Merge branch 'feature/creatingQuotationPage' into develop
This commit is contained in:
42
src/app/components/quotation-form/quotation-form.html
Normal file
42
src/app/components/quotation-form/quotation-form.html
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
<form nz-form nzLayout="horizontal" [formGroup]="QuotationForm" (ngSubmit)="submitForm()">
|
||||||
|
<nz-form-item nz-flex>
|
||||||
|
<nz-form-label nzSpan="9" nzRequired>
|
||||||
|
ID Devis
|
||||||
|
</nz-form-label>
|
||||||
|
|
||||||
|
<nz-form-control nzSpan="12">
|
||||||
|
<input nz-input type="number" placeholder="ID Devis" formControlName="quotationId">
|
||||||
|
</nz-form-control>
|
||||||
|
</nz-form-item>
|
||||||
|
|
||||||
|
<nz-form-item nz-flex>
|
||||||
|
<nz-form-label nzSpan="9">
|
||||||
|
Message du devis
|
||||||
|
</nz-form-label>
|
||||||
|
|
||||||
|
<nz-form-control nzSpan="12">
|
||||||
|
<input nz-input placeholder="Message du devis" formControlName="quotationMessage">
|
||||||
|
</nz-form-control>
|
||||||
|
</nz-form-item>
|
||||||
|
|
||||||
|
<nz-form-item nz-flex>
|
||||||
|
<nz-form-label nzSpan="9" nzRequired>
|
||||||
|
Conditions de vente
|
||||||
|
</nz-form-label>
|
||||||
|
|
||||||
|
<nz-form-control nzSpan="12">
|
||||||
|
<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>
|
||||||
|
|
||||||
41
src/app/components/quotation-form/quotation-form.ts
Normal file
41
src/app/components/quotation-form/quotation-form.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms";
|
||||||
|
import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
|
||||||
|
import {NzInputDirective} from "ng-zorro-antd/input";
|
||||||
|
import {NzColDirective} from "ng-zorro-antd/grid";
|
||||||
|
import {NzFlexDirective} from "ng-zorro-antd/flex";
|
||||||
|
import {NzDatePickerComponent} from "ng-zorro-antd/date-picker";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-quotation-form',
|
||||||
|
imports: [
|
||||||
|
NzFormItemComponent,
|
||||||
|
NzFormLabelComponent,
|
||||||
|
NzFormControlComponent,
|
||||||
|
NzInputDirective,
|
||||||
|
NzColDirective,
|
||||||
|
NzFlexDirective,
|
||||||
|
NzFormDirective,
|
||||||
|
ReactiveFormsModule
|
||||||
|
],
|
||||||
|
templateUrl: './quotation-form.html',
|
||||||
|
styleUrl: './quotation-form.css',
|
||||||
|
})
|
||||||
|
export class QuotationForm {
|
||||||
|
QuotationForm: FormGroup = new FormGroup({
|
||||||
|
quotationId: new FormControl<number>(null),
|
||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
85
src/app/components/quotation-table/quotation-table.css
Normal file
85
src/app/components/quotation-table/quotation-table.css
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
/* Table globale */
|
||||||
|
nz-table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: separate;
|
||||||
|
border-spacing: 0 8px; /* espace entre les lignes */
|
||||||
|
background: #fff;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
box-shadow: 0 2px 6px rgba(0,0,0,0.1);
|
||||||
|
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* En-tête */
|
||||||
|
nz-table thead tr {
|
||||||
|
background-color: #f5f5f5;
|
||||||
|
text-align: left;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #333;
|
||||||
|
border-bottom: 2px solid #e0e0e0;
|
||||||
|
}
|
||||||
|
|
||||||
|
nz-table thead th {
|
||||||
|
padding: 12px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Lignes du tableau */
|
||||||
|
nz-table tbody tr {
|
||||||
|
background-color: #fff;
|
||||||
|
transition: background 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
nz-table tbody tr:nth-child(even) {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
|
||||||
|
nz-table tbody tr:hover {
|
||||||
|
background-color: #e6f7ff; /* survol */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Cellules */
|
||||||
|
nz-table tbody td {
|
||||||
|
padding: 12px 16px;
|
||||||
|
vertical-align: middle;
|
||||||
|
color: #444;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Boutons */
|
||||||
|
nz-table button[nz-button] {
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Modals dans le tableau */
|
||||||
|
nz-table app-modal {
|
||||||
|
margin-right: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Dates (pour alignement et style) */
|
||||||
|
nz-table tbody td p {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 14px;
|
||||||
|
color: #555;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
nz-table thead {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
nz-table tbody tr {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
box-shadow: 0 1px 3px rgba(0,0,0,0.1);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
nz-table tbody td {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 6px 12px;
|
||||||
|
}
|
||||||
|
nz-table tbody td::before {
|
||||||
|
content: attr(data-label);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
}
|
||||||
75
src/app/components/quotation-table/quotation-table.html
Normal file
75
src/app/components/quotation-table/quotation-table.html
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
<nz-table #basicTable [nzData]="quotations" class="mr-7">
|
||||||
|
<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) {
|
||||||
|
<tr>
|
||||||
|
<td>{{data.quotationId}}</td>
|
||||||
|
<td>{{data.quotationMessage}}</td>
|
||||||
|
<td>{{data.quotationConditionsSale}}</td>
|
||||||
|
<td>{{data.Supplier}}</td>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<app-modal-button type="link" name="Voir les produits">
|
||||||
|
<div style="max-height: 400px; overflow-y: auto;">
|
||||||
|
<nz-table>
|
||||||
|
<thead>
|
||||||
|
<tr class="text-center">
|
||||||
|
<th>Réference</th>
|
||||||
|
<th>Nom</th>
|
||||||
|
<th>Quantité</th>
|
||||||
|
<th>Action</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody class="text-center">
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>{{data.quotationProductReference}}</td>
|
||||||
|
<td>{{data.quotationProductName}}</td>
|
||||||
|
<td>{{data.quotationProductQuantity}}</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>
|
||||||
|
</app-modal-button>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<div style="justify-content: center; display: flex">
|
||||||
|
<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"/>
|
||||||
|
</div>
|
||||||
|
<nz-divider nzType="vertical"></nz-divider>
|
||||||
|
<div>
|
||||||
|
<nz-icon nzType="export" nzTheme="outline" class="cursor-pointer text-green-700"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
}
|
||||||
|
</tbody>
|
||||||
|
</nz-table>
|
||||||
|
|
||||||
85
src/app/components/quotation-table/quotation-table.ts
Normal file
85
src/app/components/quotation-table/quotation-table.ts
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import { Component } 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";
|
||||||
|
|
||||||
|
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',
|
||||||
|
imports: [
|
||||||
|
ModalButton,
|
||||||
|
ModalNav,
|
||||||
|
NzDividerComponent,
|
||||||
|
NzIconDirective,
|
||||||
|
NzTableComponent,
|
||||||
|
QuotationForm
|
||||||
|
],
|
||||||
|
templateUrl: './quotation-table.html',
|
||||||
|
styleUrl: './quotation-table.css',
|
||||||
|
})
|
||||||
|
|
||||||
|
export class QuotationTable {
|
||||||
|
quotations: QuotationInfo[] = [
|
||||||
|
{
|
||||||
|
quotationId: 101,
|
||||||
|
quotationMessage: 'Livraison urgente demandée',
|
||||||
|
quotationConditionsSale: 'Paiement à 30 jours',
|
||||||
|
quotationProduct: [
|
||||||
|
{ quotationProductReference: 'DLV-1000' },
|
||||||
|
{ quotationProductName: 'Produit1'},
|
||||||
|
{ quotationProductQuantity: 5 },
|
||||||
|
],
|
||||||
|
quotationProductReference: 'DLV-1000',
|
||||||
|
quotationProductName: 'Produit1',
|
||||||
|
quotationProductQuantity: 5,
|
||||||
|
Supplier: 'Fireworkssupplier&Co'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quotationId: 102,
|
||||||
|
quotationMessage: 'Livraison standard',
|
||||||
|
quotationConditionsSale: 'Payé d\'avance',
|
||||||
|
quotationProduct: [
|
||||||
|
{ quotationProductReference: 'DLV-1001' },
|
||||||
|
{ quotationProductName: 'Produit2'},
|
||||||
|
{ quotationProductQuantity: 6 },
|
||||||
|
],
|
||||||
|
quotationProductReference: 'DLV-1001',
|
||||||
|
quotationProductName: 'Produit2',
|
||||||
|
quotationProductQuantity: 6,
|
||||||
|
Supplier: 'Fireworkssupplier&Co'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
quotationId: 103,
|
||||||
|
quotationMessage: 'Livraison rapide',
|
||||||
|
quotationConditionsSale: 'Paiement à 15 jours',
|
||||||
|
quotationProduct: [
|
||||||
|
{ quotationProductReference: 'DLV-1003' },
|
||||||
|
{ quotationProductName: 'Produit3'},
|
||||||
|
{ quotationProductQuantity: 7 },
|
||||||
|
],
|
||||||
|
quotationProductReference: 'DLV-1002',
|
||||||
|
quotationProductName: 'Produit3',
|
||||||
|
quotationProductQuantity: 7,
|
||||||
|
Supplier: 'Fireworkssupplier&Co'
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,9 +1,13 @@
|
|||||||
<div class="flex mt-2">
|
<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">
|
<div class="ml-95 w-150">
|
||||||
<app-search class="w-full"></app-search>
|
<app-search></app-search>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
voir prix dans les produits + suppr id devis dans form et dans bon de livraison form
|
||||||
<div class="mt-1">
|
<div class="mt-1">
|
||||||
<p>quotation works!</p>
|
<app-quotation-table></app-quotation-table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,10 +1,18 @@
|
|||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import {Search} from "../../components/search/search";
|
import {Search} from "../../components/search/search";
|
||||||
|
import {DelivereryNoteTable} from "../../components/deliverery-note-table/deliverery-note-table";
|
||||||
|
import {ModalButton} from "../../components/modal-button/modal-button";
|
||||||
|
import {DelivereryNoteForm} from "../../components/deliverery-note-form/deliverery-note-form";
|
||||||
|
import {QuotationForm} from "../../components/quotation-form/quotation-form";
|
||||||
|
import {QuotationTable} from "../../components/quotation-table/quotation-table";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-quotation',
|
selector: 'app-quotation',
|
||||||
imports: [
|
imports: [
|
||||||
Search
|
ModalButton,
|
||||||
|
Search,
|
||||||
|
QuotationForm,
|
||||||
|
QuotationTable
|
||||||
],
|
],
|
||||||
templateUrl: './quotation.html',
|
templateUrl: './quotation.html',
|
||||||
styleUrl: './quotation.css',
|
styleUrl: './quotation.css',
|
||||||
|
|||||||
Reference in New Issue
Block a user