Index: src/app/customer/create-order/create-order.component.html =================================================================== --- src/app/customer/create-order/create-order.component.html (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/customer/create-order/create-order.component.html (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -104,9 +104,11 @@ - {{ it.article.name }} - ${{ it.article.price.toFixed(2) }} - {{ it.article.manufacturer }} + {{ it.article?.art_name }} + ${{ it.article?.currentPrice }} + {{ it.article?.manufacturer }} {{ it.quantity }} - ${{ (it.article.price * it.quantity).toFixed(2) }} + + + + + + + + + + Index: src/app/manager/create-delivery/create-delivery.component.ts =================================================================== --- src/app/manager/create-delivery/create-delivery.component.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/manager/create-delivery/create-delivery.component.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,11 +1,255 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; +import { Order } from '../../models'; +import { ManagerService } from '../../services/manager.service'; +import { NavbarComponent } from '../../navbar/navbar.component'; +import { CommonModule } from '@angular/common'; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, + Validators, +} from '@angular/forms'; +import { Router } from '@angular/router'; +import { Vehicle } from '../../models/vehicle.model'; +import { City } from '../../models/city.model'; @Component({ selector: 'app-create-delivery', - imports: [], + imports: [NavbarComponent, CommonModule, ReactiveFormsModule], templateUrl: './create-delivery.component.html', - styleUrl: './create-delivery.component.css' + styleUrl: './create-delivery.component.css', }) -export class CreateDeliveryComponent { - +export class CreateDeliveryComponent implements OnInit { + deliveryForm: FormGroup; + cities: City[] = []; + vehicles: Vehicle[] = []; + availableOrders: Order[] = []; + selectedOrders: Order[] = []; + warehouseStock: any[] = []; + + selectedCities: number[] = []; + selectedVehicle: Vehicle | null = null; + currentWeight: number = 0; + maxWeight: number = 0; + + isLoading = false; + errorMessage = ''; + + constructor( + private fb: FormBuilder, + private managerService: ManagerService, + private router: Router, + ) { + this.deliveryForm = this.fb.group({ + selectedCities: [[], Validators.required], + selectedVehicle: [null, Validators.required], + deliveryDate: [ + new Date().toISOString().split('T')[0], + Validators.required, + ], + selectedOrders: [[]], + }); + } + + ngOnInit() { + this.loadInitialData(); + this.deliveryForm.get('deliveryDate')?.valueChanges.subscribe((date) => { + if (date) { + this.loadAvailableVehicles(date); + } + }); + } + + loadInitialData() { + this.isLoading = true; + + this.managerService.getAvailableCities().subscribe({ + next: (cities) => (this.cities = cities), + error: (error) => this.handleError('Failed to load cities', error), + }); + + const initialDate = this.deliveryForm.get('deliveryDate')?.value; + if (initialDate) { + this.loadAvailableVehicles(initialDate); + } + + this.managerService.getWarehouseStock().subscribe({ + next: (stock) => (this.warehouseStock = stock), + error: (error) => + this.handleError('Failed to load warehouse stock', error), + }); + + this.isLoading = false; + } + + onCitySelectionChange(event: any) { + const cityId = parseInt(event.target.value); + const isChecked = event.target.checked; + + if (isChecked) { + this.selectedCities.push(cityId); + } else { + this.selectedCities = this.selectedCities.filter((id) => id !== cityId); + } + + this.deliveryForm.patchValue({ selectedCities: this.selectedCities }); + + if (this.selectedCities.length > 0) { + this.loadOrdersForSelectedCities(); + } else { + this.availableOrders = []; + } + } + + onVehicleChange(event: any) { + const vehicleId = parseInt(event.target.value); + this.selectedVehicle = + this.vehicles.find((v) => v.veh_id === vehicleId) || null; + + if (this.selectedVehicle) { + this.maxWeight = this.selectedVehicle.veh_carry_weight; + this.deliveryForm.patchValue({ selectedVehicle: vehicleId }); + } + } + + loadAvailableVehicles(deliveryDate: string) { + this.managerService.getAvailableVehicles(deliveryDate).subscribe({ + next: (vehicles) => { + this.vehicles = vehicles; + // Reset selected vehicle if it's no longer available + if ( + this.selectedVehicle && + !vehicles.find((v) => v.veh_id === this.selectedVehicle!.veh_id) + ) { + this.selectedVehicle = null; + this.maxWeight = 0; + this.deliveryForm.patchValue({ selectedVehicle: null }); + } + }, + error: (error) => this.handleError('Failed to load vehicles', error), + }); + } + + loadOrdersForSelectedCities() { + if (this.selectedCities.length === 0) return; + + this.isLoading = true; + this.managerService + .getUnassignedOrdersByCities(this.selectedCities) + .subscribe({ + next: (orders) => { + this.availableOrders = orders.sort( + (a, b) => + new Date(a.ord_date).getTime() - new Date(b.ord_date).getTime(), + ); + }, + error: (error) => this.handleError('Failed to load orders', error), + complete: () => (this.isLoading = false), + }); + } + + onDeliveryDateChange(event: any) { + const selectedDate = event.target.value; + if (selectedDate) { + this.loadAvailableVehicles(selectedDate); + } + } + + onOrderSelectionChange(order: Order, event: any) { + const isChecked = event.target.checked; + + if (isChecked) { + const newWeight = this.currentWeight + (order.totalWeight || 0); + if (newWeight > this.maxWeight) { + event.target.checked = false; + alert( + `Adding this order would exceed vehicle capacity (${this.maxWeight}kg)`, + ); + return; + } + + if (!this.checkStockAvailability(order)) { + event.target.checked = false; + alert('Insufficient stock for this order'); + return; + } + + this.selectedOrders.push(order); + this.currentWeight = newWeight; + } else { + this.selectedOrders = this.selectedOrders.filter( + (o) => o.ord_id !== order.ord_id, + ); + this.currentWeight -= order.totalWeight || 0; + } + + this.deliveryForm.patchValue({ + selectedOrders: this.selectedOrders.map((o) => o.ord_id), + }); + } + + checkStockAvailability(order: Order): boolean { + if (!order.orderItems) return true; + + return order.orderItems.every((item) => { + const stockItem = this.warehouseStock.find( + (s) => s.art_id === item.art_id, + ); + return stockItem && stockItem.available_quantity >= item.quantity; + }); + } + + getSelectedCityNames(): string { + return this.cities + .filter((city) => this.selectedCities.includes(city.city_id)) + .map((city) => city.city_name) + .join(', '); + } + + getWeightPercentage(): number { + return this.maxWeight > 0 ? (this.currentWeight / this.maxWeight) * 100 : 0; + } + + getWeightBarClass(): string { + const percentage = this.getWeightPercentage(); + if (percentage < 50) return 'bg-success'; + if (percentage < 80) return 'bg-warning'; + return 'bg-danger'; + } + + onCreateDelivery() { + if (this.deliveryForm.invalid || this.selectedOrders.length === 0) { + this.errorMessage = + 'Please fill all required fields and select at least one order'; + return; + } + + const deliveryData = { + del_date: this.deliveryForm.value.deliveryDate, + del_date_created: new Date(), + veh_id: this.selectedVehicle?.veh_id, + d_status_id: 1, + orderIds: this.selectedOrders.map((o) => o.ord_id), + }; + + this.isLoading = true; + this.managerService.createDelivery(deliveryData).subscribe({ + next: (delivery) => { + console.log('Delivery created successfully:', delivery); + this.router.navigate(['/manager/deliveries']); + }, + error: (error) => this.handleError('Failed to create delivery', error), + complete: () => (this.isLoading = false), + }); + } + + private handleError(message: string, error: any) { + console.error(message, error); + this.errorMessage = message; + this.isLoading = false; + } + + public navigateToDeliveries(): void { + this.router.navigate(['/manager/deliveries']); + } } Index: src/app/manager/manager-dashboard/manager-dashboard.component.html =================================================================== --- src/app/manager/manager-dashboard/manager-dashboard.component.html (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/manager/manager-dashboard/manager-dashboard.component.html (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -18,5 +18,5 @@ - {{ order.id }} + {{ order.ord_id }} + {{ delivery.del_id }} {{ delivery.driverName }} - + {{ delivery.deliveryStatus }} + {{ delivery.orderCount }} Index: src/app/manager/manager-warehouse/manager-warehouse.component.html =================================================================== --- src/app/manager/manager-warehouse/manager-warehouse.component.html (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/manager/manager-warehouse/manager-warehouse.component.html (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -3,5 +3,5 @@

Warehouse Management

- +
@@ -61,17 +61,38 @@ - - {{ article.name }} - {{ article.quantity }} - {{ article.unitPrice | currency }} - {{ (article.quantity * article.unitPrice) | currency }} - - - {{ getStockLevel(article.quantity, article.minQuantity) | titlecase }} + + {{ stock.article.art_name }} + {{ stock.quantity }} + {{ stock.article.price | currency }} + {{ stock.quantity * (stock.sellingPrice) | currency }} + + + {{ + getStockLevel( + stock.quantity, + getMinQuantity(stock) + ) | titlecase + }} - {{ article.expirationDate | date }} + {{ stock.nearestExpirationDate | date }} @@ -104,9 +125,9 @@ - {{ article.name }} + {{ article.article.art_name }} {{ article.quantity }} - {{ article.deliveryId }} - {{ article.customerName }} - {{ article.scheduledDate | date }} + @@ -138,14 +159,17 @@ - - {{ article.name }} + + {{ article.article.art_name }} {{ article.quantity }} - {{ getDaysUntilExpiration(article.expirationDate) }} days + {{ getDaysUntilExpiration(article.nearestExpirationDate) }} days - {{ article.expirationDate | date }} - {{ (article.quantity * article.unitPrice) | currency }} + {{ article.nearestExpirationDate | date }} + {{ article.quantity * (article.sellingPrice) | currency }} @@ -178,16 +202,24 @@ - - {{ article.name }} + + {{ article.article.art_name }} {{ article.quantity }} - {{ article.expirationDate | date }} + {{ article.nearestExpirationDate | date }} - {{ Math.abs(getDaysUntilExpiration(article.expirationDate)) }} days ago + {{ + Math.abs(getDaysUntilExpiration(article.nearestExpirationDate)) + }} + days ago - {{ (article.quantity * article.unitPrice) | currency }} - - + {{ article.quantity * (article.sellingPrice) | currency }} + + @@ -221,14 +253,28 @@ - + {{ forecast.articleName }} {{ forecast.currentStock }} {{ forecast.dailyUsage }} - + {{ forecast.daysRemaining }} days @@ -236,7 +282,22 @@ {{ forecast.estimatedRefillDate | date }} - Urgent - Soon - OK + Urgent + Soon + OK Index: src/app/manager/manager-warehouse/manager-warehouse.component.ts =================================================================== --- src/app/manager/manager-warehouse/manager-warehouse.component.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/manager/manager-warehouse/manager-warehouse.component.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -2,7 +2,7 @@ import { NavbarComponent } from '../../navbar/navbar.component'; import { CommonModule } from '@angular/common'; -import { Article } from '../../models'; import { StockForecast } from '../../models/stock-forecast.model'; import { WarehouseService } from '../../services/warehouse.service'; +import { WarehouseStock } from '../../models/warehouse-stock.model'; @Component({ @@ -13,11 +13,10 @@ }) export class ManagerWarehouseComponent { - availableArticles: Article[] = []; - pendingDeliveryArticles: Article[] = []; - nearExpirationArticles: Article[] = []; - expiredArticles: Article[] = []; + availableArticles: WarehouseStock[] = []; + pendingDeliveryArticles: WarehouseStock[] = []; + nearExpirationArticles: WarehouseStock[] = []; + expiredArticles: WarehouseStock[] = []; stockForecast: StockForecast[] = []; totalLoss: number = 0; - warehouseId: number = 1; public Math = Math; @@ -31,17 +30,17 @@ loadWarehouseData() { this.warehouseService - .getAvailableArticles(this.warehouseId) + .getAvailableArticles() .subscribe((articles) => (this.availableArticles = articles)); this.warehouseService - .getPendingDeliveryArticles(this.warehouseId) + .getPendingDeliveryArticles() .subscribe((articles) => (this.pendingDeliveryArticles = articles)); this.warehouseService - .getNearExpirationArticles(this.warehouseId) + .getNearExpirationArticles() .subscribe((articles) => (this.nearExpirationArticles = articles)); this.warehouseService - .getExpiredArticles(this.warehouseId) + .getExpiredArticles() .subscribe((articles) => (this.expiredArticles = articles)); this.warehouseService - .getStockForecast(this.warehouseId) + .getStockForecast() .subscribe((forecast) => (this.stockForecast = forecast)); } @@ -49,6 +48,5 @@ calculateTotalLoss() { this.totalLoss = this.expiredArticles.reduce( - (sum, article) => sum + article.quantity * article.unitPrice, - 0, + (sum, stock) => sum + stock.quantity * (stock.article.price || 0), 0 ); } @@ -62,8 +60,14 @@ getStockLevel(quantity: number, minQuantity: number): string { + const minQty = minQuantity ?? 10; + if (quantity <= 0) return 'out-of-stock'; - if (quantity <= minQuantity) return 'low-stock'; - if (quantity <= minQuantity * 2) return 'medium-stock'; + if (quantity <= minQty) return 'low-stock'; + if (quantity <= minQty * 2) return 'medium-stock'; return 'high-stock'; } + + getMinQuantity(stock: WarehouseStock): number { + return stock.article?.minQuantity ?? 10; } +} Index: src/app/models/article-unit.model.ts =================================================================== --- src/app/models/article-unit.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/article-unit.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,31 @@ +import { Article } from "./article.model"; +import { Order } from "./order.model"; +import { Price } from "./price.model"; +import { Warehouse } from "./warehouse.model"; + +export interface ArticleUnit { + unit_id?: number; + id?: number; + unit_expiration_date: string; + expiryDate?: string; + unit_serial_number: string; + serialNo?: string; + unit_batch_number: string; + batchNo?: string; + unit_manufacture_date: string; + manufactureDate?: string; + unit_cost_price?: number; + costPrice?: number; + wh_id: number; + whId?: number; + art_id: number; + artId?: number; + ord_id?: number; + ordId?: number; + + // Joined properties from DTOs + artName?: string; + whRegion?: string; + whCity?: string; + customerEmail?: string; +} Index: src/app/models/article.model.ts =================================================================== --- src/app/models/article.model.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/models/article.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,19 +1,51 @@ +import { Category } from './category.model'; +import { Manufacturer } from './manufacturer.model'; +import { Price } from './price.model'; + export interface Article { - id: number; - name: string; - manufacturer: string; - quantity: number; - manufacturerId: number; - price: number; - category: string; - categoryId: number; - weight: number; + art_id?: number; + id?: number; + art_name: string; + name?: string; + art_image: string; image?: string; - // -- - unitPrice: number; - expirationDate: string; - minQuantity: number; - deliveryId: number; - customerName: string; - scheduledDate: Date; + art_weight: number; + weight?: number; + ctg_id: number; + categoryId?: number; + man_id: number; + manufacturerId?: number; + + category?: Category | string; + manufacturer?: Manufacturer | string; + currentPrice?: Price | number; + quantity?: number; + price?: number; + minQuantity?: number; } + +export function adaptArticle(backendArticle: any): Article { + return { + art_id: backendArticle.id || backendArticle.art_id, + id: backendArticle.id || backendArticle.art_id, + art_name: backendArticle.name || backendArticle.art_name, + name: backendArticle.name || backendArticle.art_name, + art_image: backendArticle.image || backendArticle.art_image, + image: backendArticle.image || backendArticle.art_image, + art_weight: backendArticle.weight || backendArticle.art_weight, + weight: backendArticle.weight || backendArticle.art_weight, + ctg_id: backendArticle.categoryId || backendArticle.ctg_id, + categoryId: backendArticle.categoryId || backendArticle.ctg_id, + man_id: backendArticle.manufacturerId || backendArticle.man_id, + manufacturerId: backendArticle.manufacturerId || backendArticle.man_id, + + category: backendArticle.category, + manufacturer: backendArticle.manufacturer, + currentPrice: backendArticle.price || backendArticle.currentPrice, + price: backendArticle.price || + (typeof backendArticle.currentPrice === 'object' ? + backendArticle.currentPrice.price : + backendArticle.currentPrice), + quantity: backendArticle.quantity + }; +} Index: src/app/models/city.model.ts =================================================================== --- src/app/models/city.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/city.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,4 @@ +export interface City { + city_id: number; + city_name: string; +} Index: src/app/models/delivery-status.model.ts =================================================================== --- src/app/models/delivery-status.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/delivery-status.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,5 @@ +export interface DeliveryStatus { + d_status_id: number; + d_status_name: string; + d_status_desc: string; +} Index: src/app/models/delivery.model.ts =================================================================== --- src/app/models/delivery.model.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/models/delivery.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,5 +1,20 @@ +import { Order } from "./order.model"; + export interface Delivery { - delDate: string; - driverName: string; - delStatus: string; + del_id?: number; + del_date_created: Date; + del_date: Date; + del_start_time?: string; + del_end_time?: string; + del_start_km?: number; + del_end_km?: number; + d_status_id: number; + veh_id: number; + orders?: Order[]; + + driverId?: number; + driverName?: string; + driverImage?: string; + deliveryStatus?: string; + orderCount?: number; } Index: src/app/models/order-item.model.ts =================================================================== --- src/app/models/order-item.model.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/models/order-item.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,6 +1,12 @@ -import { Article } from "./article.model"; +import { Article } from './article.model'; export interface OrderItem { - article: Article; + item_id?: number; + ord_id: number; + art_id: number; quantity: number; + unit_price: number; + total_price?: number; + + article?: Article; } Index: src/app/models/order-status.model.ts =================================================================== --- src/app/models/order-status.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/order-status.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,5 @@ +export interface OrderStatus { + o_status_id: number; + o_status_name: string; + o_status_desc: string; +} Index: src/app/models/order.model.ts =================================================================== --- src/app/models/order.model.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/models/order.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,11 +1,22 @@ +import { ArticleUnit } from './article-unit.model'; +import { Customer } from './customer.model'; +import { OrderItem } from './order-item.model'; +import { OrderStatus } from './order-status.model'; + export interface Order { - id: number; - ordDate: string; - ordSum: number; - ordFulfillmentDate: string; - ordComment: string; - oStatusId: number; - customerId: number; - deliveryId: number; - pfId: number; + ord_id: number; + ord_date: string; + ord_sum: number; + ord_fulfillment_date?: string; + ord_comment?: string; + user_id: number; + o_status_id: number; + wh_id: number; + city_id: number; + + customerName?: string; + customerAddress?: string; + cityName?: string; + orderItems?: OrderItem[]; + totalWeight?: number; } Index: src/app/models/price.model.ts =================================================================== --- src/app/models/price.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/price.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,6 @@ +export interface Price { + price_id?: number; + price: number; + price_eff_date: Date; + art_id: number; +} Index: src/app/models/vehicle-availability.model.ts =================================================================== --- src/app/models/vehicle-availability.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/vehicle-availability.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,6 @@ +import { Vehicle } from './vehicle.model'; + +export interface VehicleAvailability extends Vehicle { + isAvailable: boolean; + conflictingDeliveryId?: number; +} Index: src/app/models/vehicle.model.ts =================================================================== --- src/app/models/vehicle.model.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/models/vehicle.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,8 +1,16 @@ +import { Driver } from "./driver.model"; +import { Warehouse } from "./warehouse.model"; + export interface Vehicle { - id: number; - make: string; - model: string; - year?: number; - licensePlate: string; - capacity?: number; + veh_id: number; + veh_carry_weight: number; + veh_kilometers: number; + veh_service_interval: number; + veh_last_service?: string; + veh_last_service_km?: number; + veh_vin: string; + veh_plate: string; + veh_reg_date: string; + + driver?: Driver; } Index: src/app/models/warehouse-stock.model.ts =================================================================== --- src/app/models/warehouse-stock.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/warehouse-stock.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,53 @@ +import { Article } from "./article.model"; + +export interface WarehouseStock { + article: Article; + quantity: number; + nearestExpirationDate: string; + sellingPrice: number; + costPrice: number; + manufacturerName: string; + categoryName: string; + + profit?: number; + profitMargin?: number; + daysToExpiration?: number; + expirationStatus?: 'ok' | 'near' | 'expired'; +} + +export function getMinQuantity(stock: WarehouseStock): number { + return stock.article?.minQuantity ?? 10; +} + +export function calculateProfitMargin(stock: WarehouseStock): number { + if (!stock.sellingPrice || !stock.costPrice || stock.costPrice === 0) + return 0; + + return ((stock.sellingPrice - stock.costPrice) / stock.costPrice) * 100; +} + +export function calculateDaysToExpiration( + stock: WarehouseStock, +): number | null { + if (!stock.nearestExpirationDate) return null; + + const expDate = new Date(stock.nearestExpirationDate); + const today = new Date(); + + expDate.setHours(0, 0, 0, 0); + today.setHours(0, 0, 0, 0); + + const diffTime = expDate.getTime() - today.getTime(); + return Math.ceil(diffTime / (1000 * 60 * 60 * 24)); +} + +export function getExpirationStatus( + stock: WarehouseStock, +): 'ok' | 'near' | 'expired' { + const daysToExpiration = calculateDaysToExpiration(stock); + + if (daysToExpiration === null) return 'ok'; + if (daysToExpiration < 0) return 'expired'; + if (daysToExpiration <= 7) return 'near'; + return 'ok'; +} Index: src/app/models/warehouse.model.ts =================================================================== --- src/app/models/warehouse.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) +++ src/app/models/warehouse.model.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -0,0 +1,5 @@ +export interface Warehouse { + wh_id?: number; + wh_adr: string; + city_id: number; +} Index: src/app/navbar/navbar.component.html =================================================================== --- src/app/navbar/navbar.component.html (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/navbar/navbar.component.html (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -2,13 +2,6 @@
DistributorApp - @@ -25,12 +18,8 @@
  • - My Deliveries + My Deliveries
  • - My Pro-Formas + My Pro-Formas
  • @@ -38,7 +27,5 @@
  • - Create Order + Create Order
    • @@ -53,7 +40,5 @@
  • - All Deliveries + All Deliveries
  • @@ -67,7 +52,5 @@
  • - - Create Delivery - + Create Delivery
  • @@ -89,33 +72,20 @@
  • - Index: src/app/services/manager.service.ts =================================================================== --- src/app/services/manager.service.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/services/manager.service.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -1,10 +1,20 @@ -import { HttpClient } from '@angular/common/http'; +import { HttpClient, HttpParams } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { map, Observable } from 'rxjs'; import { environment } from '../../environment'; import { Manager } from '../models/manager.model'; import { FinancialSummary } from '../models/financial-summary.model'; -import { ProForma, ProFormaResponseDto } from '../models/pro-forma-dtos.model'; +import { ProFormaResponseDto } from '../models/pro-forma-dtos.model'; import { Driver } from '../models/driver.model'; +import { Vehicle } from '../models/vehicle.model'; +import { City } from '../models/city.model'; +import { Order } from '../models'; +import { Delivery } from '../models/delivery.model'; +import { + calculateDaysToExpiration, + calculateProfitMargin, + getExpirationStatus, + WarehouseStock, +} from '../models/warehouse-stock.model'; @Injectable({ @@ -12,5 +22,5 @@ }) export class ManagerService { - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) {} getProfile(): Observable { @@ -35,21 +45,80 @@ getAllProFormas(): Observable { - return this.http.get(`${environment.apiUrl}/pro-forma/manager/all`); + return this.http.get( + `${environment.apiUrl}/pro-forma/manager/all`, + ); } getMonthlyFinancialSummary(): Observable { - return this.http.get(`${environment.apiUrl}/manager/finances/monthly-report`); + return this.http.get( + `${environment.apiUrl}/manager/finances/monthly-report`, + ); } getQuarterlyFinancialSummary(): Observable { - return this.http.get(`${environment.apiUrl}/manager/finances/quarterly-report`); + return this.http.get( + `${environment.apiUrl}/manager/finances/quarterly-report`, + ); } createProForma(proForma: number): Observable { - return this.http.post(`${environment.apiUrl}/manager/pro-formas`, proForma); + return this.http.post( + `${environment.apiUrl}/manager/pro-formas`, + proForma, + ); } getDrivers(): Observable { - return this.http.get(`${environment.apiUrl}/driver/manager/list-all`); + return this.http.get( + `${environment.apiUrl}/driver/manager/list-all`, + ); + } + + getAvailableCities(): Observable { + return this.http.get( + `${environment.apiUrl}/city/manager/available-cities`, + ); + } + + getAvailableVehicles(deliveryDate?: string): Observable { + let params = new HttpParams(); + if (deliveryDate) { + params = params.set('deliveryDate', deliveryDate); + } + return this.http.get( + `${environment.apiUrl}/vehicle/manager/available-vehicles`, + { params }, + ); + } + + getUnassignedOrdersByCities(cityIds: number[]): Observable { + const params = new HttpParams().set('cityIds', cityIds.join(',')); + return this.http.get( + `${environment.apiUrl}/orders/manager/unassigned-by-city`, + { params }, + ); + } + + getWarehouseStock(): Observable { + return this.http + .get(`${environment.apiUrl}/warehouse/manager/stock`) + .pipe( + map((stocks) => + stocks.map((stock) => ({ + ...stock, + profi: stock.sellingPrice - stock.costPrice, + profitMargin: calculateProfitMargin(stock), + daysToExpiration: calculateDaysToExpiration(stock) ?? undefined, + expirationStatus: getExpirationStatus(stock), + })), + ), + ); + } + + createDelivery(deliveryData: any): Observable { + return this.http.post( + `${environment.apiUrl}/delivery/manager/create`, + deliveryData, + ); } } Index: src/app/services/order.service.ts =================================================================== --- src/app/services/order.service.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/services/order.service.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -50,14 +50,14 @@ orderItems: orderItems.map((it) => ({ article: { - id: it.article.id, - name: it.article.name, - manufacturer: it.article.manufacturer, - quantity: it.article.quantity, - manufacturerId: it.article.manufacturerId, - price: it.article.price, - category: it.article.category, - categoryId: it.article.categoryId, - weight: it.article.weight, - image: it.article.image || null, + id: it.article?.id ?? null, + name: it.article?.name ?? '', + manufacturer: it.article?.manufacturer ?? null, + quantity: it.article?.quantity ?? 0, + manufacturerId: it.article?.manufacturerId ?? null, + price: it.article?.price ?? 0, + category: it.article?.category ?? null, + categoryId: it.article?.categoryId ?? null, + weight: it.article?.weight ?? 0, + image: it.article?.image ?? null, }, quantity: it.quantity, Index: src/app/services/warehouse.service.ts =================================================================== --- src/app/services/warehouse.service.ts (revision c51774242064fe9a1b2d8bcbfc40aaa4ed3b8bab) +++ src/app/services/warehouse.service.ts (revision 0c6e947eb4611c6e4fc6291c79595547748ae3df) @@ -3,4 +3,7 @@ import { StockForecast } from '../models/stock-forecast.model'; import { Article } from '../models'; +import { WarehouseStock } from '../models/warehouse-stock.model'; +import { environment } from '../../environment'; +import { Observable } from 'rxjs'; @Injectable({ @@ -10,31 +13,37 @@ constructor(private http: HttpClient) {} - getAvailableArticles(warehouseId: number) { - return this.http.get( - `/api/warehouses/${warehouseId}/articles/available`, + getWarehouseStock(): Observable { + return this.http.get( + `${environment.apiUrl}/warehouse/stock`, ); } - getPendingDeliveryArticles(warehouseId: number) { - return this.http.get( - `/api/warehouses/${warehouseId}/articles/pending-delivery`, + getAvailableArticles(): Observable { + return this.http.get( + `${environment.apiUrl}/warehouse/articles/available`, ); } - getNearExpirationArticles(warehouseId: number) { - return this.http.get( - `/api/warehouses/${warehouseId}/articles/near-expiration`, + getPendingDeliveryArticles(): Observable { + return this.http.get( + `${environment.apiUrl}/warehouse/articles/pending-delivery`, ); } - getExpiredArticles(warehouseId: number) { - return this.http.get( - `/api/warehouses/${warehouseId}/articles/expired`, + getNearExpirationArticles(): Observable { + return this.http.get( + `${environment.apiUrl}/warehouse/articles/near-expiration`, ); } - getStockForecast(warehouseId: number) { + getExpiredArticles(): Observable { + return this.http.get( + `${environment.apiUrl}/warehouse/articles/expired`, + ); + } + + getStockForecast(): Observable { return this.http.get( - `/api/warehouses/${warehouseId}/stock-forecast`, + `${environment.apiUrl}/warehouse/stock-forecast`, ); }