Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into stable

Browse Source
This commit is contained in:
Richard Reiswich 2023-02-06 09:35:18 +01:00
commit 7b7889fee4
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/bib/essensbestellungsverwaltung/Allergy.java
View File

@ -26,4 +26,9 @@ public class Allergy {
public String getHandle() { public String getHandle() {
return handle; return handle;
} }
@Override
public String toString() {
return getName();
}
} }

5
src/main/java/com/bib/essensbestellungsverwaltung/AllergySeverity.java
View File

@ -26,4 +26,9 @@ public class AllergySeverity {
public String getSeverity() { public String getSeverity() {
return severity; return severity;
} }
@Override
public String toString() {
return getAllergy().getName() + " (" + getSeverity() + ")";
}
} }

36
src/main/java/com/bib/essensbestellungsverwaltung/ChildViewController.java
View File

@ -2,6 +2,8 @@
package com.bib.essensbestellungsverwaltung; package com.bib.essensbestellungsverwaltung;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
@ -35,6 +37,7 @@ public class ChildViewController implements Initializable {
//public TextField allergies; //public TextField allergies;
@FXML @FXML
public ListView allergiesList; public ListView allergiesList;
ObservableList olAllergiesList;
@FXML @FXML
public ComboBox selectAllergy; public ComboBox selectAllergy;
@FXML @FXML
@ -71,17 +74,21 @@ public class ChildViewController implements Initializable {
if(childData) { if(childData) {
Address adress = new Address(streetString, numberString, plzString, cityString); Address adress = AccountMgr.currentUser.getAddress();
List<Allergy> childAllergyList = allergiesList.getItems(); var olChildAllergyList = allergiesList.getItems();
List<AllergySeverity> childAllergyList = new ArrayList<>();
for (var o : olChildAllergyList) {
childAllergyList.add((AllergySeverity) o);
}
ArrayList<AllergySeverity> allergySeverityArrayList = new ArrayList<>(); ArrayList<AllergySeverity> allergySeverityArrayList = new ArrayList<>();
/*for (Allergy a : childAllergyList) { /*for (AllergySeverity a : childAllergyList) {
AllergySeverity aS = new AllergySeverity(a, ) AllergySeverity aS = new AllergySeverity(a, )
}*/ //Allergy Severity doesn't work in my case so the List will be left empty for now } */ //Allergy Severity doesn't work in my case so the List will be left empty for now
Child child = new Child(childLastname, childName, adress, allergySeverityArrayList); Child child = new Child(childLastname, childName, adress, childAllergyList);
System.out.println(AccountMgr.createChild(child)); System.out.println(AccountMgr.createChild(child));
@ -121,9 +128,11 @@ public class ChildViewController implements Initializable {
String addedAllergy = selectAllergy.getValue().toString(); Allergy addedAllergy = (Allergy)selectAllergy.getValue();
String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[0]; long addedSeverityId = Long.parseLong(selectAllergySeverity.getValue().toString().split(":")[0]);
allergiesList.getItems().add(addedAllergy + ":" + addedSeverity); String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[1];
olAllergiesList.add(new AllergySeverity(addedAllergy,addedSeverityId,addedSeverity));
allergiesList.setItems(olAllergiesList);
selectAllergy.setValue("Allergie Wählen"); selectAllergy.setValue("Allergie Wählen");
@ -133,8 +142,15 @@ public class ChildViewController implements Initializable {
@Override @Override
public void initialize(URL url, ResourceBundle resourceBundle) { public void initialize(URL url, ResourceBundle resourceBundle) {
selectAllergy.getItems().addAll(allergyComboBox()); ObservableList<Allergy> olAll = FXCollections.observableArrayList(allergyComboBox());
selectAllergy.setItems(olAll);
//selectAllergy.getItems().addAll(allergyComboBox());
olAllergiesList = FXCollections.observableArrayList();
selectAllergySeverity.getItems().addAll("1:Harmlos","2:Warnung","3:Kritisch"); ObservableList olSev = FXCollections.observableArrayList();
olSev.add("1:Harmlos");
olSev.add("2:Warnung");
olSev.add("3:Kritisch");
selectAllergySeverity.setItems(olSev);
} }
} }

2
src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
View File

@ -101,7 +101,7 @@
<Insets bottom="15.0" top="15.0" /> <Insets bottom="15.0" top="15.0" />
</VBox.margin> </VBox.margin>
</Text> </Text>
<ListView prefHeight="101.0" prefWidth="227.0" /> <ListView fx:id="allergiesList" prefHeight="101.0" prefWidth="227.0" />
<HBox prefHeight="26.0" prefWidth="256.0"> <HBox prefHeight="26.0" prefWidth="256.0">
<children> <children>
<ComboBox fx:id="selectAllergy" prefWidth="150.0" promptText="Allergie wählen" /> <ComboBox fx:id="selectAllergy" prefWidth="150.0" promptText="Allergie wählen" />