Commit Graph
9 Commits
Author SHA1 Message Date
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
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
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
Nicolas Fuentes Maturana d4874d6cd5 Merge pull request #55 in TEA/dafa-web-monorepo from feature/TV-366 to develop
Squashed commit of the following:

commit 41f27ba3701d7b690e941f2038676218facaab84
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:40:44 2021 +0200

    TV-366 removed redundant import

commit f31d3d6545375e2c84254a60b9e072333fddaa80
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:38:41 2021 +0200

    TV-366 made a bunch of changes in accordance with the feedback from the current pull request.

commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5
Merge: 721b58e e712f2f
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Thu Aug 19 06:10:28 2021 +0200

    Co-authored-by: af-aden <af-aden@users.noreply.github.com>

commit 721b58e1767c465673cb817414e1410b403f5e60
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 10:16:40 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts
    #	apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts
    #	apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts

commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82
Merge: fbda233 218e3d6
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Wed Aug 18 09:41:54 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit fbda233782a0850edb5e23b50f0030486a15effe
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:50:08 2021 +0200

    TV-366 removing stored selected organization when logging out.

commit ed51909892cd92f180f6785635f85c735ec3f129
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:05:14 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

    # Conflicts:
    #	apps/dafa-web/src/app/shared/services/api/user.service.ts

commit 6a77f2497aec71d174c719d27c6d5c644ba53fed
Merge: 17f643d 6d29baa
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 19:04:22 2021 +0200

    Merge branch 'develop-remote' into feature/TV-366

commit 17f643d18abcbdbfe12a91a63179278d559fdba5
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Aug 17 17:35:59 2021 +0200

    TV-366 First version od organization-picker
2021-08-19 08:17:59 +02:00
Nicolas Fuentes Maturana 39cdcff53d Merge pull request #48 in TEA/dafa-web-monorepo from feature/TV-335 to develop
Squashed commit of the following:

commit 8135e484f44885875bd28dbb0cb7f89fdb7223fa
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Sat Aug 14 19:32:56 2021 +0200

    TV-335 refactoring validators

commit f85a832f9f3e7161380b4b204639a71129eee2fb
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Sat Aug 14 18:18:30 2021 +0200

    TV-335 refactoring

commit 81e03f9377ae3ea4d1e2a196d1074e2e620472b1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 17:51:33 2021 +0200

    TV-335 spelling

commit 8542d0d20743e6a6d777c083e3559416b96529bc
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 17:48:10 2021 +0200

    TV-335 review fixes

commit 07a5da0576d2d42f043b54cb655aac2070ab218c
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 13:22:15 2021 +0200

    TV-335 use digi layout gutters for margins

commit 9c99d78b10a4c7414d83005ba1847ddd5420d7f5
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 11:47:32 2021 +0200

    TV-335 added ChangeDetectorRef, refactoring submitForm

commit 21b4e3ca5d72b3cedfd0795ef2d924f3380d167b
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 11:09:40 2021 +0200

    TV-335 refactoring due to review comments

commit 9e389c7e67e56e9965453822c38c5fce44e99b35
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Aug 13 00:43:57 2021 +0200

    TV-335 refactoring

commit e3c98416bea1ff705b17bd5bdd85112cbff13c91
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 18:56:21 2021 +0200

    TV-335 invalidFormMessage

commit f3f54fc8c331b7b00a4ebef72e80e7fb56640985
Merge: e68eb7c 466abd1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 16:55:33 2021 +0200

    Merge branch 'develop' into feature/TV-335

commit e68eb7cb09aecb2252f542bece1228db453d3cf6
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 16:49:40 2021 +0200

    TV-335 email validator

commit eee201919eca8186e0864a69e5f80fd696e40b91
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 16:23:30 2021 +0200

    TV-335 post mock data api, notification alert

commit 46b185ad82ac5946ccfdf173a960fde7261e51bd
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 11:56:43 2021 +0200

    TV-335 prepare method for post request

commit 8b983fbf34ff39b6252cff9bfdc904d6aeeb3a46
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 11:54:25 2021 +0200

    TV-335 routing

commit 01bac9359100a22c3fafa482e828e88727c7ab29
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Thu Aug 12 11:53:30 2021 +0200

    TV-335 employee-invite component
2021-08-17 09:35:10 +02:00
Nicolas Fuentes Maturana d020c81519 Merge pull request #50 in TEA/dafa-web-monorepo from feature/TV-338 to develop
Squashed commit of the following:

commit e4a56f5e8afd00382810babfca258d31dbb30a15
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Aug 16 02:48:58 2021 +0200

    TV-338 lade in lite justeringar av mockAPI:et för att det ska gå att se om en användare har behörigheter eller inte i gränssnittet när man filtrerar listan

commit 52aacae80777358b2ffab8d03dc0664c974803dc
Merge: eacbb04 466abd1
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 13 06:21:16 2021 +0200

    Merge branch 'develop-remote' into feature/TV-338

commit eacbb04bf17b87970efa2cfd1f27372928c1ca93
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Fri Aug 13 06:20:42 2021 +0200

    TV-338 har lagt till en query-param i anropet för att hämta en lista av personal/anställda, får kolla med backend vad den bör heta. I formuläret finns den representerad som en checkbox.
2021-08-16 09:26:52 +02:00
Nicolas Fuentes Maturana 9c1f88e6a7 Merge pull request #44 in TEA/dafa-web-monorepo from feature/TV-292-corr to develop
Squashed commit of the following:

commit 37b6ae9db2c47886f453e6d58ddaf38b1e21baf4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Aug 11 18:09:43 2021 +0200

    TV-292-corr display tolkbehov in avrop-table-row
2021-08-11 18:11:26 +02:00
Nicolas Fuentes Maturana 327075bd73 Merge pull request #41 in TEA/dafa-web-monorepo from TV-292 to develop
Squashed commit of the following:

commit 936a5bbb0dcf8204fef864d5e6feafc1293159a9
Merge: 4bac607 1e41ab0
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Aug 11 11:43:01 2021 +0200

    Merge branch 'develop' into TV-292

commit 4bac607de89e7d2732337391961077dec3ef57a9
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Aug 11 09:50:57 2021 +0200

    TV-292 updated response due to database

commit e0da747dfe697c1f6b2a0e79a423c274e445be4d
Merge: ce4ed5e b621b72
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 11:47:09 2021 +0200

    Merge branch 'TV-292' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into TV-292

commit ce4ed5e95b918d056b7faf32c3afb5f52c2495fb
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 11:45:07 2021 +0200

    deleted property name

commit b621b7287652896e993dd21f0bb3f476c8184049
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 11:45:07 2021 +0200

    TV-292 changed property name to fullName

commit 4e50e005e17de0e641efcb0c839978c72bfe1d70
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 10:57:34 2021 +0200

    TV-292 pr review update

commit f9643c516d744a42c326512257422b2af74cbce6
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 10:38:33 2021 +0200

    corr

commit 0b60d0baa9d4979c67238ece600d55378b0cabb6
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Aug 10 10:35:30 2021 +0200

    TV-292 pr review updates

commit c5ca8a5eb2f320f54b54884a0a8fec14a40363b4
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Mon Aug 9 12:51:13 2021 +0200

    TV-292 changed mock data to api requests
2021-08-11 12:11:28 +02:00