|
|
|
@@ -2,6 +2,8 @@
|
|
|
|
|
|
|
|
|
|
package com.bib.essensbestellungsverwaltung;
|
|
|
|
|
|
|
|
|
|
import javafx.collections.FXCollections;
|
|
|
|
|
import javafx.collections.ObservableList;
|
|
|
|
|
import javafx.event.ActionEvent;
|
|
|
|
|
import javafx.fxml.FXML;
|
|
|
|
|
import javafx.fxml.Initializable;
|
|
|
|
@@ -35,6 +37,7 @@ public class ChildViewController implements Initializable {
|
|
|
|
|
//public TextField allergies;
|
|
|
|
|
@FXML
|
|
|
|
|
public ListView allergiesList;
|
|
|
|
|
ObservableList olAllergiesList;
|
|
|
|
|
@FXML
|
|
|
|
|
public ComboBox selectAllergy;
|
|
|
|
|
@FXML
|
|
|
|
@@ -71,17 +74,21 @@ public class ChildViewController implements Initializable {
|
|
|
|
|
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<>();
|
|
|
|
|
|
|
|
|
|
/*for (Allergy a : childAllergyList) {
|
|
|
|
|
/*for (AllergySeverity a : childAllergyList) {
|
|
|
|
|
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));
|
|
|
|
|
|
|
|
|
@@ -121,9 +128,11 @@ public class ChildViewController implements Initializable {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String addedAllergy = selectAllergy.getValue().toString();
|
|
|
|
|
String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[0];
|
|
|
|
|
allergiesList.getItems().add(addedAllergy + ":" + addedSeverity);
|
|
|
|
|
Allergy addedAllergy = (Allergy)selectAllergy.getValue();
|
|
|
|
|
long addedSeverityId = Long.parseLong(selectAllergySeverity.getValue().toString().split(":")[0]);
|
|
|
|
|
String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[1];
|
|
|
|
|
olAllergiesList.add(new AllergySeverity(addedAllergy,addedSeverityId,addedSeverity));
|
|
|
|
|
allergiesList.setItems(olAllergiesList);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
selectAllergy.setValue("Allergie Wählen");
|
|
|
|
@@ -133,8 +142,15 @@ public class ChildViewController implements Initializable {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|