Compare commits
	
		
			26 Commits
		
	
	
		
			samu_maske
			...
			0303458524
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 0303458524 | |||
| f97211ae84 | |||
| f0bd39d3a6 | |||
| c127cfb8a3 | |||
| 293c5f7fee | |||
| 956c723057 | |||
| ee2685cd45 | |||
| 8f8597c0c9 | |||
| a620c620f0 | |||
| 43f0aeb352 | |||
| 29c31841fa | |||
| 349a8f02cc | |||
| 58ab3e313c | |||
| 4bebd27617 | |||
| 3edbca73f9 | |||
|   | f43dad000f | ||
| 0300b96bf4 | |||
| 53383f3a23 | |||
| c6b4bc1cd1 | |||
| 450e08b8e7 | |||
| 17f0d66677 | |||
| 3ac92ea955 | |||
| e817a7caa1 | |||
| feba2a14b2 | |||
|   | 287ccd9ce5 | ||
|   | 8dfe6547c9 | 
							
								
								
									
										
											BIN
										
									
								
								out/artifacts/VPR_App_jar/VPR_App.jar
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								out/artifacts/VPR_App_jar/VPR_App.jar
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| @@ -17,22 +17,6 @@ public class Mahlzeit { | |||||||
| 		zutaten = new ArrayList<>(); | 		zutaten = new ArrayList<>(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public Mahlzeit (int id, String name, float preis, String beschreibung) { |  | ||||||
| 		this.id = id; |  | ||||||
| 		this.name = name; |  | ||||||
| 		this.preis = preis; |  | ||||||
| 		this.beschreibung = beschreibung; |  | ||||||
| 		zutaten = new ArrayList<>(); |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	public int getId() { |  | ||||||
| 		return id; |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	public void setId(int id) { |  | ||||||
| 		this.id = id; |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	public String getName() { | 	public String getName() { | ||||||
| 		return name; | 		return name; | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -9,4 +9,10 @@ public class Zutat { | |||||||
| 	public String getName(){ | 	public String getName(){ | ||||||
| 		return this.name; | 		return this.name; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	@Override | ||||||
|  | 	public String toString() { | ||||||
|  | 		return name; | ||||||
|  | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,10 +1,12 @@ | |||||||
| package RestAPISchnittstelle; | package RestAPISchnittstelle; | ||||||
|  |  | ||||||
|  | import java.net.ConnectException; | ||||||
| import java.net.URI; | import java.net.URI; | ||||||
| import java.net.http.HttpClient; | import java.net.http.HttpClient; | ||||||
| import java.net.http.HttpRequest; | import java.net.http.HttpRequest; | ||||||
| import java.net.http.HttpResponse; | import java.net.http.HttpResponse; | ||||||
| import java.nio.charset.StandardCharsets; | import java.nio.charset.StandardCharsets; | ||||||
|  | import java.time.Duration; | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  |  | ||||||
| import Logik.ElternAccount; | import Logik.ElternAccount; | ||||||
| @@ -12,16 +14,17 @@ import Logik.Kind; | |||||||
| import Logik.Mahlzeit; | import Logik.Mahlzeit; | ||||||
| import Logik.Tagesplan; | import Logik.Tagesplan; | ||||||
| import com.google.gson.*; | import com.google.gson.*; | ||||||
|  | import javafx.scene.control.Alert; | ||||||
|  |  | ||||||
| /** | /** | ||||||
|  * noch nicht getestet |  | ||||||
|  * TODO FERTIG MACHEN |  | ||||||
|  * @author Samuel Wolff |  * @author Samuel Wolff | ||||||
|  */ |  */ | ||||||
| public class RestApiClient implements IRestAPI{ | public class RestApiClient implements IRestAPI{ | ||||||
|  |  | ||||||
| 	private final String urlBase = "https://pbg2h22awo.web.pb.bib.de/VPR_Schnittstelle/VPR_Schnittstelle/restAPI.php"; | 	private final String urlBase = "https://pbg2h22awo.web.pb.bib.de/VPR_Schnittstelle/VPR_Schnittstelle/restAPI.php"; | ||||||
|  |  | ||||||
|  | 	private final int timeout = 10; | ||||||
|  |  | ||||||
| 	private final HttpClient client; | 	private final HttpClient client; | ||||||
|  |  | ||||||
| 	private final Gson gson; | 	private final Gson gson; | ||||||
| @@ -48,12 +51,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * Methode für einen Get-Aufruf. Ruft alle Elemente einer Tabelle auf. | 	 * Methode für einen Get-Aufruf. Ruft alle Elemente einer Tabelle auf. | ||||||
| 	 * | 	 * | ||||||
| 	 * @param controllerName Name des aufzurufenden Controllers | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public String get(String controllerName) { | 	public String get(String controllerName) { | ||||||
| 		URI apiUri = URI.create(String.format("%s/%s", urlBase, controllerName)); | 		URI apiUri = URI.create(String.format("%s/%s", urlBase, controllerName)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .GET() | 											 .GET() | ||||||
| 											 .build(); | 											 .build(); | ||||||
| @@ -66,7 +71,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 			return httpResponse.body(); | 			return httpResponse.body(); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return null; | 			return null; | ||||||
| 		} | 		} | ||||||
| @@ -77,12 +89,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * | 	 * | ||||||
| 	 * @param controllerName Name des aufzurufenden Controllers | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
| 	 * @param id Id der Aufzurufenden Zeile | 	 * @param id Id der Aufzurufenden Zeile | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public String get(String controllerName, int id) { | 	public String get(String controllerName, int id) { | ||||||
| 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id)); | 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .GET() | 											 .GET() | ||||||
| 											 .build(); | 											 .build(); | ||||||
| @@ -97,24 +111,35 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			return httpResponse.body(); | 			return httpResponse.body(); | ||||||
|  |  | ||||||
| 			//System.out.println("Response Body: " + test); | 			//System.out.println("Response Body: " + test); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return null; | 			return null; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
|  | 	 * --DEPRECATED-- | ||||||
| 	 * Methode für einen Get-Aufruf. Ruft ein spezielles Element auf. | 	 * Methode für einen Get-Aufruf. Ruft ein spezielles Element auf. | ||||||
| 	 * | 	 * | ||||||
| 	 * @param controllerName Name des aufzurufenden Controllers | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
| 	 * @param id Id der Aufzurufenden Zeile | 	 * @param id Id der Aufzurufenden Zeile | ||||||
| 	 * @param bezahlt TODO Warum ist das hier? | 	 * @param bezahlt TODO Warum ist das hier? | ||||||
|  | 	 * @deprecated | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public String get(String controllerName, int id, boolean bezahlt) { | 	public String get(String controllerName, int id, boolean bezahlt) { | ||||||
| 		URI apiUri = URI.create(String.format("%s/%s?%s&%s", urlBase, controllerName, id, bezahlt)); | 		URI apiUri = URI.create(String.format("%s/%s?%s&%s", urlBase, controllerName, id, bezahlt)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .GET() | 											 .GET() | ||||||
| 											 .build(); | 											 .build(); | ||||||
| @@ -127,12 +152,26 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 			return httpResponse.body(); | 			return httpResponse.body(); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return null; | 			return null; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/*** | ||||||
|  | 	 * Ein gefilterter Get Aufruf | ||||||
|  | 	 * @param controllerName | ||||||
|  | 	 * @param params | ||||||
|  | 	 * @return | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public String get(String controllerName, String[] params) { | 	public String get(String controllerName, String[] params) { | ||||||
| 		String ende = ""; | 		String ende = ""; | ||||||
| @@ -143,6 +182,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		URI apiUri = URI.create(String.format("%s/%s?%s", urlBase, controllerName, ende)); | 		URI apiUri = URI.create(String.format("%s/%s?%s", urlBase, controllerName, ende)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .GET() | 											 .GET() | ||||||
| 											 .build(); | 											 .build(); | ||||||
| @@ -157,7 +197,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			return httpResponse.body(); | 			return httpResponse.body(); | ||||||
|  |  | ||||||
| 			//System.out.println("Response Body: " + test); | 			//System.out.println("Response Body: " + test); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return null; | 			return null; | ||||||
| 		} | 		} | ||||||
| @@ -169,6 +216,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * @param controllerName Name des aufzurufenden Controllers. | 	 * @param controllerName Name des aufzurufenden Controllers. | ||||||
| 	 * @param id Id des zu änderenden Eintrags. | 	 * @param id Id des zu änderenden Eintrags. | ||||||
| 	 * @param jsonData JsonString mit den neuen Daten. | 	 * @param jsonData JsonString mit den neuen Daten. | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public void put(String controllerName, int id, String jsonData) { | 	public void put(String controllerName, int id, String jsonData) { | ||||||
| @@ -176,6 +224,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase,controllerName, id)); | 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase,controllerName, id)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .header("Content-Type", "application/json") | 											 .header("Content-Type", "application/json") | ||||||
| 											 .PUT(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | 											 .PUT(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||||
| @@ -188,7 +237,13 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			// Print the response status code and body | 			// Print the response status code and body | ||||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -198,6 +253,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * | 	 * | ||||||
| 	 * @param controllerName Name des aufzurufenden Controllers. | 	 * @param controllerName Name des aufzurufenden Controllers. | ||||||
| 	 * @param jsonData JsonString mit den Daten des Eintrags. | 	 * @param jsonData JsonString mit den Daten des Eintrags. | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public void post(String controllerName, String jsonData) { | 	public void post(String controllerName, String jsonData) { | ||||||
| @@ -206,6 +262,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		System.out.println(apiUri); | 		System.out.println(apiUri); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .header("Content-Type", "application/json") | 											 .header("Content-Type", "application/json") | ||||||
| 											 .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | 											 .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||||
| @@ -218,7 +275,13 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			// Print the response status code and body | 			// Print the response status code and body | ||||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -228,6 +291,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * | 	 * | ||||||
| 	 * @param controllerName Name des aufzurufenden Controllers | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
| 	 * @param id Id des zu löschenden Eintrags. | 	 * @param id Id des zu löschenden Eintrags. | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	@Override | 	@Override | ||||||
| 	public void delete(String controllerName, int id) { | 	public void delete(String controllerName, int id) { | ||||||
| @@ -236,6 +300,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		System.out.println(apiUri); | 		System.out.println(apiUri); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .header("Content-Type", "application/json") | 											 .header("Content-Type", "application/json") | ||||||
| 											 .DELETE() | 											 .DELETE() | ||||||
| @@ -248,15 +313,28 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			// Print the response status code and body | 			// Print the response status code and body | ||||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/*** | ||||||
|  | 	 * Holt die nöchste Autoinkrement Id für den mitgegebenen Controller aus der Datenbank | ||||||
|  | 	 * @param controllerName | ||||||
|  | 	 * @return | ||||||
|  | 	 * @author Samuel Wolff | ||||||
|  | 	 */ | ||||||
| 	public int nextId(String controllerName){ | 	public int nextId(String controllerName){ | ||||||
| 		URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName)); | 		URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName)); | ||||||
|  |  | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .GET() | 											 .GET() | ||||||
| 											 .build(); | 											 .build(); | ||||||
| @@ -276,7 +354,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
|  |  | ||||||
| 			return json.get("auto_increment").getAsInt(); | 			return json.get("auto_increment").getAsInt(); | ||||||
|  |  | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return -1; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return -1; | 			return -1; | ||||||
| 		} | 		} | ||||||
| @@ -287,6 +372,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * | 	 * | ||||||
| 	 * @param credentials Die Anmeldedaten in Json-String form | 	 * @param credentials Die Anmeldedaten in Json-String form | ||||||
| 	 * @return True oder false, je nach Erfolg des Anmeldeversuchs | 	 * @return True oder false, je nach Erfolg des Anmeldeversuchs | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	public boolean anmeldeVersuch(String credentials){ | 	public boolean anmeldeVersuch(String credentials){ | ||||||
|  |  | ||||||
| @@ -300,6 +386,7 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		URI apiUri = URI.create(String.format("%s/Benutzer/anmeldeVersuch?Benutzername=%s&passwort=%s", urlBase, benutzer, passwort)); | 		URI apiUri = URI.create(String.format("%s/Benutzer/anmeldeVersuch?Benutzername=%s&passwort=%s", urlBase, benutzer, passwort)); | ||||||
| 		System.out.println(apiUri); | 		System.out.println(apiUri); | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .header("Content-Type", "application/json") | 											 .header("Content-Type", "application/json") | ||||||
| 											 .GET() | 											 .GET() | ||||||
| @@ -314,10 +401,25 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 			System.out.println("Response Body: " + httpResponse.body()); | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
| 			if(httpResponse.body().equals("true")) | 			if(httpResponse.body().equals("true")) | ||||||
| 				return true; | 				return true; | ||||||
| 			else | 			else{ | ||||||
|  | 				Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 				alert.setContentText("Falsche Anmeldedaten"); | ||||||
|  | 				alert.setHeaderText("Fehler!"); | ||||||
|  | 				alert.showAndWait(); | ||||||
| 				return false; | 				return false; | ||||||
| 		} catch (Exception e) { | 			} | ||||||
|  | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return false; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Ein Uwuwarteter Fehler ist aufgetreten!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
| 			return false; | 			return false; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -327,12 +429,14 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 	 * | 	 * | ||||||
| 	 * @param datum Das angeforderte Datum in String Form (YYYY-MM-DD) | 	 * @param datum Das angeforderte Datum in String Form (YYYY-MM-DD) | ||||||
| 	 * @return Ein Tagesplan Objekt mit allen Gerichten | 	 * @return Ein Tagesplan Objekt mit allen Gerichten | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	public Tagesplan getGerichteOnTag(String datum){ | 	public Tagesplan getGerichteOnTag(String datum){ | ||||||
|  |  | ||||||
| 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichteOnTag?datum=%s", urlBase, datum)); | 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichteOnTag?datum=%s", urlBase, datum)); | ||||||
| 		System.out.println(apiUri); | 		System.out.println(apiUri); | ||||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .timeout(Duration.ofSeconds(timeout)) | ||||||
| 											 .uri(apiUri) | 											 .uri(apiUri) | ||||||
| 											 .header("Content-Type", "application/json") | 											 .header("Content-Type", "application/json") | ||||||
| 											 .GET() | 											 .GET() | ||||||
| @@ -365,12 +469,26 @@ public class RestApiClient implements IRestAPI{ | |||||||
|  |  | ||||||
| 			return t; | 			return t; | ||||||
|  |  | ||||||
| 		} catch (Exception e) { | 		} | ||||||
|  | 		catch(ConnectException conex){ | ||||||
|  | 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||||
|  | 			alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!"); | ||||||
|  | 			alert.showAndWait(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 		catch (Exception e) { | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 			return null; | 			return null; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Holt die Id des Gerichtes mit dem mitgegebenen Namen an einem mitgegebenen Tag und gibt sie zurück | ||||||
|  | 	 * @param name | ||||||
|  | 	 * @param datum | ||||||
|  | 	 * @return | ||||||
|  | 	 * @author Samuel Wolff | ||||||
|  | 	 */ | ||||||
| 	public int getGerichtIdOnTag(String name, String datum){ | 	public int getGerichtIdOnTag(String name, String datum){ | ||||||
|  |  | ||||||
| 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichtIdOnTag?name=%s&datum=%s", urlBase, name, datum)); | 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichtIdOnTag?name=%s&datum=%s", urlBase, name, datum)); | ||||||
| @@ -403,6 +521,11 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Löscht ein Gericht mit der mitgebenen Id aus der Datenbank | ||||||
|  | 	 * @param id | ||||||
|  | 	 * @author Samuel Wolff | ||||||
|  | 	 */ | ||||||
| 	public void deleteGericht(int id){ | 	public void deleteGericht(int id){ | ||||||
| 		URI apiUri = URI.create(String.format("%s/Tagesplan/%d", urlBase, id)); | 		URI apiUri = URI.create(String.format("%s/Tagesplan/%d", urlBase, id)); | ||||||
| 		System.out.println(apiUri); | 		System.out.println(apiUri); | ||||||
|   | |||||||
| @@ -190,7 +190,11 @@ public class AccounterstellungMitarbeiter { | |||||||
| 	 */ | 	 */ | ||||||
| 	public void onSpeichern(ActionEvent actionEvent) { | 	public void onSpeichern(ActionEvent actionEvent) { | ||||||
| 		if (eingabenGueltig()) { | 		if (eingabenGueltig()) { | ||||||
| 			//Zeigt generiert ein Einmalpasswort und zeigt es an |  | ||||||
|  | 			//speichert das aktuelle Passwort zwischen | ||||||
|  | 			String passwort = einmalpw.getText(); | ||||||
|  |  | ||||||
|  | 			//generiert ein neues Einmalpasswort und zeigt es an | ||||||
| 			einmalpw.setText(einmalPwGenerieren()); | 			einmalpw.setText(einmalPwGenerieren()); | ||||||
|  |  | ||||||
| 			//Schnittstelle zur RestAPI | 			//Schnittstelle zur RestAPI | ||||||
| @@ -213,14 +217,14 @@ public class AccounterstellungMitarbeiter { | |||||||
| 			Account neuer; | 			Account neuer; | ||||||
| 			//Handelt es sich um einen Elternaccount, werden alle Eingegebenen Kinder erstellt. | 			//Handelt es sich um einen Elternaccount, werden alle Eingegebenen Kinder erstellt. | ||||||
| 			if (typEltern.isSelected()) { | 			if (typEltern.isSelected()) { | ||||||
| 				neuer = new ElternAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText()); | 				neuer = new ElternAccount(passwort, accountname.getText(), email.getText()); | ||||||
| 				//Kinder dem neuen Account hinzufügen | 				//Kinder dem neuen Account hinzufügen | ||||||
| 				for (Kind k : kinder) { | 				for (Kind k : kinder) { | ||||||
| 					((ElternAccount)neuer).getKinder().add(k); | 					((ElternAccount)neuer).getKinder().add(k); | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 			else if (typMitarbeiter.isSelected()) { | 			else if (typMitarbeiter.isSelected()) { | ||||||
| 				neuer = new MitarbeiterAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText()); | 				neuer = new MitarbeiterAccount(passwort, accountname.getText(), email.getText()); | ||||||
| 			} | 			} | ||||||
| 			//Ist kein Radio Button ausgewählt, wird hier abgebrochen | 			//Ist kein Radio Button ausgewählt, wird hier abgebrochen | ||||||
| 			else { | 			else { | ||||||
|   | |||||||
| @@ -1,11 +1,16 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import RestAPISchnittstelle.IRestAPI; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
| import javafx.event.ActionEvent; | import javafx.event.ActionEvent; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| import javafx.geometry.Insets; | import javafx.geometry.Insets; | ||||||
|  | import javafx.geometry.Pos; | ||||||
| import javafx.scene.control.Accordion; | import javafx.scene.control.Accordion; | ||||||
|  | import javafx.scene.control.Label; | ||||||
| import javafx.scene.control.ScrollPane; | import javafx.scene.control.ScrollPane; | ||||||
| import javafx.scene.control.TitledPane; | import javafx.scene.control.TitledPane; | ||||||
|  | import javafx.scene.layout.VBox; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| import java.util.List; | import java.util.List; | ||||||
| @@ -28,23 +33,28 @@ public class BestelluebersichtMitarbeiter { | |||||||
|  |  | ||||||
| 		accordion.setStyle("-fx-box-border: transparent;"); | 		accordion.setStyle("-fx-box-border: transparent;"); | ||||||
|  |  | ||||||
| 		for (String s : datum) { | 		for (String i : datum) { | ||||||
| 			TitledPane datumUeberschrift = new TitledPane(s, createGerichtAkkordion()); | 			Accordion gerichtAkkordion = createGerichtAkkordion(); | ||||||
|  |  | ||||||
|  | 			TitledPane datumUeberschrift = new TitledPane(i, gerichtAkkordion); | ||||||
|  |  | ||||||
| 			datumUeberschrift.getStyleClass().add("titledPaneUeberschrift"); | 			datumUeberschrift.getStyleClass().add("titledPaneUeberschrift"); | ||||||
| 			datumUeberschrift.animatedProperty().set(false); | 			datumUeberschrift.animatedProperty().set(false); | ||||||
| 			datumUeberschrift.setPadding(new Insets(0, 0, 15, 0)); | 			datumUeberschrift.setPadding(new Insets(0, 0, 15, 0)); | ||||||
|  |  | ||||||
|  | 			//TitledPane personen = new TitledPane("Person", createPersonenAccordion()); | ||||||
| 			accordion.getPanes().add(datumUeberschrift); | 			accordion.getPanes().add(datumUeberschrift); | ||||||
|  | 			//gerichtAkkordion.getPanes().add(personen); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); | 		scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); | ||||||
| 		scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); | 		scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	private Accordion createGerichtAkkordion() { |  | ||||||
| 		Accordion accordion = new Accordion(); |  | ||||||
| 	int anzahlGerichtA = 1; | 	int anzahlGerichtA = 1; | ||||||
|  |  | ||||||
|  | 	public Accordion createGerichtAkkordion() { | ||||||
|  | 		Accordion accordion = new Accordion(); | ||||||
| 		int anzahlGerichtB = 15; | 		int anzahlGerichtB = 15; | ||||||
| 		int anzahlGerichtC = 3; | 		int anzahlGerichtC = 3; | ||||||
| 		int anzahlGerichtD = 2; | 		int anzahlGerichtD = 2; | ||||||
| @@ -71,6 +81,7 @@ public class BestelluebersichtMitarbeiter { | |||||||
| 			TitledPane tp = new TitledPane(); | 			TitledPane tp = new TitledPane(); | ||||||
| 			tp.setText("GerichtB " + anzahlGerichtB + "-Mal " + preisGerichtB * anzahlGerichtB + " €"); | 			tp.setText("GerichtB " + anzahlGerichtB + "-Mal " + preisGerichtB * anzahlGerichtB + " €"); | ||||||
| 			accordion.getPanes().addAll(tp); | 			accordion.getPanes().addAll(tp); | ||||||
|  |  | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		if (anzahlGerichtC >= 1) { | 		if (anzahlGerichtC >= 1) { | ||||||
| @@ -92,16 +103,44 @@ public class BestelluebersichtMitarbeiter { | |||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		if (anzahlNachtischA >= 1) { | 		if (anzahlNachtischA >= 1) { | ||||||
| 			TitledPane tp = new TitledPane(); |  | ||||||
| 			tp.setText("NachtischB " + anzahlNachtischB + "-Mal " + preisNachtischB * anzahlNachtischB + " €"); | 			Label label2 = new Label("Hans Schwanz" + " für " + " Anja Arbeitslos"); | ||||||
|  | 			Label label3 = new Label("Drittes Label"); | ||||||
|  |  | ||||||
|  | 			VBox vbox = new VBox(label2, label3); | ||||||
|  | 			vbox.setAlignment(Pos.CENTER_LEFT); | ||||||
|  |  | ||||||
|  | 			TitledPane tp = new TitledPane("NachtischB " + "-Mal " + preisNachtischB * anzahlGerichtB + " €", vbox); | ||||||
|  |  | ||||||
| 			accordion.getPanes().addAll(tp); | 			accordion.getPanes().addAll(tp); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		return accordion; | 		return accordion; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/* | ||||||
|  | 	public Accordion createPersonenAccordion() { | ||||||
|  | 		Accordion accordion1 = new Accordion(); | ||||||
|  |  | ||||||
|  | 		for (int i = 0; i < 10; i++) { | ||||||
|  | 			String kind = "Kind"; | ||||||
|  | 			String elternteil = "Max Heer"; | ||||||
|  |  | ||||||
|  | 			Label label = new Label(); | ||||||
|  | 			label.setText(elternteil + " für " + kind); | ||||||
|  |  | ||||||
|  | 			// Erstellen Sie eine TitledPane für jedes Label | ||||||
|  | 			TitledPane titledPane = new TitledPane("Kind Informationen", label); | ||||||
|  |  | ||||||
|  | 			// Fügen Sie die TitledPane zur Accordion hinzu | ||||||
|  | 			accordion1.getPanes().add(titledPane); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		return accordion1; | ||||||
|  | 	} | ||||||
|  | 	*/ | ||||||
|  |  | ||||||
| 	public void onAbmelden(ActionEvent event) { | 	public void onAbmelden(ActionEvent event) { | ||||||
| 		VerwaltungApplication.abmelden(); | 		//VerwaltungApplication.abmelden(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public void onZurueck(ActionEvent actionEvent) { | 	public void onZurueck(ActionEvent actionEvent) { | ||||||
|   | |||||||
| @@ -0,0 +1,38 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.event.ActionEvent; | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.scene.control.Label; | ||||||
|  | import javafx.scene.control.TextField; | ||||||
|  | import javafx.scene.paint.Color; | ||||||
|  |  | ||||||
|  | public class ErsteLoginViewController { | ||||||
|  | 	@FXML | ||||||
|  | 	private Label text; | ||||||
|  | 	@FXML | ||||||
|  | 	private TextField passwort; | ||||||
|  | 	@FXML | ||||||
|  | 	private TextField bpasswort; | ||||||
|  | 	@FXML | ||||||
|  | 	private Label fehlertext; | ||||||
|  | 	private String benutzername; | ||||||
|  | 	public void initialize(){ | ||||||
|  | 		benutzername = "Test"; | ||||||
|  | 		text.setText("Willkommen, "+benutzername+"\n\nUm Sie und Ihre Kinder zu schützen, bitten wir Sie darum Ihr Einmalpasswort zu ändern."); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onAbmelden(ActionEvent actionEvent) { | ||||||
|  | 		VerwaltungApplication.abmelden(); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onbestaetigen(ActionEvent actionEvent) { | ||||||
|  | 		if(passwort.getText().equals(bpasswort.getText())){ | ||||||
|  |  | ||||||
|  | 		} | ||||||
|  | 		else{ | ||||||
|  | 			fehlertext.setText("Die Eingaben müssen identisch sein"); | ||||||
|  | 			fehlertext.setTextFill(Color.color(1, 0, 0)); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -0,0 +1,17 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.event.ActionEvent; | ||||||
|  |  | ||||||
|  | public class EssensverwaltungElternController { | ||||||
|  |  | ||||||
|  | 	public void onFilter(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void pfeilLinks(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void pfeilRechts(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void onAbmelden(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void onZurueck(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -94,8 +94,8 @@ public class EssensverwaltungMitarbeiterView { | |||||||
|  |  | ||||||
| 		VerwaltungApplication.sceneWechseln(gerichterstellung, 400, 530, "gerichterstellung_mitarbeiter-view.fxml"); | 		VerwaltungApplication.sceneWechseln(gerichterstellung, 400, 530, "gerichterstellung_mitarbeiter-view.fxml"); | ||||||
|  |  | ||||||
| 		gerichterstellung.minWidthProperty().set(400); | 		gerichterstellung.minWidthProperty().set(420); | ||||||
| 		gerichterstellung.minHeightProperty().set(530); | 		gerichterstellung.minHeightProperty().set(600); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| @@ -193,6 +193,7 @@ public class EssensverwaltungMitarbeiterView { | |||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| 	 * Initialisiert das responsive grid. | 	 * Initialisiert das responsive grid. | ||||||
|  | 	 * @author Max Heer, Sven Alteköster | ||||||
| 	 */ | 	 */ | ||||||
| 	public void initGrid(){ | 	public void initGrid(){ | ||||||
| 		for (int i = 0; i < tagesplan.getColumnCount(); i++) { | 		for (int i = 0; i < tagesplan.getColumnCount(); i++) { | ||||||
| @@ -217,6 +218,7 @@ public class EssensverwaltungMitarbeiterView { | |||||||
| 	/** | 	/** | ||||||
| 	 * Methode beim klicken auf den Löschen Button eines Tagesplan Elementes | 	 * Methode beim klicken auf den Löschen Button eines Tagesplan Elementes | ||||||
| 	 * @param a | 	 * @param a | ||||||
|  | 	 * @author Samuel Wolff | ||||||
| 	 */ | 	 */ | ||||||
| 	private void loeschenButtonKlick(ActionEvent a){ | 	private void loeschenButtonKlick(ActionEvent a){ | ||||||
| 		Button btn = (Button) a.getSource(); | 		Button btn = (Button) a.getSource(); | ||||||
|   | |||||||
| @@ -1,27 +1,36 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Mahlzeit; | ||||||
| import Logik.Zutat; | import Logik.Zutat; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
|  | import com.google.gson.*; | ||||||
| import javafx.event.ActionEvent; | import javafx.event.ActionEvent; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| import javafx.scene.control.Button; | import javafx.scene.control.*; | ||||||
| import javafx.scene.control.TextArea; |  | ||||||
| import javafx.scene.control.TextField; |  | ||||||
| import javafx.scene.layout.HBox; | import javafx.scene.layout.HBox; | ||||||
| import javafx.scene.layout.Pane; | import javafx.scene.layout.Pane; | ||||||
|  |  | ||||||
|  | import java.time.LocalDate; | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  |  | ||||||
| public class GerichterstellungMitarbeiterView { | public class GerichterstellungMitarbeiterView { | ||||||
|  |  | ||||||
| 	private @FXML HBox anzeigeInhaltsstoffe; | 	private @FXML HBox anzeigeInhaltsstoffe; | ||||||
| 	private @FXML TextArea eingabeBeschreibung; | 	private @FXML TextArea eingabeBeschreibung; | ||||||
| 	private @FXML TextField eingabeName; | 	private @FXML TextField eingabeName; | ||||||
| 	private @FXML Button buttonInhaltsstoffe; | 	private @FXML Button buttonInhaltsstoffe; | ||||||
| 	private @FXML TextField eingabeInhaltsstoffe; | 	private @FXML TextField eingabeInhaltsstoffe; | ||||||
|  | 	private @FXML Button speichernButton; | ||||||
|  | 	private @FXML TextField eingabePreis; | ||||||
|  | 	private @FXML DatePicker datePicker; | ||||||
|  | 	private @FXML Label status; | ||||||
|  |  | ||||||
| 	private ArrayList<Zutat> zutaten; | 	private ArrayList<Zutat> zutaten; | ||||||
|  | 	private ArrayList<Mahlzeit> mahlzeiten; | ||||||
|  |  | ||||||
| 	public void initialize() { | 	public void initialize() { | ||||||
| 		zutaten = new ArrayList<>(); | 		zutaten = new ArrayList<>(); | ||||||
|  | 		mahlzeiten = new ArrayList<>(); | ||||||
|  |  | ||||||
| 		//wird das Fenster vergrößert, wird das Eingabefeld für Inhaltstoffe und den Hinzufügenbutton | 		//wird das Fenster vergrößert, wird das Eingabefeld für Inhaltstoffe und den Hinzufügenbutton | ||||||
| 		// auf die volle breite vergrößert. | 		// auf die volle breite vergrößert. | ||||||
| @@ -48,4 +57,155 @@ public class GerichterstellungMitarbeiterView { | |||||||
| 			}); | 			}); | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	public void onSpeichernButtonClick() { | ||||||
|  | 		String eingabe = eingabeName.getText(); | ||||||
|  | 		String beschreibung = eingabeBeschreibung.getText(); | ||||||
|  | 		float preis = Float.parseFloat(eingabePreis.getText()); | ||||||
|  | 		LocalDate datum = datePicker.getValue(); | ||||||
|  |  | ||||||
|  | 		if (!eingabe.isEmpty() && !beschreibung.isEmpty()) { | ||||||
|  | 			resetEingabeFelder(); | ||||||
|  |  | ||||||
|  | 			Mahlzeit mahlzeit = new Mahlzeit(eingabe, preis, beschreibung); | ||||||
|  | 			mahlzeiten.add(mahlzeit); | ||||||
|  | 			status.setText("Mahlzeit hinzugefügt"); | ||||||
|  |  | ||||||
|  | 			int datumId = datumBearbeiten(datum); | ||||||
|  | 			System.out.println(datumId); | ||||||
|  |  | ||||||
|  | 			int gerichtId = gerichteAbfragen(mahlzeit); | ||||||
|  | 			System.out.println(gerichtId); | ||||||
|  |  | ||||||
|  | 			inhaltsstoff(); | ||||||
|  | 			gibtsAm(gerichtId, datumId); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	private void resetEingabeFelder() { | ||||||
|  | 		eingabeName.setText(""); | ||||||
|  | 		eingabeBeschreibung.setText(""); | ||||||
|  | 		eingabePreis.setText(""); | ||||||
|  | 		eingabeInhaltsstoffe.setText(""); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	private int datumBearbeiten(LocalDate datum) { | ||||||
|  | 		RestApiClient restApiClient = new RestApiClient(); | ||||||
|  | 		String datumAsString = datum.toString(); | ||||||
|  |  | ||||||
|  | 		JsonElement jsonElement = JsonParser.parseString(restApiClient.get("Tagesplan")); | ||||||
|  | 		JsonArray jsonArray = jsonElement.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 		for (JsonElement element : jsonArray) { | ||||||
|  | 			JsonObject obj = element.getAsJsonObject(); | ||||||
|  | 			if (obj.get("datum").getAsString().equals(datumAsString)) { | ||||||
|  | 				return Integer.parseInt(obj.get("id").getAsString()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		restApiClient.post("Tagesplan", "{\"datum\":\"" + datumAsString + "\"}"); | ||||||
|  |  | ||||||
|  | 		jsonElement = JsonParser.parseString(restApiClient.get("Tagesplan")); | ||||||
|  | 		jsonArray = jsonElement.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 		for (JsonElement element : jsonArray) { | ||||||
|  | 			JsonObject obj = element.getAsJsonObject(); | ||||||
|  | 			if (obj.get("datum").getAsString().equals(datumAsString)) { | ||||||
|  | 				return Integer.parseInt(obj.get("id").getAsString()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		return -1; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void gibtsAm(int gid, int tid){ | ||||||
|  | 		RestApiClient restApiClient = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 		JsonObject gibtsAmJson = new JsonObject(); | ||||||
|  |  | ||||||
|  | 		gibtsAmJson.addProperty("tid", tid); | ||||||
|  | 		gibtsAmJson.addProperty("gid", gid); | ||||||
|  | 		restApiClient.post("gibtsAm", gibtsAmJson.toString()); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void inhaltsstoff() { | ||||||
|  | 		RestApiClient restApiClient = new RestApiClient(); | ||||||
|  | 		ArrayList<Integer> ids = new ArrayList<>(); | ||||||
|  |  | ||||||
|  | 		for (Zutat zutat : zutaten) { | ||||||
|  | 			JsonElement jE = JsonParser.parseString(restApiClient.get("Inhaltsstoff")); | ||||||
|  | 			JsonArray inhaltsstoffArray = jE.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 			int id = -1; | ||||||
|  |  | ||||||
|  | 			for (JsonElement element : inhaltsstoffArray) { | ||||||
|  | 				JsonObject inhatsstoff = element.getAsJsonObject(); | ||||||
|  | 				if (inhatsstoff.get("name").getAsString().equalsIgnoreCase(zutat.getName())) { | ||||||
|  | 					id = inhatsstoff.get("id").getAsInt(); | ||||||
|  | 					break; | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			if (id == -1) { | ||||||
|  | 				JsonObject neuerInhaltsstoff = new JsonObject(); | ||||||
|  | 				neuerInhaltsstoff.addProperty("name", zutat.getName()); | ||||||
|  | 				restApiClient.post("Inhaltsstoff", neuerInhaltsstoff.toString()); | ||||||
|  |  | ||||||
|  | 				jE = JsonParser.parseString(restApiClient.get("Inhaltsstoff")); | ||||||
|  | 				inhaltsstoffArray = jE.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 				JsonObject letzterInhaltsstoff = inhaltsstoffArray.get(inhaltsstoffArray.size() - 1).getAsJsonObject(); | ||||||
|  | 				id = letzterInhaltsstoff.get("id").getAsInt(); | ||||||
|  | 				System.out.println("Inhaltsstoff hinzugefügt: " + zutat.getName()); | ||||||
|  | 			} | ||||||
|  | 			ids.add(id); | ||||||
|  | 		} | ||||||
|  | 		System.out.println("IDs der Inhaltsstoffe: " + ids); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 	private int gerichteAbfragen(Mahlzeit mahlzeit) { | ||||||
|  | 		RestApiClient restApiClient = new RestApiClient(); | ||||||
|  | 		JsonElement je = JsonParser.parseString(restApiClient.get("Gericht")); | ||||||
|  | 		JsonArray js = je.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 		for (JsonElement element : js) { | ||||||
|  | 			JsonObject mahlzeitJson = element.getAsJsonObject(); | ||||||
|  | 			String nameMahlzeit = mahlzeitJson.get("name").getAsString(); | ||||||
|  |  | ||||||
|  | 			if (nameMahlzeit.equals(mahlzeit.getName())) { | ||||||
|  | 				int id = Integer.parseInt(mahlzeitJson.get("id").getAsString()); | ||||||
|  |  | ||||||
|  | 				// Update des existierenden Gerichts | ||||||
|  | 				JsonObject updateGericht = new JsonObject(); | ||||||
|  | 				updateGericht.addProperty("id", id); | ||||||
|  | 				updateGericht.addProperty("name", mahlzeit.getName()); | ||||||
|  | 				updateGericht.addProperty("preis", mahlzeit.getPreis()); | ||||||
|  | 				updateGericht.addProperty("beschreibung", mahlzeit.getBeschreibung()); | ||||||
|  |  | ||||||
|  | 				restApiClient.put("Gericht", id, updateGericht.toString()); | ||||||
|  | 				return id; | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		// Neues Gericht zur Datenbank hinzufügen, falls es nicht existiert | ||||||
|  | 		JsonObject neuesGericht = new JsonObject(); | ||||||
|  | 		neuesGericht.addProperty("name", mahlzeit.getName()); | ||||||
|  | 		neuesGericht.addProperty("preis", mahlzeit.getPreis()); | ||||||
|  | 		neuesGericht.addProperty("beschreibung", mahlzeit.getBeschreibung()); | ||||||
|  |  | ||||||
|  | 		restApiClient.post("Gericht", neuesGericht.toString()); | ||||||
|  |  | ||||||
|  | 		// ID des neu hinzugefügten Gerichts abrufen | ||||||
|  | 		je = JsonParser.parseString(restApiClient.get("Gericht")); | ||||||
|  | 		js = je.getAsJsonArray(); | ||||||
|  | 		for (JsonElement element : js) { | ||||||
|  | 			JsonObject mahlzeitJson = element.getAsJsonObject(); | ||||||
|  | 			if (mahlzeitJson.get("name").getAsString().equals(mahlzeit.getName())) { | ||||||
|  | 				return Integer.parseInt(mahlzeitJson.get("id").getAsString()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 		return -1; | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,68 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Tagesplan; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
|  | import javafx.event.ActionEvent; | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.scene.control.Label; | ||||||
|  | import javafx.scene.layout.GridPane; | ||||||
|  | import javafx.scene.text.TextAlignment; | ||||||
|  |  | ||||||
|  | import java.text.DateFormat; | ||||||
|  | import java.util.Date; | ||||||
|  |  | ||||||
|  | public class HauptmenueElternController { | ||||||
|  | 	@FXML | ||||||
|  | 	private GridPane wochenplan; | ||||||
|  | 	private String date; | ||||||
|  | 	private String day; | ||||||
|  | 	private String month; | ||||||
|  | 	private String year; | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Ruft die Methode zum Befüllen der Ansicht auf der Hauptseite auf | ||||||
|  | 	 * @author Max Heer | ||||||
|  | 	 */ | ||||||
|  | 	public void initialize(){ | ||||||
|  | 		wochenuebersichtFuellen(); | ||||||
|  | 	} | ||||||
|  | 	/** | ||||||
|  | 	 * Methode zum initialisieren und befüllen der Tabelle im Hauptmenü | ||||||
|  | 	 * @author Max Heer | ||||||
|  | 	 */ | ||||||
|  | 	public void wochenuebersichtFuellen(){ | ||||||
|  | 		String dateanzeige; | ||||||
|  | 		DateFormat dateFormat = DateFormat.getDateInstance(); | ||||||
|  | 		date = dateFormat.format(new Date()); | ||||||
|  | 		date = date.replace('.', '-'); | ||||||
|  | 		day = date.split("-")[0]; | ||||||
|  | 		month = date.split("-")[1]; | ||||||
|  | 		year = date.split("-")[2]; | ||||||
|  | 		date = String.format("%s-%s-%s", year, month, day); | ||||||
|  | 		dateanzeige = String.format("%s.%s.%s",day,month,year); | ||||||
|  | 		Tagesplan t = new RestApiClient().getGerichteOnTag(date); | ||||||
|  | 		for(int i=0;i<5;i++){ | ||||||
|  | 			Label tag = new Label(); | ||||||
|  | 			wochenplan.add(tag, i, 0); | ||||||
|  | 			tag.setText(dateanzeige); | ||||||
|  | 			for(int j=0; j<t.getGerichte().size();j++){ | ||||||
|  | 				Label name = new Label(); | ||||||
|  | 				name.setWrapText(true); | ||||||
|  | 				wochenplan.add(name, i, j+1); | ||||||
|  | 				name.setText(t.getGerichte().get(j).getName()); | ||||||
|  | 				name.setPrefHeight(75); | ||||||
|  | 				name.setTextAlignment(TextAlignment.CENTER); | ||||||
|  | 			} | ||||||
|  | 			day = String.valueOf(Integer.parseInt(day)+1); | ||||||
|  | 			date = String.format("%s-%s-%s", year, month, day); | ||||||
|  | 			dateanzeige = String.format("%s.%s.%s",day,month,year); | ||||||
|  | 			t = new RestApiClient().getGerichteOnTag(date); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 	public void onAbmelden(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void onBestellungPlanen(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | 	public void onBestellhistorieAnzeigen(ActionEvent actionEvent) {} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -22,7 +22,7 @@ public class HauptmenueMitarbeiterView { | |||||||
|     private String year; |     private String year; | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Ruft die Methode zum Befüllen der Ansicht auf |      * Ruft die Methode zum Befüllen der Ansicht auf der Hauptseite auf | ||||||
|      * @author Max Heer |      * @author Max Heer | ||||||
|      */ |      */ | ||||||
|     public void initialize(){ |     public void initialize(){ | ||||||
|   | |||||||
| @@ -7,14 +7,21 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
| import Logik.Kind; | import Logik.Kind; | ||||||
|  | import Logik.Zutat; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
|  | import com.google.gson.*; | ||||||
|  | import javafx.collections.FXCollections; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| import javafx.scene.control.Button; | import javafx.scene.control.Button; | ||||||
| import javafx.scene.control.CheckBox; | import javafx.scene.control.CheckBox; | ||||||
| import javafx.scene.control.ListView; | import javafx.scene.control.ListView; | ||||||
|  | import javafx.scene.control.SelectionMode; | ||||||
|  |  | ||||||
|  | import java.util.ArrayList; | ||||||
|  |  | ||||||
| public class InhaltsstoffeFilternController { | public class InhaltsstoffeFilternController { | ||||||
|  |  | ||||||
| 	private @FXML ListView<zutatListViewController> zutatListView; | 	private @FXML ListView<Zutat> zutatListView; | ||||||
|  |  | ||||||
| 	private @FXML CheckBox speichernCheckBox; | 	private @FXML CheckBox speichernCheckBox; | ||||||
|  |  | ||||||
| @@ -22,11 +29,28 @@ public class InhaltsstoffeFilternController { | |||||||
|  |  | ||||||
| 	private @FXML Button fortfahrenButton; | 	private @FXML Button fortfahrenButton; | ||||||
|  |  | ||||||
|  | 	private ArrayList<Zutat> zutaten; | ||||||
|  |  | ||||||
| 	public void initialize(){ | 	public void initialize(){ | ||||||
|  |  | ||||||
| 		// hier ListView füllen | 		zutatListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE); | ||||||
|  |  | ||||||
|  | 		RestApiClient api = new RestApiClient(); | ||||||
|  | 		String json = api.get("Inhaltsstoff"); | ||||||
|  |  | ||||||
|  | 		zutaten = new ArrayList<>(); | ||||||
|  |  | ||||||
|  | 		Gson gson = new Gson(); | ||||||
|  |  | ||||||
|  | 		JsonElement je = JsonParser.parseString(json); | ||||||
|  | 		JsonArray ja = je.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 		for (JsonElement e : ja) { | ||||||
|  | 			JsonObject jo = e.getAsJsonObject(); | ||||||
|  | 			zutaten.add(gson.fromJson(jo, Zutat.class)); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		zutatListView.setItems(FXCollections.observableArrayList(zutaten)); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ public class VerwaltungApplication extends Application { | |||||||
|  |  | ||||||
| 	@Override | 	@Override | ||||||
| 	public void start(Stage stage) throws IOException { | 	public void start(Stage stage) throws IOException { | ||||||
| 		FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("login-view.fxml")); | 		FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("gerichterstellung_mitarbeiter-view.fxml")); | ||||||
| 		Scene scene = new Scene(fxmlLoader.load()); | 		Scene scene = new Scene(fxmlLoader.load()); | ||||||
|  |  | ||||||
| 		stage.setWidth(960); | 		stage.setWidth(960); | ||||||
| @@ -121,7 +121,6 @@ public class VerwaltungApplication extends Application { | |||||||
| 	 * Methode zum automatischen vergrößern und verkleinern von Grids | 	 * Methode zum automatischen vergrößern und verkleinern von Grids | ||||||
| 	 * | 	 * | ||||||
| 	 * Geschrieben: Max Heer, Sven Alteköster | 	 * Geschrieben: Max Heer, Sven Alteköster | ||||||
| 	 * Getestet |  | ||||||
| 	 * | 	 * | ||||||
| 	 * @param grid das responsiv sein soll | 	 * @param grid das responsiv sein soll | ||||||
| 	 */ | 	 */ | ||||||
|   | |||||||
| @@ -33,11 +33,5 @@ public class VerwaltungController { | |||||||
| 		String credentials = String.format("{\"Benutzername\" : \"%s\", \"passwort\" : \"%s\"}", benutzernameTextfield.getText(), passwortTextfield.getText()); | 		String credentials = String.format("{\"Benutzername\" : \"%s\", \"passwort\" : \"%s\"}", benutzernameTextfield.getText(), passwortTextfield.getText()); | ||||||
| 		if(client.anmeldeVersuch(credentials)) | 		if(client.anmeldeVersuch(credentials)) | ||||||
| 			VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | 			VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | ||||||
| 		else { |  | ||||||
| 			Alert alert = new Alert(Alert.AlertType.INFORMATION); |  | ||||||
| 			alert.setContentText("Falsche Anmeldedaten"); |  | ||||||
| 			alert.setHeaderText("Fehler!"); |  | ||||||
| 			alert.showAndWait(); |  | ||||||
| 		} |  | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| @@ -6,6 +6,8 @@ | |||||||
| <?import javafx.scene.control.*?> | <?import javafx.scene.control.*?> | ||||||
| <?import javafx.scene.layout.*?> | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <!-- Erstellt von Sven Alteköster --> | ||||||
|  |  | ||||||
| <BorderPane xmlns="http://javafx.com/javafx" | <BorderPane xmlns="http://javafx.com/javafx" | ||||||
|             xmlns:fx="http://javafx.com/fxml" |             xmlns:fx="http://javafx.com/fxml" | ||||||
|             fx:controller="de.subway_surfers.vpr_app.AccounterstellungMitarbeiter" |             fx:controller="de.subway_surfers.vpr_app.AccounterstellungMitarbeiter" | ||||||
|   | |||||||
| @@ -0,0 +1,34 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <!--Erstellt von Max Heer--> | ||||||
|  |  | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <BorderPane prefHeight="400.0" prefWidth="600.0" stylesheets="@layout.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.subway_surfers.vpr_app.ErsteLoginViewController"> | ||||||
|  |     <top> | ||||||
|  |         <BorderPane styleClass="kopfzeile"> | ||||||
|  |             <right> | ||||||
|  |                 <Button onAction="#onAbmelden" text="Abmelden" /> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </top> | ||||||
|  |     <bottom> | ||||||
|  |         <BorderPane styleClass="button-untenrechts"> | ||||||
|  |             <right> | ||||||
|  |                 <Button defaultButton="true" onAction="#onbestaetigen" styleClass=".button" text="Bestätigen" /> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </bottom> | ||||||
|  |    <left> | ||||||
|  |         <AnchorPane BorderPane.alignment="CENTER"> | ||||||
|  |          <children> | ||||||
|  |             <Label fx:id="text" layoutX="27.0" layoutY="34.0" text="Label" /> | ||||||
|  |             <Label layoutX="27.0" layoutY="127.0" text="Passwort:" /> | ||||||
|  |             <Label layoutX="27.0" layoutY="178.0" text="Passwort bestätigen:" /> | ||||||
|  |             <TextField fx:id="passwort" layoutX="175.0" layoutY="122.0" /> | ||||||
|  |             <TextField fx:id="bpasswort" layoutX="175.0" layoutY="173.0" /> | ||||||
|  |             <Label layoutX="27.0" layoutY="216.0" fx:id="fehlertext"/> | ||||||
|  |          </children></AnchorPane> | ||||||
|  |    </left> | ||||||
|  | </BorderPane> | ||||||
| @@ -0,0 +1,61 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  | <!--Erstellt von Max Heer--> | ||||||
|  |  | ||||||
|  | <?import java.lang.*?> | ||||||
|  | <?import java.util.*?> | ||||||
|  | <?import javafx.scene.*?> | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <BorderPane xmlns="http://javafx.com/javafx" | ||||||
|  |             xmlns:fx="http://javafx.com/fxml" | ||||||
|  |             fx:controller="de.subway_surfers.vpr_app.EssensverwaltungElternController" | ||||||
|  |             prefHeight="400.0" prefWidth="600.0" | ||||||
|  |             stylesheets="@layout.css"> | ||||||
|  |     <top> | ||||||
|  |         <BorderPane styleClass="kopfzeile"> | ||||||
|  |             <right> | ||||||
|  |                 <Button text="Abmelden" onAction="#onAbmelden"/> | ||||||
|  |             </right> | ||||||
|  |             <left> | ||||||
|  |                 <Button text="Zurück" onAction="#onZurueck"/> | ||||||
|  |             </left> | ||||||
|  |         </BorderPane> | ||||||
|  |     </top> | ||||||
|  |     <center> | ||||||
|  |         <BorderPane> | ||||||
|  |             <top> | ||||||
|  |                 <BorderPane> | ||||||
|  |                     <left> | ||||||
|  |                         <HBox styleClass="test" spacing="10"> | ||||||
|  |                             <Button text="Filter" onAction="#onFilter"/> | ||||||
|  |                             <Label text="Bestellung Planen für: "/> | ||||||
|  |                             <ComboBox fx:id="kindAuswahl"/> | ||||||
|  |                         </HBox> | ||||||
|  |                     </left> | ||||||
|  |                     <right> | ||||||
|  |                         <HBox styleClass="test" spacing="10"> | ||||||
|  |                             <Button styleClass="pfeil, links" onAction="#pfeilLinks"/> | ||||||
|  |                             <Label fx:id="dateLabel"/> | ||||||
|  |                             <Button styleClass="pfeil" onAction="#pfeilRechts"/> | ||||||
|  |                         </HBox> | ||||||
|  |                     </right> | ||||||
|  |                 </BorderPane> | ||||||
|  |             </top> | ||||||
|  |             <center> | ||||||
|  |                 <AnchorPane> | ||||||
|  |                     <GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" > | ||||||
|  |                     </GridPane> | ||||||
|  |                 </AnchorPane> | ||||||
|  |             </center> | ||||||
|  |         </BorderPane> | ||||||
|  |  | ||||||
|  |     </center> | ||||||
|  |     <bottom> | ||||||
|  |         <BorderPane styleClass="button-untenrechts"> | ||||||
|  |             <right> | ||||||
|  |                 <Button text="Bestätigen" defaultButton="true" styleClass=".button"/> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </bottom> | ||||||
|  | </BorderPane> | ||||||
| @@ -1,11 +1,14 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  | <!--Sven Alteköster--> | ||||||
| <?import java.lang.*?> | <?import java.lang.*?> | ||||||
| <?import java.util.*?> | <?import java.util.*?> | ||||||
| <?import javafx.scene.*?> | <?import javafx.scene.*?> | ||||||
| <?import javafx.scene.control.*?> | <?import javafx.scene.control.*?> | ||||||
| <?import javafx.scene.layout.*?> | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <!-- Erstellt von Sven Alteköster --> | ||||||
|  |  | ||||||
|  | <?import javafx.geometry.Insets?> | ||||||
| <BorderPane xmlns="http://javafx.com/javafx" | <BorderPane xmlns="http://javafx.com/javafx" | ||||||
|             xmlns:fx="http://javafx.com/fxml" |             xmlns:fx="http://javafx.com/fxml" | ||||||
|             fx:controller="de.subway_surfers.vpr_app.GerichterstellungMitarbeiterView" |             fx:controller="de.subway_surfers.vpr_app.GerichterstellungMitarbeiterView" | ||||||
| @@ -14,19 +17,22 @@ | |||||||
|     <center> |     <center> | ||||||
|        <VBox styleClass="gerichterstellung_felder"> |        <VBox styleClass="gerichterstellung_felder"> | ||||||
|            <TextField fx:id="eingabeName" promptText="Name des Gerichtes" focusTraversable="false"/> |            <TextField fx:id="eingabeName" promptText="Name des Gerichtes" focusTraversable="false"/> | ||||||
|  |            <TextField fx:id="eingabePreis" promptText="Preis des Gerichtes" focusTraversable="false"/> | ||||||
|            <TextArea fx:id="eingabeBeschreibung" promptText="Beschreibung" focusTraversable="false"/> |            <TextArea fx:id="eingabeBeschreibung" promptText="Beschreibung" focusTraversable="false"/> | ||||||
|            <HBox> |            <HBox> | ||||||
|                <TextField fx:id="eingabeInhaltsstoffe" promptText="Inhaltsstoffe" focusTraversable="false"/> |                <TextField fx:id="eingabeInhaltsstoffe" promptText="Inhaltsstoffe" focusTraversable="false"/> | ||||||
|                <Button fx:id="buttonInhaltsstoffe" onAction="#onButtonInhaltsstoffeClick" text="Hinzufügen"/> |                <Button fx:id="buttonInhaltsstoffe" onAction="#onButtonInhaltsstoffeClick" text="Hinzufügen"/> | ||||||
|            </HBox> |            </HBox> | ||||||
|            <HBox fx:id="anzeigeInhaltsstoffe" /> |            <HBox fx:id="anzeigeInhaltsstoffe" minHeight="30"/> | ||||||
|  |            <DatePicker fx:id="datePicker" maxWidth="Infinity"/> | ||||||
|  |            <Label fx:id="status"/> | ||||||
|        </VBox> |        </VBox> | ||||||
|     </center> |     </center> | ||||||
|     <bottom> |     <bottom> | ||||||
|         <BorderPane> |         <BorderPane> | ||||||
|             <right> |             <right> | ||||||
|                 <HBox styleClass="button_untenrechts"> |                 <HBox styleClass="button_untenrechts"> | ||||||
|                     <Button text="Speichern" defaultButton="true"/> |                     <Button fx:id="speichernButton" text="Speichern" defaultButton="true" onAction="#onSpeichernButtonClick"/> | ||||||
|                 </HBox> |                 </HBox> | ||||||
|             </right> |             </right> | ||||||
|         </BorderPane> |         </BorderPane> | ||||||
|   | |||||||
| @@ -0,0 +1,37 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  | <!--Erstellt von Sven Alteköster und Max Heer--> | ||||||
|  |  | ||||||
|  | <?import java.lang.*?> | ||||||
|  | <?import java.util.*?> | ||||||
|  | <?import javafx.scene.*?> | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <!-- Erstellt von Sven Alteköster --> | ||||||
|  |  | ||||||
|  | <BorderPane xmlns="http://javafx.com/javafx" | ||||||
|  |             xmlns:fx="http://javafx.com/fxml" | ||||||
|  |             fx:controller="de.subway_surfers.vpr_app.HauptmenueElternController" | ||||||
|  |             prefHeight="400.0" prefWidth="600.0" | ||||||
|  |             stylesheets="@layout.css"> | ||||||
|  |     <top> | ||||||
|  |         <BorderPane styleClass="kopfzeile"> | ||||||
|  |             <right> | ||||||
|  |                 <Button text="Abmelden" onAction="#onAbmelden"/> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </top> | ||||||
|  |     <center> | ||||||
|  |         <BorderPane styleClass="main"> | ||||||
|  |             <left> | ||||||
|  |                 <VBox styleClass="hauptmenue_buttons_links"> | ||||||
|  |                     <Button text="Bestellung Planen" onAction="#onBestellungPlanen"/> | ||||||
|  |                     <Button text="Bestellhistorie anzeigen" onAction="#onBestellhistorieAnzeigen"/> | ||||||
|  |                 </VBox> | ||||||
|  |             </left> | ||||||
|  |             <right> | ||||||
|  |                 <GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"/> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </center> | ||||||
|  | </BorderPane> | ||||||
| @@ -31,8 +31,7 @@ | |||||||
|                 </VBox> |                 </VBox> | ||||||
|             </left> |             </left> | ||||||
|             <right> |             <right> | ||||||
|                 <GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"> |                 <GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"/> | ||||||
|                 </GridPane> |  | ||||||
|             </right> |             </right> | ||||||
|         </BorderPane> |         </BorderPane> | ||||||
|     </center> |     </center> | ||||||
|   | |||||||
| @@ -1,9 +1,6 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
| <!-- @author Samuel Wolff | <!--Samuel Wolff--> | ||||||
|      Noch nicht getestet |  | ||||||
|      TODO Style einbauen |  | ||||||
| --> |  | ||||||
|  |  | ||||||
| <?import javafx.scene.control.*?> | <?import javafx.scene.control.*?> | ||||||
| <?import javafx.scene.layout.*?> | <?import javafx.scene.layout.*?> | ||||||
|   | |||||||
| @@ -6,6 +6,8 @@ | |||||||
| <?import javafx.scene.control.*?> | <?import javafx.scene.control.*?> | ||||||
| <?import javafx.scene.layout.*?> | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <!-- Erstellt von Sven Alteköster --> | ||||||
|  |  | ||||||
| <BorderPane xmlns="http://javafx.com/javafx" | <BorderPane xmlns="http://javafx.com/javafx" | ||||||
|             xmlns:fx="http://javafx.com/fxml" |             xmlns:fx="http://javafx.com/fxml" | ||||||
|             fx:controller="de.subway_surfers.vpr_app.VerwaltungController" |             fx:controller="de.subway_surfers.vpr_app.VerwaltungController" | ||||||
|   | |||||||
| @@ -1,10 +1,6 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
| <!-- | <!--Samuel Wolff--> | ||||||
|     @author Samuel Wolff |  | ||||||
|     Noch nicht getestet |  | ||||||
|     TODO Style einbinden |  | ||||||
| --> |  | ||||||
|  |  | ||||||
| <?import java.lang.*?> | <?import java.lang.*?> | ||||||
| <?import java.util.*?> | <?import java.util.*?> | ||||||
|   | |||||||
| @@ -1,10 +1,6 @@ | |||||||
| <?xml version="1.0" encoding="UTF-8"?> | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
| <!-- | <!--Samuel Wolff--> | ||||||
| @author Samuel Wolff |  | ||||||
| Noch nicht getestet |  | ||||||
| TODO Style einbauen |  | ||||||
| --> |  | ||||||
|  |  | ||||||
| <?import java.lang.*?> | <?import java.lang.*?> | ||||||
| <?import java.util.*?> | <?import java.util.*?> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user