mina-sidor-fa-web

Files

Nicolas Fuentes Maturana 132aba21d8 Merge pull request #180 in TEA/mina-sidor-fa-web from feature/TV-565-report-signal-arbete-studier to develop

Squashed commit of the following:

commit 6331ed75b007f97f46d92584b55ca8c358fb9dd0
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 13:13:48 2021 +0200

    TV-565 hide link, update routing

commit d5b08ef9f7e3e896b19c765ccb6cbd65b4ed2754
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 12:42:43 2021 +0200

    TV-565 deleted unused method

commit 6e6095130c01ce2b6a978e06cb1b1a6ccb362ce0
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 12:34:21 2021 +0200

    TV-565 refactoring signal report

commit 5a4452ed88554ce5e462d53222889c5535802208
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 11:28:19 2021 +0200

    TV-565 corrected format date

commit 2983df1c7af82d6495b7fb5cca92ed7398e52d63
Merge: fa36a821 3321e04a
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 09:12:35 2021 +0200

    Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier

commit fa36a8210951cd495895f6ae8df30f397ea35cad
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Fri Oct 8 09:12:02 2021 +0200

    TV-565 refactoring validation, cleaning scss

commit 33076ba5e3dd136324d89d03feee0ad6ed094625
Merge: 1f3d5cf8 890573b1
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 17:32:50 2021 +0200

    Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier

commit 1f3d5cf8bd16376e8d798d00261c72c4db462280
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 13:44:33 2021 +0200

    TV-565 refactoring, send in avrop to report layout

commit 2a79f44202a5e1db7ba6d0564be708f535ebe8f0
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 11:27:03 2021 +0200

    TV-565 updated spec files

commit 3ae4a3d50f5b9d6d24c491cda47992960c7b744c
Merge: d606ef90 3d941fdd
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 11:13:35 2021 +0200

    Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier

commit d606ef90f44d4d27b8588f51d1717732545deb0d
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 11:08:31 2021 +0200

    TV-565 fixed validation

commit 9d733ab4868d85a5756e45023e8efe4a10623e29
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Wed Oct 6 09:12:39 2021 +0200

    TV-565 max, min dates, text updates, part time utbildning

commit b3e479b84bd5622be2d4e2b44648560c8731c92a
Merge: b95dd0d9 5cee9695
Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se>
Date:   Tue Oct 5 23:23:01 2021 +0200

    Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier

commit b95dd0d96e5d10415a145925904565ed7bfb12a3
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Fri Oct 1 16:34:15 2021 +0200

    TV-565 fix according to PR comments

commit 99c3e6f7cea6edf44684dd2ee3011c8911c6645e
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 13:06:22 2021 +0200

    TV-565 remove file

commit 273a93d2d074b2fafaa14c6d3ef5f51fdbb62a22
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 12:56:33 2021 +0200

    TV-565 cleanup

commit 2a2237505d14ed15add4c623afb7705f29e0069c
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 12:43:00 2021 +0200

    TV-565 solved merge conflicts

commit e3357510ab62b27327716b160daf626c9d399251
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 10:09:32 2021 +0200

    TV-565 mergekonflikter

commit 46421470a560123d3ad9ee5c64fea564cfb4cc8b
Merge: 62e23180 6147a2e7
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 10:04:50 2021 +0200

    Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.ts
    #	apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/deltagare-avvikelse/deltagare-avvikelse.component.html
    #	apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.html
    #	apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.ts
    #	apps/mina-sidor-fa/src/app/pages/deltagare/shared/report-layout/report-layout.component.scss

commit 62e2318092a978e59147fa18e80a0c5d1a25d0f8
Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se>
Date:   Thu Sep 30 09:50:58 2021 +0200

    TV-565 fix shared report layout progress

... and 15 more commits