Fetching activities to be able to show PR after submit
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
export interface PeriodiskRedovisningActivityResponse {
|
||||
id: number;
|
||||
name: string;
|
||||
performedRemotely: boolean;
|
||||
performedPhysically: boolean;
|
||||
hours: number;
|
||||
@@ -23,21 +22,18 @@ export function mockOnePeriodiskRedovisningResponse(): PeriodiskRedovisningRespo
|
||||
activities: [
|
||||
{
|
||||
id: 24,
|
||||
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,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { Activity } from './activity.model';
|
||||
import { PeriodiskRedovisningResponse } from './api/periodisk-redovisning.response.model';
|
||||
|
||||
export interface PeriodiskRedovisningActivity {
|
||||
@@ -16,7 +17,10 @@ export interface PeriodiskRedovisning {
|
||||
activities: PeriodiskRedovisningActivity[];
|
||||
}
|
||||
|
||||
export function mapResponseToPeriodiskRedovisning(data: PeriodiskRedovisningResponse): PeriodiskRedovisning {
|
||||
export function mapResponseToPeriodiskRedovisning(
|
||||
data: PeriodiskRedovisningResponse,
|
||||
allActivities: Activity[]
|
||||
): PeriodiskRedovisning {
|
||||
const { genomforandeReferens, period, hasOfferedLanguageSupport, hasOfferedJob, activities } = data;
|
||||
|
||||
return {
|
||||
@@ -24,6 +28,12 @@ export function mapResponseToPeriodiskRedovisning(data: PeriodiskRedovisningResp
|
||||
period,
|
||||
hasOfferedJob,
|
||||
hasOfferedLanguageSupport,
|
||||
activities,
|
||||
activities: activities.map(({ id, performedRemotely, performedPhysically, hours }) => ({
|
||||
id,
|
||||
name: allActivities.find(activity => activity.id === id).name,
|
||||
performedRemotely,
|
||||
performedPhysically,
|
||||
hours,
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user