diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java index c082f9c..2e73e40 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikController.java @@ -409,7 +409,7 @@ public class DebitorStatistikController implements Serializable { // Datasets 1 result = result + "{label: 'Zahlungsziel',borderWidth: 1,"; - result = result + " \"backgroundColor\" : [\"#EBA05F\"],"; + result = result + " \"backgroundColor\" : [\"#3B6B82\"],"; result = result + "data: ["; for (Map.Entry entry : stats.entrySet()) { @@ -422,7 +422,7 @@ public class DebitorStatistikController implements Serializable { // Datasets 2 result = result + "{label: 'Zahldauer',borderWidth: 1,"; - result = result + " \"backgroundColor\" : [\"#70B088\" ],"; + result = result + " \"backgroundColor\" : [\"#CFE9F5\" ],"; result = result + " trendlineLinear: { colorMin: \"red\", colorMax: \"green\", lineStyle: \"dotted\", width: 2 , projection: true },"; diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java index cb895fa..5d05709 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/DebitorStatistikData.java @@ -13,9 +13,11 @@ public class DebitorStatistikData { int month; int year; - int count = 0; - int averageDueDays; // Zahlungsziel - int averagePaymentDays; // Tatsächliche Zahlung + long count = 0; + long averageDueDays; // Zahlungsziel + long averagePaymentDays; // Tatsächliche Zahlung + long totalDueDays; + long totalPaymentDays; public DebitorStatistikData(Date date) { // Create a Calendar instance and set the date @@ -57,7 +59,10 @@ public class DebitorStatistikData { long diffMilliseconds = milliseconds2 - milliseconds1; long dueTime = diffMilliseconds / (24 * 60 * 60 * 1000); logger.info("...Fälligkeit in tagen= " + dueTime); - averageDueDays = (int) (averageDueDays + dueTime / count); + + totalDueDays = totalDueDays + dueTime; + // averageDueDays = (long) (totalDueDays / count); + averageDueDays = Math.round((double) totalDueDays / count); // Bezahlt nach Tagen milliseconds1 = invoiceDate.getTime(); @@ -65,16 +70,21 @@ public class DebitorStatistikData { // Berechnen Sie die Differenz in Millisekunden diffMilliseconds = milliseconds2 - milliseconds1; long paymentTime = diffMilliseconds / (24 * 60 * 60 * 1000); + + // Fix differenz + // paymentTime = paymentTime - dueTime; logger.info("...Zahlung erfolgte nach tagen= " + paymentTime); - averagePaymentDays = (int) (averagePaymentDays + paymentTime / count); + totalPaymentDays = totalPaymentDays + paymentTime; + // averagePaymentDays = (long) (totalPaymentDays / count); + averagePaymentDays = Math.round((double) totalPaymentDays / count); } - public int getAverageDueDays() { + public long getAverageDueDays() { return averageDueDays; } - public int getAveragePaymentDays() { + public long getAveragePaymentDays() { return averagePaymentDays; }