mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-23 15:08:22 +02:00
Update statistics to show reconciliation rate instead of on-time delivery
Replace 'onTimeRate' with 'reconciliationRate' in storage interfaces and implementations. Update database and in-memory calculations to reflect reconciled status instead of on-time delivery. Replit-Commit-Author: Agent Replit-Commit-Session-Id: 1e4433b5-47ab-464c-b663-fea2e53367dd Replit-Commit-Checkpoint-Type: intermediate_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/1e4433b5-47ab-464c-b663-fea2e53367dd/awJgdDR
This commit is contained in:
1 parent
ea04001729
commit
b24520fda0
1 file changed
+9
-9
+9
-9
@@ -274,7 +274,7 @@ export interface IStorage {
|
|||||||
}): Promise<{
|
}): Promise<{
|
||||||
totalOrders: number;
|
totalOrders: number;
|
||||||
totalDeliveries: number;
|
totalDeliveries: number;
|
||||||
onTimeRate: number;
|
reconciliationRate: number;
|
||||||
totalAmount: number;
|
totalAmount: number;
|
||||||
avgDeliveryDelay: number;
|
avgDeliveryDelay: number;
|
||||||
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
||||||
@@ -2863,7 +2863,7 @@ export class DatabaseStorage implements IStorage {
|
|||||||
}): Promise<{
|
}): Promise<{
|
||||||
totalOrders: number;
|
totalOrders: number;
|
||||||
totalDeliveries: number;
|
totalDeliveries: number;
|
||||||
onTimeRate: number;
|
reconciliationRate: number;
|
||||||
totalAmount: number;
|
totalAmount: number;
|
||||||
avgDeliveryDelay: number;
|
avgDeliveryDelay: number;
|
||||||
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
||||||
@@ -2905,7 +2905,7 @@ export class DatabaseStorage implements IStorage {
|
|||||||
const deliveryQuery = db.select({
|
const deliveryQuery = db.select({
|
||||||
count: sql<number>`COUNT(*)`,
|
count: sql<number>`COUNT(*)`,
|
||||||
totalAmount: sql<number>`COALESCE(SUM(CAST(bl_amount AS NUMERIC)), 0) + COALESCE(SUM(CAST(invoice_amount AS NUMERIC)), 0)`,
|
totalAmount: sql<number>`COALESCE(SUM(CAST(bl_amount AS NUMERIC)), 0) + COALESCE(SUM(CAST(invoice_amount AS NUMERIC)), 0)`,
|
||||||
onTime: sql<number>`COUNT(CASE WHEN delivered_date <= scheduled_date THEN 1 END)`,
|
reconciled: sql<number>`COUNT(CASE WHEN reconciled = true OR reconciled = 1 THEN 1 END)`,
|
||||||
avgDelay: sql<number>`AVG(EXTRACT(EPOCH FROM (delivered_date - scheduled_date)) / 86400)` // days
|
avgDelay: sql<number>`AVG(EXTRACT(EPOCH FROM (delivered_date - scheduled_date)) / 86400)` // days
|
||||||
}).from(deliveries);
|
}).from(deliveries);
|
||||||
if (deliveryConditions.length) deliveryQuery.where(and(...deliveryConditions));
|
if (deliveryConditions.length) deliveryQuery.where(and(...deliveryConditions));
|
||||||
@@ -2949,7 +2949,7 @@ export class DatabaseStorage implements IStorage {
|
|||||||
return {
|
return {
|
||||||
totalOrders: Number(totalOrders) || 0,
|
totalOrders: Number(totalOrders) || 0,
|
||||||
totalDeliveries: Number(deliveryStats.count) || 0,
|
totalDeliveries: Number(deliveryStats.count) || 0,
|
||||||
onTimeRate: deliveryStats.count ? (Number(deliveryStats.onTime) / Number(deliveryStats.count)) * 100 : 0,
|
reconciliationRate: deliveryStats.count ? (Number(deliveryStats.reconciled) / Number(deliveryStats.count)) * 100 : 0,
|
||||||
totalAmount: Number(deliveryStats.totalAmount) || 0,
|
totalAmount: Number(deliveryStats.totalAmount) || 0,
|
||||||
avgDeliveryDelay: Number(deliveryStats.avgDelay) || 0,
|
avgDeliveryDelay: Number(deliveryStats.avgDelay) || 0,
|
||||||
topSuppliers: topSuppliers.map(s => ({
|
topSuppliers: topSuppliers.map(s => ({
|
||||||
@@ -5134,7 +5134,7 @@ export class MemStorage implements IStorage {
|
|||||||
}): Promise<{
|
}): Promise<{
|
||||||
totalOrders: number;
|
totalOrders: number;
|
||||||
totalDeliveries: number;
|
totalDeliveries: number;
|
||||||
onTimeRate: number;
|
reconciliationRate: number;
|
||||||
totalAmount: number;
|
totalAmount: number;
|
||||||
avgDeliveryDelay: number;
|
avgDeliveryDelay: number;
|
||||||
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
topSuppliers: Array<{ id: number; name: string; count: number; amount: number }>;
|
||||||
@@ -5166,10 +5166,10 @@ export class MemStorage implements IStorage {
|
|||||||
// Calculate metrics
|
// Calculate metrics
|
||||||
const totalOrders = filteredOrders.length;
|
const totalOrders = filteredOrders.length;
|
||||||
const totalDeliveries = filteredDeliveries.length;
|
const totalDeliveries = filteredDeliveries.length;
|
||||||
const onTimeDeliveries = filteredDeliveries.filter(d =>
|
const reconciledDeliveries = filteredDeliveries.filter(d =>
|
||||||
d.deliveredDate && d.deliveredDate <= d.scheduledDate
|
d.reconciled === true || d.reconciled === 1
|
||||||
).length;
|
).length;
|
||||||
const onTimeRate = totalDeliveries > 0 ? (onTimeDeliveries / totalDeliveries) * 100 : 0;
|
const reconciliationRate = totalDeliveries > 0 ? (reconciledDeliveries / totalDeliveries) * 100 : 0;
|
||||||
|
|
||||||
const totalAmount = filteredDeliveries.reduce((sum, d) => {
|
const totalAmount = filteredDeliveries.reduce((sum, d) => {
|
||||||
return sum + (parseFloat(d.blAmount as any) || 0) + (parseFloat(d.invoiceAmount as any) || 0);
|
return sum + (parseFloat(d.blAmount as any) || 0) + (parseFloat(d.invoiceAmount as any) || 0);
|
||||||
@@ -5217,7 +5217,7 @@ export class MemStorage implements IStorage {
|
|||||||
return {
|
return {
|
||||||
totalOrders,
|
totalOrders,
|
||||||
totalDeliveries,
|
totalDeliveries,
|
||||||
onTimeRate,
|
reconciliationRate,
|
||||||
totalAmount,
|
totalAmount,
|
||||||
avgDeliveryDelay: 0, // Simplified for development
|
avgDeliveryDelay: 0, // Simplified for development
|
||||||
topSuppliers,
|
topSuppliers,
|
||||||
|
|||||||
Reference in new issue
Block a user