Merge branch 'feature/ConnectingApiToQuotationPage' into develop

src/app/components/quotation-form/quotation-form.html

@@ -1,4 +1,4 @@
-<form nz-form nzLayout="horizontal" [formGroup]="QuotationForm" (ngSubmit)="submitForm()">
+<form nz-form nzLayout="horizontal" [formGroup]="QuotationForm">
     <nz-form-item nz-flex>
         <nz-form-label nzSpan="9">
             Message du devis
@@ -18,15 +18,5 @@
             <input nz-input placeholder="Conditions de vente" formControlName="quotationConditionsSale">
         </nz-form-control>
     </nz-form-item>
-
-    <nz-form-item nz-flex>
-        <nz-form-label nzSpan="9" nzRequired>
-            Fournisseur
-        </nz-form-label>
-
-        <nz-form-control nzSpan="12">
-            <input nz-input placeholder="Fournisseur" formControlName="quotationProvider">
-        </nz-form-control>
-    </nz-form-item>
 </form>
 

src/app/components/quotation-form/quotation-form.ts

@@ -26,15 +26,4 @@ export class QuotationForm {
         quotationMessage: new FormControl<string>(null),
         quotationConditionsSale: new FormControl<string>(null),
     })
-
-    submitForm() {
-        // Pour annuler si le formulaire est invalide
-        if (this.QuotationForm.invalid) return;
-
-        // Pour obtenir la valeur du formulaire
-        console.log(this.QuotationForm.getRawValue())
-
-        // Pour vider le formulaire
-        this.QuotationForm.reset()
-    }
 }

src/app/components/quotation-table/quotation-table.html

@@ -1,22 +1,23 @@
-<nz-table #basicTable [nzData]="quotations" class="mr-7">
+<nz-table class="mr-7"
+          [nzData]="quotations()"
+          [nzLoading]="quotationsLoading()"
+          [nzFrontPagination]="false"
+>
     <thead>
     <tr class="text-center">
         <th>Numéro de Devis</th>
         <th>Message</th>
         <th>Conditions de vente</th>
-        <th>Fournisseur</th>
         <th>Produit</th>
         <th>Action</th>
     </tr>
     </thead >
     <tbody class="text-center">
-        @for (data of basicTable.data; track data) {
+        @for (quotation of quotations(); track quotation.id) {
             <tr>
-                <td>{{data.quotationId}}</td>
+                <td>{{quotation.id}}</td>
-                <td>{{data.quotationMessage}}</td>
+                <td>{{quotation.message}}</td>
-                <td>{{data.quotationConditionsSale}}</td>
+                <td>{{quotation.conditionsSale}}</td>
-                <td>{{data.Supplier}}</td>
-
                 <td>
                     <app-modal-button type="link" name="Voir les produits">
                         <div style="max-height: 400px; overflow-y: auto;">
@@ -31,25 +32,19 @@
                                 </tr>
                                 </thead>
                                 <tbody class="text-center">
-
+                                    @for (product of quotation.getQuotationProductDto; track product.productId) {
                                         <tr>
-                                            <td>{{data.quotationProductReference}}</td>
+                                            <td>{{ product.productReferences }}</td>
-                                            <td>{{data.quotationProductName}}</td>
+                                            <td>{{ product.productName }}</td>
-                                            <td>XX.XX€</td>
+                                            <td>Price ???</td>
-                                            <td>{{data.quotationProductQuantity}}</td>
+                                            <td>Quantité ???</td>
                                             <td>
                                                 <div style="justify-content: center; display: flex">
-                                                    <app-modal-nav nameIcon="edit" name="Modification du produit" class="cursor-pointer">
-                                                        <app-product-form></app-product-form>
-                                                    </app-modal-nav>
-                                                    <nz-divider nzType="vertical"></nz-divider>
-                                                    <div>
                                                     <nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700"/>
                                                 </div>
-                                                </div>
                                             </td>
                                         </tr>
-
+                                    }
                                 </tbody>
                             </nz-table>
                         </div>
@@ -57,12 +52,16 @@
                 </td>
                 <td>
                     <div style="justify-content: center; display: flex">
+                        <div>
+                            <nz-icon nzType="plus-circle" nzTheme="outline" class="cursor-pointer text-green-700" />
+                        </div>
+                        <nz-divider nzType="vertical"></nz-divider>
                         <app-modal-nav nameIcon="edit" name="Modification du devis" class="cursor-pointer">
                             <app-quotation-form></app-quotation-form>
                         </app-modal-nav>
                         <nz-divider nzType="vertical"></nz-divider>
                         <div>
-                            <nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700"/>
+                            <nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700" (click)="delete(quotation.id)"/>
                         </div>
                         <nz-divider nzType="vertical"></nz-divider>
                         <div>

src/app/components/quotation-table/quotation-table.ts

@@ -1,27 +1,13 @@
-import { Component } from '@angular/core';
+import {Component, inject, OnInit, signal} from '@angular/core';
 import {NzTableComponent} from "ng-zorro-antd/table";
 import {ModalButton} from "../modal-button/modal-button";
 import {ModalNav} from "../modal-nav/modal-nav";
 import {NzDividerComponent} from "ng-zorro-antd/divider";
 import {NzIconDirective} from "ng-zorro-antd/icon";
 import {QuotationForm} from "../quotation-form/quotation-form";
-import {ProductTable} from "../product-table/product-table";
+import {GetQuotationDto, QuotationsService} from "../../services/api";
-import {ProductForm} from "../product-form/product-form";
+import {NzNotificationService} from "ng-zorro-antd/notification";
-
+import {firstValueFrom} from "rxjs";
-interface QuotationInfo {
-    quotationId: number;
-    quotationMessage?: string;
-    quotationConditionsSale?: string;
-    quotationProduct: [
-        { quotationProductReference: string; },
-        { quotationProductName: string; },
-        { quotationProductQuantity?: number; },
-    ],
-    quotationProductReference: string;
-    quotationProductName: string;
-    quotationProductQuantity?: number;
-    Supplier?: string;
-}
 
 @Component({
     selector: 'app-quotation-table',
@@ -32,56 +18,50 @@ interface QuotationInfo {
         NzIconDirective,
         NzTableComponent,
         QuotationForm,
-        ProductForm
     ],
     templateUrl: './quotation-table.html',
     styleUrl: './quotation-table.css',
 })
 
-export class QuotationTable {
+export class QuotationTable implements OnInit {
-    quotations: QuotationInfo[] = [
+    private quotationsService = inject(QuotationsService);
-        {
+    private notificationService = inject(NzNotificationService)
-            quotationId: 101,
+    quotations = signal<GetQuotationDto[]>([]);
-            quotationMessage: 'Livraison urgente demandée',
+    quotationsLoading = signal<boolean>(false);
-            quotationConditionsSale: 'Paiement à 30 jours',
+
-            quotationProduct: [
+    async ngOnInit() {
-                { quotationProductReference: 'DLV-1000' },
+        await this.fetchQuotations();
-                { quotationProductName: 'Produit1'},
+    }
-                { quotationProductQuantity: 5 },
+
-            ],
+    async fetchQuotations() {
-            quotationProductReference: 'DLV-1000',
+        this.quotationsLoading.set(true)
-            quotationProductName: 'Produit1',
+
-            quotationProductQuantity: 5,
+        try {
-            Supplier: 'Fireworkssupplier&Co'
+            const quotations = await firstValueFrom(this.quotationsService.getAllQuotationEndpoint())
-        },
+            this.quotations.set(quotations);
-        {
+        } catch (e) {
-            quotationId: 102,
+            this.notificationService.error(
-            quotationMessage: 'Livraison standard',
+                'Erreur',
-            quotationConditionsSale: 'Payé d\'avance',
+                'Erreur de communication avec l\'API'
-            quotationProduct: [
+            )
-                { quotationProductReference: 'DLV-1001' },
+        }
-                { quotationProductName: 'Produit2'},
+        this.quotationsLoading.set(false)
-                { quotationProductQuantity: 6 },
+    }
-            ],
+
-            quotationProductReference: 'DLV-1001',
+    async delete(quotation:number) {
-            quotationProductName: 'Produit2',
+        try {
-            quotationProductQuantity: 6,
+            await firstValueFrom(this.quotationsService.deleteQuotationEndpoint(quotation))
-            Supplier: 'Fireworkssupplier&Co'
+            this.notificationService.success(
-        },
+                'Success',
-        {
+                'Suppression effectuée'
-            quotationId: 103,
+            )
-            quotationMessage: 'Livraison rapide',
+        } catch (e) {
-            quotationConditionsSale: 'Paiement à 15 jours',
+            this.notificationService.error(
-            quotationProduct: [
+                'Erreur',
-                { quotationProductReference: 'DLV-1003' },
+                'Impossible de supprimer la ligne'
-                { quotationProductName: 'Produit3'},
+            )
-                { quotationProductQuantity: 7 },
+        }
-            ],
+        await this.fetchQuotations();
-            quotationProductReference: 'DLV-1002',
-            quotationProductName: 'Produit3',
-            quotationProductQuantity: 7,
-            Supplier: 'Fireworkssupplier&Co'
     }
-    ];
 }
 

src/app/pages/quotation/quotation.html

@@ -1,8 +1,4 @@
 <div class="flex mt-2">
-    <app-modal-button type="primary" name="Créer un devis">
-        <app-quotation-form></app-quotation-form>
-    </app-modal-button>
-
     <div class="ml-95 w-150">
         <app-search></app-search>
     </div>