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
