diff --git a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html b/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html index e1fa3cb..c117920 100644 --- a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html +++ b/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.html @@ -23,7 +23,7 @@ > -
{{address.type}}
+
{{address.type}}:
{{ address.street }}
@@ -56,7 +56,7 @@
Tolk:
-
{{deltagare.translator ? 'Ja ({{deltagare.translator}})' : 'Nej'}}
+
{{deltagare.translator ? 'Ja (' + deltagare.translator + ')' : 'Nej'}}
@@ -154,8 +154,8 @@

Körkortsinformation

Har körkort
-
{{deltagare.driversLicense.licenses ? 'Ja' : 'Nej'}}
- +
{{deltagare.driversLicense.licenses.length ? 'Ja' : 'Nej'}}
+
Körkortsklasser
{{deltagare.driversLicense.licenses.join(', ')}}
Tillgång till bil
diff --git a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.scss b/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.scss index 150827f..4e80ae4 100644 --- a/apps/dafa-web/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.scss +++ b/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 { diff --git a/apps/dafa-web/src/styles/styles.scss b/apps/dafa-web/src/styles/styles.scss index 8dea91c..d589436 100644 --- a/apps/dafa-web/src/styles/styles.scss +++ b/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 { diff --git a/mock-api/dafa-web/scripts/deltagare.js b/mock-api/dafa-web/scripts/deltagare.js index c1a7b1d..888117d 100644 --- a/mock-api/dafa-web/scripts/deltagare.js +++ b/mock-api/dafa-web/scripts/deltagare.js @@ -106,12 +106,14 @@ function generateDeltagare(amount = 10) { })) : [], }, - disabilities: { - funktionsnedsattningar: Math.random() > 0.3 ? chooseRandom(DISABILITIES, faker.datatype.number(3)) : [], - }, + // disabilities: { + // 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({ diff --git a/mock-api/dafa-web/scripts/work-experiences.js b/mock-api/dafa-web/scripts/work-experiences.js index 2f7eb5b..dc2a986 100644 --- a/mock-api/dafa-web/scripts/work-experiences.js +++ b/mock-api/dafa-web/scripts/work-experiences.js @@ -1,38 +1,50 @@ function generateWorkExperiences() { - console.info('Work experiences generated...'); - return [ - { - yrke: 'Revisorer m.fl.', - beskrivning: 'asasaf', - arbetsgivare: 'Jobbet AB', - period_from: '20090501', - period_tom: '20110430' - }, - { - yrke: 'Revisorer m.fl.', - beskrivning: 'asasaf', - arbetsgivare: 'Himmelsö AB', - period_from: '20130829', - period_tom: '20140128' - }, - { - yrke: 'Revisorer m.fl.', - beskrivning: 'asasaf', - arbetsgivare: 'Himmelsö AB', - period_from: '20140129', - period_tom: '20141126' - }, - { - yrke: 'Revisorer m.fl.', - beskrivning: 'AFAsdfasdf', - arbetsgivare: 'Distansutbildningsnämnden', - period_from: '20140527', - period_tom: '20141126' - }, - ]; - } - - export default { - generate: generateWorkExperiences, - }; - \ No newline at end of file + console.info('Work experiences generated...'); + return [ + { + yrke: 'Administratör', + arbetsgivare: 'Eriksson', + period_from: '20020202', + period_tom: '20040404', + }, + { + yrke: 'Militärer', + beskrivning: 'slödfkäqwefkop qwelöfk aäsdlöfk aäsdklöf aäldfk', + arbetsgivare: 'Grönlunds Trafikskola AB', + period_from: '20130301', + period_tom: '20131220', + }, + { + yrke: 'Revisorer m.fl.', + beskrivning: 'asasaf', + arbetsgivare: 'Jobbet AB', + period_from: '20090501', + period_tom: '20110430', + }, + { + yrke: 'Revisorer m.fl.', + beskrivning: 'asasaf', + arbetsgivare: 'Himmelsö AB', + period_from: '20130829', + period_tom: '20140128', + }, + { + yrke: 'Revisorer m.fl.', + beskrivning: 'asasaf', + arbetsgivare: 'Himmelsö AB', + period_from: '20140129', + period_tom: '20141126', + }, + { + yrke: 'Revisorer m.fl.', + beskrivning: 'AFAsdfasdf', + arbetsgivare: 'Distansutbildningsnämnden', + period_from: '20140527', + period_tom: '20141126', + }, + ]; +} + +export default { + generate: generateWorkExperiences, +}; diff --git a/mock-api/dafa-web/server.js b/mock-api/dafa-web/server.js index 952ccbc..65963a5 100644 --- a/mock-api/dafa-web/server.js +++ b/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; }