feat(Deltagarlista): Lade till startdatum, slutdatum, avbrott samt Visa händelser, som öppnar en modal med en deltagares händelser (TV-606)

Squashed commit of the following:

commit 932d0ce27b416652e241803e04dd9e98c6ca5757
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Sep 22 08:17:56 2021 +0200

    fix lint and fails

commit b988fb7dc443d336e1e572d1a1f2993f7ed8f43b
Merge: 7eb75ec 5846c2c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Sep 22 07:54:00 2021 +0200

    Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns

commit 7eb75ec659a3a25386f76dd9aed1806fd603c35b
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Sep 22 07:53:54 2021 +0200

    refactor

commit 3bfe1fe1d7d17f8ba3dcdc6d587d957ff584ef6c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 11:53:20 2021 +0200

    Update deltagare-list-handelser-dialog.component.scss

commit 4c7275e24ca9fdf70fb26db8e67a747c2a26b825
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 11:51:08 2021 +0200

    set dialog width to auto

commit 1feb3b6f5779a810881a7592325dd9f1bf33d490
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 11:43:51 2021 +0200

    added captions to tables

commit 4b4137cd9ae8e4084ea6172119449d247c591c40
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 11:06:16 2021 +0200

    Update server.js

commit 203609c380f2d47ce248b94ed06e0dfde293ef24
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 11:05:05 2021 +0200

    full name in dialog heading

commit 265c38aefe8d1380c7cc0ae1b87a12d276671ced
Merge: e734ab5 2dd9d3d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:58:29 2021 +0200

    Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns

commit e734ab5c6fe00923642da70dfe92cdbafc0f0c79
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:58:26 2021 +0200

    formatting

commit 1a13a9fc6d9329e6b5d6fce7c77352ac75123a5a
Merge: aa1552d 91eeb1d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 10:49:07 2021 +0200

    Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns

commit aa1552d0ad85b3213a0e062ee3f786849013566a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Sep 21 09:33:10 2021 +0200

    add colums to handelser

commit 584ecd2cb2b5265cc885dcab713582083dbe19bb
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 15:46:38 2021 +0200

    fix test and lint

commit 890e741c69a6408a72ca7899cc5cd76eccbdb498
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 15:39:18 2021 +0200

    add dialog and fix mock apis

commit fc8ee963619a8cd24e482c56180536219c83ec28
Merge: 422563b 8da6899
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 14:14:49 2021 +0200

    Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns

commit 422563b5ecc8cc923b2e6791b5c533913ae6e4bd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 13:01:45 2021 +0200

    wip

commit 2d83fa6e8a4d7459e8661bf7036388021bec460e
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 11:26:38 2021 +0200

    added columns to deltagare list

commit a9df57d4492ec3f08de8f20a3032c8a1a84fd8a4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Sep 20 10:21:27 2021 +0200

    wip
This commit is contained in:
Daniel Appelgren
2021-09-22 08:19:25 +02:00
parent 5846c2c5a4
commit 68c5c8d4a8
24 changed files with 382 additions and 70 deletions

View File

@@ -58,6 +58,7 @@ function generateAvrop(amount = 10, deltagare, handledare) {
sparNamn: track.name,
handledareCiamUserId: null,
recievedTimestamp: faker.date.recent(),
hasAvbrott: currentDeltagare.hasAvbrott,
});
}

View File

@@ -0,0 +1,36 @@
import faker from 'faker';
faker.locale = 'sv';
const HANDELSER = [
'Gemensam planering inkommen',
'Gemensam planering godkänd',
'Slutredovisning inkommen',
'Slutredovisning godkänd',
'Slutredovisning ej godkänd',
'Avbrott handläggs',
'Avbrott bifall',
'Avbrott avslag',
'Byte av leverantör bifall',
];
const TIDPUNKT_DESCRIPTION = ['Handläggning startad', 'Inrapporteringsdatum slutredovisning'];
function generateHandelser(amount = 10) {
const handelser = [];
for (let id = 1; id <= amount; ++id) {
const handelse = HANDELSER[Math.floor(Math.random() * HANDELSER.length)];
handelser.push({
description: handelse,
receivedDate: faker.date.recent(),
isAvbrott: handelse.indexOf('Avbrott') >= 0,
tidpunkt: faker.date.recent(),
tidpunktDescription: TIDPUNKT_DESCRIPTION[Math.floor(Math.random() * TIDPUNKT_DESCRIPTION.length)],
});
}
return handelser;
}
export default {
generate: generateHandelser,
};

View File

@@ -111,6 +111,7 @@ function generateDeltagare(amount = 10) {
workExperiences: {
arbetslivserfarenheter: chooseRandom(WORK_EXPERIENCES, faker.datatype.number(WORK_EXPERIENCES.length)),
},
hasAvbrott: Math.random() < 0.2,
};
if (Math.random() > 0.8) {
deltagare.contact.adresser.push({

View File

@@ -4,6 +4,7 @@ import avrop from './avrop.js';
import currentUser from './current-user.js';
import userinfo from './userinfo.js';
import deltagare from './deltagare.js';
import deltagareHandelser from './deltagare-handelser.js';
import employees from './employees.js';
import handledare from './handledare.js';
import languages from './languages.js';
@@ -21,6 +22,7 @@ const AUTHORIZATIONS = ['Hantera användare', 'Hantera origisation', 'Hantera ek
const generatedEmployees = employees.generate(50);
const generatedDeltagare = deltagare.generate(50);
const generatedDeltagareHandelser = deltagareHandelser.generate(10);
const generatedHandledare = handledare.generate(generatedEmployees.slice(0, 6));
const generatedAvrop = avrop.generate(10, generatedDeltagare.slice(0, 25), generatedHandledare);
const generatedTjanster = tjanster.generate();
@@ -111,6 +113,7 @@ const apiData = {
utforandeVerksamheter,
kommuner: avropKommuner,
deltagare: generatedDeltagare,
deltagareHandelser: generatedDeltagareHandelser,
handledare: generatedHandledare,
participants: participants.generate(50).map(participant => ({
...participant,

View File

@@ -123,14 +123,32 @@ router.render = (req, res) => {
}
if (pathname === '/deltagare') {
data = data.map(({ sokandeId, fornamn, efternamn, tjansteNamn, utforandeverksamhet, adress }) => ({
sokandeId: sokandeId.toString(),
fornamn,
efternamn,
tjanst: tjansteNamn,
utforandeVerksamhet: utforandeverksamhet,
utforandeAdress: adress,
}));
// NOTE: this is reading from avrop.js
data = data.map(
({
sokandeId,
fornamn,
efternamn,
tjansteNamn,
utforandeverksamhet,
adress,
startdatumAvrop,
slutdatumAvrop,
hasAvbrott,
genomforandeReferens,
}) => ({
sokandeId: sokandeId.toString(),
fornamn,
efternamn,
tjanst: tjansteNamn,
utforandeVerksamhet: utforandeverksamhet,
utforandeAdress: adress,
startdatumAvrop,
slutdatumAvrop,
hasAvbrott,
genomforandeReferens,
})
);
}
res.jsonp({