From 105c168157a487733f1381b7119a1efd527413bb Mon Sep 17 00:00:00 2001 From: localhorst Date: Wed, 3 Oct 2018 22:19:29 +0200 Subject: [PATCH] Finished the categories, Again --- src/application/DBController.java | 13 ++++++---- src/application/MainWindowController.java | 29 +++++++++++++---------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/application/DBController.java b/src/application/DBController.java index f3c5a8b..91b0295 100644 --- a/src/application/DBController.java +++ b/src/application/DBController.java @@ -109,9 +109,14 @@ class DBController e.printStackTrace(); } - for (int i = 1; i < 6; i++) { - fillCategory_Category(i, "Standard"); - } + + fillCategory_Category(1, "Essen"); + fillCategory_Category(2, "alkoholische Getränke"); + fillCategory_Category(3, "alkoholfreie Getränke"); + fillCategory_Category(4, "Kuchen"); + fillCategory_Category(5, "Standard"); + + } @@ -133,7 +138,7 @@ class DBController } if (catInPos == 6) { - return "keine Kategorie"; + return "Standard"; } try { diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index d419ff7..cea8c00 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -423,6 +423,7 @@ public class MainWindowController dbc.setName_Positionen(idPositionen, "Noch frei"); dbc.setValue_Positionen(idPositionen, "0.00"); dbc.setColor_Positionen(idPositionen, "#FAF0E6"); + dbc.setCat_Positionen(idPositionen, 6); fillTablePositionen(); // fill TreeTable 'Positionen' } @@ -673,20 +674,22 @@ public class MainWindowController ObservableList cats = FXCollections.observableArrayList(); - /* - * for(int i = 1; i < 6; i++) { - * - * if(dbc.getName_Category(i).equals("Standard")) { - * - * }else { cats.add(dbc.getName_Category(i)); } - * - * } - */ + for (int i = 1; i < 5; i++) { - cats.add(dbc.getName_Category(1)); - cats.add(dbc.getName_Category(2)); - cats.add(dbc.getName_Category(3)); - cats.add(dbc.getName_Category(4)); + if (dbc.getName_Category(i).equals("Standard")) { + + } else { + cats.add(dbc.getName_Category(i)); + } + + } + + /* + * cats.add(dbc.getName_Category(1)); + * + * cats.add(dbc.getName_Category(2)); cats.add(dbc.getName_Category(3)); + * cats.add(dbc.getName_Category(4)); + */ cats.add(dbc.getName_Category(5)); catChoise.setItems(cats);