Erik Tiekstra
59ce393259
feat(employees): New component for utförande verksamheter and addresses inside employee card.(TV-361)
...
Squashed commit of the following:
commit f75e29597c13b5d9c4232631e5c396974c6470fa
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 16:25:12 2021 +0200
Added name to employees-list component for listing names of utförandeverksamheter as the response have changed so utforandeVerksamheter contains more then just the name.
commit a2665dc110243c3327bb4ee88099f7e19451456e
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:45:52 2021 +0200
Updated avrop.js to match new mock-api
commit 71ac0c85c73615d6a638670250d390d90a673051
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:28:26 2021 +0200
Reverted some changes after comparison with develop.
commit d96d3d6ae3390582d7a06a765b6667bf4733614a
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:17:43 2021 +0200
Added flag allaUtforandeVerksamheter to employee mock-api
commit 833c32a63fc18a67cde498fd0e976483cff8f047
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 11:47:38 2021 +0200
- Splitted out utförandeverksamheter from organizations.js to utforande-verksamhet.js which is included in employees.js
- Changed layout
- Prepared markup for all utforande verksamheter permission. Needs to be changed to mock-api data-value when we get it from backend.
commit 31d33010af049f8b3cf5ba7b7ea8e1f03cf38fb1
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 15:26:00 2021 +0200
Added name/organizationNumber
commit 1037098f67ad9bfd4400a2b0de1daf7e969b378d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 13:56:24 2021 +0200
Utforande verksamheter amends to work with changed api settings
commit 436440fe3a8f2170029a4d7b418f10741e9e233a
Merge: 5cbb694 e6f8090nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 11:31:59 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts
# apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts
# apps/mina-sidor-fa/src/app/shared/models/api/employee.response.model.ts
# apps/mina-sidor-fa/src/app/shared/models/employee.model.ts
# apps/mina-sidor-fa/src/app/shared/services/api/authentication.service.ts
# apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts
# apps/mina-sidor-fa/src/app/shared/services/api/user.service.ts
# mock-api/mina-sidor-fa/scripts/employees.js
# mock-api/mina-sidor-fa/scripts/generate-api.js
# mock-api/mina-sidor-fa/scripts/tjanster.js
# mock-api/mina-sidor-fa/server.js
commit 5cbb694bb5b836f3826f7dadae300a0f7feba80f
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 11:19:02 2021 +0200
Reference name changes
commit 387451b3168a101f94f2b49470521d74a4f30e65
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 10:42:56 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
# mock-api/mina-sidor-fa/scripts/employees.js
commit c7d31f6f926e52be9b5c4aec59eafd4d22d36e00
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 16:09:20 2021 +0200
Renamed organization to utforandeVerksamhet and changed referenses.
commit 12d9f49f56d658da6a2082af46091eeb48b6031f
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 15:57:08 2021 +0200
Utforande verksamheter cards created
commit e88962cd20394b54bad9904258d6876230d60f51
Merge: 5211885 b7c7b6bnikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 11:04:14 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
commit 52118858f20f7f63812cec44641753f1760e2300
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 10:58:40 2021 +0200
Updated mock-api
commit 63da7e7f4cfc1b7cbd721899300357694103900b
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Aug 17 10:28:57 2021 +0200
SKapat upp komponent
2021-08-24 08:53:11 +02:00
Erik Tiekstra
e6f80901ea
feat(employee): Showing employee-data inside employee-card page. (TV-341)
...
Squashed commit of the following:
commit 4fd71e0d0655a0d75dda59151ac74e2361f187bc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 10:59:46 2021 +0200
Updated RoleEnum and mock-data för roles
commit f05a93239727ce1245650ece3b48cf75dc7091ca
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 08:34:20 2021 +0200
Fixed issue with mock-api
commit c31e94da6b90e442fd84c5113789db245be81c6d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 08:26:14 2021 +0200
Fixed issue with tjanster
commit a183a08f0446cdaea7d01c8935d88ac436b0438f
Merge: eb310c1 1e2d925erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 07:59:06 2021 +0200
Merge branch 'develop' into feature/TV-341-erik
commit eb310c10bdf0f4b60032bdda97df75c19bdbf447
Merge: 877b68b fae7d9aerik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 07:21:39 2021 +0200
Merged develop and fixed conflicts
commit 877b68b8827e89cfd230856c9d8247f1cd8db264
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 15:01:55 2021 +0200
Now fetching tjanster from mock-api
commit 1ecd26595b21ea46ce6fb0c193c6642f66250ae3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 14:24:11 2021 +0200
Some more changes to employee-card
commit e42ae254e7aa7b994627fdccb7037493b116d6a2
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 13:44:23 2021 +0200
Added new enum Role and fixed some issues mapping roles inside employee-card
commit 7801831d83feae5ef5e5b92e6421b18863b2a1db
Merge: c78f3f8 d6e4666erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 12:37:56 2021 +0200
Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss
commit c78f3f886752477d2dbc4af20356252af4128440
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Thu Aug 19 11:19:56 2021 +0200
Authorization
commit 9c043720a9cfa5fd6943013f643d948a50c8f135
Merge: 77d6a9c ffeb372nikola.holst-nikolic@arbetsformedlingen.se >
Date: Thu Aug 19 11:19:43 2021 +0200
Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts
# apps/mina-sidor-fa/src/app/shared/enums/employee-authorization.enum.ts
commit 77d6a9c600e6b42e97fa5431ed37ad430c5febd3
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 10:22:45 2021 +0200
Moved subscription, added icons, refactured markup
commit b43c18e28b5aabb8115fa659a98b4ae8c0a7bf40
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Aug 17 10:50:02 2021 +0200
unsubscribed
commit 9f48cddc75872fc3f740c53de998cd54666b0b1d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 16 16:40:08 2021 +0200
Unsubscription behöver läggas till efter genomgång av hur unsubscribeOnDestroy fungerar
commit b2cef346f18482e72c11c09d0a6e629370d01bd5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 16 16:37:13 2021 +0200
Authorization
commit 5fe0b5d5fc725551f9e794cbaa70dc0f077f8717
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 13 15:46:50 2021 +0200
- Changed first h2 to h3
- Changed link to routerLink
commit fd1cb3c6249535ce84e61df035cae63352b1b00b
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 13 11:53:36 2021 +0200
Amends after PR
commit 13e9881e3680bd829736205b3fef57b2228638d5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 11 16:19:36 2021 +0200
Employee-card amends to look more like the sketch.
2021-08-20 11:01:23 +02:00
Erik Tiekstra
1e2d925d27
Made some changes to the mock-api
2021-08-20 07:57:27 +02:00
Christian Gårdebrink
fae7d9ad8c
Merge pull request #59 in TEA/dafa-web-monorepo from feature/TV-244 to develop
...
Squashed commit of the following:
commit b8ea6da64b2fbdc1bbc0d7546c6ce859ce6981cd
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 15:17:39 2021 +0200
minor changes to get correct employee data from mock-api
commit 715eff33a8f3cccd7ddce8bd32996190dc6597f3
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 15:05:26 2021 +0200
minor changes and added employee email to mock-data (TV-244)
commit 454641e1fd486e4aee271d63406a28f47c299b45
Merge: f5e0950 ecb929aaden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 14:52:39 2021 +0200
merged with develop and fixed conflicts (TV-244)
commit f5e0950da2de0465fb6eaee39a0e1c13b1c52281
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 13:31:01 2021 +0200
flyttat över grundstrukturen till edit-employee-form componenten
commit bcce2e41646b45c65929d057248b6767a832d807
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 12:42:12 2021 +0200
pre-populated email-input and minor changes to employee model and moch-api
commit 088ed6efb0cebdea86d25094ca1fd55827f938d2
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 11:12:57 2021 +0200
TV-244 small adjustments.
commit be17adf5d898b42467a557832e728ca3827f58d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 10:43:26 2021 +0200
TV-244 extended emplyee authorizations to a list with two random authorizations.
commit cc57a6d2ceae4069d48aa670a6fea95c21ebd628
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 10:25:42 2021 +0200
minor changes and re-wrote the mock-api to similar data for authorizations and employee-auth
commit 0a22b310729e2a359aa9f1c9d475ac875b6b2301
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 05:37:05 2021 +0200
TV-244 wip
commit 0e80b5bc4ac14b74f1a8c58ec257ca1f6453e119
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Aug 18 17:14:48 2021 +0200
TV-244 WIP
2021-08-19 15:56:00 +02:00
Erik Tiekstra
d6e46668e5
Fixed mock-api for single employee requests
2021-08-19 11:42:55 +02:00
Erik Tiekstra
aa55ee80f4
Fixed issue with sorting
2021-08-18 14:55:41 +02:00
Erik Tiekstra
456f305f0e
Fixed employees without roles filter
2021-08-18 14:51:28 +02:00
Erik Tiekstra
5bb81c3bd4
feat(employee): Matched models to the API and adjusted mock-api. (TV-346)
...
Squashed commit of the following:
commit 0f10a7864960cae47694212042f9d58053b05a0c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 14:13:15 2021 +0200
Changed tjanst and utforandeVerksamhet to plural
commit 3ffe861d8721692d0b49b0f333f2f52186b23560
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 12:26:43 2021 +0200
Updated fetching single employee in mock-api
commit ae101885a90367b86b77faadaa171816aa2ffcaa
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 12:23:28 2021 +0200
Changed models for employees and fixed mock-api
2021-08-18 14:16:17 +02:00
Erik Tiekstra
218e3d6b36
Fixed models and services to match deltagare response from api
2021-08-18 08:21:29 +02:00
Erik Tiekstra
9f86fb405b
feat(deltagare): Added deltagare list with data from api. Also adjusted mock-api to match the api. (TV-309)
...
Squashed commit of the following:
commit 41560491305b61ba322fa653788411de6112cc7e
Merge: a157e69 03a2c7aerik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 07:23:35 2021 +0200
Merged develop and fixed conflicts
commit a157e69d6b4b18c9b8a806c4bbbc264b8b311b67
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 13:54:29 2021 +0200
Removed console.log
commit 87a532eb63b9c68109a4f847cc9530a47a56b648
Merge: db2ff17 6d29baaerik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 13:52:54 2021 +0200
Merged develop and fixed conflicts
commit db2ff1758218c651cadf93de8ce0c5034d6994d3
Merge: 588adee 01dc4b3erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 13:09:33 2021 +0200
Merged develop and fixed conflicts
commit 588adee5b17aeefcaf526aabdde02ca975c9c031
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 11:11:57 2021 +0200
Added deltagarlist
commit a0c378a8221a5d363f56ee644b9728d873ae1ff1
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 07:19:49 2021 +0200
Updates after PR
commit 479df238c712e2e14829d33b468ece91332f81c8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 13 15:18:23 2021 +0200
Updated tolkbehov inside deltagare-card
commit df95ae2a8afbcc78ba546472ae9c1db141d1e642
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 13 15:14:27 2021 +0200
Updated deltagare-kort after discussion with UX
2021-08-18 07:24:53 +02:00
Erik Tiekstra
03a2c7a42f
refactor(project): Renamed all instances of dafa to msfa or mina-sidor-fa. (TV-379)
...
Squashed commit of the following:
commit d3f52ff6876f6e246c7d3c188e56cc2370289341
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 14:10:38 2021 +0200
Renamed all dafa instances to msfa
2021-08-18 07:10:28 +02:00
