Erik Tiekstra
ab6cf6b7c3
Updated Jenkisfile for dev to only deploy to sys and auto
2021-09-07 14:45:27 +02:00
Erik Tiekstra
caebc349da
Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/mina-sidor-fa-web into develop
2021-09-07 14:44:33 +02:00
Erik Tiekstra
39a0090881
Added error handling for edit employee
2021-09-07 14:44:14 +02:00
Daniel Appelgren
83b69c420f
Update Jenkinsfile
2021-09-07 14:41:13 +02:00
Daniel Appelgren
8ff8f7923f
update deploy2prod jenkinsfile
2021-09-07 14:29:38 +02:00
Erik Tiekstra
bb4d88a8e0
feat(employee): Now possible to submit edit employee form. (TV-513)
...
Squashed commit of the following:
commit fc79d20601988735b407a54009426e10e233df39
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 13:24:30 2021 +0200
Small fixes
commit bc8741bab9b3161d356d1375b7ab869b202a8195
Merge: 1ad9db8 cac0515
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 13:16:21 2021 +0200
Merged develop
commit 1ad9db87e7f1f19fdb2cd3e2cfcc17e08c9ccfef
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 12:49:37 2021 +0200
Stylechanges
commit 5a3b863f87f956ed90564fecbef9abe9460558bd
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 11:26:35 2021 +0200
Now possible to edit employee-accounts
commit 0677f2ebeee12adeba6cb65a673781dea7a6c06d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 10:05:35 2021 +0200
Updated models to include new structure
commit 76bde9e0afbbf44a09348ee8e4849b4816b0c39d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Sep 7 08:43:25 2021 +0200
edit employee
commit c8cf93b6bbeef0a3b4b6f141f36aea7ea86f399e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 16:22:46 2021 +0200
WIP
commit fe5cff4aa209c4da0025ebfb70b79d6a95c8d1f1
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 15:46:26 2021 +0200
Fixed issue not fetching new utforande verksamheter on page load
commit c997dbe80c8f9f5ec84aad2ac18805918b7ab6f5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 15:35:34 2021 +0200
Added scrollPositionRestoration
commit 58ee0147ff553f2a97fdf143ddcbdf1b0241d26f
Merge: 27b595c 9a73ffe
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 15:30:08 2021 +0200
Merge branch 'develop' into feature/TV-513
commit 27b595cbf94dc1d95ad32a0da1943e2e6fce61c4
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 14:28:10 2021 +0200
WIP
commit 81cb9df1869784a80f6747ac68bfdc81ae5d777a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 13:21:41 2021 +0200
Fixed roles
2021-09-07 13:26:46 +02:00
Christian Gårdebrink
cac0515c9c
Merge pull request #76 in TEA/mina-sidor-fa-web from bugs/TV-520 to develop
...
Squashed commit of the following:
commit 0b09c15d23fb2bfeb54cbf9e9508a65c782ba230
Merge: 32383b6 9a73ffe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Sep 7 10:09:02 2021 +0200
Merge branch 'develop-remote' into bugs/TV-520
commit 32383b6d1f2b3611cb99c7b05c66b46b561175fe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 12:57:24 2021 +0200
TV-520 fixed failing test after merge from develop
commit 29fff4e9dd055dd0da2ba21e8b95a9c4ae9714b4
Merge: b28ef1c db03d97
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 12:46:50 2021 +0200
Merge branch 'develop-remote' into bugs/TV-520
commit b28ef1c1e8645452ab43f1dce8732f69ca73781c
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 10:30:13 2021 +0200
TV-520 removed unnecessary reference
commit 17d39ec2d396aa4eb60d739a2a04b6e64d2fb5df
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 09:55:23 2021 +0200
TV-520 varied fixes for template errors..
commit 8196d0305b224475786843bd149d4e13cc3039aa
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 09:06:56 2021 +0200
Merge branch 'develop-remote' into bugs/TV-520
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/administration-routing.module.ts
commit 8911fdd694d227b901ad492679ed2ed0d044beeb
Merge: 31cd47f ec7b4fc
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 08:56:53 2021 +0200
Merge branch 'develop-remote' into bugs/TV-520
commit 31cd47ff2e13d090dd3489e21f18fcf292600cbd
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Mon Sep 6 08:52:06 2021 +0200
TV-520 lade in en funktion i layout komponenten som i stort sett alla sidor verkar använda sig av där title sätts till vad man lagt in för info i data objektet för den aktuella routen.
2021-09-07 12:59:54 +02:00
Erik Tiekstra
9a73ffeee3
Changed texts for employee invite
2021-09-06 15:29:12 +02:00
Erik Tiekstra
b3283aaab3
Fixed issue with utforandeverksamheter in employees
2021-09-06 15:23:48 +02:00
Erik Tiekstra
db03d97d54
Updated readme
2021-09-06 10:59:35 +02:00
Erik Tiekstra
9253edfe62
feat(employee): Added functionality to invite multiple emailaddresses. (TV-512)
...
Squashed commit of the following:
commit 04baa8e9398016ffb0cba618a5b857230dc4ea9e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 10:52:12 2021 +0200
moved email-regex
commit 0f54392c2e65386f4d0ae79493f6d33d84e313fe
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 07:54:13 2021 +0200
Updated confirmation texts
commit 4557c8203cf826caccff7ac174e15b547f041993
Merge: ec932ec ec7b4fc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Sep 6 07:37:56 2021 +0200
Merge branch 'develop' into feature/TV-512-inbjudningar
commit ec932ecad69b96504b2d25f937aa4b6def646f11
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Sep 3 16:08:22 2021 +0200
Now possible to add commaseparated list of emails
2021-09-06 10:53:25 +02:00
Erik Tiekstra
ec7b4fcd8e
Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/mina-sidor-fa-web into develop
2021-09-06 07:36:45 +02:00
Erik Tiekstra
ab042230f3
Updated avrop params to match API
2021-09-06 07:36:38 +02:00
Daniel Appelgren
dc119dd655
restore lint and test before release
2021-09-03 15:59:49 +02:00
Daniel Appelgren
d8c30bb555
chore(changelog): Updated CHANGELOG.md inside assets directory
2021-09-03 15:52:46 +02:00
semantic-release-bot
a7f51446bd
chore(release): 1.2.0 [skip ci]
...
## [1.2.0](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/mina-sidor-fa-web/compare/diff?targetBranch=refs%2Ftags%2Fv1.1.0&sourceBranch=refs%2Ftags%2Fv1.2.0 ) (2021-09-03)
### Features
* **avrop:** Added additional functionality to avrop-flow. ([TV-411](https://jira.arbetsformedlingen.se/browse/TV-411 )) ([1f26e80 ](1f26e80cb3 ))
* **login:** Added auth-guard to avoid unauthorized access ([e9159bc ](e9159bcbc4 ))
* **deltagare:** Added avrop-information to deltagare card. ([TV-324](https://jira.arbetsformedlingen.se/browse/TV-324 )) ([b4b71ef ](b4b71efe2c ))
* **api:** Added connection to the dotnet api ([TV-189](https://jira.arbetsformedlingen.se/browse/TV-189 )) ([4334fd7 ](4334fd7364 ))
* **deltagare:** Added deltagare data and models ([TV-268](https://jira.arbetsformedlingen.se/browse/TV-268 )) ([c4ffb2a ](c4ffb2aeb3 ))
* **deltagare:** Added deltagare list with data from api. Also adjusted mock-api to match the api. ([TV-309](https://jira.arbetsformedlingen.se/browse/TV-309 )) ([9f86fb4 ](9f86fb405b ))
* **employee:** Added functionality to delete employees. ([TV-352](https://jira.arbetsformedlingen.se/browse/TV-352 )) ([b7ff429 ](b7ff429db3 ))
* **deltagare:** Added functionality to filter on only "My deltagare". ([TV-405](https://jira.arbetsformedlingen.se/browse/TV-405 )) ([70ab2c3 ](70ab2c3ee4 ))
* **deltagare:** Added functionality to sort work experiences and educations on from/to dates. ([TV-270](https://jira.arbetsformedlingen.se/browse/TV-270 )) ([517d75d ](517d75daf6 ))
* **personal:** Added information regarding roles inside the dialog. ([TV-498](https://jira.arbetsformedlingen.se/browse/TV-498 )) ([91d7e93 ](91d7e93fea ))
* **employee-list:** Added possibility to sort and paginate inside the list of employees ([TV-217](https://jira.arbetsformedlingen.se/browse/TV-217 )) ([TV-222](https://jira.arbetsformedlingen.se/browse/TV-222 )) ([48801a9 ](48801a93a0 ))
* **participant-page:** Added routing and page for single participants. ([TV-267](https://jira.arbetsformedlingen.se/browse/TV-267 )) ([f7081d8 ](f7081d84b5 ))
* **employee-list:** Added search functionality using API. ([TV-221](https://jira.arbetsformedlingen.se/browse/TV-221 )) ([5a97ebf ](5a97ebff78 ))
* **avrop:** Created mock-api and models for avrop. ([TV-288](https://jira.arbetsformedlingen.se/browse/TV-288 )) ([f7207ae ](f7207ae1e0 ))
* **deltagare:** Fetching data from avrop to show list of deltagare. ([4fc2353 ](4fc23530ef )), closes [TV-269](https://jira.arbetsformedlingen.se/browse/TV-269 ) [TV-269](https://jira.arbetsformedlingen.se/browse/TV-269 ) [TV-269](https://jira.arbetsformedlingen.se/browse/TV-269 )
* **avrop:** Implemented filter-tags for avrop-flow ([TV-286](https://jira.arbetsformedlingen.se/browse/TV-286 )) ([a11d166 ](a11d1665da ))
* **deltagare:** Matched deltagareinformation page to the design. ([TV-269](https://jira.arbetsformedlingen.se/browse/TV-269 )) ([1d69b4b ](1d69b4b013 ))
* **employee:** Matched models to the API and adjusted mock-api. ([TV-346](https://jira.arbetsformedlingen.se/browse/TV-346 )) ([5bb81c3 ](5bb81c3bd4 ))
* **error-handling:** Modified error-handling to show better types of errors ([dc40953 ](dc40953aba ))
* **employees:** New component for utförande verksamheter and addresses inside employee card.([TV-361](https://jira.arbetsformedlingen.se/browse/TV-361 )) ([59ce393 ](59ce393259 ))
* **login:** Now adding orgnr to all API requests. ([TV-399](https://jira.arbetsformedlingen.se/browse/TV-399 )) ([50a83f7 ](50a83f784d ))
* **api:** Reflected api-changes to different api-requests and fixed mock-api. ([TV-371](https://jira.arbetsformedlingen.se/browse/TV-371 )) ([d003842 ](d003842e4e ))
* **creat-account:** Services: replaced multi-select-dropdown with selectboxes ([TV-225](https://jira.arbetsformedlingen.se/browse/TV-225 )) ([61c3c2f ](61c3c2ff59 ))
* **employee:** Showing employee-data inside employee-card page. ([TV-341](https://jira.arbetsformedlingen.se/browse/TV-341 )) ([e6f8090 ](e6f80901ea ))
* **navigation:** Updated css to match the scetches. ([TV-349](https://jira.arbetsformedlingen.se/browse/TV-349 )) ([466abd1 ](466abd1dee ))
* **deltagare:** Visual changes to deltagare-card ([TV-363](https://jira.arbetsformedlingen.se/browse/TV-363 )) ([01dc4b3 ](01dc4b3919 ))
### Bug Fixes
* **create-account:** Fixed form-submit so it submits correct data and uses correct data to redirect ([TV-241](https://jira.arbetsformedlingen.se/browse/TV-241 )) ([a701888 ](a70188863c ))
2021-09-03 15:52:43 +02:00
Daniel Appelgren
e749857a57
Update .releaserc
2021-09-03 15:52:29 +02:00
Daniel Appelgren
8eb229a1e6
fix git repo name
2021-09-03 15:52:05 +02:00
Daniel Appelgren
c2caec0fd3
temporary disable test and lint for release
2021-09-03 15:49:51 +02:00
Erik Tiekstra
6f21b15f51
Small copy-changes
2021-09-03 13:53:43 +02:00
Erik Tiekstra
1fef2fe173
Removed some routes and renamed others
2021-09-03 12:01:29 +02:00
Erik Tiekstra
5ed4b79d9c
Commented code which should not be part of mvp
2021-09-03 11:24:22 +02:00
Erik Tiekstra
73595564f0
updated package-lock
2021-09-03 11:06:22 +02:00
Christian Gårdebrink
773d8f33ab
Merge pull request #74 in TEA/mina-sidor-fa-web from feature/TV-389 to develop
...
Squashed commit of the following:
commit a865f5452ae9cb5eab0b55080dd7e7ec43d9ed61
Merge: b4e5a9e d9938cc
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Fri Sep 3 10:25:38 2021 +0200
Merge branch 'develop-remote' into feature/TV-389
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.module.ts
commit b4e5a9ef26f99d0e0e8b2f8104f5e432da4bc82e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Fri Sep 3 02:43:51 2021 +0200
TV-389 removed some references to inputs that are no longer existing.
commit 04c1527a994d9c5479ebcd523261dd331beb093e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Sep 2 15:17:24 2021 +0200
TV-389 adjusted spelling error
commit 3ea3faf1b13fafc16d4a97a6fc748dc790d1bc41
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Sep 2 15:13:57 2021 +0200
TV-389 have adjusted a bunch of issues after feedback in PR
commit 9ced585dd830c19006ead3bfe5a52ae1467189ef
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Sep 2 10:55:55 2021 +0200
Merge branch 'develop-remote' into feature/TV-389
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/edit-employee-form/edit-employee-form.component.html
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts
commit eb873ecb2125574c624523818f0441acd0a1bb61
Merge: 8f896cb b80bf22
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Sep 2 10:35:44 2021 +0200
Merge branch 'develop-remote' into feature/TV-389
commit 8f896cbf156ea65fed95a19d17ef485d06046ed0
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Sep 1 18:19:16 2021 +0200
TV-389 making sure we're getting data of the right format
commit 801e0298781815c9b4ca78f900cda17fbf33ffb5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Sep 1 09:09:51 2021 +0200
TV-389 fixed old function name
commit 145e312d68e9a067377b228a718386dcf419ef49
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Sep 1 08:52:54 2021 +0200
TV-389 restored file
commit b1cf3b44bae548979fd090fca4e2194ae9c586c1
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Sep 1 08:47:30 2021 +0200
TV-389 cleaned up some console logs for testing and renamed a function
commit e9d79205902771eafeaf0fbe3bdb63e7cceeb0d5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Sep 1 08:30:08 2021 +0200
TV-389 have added a bunch of tests and refactored some stuff on the edit employee forms into a service.
commit 185b4597c303ff20ae079efdf9247a53615b627e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 15:00:50 2021 +0200
TV-389 made a first working version of the tree node selector
commit ddff1ed3a05434a42a81d4dabfd8b2f2ff3c468e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 13:01:49 2021 +0200
TV-389 adjustments after checking out integration against API.
commit 92117d54b248f00a8b0619c3200d20a06510d9ba
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 12:21:05 2021 +0200
TV-389 made various changes in prepertion for integration against the api..
commit 2f15741eb47335cfe4e8c47dc779642a8ab9893b
Merge: 062f42b 02cf0f6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 08:13:21 2021 +0200
Merge branch 'develop-remote' into feature/TV-389
commit 062f42b4d89976685fce463eec4f8deff399fd75
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 08:12:37 2021 +0200
TV-389 preparing for integration with api..
commit 674b636e4b32aa391e1e14763c5781fa25bc31fb
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 07:51:12 2021 +0200
TV-389 fixed some custom validators for utforandeverksamheter..
commit 07256654273e499b41cbb6b06e26b9ca4f7627c5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 05:39:27 2021 +0200
TV-389 removed useless z-index
commit 36b6ac2f6f846f5e88b393650c6d66821b600933
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 05:32:16 2021 +0200
TV-389 added styling to button for opening the panel.
commit 75ea6b7196e6ab69b0ec4ce103214dc742ea5252
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Tue Aug 31 03:23:10 2021 +0200
TV-389 minor adjustments of panel.
... and 13 more commits
2021-09-03 10:36:34 +02:00
Erik Tiekstra
d9938cc770
Fixed small typo
2021-09-02 15:46:08 +02:00
Erik Tiekstra
b7ff429db3
feat(employee): Added functionality to delete employees. (TV-352)
...
Squashed commit of the following:
commit 2602b9205ef86307fa7c85ecb6ce87cb51b71150
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 2 15:40:49 2021 +0200
Added error-handling
commit 4a3f79948b992e5ad7278328957380215ad21ed7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 2 14:48:54 2021 +0200
Removed some unused variables
commit f8e69dce84fee2b1fe2a06d6f0960511c286e2b5
Merge: b155865 b80bf22
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 2 14:39:44 2021 +0200
Merged develop and fixed conflicts
commit b15586559dab669d652d3a44625bacae4620ed40
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 2 14:34:58 2021 +0200
Added separate component for employee deletion
commit 1720b4954ebbc2868db6f0304fc57b0f3ff07216
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 31 07:50:56 2021 +0200
added the showing of errror- and succsess messages when employee is deleted (TV-352)
commit 2556d53802249fff545a2d256a178479103108e7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 30 13:33:22 2021 +0200
minor change (TV-352)
commit 035dbbe67486392a7a9c656ac73103e938953b24
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 30 12:38:07 2021 +0200
added close and open methods for better handling of modal (TV-352)
commit abc9ce0f8580ae1b9d784bc7591f095faeddcc33
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 30 12:27:07 2021 +0200
feat(edit-employee): added functionality to delete employee, and catch error if such exists
commit 23603dd2d84b0e694a19c2131c9c842cf730d97b
Merge: 56a4a6a 02cf0f6
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 30 11:19:18 2021 +0200
Merge branch 'develop' into feature/TV-352-add-delete-employee-button
commit 56a4a6a9c9195542f51578bd4ee937086ace8df8
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Aug 27 12:58:23 2021 +0200
added the basic http-delete request method
commit 2f61ff7d6ac2c42a7972fc88548d3d59172cbcc1
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Aug 27 09:18:13 2021 +0200
added the basic html/css and functionality for deleting an employee from edit-page
2021-09-02 15:42:03 +02:00
Erik Tiekstra
b80bf226a9
Fixed small flex-box issue
2021-09-02 08:27:02 +02:00
Erik Tiekstra
55e422d42c
Fixed package-lock
2021-09-01 15:09:56 +02:00
Erik Tiekstra
8927f7c4a4
Updated repository name
2021-09-01 15:06:59 +02:00
Erik Tiekstra
91d7e93fea
feat(personal): Added information regarding roles inside the dialog. (TV-498)
2021-09-01 15:02:57 +02:00
Erik Tiekstra
b9f4f904d2
Updated text according to sketches
2021-09-01 14:42:37 +02:00
Erik Tiekstra
b892c88cfa
Removed console.log
2021-09-01 13:42:19 +02:00
Erik Tiekstra
803422dbc5
Fixed some issues with invites mock-data and response from api
2021-09-01 13:39:01 +02:00
Erik Tiekstra
70ab2c3ee4
feat(deltagare): Added functionality to filter on only "My deltagare". (TV-405)
...
Squashed commit of the following:
commit f67c9cd63e51bdc84a7c9da4c66b413213c33117
Merge: 84f00ea 0753d39
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Sep 1 12:00:15 2021 +0200
Merge branch 'feature/TV-405' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into feature/TV-405
commit 84f00eab3e211a5102d7abc9902be523f2e5b450
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Sep 1 11:58:37 2021 +0200
Updated mock-api and removed some unused code
commit 0753d39b7bd51163ddf1d2cf91f39a84321e8bb2
Merge: 47c363f a4bc9aa
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se >
Date: Wed Sep 1 11:46:37 2021 +0200
Merge branch 'develop' into feature/TV-405
commit 14164ca7b01c0954d6f3efd441fef124a564edec
Merge: 47c363f a4bc9aa
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Sep 1 10:33:10 2021 +0200
Merge branch 'develop' into feature/TV-405
commit 47c363f6b984d1c46ed2f2bb054b3e541aa01cc3
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se >
Date: Sun Aug 29 19:14:43 2021 +0200
TV-405 cleanup
commit 241d67de57ffc5d83b1dfd8e00de9cad7a6b985a
Merge: 40f30ff eee20a3
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se >
Date: Sun Aug 29 18:54:55 2021 +0200
Merge branch 'develop' into feature/TV-405
# Conflicts:
# apps/mina-sidor-fa/src/app/shared/services/api/deltagare.service.ts
# mock-api/mina-sidor-fa/server.js
commit 40f30ff385022dcac88a8cd3046d01bcd92760bf
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se >
Date: Sun Aug 29 18:45:37 2021 +0200
TV-405 temporary empty 'mina deltagare' in mockapi until assign handledare is implemented
commit 9bdeefc57dcb7d409abb1d7fe88865392a1b7516
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se >
Date: Wed Aug 25 16:24:08 2021 +0200
TV-405 filter mina deltagare
2021-09-01 12:10:16 +02:00
Erik Tiekstra
a4bc9aa37c
Updated employees mock-api
2021-09-01 10:27:04 +02:00
Erik Tiekstra
e4f5802f97
Changes to some models and data coming from API
2021-09-01 10:26:05 +02:00
Aden Hassan
02cf0f6114
Merge pull request #70 in TEA/dafa-web-monorepo from feature/TV-227-se-behorigheter to develop
...
Squashed commit of the following:
commit 1ad19a85662f2187c9345b5ca19f6ffc3e1b833e
Merge: 60e4e46 03a9eb2
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 30 10:06:56 2021 +0200
Merge branch 'develop' into feature/TV-227-se-behorigheter
commit 60e4e467699de167b7170fb793f083554eed16f6
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Sun Aug 29 09:29:31 2021 +0200
removed some unneccacry console log code
commit a5099b4f22d7ef227a6068119c7ad204a760d7a0
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Sun Aug 29 09:15:18 2021 +0200
moved dialog box so that focus is on the open-dialog button when dialog is closed
2021-08-30 10:07:27 +02:00
Nicolas Fuentes Maturana
03a9eb2c65
Merge pull request #72 in TEA/dafa-web-monorepo from bugfix/TV-307 to develop
...
Squashed commit of the following:
commit 297b139869ab7bd1164b12e2cdc8cff32b7a77a4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Aug 30 09:19:43 2021 +0200
TV-307 changed http method to patch
2021-08-30 09:25:00 +02:00
Nicolas Fuentes Maturana
eee20a38b3
Merge pull request #67 in TEA/dafa-web-monorepo from feature/TV-386 to develop
...
Squashed commit of the following:
commit 3cf3d3cc0b6e69f0264779778ccd745a39017242
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 26 18:00:34 2021 +0200
fixed broken code after merge and re-instated old breadcrumb for edit-employee-page
commit 661c51a775474eee2dececd5af18831cbf11bd16
Merge: e0cbda6 1f26e80
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 26 15:46:06 2021 +0200
merged with the new changes in develop branch - resolved some merge conflicts
commit e0cbda6ccb61dc08e2f21c9bd695b35f99d2d696
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 26 09:07:08 2021 +0200
re-used previous method to select and remove tjanster from selectedTjanster list (TV-386)
commit 005ff68d23994c62b3abb2f8a3460229f8fe2dcc
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 26 08:57:46 2021 +0200
renamed service-related variables and methods to tjanst/tjanster in edit-employee component
commit 073db3b8d8f05f33f74df1717017ed2ebfa77b1d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 22:29:17 2021 +0200
removed experimental code (TV-386)
commit 83628b1e972350ad29ee6471043e073aa990622d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 22:26:29 2021 +0200
minor change to make code shorter (TV-386)
commit 709e317b22efb10aec67341584dbdfbe096a7b87
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 13:47:41 2021 +0200
added reset form default value after a service-tag is removed
commit 434020d7c64d7f9ab6bc1b324557c6c24ef8c519
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 13:39:11 2021 +0200
removed unused imports and files (TV-386)
commit a09bcc90f5e800e084731a64748752a8bebeda4f
Merge: f1885dd 0661d22
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 13:34:08 2021 +0200
Merge branch 'develop' into feature/TV-386
commit f1885dd194a0f8e39ed1654ae86e24b1a9ad8dd6
Merge: 93527ac 50a83f7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 07:25:58 2021 +0200
fixed conflict after mergeing in develop branch
commit 93527ac238cf4e282332abd8529b23bf4189019d
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 00:32:49 2021 +0200
finalized re-implementation of service selection
commit f69d090a56f87f6df1849222e097b7558a1dbe39
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 24 17:01:25 2021 +0200
re-writing code for editing roles some more
commit a95e01bc572b808d2a65efe4281813aba28fa340
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 24 16:32:22 2021 +0200
re-writing code for editing services
commit 6a0759e551f863af507b952b09f3ace965c97903
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 24 14:08:54 2021 +0200
fixed broken code and html and css to get roles-selection to work
commit cf3a75fb82c33c1081bd9645faac47bd3db1d33f
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 24 14:08:29 2021 +0200
fixed broken code and html and css to get roles-selection to work
commit 3f4d8ddba0a76c3079a028042318a948c39b7fe8
Merge: c305aff 59ce393
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Tue Aug 24 12:35:20 2021 +0200
merged in develope and added som fixes to broken code (TV-386)
commit c305aff00a0dedb7dc8988e80c85794331d58ce1
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 23 09:25:00 2021 +0200
re-arranged the breadcrumbs when visiting the edit-employee card (TV-386)
commit d73b6f97001a3ae36495dfebb14a554e23d1dff4
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 23 08:25:40 2021 +0200
minor corrections
commit 67f083bc31a5b7199eaf9d606e6cfb320b6a72e7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 23 07:52:45 2021 +0200
cleared unused imports (TV-386)
commit 95c59bab20f5fa088f650af83dbf7b447a141636
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Aug 23 07:31:27 2021 +0200
minor changes added (TV-386)
... and 3 more commits
2021-08-26 21:58:55 +02:00
Erik Tiekstra
1f26e80cb3
feat(avrop): Added additional functionality to avrop-flow. (TV-411)
...
Squashed commit of the following:
commit b174dd7480baa5e5e4b7f4bea4c9fc674d344c0c
Merge: e1f9d2d 0661d22
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 26 11:50:11 2021 +0200
Merged develop and resolved conflicts
commit e1f9d2d49e279e704b760a3cbe45941cdcfb81d9
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 26 11:41:45 2021 +0200
Now fetching handledare and patching through API
commit cc017fdc6eb5d9620399eee011341a0307fe5658
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 25 16:02:20 2021 +0200
Updated some functionality
commit 345712842c12af08dd4a956d0d2fdfd2592ab3de
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 25 15:32:22 2021 +0200
Implmented pagination and select all
commit 95f9be3fae6d3f3b258897be9b78f49442ee0747
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 25 13:03:41 2021 +0200
Renamed avrop-table instances to avrop-list and avrop-table-row to avrop-row
commit 5f1e11bff74c942e2c8b9e62892f043dc299f612
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 25 12:54:56 2021 +0200
Added some changes to mock-api related to parameter changes inside avrop
commit 71b199744a31b2a4b8bcaa6870094fd900851030
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 25 12:23:57 2021 +0200
added qp to avrop requests
commit dc0e34b4971ddfd3d683d482502439b961df8852
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 16:02:31 2021 +0200
Renamed multiple variablenames inside avrop-api
commit 8a4d5471cf637db7d90c6659c893f6841ec9c961
Merge: be9e9b3 50a83f7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 13:57:50 2021 +0200
Merged develop and fixed conflicts
commit be9e9b323aee76493b5035cd79f6058781ae4c1a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 13:27:16 2021 +0200
Moved around elements inside avrop component
commit 7ede2d00cd7ed105ef12be88e2ab788841329f00
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 09:34:57 2021 +0200
Moved around some components and other files to match project-structure
commit 7d1396216de643388a5690f2fa2733f127623b6c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 09:04:28 2021 +0200
Fixed issues with utforande verksamheter model and mock-data
commit 22baca18c25bd4ce8dcc713e91126214882cf017
Merge: 4ba3c1c 59ce393
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 08:56:02 2021 +0200
Merged develop and fixed conflicts
commit 4ba3c1ce9dac206602de9651a98aecfd5857a0e5
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 08:48:21 2021 +0200
Fixed issues with tjanst model and mock-data
commit 50d8c698778fa64cedd4249f6852715d038b450c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 08:40:25 2021 +0200
Fixed issues with kommun-model and mock-data
2021-08-26 13:46:17 +02:00
Nicolas Fuentes Maturana
0661d2209b
Merge pull request #66 in TEA/dafa-web-monorepo from feature/TV-406 to develop
...
Squashed commit of the following:
commit e6d9ed4bb24901433a126981d949e4085719a275
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 24 16:53:06 2021 +0200
TV-406 updated spec file, deleted inline style
commit dfd9ec31950a7f06ca8935452ff7d022da2685c1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 24 16:06:52 2021 +0200
TV-406 some html
commit 84e3e05b79c33209d04107c79df3a2600665cc0a
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 24 15:21:03 2021 +0200
TV-406 DeltagareReportComponent, routing created
2021-08-25 10:54:21 +02:00
Nicolas Fuentes Maturana
7dd5599c29
Merge pull request #64 in TEA/dafa-web-monorepo from bugfix/TV-410 to develop
...
Squashed commit of the following:
commit 8ce45d3a600ae3577f1e0764a6d65f6f087446d1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 25 09:59:34 2021 +0200
TV-410 review fix
commit 175bbc005bd383880999472b28a7b1c373911e4a
Merge: a65ba47 50a83f7
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 24 13:50:50 2021 +0200
Merge branch 'develop' into bugfix/TV-410
commit a65ba47364e5043feecf2634a143573ebb63ad0b
Merge: 6f574c8 59ce393
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Aug 24 13:46:11 2021 +0200
Merge branch 'develop' into bugfix/TV-410
commit 6f574c8264f0372147c32a6aa297bba2deb54775
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Aug 23 16:12:18 2021 +0200
TV-410 updated api request for invite employee
2021-08-25 10:01:07 +02:00
Erik Tiekstra
50a83f784d
feat(login): Now adding orgnr to all API requests. (TV-399)
...
Squashed commit of the following:
commit b0cc0cf07a4eeaf85c8fdfc111fee1898fa14185
Merge: be9d909 59ce393
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 13:42:09 2021 +0200
Merged develop and fixed conflicts
commit be9d909232326eb06221336a966fc40c7c88289d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 24 08:02:12 2021 +0200
Updated auth guard to remove localstorage data when user is not logged in
commit a4a182f565689a44e612b9353ae46514c1b439c7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 23 15:08:00 2021 +0200
Updated organization functionality to check if organization matches users organizations
commit c170245c2799118bbf7961e95d507885a0571de6
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 14:34:33 2021 +0200
Now saving organization instead of organization number
commit 7c19600f712f48c9c56ba797e4e281a82adcf72f
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 13:43:27 2021 +0200
Removed all headers from API requests from services
commit 7c243bafc63f0544e11f1fa8729a139615cb14c0
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 13:18:19 2021 +0200
Dynamically adding orgnr to interceptor
2021-08-24 13:43:03 +02:00
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 e6f8090
Author: WP\holno <nikola.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 b7c7b6b
Author: WP\holno <nikola.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 1e2d925
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 07:59:06 2021 +0200
Merge branch 'develop' into feature/TV-341-erik
commit eb310c10bdf0f4b60032bdda97df75c19bdbf447
Merge: 877b68b fae7d9a
Author: Erik Tiekstra <erik.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 d6e4666
Author: Erik Tiekstra <erik.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 ffeb372
Author: WP\holno <nikola.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
Christian Gårdebrink
d4447933f8
Merge pull request #60 in TEA/dafa-web-monorepo from bugs/TV-397 to develop
...
Squashed commit of the following:
commit 4213320a89111b3486ff799dbdd9b648a245fc00
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Fri Aug 20 09:27:04 2021 +0200
TV-397 tog bort metoder som fanns i två servicar.
commit 01195a0b2b5ea8da234c5e32692b51aff32b23e6
Merge: 6b5b1e9 1e2d925
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Fri Aug 20 09:24:01 2021 +0200
Merge branch 'develop-remote' into bugs/TV-397
commit 6b5b1e9fbad2c68ddbd38f0a3c5e183fc6a707c4
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 15:42:36 2021 +0200
TV-397 fixed bug that occurs if userService is brought in as a dependency before authentication is done.
2021-08-20 10:30:18 +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 ecb929a
Author: Aden Hassan <aden.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 ffeb372
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Aug 18 17:34:46 2021 +0200
Merge branch 'develop' into feature/TV-351
commit 69cae6f711c60959edff48709e2fa99ba4534c65
Merge: ed57d7d b7c7b6b
Author: fueno <nicolas.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 218e3d6
Author: fueno <nicolas.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
Erik Tiekstra
d6e46668e5
Fixed mock-api for single employee requests
2021-08-19 11:42:55 +02:00