added getall and delete functions for deliverynote page

This commit is contained in:
2025-11-30 14:28:18 +01:00
parent 387df7fd69
commit 7535689eef
12 changed files with 143 additions and 206 deletions

View File

@@ -1,11 +1,15 @@
<form nz-form nzLayout="horizontal" [formGroup]="deliveryNoteForm" (ngSubmit)="submitForm()"> <form nz-form nzLayout="horizontal" [formGroup]="deliveryNoteForm">
<nz-form-item nz-flex> <nz-form-item nz-flex>
<nz-form-label nzSpan="9" nzRequired> <nz-form-label nzSpan="9" nzRequired>
Transporteur Transporteur
</nz-form-label> </nz-form-label>
<nz-form-control nzSpan="12" nzErrorTip="Ce champ est requis"> <nz-form-control nzSpan="12" nzErrorTip="Ce champ est requis">
<input nz-input placeholder="Transporteur" formControlName="deliverer"> <nz-select formControlName="deliverer" [nzPlaceHolder]="'Choisir un transporteur'" nzShowSearch [nzFilterOption]="filter">
@for (deliverer of deliverers(); track deliverer.id) {
<nz-option [nzValue]="deliverer.id" [nzLabel]="deliverer.transporter"></nz-option>
}
</nz-select>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

View File

@@ -1,10 +1,13 @@
import { Component } from '@angular/core'; import {Component, inject, signal} from '@angular/core';
import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms"; import {FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms";
import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; 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 {NzColDirective} from "ng-zorro-antd/grid";
import {NzFlexDirective} from "ng-zorro-antd/flex"; import {NzFlexDirective} from "ng-zorro-antd/flex";
import {NzDatePickerComponent} from "ng-zorro-antd/date-picker"; import {NzDatePickerComponent} from "ng-zorro-antd/date-picker";
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
import {DeliverersService, GetDelivererDto} from "../../services/api";
import {NzNotificationService} from "ng-zorro-antd/notification";
import {firstValueFrom} from "rxjs";
@Component({ @Component({
selector: 'app-deliverery-note-form', selector: 'app-deliverery-note-form',
@@ -12,12 +15,13 @@ import {NzDatePickerComponent} from "ng-zorro-antd/date-picker";
NzFormItemComponent, NzFormItemComponent,
NzFormLabelComponent, NzFormLabelComponent,
NzFormControlComponent, NzFormControlComponent,
NzInputDirective,
NzColDirective, NzColDirective,
NzFlexDirective, NzFlexDirective,
NzFormDirective, NzFormDirective,
ReactiveFormsModule, ReactiveFormsModule,
NzDatePickerComponent NzDatePickerComponent,
NzSelectComponent,
NzOptionComponent
], ],
templateUrl: './deliverery-note-form.html', templateUrl: './deliverery-note-form.html',
styleUrl: './deliverery-note-form.css', styleUrl: './deliverery-note-form.css',
@@ -30,14 +34,24 @@ export class DelivereryNoteForm {
realDate: new FormControl(null) realDate: new FormControl(null)
}) })
submitForm() { private deliverersService = inject(DeliverersService);
// Pour annuler si le formulaire est invalide private notificationService = inject(NzNotificationService);
if (this.deliveryNoteForm.invalid) return; deliverers = signal<GetDelivererDto[]>([]);
// Pour obtenir la valeur du formulaire async fetchDeliverers() {
console.log(this.deliveryNoteForm.getRawValue()) try {
const deliverers = await firstValueFrom(this.deliverersService.getAllDelivererEndpoint());
// Pour vider le formulaire this.deliverers.set(deliverers);
this.deliveryNoteForm.reset() } catch (e) {
this.notificationService.error('Erreur', 'Impossible de récupérer les transporteurs');
}
}
async ngOnInit() {
await this.fetchDeliverers();
}
filter(input: string, option: any) {
return option.nzLabel.toLowerCase().includes(input.toLowerCase());
} }
} }

View File

@@ -1,4 +1,7 @@
<nz-table #basicTable [nzData]="deliveryNotes" class="mr-7"> <nz-table [nzData]="deliveryNotes()"
class="mr-7"
[nzFrontPagination]="false"
[nzLoading]="deliveryNotesLoading()">
<thead> <thead>
<tr class="text-center"> <tr class="text-center">
<th>Numéro de livraison</th> <th>Numéro de livraison</th>
@@ -11,17 +14,17 @@
</tr> </tr>
</thead > </thead >
<tbody class="text-center"> <tbody class="text-center">
@for (data of basicTable.data; track data) { @for (deliveryNote of deliveryNotes(); track deliveryNote.id) {
<tr> <tr>
<td>{{data.trackingNumber}}</td> <td>{{deliveryNote.trackingNumber}}</td>
<td>{{data.deliverer}}</td> <td>{{deliveryNote.delivererTransporter}}</td>
<td>{{data.expeditionDate | date: 'dd/MM/yyyy'}}</td> <td>{{deliveryNote.expeditionDate | date: 'dd/MM/yyyy'}}</td>
<td>{{data.estimateDeliveryDate | date: 'dd/MM/yyyy'}}</td> <td>{{deliveryNote.estimateDeliveryDate | date: 'dd/MM/yyyy'}}</td>
<td>{{data.realDeliveryDate | date: 'dd/MM/yyyy'}}</td> <td>{{deliveryNote.realDeliveryDate | date: 'dd/MM/yyyy'}}</td>
<td> <td>
<app-modal-button type="link" name="Voir les produits"> <app-modal-button type="link" name="Voir les produits">
<div style="max-height: 400px; overflow-y: auto;"> <div style="max-height: 400px; overflow-y: auto;">
<nz-table [nzData]="data.productDelivery"> <nz-table [nzData]="deliveryNotes()">
<thead> <thead>
<tr class="text-center"> <tr class="text-center">
<th>Réference</th> <th>Réference</th>
@@ -30,10 +33,10 @@
</tr> </tr>
</thead> </thead>
<tbody class="text-center"> <tbody class="text-center">
@for (product of data.productDelivery; track product) { @for (product of deliveryNote.products; track product.productId) {
<tr> <tr>
<td>{{product.product.reference}}</td> <td>{{product.productReference}}</td>
<td>{{product.product.name}}</td> <td>{{product.productName}}</td>
<td>{{product.quantity}}</td> <td>{{product.quantity}}</td>
</tr> </tr>
} }
@@ -49,11 +52,11 @@
</app-modal-nav> </app-modal-nav>
<nz-divider nzType="vertical"></nz-divider> <nz-divider nzType="vertical"></nz-divider>
<div> <div>
<nz-icon nzType="delete" nzTheme="outline" (click)="delete()" class="cursor-pointer text-red-700"/> <nz-icon nzType="delete" nzTheme="outline" (click)="delete(deliveryNote.id)" class="cursor-pointer text-red-700"/>
</div> </div>
<nz-divider nzType="vertical"></nz-divider> <nz-divider nzType="vertical"></nz-divider>
<div> <div>
<nz-icon nzType="export" nzTheme="outline" (click)="export()" class="cursor-pointer text-green-700"/> <nz-icon nzType="export" nzTheme="outline" (click)="export(deliveryNote.id)" class="cursor-pointer text-green-700"/>
</div> </div>
</div> </div>
</td> </td>

View File

@@ -1,6 +1,4 @@
import { Component } from '@angular/core'; import {Component, inject, OnInit, signal} from '@angular/core';
import {DeliveryNoteInfo} from "../../interfaces/delivery-note.interface";
import {ProductTable} from "../product-table/product-table";
import {DatePipe} from "@angular/common"; import {DatePipe} from "@angular/common";
import {ModalButton} from "../modal-button/modal-button"; import {ModalButton} from "../modal-button/modal-button";
import {ModalNav} from "../modal-nav/modal-nav"; import {ModalNav} from "../modal-nav/modal-nav";
@@ -8,6 +6,9 @@ import {NzDividerComponent} from "ng-zorro-antd/divider";
import {NzIconDirective} from "ng-zorro-antd/icon"; import {NzIconDirective} from "ng-zorro-antd/icon";
import {NzTableComponent} from "ng-zorro-antd/table"; import {NzTableComponent} from "ng-zorro-antd/table";
import {DelivereryNoteForm} from "../deliverery-note-form/deliverery-note-form"; import {DelivereryNoteForm} from "../deliverery-note-form/deliverery-note-form";
import {DeliverynotesService, GetDeliveryNoteDto} from "../../services/api";
import {NzNotificationService} from "ng-zorro-antd/notification";
import {firstValueFrom} from "rxjs";
@Component({ @Component({
selector: 'app-deliverery-note-table', selector: 'app-deliverery-note-table',
@@ -23,135 +24,48 @@ import {DelivereryNoteForm} from "../deliverery-note-form/deliverery-note-form";
templateUrl: './deliverery-note-table.html', templateUrl: './deliverery-note-table.html',
styleUrl: './deliverery-note-table.css', styleUrl: './deliverery-note-table.css',
}) })
export class DelivereryNoteTable { export class DelivereryNoteTable implements OnInit {
deliveryNotes: DeliveryNoteInfo[] = [ private DeliveryNotesService = inject(DeliverynotesService);
{ private notificationService = inject(NzNotificationService)
trackingNumber: 'DLV-1000', deliveryNotes = signal<GetDeliveryNoteDto[]>([]);
deliverer: 'Transporteur 1', deliveryNotesLoading = signal<boolean>(false);
estimateDeliveryDate: new Date('2025-11-20'),
expeditionDate: new Date('2025-11-15'),
realDeliveryDate: new Date('2025-11-19'),
productDelivery: [
{ product: ProductTable.listOfProducts[0], quantity: 5 },
{ product: ProductTable.listOfProducts[1], quantity: 3 },
{ product: ProductTable.listOfProducts[2], quantity: 7 },
],
},
{
trackingNumber: 'DLV-1001',
deliverer: 'Transporteur 1',
estimateDeliveryDate: new Date('2025-11-22'),
expeditionDate: new Date('2025-11-16'),
realDeliveryDate: new Date('2025-11-21'),
productDelivery: [
{ product: ProductTable.listOfProducts[3], quantity: 2 },
{ product: ProductTable.listOfProducts[4], quantity: 4 },
{ product: ProductTable.listOfProducts[5], quantity: 6 },
],
},
{
trackingNumber: 'DLV-1002',
deliverer: 'Transporteur 2',
estimateDeliveryDate: new Date('2025-11-23'),
expeditionDate: new Date('2025-11-17'),
realDeliveryDate: new Date('2025-11-22'),
productDelivery: [
{ product: ProductTable.listOfProducts[6], quantity: 3 },
{ product: ProductTable.listOfProducts[7], quantity: 8 },
{ product: ProductTable.listOfProducts[8], quantity: 5 },
],
},
{
trackingNumber: 'DLV-1003',
deliverer: 'Transporteur 2',
estimateDeliveryDate: new Date('2025-11-24'),
expeditionDate: new Date('2025-11-18'),
realDeliveryDate: new Date('2025-11-23'),
productDelivery: [
{ product: ProductTable.listOfProducts[9], quantity: 4 },
{ product: ProductTable.listOfProducts[10], quantity: 6 },
{ product: ProductTable.listOfProducts[11], quantity: 7 },
],
},
{
trackingNumber: 'DLV-1004',
deliverer: 'Transporteur 3',
estimateDeliveryDate: new Date('2025-11-25'),
expeditionDate: new Date('2025-11-19'),
realDeliveryDate: new Date('2025-11-24'),
productDelivery: [
{ product: ProductTable.listOfProducts[12], quantity: 2 },
{ product: ProductTable.listOfProducts[13], quantity: 5 },
{ product: ProductTable.listOfProducts[14], quantity: 6 },
],
},
{
trackingNumber: 'DLV-1005',
deliverer: 'Transporteur 3',
estimateDeliveryDate: new Date('2025-11-26'),
expeditionDate: new Date('2025-11-20'),
realDeliveryDate: new Date('2025-11-25'),
productDelivery: [
{ product: ProductTable.listOfProducts[15], quantity: 3 },
{ product: ProductTable.listOfProducts[16], quantity: 7 },
{ product: ProductTable.listOfProducts[17], quantity: 4 },
],
},
{
trackingNumber: 'DLV-1006',
deliverer: 'Transporteur 4',
estimateDeliveryDate: new Date('2025-11-27'),
expeditionDate: new Date('2025-11-21'),
realDeliveryDate: new Date('2025-11-26'),
productDelivery: [
{ product: ProductTable.listOfProducts[18], quantity: 5 },
{ product: ProductTable.listOfProducts[19], quantity: 6 },
{ product: ProductTable.listOfProducts[20], quantity: 7 },
],
},
{
trackingNumber: 'DLV-1007',
deliverer: 'Transporteur 4',
estimateDeliveryDate: new Date('2025-11-28'),
expeditionDate: new Date('2025-11-22'),
realDeliveryDate: new Date('2025-11-27'),
productDelivery: [
{ product: ProductTable.listOfProducts[21], quantity: 3 },
{ product: ProductTable.listOfProducts[22], quantity: 5 },
{ product: ProductTable.listOfProducts[23], quantity: 4 },
],
},
{
trackingNumber: 'DLV-1008',
deliverer: 'Transporteur 5',
estimateDeliveryDate: new Date('2025-11-29'),
expeditionDate: new Date('2025-11-23'),
realDeliveryDate: new Date('2025-11-28'),
productDelivery: [
{ product: ProductTable.listOfProducts[24], quantity: 6 },
{ product: ProductTable.listOfProducts[25], quantity: 7 },
{ product: ProductTable.listOfProducts[26], quantity: 3 },
],
},
{
trackingNumber: 'DLV-1009',
deliverer: 'Transporteur 5',
estimateDeliveryDate: new Date('2025-11-30'),
expeditionDate: new Date('2025-11-24'),
realDeliveryDate: new Date('2025-11-29'),
productDelivery: [
{ product: ProductTable.listOfProducts[27], quantity: 5 },
{ product: ProductTable.listOfProducts[28], quantity: 4 },
{ product: ProductTable.listOfProducts[29], quantity: 6 },
],
},
];
delete() { async ngOnInit() {
return await this.fetchDeliveryNotes();
} }
export() { async fetchDeliveryNotes() {
this.deliveryNotesLoading.set(true)
try {
const deliveryNotes = await firstValueFrom(this.DeliveryNotesService.getAllDeliveryNoteEndpoint())
this.deliveryNotes.set(deliveryNotes);
} catch (e) {
this.notificationService.error(
'Erreur',
'Erreur de communication avec l\'API'
)
}
this.deliveryNotesLoading.set(false)
}
async delete(deliveryNote:number) {
try {
await firstValueFrom(this.DeliveryNotesService.deleteDeliveryNoteEndpoint(deliveryNote));
this.notificationService.success(
'Success',
'Suppression effectuée'
)
} catch (e) {
this.notificationService.error(
'Erreur',
'Impossible de supprimer la ligne'
)
}
await this.fetchDeliveryNotes();
}
export(deliveryNote: number) {
return return
} }
} }

View File

@@ -2,8 +2,6 @@ import {Component, inject, OnInit, signal, viewChild} from '@angular/core';
import {ModalNav} from "../modal-nav/modal-nav"; import {ModalNav} from "../modal-nav/modal-nav";
import {NzIconDirective} from "ng-zorro-antd/icon"; import {NzIconDirective} from "ng-zorro-antd/icon";
import {NzTableComponent} from "ng-zorro-antd/table"; import {NzTableComponent} from "ng-zorro-antd/table";
import {StockForm} from "../stock-form/stock-form";
import {UserInfo} from "../../interfaces/user.interface";
import {ProfilForm} from "../profil-form/profil-form"; import {ProfilForm} from "../profil-form/profil-form";
import {NzDividerComponent} from "ng-zorro-antd/divider"; import {NzDividerComponent} from "ng-zorro-antd/divider";
import {GetUserDto, UsersService} from "../../services/api"; import {GetUserDto, UsersService} from "../../services/api";

View File

@@ -1,6 +0,0 @@
import {DeliveryNoteInfo} from "./delivery-note.interface";
export interface DelivererInfo {
transporter: string;
deliveryNote: DeliveryNoteInfo[];
}

View File

@@ -1,7 +0,0 @@
import {ProductInfo} from "./product.interface";
export interface ProductOrderInfo {
product: ProductInfo;
quantity: number;
price: number;
}

View File

@@ -1,8 +0,0 @@
import {ProductOrderInfo} from "./product-order.interface";
import {SupplierInfo} from "./supplier.interface";
export interface PurchaseOrderInfo {
purchaseCondition: string;
productOrder: ProductOrderInfo[];
supplier: SupplierInfo;
}

View File

@@ -1,9 +0,0 @@
import {ProductOrderInfo} from "./product-order.interface";
import {SupplierInfo} from "./supplier.interface";
export interface QuotationInfo {
saleCondition: string;
message: string;
productOrder: ProductOrderInfo[];
supplier: SupplierInfo;
}

View File

@@ -1,7 +0,0 @@
import {ProductInfo} from "./product.interface";
export interface StockInfo {
id: number;
product: ProductInfo;
quantity: number;
}

View File

@@ -1,12 +0,0 @@
import {ProductInfo} from "./product.interface";
export interface SupplierInfo {
name: string;
email: string;
phone: string;
address: string;
zipCode: string;
city: string;
deliveryDelay: number;
products: ProductInfo[];
}

View File

@@ -103,6 +103,59 @@ export class DeliverynotesService extends BaseService {
); );
} }
/**
* @endpoint delete /API/deliveryNotes/{id}
* @param id
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
* @param reportProgress flag to report request and response progress.
*/
public deleteDeliveryNoteEndpoint(id: number, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any>;
public deleteDeliveryNoteEndpoint(id: number, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpResponse<any>>;
public deleteDeliveryNoteEndpoint(id: number, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<HttpEvent<any>>;
public deleteDeliveryNoteEndpoint(id: number, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: undefined, context?: HttpContext, transferCache?: boolean}): Observable<any> {
if (id === null || id === undefined) {
throw new Error('Required parameter id was null or undefined when calling deleteDeliveryNoteEndpoint.');
}
let localVarHeaders = this.defaultHeaders;
const localVarHttpHeaderAcceptSelected: string | undefined = options?.httpHeaderAccept ?? this.configuration.selectHeaderAccept([
]);
if (localVarHttpHeaderAcceptSelected !== undefined) {
localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
}
const localVarHttpContext: HttpContext = options?.context ?? new HttpContext();
const localVarTransferCache: boolean = options?.transferCache ?? true;
let responseType_: 'text' | 'json' | 'blob' = 'json';
if (localVarHttpHeaderAcceptSelected) {
if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
responseType_ = 'text';
} else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
responseType_ = 'json';
} else {
responseType_ = 'blob';
}
}
let localVarPath = `/API/deliveryNotes/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "number", dataFormat: "int32"})}`;
const { basePath, withCredentials } = this.configuration;
return this.httpClient.request<any>('delete', `${basePath}${localVarPath}`,
{
context: localVarHttpContext,
responseType: <any>responseType_,
...(withCredentials ? { withCredentials } : {}),
headers: localVarHeaders,
observe: observe,
...(localVarTransferCache !== undefined ? { transferCache: localVarTransferCache } : {}),
reportProgress: reportProgress
}
);
}
/** /**
* @endpoint get /API/deliveryNotes * @endpoint get /API/deliveryNotes
* @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body. * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.