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:
@@ -2,6 +2,7 @@ export interface PeriodiskRedovisningActivityRequest {
|
||||
id: number;
|
||||
performedRemotely: boolean;
|
||||
performedPhysically: boolean;
|
||||
hours: number;
|
||||
}
|
||||
|
||||
export interface PeriodiskRedovisningRequest {
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
@@ -5,6 +5,7 @@ export interface PeriodiskRedovisningActivity {
|
||||
name: string;
|
||||
performedRemotely: boolean;
|
||||
performedPhysically: boolean;
|
||||
hours: number;
|
||||
}
|
||||
|
||||
export interface PeriodiskRedovisning {
|
||||
|
||||
Reference in New Issue
Block a user