Erik Tiekstra
19a3b05e5f
Removed a lot of unused models, services and enums
2021-10-06 12:51:12 +02:00
Nicolas Fuentes Maturana
41a3cc61bd
Merge pull request #134 in TEA/mina-sidor-fa-web from feature/TV-668-pr-activities-form to develop
...
Squashed commit of the following:
commit 25325c6ee86f294d7b0a5673a0643948e3a2a583
Merge: 71715ea5 ca32a1ed
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 17:22:02 2021 +0200
Merge branch 'develop' into feature/TV-668-pr-activities-form
commit 71715ea5215c680f655c0455a836c449fffac389
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 17:15:33 2021 +0200
minor changes
commit 6a0b64d587665444635b6f93f6932ef42f51c6ce
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 12:53:52 2021 +0200
re-added mistakenly removed line
commit 9c0a0d1261c2342309059681c128dacd9fe0c50c
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 12:42:33 2021 +0200
swiched over to actual types-model for activity and aDsubActivities
commit c50c7ca5b02f45b5c32776952e93e0943c843065
Merge: 7bfd9bf4 a7aa94e0
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 12:39:10 2021 +0200
fixed some merge conflicts
commit 7bfd9bf4d867f68e50fa9756e2904e39ce8cd944
Merge: 5268a2c0 85242b05
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 09:00:36 2021 +0200
resolved some merge conflicts
commit 5268a2c0c6ce940b2235d872f3dfaa2193380d12
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 08:48:43 2021 +0200
minor changes and removals
commit 02d43100c3760fb3620057d452026fb4f692e460
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Sun Sep 26 13:24:30 2021 +0200
remove empty space
commit 33a8884e41f03c84b3f825e6729e7dc007c5ebb8
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Sat Sep 25 22:37:36 2021 +0200
added changes to method to dynamically create activity fields
commit b049890a340afd35fc6af1ab5c77cb3ec94a6100
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Sep 24 14:07:25 2021 +0200
changes made to the mock api for the activities
commit e6aaf979cb83b716feea37bf68c110df4ea0599c
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Sep 24 12:58:06 2021 +0200
minor corrections
commit 2b38e18c77973057c804fb383a93b33af6656a75
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Sep 24 12:42:47 2021 +0200
created mock-data for getting activites and sub-activities
commit acfe8ab60b7f7bb4c9eb8b14ff7ca0c855b414f7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Fri Sep 24 11:46:10 2021 +0200
created basic structure of the periodisk redovisning form-object and relevant basic methods
commit 05865a5eec270bae8720abfd738f67df72d7d457
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 23:09:43 2021 +0200
added formcontrol for comments
commit 2e38dd70f4b03c9a6af86497124b5ee08999d21b
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 22:04:40 2021 +0200
minor addition
commit d56a76c600d8ff63187d958fc76af04e729d3aa0
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 22:01:55 2021 +0200
created for arrays for the fields that required it
commit 43026442c523ceb559f128ddec7a3d8dd39eed88
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 17:34:14 2021 +0200
created getters for formarrayfields
commit 0dc78842ba154b03c945a89adbe05d142eee0ac0
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 17:28:02 2021 +0200
created the activities form fields
commit c14807a5acb11140250066c7340acb54bc75dcf9
Merge: 8918360c ed840425
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 15:11:18 2021 +0200
Merge branch 'feature/TV-654-pr-form-base' into feature/TV-668-pr-activities-form
commit ed8404251283d896f8612cf43f3a2e3dc59015e1
Merge: 032e4501 14739fb9
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Sep 23 15:09:38 2021 +0200
Merge branch 'develop' into feature/TV-654-pr-form-base
... and 13 more commits
2021-09-27 17:25:25 +02:00
Aden Hassan
a7aa94e084
Merge pull request #132 in TEA/mina-sidor-fa-web from feature/TV-591 to develop
...
Squashed commit of the following:
commit 92501f038a2e9d43a62ee7ef606fe8ff95b3a994
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Mon Sep 27 10:06:56 2021 +0200
updating models, services, api
commit bc9815f457ef4e80e40e3f0ea9f0f71d14cf5c65
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Mon Sep 27 07:07:34 2021 +0200
updated html file
commit a5842fd33b9909679c091d7b2657eb7d8cd2e094
Merge: 1b51bf6 85242b0
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Mon Sep 27 06:56:01 2021 +0200
Merge branch 'develop' into feature/TV-591
commit 1b51bf6c73e831b6b0f46c0b75b09c86f813b237
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Mon Sep 27 06:55:26 2021 +0200
base structure done
commit fd0900411a0365d9c92337ab5ee7c8fae4282fe3
Merge: 4333891 9bedbd3
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Thu Sep 23 16:44:11 2021 +0200
Merge branch 'develop' into feature/TV-591
commit 43338914fa67d40357f68d20ef2d6fe0cb19e218
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Thu Sep 23 16:43:42 2021 +0200
formgroup and more
commit 96086b08b10ca785d3271e38e5cd81cade91acf0
Merge: d263f27 5846c2c
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Tue Sep 21 19:57:06 2021 +0200
Merge branch 'develop' into feature/TV-591
commit d263f270c643cc0a8f36a1edb4f87813b1916eba
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Tue Sep 21 19:56:24 2021 +0200
sÃparar filer innan merge
commit 4352b00d0eed60ea2703b5a3957a608ee053e8d3
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Mon Sep 20 10:58:12 2021 +0200
updating to match other tasks
commit d51e22bc8a61e67cec711eb4915c3a381eb67aaf
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Thu Sep 16 18:52:25 2021 +0200
Created some base-structure
2021-09-27 12:33:47 +02:00
Daniel Appelgren
68c5c8d4a8
feat(Deltagarlista): Lade till startdatum, slutdatum, avbrott samt Visa händelser, som öppnar en modal med en deltagares händelser (TV-606)
...
Squashed commit of the following:
commit 932d0ce27b416652e241803e04dd9e98c6ca5757
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Sep 22 08:17:56 2021 +0200
fix lint and fails
commit b988fb7dc443d336e1e572d1a1f2993f7ed8f43b
Merge: 7eb75ec 5846c2c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Sep 22 07:54:00 2021 +0200
Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns
commit 7eb75ec659a3a25386f76dd9aed1806fd603c35b
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Sep 22 07:53:54 2021 +0200
refactor
commit 3bfe1fe1d7d17f8ba3dcdc6d587d957ff584ef6c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 11:53:20 2021 +0200
Update deltagare-list-handelser-dialog.component.scss
commit 4c7275e24ca9fdf70fb26db8e67a747c2a26b825
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 11:51:08 2021 +0200
set dialog width to auto
commit 1feb3b6f5779a810881a7592325dd9f1bf33d490
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 11:43:51 2021 +0200
added captions to tables
commit 4b4137cd9ae8e4084ea6172119449d247c591c40
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 11:06:16 2021 +0200
Update server.js
commit 203609c380f2d47ce248b94ed06e0dfde293ef24
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 11:05:05 2021 +0200
full name in dialog heading
commit 265c38aefe8d1380c7cc0ae1b87a12d276671ced
Merge: e734ab5 2dd9d3d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 10:58:29 2021 +0200
Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns
commit e734ab5c6fe00923642da70dfe92cdbafc0f0c79
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 10:58:26 2021 +0200
formatting
commit 1a13a9fc6d9329e6b5d6fce7c77352ac75123a5a
Merge: aa1552d 91eeb1d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 10:49:07 2021 +0200
Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns
commit aa1552d0ad85b3213a0e062ee3f786849013566a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 21 09:33:10 2021 +0200
add colums to handelser
commit 584ecd2cb2b5265cc885dcab713582083dbe19bb
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 15:46:38 2021 +0200
fix test and lint
commit 890e741c69a6408a72ca7899cc5cd76eccbdb498
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 15:39:18 2021 +0200
add dialog and fix mock apis
commit fc8ee963619a8cd24e482c56180536219c83ec28
Merge: 422563b 8da6899
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 14:14:49 2021 +0200
Merge branch 'develop' into feature/TV-606-deltagarlista-add-columns
commit 422563b5ecc8cc923b2e6791b5c533913ae6e4bd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 13:01:45 2021 +0200
wip
commit 2d83fa6e8a4d7459e8661bf7036388021bec460e
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 11:26:38 2021 +0200
added columns to deltagare list
commit a9df57d4492ec3f08de8f20a3032c8a1a84fd8a4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 20 10:21:27 2021 +0200
wip
2021-09-22 08:19:25 +02:00
Nicolas Fuentes Maturana
a28bca739c
Merge pull request #105 in TEA/mina-sidor-fa-web from bugfix/TV-621 to develop
...
Squashed commit of the following:
commit b86ee7b9994b647c4ad7616ad0e989cffb2581af
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 12:26:13 2021 +0200
TV-621 deleted path from server.js, updated path name in generate
commit 4370d39e401021d6cde9f47d2da22078ce6fd626
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Fri Sep 17 17:14:47 2021 +0200
TV-621: updated mock data for avvikelserapporter
2021-09-20 13:52:55 +02:00
Nicolas Fuentes Maturana
1b281be531
Merge pull request #90 in TEA/mina-sidor-fa-web from feature/TV-407 to develop
...
Squashed commit of the following:
commit f4fe49b7e5602b7041573c70b85b22bd978d237b
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Sep 16 18:01:24 2021 +0200
TV-407 cleanup
commit 141cd9afa8d73e5ad4860456da926ad1468de874
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Sep 16 16:32:07 2021 +0200
TV-407 updated heading text
commit 2d778bd4dd7982e0736bc8c720a69499662a2164
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Sep 16 14:33:04 2021 +0200
TV-407 fixed run test issues, some refactoring
commit 9f4cc2c3ad2572eef80923ae465e4d2218acb0cc
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 18:51:58 2021 +0200
TV-407 removed afInvalid on timepicker
commit f10923c92ebab2c51593682de4748fc443699c28
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 17:54:49 2021 +0200
TV 407 service name
commit cdf02cd956e9f75d8415d525645a5d2ecbeb7e41
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 17:51:39 2021 +0200
TV-407 changed api service name to AvvikelseApiService
commit 0ebaddc235ba506aec7cf23ebf96c03cb7a0a79f
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 16:51:02 2021 +0200
TV-407 renaming service name to DeltagareAvvikelseService
commit 60e59881099c99a550b70e310930b1f708fa7f70
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 16:40:57 2021 +0200
TV-407 digi-ng timepicker, fixed some pr reviews comments
commit b80e79e915d3baa11d7850ddf9ef506b4dd1d1cd
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 15 01:42:42 2021 +0200
TV-407 restructoring files, some cleaning
commit 1c92ccefa2f3441c55fd4beacbf38b2ce465aee0
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Sep 14 14:54:53 2021 +0200
TV-407 refactoring, cleaning
commit 02904debb8f8dc70c817d2b18b79c0da1b9fd102
Merge: f1ad09a 2a37566
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Sep 14 11:51:31 2021 +0200
Merge branch 'develop' into feature/TV-407
commit f1ad09ac823a909b2d6503677314850235670838
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Sep 14 11:50:50 2021 +0200
TV-407 updating report-api service
commit 1f766fba089ac0e1f9bd3e00d2a7f81bb5b979e9
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Tue Sep 14 11:40:10 2021 +0200
TV-407 sorting franvaro, validating, cleaning
commit f153e574007dfcfe7a65cbd5034370ed31202a34
Merge: ff4011c 92272e4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 13 14:42:38 2021 +0200
Merge branch 'develop' into feature/TV-407
commit ff4011c86f1222c677b2d027ef479b2f82aff5e3
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 13 13:58:05 2021 +0200
TV-407 structoring code to reactive style, validation implemnted
commit 25f9debe6216a7bf0a3c6d9a59e6b4499699e380
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 8 22:46:33 2021 +0200
TV-407 changed file structure and renaming
commit 9f6f6d4a9f63698d7912668db542eefe285a3b83
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 8 20:11:20 2021 +0200
TV-407 conditions fixes
commit 29c1a9536f799795712ded15a3ac746b807f8f94
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 8 15:02:26 2021 +0200
TV-407 reactive error messages, sokandeId to model, cleaning
commit ba7a031b3e253cb05ecd1a96920bc8439884dec1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 8 09:17:16 2021 +0200
TV-407 setTimeout, timepicker condition
commit 2eb2c48bc89bc310d2b2e9de4e909fbb5f3bdcb4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Wed Sep 8 09:03:41 2021 +0200
TV-407 corrections
... and 34 more commits
2021-09-16 18:04:37 +02:00
Daniel Appelgren
52cd7ad6f4
fix: Fix mock-api login functionality
...
Squashed commit of the following:
commit 9022427d59290dfd2b08c4a076d6b0690d44d926
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Mon Sep 13 13:25:05 2021 +0200
Update mock-apis
2021-09-14 13:26:04 +02:00
Erik Tiekstra
ab042230f3
Updated avrop params to match API
2021-09-06 07:36:38 +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
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
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
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
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