sanchezvem/pyrofetes-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed error to function to create purchase order

Browse Source
This commit is contained in:
sanchezvem
2026-05-27 12:20:25 +01:00
parent 56d3d1bea7
commit a7ef707388
10 changed files with 118 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/add-product-supplier-form/add-product-supplier-form.ts
+3 -2
View File
@@ -32,15 +32,16 @@ export class AddProductSupplierForm {
});
suppliers = input.required<GetSupplierDto[]>();
products = input.required<GetProductDto[]>();
get lines(): FormArray {
return this.addProductForm.get('lines') as FormArray;
}
addProductToForm(selectedProducts: GetProductDto[]) {
addProductToForm() {
this.lines.clear();
selectedProducts.forEach(x => {
this.products().forEach(x => {
this.lines.push(
new FormGroup({
productId: new FormControl(x.id),
src/app/components/create-purchaseorder-form/create-purchaseorder-form.html
+2 -1
View File
@@ -15,7 +15,8 @@
</nz-form-label>
<nz-form-control nzSpan="12" nzErrorTip="Ce champ est requis">
<nz-select formControlName="supplierId" nzPlaceHolder="Choisir un fournisseur" nzShowSearch>
<nz-select formControlName="supplierId" [nzPlaceHolder]="getBestSupplier().name ?? 'Choisir un fournisseur'"
nzShowSearch>
@for (supplier of suppliers(); track supplier.id) {
<nz-option [nzLabel]="supplier.name" [nzValue]="supplier.id"></nz-option>
}
src/app/components/create-purchaseorder-form/create-purchaseorder-form.ts
+30 -5
View File
@@ -1,4 +1,4 @@
import {Component, input} from '@angular/core';
import {Component, input, OnInit, signal} from '@angular/core';
import {FormBuilder, FormGroup, FormArray, Validators, ReactiveFormsModule, FormControl} from '@angular/forms';
import {GetProductDto, GetSupplierDto} from '../../services/api';
import {NzTableComponent} from "ng-zorro-antd/table";
@@ -8,6 +8,7 @@ import {NzFlexDirective} from "ng-zorro-antd/flex";
import {NzFormControlComponent, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
import {NzInputDirective} from "ng-zorro-antd/input";
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
import {min} from "rxjs";
@Component({
selector: 'app-create-purchaseorder-form',
@@ -29,6 +30,25 @@ import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
})
export class CreatePurchaseorderForm {
suppliers = input.required<GetSupplierDto[]>();
products = input.required<GetProductDto[]>();
getBestSupplier() {
let bestSupplier: GetSupplierDto = this.suppliers()[0];
let maxProducts = 0;
const selectedProducts = this.products().map(x => x.id);
this.suppliers().forEach(x => {
const supplierProductsCount = x.prices.filter(p => selectedProducts.includes(p.productId)).length ?? 0;
if (supplierProductsCount > maxProducts) {
maxProducts = supplierProductsCount;
bestSupplier = x;
}
})
return bestSupplier;
}
createPurchaseOrderForm: FormGroup = new FormGroup({
purchaseConditions: new FormControl<string | null>(null, Validators.required),
@@ -40,16 +60,21 @@ export class CreatePurchaseorderForm {
return this.createPurchaseOrderForm.get('lines') as FormArray;
}
addProductToForm(selectedProducts: GetProductDto[]) {
addProductToForm() {
this.lines.clear();
selectedProducts.forEach(p => {
this.products().forEach(x => {
this.lines.push(
new FormGroup({
productId: new FormControl(p.id),
name: new FormControl(p.name),
productId: new FormControl(x.id),
name: new FormControl(x.name),
quantity: new FormControl(1, [Validators.required, Validators.min(0)])
})
);
});
const bestSupplier = this.getBestSupplier();
this.createPurchaseOrderForm.patchValue({
supplierId: bestSupplier.id,
});
}
}
src/app/components/create-quotation-form/create-quotation-form.ts
+7 -5
View File
@@ -1,4 +1,4 @@
import {Component} from '@angular/core';
import {Component, input} from '@angular/core';
import {
FormArray,
FormBuilder,
@@ -34,6 +34,8 @@ import {GetProductDto} from "../../services/api";
styleUrl: './create-quotation-form.css',
})
export class CreateQuotationForm {
products = input.required<GetProductDto[]>();
createQuotationForm: FormGroup = new FormGroup({
message: new FormControl<string>(null, Validators.required),
purchaseConditions: new FormControl<string>(null, Validators.required),
@@ -44,13 +46,13 @@ export class CreateQuotationForm {
return this.createQuotationForm.get('lines') as FormArray;
}
addProductToForm(selectedProducts: GetProductDto[]) {
addProductToForm() {
this.lines.clear();
selectedProducts.forEach(p => {
this.products().forEach(x => {
this.lines.push(
new FormGroup({
productId: new FormControl(p.id),
name: new FormControl(p.name),
productId: new FormControl(x.id),
name: new FormControl(x.name),
quantity: new FormControl(0, [Validators.required, Validators.min(0)])
})
);
src/app/components/stock-table/stock-table.ts
+2 -2
View File
@@ -41,7 +41,7 @@ export class StockTable implements OnInit {
modal = viewChild.required<ModalNav>('modalNav');
selectionChange = output<number[]>();
productsTables = output<ProductWithQuantity[]>();
productsTables = output<GetProductDto[]>();
selectedProduct: GetProductDto | null = null;
checked: boolean = false;
@@ -56,6 +56,7 @@ export class StockTable implements OnInit {
this.productsLoading.set(true);
try {
const products = await firstValueFrom(this.productsService.getAllProductsEndpoint());
this.productsTables.emit(products);
const productsWithQuantity = await Promise.all(
products.map(async (x) => {
@@ -74,7 +75,6 @@ export class StockTable implements OnInit {
})
);
this.products.set(productsWithQuantity);
this.productsTables.emit(productsWithQuantity);
} catch {
this.notificationService.error('Erreur', 'Erreur de communication avec l\'API');
}
src/app/pages/stock/stock.html
+13 -5
View File
@@ -1,5 +1,5 @@
<div class="flex mt-2">
@if (productIds.length) {
@if (productIds().length) {
<app-modal-button #modalButtonPurchaseOrder
(click)="openPurchaseOrderForm()"
(ok)="onModalPurchaseOrderOk()"
@@ -8,7 +8,10 @@
name="Créer un bon de commande"
size="35%"
class="ml-4">
<app-create-purchaseorder-form #purchaseOrderForm [suppliers]="suppliers()"></app-create-purchaseorder-form>
<app-create-purchaseorder-form #purchaseOrderForm
[suppliers]="suppliers()"
[products]="selectedProducts()">
</app-create-purchaseorder-form>
</app-modal-button>
<app-modal-button #modalButtonQuotation
@@ -19,7 +22,9 @@
(click)="openQuotationForm()"
(ok)="onModalQuotationOk()"
(cancel)="onModalQuotationCancel()">
<app-create-quotation-form #quotationForm></app-create-quotation-form>
<app-create-quotation-form #quotationForm
[products]="selectedProducts()">
</app-create-quotation-form>
</app-modal-button>
<app-modal-button #modalButtonSupplier
@@ -30,13 +35,16 @@
(click)="openSupplierForm()"
(ok)="onModalSupplierOk()"
(cancel)="onModalSupplierCancel()">
<app-add-product-supplier-form #supplierForm [suppliers]="suppliers()"></app-add-product-supplier-form>
<app-add-product-supplier-form #supplierForm
[suppliers]="suppliers()"
[products]="selectedProducts()">
</app-add-product-supplier-form>
</app-modal-button>
}
</div>
<div class="mt-4">
<app-stock-table (selectionChange)="productIds = $event"
<app-stock-table (selectionChange)="onSelectionChange($event)"
(productsTables)="products.set($event)">
</app-stock-table>
</div>
src/app/pages/stock/stock.ts
+18 -13
View File
@@ -4,6 +4,8 @@ import {ModalButton} from "../../components/modal-button/modal-button";
import {CreatePurchaseorderForm} from "../../components/create-purchaseorder-form/create-purchaseorder-form";
import {NzNotificationService} from "ng-zorro-antd/notification";
import {
CreatePurchaseOrderDto,
GetProductDto,
GetSupplierDto,
PurchaseordersService,
QuotationsService,
@@ -39,35 +41,36 @@ export class Stock implements OnInit {
private suppliersService = inject(SuppliersService);
private notificationService = inject(NzNotificationService);
products = signal([]);
products = signal<GetProductDto[]>([]);
suppliers = signal<GetSupplierDto[]>([]);
selectedProducts = signal([]);
productIds = [];
productIds = signal<number[]>([]);
async ngOnInit() {
try {
const suppliers = await firstValueFrom(this.suppliersService.getAllSuppliersEndpoint());
this.suppliers.set(suppliers);
}
catch {
} catch {
this.notificationService.error('Erreur', 'Erreur de communication avec l\'API');
}
}
getSelectedProducts() {
return this.products().filter(x => this.productIds.includes(x.id));
onSelectionChange(ids: number[]) {
this.productIds.set(ids);
this.selectedProducts.set(this.products().filter(x => ids.includes(x.id)));
}
openPurchaseOrderForm() {
this.createPurchaseOrder().addProductToForm(this.getSelectedProducts());
this.createPurchaseOrder().addProductToForm();
}
openQuotationForm() {
this.createQuotation().addProductToForm(this.getSelectedProducts());
this.createQuotation().addProductToForm();
}
openSupplierForm() {
this.addProduct().addProductToForm(this.getSelectedProducts());
this.addProduct().addProductToForm();
}
async addPurchaseOrder() {
@@ -88,9 +91,10 @@ export class Stock implements OnInit {
return;
}
const purchaseOrder = {
purchaseConditions: form.get('purchaseConditions')!.value,
products: orderLines
const purchaseOrder: CreatePurchaseOrderDto = {
purchaseConditions: form.value.purchaseConditions,
products: orderLines,
supplierId: form.value.supplierId
};
try {
@@ -163,7 +167,8 @@ export class Stock implements OnInit {
);
success++;
} catch {}
} catch {
}
}
this.notificationService.success('Succès', `${success} produits ajoutés`);
}
src/app/services/api/model/create-purchase-order-dto.ts
+1
View File
@@ -12,6 +12,7 @@ import {CreatePurchaseOrderProductDto} from './create-purchase-order-product-dto
export interface CreatePurchaseOrderDto {
purchaseConditions?: string | null;
supplierId?: number;
products?: Array<CreatePurchaseOrderProductDto> | null;
}