diff --git a/src/app/components/quotation-form/quotation-form.html b/src/app/components/quotation-form/quotation-form.html index f491c1d..0aab894 100644 --- a/src/app/components/quotation-form/quotation-form.html +++ b/src/app/components/quotation-form/quotation-form.html @@ -1,16 +1,6 @@
- Quantité - - - - - - - - - ID Devis @@ -30,7 +20,7 @@ - + Conditions de vente @@ -40,112 +30,12 @@ - - ID Produit + + Fournisseur - - - - - - - Référence produit - - - - - - - - - - Nom du produit - - - - - - - - - - Durée produit - - - - - - - - - - Calibre produit - - - - - - - - - - Numéro d'approbation - - - - - - - - - - Poids produit - - - - - - - - - - NEC Produit - - - - - - - - - - Image produit - - - - - - - - - - Lien produit - - - - - - - - - - Quantité minimale - - - - +
diff --git a/src/app/components/quotation-form/quotation-form.ts b/src/app/components/quotation-form/quotation-form.ts index 234c0e3..b62a3fe 100644 --- a/src/app/components/quotation-form/quotation-form.ts +++ b/src/app/components/quotation-form/quotation-form.ts @@ -16,29 +16,16 @@ import {NzDatePickerComponent} from "ng-zorro-antd/date-picker"; NzColDirective, NzFlexDirective, NzFormDirective, - ReactiveFormsModule, - NzDatePickerComponent + ReactiveFormsModule ], templateUrl: './quotation-form.html', styleUrl: './quotation-form.css', }) export class QuotationForm { QuotationForm: FormGroup = new FormGroup({ - quantity: new FormControl(null, [Validators.required]), quotationId: new FormControl(null), quotationMessage: new FormControl(null), quotationConditionsSale: new FormControl(null), - productId: new FormControl(null), - productReferences: new FormControl(null), - productName: new FormControl(null), - productDuration: new FormControl(null), - productCaliber: new FormControl(null), - productApprovalNumber: new FormControl(null), - productWeight: new FormControl(null), - productNec: new FormControl(null), - productImage: new FormControl(null), - productLink: new FormControl(null), - productMinimalQuantity: new FormControl(null) }) submitForm() { diff --git a/src/app/components/quotation-table/quotation-table.html b/src/app/components/quotation-table/quotation-table.html index e6c4ef3..17ff897 100644 --- a/src/app/components/quotation-table/quotation-table.html +++ b/src/app/components/quotation-table/quotation-table.html @@ -1,12 +1,11 @@ - ID Devis - Nom du produit - Quantité + Numéro de Devis Message Conditions de vente - Détails produit + Fournisseur + Produit Action @@ -14,27 +13,31 @@ @for (data of basicTable.data; track data) { {{data.quotationId}} - {{data.productName}} - {{data.quantity}} {{data.quotationMessage}} {{data.quotationConditionsSale}} + {{data.Supplier}} + + - +
- - - - - - - - - - - - + + + + + + + + + + + + + + + -
ID Produit:{{data.productId}}
Référence:{{data.productReferences}}
Durée:{{data.productDuration}}
Calibre:{{data.productCaliber}}
Numéro d'approbation:{{data.productApprovalNumber}}
Poids:{{data.productWeight}}
NEC:{{data.productNec}}
Quantité min:{{data.productMinimalQuantity}}
Image:{{data.productImage}}
Lien:{{data.productLink}}
RéferenceNomQuantité
{{data.quotationProductReference}}{{data.quotationProductName}}{{data.quotationProductQuantity}}
+
diff --git a/src/app/components/quotation-table/quotation-table.ts b/src/app/components/quotation-table/quotation-table.ts index 73f4ef3..1e9a96e 100644 --- a/src/app/components/quotation-table/quotation-table.ts +++ b/src/app/components/quotation-table/quotation-table.ts @@ -7,21 +7,13 @@ import {NzIconDirective} from "ng-zorro-antd/icon"; import {QuotationForm} from "../quotation-form/quotation-form"; interface QuotationInfo { - quantity: number; quotationId: number; quotationMessage?: string; quotationConditionsSale?: string; - productId: number; - productReferences: number; - productName?: string; - productDuration: number; - productCaliber: number; - productApprovalNumber: number; - productWeight: number; - productNec: number; - productImage?: string; - productLink?: string; - productMinimalQuantity: number; + quotationProductReference: string; + quotationProductName: string; + quotationProductQuantity?: number; + Supplier?: string; } @Component({ @@ -41,55 +33,31 @@ interface QuotationInfo { export class QuotationTable { quotations: QuotationInfo[] = [ { - quantity: 10, quotationId: 101, quotationMessage: 'Livraison urgente demandée', quotationConditionsSale: 'Paiement à 30 jours', - productId: 5001, - productReferences: 123456, - productName: 'Feu d\'artifice A', - productDuration: 45.5, - productCaliber: 30, - productApprovalNumber: 998877, - productWeight: 1.5, - productNec: 0.5, - productImage: 'url_to_image_a', - productLink: 'http://example.com/product/a', - productMinimalQuantity: 5 + quotationProductReference: 'DLV-1000', + quotationProductName: 'Produit1', + quotationProductQuantity: 5, + Supplier: 'fireworkssupplier&Co' }, { - quantity: 20, quotationId: 102, quotationMessage: 'Livraison standard', quotationConditionsSale: 'Payé d\'avance', - productId: 5002, - productReferences: 654321, - productName: 'Feu d\'artifice B', - productDuration: 60.0, - productCaliber: 50, - productApprovalNumber: 112233, - productWeight: 2.0, - productNec: 0.8, - productImage: 'url_to_image_b', - productLink: 'http://example.com/product/b', - productMinimalQuantity: 10 + quotationProductReference: 'DLV-1001', + quotationProductName: 'Produit2', + quotationProductQuantity: 6, + Supplier: 'fireworkssupplier&Co' }, { - quantity: 5, quotationId: 103, - quotationMessage: null, + quotationMessage: 'Livraison rapide', quotationConditionsSale: 'Paiement à 15 jours', - productId: 5003, - productReferences: 789012, - productName: 'Feu d\'artifice C', - productDuration: 30.0, - productCaliber: 25, - productApprovalNumber: 445566, - productWeight: 1.0, - productNec: 0.3, - productImage: null, - productLink: null, - productMinimalQuantity: 1 + quotationProductReference: 'DLV-1002', + quotationProductName: 'Produit3', + quotationProductQuantity: 7, + Supplier: 'fireworkssupplier&Co' } ]; } diff --git a/src/app/pages/quotation/quotation.ts b/src/app/pages/quotation/quotation.ts index 938dc1b..c22b8c2 100644 --- a/src/app/pages/quotation/quotation.ts +++ b/src/app/pages/quotation/quotation.ts @@ -9,9 +9,7 @@ import {QuotationTable} from "../../components/quotation-table/quotation-table"; @Component({ selector: 'app-quotation', imports: [ - DelivereryNoteTable, ModalButton, - DelivereryNoteForm, Search, QuotationForm, QuotationTable