-
-
Index: src/app/manager/create-delivery/create-delivery.component.ts
===================================================================
--- src/app/manager/create-delivery/create-delivery.component.ts (revision 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/manager/create-delivery/create-delivery.component.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -1,12 +1,16 @@
-import { Component } from '@angular/core';
-import { Article, Order } from '../../models';
+import { Component, OnInit } from '@angular/core';
+import { Order } from '../../models';
import { ManagerService } from '../../services/manager.service';
-import { OrderService } from '../../services/order.service';
-import { Delivery } from '../../models/delivery.model';
import { NavbarComponent } from '../../navbar/navbar.component';
import { CommonModule } from '@angular/common';
-import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import {
+ FormBuilder,
+ FormGroup,
+ ReactiveFormsModule,
+ Validators,
+} from '@angular/forms';
import { Router } from '@angular/router';
-import { Driver } from '../../models/driver.model';
+import { Vehicle } from '../../models/vehicle.model';
+import { City } from '../../models/city.model';
@Component({
@@ -14,92 +18,214 @@
imports: [NavbarComponent, CommonModule, ReactiveFormsModule],
templateUrl: './create-delivery.component.html',
- styleUrl: './create-delivery.component.css'
+ styleUrl: './create-delivery.component.css',
})
-export class CreateDeliveryComponent {
- form!: FormGroup;
- undeliveredOrders: Order[] = [];
+export class CreateDeliveryComponent implements OnInit {
+ deliveryForm: FormGroup;
+ cities: City[] = [];
+ vehicles: Vehicle[] = [];
+ availableOrders: Order[] = [];
selectedOrders: Order[] = [];
- deliveryDate: Date | null = null;
- driverName: string = '';
- delivery: Delivery | null = null;
- drivers: Driver[] = [];
- warehouseStock: { [articleId: string]: { quantity: number } } = {};
+ warehouseStock: any[] = [];
+
+ selectedCities: number[] = [];
+ selectedVehicle: Vehicle | null = null;
+ currentWeight: number = 0;
+ maxWeight: number = 0;
+
+ isLoading = false;
+ errorMessage = '';
constructor(
- private orderSvc: OrderService,
private fb: FormBuilder,
+ private managerService: ManagerService,
private router: Router,
- private managerSvc: ManagerService
- ){}
+ ) {
+ this.deliveryForm = this.fb.group({
+ selectedCities: [[], Validators.required],
+ selectedVehicle: [null, Validators.required],
+ deliveryDate: [
+ new Date().toISOString().split('T')[0],
+ Validators.required,
+ ],
+ selectedOrders: [[]],
+ });
+ }
ngOnInit() {
- this.initForm();
- this.loadData();
- }
-
- private initForm(){
- this.form = this.fb.group({
- deliveryDate: ['', Validators.required],
- driverId: ['', Validators.required]
- })
- }
-
- private loadData(){
- this.orderSvc.getUnassignedOrdersForWarehouse().subscribe(orders => {
- this.undeliveredOrders = orders;
- });
-
- this.managerSvc.getAvailableDrivers(this.deliveryDate).subscribe(drivers => {
- this.drivers = drivers;
- });
- }
-
- isOrderAvailable(order: Order): boolean {
- // TODO: Implement order item article list so we can check if all articles are available in the warehouse
- // return order.articles.every(article=> this.warehouseStock[article.id]?.quantity >= article.quantity)
- return false;
- }
-
- getMissingArticles(order: Order): Article[]{
- return order.articles.filter(article=> !this.warehouseStock[article.id] ||
- this.warehouseStock[article.id].quantity < article.quantity
- );
- }
-
- toggleOrderSelection(order: Order){
- if (!this.isOrderAvailable(order)) return;
-
- const index = this.selectedOrders.indexOf(order);
- if(index===-1){
+ this.loadInitialData();
+ }
+
+ loadInitialData() {
+ this.isLoading = true;
+
+ // Load cities and vehicles
+ this.managerService.getAvailableCities().subscribe({
+ next: (cities) => (this.cities = cities),
+ error: (error) => this.handleError('Failed to load cities', error),
+ });
+
+ this.managerService.getAvailableVehicles().subscribe({
+ next: (vehicles) => (this.vehicles = vehicles),
+ error: (error) => this.handleError('Failed to load vehicles', error),
+ });
+
+ // Load warehouse stock
+ this.managerService.getWarehouseStock(1).subscribe({
+ // Replace with actual warehouse ID
+ 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 });
+ }
+ }
+
+ loadOrdersForSelectedCities() {
+ if (this.selectedCities.length === 0) return;
+
+ this.isLoading = true;
+ this.managerService
+ .getUnassignedOrdersByCities(this.selectedCities)
+ .subscribe({
+ next: (orders) => {
+ // Sort by oldest first
+ 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),
+ });
+ }
+
+ onOrderSelectionChange(order: Order, event: any) {
+ const isChecked = event.target.checked;
+
+ if (isChecked) {
+ // Check if adding this order would exceed vehicle capacity
+ 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;
+ }
+
+ // Check stock availability
+ if (!this.checkStockAvailability(order)) {
+ event.target.checked = false;
+ alert('Insufficient stock for this order');
+ return;
+ }
+
this.selectedOrders.push(order);
- }else{
- this.selectedOrders.splice(index,1);
- }
- }
-
- createDelivery(){
- if(this.form.invalid || !this.selectedOrders.length) return;
-
- const delivery: Delivery = {
- orders: this.selectedOrders.map(o=>o.id),
- driverId: this.form.get('driverId')?.value,
- delDate: this.form.get('deliveryDate')?.value,
- delStatus: 'pending'
+ 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, // Pending status
+ orderIds: this.selectedOrders.map((o) => o.ord_id),
};
- this.managerSvc.createDelivery(delivery).subscribe({
- next: () => {
- alert('Delivery created successfully');
+ this.isLoading = true;
+ this.managerService.createDelivery(deliveryData).subscribe({
+ next: (delivery) => {
+ console.log('Delivery created successfully:', delivery);
this.router.navigate(['/manager/deliveries']);
},
- error: () => alert('Failed to create delivery')
- });
- }
-
- private checkOrdersAvailability(){
- this.undeliveredOrders.forEach(order => {
- order.isAvailable = this.isOrderAvailable(order);
- order.missingArticles = this.getMissingArticles(order);
- });
+ 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/models/article-unit.model.ts
===================================================================
--- src/app/models/article-unit.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/article-unit.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -0,0 +1,20 @@
+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;
+ unit_expiration_date: Date;
+ unit_serial_number: string;
+ unit_batch_number: string;
+ unit_manufacture_date: Date;
+ unit_cost_price?: number;
+ wh_id: number;
+ ord_id?: number;
+
+ article?: Article;
+ price?: Price;
+ order?: Order;
+ warehouse?: Warehouse;
+}
Index: src/app/models/article.model.ts
===================================================================
--- src/app/models/article.model.ts (revision 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/models/article.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -1,19 +1,16 @@
+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;
- image?: string;
- // --
- unitPrice: number;
- expirationDate: string;
- minQuantity: number;
- deliveryId: number;
- customerName: string;
- scheduledDate: Date;
+ art_id?: number;
+ art_name: string;
+ art_image: string;
+ art_weight: number;
+ ctg_id: number;
+ man_id: number;
+
+ category?: Category;
+ manufacturer?: Manufacturer;
+ currentPrice?: Price;
}
Index: src/app/models/city.model.ts
===================================================================
--- src/app/models/city.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/city.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -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 f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/delivery-status.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -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 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/models/delivery.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -1,7 +1,14 @@
+import { Order } from "./order.model";
+
export interface Delivery {
- delDate: string;
- driverName: string;
- delStatus: string;
- orders: number[];
- driverId: number;
+ 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[];
}
Index: src/app/models/order-item.model.ts
===================================================================
--- src/app/models/order-item.model.ts (revision 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/models/order-item.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -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 f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/order-status.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -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 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/models/order.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -1,13 +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;
- isAvailable?: boolean;
- missingArticles?: any[];
+ 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 f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/price.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -0,0 +1,6 @@
+export interface Price {
+ price_id?: number;
+ price: number;
+ price_eff_date: Date;
+ art_id: number;
+}
Index: src/app/models/vehicle.model.ts
===================================================================
--- src/app/models/vehicle.model.ts (revision 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/models/vehicle.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -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.model.ts
===================================================================
--- src/app/models/warehouse.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
+++ src/app/models/warehouse.model.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -0,0 +1,5 @@
+export interface Warehouse {
+ wh_id?: number;
+ wh_adr: string;
+ city_id: number;
+}
Index: src/app/services/manager.service.ts
===================================================================
--- src/app/services/manager.service.ts (revision 2a70e767a5f1c71871b063de4c71c47db9ad4fa0)
+++ src/app/services/manager.service.ts (revision f16a4053009d6b32b8cae21821489c82300e54a2)
@@ -1,3 +1,3 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
@@ -7,4 +7,8 @@
import { ProForma, 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';
@Injectable({
@@ -53,3 +57,24 @@
return this.http.get
(`${environment.apiUrl}/driver/manager/list-all`);
}
+
+ getAvailableCities(): Observable {
+ return this.http.get(`${environment.apiUrl}/manager/cities`);
}
+
+getAvailableVehicles(): Observable {
+ return this.http.get(`${environment.apiUrl}/manager/vehicles`);
+}
+
+getUnassignedOrdersByCities(cityIds: number[]): Observable {
+ const params = new HttpParams().set('cityIds', cityIds.join(','));
+ return this.http.get(`${environment.apiUrl}/manager/orders/unassigned`, { params });
+}
+
+getWarehouseStock(warehouseId: number): Observable {
+ return this.http.get(`${environment.apiUrl}/manager/warehouse/${warehouseId}/stock`);
+}
+
+createDelivery(deliveryData: any): Observable {
+ return this.http.post(`${environment.apiUrl}/manager/delivery/create`, deliveryData);
+}
+}