arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature(Periodisk redovisning): Vy för periodisk redovisning (TV-797)

Browse Source 
Squashed commit of the following:

commit bca16a8546667a476fa67d33839d5dbe7d9ee1f4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 21 14:36:23 2021 +0200

    Update periodisk-redovisning-view.component.html

commit 4e9198e4841b6930eb14ff81af443500619eb363
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 21 12:56:38 2021 +0200

    handlingId

commit 196c26a52c58ee8808c890cb15277ae0668d725a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Oct 21 12:54:25 2021 +0200

    periodisk redovisning view

commit c62232079e7c5584fc9071b90514b6eea133755f
Merge: 84099116 8805c59a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 16:18:03 2021 +0200

    Merge branch 'develop' into feature/TV-797-periodisk-redovisning-view

    # Conflicts:
    #	apps/mina-sidor-fa/src/app/shared/models/api/periodisk-redovisning.response.model.ts
    #	apps/mina-sidor-fa/src/app/shared/models/periodisk-redovisning.model.ts

commit 84099116adf985ee6eb71b9b340eff7701505e9a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 15:56:40 2021 +0200

    wip

commit eee14a464fe2fe2a99074f0fe92eecfc92cd05fa
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 14:09:48 2021 +0200

    styling

commit b95bac31ac2b33b5c383a32f06ababf3e5f00245
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 13:35:03 2021 +0200

    Update periodisk-redovisning.validator.ts

commit aeda04cd6705e72b5621a3079904617322ce3036
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 13:34:15 2021 +0200

    Deltagaren har inte deltagit i några aktiviteter denna period checkbox

commit f6ee1ff62d5001e8319bfff04ceb6950ebce9cff
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 11:12:57 2021 +0200

    form validation and dialog done

commit 93e5345d13caf5ab25dc581d58efe92f85acb2dd
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 09:16:03 2021 +0200

    hidden checkboxes

commit 68c2f17ec8417ce5a0404d5b0c00e4800b738143
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Oct 20 08:19:01 2021 +0200

    Update app.module.ts

commit 2a1dfa6559b9b86839de8ddd1d8cd7c821a56b3a
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 19 21:56:22 2021 +0200

    form array with checkboxes done

commit 32f26800656d13d1c6c30b20c8187b20fda3c71c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 19 17:04:33 2021 +0200

    activity form array

commit db2974cfcca453390ebb4f637daf9d9064b527da
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 19 15:56:39 2021 +0200

    add radiobuttons

commit 2c4099b48337aaad1cb5b0cc4794ee94e6bb508c
Merge: 1ae24a90 25b12092
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 19 14:07:46 2021 +0200

    Merge branch 'develop' into feature/TV-771-periodisk-redovisning

commit 1ae24a905a6c915dcc7d5e3b0cf77a8b62b44d7c
Merge: 79e0cf39 794bbc9a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 19 10:14:29 2021 +0200

    Merge branch 'feature/TV-771-periodisk-redovisning' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/mina-sidor-fa-web into feature/TV-771-periodisk-redovisning

commit 79e0cf394055527ba09f0d1ae97ddc7c519f2236
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Oct 19 10:14:18 2021 +0200

    Updated periods

commit 794bbc9a71a0e638196d961ed8b3093de5a64e49
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Oct 19 09:30:24 2021 +0200

    Update package-lock.json

commit 56351afb1f92060b9f743233a69a785114a3ee96
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Oct 18 17:03:19 2021 +0200

    Update periodisk-redovisning-form.component.ts

commit 213e6c888a8e388381cf4370d2f5020987b29c4f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Oct 18 17:01:17 2021 +0200

    Update extract-avrop-periods.ts

... and 8 more commits
This commit is contained in:
Daniel Appelgren
2021-10-22 08:34:17 +02:00
parent 6d5a449323
commit cfde226f3d
14 changed files with 235 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/mina-sidor-fa/src/app/shared/models/api/periodisk-redovisning.response.model.ts
View File

@@ -1,7 +1,8 @@
export interface PeriodiskRedovisningActivityResponse {
activityId: number;
activityName: string;
id: number;
name: string;
performedRemotely: boolean;
performedPhysically: boolean;
}
export interface PeriodiskRedovisningResponse {
@@ -20,19 +21,22 @@ export function mockOnePeriodiskRedovisningResponse(): PeriodiskRedovisningRespo
period: '2021-10',
activities: [
{
activityId: 24,
activityName: 'Aktivitet 1',
id: 24,
name: 'Aktivitet 1',
performedRemotely: false,
performedPhysically: true,
},
{
activityId: 19,
activityName: 'Aktivitet 5',
id: 19,
name: 'Aktivitet 2',
performedRemotely: true,
performedPhysically: false,
},
{
activityId: 31,
activityName: 'Aktivitet 5',
id: 31,
name: 'Aktivitet 3',
performedRemotely: true,
performedPhysically: true,
},
],
};

5
apps/mina-sidor-fa/src/app/shared/models/periodisk-redovisning.model.ts
View File

@@ -1,9 +1,10 @@
import { PeriodiskRedovisningResponse } from './api/periodisk-redovisning.response.model';
export interface PeriodiskRedovisningActivity {
activityId: number;
activityName: string;
id: number;
name: string;
performedRemotely: boolean;
performedPhysically: boolean;
}
export interface PeriodiskRedovisning {

16
apps/mina-sidor-fa/src/app/shared/services/api/periodisk-redovisning.api.service.ts
View File

@@ -2,7 +2,6 @@ import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ErrorType } from '@msfa-enums/error-type.enum';
import { environment } from '@msfa-environment';
import { Params } from '@msfa-models/api/params.model';
import { PeriodiskRedovisningRequest } from '@msfa-models/api/periodisk-redovisning.request.model';
import {
mockOnePeriodiskRedovisningResponse,
@@ -11,7 +10,7 @@ import {
import { CustomError } from '@msfa-models/error/custom-error';
import { mapResponseToPeriodiskRedovisning, PeriodiskRedovisning } from '@msfa-models/periodisk-redovisning.model';
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
import { catchError, delay, map } from 'rxjs/operators';
@Injectable({
providedIn: 'root',
@@ -21,17 +20,8 @@ export class PeriodiskRedovisningApiService {
constructor(private httpClient: HttpClient) {}
public fetchPeriodiskRedovisning$(
periodStart: string,
periodEnd: string,
genomforandeReferens: number
): Observable<PeriodiskRedovisning> {
const params: Params = {
genomforandeReferens: genomforandeReferens.toString(),
periodStart,
periodEnd,
};
return of(mapResponseToPeriodiskRedovisning(mockOnePeriodiskRedovisningResponse()));
public fetchPeriodiskRedovisning$(handlingId: string): Observable<PeriodiskRedovisning> {
return of(mapResponseToPeriodiskRedovisning(mockOnePeriodiskRedovisningResponse())).pipe(delay(59));
// return this.httpClient
// .get<{ data: PeriodiskRedovisningResponse }>(`${this._apiBaseUrl}`, { params })
// .pipe(map(({ data }) => (data ? mapResponseToPeriodiskRedovisning(data) : null)));