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