diff --git a/src/app/pages/providers/providers-card/providers-card.html b/src/app/pages/providers/providers-card/providers-card.html index e9ec0c8..e5b0da9 100644 --- a/src/app/pages/providers/providers-card/providers-card.html +++ b/src/app/pages/providers/providers-card/providers-card.html @@ -2,6 +2,7 @@

Prestataire n°{{ provider().id }}

Prix : {{ provider().price }}

+

Type de Prestataire : {{ provider().providerType }}

@@ -15,7 +16,7 @@ Prix - + diff --git a/src/app/pages/staff/staff-add-form/staff-add-form.ts b/src/app/pages/staff/staff-add-form/staff-add-form.ts index a991294..56df90b 100644 --- a/src/app/pages/staff/staff-add-form/staff-add-form.ts +++ b/src/app/pages/staff/staff-add-form/staff-add-form.ts @@ -56,7 +56,7 @@ class StaffAddForm { profession: profession, email: email, f4T2NumberApproval: f4t2number, - f4T2ExpirationDate: f4t2expiration instanceof Date ? f4t2expiration.toISOString().split('T')[0] : f4t2expiration + f4T2ExpirationDate: f4t2expiration instanceof Date ? f4t2expiration : new Date(f4t2expiration) } try { diff --git a/src/app/pages/staff/staff-card/staff-card.html b/src/app/pages/staff/staff-card/staff-card.html index 8be06c6..09e0487 100644 --- a/src/app/pages/staff/staff-card/staff-card.html +++ b/src/app/pages/staff/staff-card/staff-card.html @@ -6,6 +6,7 @@

Email : {{ staff().email }}

N° F4T2 : {{ staff().f4T2NumberApproval }}

Expiration F4T2 : {{ staff().f4T2ExpirationDate }}

+

Niveau d'experience : {{ staff().experienceLevel}}

diff --git a/src/app/services/api/model/create-experience-level-dto.ts b/src/app/services/api/model/create-experience-level-dto.ts index 736fb08..20c17ba 100644 --- a/src/app/services/api/model/create-experience-level-dto.ts +++ b/src/app/services/api/model/create-experience-level-dto.ts @@ -11,5 +11,6 @@ export interface CreateExperienceLevelDto { label?: string | null; + staffId?: number | null; } diff --git a/src/app/services/api/model/create-history-of-approval-dto.ts b/src/app/services/api/model/create-history-of-approval-dto.ts index 156d083..25086df 100644 --- a/src/app/services/api/model/create-history-of-approval-dto.ts +++ b/src/app/services/api/model/create-history-of-approval-dto.ts @@ -12,5 +12,6 @@ export interface CreateHistoryOfApprovalDto { deliveryDate?: string; expirationDate?: string; + staffId?: number; } diff --git a/src/app/services/api/model/create-staff-dto.ts b/src/app/services/api/model/create-staff-dto.ts index 2e1ac8e..614f4b7 100644 --- a/src/app/services/api/model/create-staff-dto.ts +++ b/src/app/services/api/model/create-staff-dto.ts @@ -15,6 +15,6 @@ export interface CreateStaffDto { profession?: string | null; email?: string | null; f4T2NumberApproval?: string | null; - f4T2ExpirationDate?: string; + f4T2ExpirationDate?: Date | null; } diff --git a/src/app/services/api/model/get-experience-level-dto.ts b/src/app/services/api/model/get-experience-level-dto.ts index 160bbd3..c6fddc7 100644 --- a/src/app/services/api/model/get-experience-level-dto.ts +++ b/src/app/services/api/model/get-experience-level-dto.ts @@ -12,5 +12,6 @@ export interface GetExperienceLevelDto { id?: number; label?: string | null; + staffId?: number | null; } diff --git a/src/app/services/api/model/get-history-of-approval-dto.ts b/src/app/services/api/model/get-history-of-approval-dto.ts index 4455b00..5102b19 100644 --- a/src/app/services/api/model/get-history-of-approval-dto.ts +++ b/src/app/services/api/model/get-history-of-approval-dto.ts @@ -13,5 +13,6 @@ export interface GetHistoryOfApprovalDto { id?: number; deliveryDate?: string; expirationDate?: string; + staffId?: number; } diff --git a/src/app/services/api/model/get-provider-dto.ts b/src/app/services/api/model/get-provider-dto.ts index ebeb7d5..33ed302 100644 --- a/src/app/services/api/model/get-provider-dto.ts +++ b/src/app/services/api/model/get-provider-dto.ts @@ -13,5 +13,6 @@ export interface GetProviderDto { id?: number; price?: number; providerTypeId?: number; + providerType?: string | null; } diff --git a/src/app/services/api/model/get-staff-dto.ts b/src/app/services/api/model/get-staff-dto.ts index 231c9bc..b5a9c8b 100644 --- a/src/app/services/api/model/get-staff-dto.ts +++ b/src/app/services/api/model/get-staff-dto.ts @@ -17,5 +17,6 @@ export interface GetStaffDto { email?: string | null; f4T2NumberApproval?: string | null; f4T2ExpirationDate?: Date | null; + experienceLevel?: string | null; }