Merge pull request #234 in TEA/mina-sidor-fa-web from feature/periodisk-redovisning-add-hours-to-activity to develop

Squashed commit of the following:

commit 01d637f78f28a68794ba4e8a12135f05fb91ddb7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Fri Oct 29 12:42:29 2021 +0200

    Added hours to PR incl. models

commit 8bea7c7ff17b80a2aa05416fd63d2bc697ba45a4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Fri Oct 29 11:57:59 2021 +0200

    wip
This commit is contained in:
Erik Tiekstra
2021-10-29 12:45:26 +02:00
parent 5b50bc407b
commit e52f499f45
10 changed files with 109 additions and 30 deletions

View File

@@ -2,6 +2,7 @@ export interface PeriodiskRedovisningActivityRequest {
id: number;
performedRemotely: boolean;
performedPhysically: boolean;
hours: number;
}
export interface PeriodiskRedovisningRequest {

View File

@@ -3,6 +3,7 @@ export interface PeriodiskRedovisningActivityResponse {
name: string;
performedRemotely: boolean;
performedPhysically: boolean;
hours: number;
}
export interface PeriodiskRedovisningResponse {
@@ -25,18 +26,21 @@ export function mockOnePeriodiskRedovisningResponse(): PeriodiskRedovisningRespo
name: 'Aktivitet 1',
performedRemotely: false,
performedPhysically: true,
hours: 25,
},
{
id: 19,
name: 'Aktivitet 2',
performedRemotely: true,
performedPhysically: false,
hours: 3,
},
{
id: 31,
name: 'Aktivitet 3',
performedRemotely: true,
performedPhysically: true,
hours: 2,
},
],
};

View File

@@ -5,6 +5,7 @@ export interface PeriodiskRedovisningActivity {
name: string;
performedRemotely: boolean;
performedPhysically: boolean;
hours: number;
}
export interface PeriodiskRedovisning {