diff --git a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
index 6f7b7bc..f268040 100644
--- a/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
+++ b/apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
@@ -22,6 +22,7 @@
+
Ta bort |
@@ -44,9 +45,12 @@
-
+
- Ta bort konto
|
@@ -55,7 +59,8 @@
-
-
- Är du säker på att du vill ta bort personalkontot för {{employee?.fullName}}?
-
+ Är du säker på att du vill ta bort personalkontot för {{employee?.fullName}}?
0.8 && {
+ const korkort = Math.random() > 0.2 && {
behorighet: chooseRandom(DRIVERS_LICENSES, faker.datatype.number(3)).join(''),
};
const educationLevel = EDUCATION_LEVELS[Math.floor(Math.random() * EDUCATION_LEVELS.length)];
@@ -90,7 +90,7 @@ function generateDeltagare(amount = 10) {
sun_kod: sunKod.sun_kod,
beskrivning_sun_kod: sunKod.beskrivning,
},
- education: {
+ educations: {
utbildningar: chooseRandom(EDUCATIONS, faker.datatype.number(EDUCATIONS.length)),
},
translator: {
diff --git a/mock-api/mina-sidor-fa/scripts/generate-api.js b/mock-api/mina-sidor-fa/scripts/generate-api.js
index 9181595..a2e303c 100644
--- a/mock-api/mina-sidor-fa/scripts/generate-api.js
+++ b/mock-api/mina-sidor-fa/scripts/generate-api.js
@@ -68,12 +68,6 @@ generatedAvrop.forEach(({ tjanstekod, tjansteNamn, utforandeVerksamhetId, utfora
}
});
-generatedEmployees.forEach(employee => {
- employee.authorizations = [
- auths[Math.floor(Math.random() * auths.length)],
- auths[Math.floor(Math.random() * auths.length)],
- ];
-});
const apiData = {
languages: languages.generate(),
employees: generatedEmployees,
@@ -87,7 +81,6 @@ const apiData = {
employeeId: generatedEmployees[Math.floor(Math.random() * generatedEmployees.length)].id,
})),
currentUser: currentUser.generate(),
- authorizations: auths,
getTokenFullAccess: authTokens.auth_code_from_CIAM_with_all_permissions,
invites: [],
};
diff --git a/mock-api/mina-sidor-fa/server.js b/mock-api/mina-sidor-fa/server.js
index 33739e1..3e10009 100644
--- a/mock-api/mina-sidor-fa/server.js
+++ b/mock-api/mina-sidor-fa/server.js
@@ -61,7 +61,7 @@ router.render = (req, res) => {
let data = res.locals.data;
const employeeRegex = /(?:\/users\/)(.*)/;
const isEmployeePath = employeeRegex.exec(pathname);
- const deltagareRegex = /(?:\/deltagare\/)(?:\d\/)(contact|driverlicense|educationlevels\/highest|educations|translator|work\/disabilities|work\/languages|work\/experiences)/g;
+ const deltagareRegex = /(?:\/deltagare\/)(?:\d*\/)(contact|driverlicense|educationlevels\/highest|educations|translator|work\/disabilities|work\/languages|work\/experiences)/g;
const isDeltagarePath = deltagareRegex.exec(pathname);
const avropRegex = /(?:\/avrop\/(?:tjanster|utforandeverksamheter|kommuner|\d))|(?:\/deltagare\/\d\/(avrop))/g;
const isAvropPath = avropRegex.exec(pathname);