diff --git a/app/models/charts.server.ts b/app/models/charts.server.ts index d2f02d7..6e5d451 100644 --- a/app/models/charts.server.ts +++ b/app/models/charts.server.ts @@ -32,8 +32,10 @@ export async function generateDrinksChartData(id: number){ var inventoryAfter = []; var lastInventoryAfter = history.length > 0 ? history[0].inventoryAfter + 1 : 0; + var previousCheckoutInventoryAfter = history.length > 0 ? history[0].inventoryAfter : 0; var lastChange = 0; + for(let i = 0; i <= dates.length - 1; i++){ let startDate = dates[i]; let endDate = dates[i+1]; @@ -48,6 +50,16 @@ export async function generateDrinksChartData(id: number){ } } + // There was inventory added + if((lastInventoryAfter + totalCheckouts) > previousCheckoutInventoryAfter){ + if(i > 0 && checkouts[i-1] > 0){ + // Special case, there were also checkouts the previous day, do nothing + } else if(i > 0) { + inventoryAfter[i - 1] = lastInventoryAfter + totalCheckouts; + } + } + previousCheckoutInventoryAfter = lastInventoryAfter; + checkouts[i] = totalCheckouts; inventoryAfter[i] = lastInventoryAfter; }