Compare commits
	
		
			9 Commits
		
	
	
		
			samu_maske
			...
			f43dad000f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | f43dad000f | ||
| c6b4bc1cd1 | |||
| 450e08b8e7 | |||
| 17f0d66677 | |||
| 3ac92ea955 | |||
| e817a7caa1 | |||
| feba2a14b2 | |||
|   | 287ccd9ce5 | ||
|   | 8dfe6547c9 | 
| @@ -1,6 +1,8 @@ | ||||
| package Logik; | ||||
|  | ||||
| import java.time.LocalDate; | ||||
| import java.util.ArrayList; | ||||
| import java.util.Date; | ||||
|  | ||||
| public class Mahlzeit { | ||||
| 	private String name; | ||||
| @@ -15,6 +17,7 @@ public class Mahlzeit { | ||||
| 		zutaten = new ArrayList<>(); | ||||
| 	} | ||||
|  | ||||
|  | ||||
| 	public String getName() { | ||||
| 		return name; | ||||
| 	} | ||||
|   | ||||
| @@ -9,4 +9,10 @@ public class Zutat { | ||||
| 	public String getName(){ | ||||
| 		return this.name; | ||||
| 	} | ||||
|  | ||||
| 	@Override | ||||
| 	public String toString() { | ||||
| 		return name; | ||||
| 	} | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -1,10 +1,12 @@ | ||||
| package RestAPISchnittstelle; | ||||
|  | ||||
| import java.net.ConnectException; | ||||
| import java.net.URI; | ||||
| import java.net.http.HttpClient; | ||||
| import java.net.http.HttpRequest; | ||||
| import java.net.http.HttpResponse; | ||||
| import java.nio.charset.StandardCharsets; | ||||
| import java.time.Duration; | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| import Logik.ElternAccount; | ||||
| @@ -12,6 +14,7 @@ import Logik.Kind; | ||||
| import Logik.Mahlzeit; | ||||
| import Logik.Tagesplan; | ||||
| import com.google.gson.*; | ||||
| import javafx.scene.control.Alert; | ||||
|  | ||||
| /** | ||||
|  * noch nicht getestet | ||||
| @@ -22,6 +25,8 @@ public class RestApiClient implements IRestAPI{ | ||||
|  | ||||
| 	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 Gson gson; | ||||
| @@ -54,6 +59,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s", urlBase, controllerName)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
| @@ -66,7 +72,14 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			System.out.println("Response Body: " + 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(); | ||||
| 			return null; | ||||
| 		} | ||||
| @@ -83,6 +96,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
| @@ -97,7 +111,14 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			return httpResponse.body(); | ||||
|  | ||||
| 			//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(); | ||||
| 			return null; | ||||
| 		} | ||||
| @@ -115,6 +136,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s?%s&%s", urlBase, controllerName, id, bezahlt)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
| @@ -127,7 +149,14 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			System.out.println("Response Body: " + 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(); | ||||
| 			return null; | ||||
| 		} | ||||
| @@ -143,6 +172,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s?%s", urlBase, controllerName, ende)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
| @@ -157,7 +187,14 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			return httpResponse.body(); | ||||
|  | ||||
| 			//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(); | ||||
| 			return null; | ||||
| 		} | ||||
| @@ -176,6 +213,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase,controllerName, id)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .header("Content-Type", "application/json") | ||||
| 											 .PUT(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||
| @@ -188,7 +226,13 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Print the response status code and body | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			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(); | ||||
| 		} | ||||
| 	} | ||||
| @@ -206,6 +250,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		System.out.println(apiUri); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .header("Content-Type", "application/json") | ||||
| 											 .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||
| @@ -218,7 +263,13 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Print the response status code and body | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			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(); | ||||
| 		} | ||||
| 	} | ||||
| @@ -236,6 +287,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		System.out.println(apiUri); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .header("Content-Type", "application/json") | ||||
| 											 .DELETE() | ||||
| @@ -248,7 +300,13 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			// Print the response status code and body | ||||
| 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||
| 			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(); | ||||
| 		} | ||||
| 	} | ||||
| @@ -257,6 +315,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName)); | ||||
|  | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .GET() | ||||
| 											 .build(); | ||||
| @@ -276,7 +335,14 @@ public class RestApiClient implements IRestAPI{ | ||||
|  | ||||
| 			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(); | ||||
| 			return -1; | ||||
| 		} | ||||
| @@ -300,6 +366,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/Benutzer/anmeldeVersuch?Benutzername=%s&passwort=%s", urlBase, benutzer, passwort)); | ||||
| 		System.out.println(apiUri); | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .header("Content-Type", "application/json") | ||||
| 											 .GET() | ||||
| @@ -314,10 +381,25 @@ public class RestApiClient implements IRestAPI{ | ||||
| 			System.out.println("Response Body: " + httpResponse.body()); | ||||
| 			if(httpResponse.body().equals("true")) | ||||
| 				return true; | ||||
| 			else | ||||
| 			else{ | ||||
| 				Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||
| 				alert.setContentText("Falsche Anmeldedaten"); | ||||
| 				alert.setHeaderText("Fehler!"); | ||||
| 				alert.showAndWait(); | ||||
| 				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(); | ||||
| 			Alert alert = new Alert(Alert.AlertType.INFORMATION); | ||||
| 			alert.setContentText("Ein Uwuwarteter Fehler ist aufgetreten!"); | ||||
| 			alert.showAndWait(); | ||||
| 			return false; | ||||
| 		} | ||||
| 	} | ||||
| @@ -333,6 +415,7 @@ public class RestApiClient implements IRestAPI{ | ||||
| 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichteOnTag?datum=%s", urlBase, datum)); | ||||
| 		System.out.println(apiUri); | ||||
| 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||
| 											 .timeout(Duration.ofSeconds(timeout)) | ||||
| 											 .uri(apiUri) | ||||
| 											 .header("Content-Type", "application/json") | ||||
| 											 .GET() | ||||
| @@ -365,7 +448,14 @@ public class RestApiClient implements IRestAPI{ | ||||
|  | ||||
| 			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(); | ||||
| 			return null; | ||||
| 		} | ||||
|   | ||||
| @@ -1,11 +1,16 @@ | ||||
| package de.subway_surfers.vpr_app; | ||||
|  | ||||
| import RestAPISchnittstelle.IRestAPI; | ||||
| import RestAPISchnittstelle.RestApiClient; | ||||
| import javafx.event.ActionEvent; | ||||
| import javafx.fxml.FXML; | ||||
| import javafx.geometry.Insets; | ||||
| import javafx.geometry.Pos; | ||||
| import javafx.scene.control.Accordion; | ||||
| import javafx.scene.control.Label; | ||||
| import javafx.scene.control.ScrollPane; | ||||
| import javafx.scene.control.TitledPane; | ||||
| import javafx.scene.layout.VBox; | ||||
|  | ||||
| import java.util.ArrayList; | ||||
| import java.util.List; | ||||
| @@ -28,23 +33,28 @@ public class BestelluebersichtMitarbeiter { | ||||
|  | ||||
| 		accordion.setStyle("-fx-box-border: transparent;"); | ||||
|  | ||||
| 		for (String s : datum) { | ||||
| 			TitledPane datumUeberschrift = new TitledPane(s, createGerichtAkkordion()); | ||||
| 		for (String i : datum) { | ||||
| 			Accordion gerichtAkkordion = createGerichtAkkordion(); | ||||
|  | ||||
| 			TitledPane datumUeberschrift = new TitledPane(i, gerichtAkkordion); | ||||
|  | ||||
| 			datumUeberschrift.getStyleClass().add("titledPaneUeberschrift"); | ||||
| 			datumUeberschrift.animatedProperty().set(false); | ||||
| 			datumUeberschrift.setPadding(new Insets(0, 0, 15, 0)); | ||||
|  | ||||
| 			//TitledPane personen = new TitledPane("Person", createPersonenAccordion()); | ||||
| 			accordion.getPanes().add(datumUeberschrift); | ||||
| 			//gerichtAkkordion.getPanes().add(personen); | ||||
| 		} | ||||
|  | ||||
| 		scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); | ||||
| 		scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); | ||||
| 	} | ||||
|  | ||||
| 	private Accordion createGerichtAkkordion() { | ||||
| 		Accordion accordion = new Accordion(); | ||||
| 	int anzahlGerichtA = 1; | ||||
|  | ||||
| 	public Accordion createGerichtAkkordion() { | ||||
| 		Accordion accordion = new Accordion(); | ||||
| 		int anzahlGerichtB = 15; | ||||
| 		int anzahlGerichtC = 3; | ||||
| 		int anzahlGerichtD = 2; | ||||
| @@ -71,6 +81,7 @@ public class BestelluebersichtMitarbeiter { | ||||
| 			TitledPane tp = new TitledPane(); | ||||
| 			tp.setText("GerichtB " + anzahlGerichtB + "-Mal " + preisGerichtB * anzahlGerichtB + " €"); | ||||
| 			accordion.getPanes().addAll(tp); | ||||
|  | ||||
| 		} | ||||
|  | ||||
| 		if (anzahlGerichtC >= 1) { | ||||
| @@ -92,14 +103,42 @@ public class BestelluebersichtMitarbeiter { | ||||
| 		} | ||||
|  | ||||
| 		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); | ||||
| 		} | ||||
|  | ||||
| 		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) { | ||||
| 		VerwaltungApplication.abmelden(); | ||||
| 	} | ||||
|   | ||||
| @@ -95,8 +95,8 @@ public class EssensverwaltungMitarbeiterView { | ||||
|  | ||||
| 		VerwaltungApplication.sceneWechseln(gerichterstellung, 400, 530, "gerichterstellung_mitarbeiter-view.fxml"); | ||||
|  | ||||
| 		gerichterstellung.minWidthProperty().set(400); | ||||
| 		gerichterstellung.minHeightProperty().set(530); | ||||
| 		gerichterstellung.minWidthProperty().set(420); | ||||
| 		gerichterstellung.minHeightProperty().set(600); | ||||
| 	} | ||||
|  | ||||
| 	public void onZurueck(ActionEvent actionEvent) { | ||||
|   | ||||
| @@ -1,27 +1,36 @@ | ||||
| package de.subway_surfers.vpr_app; | ||||
|  | ||||
| import Logik.Mahlzeit; | ||||
| import Logik.Zutat; | ||||
| import RestAPISchnittstelle.RestApiClient; | ||||
| import com.google.gson.*; | ||||
| import javafx.event.ActionEvent; | ||||
| import javafx.fxml.FXML; | ||||
| import javafx.scene.control.Button; | ||||
| import javafx.scene.control.TextArea; | ||||
| import javafx.scene.control.TextField; | ||||
| import javafx.scene.control.*; | ||||
| import javafx.scene.layout.HBox; | ||||
| import javafx.scene.layout.Pane; | ||||
|  | ||||
| import java.time.LocalDate; | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| public class GerichterstellungMitarbeiterView { | ||||
|  | ||||
| 	private @FXML HBox anzeigeInhaltsstoffe; | ||||
| 	private @FXML TextArea eingabeBeschreibung; | ||||
| 	private @FXML TextField eingabeName; | ||||
| 	private @FXML Button buttonInhaltsstoffe; | ||||
| 	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<Mahlzeit> mahlzeiten; | ||||
|  | ||||
| 	public void initialize() { | ||||
| 		zutaten = new ArrayList<>(); | ||||
| 		mahlzeiten = new ArrayList<>(); | ||||
|  | ||||
| 		//wird das Fenster vergrößert, wird das Eingabefeld für Inhaltstoffe und den Hinzufügenbutton | ||||
| 		// 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; | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -7,14 +7,21 @@ | ||||
| package de.subway_surfers.vpr_app; | ||||
|  | ||||
| import Logik.Kind; | ||||
| import Logik.Zutat; | ||||
| import RestAPISchnittstelle.RestApiClient; | ||||
| import com.google.gson.*; | ||||
| import javafx.collections.FXCollections; | ||||
| import javafx.fxml.FXML; | ||||
| import javafx.scene.control.Button; | ||||
| import javafx.scene.control.CheckBox; | ||||
| import javafx.scene.control.ListView; | ||||
| import javafx.scene.control.SelectionMode; | ||||
|  | ||||
| import java.util.ArrayList; | ||||
|  | ||||
| public class InhaltsstoffeFilternController { | ||||
|  | ||||
| 	private @FXML ListView<zutatListViewController> zutatListView; | ||||
| 	private @FXML ListView<Zutat> zutatListView; | ||||
|  | ||||
| 	private @FXML CheckBox speichernCheckBox; | ||||
|  | ||||
| @@ -22,11 +29,28 @@ public class InhaltsstoffeFilternController { | ||||
|  | ||||
| 	private @FXML Button fortfahrenButton; | ||||
|  | ||||
| 	private ArrayList<Zutat> zutaten; | ||||
|  | ||||
| 	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)); | ||||
| 	} | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -33,11 +33,5 @@ public class VerwaltungController { | ||||
| 		String credentials = String.format("{\"Benutzername\" : \"%s\", \"passwort\" : \"%s\"}", benutzernameTextfield.getText(), passwortTextfield.getText()); | ||||
| 		if(client.anmeldeVersuch(credentials)) | ||||
| 			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,7 @@ | ||||
| <?import javafx.scene.control.*?> | ||||
| <?import javafx.scene.layout.*?> | ||||
|  | ||||
| <?import javafx.geometry.Insets?> | ||||
| <BorderPane xmlns="http://javafx.com/javafx" | ||||
|             xmlns:fx="http://javafx.com/fxml" | ||||
|             fx:controller="de.subway_surfers.vpr_app.GerichterstellungMitarbeiterView" | ||||
| @@ -14,19 +15,22 @@ | ||||
|     <center> | ||||
|        <VBox styleClass="gerichterstellung_felder"> | ||||
|            <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"/> | ||||
|            <HBox> | ||||
|                <TextField fx:id="eingabeInhaltsstoffe" promptText="Inhaltsstoffe" focusTraversable="false"/> | ||||
|                <Button fx:id="buttonInhaltsstoffe" onAction="#onButtonInhaltsstoffeClick" text="Hinzufügen"/> | ||||
|            </HBox> | ||||
|            <HBox fx:id="anzeigeInhaltsstoffe" /> | ||||
|            <HBox fx:id="anzeigeInhaltsstoffe" minHeight="30"/> | ||||
|            <DatePicker fx:id="datePicker" maxWidth="Infinity"/> | ||||
|            <Label fx:id="status"/> | ||||
|        </VBox> | ||||
|     </center> | ||||
|     <bottom> | ||||
|         <BorderPane> | ||||
|             <right> | ||||
|                 <HBox styleClass="button_untenrechts"> | ||||
|                     <Button text="Speichern" defaultButton="true"/> | ||||
|                     <Button fx:id="speichernButton" text="Speichern" defaultButton="true" onAction="#onSpeichernButtonClick"/> | ||||
|                 </HBox> | ||||
|             </right> | ||||
|         </BorderPane> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user