Daniel Appelgren
e947ab4b39
feature(Slutredovisning): Formulär för att skapa och skicka in slutredovisning (TV-533)
...
Squashed commit of the following:
commit 5b427cdd62b881cc32d408beaf92f8e3c22a9bd4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Nov 12 09:24:18 2021 +0100
refactor
commit b51af1b25b573a3203f3dd7e8e1c3e1401f0d228
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Nov 12 09:20:58 2021 +0100
add yrke names
commit 1ed3a33fb997669bf1af0be52347b371af0177ba
Merge: 4d9d2522 0235f1f9daniel.appelgren@arbetsformedlingen.se >
Date: Fri Nov 12 07:40:48 2021 +0100
Merge branch 'develop' into feature/tv-533-Skapa-slutredovisning-2
# Conflicts:
# apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts
commit 4d9d25226fc3b91386832b1367edcf016d336c03
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Nov 11 16:34:24 2021 +0100
Fixed switch functionality inside slutredovisning model
commit cce93c169e39bba681e4e25f511fa42686134f97
Merge: b56ce52f 51ed2e84
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Nov 11 16:15:46 2021 +0100
Fixed conflicts and added deltid percent
commit 51ed2e841e00e8d7cea9225bd9cfeab8b783efbd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 14:49:40 2021 +0100
hide description on step 1 and 2
commit 269708be2f7fec84815b3e7f91e33d4c305b0846
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 14:04:59 2021 +0100
cleanup
commit 05df3acf97f6115ec15cd295c1ed12721592f867
Merge: 3c803f38 c6adc71fdaniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 13:47:22 2021 +0100
Merge branch 'develop' into feature/tv-533-Skapa-slutredovisning-2
commit 3c803f3883b23065c2e0c15f6946213e5972576b
Merge: c2724aa6 f332dd41daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 12:38:53 2021 +0100
Merge branch 'develop' into feature/tv-533-Skapa-slutredovisning-2
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-details/pages/deltagare-card/components/deltagare-tab-reports/components/reports-list/reports-list.component.ts
# apps/mina-sidor-fa/src/app/shared/enums/report-type.enum.ts
commit c2724aa654483001d48ca1c2d0a5bfc1b2552c89
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 12:22:05 2021 +0100
add loader
commit b97b45fb22260dbdc9f9792e027b7bda68150ead
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 12:09:09 2021 +0100
move formgroups to parent to persist stat
commit 37feaab19309777ef96fb70be62ede9e26498b89
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 10:43:53 2021 +0100
fix radiobuttons
commit 644b9fd6288589cc3a66ceb8beefb623345e4308
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 09:30:31 2021 +0100
.
commit 28875f21a381a966054523ff7ccb7df126b30120
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 08:20:07 2021 +0100
move submit logic to step3
commit eef52c39dd970abbedc413b4c348098e07abe036
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Nov 11 07:40:56 2021 +0100
submit button
commit 4d732240e0ff6196d827572ff865392d6aaa0a9c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Nov 10 12:47:43 2021 +0100
fix some bugs
commit 642cc2b24fd3a5def8abb9ae45595d101ccdcfb7
Merge: c4d53407 2dc56685daniel.appelgren@arbetsformedlingen.se >
Date: Wed Nov 10 12:24:18 2021 +0100
Merge branch 'develop' into feature/tv-533-Skapa-slutredovisning-2
commit c4d53407399d695f58e5a0be074d81bbc1b1cb21
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Nov 10 12:24:09 2021 +0100
wip
commit 808810699850e611ead2ee7ed1b728acc3d93dd5
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Nov 10 12:02:01 2021 +0100
slutredovisning
commit fa446717acc66e779ecdb87ba7a5b2224eeca9fe
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Wed Nov 10 11:00:44 2021 +0100
view for utbildning done
... and 64 more commits
2021-11-12 09:28:42 +01:00
Chingiz Esenbaev
b499a61a0d
Merge pull request #166 in TEA/mina-sidor-fa-web from bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande to develop
...
Squashed commit of the following:
commit 72fe0460be679ccbd89987a9a6b167c78cf1f950
Merge: 844a9447 3d941fddnikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Oct 6 10:21:33 2021 +0200
Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande
commit 844a9447e3729e5d75df68eba893ff12a5dcd32e
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Oct 6 10:21:26 2021 +0200
Amends
commit c601e1a02fa9b7976ee071e93b0c6623dd89588e
Merge: 9f979e12 5cee9695nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Oct 5 15:01:37 2021 +0200
Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande
commit 9f979e12243328cdf5fbb19ee178115dcffbda12
Merge: a16b6c27 07ec3c4anikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Oct 5 11:10:36 2021 +0200
Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande
commit a16b6c27d86f6c1442bc725485e5ebc1c532a6f5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Oct 5 11:03:36 2021 +0200
- Changed additional text to be more detailed and only accessible for screen-readers
- Created a mixin for screen-reader only (sr-only)
- reverted back accessibillity for selected organization for screen readers
commit 253c64998d7b3ab8415af35a3d27423c69980d75
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Oct 4 16:44:04 2021 +0200
Changed title to aria-labelledby
commit 9ef22ec8f861a90c49d30ad1b1ab6e76082168a9
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Oct 4 16:24:10 2021 +0200
Amends after PR
commit a5dc1afc4c2bed922ddb5dcb29ee2dc5a0e43318
Merge: 7577640e d139f750nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Oct 4 13:07:38 2021 +0200
Merge branch 'develop' into bugfix/TV-647-ikoner-utan-text-far-inte-vara-betydelsebarande
commit 7577640e80b4fc17be54d9fe9235abc3f1b792d4
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Oct 1 14:08:44 2021 +0200
Accessibility adaptation
2021-10-08 14:25:15 +02:00
Erik Tiekstra
19a3b05e5f
Removed a lot of unused models, services and enums
2021-10-06 12:51:12 +02:00
Daniel Appelgren
3dadf098ed
Merge pull request #163 in TEA/mina-sidor-fa-web from feature/TV-670 to develop
...
Squashed commit of the following:
commit 0e6ae5b651bd8f1bf57027749314d6ab3d7ea9d0
Merge: d02df112 b14922acchingiz.esenbaev@arbetsformedlingen.se >
Date: Fri Oct 1 09:52:20 2021 +0200
Merge branch 'develop' into feature/TV-670
commit d02df1126e9bc4c7ccc6c03eb2cc73b7cfb68947
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se >
Date: Fri Oct 1 09:51:56 2021 +0200
Ãandring i mockdata
2021-10-04 16:34:45 +02:00
Nicolas Fuentes Maturana
60ecf74ecb
Merge pull request #161 in TEA/mina-sidor-fa-web from bugfix/TV-716 to develop
...
Squashed commit of the following:
commit 2a993b14489c310ba4a561444c35ddf36495c1ea
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Thu Sep 30 15:32:46 2021 +0200
TV-716 updated path for orsaksKoder to reflect api
2021-09-30 15:38:51 +02:00
Daniel Appelgren
7f09017467
Merge branch 'next' into develop
2021-09-28 13:56:06 +02:00
Daniel Appelgren
be68be2846
feature(Deltagarlista): Ny kolumn "Effekt" i genomförandehändelser (TV-703)
...
Squashed commit of the following:
commit 4ee981be8779922ce12e4a3158a11186a8666ebe
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 28 13:34:03 2021 +0200
Ny kolymn under genomförandehändelser
2021-09-28 13:47:26 +02:00
Daniel Appelgren
de8931a87d
Merge pull request #148 in TEA/mina-sidor-fa-web from bugfix/TV-696-Telefonnummer-i-deltagarkortet-visar-undefined- to next
...
Squashed commit of the following:
commit be0b5ebe0fdb568e4264354010f147cd18deceee
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 28 11:29:03 2021 +0200
id ska vara genomforandeReferens
commit f5d294d827b5254e444e77ec389a9de2ce7ec25c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Tue Sep 28 09:39:09 2021 +0200
telefonnummer visas inte ifall något av landskod eller telefonnummer saknas
2021-09-28 11:54:49 +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 ca32a1edaden.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 a7aa94e0aden.hassan@arbetsformedlingen.se >
Date: Mon Sep 27 12:39:10 2021 +0200
fixed some merge conflicts
commit 7bfd9bf4d867f68e50fa9756e2904e39ce8cd944
Merge: 5268a2c0 85242b05aden.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 14739fb9aden.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
Erik Tiekstra
ca32a1ed08
Merge branch 'next' into develop
2021-09-27 15:37:42 +02:00
Erik Tiekstra
60f5cb047b
Fixed tests and lint
2021-09-27 15:37:33 +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 85242b0chingiz.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 9bedbd3chingiz.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 5846c2cchingiz.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
2d4849d9f1
Merge pull request #129 in TEA/mina-sidor-fa-web from feature/TV-606-corrections to develop
...
Squashed commit of the following:
commit 40fd52f67264a76a43c3567c3d56c939c02d19e9
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 13:35:03 2021 +0200
Update server.js
commit 7db635ff6264d21a8377369d0f3da08cb0d9e7bc
Merge: 48a4d19 f624369daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 13:30:53 2021 +0200
Merge branch 'develop' into feature/TV-606-corrections
commit 48a4d199eac9c416c73470d22b0200268d8d5816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 13:27:36 2021 +0200
fix comments
commit 8cf12e9a9a98c9686adc9133ab1128b7ec12fb6a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 11:25:41 2021 +0200
Update proxy.conf.api.json
commit 206f41f571b1f1df7e8f0a7583963d2abff4a150
Merge: 3c868a6 342102f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 11:23:38 2021 +0200
Merge branch 'feature/TV-606-corrections' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into feature/TV-606-corrections
commit 3c868a6fdf66039779162b5f2d1e188b62166df2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 11:10:17 2021 +0200
ändrade urler till apier och lade till felmeddelanden
commit 342102f40ea209d0418a4a0a46bb4966a188d816
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Fri Sep 24 11:10:17 2021 +0200
new api
2021-09-24 13:39:05 +02:00
Erik Tiekstra
62fb35ca7e
feat(deltagare): Implemented role-check and fetching data when needed. (TV-639)
...
Squashed commit of the following:
commit be46ec00569f3fa23a439d4fc40bfa8dd2f30ea7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Sep 24 10:18:33 2021 +0200
Fixed error-handling for deltagare
commit e18fe76f68f3894198887bf7fe8793dd34905674
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Sep 24 08:35:40 2021 +0200
Updated tests
commit c8fa577236c1e3a797046d884d91e12e2c1f2c4a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Sep 24 08:20:18 2021 +0200
Fixed styling and some functionality
commit bfdcaef5c01edbee584ec0a1c1704983578ff6e5
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Sep 23 16:00:10 2021 +0200
refactor
commit 5be380af3aaca3c158dcfb1d084e449558f4e720
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Sep 23 15:59:41 2021 +0200
Update deltagare-tab-reports.component.ts
commit 96c4e36f0ce1a1f607e67ec3a99f18a85221f1d3
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se >
Date: Thu Sep 23 15:34:27 2021 +0200
break up into several components. remove activeTab-observable etc
commit ce2145f09438240d786e58f60e286e6e6f8e7a29
Merge: afc3989 14739fberik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 23 14:05:05 2021 +0200
Merged develop and resolved conflicts
commit afc39892ea33d2e1add92b2d5cb0d9f23b963666
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 23 13:39:01 2021 +0200
Added handledare information to avrop-data and removed id from deltagare-card
commit 1f7454a3cb4af09d3fdcb60c1298677d01a5a64a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 23 12:59:47 2021 +0200
Implemented more logic inside component instead of service
commit 5af4a9a9f74707169892ce9fe02f7c93285f48cc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Sep 23 10:50:14 2021 +0200
Added part of role-check to be able to access deltagare-card
commit 7cf7c1d379583788e5fcbef5fff44b158d028f76
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Sep 22 15:07:40 2021 +0200
WIP
commit 8466394d617fa573663f3d199414354394d22b31
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Sep 22 11:42:32 2021 +0200
Moved around content for deltagare-card
2021-09-24 10:45:51 +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 5846c2cdaniel.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 2dd9d3ddaniel.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 91eeb1ddaniel.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 8da6899daniel.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
0e3b86c4f5
bugfix(avvikelserapport) updated mockdata id for FragorForAvvikelser /TV-621-fix
...
Squashed commit of the following:
commit bec61f1f373e9023eed3604e4f068b6050576639
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 15:26:35 2021 +0200
TV-621-fix updated id for FragorForAvvikelser
2021-09-20 15:28:29 +02:00
Nicolas Fuentes Maturana
43247476fd
Merge pull request #104 in TEA/mina-sidor-fa-web from feature/TV-541 to develop
...
Squashed commit of the following:
commit d3b644086cb124c86ed944c4e5c7dcfe2a37cfd8
Merge: 350fcea a28bca7nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 13:56:11 2021 +0200
Merge branch 'develop' into feature/TV-541
commit 350fcea2d3c625355b4f23bb3454060da274cb19
Merge: 5ddd03a ffc5a46nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 12:32:38 2021 +0200
Merge branch 'develop' into feature/TV-541
commit 5ddd03ac8a6fe422684463ab537879754ea67c9a
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 12:19:05 2021 +0200
TV-541 renaming service and model names
commit ce0ec535e2622faf0a057324716bd955b25918ad
Merge: 877e08a 77be903
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Mon Sep 20 10:15:00 2021 +0200
Merge branch 'feature/TV-542' into feature/TV-541
commit 877e08af6206911ddd6d9b119ae6ee2591be616b
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Fri Sep 17 16:39:59 2021 +0200
TV-541: api and state service for gp
commit 77be9034c95efe885602fcd9aa6a5a23664d5630
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se >
Date: Fri Sep 17 16:34:15 2021 +0200
TV-542: mock-data for gp
2021-09-20 13:56:35 +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 2a37566nicolas.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 92272e4nicolas.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
Erik Tiekstra
a3944cf311
Updated mock-api to serve with a little delay. Also added possibility to change the delay
2021-09-15 11:29:34 +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
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 ec7b4fcerik.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
ab042230f3
Updated avrop params to match API
2021-09-06 07:36:38 +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 b80bf22erik.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 02cf0f6aden.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
55e422d42c
Fixed package-lock
2021-09-01 15:09:56 +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 a4bc9aacecilia.varnava@arbetsformedlingen.se >
Date: Wed Sep 1 11:46:37 2021 +0200
Merge branch 'develop' into feature/TV-405
commit 14164ca7b01c0954d6f3efd441fef124a564edec
Merge: 47c363f a4bc9aaerik.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 eee20a3cecilia.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
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 1f26e80aden.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 0661d22aden.hassan@arbetsformedlingen.se >
Date: Wed Aug 25 13:34:08 2021 +0200
Merge branch 'develop' into feature/TV-386
commit f1885dd194a0f8e39ed1654ae86e24b1a9ad8dd6
Merge: 93527ac 50a83f7aden.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 59ce393aden.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 0661d22erik.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 50a83f7erik.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 59ce393erik.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
59ce393259
feat(employees): New component for utförande verksamheter and addresses inside employee card.(TV-361)
...
Squashed commit of the following:
commit f75e29597c13b5d9c4232631e5c396974c6470fa
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 16:25:12 2021 +0200
Added name to employees-list component for listing names of utförandeverksamheter as the response have changed so utforandeVerksamheter contains more then just the name.
commit a2665dc110243c3327bb4ee88099f7e19451456e
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:45:52 2021 +0200
Updated avrop.js to match new mock-api
commit 71ac0c85c73615d6a638670250d390d90a673051
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:28:26 2021 +0200
Reverted some changes after comparison with develop.
commit d96d3d6ae3390582d7a06a765b6667bf4733614a
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 12:17:43 2021 +0200
Added flag allaUtforandeVerksamheter to employee mock-api
commit 833c32a63fc18a67cde498fd0e976483cff8f047
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 23 11:47:38 2021 +0200
- Splitted out utförandeverksamheter from organizations.js to utforande-verksamhet.js which is included in employees.js
- Changed layout
- Prepared markup for all utforande verksamheter permission. Needs to be changed to mock-api data-value when we get it from backend.
commit 31d33010af049f8b3cf5ba7b7ea8e1f03cf38fb1
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 15:26:00 2021 +0200
Added name/organizationNumber
commit 1037098f67ad9bfd4400a2b0de1daf7e969b378d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 13:56:24 2021 +0200
Utforande verksamheter amends to work with changed api settings
commit 436440fe3a8f2170029a4d7b418f10741e9e233a
Merge: 5cbb694 e6f8090nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 11:31:59 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts
# apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts
# apps/mina-sidor-fa/src/app/shared/models/api/employee.response.model.ts
# apps/mina-sidor-fa/src/app/shared/models/employee.model.ts
# apps/mina-sidor-fa/src/app/shared/services/api/authentication.service.ts
# apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts
# apps/mina-sidor-fa/src/app/shared/services/api/user.service.ts
# mock-api/mina-sidor-fa/scripts/employees.js
# mock-api/mina-sidor-fa/scripts/generate-api.js
# mock-api/mina-sidor-fa/scripts/tjanster.js
# mock-api/mina-sidor-fa/server.js
commit 5cbb694bb5b836f3826f7dadae300a0f7feba80f
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 11:19:02 2021 +0200
Reference name changes
commit 387451b3168a101f94f2b49470521d74a4f30e65
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 20 10:42:56 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html
# mock-api/mina-sidor-fa/scripts/employees.js
commit c7d31f6f926e52be9b5c4aec59eafd4d22d36e00
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 16:09:20 2021 +0200
Renamed organization to utforandeVerksamhet and changed referenses.
commit 12d9f49f56d658da6a2082af46091eeb48b6031f
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 15:57:08 2021 +0200
Utforande verksamheter cards created
commit e88962cd20394b54bad9904258d6876230d60f51
Merge: 5211885 b7c7b6bnikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 11:04:14 2021 +0200
Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget
commit 52118858f20f7f63812cec44641753f1760e2300
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 10:58:40 2021 +0200
Updated mock-api
commit 63da7e7f4cfc1b7cbd721899300357694103900b
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Aug 17 10:28:57 2021 +0200
SKapat upp komponent
2021-08-24 08:53:11 +02:00
Erik Tiekstra
e6f80901ea
feat(employee): Showing employee-data inside employee-card page. (TV-341)
...
Squashed commit of the following:
commit 4fd71e0d0655a0d75dda59151ac74e2361f187bc
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 10:59:46 2021 +0200
Updated RoleEnum and mock-data för roles
commit f05a93239727ce1245650ece3b48cf75dc7091ca
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 08:34:20 2021 +0200
Fixed issue with mock-api
commit c31e94da6b90e442fd84c5113789db245be81c6d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 08:26:14 2021 +0200
Fixed issue with tjanster
commit a183a08f0446cdaea7d01c8935d88ac436b0438f
Merge: eb310c1 1e2d925erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 07:59:06 2021 +0200
Merge branch 'develop' into feature/TV-341-erik
commit eb310c10bdf0f4b60032bdda97df75c19bdbf447
Merge: 877b68b fae7d9aerik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 20 07:21:39 2021 +0200
Merged develop and fixed conflicts
commit 877b68b8827e89cfd230856c9d8247f1cd8db264
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 15:01:55 2021 +0200
Now fetching tjanster from mock-api
commit 1ecd26595b21ea46ce6fb0c193c6642f66250ae3
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 14:24:11 2021 +0200
Some more changes to employee-card
commit e42ae254e7aa7b994627fdccb7037493b116d6a2
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 13:44:23 2021 +0200
Added new enum Role and fixed some issues mapping roles inside employee-card
commit 7801831d83feae5ef5e5b92e6421b18863b2a1db
Merge: c78f3f8 d6e4666erik.tiekstra@arbetsformedlingen.se >
Date: Thu Aug 19 12:37:56 2021 +0200
Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss
commit c78f3f886752477d2dbc4af20356252af4128440
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Thu Aug 19 11:19:56 2021 +0200
Authorization
commit 9c043720a9cfa5fd6943013f643d948a50c8f135
Merge: 77d6a9c ffeb372nikola.holst-nikolic@arbetsformedlingen.se >
Date: Thu Aug 19 11:19:43 2021 +0200
Merge branch 'develop' into feature/TV-341-fe-anpassa-personal-kortet-sa-att-den-ar-enligt-skiss
# Conflicts:
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss
# apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.module.ts
# apps/mina-sidor-fa/src/app/shared/enums/employee-authorization.enum.ts
commit 77d6a9c600e6b42e97fa5431ed37ad430c5febd3
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 18 10:22:45 2021 +0200
Moved subscription, added icons, refactured markup
commit b43c18e28b5aabb8115fa659a98b4ae8c0a7bf40
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Tue Aug 17 10:50:02 2021 +0200
unsubscribed
commit 9f48cddc75872fc3f740c53de998cd54666b0b1d
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 16 16:40:08 2021 +0200
Unsubscription behöver läggas till efter genomgång av hur unsubscribeOnDestroy fungerar
commit b2cef346f18482e72c11c09d0a6e629370d01bd5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Mon Aug 16 16:37:13 2021 +0200
Authorization
commit 5fe0b5d5fc725551f9e794cbaa70dc0f077f8717
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 13 15:46:50 2021 +0200
- Changed first h2 to h3
- Changed link to routerLink
commit fd1cb3c6249535ce84e61df035cae63352b1b00b
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Fri Aug 13 11:53:36 2021 +0200
Amends after PR
commit 13e9881e3680bd829736205b3fef57b2228638d5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se >
Date: Wed Aug 11 16:19:36 2021 +0200
Employee-card amends to look more like the sketch.
2021-08-20 11:01:23 +02:00
Erik Tiekstra
1e2d925d27
Made some changes to the mock-api
2021-08-20 07:57:27 +02:00
Christian Gårdebrink
fae7d9ad8c
Merge pull request #59 in TEA/dafa-web-monorepo from feature/TV-244 to develop
...
Squashed commit of the following:
commit b8ea6da64b2fbdc1bbc0d7546c6ce859ce6981cd
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 15:17:39 2021 +0200
minor changes to get correct employee data from mock-api
commit 715eff33a8f3cccd7ddce8bd32996190dc6597f3
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 15:05:26 2021 +0200
minor changes and added employee email to mock-data (TV-244)
commit 454641e1fd486e4aee271d63406a28f47c299b45
Merge: f5e0950 ecb929aaden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 14:52:39 2021 +0200
merged with develop and fixed conflicts (TV-244)
commit f5e0950da2de0465fb6eaee39a0e1c13b1c52281
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 13:31:01 2021 +0200
flyttat över grundstrukturen till edit-employee-form componenten
commit bcce2e41646b45c65929d057248b6767a832d807
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 12:42:12 2021 +0200
pre-populated email-input and minor changes to employee model and moch-api
commit 088ed6efb0cebdea86d25094ca1fd55827f938d2
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 11:12:57 2021 +0200
TV-244 small adjustments.
commit be17adf5d898b42467a557832e728ca3827f58d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 10:43:26 2021 +0200
TV-244 extended emplyee authorizations to a list with two random authorizations.
commit cc57a6d2ceae4069d48aa670a6fea95c21ebd628
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se >
Date: Thu Aug 19 10:25:42 2021 +0200
minor changes and re-wrote the mock-api to similar data for authorizations and employee-auth
commit 0a22b310729e2a359aa9f1c9d475ac875b6b2301
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Thu Aug 19 05:37:05 2021 +0200
TV-244 wip
commit 0e80b5bc4ac14b74f1a8c58ec257ca1f6453e119
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se >
Date: Wed Aug 18 17:14:48 2021 +0200
TV-244 WIP
2021-08-19 15:56:00 +02:00
Erik Tiekstra
d6e46668e5
Fixed mock-api for single employee requests
2021-08-19 11:42:55 +02:00
Erik Tiekstra
aa55ee80f4
Fixed issue with sorting
2021-08-18 14:55:41 +02:00
Erik Tiekstra
456f305f0e
Fixed employees without roles filter
2021-08-18 14:51:28 +02:00
Erik Tiekstra
5bb81c3bd4
feat(employee): Matched models to the API and adjusted mock-api. (TV-346)
...
Squashed commit of the following:
commit 0f10a7864960cae47694212042f9d58053b05a0c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 14:13:15 2021 +0200
Changed tjanst and utforandeVerksamhet to plural
commit 3ffe861d8721692d0b49b0f333f2f52186b23560
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 12:26:43 2021 +0200
Updated fetching single employee in mock-api
commit ae101885a90367b86b77faadaa171816aa2ffcaa
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 12:23:28 2021 +0200
Changed models for employees and fixed mock-api
2021-08-18 14:16:17 +02:00
Erik Tiekstra
218e3d6b36
Fixed models and services to match deltagare response from api
2021-08-18 08:21:29 +02:00
Erik Tiekstra
9f86fb405b
feat(deltagare): Added deltagare list with data from api. Also adjusted mock-api to match the api. (TV-309)
...
Squashed commit of the following:
commit 41560491305b61ba322fa653788411de6112cc7e
Merge: a157e69 03a2c7aerik.tiekstra@arbetsformedlingen.se >
Date: Wed Aug 18 07:23:35 2021 +0200
Merged develop and fixed conflicts
commit a157e69d6b4b18c9b8a806c4bbbc264b8b311b67
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 13:54:29 2021 +0200
Removed console.log
commit 87a532eb63b9c68109a4f847cc9530a47a56b648
Merge: db2ff17 6d29baaerik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 13:52:54 2021 +0200
Merged develop and fixed conflicts
commit db2ff1758218c651cadf93de8ce0c5034d6994d3
Merge: 588adee 01dc4b3erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 13:09:33 2021 +0200
Merged develop and fixed conflicts
commit 588adee5b17aeefcaf526aabdde02ca975c9c031
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 11:11:57 2021 +0200
Added deltagarlist
commit a0c378a8221a5d363f56ee644b9728d873ae1ff1
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Mon Aug 16 07:19:49 2021 +0200
Updates after PR
commit 479df238c712e2e14829d33b468ece91332f81c8
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 13 15:18:23 2021 +0200
Updated tolkbehov inside deltagare-card
commit df95ae2a8afbcc78ba546472ae9c1db141d1e642
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Fri Aug 13 15:14:27 2021 +0200
Updated deltagare-kort after discussion with UX
2021-08-18 07:24:53 +02:00
Erik Tiekstra
03a2c7a42f
refactor(project): Renamed all instances of dafa to msfa or mina-sidor-fa. (TV-379)
...
Squashed commit of the following:
commit d3f52ff6876f6e246c7d3c188e56cc2370289341
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se >
Date: Tue Aug 17 14:10:38 2021 +0200
Renamed all dafa instances to msfa
2021-08-18 07:10:28 +02:00
