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

Merge pull request #132 in TEA/mina-sidor-fa-web from feature/TV-591 to develop

Browse Source 
Squashed commit of the following:

commit 92501f038a2e9d43a62ee7ef606fe8ff95b3a994
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Mon Sep 27 10:06:56 2021 +0200

    updating models, services, api

commit bc9815f457ef4e80e40e3f0ea9f0f71d14cf5c65
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Mon Sep 27 07:07:34 2021 +0200

    updated html file

commit a5842fd33b9909679c091d7b2657eb7d8cd2e094
Merge: 1b51bf6 85242b0
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Mon Sep 27 06:56:01 2021 +0200

    Merge branch 'develop' into feature/TV-591

commit 1b51bf6c73e831b6b0f46c0b75b09c86f813b237
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Mon Sep 27 06:55:26 2021 +0200

    base structure done

commit fd0900411a0365d9c92337ab5ee7c8fae4282fe3
Merge: 4333891 9bedbd3
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Sep 23 16:44:11 2021 +0200

    Merge branch 'develop' into feature/TV-591

commit 43338914fa67d40357f68d20ef2d6fe0cb19e218
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Sep 23 16:43:42 2021 +0200

    formgroup and more

commit 96086b08b10ca785d3271e38e5cd81cade91acf0
Merge: d263f27 5846c2c
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Tue Sep 21 19:57:06 2021 +0200

    Merge branch 'develop' into feature/TV-591

commit d263f270c643cc0a8f36a1edb4f87813b1916eba
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Tue Sep 21 19:56:24 2021 +0200

    sÃparar filer innan merge

commit 4352b00d0eed60ea2703b5a3957a608ee053e8d3
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Mon Sep 20 10:58:12 2021 +0200

    updating to match other tasks

commit d51e22bc8a61e67cec711eb4915c3a381eb67aaf
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Sep 16 18:52:25 2021 +0200

    Created some base-structure
This commit is contained in:
Aden Hassan
2021-09-27 12:33:47 +02:00
parent 85242b0544
commit a7aa94e084
15 changed files with 362 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/mina-sidor-fa/src/app/shared/models/activity.model.ts
View File

@@ -1,23 +1,26 @@
import { ActivityResponse } from './api/activity-response.model';
export interface Activity {
id: string;
name: string;
activityId: number;
activityName: string;
description?: string;
subActivities: SubActivity[];
}
export interface SubActivity {
subId: string;
subName: string;
subDescription: string;
id: number;
subActivityName: string;
subActivityDescription: string;
}
export interface ActivityResponse {
id: number;
activityName: string;
description?: string;
subActivities: SubActivity[];
}
export function mapResponseToActivity(data: ActivityResponse): Activity {
const { aktivitets_id, aktivitets_namn } = data;
const { id, activityName, description, subActivities } = data;
return {
id: aktivitets_id,
name: aktivitets_namn
}
activityId: id,
activityName,
description,
subActivities,
};
}

11
apps/mina-sidor-fa/src/app/shared/models/gemensam-planering.model.ts Normal file
View File

@@ -0,0 +1,11 @@
export interface Activity {
activityId: string;
name: string;
description: string;
}
export interface SubActivity {
subActivityId: string;
name: string;
description: string;
}