Erweiterung der Footer-Tabelle abgeschlossen

tpoerschke · Jan 31, 2024 · e7e3350 · e7e3350
1 parent 839756f
commit e7e3350
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 6 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/src/main/java/timkodiert/budgetBook/table/monthlyOverview/TableData.java b/src/main/java/timkodiert/budgetBook/table/monthlyOverview/TableData.java
@@ -0,0 +1,14 @@
+package timkodiert.budgetBook.table.monthlyOverview;
+
+import java.time.LocalDate;
+
+import timkodiert.budgetBook.util.HasType;
+import timkodiert.budgetBook.view.MonthlyOverview.RowType;
+
+public record TableData(String position, double value, LocalDate date, String categories, RowType type) implements HasType<RowType> {
+
+    @Override
+    public RowType getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/timkodiert/budgetBook/util/HasType.java b/src/main/java/timkodiert/budgetBook/util/HasType.java
@@ -0,0 +1,5 @@
+package timkodiert.budgetBook.util;
+
+public interface HasType <T> {
+    T getType();
+}
diff --git a/src/main/java/timkodiert/budgetBook/view/MonthlyOverview.java b/src/main/java/timkodiert/budgetBook/view/MonthlyOverview.java
@@ -96,7 +96,12 @@ public void initialize(URL location, ResourceBundle resources) {
                     .filter(d -> !RowType.getGroupTypes().contains(d.type()))
                     .mapToDouble(TableData::value).sum();
             sumTable.getItems().clear();
-            sumTable.getItems().add(new TableData(LanguageManager.getInstance().getLocString("monthlyOverview.label.sum"), totalSum, null, null, RowType.SUM));
+            sumTable.getItems()
+                    .add(new TableData(LanguageManager.getInstance().getLocString("monthlyOverview.label.sumExpenses"),
+                                       totalSum,
+                                       null,
+                                       null,
+                                       RowType.SUM));
 
             // Summe der Einnahmen für den Monat
             double incomeSum = fixedExpenseRepository.findAll()
@@ -110,8 +115,9 @@ public void initialize(URL location, ResourceBundle resources) {
                                                 .filter(t -> t.getTotalValue() > 0)
                                                 .mapToDouble(UniqueTurnover::getTotalValue)
                                                 .sum();
-            sumTable.getItems().add(new TableData("Einnahmen (Summe)", incomeSum, null, null, RowType.SUM));
-            sumTable.getItems().add(new TableData("Summe", incomeSum + totalSum, null, null, RowType.TOTAL_SUM));
+
+            sumTable.getItems().addAll(new TableData(LanguageManager.get("monthlyOverview.label.sumEarnings"), incomeSum, null, null, RowType.SUM),
+                                       new TableData(LanguageManager.get("monthlyOverview.label.sum"), incomeSum + totalSum, null, null, RowType.TOTAL_SUM));
         });
 
         initDataGroups(MonthYear.now());

diff --git a/src/main/resources/css/RobotoMono-Bold.ttf b/src/main/resources/css/RobotoMono-Bold.ttf
diff --git a/src/main/resources/css/RobotoMono-Regular.ttf b/src/main/resources/css/RobotoMono-Regular.ttf
diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties
@@ -64,7 +64,9 @@ monthlyOverview.sumTable.column.columnX=Spalte X
 monthlyOverview.sumTable.column.c1=C1
 monthlyOverview.sumTable.column.c2=C2
 monthlyOverview.label.monthlyView=Monatsansicht
-monthlyOverview.label.sum=Summe (Ausgaben)
+monthlyOverview.label.sum=Summe
+monthlyOverview.label.sumEarnings=Einnahmen (Summe)
+monthlyOverview.label.sumExpenses=Ausgaben (Summe)
 monthlyOverview.label.uniqueExpenses=Einzigartige Ausgaben
 monthlyOverview.label.fixedExpenses=Wiederkehrende Ausgaben
 

diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties
@@ -65,7 +65,9 @@ monthlyOverview.sumTable.column.columnX=Column X
 monthlyOverview.sumTable.column.c1=C1
 monthlyOverview.sumTable.column.c2=C2
 monthlyOverview.label.monthlyView=Monthly view
-monthlyOverview.label.sum=Sum (expenses)
+monthlyOverview.label.sum=Sum
+monthlyOverview.label.sumEarnings=Earnings (sum)
+monthlyOverview.label.sumExpenses=Expenses (sum)
 monthlyOverview.label.uniqueExpenses=Unique expenses
 monthlyOverview.label.fixedExpenses=Fixed expenses