7 Commits

Author SHA1 Message Date
0fed0fb12b From main:
Reshad Meher:
sanitized b15b94e579
2023-02-03 12:32:45 +01:00
dbe98686bd minimal changes 2023-02-02 16:23:56 +01:00
106b97e105 set "password" for cli 2023-02-02 15:21:14 +01:00
d2df46eaa6 moving currentUser to AccountMgr
moving to stable:
Reshad Meher:
login
2023-02-01 23:05:24 +01:00
3643f44afb Merge remote-tracking branch 'origin/stable' into stable 2023-02-01 22:52:26 +01:00
c022d68b92 Kommentare 2: electric boogaloo 2023-02-01 22:52:04 +01:00
b9101e4a55 moving commit to stable:
Richard Reiswich:
6e60fb1517
0a7f941d61
28dc4a7ab
9d7b981c22
2023-02-01 22:49:35 +01:00
25 changed files with 735 additions and 396 deletions

View File

@@ -1,7 +1,4 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
@@ -13,12 +10,20 @@ import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
/**
* A collection of functions loosely related to account management
* Acts as an abstraction layer to the database
* @author Malte Schulze Hobeling
*/
public class AccountMgr {
protected static double price = 5.0;
static User currentUser = null;
/**
* creates a user with createUser(...) and adds its id to the 'worker' table
* @param worker the worker to be created
* @return userid or -1
* @author Malte Schulze Hobeling
*/
protected static long createWorker(Worker worker){
long id = createUser(worker);
@@ -29,7 +34,9 @@ public class AccountMgr {
/**
* creates a user with createUser(...) and adds its id to the 'parent' table
* @param parent the parent to be created
* @return userid or -1
* @author Malte Schulze Hobeling
*/
protected static long createParent(Parent parent){
long id = createUser(parent);
@@ -40,7 +47,9 @@ public class AccountMgr {
/**
* adds a user to the database
* @param user the user to be created
* @return userid or -1
* @author Malte Schulze Hobeling
*/
protected static long createUser(User user) {
String[] userH = {"name", "firstname", "addressid", "password", "email"};
@@ -56,6 +65,12 @@ public class AccountMgr {
return Database.insert("user", userH, userD);
}
/**
* adds an address to the database
* @param address the address to be created
* @return id or -1
* @author Malte Schulze Hobeling
*/
protected static long createAddress(Address address){
String[] addressH = {"street", "number", "plz", "city"};
String[] addressD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
@@ -64,7 +79,9 @@ public class AccountMgr {
/**
* adds a child and allergies to the database
* @param child the child to be created
* @return id of child or -1
* @author Malte Schulze Hobeling
*/
protected static long createChild(Child child){
String[] childH = {"name","firstname","addressid"};
@@ -81,8 +98,17 @@ public class AccountMgr {
return id;
}
/**
* returns a User(Worker | Parent) for a given id or null if no unique id was found
* @param id id of the User
* @return User(Worker | Parent) or null
* @author Malte Schulze Hobeling
*/
protected static User getUserById(long id){
List<String> entry = Database.getEntryById("user",id);
if(entry.size() != 1){
return null;
}
String[] parts = entry.get(0).split(":");
Address address = getAddressById(id);
if(isWorker(String.valueOf(id))){
@@ -100,8 +126,17 @@ public class AccountMgr {
}
}
/**
* returns a Child for a given id or null if no unique id was found
* @param id id of child
* @return Child or null
* @author Malte Schulze Hobeling
*/
protected static Child getChildById(long id){
List<String> entry = Database.getEntryById("child",id);
if(entry.size() != 1){
return null;
}
String[] parts = entry.get(0).split(":");
String[] child_allergyH = {"childid"};
String[] child_allergyD = {String.valueOf(id)};
@@ -117,8 +152,17 @@ public class AccountMgr {
return new Child(id,parts[1],parts[2],getAddressById(Long.parseLong(parts[3])),allergySeverities);
}
/**
* returns an Address for a given id or null if no unique id was found
* @param id id of the address
* @return Address or null
* @author Malte Schulze Hobeling
*/
protected static Address getAddressById(long id){
List<String> entry = Database.getEntryById("address",id);
if(entry.size() != 1){
return null;
}
String[] parts = entry.get(0).split(":");
return new Address(Long.parseLong(parts[0]),parts[1],parts[2],parts[3],parts[4]);
}
@@ -128,6 +172,7 @@ public class AccountMgr {
* @param parentId id of parent
* @param childId id of child
* @return id of parent_child or -1
* @author Malte Schulze Hobeling
*/
protected static long matchParentChild(String parentId, String childId){
String[] parent_childH = {"parentuserid","childid"};
@@ -140,6 +185,7 @@ public class AccountMgr {
* @param email email
* @param pw password
* @return id or -1
* @author Malte Schulze Hobeling
*/
protected static long login(String email, String pw){
String[] pwH = {"email"};
@@ -163,6 +209,7 @@ public class AccountMgr {
* checks if id is in worker table
* @param id userid
* @return true if id is in worker table
* @author Malte Schulze Hobeling
*/
protected static boolean isWorker(String id){
String[] workerH = {"userid"};
@@ -175,6 +222,7 @@ public class AccountMgr {
* checks if id is in parent table
* @param id userid
* @return true if id is in parent table
* @author Malte Schulze Hobeling
*/
protected static boolean isParent(String id){
String[] parentH = {"userid"};
@@ -187,6 +235,7 @@ public class AccountMgr {
* returns a hashed and salted password
* @param pw the password to hash
* @return hashed and salted password
* @author Malte Schulze Hobeling
*/
private static String hashAndSalt(String pw, String salt){
Base64.Decoder dec = Base64.getDecoder();
@@ -205,6 +254,11 @@ public class AccountMgr {
return hashedPw;
}
/**
* generates a secure random salt, Base64 encoded
* @return String Base64 encoded
* @author Malte Schulze Hobeling
*/
private static String getSalt(){
SecureRandom sec = new SecureRandom();
byte[] salt = new byte[16];
@@ -218,11 +272,15 @@ public class AccountMgr {
* @param date YYYY-MM the month
* @param childId id of child
* @return the invoice as a List
* @author Malte Schulze Hobeling
*/
protected static List<String> getInvoice(String date, String childId){
List<String> invoice = new ArrayList<>();
invoice.add("Monatsabrechnung " + date);
List<String> child = Database.getEntryById("child", Long.parseLong(childId));
if(child.size() != 1){
return invoice;
}
invoice.add("Monatsabrechnung " + date);
String[] childParts = child.get(0).split(":");
invoice.add(childParts[1] + ", " + childParts[2]);
String[] food_planH = {"date"};
@@ -241,18 +299,29 @@ public class AccountMgr {
invoice.add(line);
}
}
double price = getPrice();
invoice.add("Total: " + (invoice.size()-2) + " X " + price + "€ = " + ((invoice.size()-2)*price) + "");
return invoice;
}
protected static void getPriceFromDb(){
/**
* gets the price per meal from the database and converts it to double
* @return double price
* @author Malte Schulze Hobeling
*/
protected static double getPrice(){
List<String> priceEntry = Database.getEntryById("price",1);
price = Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
return Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
}
protected static void setPriceInDb(){
/**
* converts the price per meal to integer and updates it in the database
* @param price double
* @author Malte Schulze Hobeling
*/
protected static void setPrice(double price){
String[] priceH = {"id","price"};
String[] priceD = {"1", String.valueOf(price*100)};
String[] priceD = {"1", String.valueOf((int)(price*100))};
Database.update("price",priceH,priceD);
}
}

View File

@@ -1,8 +1,10 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* An Address, used by User and Child and intended as a way to identify a child if you want to match it to another parent
* one constructor is used for creating new addresses the other is used to create existing addresses from database
* @author Malte Schulze Hobeling
*/
public class Address {
private long id;
private String street;

View File

@@ -1,8 +1,9 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* An Allergy, used by Food and AllergySeverity, not intended to be changed
* @author Malte Schulze Hobeling
*/
public class Allergy {
private final long id;
private final String name;

View File

@@ -1,8 +1,9 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* Matching an Allergy to a Severity, used by Child
* @author Malte Schulze Hobeling
*/
public class AllergySeverity {
private Allergy allergy;
private long severityId;

View File

@@ -1,10 +1,12 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.List;
/**
* A Child, used by Parent
* one constructor is used to create new children the other is used to create existing children from database
* @author Malte Schulze Hobeling
*/
public class Child {
private long id;
private String name;

View File

@@ -1,12 +1,13 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
/**
* library for cli functions
* @author Malte Schulze Hobeling
*/
public class ConsoleLib {
public static void createWorkerPrompt(){
Scanner sc = new Scanner(System.in);
@@ -320,7 +321,6 @@ public class ConsoleLib {
Scanner sc = new Scanner(System.in);
double price = sc.nextDouble();
sc.nextLine();
AccountMgr.price = price;
AccountMgr.setPriceInDb();
AccountMgr.setPrice(price);
}
}

View File

@@ -1,12 +1,13 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.Scanner;
/**
* simple cli showcase of the implemented functionality
* @author Malte Schulze Hobeling
*/
public class ConsoleMain {
static User currentUser = null;
//static User currentUser = null;
static boolean running = true;
public static void main(String[] args) {
boolean firstRun = Database.init();
@@ -15,14 +16,14 @@ public class ConsoleMain {
Database.fillDb();
ConsoleLib.createWorkerPrompt();
}
AccountMgr.getPriceFromDb();
AccountMgr.getPrice();
while (running){
if(currentUser == null){
if(AccountMgr.currentUser == null){
defaultMenu();
}else{
if(currentUser.getClass().getSimpleName().equals("Worker")){
if(AccountMgr.currentUser.getClass().getSimpleName().equals("Worker")){
adminMenu();
}else if(currentUser.getClass().getSimpleName().equals("Parent")){
}else if(AccountMgr.currentUser.getClass().getSimpleName().equals("Parent")){
parentMenu();
}
}
@@ -40,9 +41,7 @@ public class ConsoleMain {
String selection = sc.nextLine();
switch (selection) {
case "0" -> running = false;
case "1" -> {
currentUser = ConsoleLib.loginPrompt();
}
case "1" -> AccountMgr.currentUser = ConsoleLib.loginPrompt();
case "2" -> ConsoleLib.showFood_planPrompt();
case "3" -> ConsoleLib.createParentPrompt();
}
@@ -69,13 +68,11 @@ public class ConsoleMain {
Scanner sc = new Scanner(System.in);
String selection = sc.nextLine();
switch (selection) {
case "0" -> {
currentUser = null;
}
case "0" -> AccountMgr.currentUser = null;
case "1" -> ConsoleLib.createWorkerPrompt();
case "2" -> ConsoleLib.createParentPrompt();
case "3" -> ConsoleLib.createChildPrompt(String.valueOf(currentUser.getId()));
case "4" -> ConsoleLib.matchParentChildPrompt(String.valueOf(currentUser.getId()));
case "3" -> ConsoleLib.createChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
case "4" -> ConsoleLib.matchParentChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
case "5" -> ConsoleLib.createFoodPrompt();
case "6" -> ConsoleLib.createFood_planPrompt();
case "7" -> ConsoleLib.showFood_planPrompt();
@@ -100,11 +97,9 @@ public class ConsoleMain {
Scanner sc = new Scanner(System.in);
String selection = sc.nextLine();
switch (selection) {
case "0" -> {
currentUser = null;
}
case "3" -> ConsoleLib.createChildPrompt(String.valueOf(currentUser.getId()));
case "6" -> ConsoleLib.tablePrompt();
case "0" -> AccountMgr.currentUser = null;
case "3" -> ConsoleLib.createChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
case "x1" -> ConsoleLib.tablePrompt();
case "7" -> ConsoleLib.showFood_planPrompt();
case "8" -> ConsoleLib.createFood_selectionPrompt();
}

View File

@@ -8,7 +8,6 @@ import javafx.scene.control.TextField;
import javafx.scene.text.Text;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class CreateFoodController {
@@ -37,7 +36,7 @@ public class CreateFoodController {
}
@FXML
public void onHinzufügen(ActionEvent actionEvent) {
public void onHinzufuegen(ActionEvent actionEvent) {
String gerichtName = name.getText();
String beschreibung = description.getText();
if(!isHauptgerichtRadio.isSelected() && !isDessertRadio.isSelected()){

View File

@@ -1,7 +1,4 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.io.File;
import java.io.IOException;
@@ -10,13 +7,19 @@ import java.sql.*;
import java.util.ArrayList;
import java.util.List;
/**
* Basic operations on the database
* Use init() -> createDb() -> fillDb() to create the skeleton with some default values
* Provides select, insert, update, delete, count operations and more
* @author Malte Schulze Hobeling
*/
public class Database {
private static final String dbLocation = "jdbc:sqlite:"+Path.of("").toAbsolutePath()+"/database.db";
/**
* creates new database.db if it doesn't exist
* @return true if a new database has been created
* @author Malte Schulze Hobeling
*/
protected static boolean init(){
File db = new File(Path.of("").toAbsolutePath()+"/database.db");
@@ -30,6 +33,7 @@ public class Database {
/**
* connects to the database
* @return Connection to the database
* @author Malte Schulze Hobeling
*/
protected static Connection connect(){
Connection conn = null;
@@ -43,6 +47,7 @@ public class Database {
/**
* creates the initial structure of the db
* @author Malte Schulze Hobeling
*/
protected static void createDb(){
String[] sql = new String[15];
@@ -173,6 +178,7 @@ public class Database {
/**
* inserts fixed values into the database
* @author Malte Schulze Hobeling
*/
protected static void fillDb(){
List<String> sqls = new ArrayList<>();
@@ -274,11 +280,12 @@ public class Database {
/**
* inserts data into table and returns its id
* does not insert if the exact set already exists
* simple duplication check
* @param table name of the database table
* @param header String[] order should match with values
* @param values String[] order should match with header
* @return id of dataset or -1
* @author Malte Schulze Hobeling
*/
protected static long insert(String table, String[] header, String[] values){
long id = -1;
@@ -320,6 +327,7 @@ public class Database {
* @param header the header of the table, order should match with values
* @param values the data you want the id of, order should match witch values
* @return one id matching the given data or -1 if no match has been found
* @author Malte Schulze Hobeling
*/
protected static long getSingleId(String table, String[] header, String[] values){
long id = -1;
@@ -372,6 +380,7 @@ public class Database {
* deletes an entry from table with matching id
* @param table the table that contains the entry you want to delete
* @param id the id of the entry you want to delete
* @author Malte Schulze Hobeling
*/
protected static void delete(String table, long id){
String sql = "DELETE FROM " + table + " WHERE id = ?;";
@@ -383,6 +392,21 @@ public class Database {
}
}
/**
* its a query builder it builds queries
* exists: checks if an entry with the given parameters exists in table
* selectMatch: returns all matching rows from table
* insert: inserts or ignores into table
* count: counts exact matches from table
* update: updates table, header/values[0] is used as WHERE, using id is recommended header/values[1+] are used
* as SET
* @param type exists, selectMatch, insert, count, update
* @param table table
* @param header header
* @param values values
* @return sql statement as String
* @author Malte Schulze Hobeling
*/
private static String queryBuilder(String type,String table, String[] header, String[] values){
String sql;
StringBuilder sb = new StringBuilder();
@@ -479,6 +503,7 @@ public class Database {
* returns a list of all entries
* @param table the table you want
* @return a list of all entries as String with the fields separated by ":"
* @author Malte Schulze Hobeling
*/
protected static List<String> getTable(String table){
List<String> data = new ArrayList<>();
@@ -510,6 +535,7 @@ public class Database {
* @param header header for the WHERE portion, order should match with values
* @param values values for the WHERE portion, order should match with header
* @return a list of the matching data as String separated by ":"
* @author Malte Schulze Hobeling
*/
protected static List<String> select(String table,String[] header, String[] values){
List<String> data = new ArrayList<>();
@@ -541,6 +567,7 @@ public class Database {
* @param table the table you want the entry from
* @param id the id of the entry you want
* @return a list of String separated by ":"
* @author Malte Schulze Hobeling
*/
protected static List<String> getEntryById(String table, long id){
List<String> data = new ArrayList<>();
@@ -574,6 +601,7 @@ public class Database {
* @param header the properties you want to count on
* @param values the values for the properties
* @return the number of found rows
* @author Malte Schulze Hobeling
*/
protected static int count(String table,String[] header,String[] values){
String sql = queryBuilder("count",table,header,values);
@@ -592,6 +620,7 @@ public class Database {
* @param header [0] is used as WHERE, everything else in SET
* @param values [0] is used as WHERE, everything else in SET
* @return number of rows affected or -1 on error
* @author Malte Schulze Hobeling
*/
protected static int update(String table,String[] header,String[] values){
try(Connection conn = connect()) {

View File

@@ -1,10 +1,12 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.List;
/**
* Food, used by FoodPlan
* one constructor is used to create new foods the other is used to create existing foods from database
* @author Malte Schulze Hobeling
*/
public class Food {
private long id;
private String name;

View File

@@ -1,16 +1,19 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.ArrayList;
import java.util.List;
/**
* A collection of functions loosely related to food management
* Acts as an abstraction layer to the database
* @author Malte Schulze Hobeling
*/
public class FoodMgr {
/**
* inserts a food int to the database and creates the food_restriction entries
* @param food the food to be created
* @return id of food or -1
* @author Malte Schulze Hobeling
*/
public static long createFood(Food food){
String[] foodH = {"name","description","isDessert","food_typeid"};
@@ -29,7 +32,9 @@ public class FoodMgr {
/**
* inserts a food_plan into the database
* @param foodPlan the foodPlan to be created
* @return id of food_plan or -1
* @author Malte Schulze Hobeling
*/
public static long createFood_plan(FoodPlan foodPlan){
String[] food_planH = {"date","food1","food2","dessert1","dessert2"};
@@ -44,6 +49,7 @@ public class FoodMgr {
/**
* updates a food_plan into the database
* @return number of rows affected or -1 on error
* @author Johannes Kantz
*/
public static long updateFood_plan(FoodPlan foodPlan){
String[] food_planH = {"id","food1","food2","dessert1","dessert2"};
@@ -59,6 +65,7 @@ public class FoodMgr {
* returns all non desserts or all desserts
* @param isDessert true for only desserts false for non desserts
* @return a list of all non desserts or all desserts
* @author Malte Schulze Hobeling
*/
public static List<Food> getFood(boolean isDessert){
String[] foodH = {"isDessert"};
@@ -76,6 +83,7 @@ public class FoodMgr {
* getFood but returns only vegan food
* @param isDessert true for only desserts false for non desserts
* @return a list of all vegan non desserts or all vegan desserts
* @author Malte Schulze Hobeling
*/
public static List<Food> getVeganFood(boolean isDessert){
String[] foodH = {"isDessert","food_typeid"};
@@ -93,6 +101,7 @@ public class FoodMgr {
* returns a food_plan for a day
* @param date YYYY-MM-DD one day
* @return food_plan for date
* @author Malte Schulze Hobeling
*/
public static FoodPlan getFoodPlan(String date){
String[] food_planH = {"date"};
@@ -110,8 +119,17 @@ public class FoodMgr {
return new FoodPlan(Long.parseLong(parts[0]),date,foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
}
/**
* returns a FoodPlan for a given id or null if no unique id was found
* @param id id of the FoodPlan
* @return FoodPlan or null
* @author Malte Schulze Hobeling
*/
public static FoodPlan getFoodPlanById(long id){
List<String> entry = Database.getEntryById("food_plan",id);
if(entry.size() != 1){
return null;
}
String[] parts = entry.get(0).split(":");
Food foodVegan = getFoodById(Long.parseLong(parts[2]));
Food foodSecond = getFoodById(Long.parseLong(parts[3]));
@@ -121,8 +139,17 @@ public class FoodMgr {
return new FoodPlan(id,parts[1], foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
}
/**
* returns a Food for a given id or null if no unique id was found
* @param id id of the Food
* @return Food or null
* @author Malte Schulze Hobeling
*/
public static Food getFoodById(long id){
List<String> entry = Database.getEntryById("food",id);
if(entry.size() != 1){
return null;
}
String[] parts = entry.get(0).split(":");
String name = parts[1];
String description = parts[2];
@@ -133,20 +160,44 @@ public class FoodMgr {
return new Food(id,name,description,isDessert,foodType,allergies);
}
/**
* returns a FoodType for a given id or null if no unique id was found
* @param id id of the FoodType
* @return FoodType or null
* @author Malte Schulze Hobeling
*/
public static FoodType getFoodTypeById(long id){
List<String> entry = Database.getEntryById("food_type",id);
if(entry.size() != 1){
return null;
}
String[] typeParts = entry.get(0).split(":");
return new FoodType(Long.parseLong(typeParts[0]),typeParts[1]);
}
/**
* returns an Allergy for a given id or null if no unique id was found
* @param id id of the Allergy
* @return Allergy or null
* @author Malte Schulze Hobeling
*/
public static Allergy getAllergyById(long id){
String[] allergyH = {"id"};
String[] allergyD = {String.valueOf(id)};
List<String> allergies = Database.select("allergy",allergyH,allergyD);
String[] allergyParts = allergies.get(0).split(":");
List<String> entry = Database.select("allergy",allergyH,allergyD);
if(entry.size() != 1){
return null;
}
String[] allergyParts = entry.get(0).split(":");
return new Allergy(id,allergyParts[1],allergyParts[2]);
}
/**
* returns all Allergies for a given foodId
* @param foodId the foodId you want the allergies from
* @return a List of Allergy, can be empty
* @author Malte Schulze Hobeling
*/
public static List<Allergy> getAllergies(long foodId){
List<Allergy> allergies = new ArrayList<>();
String[] restrictionsH = {"foodid"};
@@ -163,11 +214,12 @@ public class FoodMgr {
* inserts the selected food into food_Selection if the food_plan has not been sent
* @param food_selectionData childid, food_planid, foodid
* @return id or -1
* @author Malte Schulze Hobeling
*/
public static long createFood_selection(String[] food_selectionData){
String[] food_selectionH = {"childid","food_planid","foodid"};
FoodPlan food_plan = getFoodPlanById(Long.parseLong(food_selectionData[1]));
if(!food_plan.isSent()){
if(food_plan != null && !food_plan.isSent()){
return Database.insert("food_selection",food_selectionH,food_selectionData);
}else {
return -1;
@@ -178,6 +230,7 @@ public class FoodMgr {
* accumulates the selected food for a given day and locks the corresponding food_plan
* @param date YYYY-MM-DD day
* @return the accumulated orders
* @author Malte Schulze Hobeling
*/
public static List<String> getDayOrder(String date){
List<String> orders = new ArrayList<>();

View File

@@ -1,5 +1,10 @@
package com.bib.essensbestellungsverwaltung;
/**
* FoodPlan
* one constructor is used to create new foodPlans the other is used to create existing foodPlans from database
* @author Malte Schulze Hobeling
*/
public class FoodPlan {
private long id;
private String date;

View File

@@ -1,8 +1,9 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* FoodType used by Food, not intended to be changed
* @author Malte Schulze Hobeling
*/
public class FoodType {
private long id;
private String name;

View File

@@ -5,11 +5,12 @@ import javafx.scene.control.Alert;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
/**
* @author Reshad Meher
* Username, Passwort , login
*/
public class HelloController {
/**
* @autor: Reshad Meher
* Username, Passwort , login
*/
@FXML
private TextField unsernameEingabe;

View File

@@ -19,15 +19,19 @@ public class LoginController {
@FXML
private PasswordField pfPassword;
HashMap<String,String> benutzerMap = new HashMap<String,String>();
@FXML
protected void onBtLoginClick() throws IOException {
benutzerMap.put("Reshad","1234");
String email = tfEmail.getText();
String password = pfPassword.getText();
if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
// if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
StartViewApplication.changeScene("parentMenu-view.fxml");
long loginPruefen = AccountMgr.login(email,password);
if(loginPruefen > 0){
AccountMgr.currentUser = AccountMgr.getUserById(loginPruefen);
if(AccountMgr.currentUser.getClass().getSimpleName().equals("Worker")){
StartViewApplication.changeScene("workerMenu-view.fxml");
}else{
StartViewApplication.changeScene("parentMenu-view.fxml");
}
}else {
Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
alert.showAndWait();

View File

@@ -1,24 +1,100 @@
/**
* Author: Reshad Meher
* Startseite
* fxml: menue-view.fxml
*/
package com.bib.essensbestellungsverwaltung;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.stage.Stage;
import java.io.IOException;
import javafx.scene.Node;
import javafx.scene.control.*;
public class MenueController {
@FXML
Button btFirstMealMon;
@FXML
Button btSecondMealMon;
@FXML
Button btNoMealMon;
@FXML
Button btFirstDessertMon;
@FXML
Button btSecondDessertMon;
@FXML
Button btNoDessertMon;
@FXML
Button btFirstMealTue;
@FXML
Button btSecondMealTue;
@FXML
Button btNoMealTue;
@FXML
Button btFirstDessertTue;
@FXML
Button btSecondDessertTue;
@FXML
Button btNoDessertTue;
@FXML
Button btFirstMealWed;
@FXML
Button btSecondMealWed;
@FXML
Button btNoMealWed;
@FXML
Button btFirstDessertWed;
@FXML
Button btSecondDessertWed;
@FXML
Button btNoDessertWed;
@FXML
Button btFirstMealThu;
@FXML
Button btSecondMealThu;
@FXML
Button btNoMealThu;
@FXML
Button btFirstDessertThu;
@FXML
Button btSecondDessertThu;
@FXML
Button btNoDessertThu;
@FXML
Button btFirstMealFri;
@FXML
Button btSecondMealFri;
@FXML
Button btNoMealFri;
@FXML
Button btFirstDessertFri;
@FXML
Button btSecondDessertFri;
@FXML
Button btNoDessertFri;
@FXML
ComboBox<String> cbPickChild;
@FXML
Button btLogin;
@FXML
Button btSaveOrder;
@FXML
ListView<String> lvFoodInfo;
private void setButtonActive(){
public ObservableList<Node> buttons = FXCollections.observableArrayList();
public void setButtonActive(ActionEvent event) {
Button b = (Button) event.getSource();
javafx.scene.Parent p = b.getParent();
buttons = p.getChildrenUnmodifiable();
for(Node button : buttons){
System.out.println(b.getStyleClass());
/*
b.getStyleClass().remove("active");
if (button.equals(b)){
b.getStyleClass().add("active");;
}
*/
}
}
}

View File

@@ -1,11 +1,12 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
import java.util.ArrayList;
import java.util.List;
/**
* one constructor is used to create new parents the other is used to create existing parents from database
* @author Malte Schulze Hobeling
*/
public class Parent extends User{
List<Child> children;

View File

@@ -1,11 +1,100 @@
/**
* @autor: Reshad Meher
*/
package com.bib.essensbestellungsverwaltung;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
import java.io.IOException;
import java.util.HashMap;
public class SingUpController {
public void onKontoErstellenBtClick(ActionEvent actionEvent) {
@FXML
private TextField tfName;
@FXML
private TextField tfVorname;
@FXML
private TextField tfEmail;
@FXML
private PasswordField pfPasswort;
@FXML
private TextField tfPLZ;
@FXML
private TextField tfStadt;
@FXML
private TextField tfStrasse;
@FXML
private TextField tfHausnummer;
@FXML
private void onKontoErstellenBtClick(){
String name = tfName.getText();
String vorname = tfVorname.getText();
String email = tfEmail.getText();
String passwort = pfPasswort.getText();
String plz = tfPLZ.getText();
String stadt = tfStadt.getText();
String strasse = tfStrasse.getText();
String hausnummer = tfHausnummer.getText();
Alert alert;
if(name.isEmpty() || vorname.isEmpty() || email.isEmpty() || passwort.isEmpty() || plz.isEmpty() ||
stadt.isEmpty() || strasse.isEmpty() || hausnummer.isEmpty()){
if(name.isEmpty()){
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Name' ist leer.");
alert.showAndWait();
} else if (vorname.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Vorname' ist leer.");
alert.showAndWait();
} else if (email.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'E-Mail' ist leer.");
alert.showAndWait();
} else if (passwort.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Passwort' ist leer.");
alert.showAndWait();
} else if (plz.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Postleitzahl' ist leer.");
alert.showAndWait();
} else if (stadt.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Stadt' ist leer.");
alert.showAndWait();
} else if (strasse.isEmpty()) {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Straße' ist leer.");
alert.showAndWait();
}else {
alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Hausnummer' ist leer.");
alert.showAndWait();
}
}else {
Address newAdresse = new Address(strasse,hausnummer,plz,stadt);
User newUser = new User(name,vorname,passwort,email,newAdresse);
long creatNewUser = AccountMgr.createUser(newUser);
if (creatNewUser > 0){
alert = new Alert(Alert.AlertType.CONFIRMATION,"Ihrer Daten wurde gespeichert.");
alert.showAndWait();
}
tfName.setText("");
tfVorname.setText("");
tfEmail.setText("");
pfPasswort.setText("");
tfPLZ.setText("");
tfStadt.setText("");
tfStrasse.setText("");
tfHausnummer.setText("");
}
}
public void onAnmeldenBtClick(ActionEvent actionEvent) {
@FXML
private void onAnmeldenBtClick() throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480);
StartViewApplication.primary.setScene(scene);
}
}

View File

@@ -1,8 +1,13 @@
package com.bib.essensbestellungsverwaltung;
/**
* Acts as a launcher required to make it a .jar
* It is also used to select either the cli or the gui depending on starting arguments
* @author Malte Schulze Hobeling
*/
public class SuperMain {
public static void main(String[] args) {
if(args.length > 0){
if(args.length > 0 && args[0].equals("Here be dragons")){
ConsoleMain.main(args);
}else {
StartViewApplication.main(args);

View File

@@ -1,8 +1,9 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* one constructor is used to create new users the other is used to create existing users from database
* @author Malte Schulze Hobeling
*/
public class User {
private long id;
private String name;

View File

@@ -1,8 +1,9 @@
package com.bib.essensbestellungsverwaltung;
/*
@author Malte Schulze Hobeling
*/
/**
* one constructor is used to create new worker the other is used to create existing worker from database
* @author Malte Schulze Hobeling
*/
public class Worker extends User{
public Worker(long id, String name, String firstname, String password, String email, Address address) {
super(id, name, firstname, password, email, address);

View File

@@ -101,7 +101,7 @@
</Text>
</children>
</VBox>
<Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufügen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
<Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufuegen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
<Button id="btCancelFood" layoutX="102.0" layoutY="473.0" mnemonicParsing="false" onAction="#onAbbrechen" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
</children>
</AnchorPane>

View File

@@ -10,228 +10,170 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<AnchorPane prefHeight="750.0" prefWidth="950.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
<children>
<Label alignment="CENTER" layoutX="392.0" layoutY="25.0" prefHeight="40.0" prefWidth="223.0" text="Essen bestellen">
<font>
<Font size="28.0" />
</font>
</Label>
<Button id="btLogin" alignment="CENTER" layoutX="848.0" layoutY="34.0" mnemonicParsing="false" text="Login" />
<HBox layoutX="220.0" layoutY="87.0" prefHeight="570.0" prefWidth="688.0">
<children>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin></Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin></Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="30.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin></Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin></Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
<VBox.margin>
<Insets top="10.0" />
</VBox.margin></Button>
</children>
<HBox.margin>
<Insets />
</HBox.margin>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Dienstag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="30.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Mittwoch" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="30.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Donnerstag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="30.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Freitag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="30.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
<VBox.margin>
<Insets bottom="10.0" top="10.0" />
</VBox.margin>
</Button>
<Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
<VBox.margin>
<Insets top="10.0" />
</VBox.margin>
</Button>
</children>
</VBox>
</children>
</HBox>
<Button id="btPlaceOrder" layoutX="436.0" layoutY="677.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung speichern" />
<ComboBox id="cbChooseChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" />
<ListView id="lvShowDescription" layoutX="14.0" layoutY="151.0" prefHeight="475.0" prefWidth="200.0" />
</children>
<AnchorPane prefHeight="600.0" prefWidth="900.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
<children>
<Label alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="35.0" prefWidth="895.0" text="Essenbestellung">
<font>
<Font size="28.0" />
</font>
</Label>
<Button id="btLogin" fx:id="btLogin" alignment="CENTER" layoutX="848.0" layoutY="34.0" mnemonicParsing="false" text="Login" />
<HBox layoutX="220.0" layoutY="87.0" prefHeight="414.0" prefWidth="688.0">
<children>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
<Button id="btFoodChoice" fx:id="btSecondDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
<Button id="btFoodChoice" fx:id="btNoDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
</children>
</VBox>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Dienstag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
<Button id="btFoodChoice" fx:id="btSecondDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
<Button id="btFoodChoice" fx:id="btNoDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
</children>
</VBox>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Mittwoch" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
<Button id="btFoodChoice" fx:id="btSecondDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
<Button id="btFoodChoice" fx:id="btNoDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
</children>
</VBox>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Donnerstag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
<Button id="btFoodChoice" fx:id="btSecondDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
<Button id="btFoodChoice" fx:id="btNoDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
</children>
</VBox>
</children>
</VBox>
<VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
<children>
<Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Freitag" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="10.0" />
</VBox.margin>
<font>
<Font size="18.0" />
</font>
</Label>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin>
<Insets bottom="20.0" />
</VBox.margin>
</Button>
</children>
</VBox>
<VBox prefHeight="200.0" prefWidth="100.0">
<children>
<Button id="btFoodChoice" fx:id="btFirstDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
<Button id="btFoodChoice" fx:id="btSecondDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
<Button id="btFoodChoice" fx:id="btNoDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
</children>
</VBox>
</children>
</VBox>
</children>
</HBox>
<Button id="btPlaceOrder" fx:id="btSaveOrder" layoutX="379.0" layoutY="527.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung abschicken" />
<ComboBox id="cbChooseChild" fx:id="cbPickChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" />
<ListView id="lvShowDescription" fx:id="lvFoodInfo" layoutX="20.0" layoutY="115.0" prefHeight="370.0" prefWidth="200.0" />
</children>
</AnchorPane>

View File

@@ -1,10 +1,33 @@
.sidebar-nav_button {
-fx-background-color: #69b6ff;
-fx-text-fill: #123;
-fx-border-color: #000;
-fx-border-radius: 20;
}
.sidebar-nav_button.active {
-fx-background-color: #4e92b4;
#btFoodChoice{
-fx-background-color: transparent;
}
#btFoodChoice:hover{
-fx-underline: true;
-fx-text-fill: black;
}
#btPlaceOrder{
-fx-background-color: lightblue;
-fx-text-fill: white;
-fx-background-radius: 25;
}
#btPlaceOrder:hover{
-fx-border-width: 0;
-fx-text-fill: black;
-fx-underline: true;
}
#cbChooseChild{
-fx-background-color: lightgray;
}
.btFood{
-fx-background-color: transparent;
}
.btFood.active{
-fx-background-color: rgba(97, 97, 232, 0.3);
-fx-background-radius: 25;
}

View File

@@ -29,72 +29,109 @@
<Circle fill="#67b5ff2e" layoutX="-23.0" layoutY="368.0" radius="100.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<Circle fill="#69b6ffb0" layoutX="235.0" layoutY="310.0" radius="158.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
<VBox alignment="CENTER" layoutX="263.0" prefHeight="400.0" prefWidth="338.0" style="-fx-background-color: white;">
<VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
<children>
<TextField promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfEmail">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField promptText="Email bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfBestätigungEmail">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<PasswordField promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfPasswort">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<PasswordField promptText="Passwort bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfBestätigungPassowrt">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<TextField fx:id="tfName" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField fx:id="tfVorname" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<TextField fx:id="tfEmail" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<effect>
<Blend />
</effect>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</TextField>
<PasswordField fx:id="pfPasswort" accessibleRole="TEXT_FIELD" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
<opaqueInsets>
<Insets />
</opaqueInsets>
<effect>
<Blend />
</effect>
<VBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</VBox.margin>
</PasswordField>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<TextField fx:id="tfPLZ" prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
<TextField fx:id="tfStadt" prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
</children>
</HBox>
<HBox prefHeight="100.0" prefWidth="200.0">
<children>
<TextField fx:id="tfStrasse" prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
<TextField fx:id="tfHausnummer" prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
<HBox.margin>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</HBox.margin>
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font>
</TextField>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
<children>
<Button mnemonicParsing="false" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE" onAction="#onKontoErstellenBtClick">
<Button mnemonicParsing="false" onAction="#onKontoErstellenBtClick" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE">
<font>
<Font name="Microsoft Tai Le Bold" size="12.0" />
</font></Button>
<Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" onAction="#onAnmeldenBtClick"/>
<Button id="btSignUp" mnemonicParsing="false" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" />
</children>
<opaqueInsets>
<Insets top="15.0" />
</opaqueInsets>
<VBox.margin>
<Insets top="15.0" />
</VBox.margin>
<opaqueInsets>
<Insets top="15.0" />
</opaqueInsets>
<VBox.margin>
<Insets top="15.0" />
</VBox.margin>
</HBox>
</children>
<padding>