added getall and delete functions for deliverer page
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
<form nz-form nzLayout="horizontal" [formGroup]="delivererForm" (ngSubmit)="submitForm()">
|
<form nz-form nzLayout="horizontal" [formGroup]="delivererForm">
|
||||||
<nz-form-item nz-flex>
|
<nz-form-item nz-flex>
|
||||||
<nz-form-label nzSpan="9" nzRequired>
|
<nz-form-label nzSpan="9" nzRequired>
|
||||||
Transporteur
|
Transporteur
|
||||||
|
|||||||
@@ -24,15 +24,4 @@ export class DelivererForm {
|
|||||||
delivererForm: FormGroup = new FormGroup({
|
delivererForm: FormGroup = new FormGroup({
|
||||||
transporter: new FormControl<string>(null, [Validators.required])
|
transporter: new FormControl<string>(null, [Validators.required])
|
||||||
})
|
})
|
||||||
|
|
||||||
submitForm() {
|
|
||||||
// Pour annuler si le formulaire est invalide
|
|
||||||
if (this.delivererForm.invalid) return;
|
|
||||||
|
|
||||||
// Pour obtenir la valeur du formulaire
|
|
||||||
console.log(this.delivererForm.getRawValue())
|
|
||||||
|
|
||||||
// Pour vider le formulaire
|
|
||||||
this.delivererForm.reset()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<nz-table #basicTable [nzData]="listOfDeliverers">
|
<nz-table [nzData]="deliverers()"
|
||||||
|
[nzFrontPagination]="false"
|
||||||
|
[nzLoading]="deliverersLoading()">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="text-center">
|
<tr class="text-center">
|
||||||
<th>Transporteur</th>
|
<th>Transporteur</th>
|
||||||
@@ -7,13 +9,14 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="text-center">
|
<tbody class="text-center">
|
||||||
@for (data of basicTable.data; track data) {
|
@for (deliverer of deliverers(); track deliverer.id) {
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{data.transporter}}</td>
|
<td>{{deliverer.transporter}}</td>
|
||||||
<td>
|
<td>
|
||||||
<app-modal-button type="link" name="Voir tout les bons de livraison">
|
<app-modal-button type="link" name="Voir tout les bons de livraison">
|
||||||
<div style="max-height: 400px; overflow-y: auto;">
|
<div style="max-height: 400px; overflow-y: auto;">
|
||||||
<nz-table [nzData]="data.deliveryNote">
|
<nz-table [nzData]="deliverers()"
|
||||||
|
[nzFrontPagination]="false">
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="text-center">
|
<tr class="text-center">
|
||||||
<th>Numéro de livraison</th>
|
<th>Numéro de livraison</th>
|
||||||
@@ -23,7 +26,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="text-center">
|
<tbody class="text-center">
|
||||||
@for (deliveryInfo of data.deliveryNote; track deliveryInfo) {
|
@for (deliveryInfo of deliverer.deliveryNotes; track deliveryInfo.id) {
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{deliveryInfo.trackingNumber}}</td>
|
<td>{{deliveryInfo.trackingNumber}}</td>
|
||||||
<td>{{deliveryInfo.expeditionDate | date: 'dd/MM/yyyy'}}</td>
|
<td>{{deliveryInfo.expeditionDate | date: 'dd/MM/yyyy'}}</td>
|
||||||
@@ -43,7 +46,7 @@
|
|||||||
</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" class="cursor-pointer text-red-700"/>
|
<nz-icon nzType="delete" nzTheme="outline" class="cursor-pointer text-red-700" (click)="delete(deliverer.id)"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
import { Component } from '@angular/core';
|
import {Component, inject, OnInit, signal} from '@angular/core';
|
||||||
import {ProductTable} from "../product-table/product-table";
|
|
||||||
import {DelivererInfo} from "../../interfaces/deliverer.interface";
|
|
||||||
import {ModalNav} from "../modal-nav/modal-nav";
|
import {ModalNav} from "../modal-nav/modal-nav";
|
||||||
import {NzDividerComponent} from "ng-zorro-antd/divider";
|
import {NzDividerComponent} from "ng-zorro-antd/divider";
|
||||||
import {NzIconDirective} from "ng-zorro-antd/icon";
|
import {NzIconDirective} from "ng-zorro-antd/icon";
|
||||||
@@ -8,6 +6,9 @@ import {NzTableComponent} from "ng-zorro-antd/table";
|
|||||||
import {ModalButton} from "../modal-button/modal-button";
|
import {ModalButton} from "../modal-button/modal-button";
|
||||||
import {DatePipe} from "@angular/common";
|
import {DatePipe} from "@angular/common";
|
||||||
import {DelivererForm} from "../deliverer-form/deliverer-form";
|
import {DelivererForm} from "../deliverer-form/deliverer-form";
|
||||||
|
import {DeliverersService, GetDelivererDto} from "../../services/api";
|
||||||
|
import {NzNotificationService} from "ng-zorro-antd/notification";
|
||||||
|
import {firstValueFrom} from "rxjs";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-deliverer-table',
|
selector: 'app-deliverer-table',
|
||||||
@@ -24,276 +25,71 @@ import {DelivererForm} from "../deliverer-form/deliverer-form";
|
|||||||
styleUrl: './deliverer-table.css',
|
styleUrl: './deliverer-table.css',
|
||||||
})
|
})
|
||||||
|
|
||||||
export class DelivererTable {
|
export class DelivererTable implements OnInit {
|
||||||
listOfDeliverers: DelivererInfo[] = [
|
private deliverersService = inject(DeliverersService);
|
||||||
{
|
private notificationService = inject(NzNotificationService)
|
||||||
transporter: 'Transporteur 1',
|
deliverers = signal<GetDelivererDto[]>([]);
|
||||||
deliveryNote: [
|
deliverersLoading = signal<boolean>(false);
|
||||||
{
|
|
||||||
trackingNumber: 'TRK-1000',
|
|
||||||
deliverer: 'Transporteur 1',
|
|
||||||
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: 'TRK-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: 'TRK-1000',
|
|
||||||
deliverer: 'Transporteur 1',
|
|
||||||
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: 'TRK-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: 'TRK-1000',
|
|
||||||
deliverer: 'Transporteur 1',
|
|
||||||
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: 'TRK-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: 'TRK-1000',
|
|
||||||
deliverer: 'Transporteur 1',
|
|
||||||
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: 'TRK-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: 'TRK-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: 'TRK-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: 'TRK-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: 'TRK-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 },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
transporter: 'Transporteur 2',
|
|
||||||
deliveryNote: [
|
|
||||||
{
|
|
||||||
trackingNumber: 'TRK-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: 'TRK-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 },
|
|
||||||
],
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
transporter: 'Transporteur 3',
|
|
||||||
deliveryNote: [
|
|
||||||
{
|
|
||||||
trackingNumber: 'TRK-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: 'TRK-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 },
|
|
||||||
],
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
transporter: 'Transporteur 4',
|
|
||||||
deliveryNote: [
|
|
||||||
{
|
|
||||||
trackingNumber: 'TRK-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: 'TRK-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 },
|
|
||||||
],
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
transporter: 'Transporteur 5',
|
|
||||||
deliveryNote: [
|
|
||||||
{
|
|
||||||
trackingNumber: 'TRK-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: 'TRK-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.fetchDeliverers();
|
||||||
|
}
|
||||||
|
|
||||||
|
async fetchDeliverers() {
|
||||||
|
this.deliverersLoading.set(true)
|
||||||
|
|
||||||
|
try {
|
||||||
|
const deliverers = await firstValueFrom(this.deliverersService.getAllDelivererEndpoint())
|
||||||
|
this.deliverers.set(deliverers);
|
||||||
|
} catch (e) {
|
||||||
|
this.notificationService.error(
|
||||||
|
'Erreur',
|
||||||
|
'Erreur de communication avec l\'API'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
this.deliverersLoading.set(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
async delete(deliverer:number) {
|
||||||
|
try {
|
||||||
|
await firstValueFrom(this.deliverersService.deleteDelivererEndpoint(deliverer))
|
||||||
|
this.notificationService.success(
|
||||||
|
'Success',
|
||||||
|
'Suppression effectuée'
|
||||||
|
)
|
||||||
|
} catch (e) {
|
||||||
|
this.notificationService.error(
|
||||||
|
'Erreur',
|
||||||
|
'Impossible de supprimer la ligne'
|
||||||
|
)
|
||||||
|
}
|
||||||
|
await this.fetchDeliverers();
|
||||||
|
}
|
||||||
|
|
||||||
|
async edit(id: number, updateDelivererComponent: DelivererForm) {
|
||||||
|
if (updateDelivererComponent.delivererForm.invalid) {
|
||||||
|
this.notificationService.error(
|
||||||
|
'Erreur',
|
||||||
|
'Erreur d\'écriture dans le formulaire'
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
|
||||||
|
const deliverers = updateDelivererComponent.delivererForm.getRawValue();
|
||||||
|
await firstValueFrom(this.deliverersService.updateDelivererEndpoint(id, deliverers))
|
||||||
|
|
||||||
|
this.notificationService.success(
|
||||||
|
'Success',
|
||||||
|
'Transporteur modifié'
|
||||||
|
)
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
this.notificationService.error(
|
||||||
|
'Erreur',
|
||||||
|
'Erreur lors de la modification'
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
<p>product-table works!</p>
|
|
||||||
|
|||||||
Reference in New Issue
Block a user