Updated mock-api and added relevant changes to deltagare-card component

apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html

@@ -23,7 +23,7 @@
                     ></dafa-hide-text>
                   </dd>
                   <ng-container *ngFor="let address of deltagare.addresses">
-                    <dt>{{address.type}}</dt>
+                    <dt>{{address.type}}:</dt>
                     <dd>
                       <address>
                         {{ address.street }}<br />
@@ -56,7 +56,7 @@
                 </dl>
                 <dl>
                   <dt>Tolk:</dt>
-                  <dd>{{deltagare.translator ? 'Ja ({{deltagare.translator}})' : 'Nej'}}</dd>
+                  <dd>{{deltagare.translator ? 'Ja (' + deltagare.translator + ')' : 'Nej'}}</dd>
                 </dl>
               </div>
               <div class="deltagare-card__tab-column">
@@ -154,8 +154,8 @@
                 <h2>Körkortsinformation</h2>
                 <dl>
                   <dt>Har körkort</dt>
-                  <dd>{{deltagare.driversLicense.licenses ? 'Ja' : 'Nej'}}</dd>
+                  <dd>{{deltagare.driversLicense.licenses.length ? 'Ja' : 'Nej'}}</dd>
-                  <ng-container *ngIf="deltagare.driversLicense.licenses">
+                  <ng-container *ngIf="deltagare.driversLicense.licenses.length">
                     <dt>Körkortsklasser</dt>
                     <dd>{{deltagare.driversLicense.licenses.join(', ')}}</dd>
                     <dt>Tillgång till bil</dt>

apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.scss

@@ -13,14 +13,11 @@
 
   dd {
     margin: 0 0 var(--digi--layout--gutter--xs);
-
-    + dd {
-      margin-top: var(--digi--layout--gutter);
-    }
   }
 
   dt {
     font-weight: var(--digi--typography--font-weight--semibold);
+    margin-top: var(--digi--layout--gutter--s);
   }
 
   &__accordion {

apps/dafa-web/src/styles/styles.scss

@@ -26,6 +26,10 @@ strong {
   font-weight: var(--digi--typography--font-weight--semibold);
 }
 
+address {
+  font-style: normal;
+}
+
 // Make all digi icons display inline-flex to make them get the correct height.
 [class^='sc-digi-icon'],
 .digi-button__icon {

mock-api/dafa-web/scripts/deltagare.js

@@ -106,12 +106,14 @@ function generateDeltagare(amount = 10) {
               }))
             : [],
       },
-      disabilities: {
+      // disabilities: {
-        funktionsnedsattningar: Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : [],
+      //   funktionsnedsattningar: Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : [],
-      },
+      // },
+      // TODO: Move to different structure. Temporary exposing disabilities in this structure as it is the way the API is exposing the data.
+      disabilities: [Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : []],
       workExperiences: {
         arbetslivserfarenheter: chooseRandom(WORK_EXPERIENCES, faker.datatype.number(WORK_EXPERIENCES.length)),
-      }
+      },
     };
     if (Math.random() > 0.8) {
       deltagare.contact.adresser.push({

mock-api/dafa-web/scripts/work-experiences.js

@@ -1,38 +1,50 @@
 function generateWorkExperiences() {
-    console.info('Work experiences generated...');
+  console.info('Work experiences generated...');
-    return [
+  return [
-      {
+    {
-        yrke: 'Revisorer m.fl.',
+      yrke: 'Administratör',
-        beskrivning: 'asasaf',
+      arbetsgivare: 'Eriksson',
-        arbetsgivare: 'Jobbet AB',
+      period_from: '20020202',
-        period_from: '20090501',
+      period_tom: '20040404',
-        period_tom: '20110430'
+    },
-      },
+    {
-      {
+      yrke: 'Militärer',
-        yrke: 'Revisorer m.fl.',
+      beskrivning: 'slödfkäqwefkop qwelöfk aäsdlöfk aäsdklöf aäldfk',
-        beskrivning: 'asasaf',
+      arbetsgivare: 'Grönlunds Trafikskola AB',
-        arbetsgivare: 'Himmelsö AB',
+      period_from: '20130301',
-        period_from: '20130829',
+      period_tom: '20131220',
-        period_tom: '20140128'
+    },
-      },      
+    {
-      {
+      yrke: 'Revisorer m.fl.',
-        yrke: 'Revisorer m.fl.',
+      beskrivning: 'asasaf',
-        beskrivning: 'asasaf',
+      arbetsgivare: 'Jobbet AB',
-        arbetsgivare: 'Himmelsö AB',
+      period_from: '20090501',
-        period_from: '20140129',
+      period_tom: '20110430',
-        period_tom: '20141126'
+    },
-      },
+    {
-      {
+      yrke: 'Revisorer m.fl.',
-        yrke: 'Revisorer m.fl.',
+      beskrivning: 'asasaf',
-        beskrivning: 'AFAsdfasdf',
+      arbetsgivare: 'Himmelsö AB',
-        arbetsgivare: 'Distansutbildningsnämnden',
+      period_from: '20130829',
-        period_from: '20140527',
+      period_tom: '20140128',
-        period_tom: '20141126'
+    },
-      },        
+    {
-    ];
+      yrke: 'Revisorer m.fl.',
-  }
+      beskrivning: 'asasaf',
-  
+      arbetsgivare: 'Himmelsö AB',
-  export default {
+      period_from: '20140129',
-    generate: generateWorkExperiences,
+      period_tom: '20141126',
-  };
+    },
-  
+    {
+      yrke: 'Revisorer m.fl.',
+      beskrivning: 'AFAsdfasdf',
+      arbetsgivare: 'Distansutbildningsnämnden',
+      period_from: '20140527',
+      period_tom: '20141126',
+    },
+  ];
+}
+
+export default {
+  generate: generateWorkExperiences,
+};

mock-api/dafa-web/server.js

@@ -44,7 +44,7 @@ router.render = (req, res) => {
     res.jsonp(res.locals.data);
   } else {
     let data = res.locals.data;
-    const deltagareRegex = /(?:\/customerinfo\/)(contact|driverlicense|education\/highest|education|translator|work\/disability|work\/languages)/g;
+    const deltagareRegex = /(?:\/customerinfo\/)(contact|driverlicense|education\/highest|education|translator|work\/disability|work\/languages|work\/experience)/g;
     const isDeltagarePath = deltagareRegex.exec(pathname);
 
     if (isDeltagarePath) {
@@ -90,6 +90,8 @@ function getDeltagareSubPath(path) {
       return 'disabilities';
     case 'work/languages':
       return 'workLanguages';
+    case 'work/experience':
+      return 'workExperiences';
     default:
       return path;
   }