localhorst
/
jFxKasse
2
0
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Finished the categories, Again

This commit is contained in:
Hendrik Schutter 2018-10-03 22:19:29 +02:00
parent 606b879fb9
commit 105c168157
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/application/DBController.java
View File

@ -109,9 +109,14 @@ class DBController
e.printStackTrace(); 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) { if (catInPos == 6) {
return "keine Kategorie"; return "Standard";
} }
try { try {

29
src/application/MainWindowController.java
View File

@ -423,6 +423,7 @@ public class MainWindowController
dbc.setName_Positionen(idPositionen, "Noch frei"); dbc.setName_Positionen(idPositionen, "Noch frei");
dbc.setValue_Positionen(idPositionen, "0.00"); dbc.setValue_Positionen(idPositionen, "0.00");
dbc.setColor_Positionen(idPositionen, "#FAF0E6"); dbc.setColor_Positionen(idPositionen, "#FAF0E6");
dbc.setCat_Positionen(idPositionen, 6);
fillTablePositionen(); // fill TreeTable 'Positionen' fillTablePositionen(); // fill TreeTable 'Positionen'
} }
@ -673,20 +674,22 @@ public class MainWindowController
ObservableList<String> cats = FXCollections.observableArrayList(); ObservableList<String> cats = FXCollections.observableArrayList();
/* for (int i = 1; i < 5; i++) {
* for(int i = 1; i < 6; i++) {
*
* if(dbc.getName_Category(i).equals("Standard")) {
*
* }else { cats.add(dbc.getName_Category(i)); }
*
* }
*/
cats.add(dbc.getName_Category(1)); if (dbc.getName_Category(i).equals("Standard")) {
cats.add(dbc.getName_Category(2));
cats.add(dbc.getName_Category(3)); } else {
cats.add(dbc.getName_Category(4)); 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)); cats.add(dbc.getName_Category(5));
catChoise.setItems(cats); catChoise.setItems(cats);