Merge branch 'develop'

# Conflicts:
#	package-lock.json

README.md

@@ -1,59 +1,16 @@
-# ApiLibraryFrontend
+# Projet 4
 
-This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 20.3.9.
+Voici le projet 4 
 
-## Development server
+## Membres
 
-To start a local development server, run:
+Carteron Mathieu
+Lallois Ily
+Barbier Gavin
 
-```bash
+## Objectif
-ng serve
-```
 
-Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
+Nous sommes responsable du développement du module dédié à la gestion des relations
-
+clients et prestataires pour Pyro-Fêtes. Ce module va devoir permettre de centraliser les
-## Code scaffolding
+informations sur les clients, les prestataires les artificiers et les différents contacts, de suivre
-
+les interactions, ainsi que garantir la conformité réglementaire.
-Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
-
-```bash
-ng generate component component-name
-```
-
-For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
-
-```bash
-ng generate --help
-```
-
-## Building
-
-To build the project run:
-
-```bash
-ng build
-```
-
-This will compile your project and store the build artifacts in the `dist/` directory. By default, the production build optimizes your application for performance and speed.
-
-## Running unit tests
-
-To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
-
-```bash
-ng test
-```
-
-## Running end-to-end tests
-
-For end-to-end (e2e) testing, run:
-
-```bash
-ng e2e
-```
-
-Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
-
-## Additional Resources
-
-For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

src/app/pages/customers/customers-card/get-all-customers-card.html

@@ -2,6 +2,7 @@
     <nz-card style="width:400px;" [nzActions]="[edit, delete]">
         <h2 style="text-align: center; font-weight: bold">Client n°{{ customer().id }}</h2>
         <p>Note : {{ customer().note }}</p>
+        <p> Type de client : {{ customer().customerType}}</p>
     </nz-card>
     <ng-template #edit>
         <nz-icon (click)="Edit()" nzType="edit" nzTheme="fill" />

src/app/pages/opportunities/opportunity-add-form/opportunity-add-form.ts

@@ -49,6 +49,9 @@ export class OpportunityAddForm {
     async submitForm() {
       if (this.communicationForm.invalid) return;
 
+      const raw = this.communicationForm.getRawValue();
+      console.log('contactId:', raw.contactId, 'type:', typeof raw.contactId);
+
       console.log(this.communicationForm.getRawValue())
       this.communicationPost.set(this.communicationForm.getRawValue())
 
@@ -63,7 +66,7 @@ export class OpportunityAddForm {
         calling: calling,
         email: email,
         meeting: meeting,
-        contactId: contactId
+        contactId: Number(contactId)
       }
 
       try {

src/app/pages/providers/providers-card/providers-card.html

@@ -2,6 +2,7 @@
     <nz-card style="width:400px;" [nzActions]="[edit, delete]">
         <h2 style="text-align: center; font-weight: bold">Prestataire n°{{ provider().id }}</h2>
         <p>Prix : {{ provider().price }}</p>
+        <p>Type de Prestataire : {{ provider().providerType }}</p>
     </nz-card>
     <ng-template #edit>
         <nz-icon (click)="Edit()" nzType="edit" nzTheme="fill" />
@@ -15,7 +16,7 @@
             <nz-form-item>
                 <nz-form-label nzSpan="5" nzRequired> Prix </nz-form-label>
                 <nz-form-control nzSpan="22" nzErrorTip="Ce champ est requis !">
-                    <input nz-input placeholder="Nom" formControlName="note">
+                    <input nz-input placeholder="Nom" formControlName="price">
                 </nz-form-control>
             </nz-form-item>
         </form>

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 {

src/app/pages/staff/staff-card/staff-card.html

@@ -6,6 +6,7 @@
         <p>Email : {{ staff().email }}</p>
         <p>N° F4T2 : {{ staff().f4T2NumberApproval }}</p>
         <p>Expiration F4T2 : {{ staff().f4T2ExpirationDate }}</p>
+        <p> Niveau d'experience : {{ staff().experienceLevel}}</p>
     </nz-card>
     <ng-template #edit>
         <nz-icon (click)="Edit()" nzType="edit" nzTheme="fill" />

src/app/services/api/model/create-experience-level-dto.ts

@@ -11,5 +11,6 @@
 
 export interface CreateExperienceLevelDto { 
     label?: string | null;
+    staffId?: number | null;
 }
 

src/app/services/api/model/create-history-of-approval-dto.ts

@@ -12,5 +12,6 @@
 export interface CreateHistoryOfApprovalDto { 
     deliveryDate?: string;
     expirationDate?: string;
+    staffId?: number;
 }
 

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;
 }
 

src/app/services/api/model/get-customer-dto.ts

@@ -13,5 +13,6 @@ export interface GetCustomerDto {
     id?: number;
     note?: string | null;
     customerTypeId?: number;
+    customerType?: string | null;
 }
 

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;
 }
 

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;
 }
 

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;
 }
 

src/app/services/api/model/get-staff-dto.ts

@@ -16,6 +16,7 @@ export interface GetStaffDto {
     profession?: string | null;
     email?: string | null;
     f4T2NumberApproval?: string | null;
-    f4T2ExpirationDate?: string;
+    f4T2ExpirationDate?: Date | null;
+    experienceLevel?: string | null;
 }