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
Nicolas Fuentes Maturana
ecb929a808
Merge pull request #57 in TEA/dafa-web-monorepo from feature/TV-351 to develop
...
Squashed commit of the following:
commit 7009ec6cae0768d134f7dff5da8d00e047ab91de
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Aug 19 13:14:22 2021 +0200
TV-351 added aria-label to delete button
commit 27380c4aa24b550af0d37dc694072d7a2b1591b2
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Aug 19 07:22:09 2021 +0200
TV-351 changed icon, observable for selected employee
commit 45fd5248534e0738cf2242bb60f4ac7f75accf64
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 17:58:09 2021 +0200
TV-351 corr
commit b8ac397712f3359495d463740b6fb97f6a8bfb0c
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 17:49:31 2021 +0200
TV-351 added takeUntil operator for unsubscription
commit da328d66a9331aa7f7c901b939d826025401c721
Merge: 69cae6f ffeb372nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 17:34:46 2021 +0200
Merge branch 'develop' into feature/TV-351
commit 69cae6f711c60959edff48709e2fa99ba4534c65
Merge: ed57d7d b7c7b6bnicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 12:58:45 2021 +0200
Merge branch 'develop' into feature/TV-351
commit ed57d7d35e132f90f374b465ffdbf507c55f4038
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 12:54:22 2021 +0200
TV-351 prev pr review fix
commit eca6211388ea20c0aba9980dd4343163e54d51eb
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 12:49:19 2021 +0200
TV-351 delete employee
commit 206bf42a9a952d2e74bb60ad4a12c2f0568cb100
Merge: 0d2700f 218e3d6nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 08:41:23 2021 +0200
Merge branch 'develop' into feature/TV-351
commit 0d2700f1fc535d6afcddbe2bfed68ff775b3d0ea
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 17 15:15:23 2021 +0200
TV-351 add letter s if fullName ends without s
commit ff0d2631f45979d6381d409e119933f48b35d852
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 17 14:18:23 2021 +0200
TV-351 delete method in service, waiting for api
commit 2f1edd6e70c83b90ad6fe6399af5ef5ddf294152
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 17 14:16:38 2021 +0200
TV-351 delete employee
2021-08-19 13:16:58 +02:00
Nicolas Fuentes Maturana
d4874d6cd5
Merge pull request #55 in TEA/dafa-web-monorepo from feature/TV-366 to develop
...
Squashed commit of the following:
commit 41f27ba3701d7b690e941f2038676218facaab84
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 06:40:44 2021 +0200
TV-366 removed redundant import
commit f31d3d6545375e2c84254a60b9e072333fddaa80
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 06:38:41 2021 +0200
TV-366 made a bunch of changes in accordance with the feedback from the current pull request.
commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5
Merge: 721b58e e712f2fchristian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 06:10:28 2021 +0200
Co-authored-by: af-aden <af-aden@users.noreply.github.com >
commit 721b58e1767c465673cb817414e1410b403f5e60
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Aug 18 10:16:40 2021 +0200
Merge branch 'develop-remote' into feature/TV-366
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts
# apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts
# apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts
# apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts
commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82
Merge: fbda233 218e3d6christian.gardebrink@arbetsformedlingen.se >
Date: Wed Aug 18 09:41:54 2021 +0200
Merge branch 'develop-remote' into feature/TV-366
commit fbda233782a0850edb5e23b50f0030486a15effe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 17 19:50:08 2021 +0200
TV-366 removing stored selected organization when logging out.
commit ed51909892cd92f180f6785635f85c735ec3f129
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 17 19:05:14 2021 +0200
Merge branch 'develop-remote' into feature/TV-366
# Conflicts:
# apps/dafa-web/src/app/shared/services/api/user.service.ts
commit 6a77f2497aec71d174c719d27c6d5c644ba53fed
Merge: 17f643d 6d29baachristian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 17 19:04:22 2021 +0200
Merge branch 'develop-remote' into feature/TV-366
commit 17f643d18abcbdbfe12a91a63179278d559fdba5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 17 17:35:59 2021 +0200
TV-366 First version od organization-picker
2021-08-19 08:17:59 +02:00
Erik Tiekstra
639109ad10
Added routes to navigation constant
2021-08-19 08:07:50 +02:00
Björn Ahlén
e712f2f00a
Merge pull request #58 in TEA/dafa-web-monorepo from TV-372-Remove-rapportera to develop
...
Squashed commit of the following:
commit b85d256db8850ef7fd9627e4f2acfdd112d97e47
Author: bjornahlen <bjorn.ahlen@arbetsformedlingen.se >
Date: Wed Aug 18 14:00:06 2021 +0200
TV-372 Rapportera removed
2021-08-18 17:19:44 +02:00
Erik Tiekstra
ffeb37290c
Added my-account page with logout functionality
2021-08-18 15:49:38 +02:00
Erik Tiekstra
3cfd7856bc
Added logout functionality with CIAM
2021-08-18 15:18:58 +02:00
Erik Tiekstra
aa55ee80f4
Fixed issue with sorting
2021-08-18 14:55:41 +02:00
Erik Tiekstra
d69f69a993
Fixed issue with unsubscribeOnDestroy
2021-08-18 14:19:04 +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
60df99aaa1
Updated orgnr inside environments
2021-08-18 09:42:41 +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
