Compare commits
	
		
			26 Commits
		
	
	
		
			SvenAccoun
			...
			3ac92ea955
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3ac92ea955 | |||
| 509dc31d62 | |||
| a8e9d0ada4 | |||
| f281bc9ef4 | |||
| e817a7caa1 | |||
| cac9a4f43a | |||
| feba2a14b2 | |||
| eea06a254f | |||
| f0d87b0e43 | |||
| c5a179a0d2 | |||
| 1073423b16 | |||
| c182bd5714 | |||
| c358366869 | |||
| 5c21ee1743 | |||
| 0741325aa6 | |||
| 9e8ca5cebf | |||
| ee5fc5ded6 | |||
| afb53d8863 | |||
| 57fb7ff997 | |||
| 39b9266067 | |||
| 245323383d | |||
| 1db44e7b22 | |||
| f59bc8d27f | |||
| 0326d80a21 | |||
| 93a443ebe1 | |||
| 412d9d7497 | 
							
								
								
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							| @@ -7,8 +7,9 @@ | |||||||
|         <option value="$PROJECT_DIR$/pom.xml" /> |         <option value="$PROJECT_DIR$/pom.xml" /> | ||||||
|       </list> |       </list> | ||||||
|     </option> |     </option> | ||||||
|  |     <option name="workspaceImportForciblyTurnedOn" value="true" /> | ||||||
|   </component> |   </component> | ||||||
|   <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="21" project-jdk-type="JavaSDK"> |   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK"> | ||||||
|     <output url="file://$PROJECT_DIR$/out" /> |     <output url="file://$PROJECT_DIR$/out" /> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
| @@ -10,7 +10,7 @@ public class Account { | |||||||
| 	// region Felder | 	// region Felder | ||||||
| 	private String passwort; | 	private String passwort; | ||||||
|  |  | ||||||
| 	private transient int id; | 	private /*transient*/ int id; | ||||||
|  |  | ||||||
| 	private String name; | 	private String name; | ||||||
|  |  | ||||||
| @@ -65,5 +65,17 @@ public class Account { | |||||||
| 		else if (this instanceof ElternAccount) | 		else if (this instanceof ElternAccount) | ||||||
| 			rid = 1; | 			rid = 1; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	public Account(int id, String passwort, String name, String email) { | ||||||
|  | 		this.id = id; | ||||||
|  | 		this.passwort = passwort; | ||||||
|  | 		this.name = name; | ||||||
|  | 		this.email = email; | ||||||
|  |  | ||||||
|  | 		if(this instanceof MitarbeiterAccount) | ||||||
|  | 			rid = 0; | ||||||
|  | 		else if (this instanceof ElternAccount) | ||||||
|  | 			rid = 1; | ||||||
|  | 	} | ||||||
| 	// endregion | 	// endregion | ||||||
| } | } | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ public class Kind { | |||||||
|  |  | ||||||
| 	// region Felder | 	// region Felder | ||||||
|  |  | ||||||
| 	private transient int id; | 	private /*transient*/ int id; | ||||||
| 	private String name; | 	private String name; | ||||||
| 	private String vorname; | 	private String vorname; | ||||||
| 	private int bid; | 	private int bid; | ||||||
|   | |||||||
| @@ -31,4 +31,9 @@ public class Mahlzeit { | |||||||
| 		return beschreibung; | 		return beschreibung; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	@Override | ||||||
|  | 	public String toString() { | ||||||
|  | 		return String.format("Name: %s, Preis: %g, Beschreibung: %s", name, preis, beschreibung); | ||||||
|  | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -9,6 +9,7 @@ public class Tagesplan { | |||||||
|  |  | ||||||
| 	public Tagesplan(String datum) { | 	public Tagesplan(String datum) { | ||||||
| 		this.datum = datum; | 		this.datum = datum; | ||||||
|  | 		this.gerichte = new ArrayList<>(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public ArrayList<Mahlzeit> getGerichte() { | 	public ArrayList<Mahlzeit> getGerichte() { | ||||||
|   | |||||||
| @@ -17,6 +17,8 @@ public interface IRestAPI { | |||||||
|  |  | ||||||
| 	String get (String controllerName, int id, boolean bezahlt); | 	String get (String controllerName, int id, boolean bezahlt); | ||||||
|  |  | ||||||
|  | 	String get(String controllerName, String[] params); | ||||||
|  |  | ||||||
| 	//endregion | 	//endregion | ||||||
|  |  | ||||||
| 	// region put | 	// region put | ||||||
|   | |||||||
| @@ -5,9 +5,12 @@ 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.util.ArrayList; | ||||||
|  |  | ||||||
| import Logik.ElternAccount; | import Logik.ElternAccount; | ||||||
| import Logik.Kind; | import Logik.Kind; | ||||||
|  | import Logik.Mahlzeit; | ||||||
|  | import Logik.Tagesplan; | ||||||
| import com.google.gson.*; | import com.google.gson.*; | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -32,8 +35,13 @@ public class RestApiClient implements IRestAPI{ | |||||||
|  |  | ||||||
| 		RestApiClient client1 = new RestApiClient(); | 		RestApiClient client1 = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 		client1.delete("Kind", 15); | ||||||
|  |  | ||||||
| 		System.out.println(client1.nextId("Benutzer")); |  | ||||||
|  | 		Tagesplan t = client1.getGerichteOnTag("2023-12-17"); | ||||||
|  |  | ||||||
|  | 		for(Mahlzeit m : t.getGerichte()) | ||||||
|  | 			System.out.println(m); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| @@ -125,6 +133,36 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	@Override | ||||||
|  | 	public String get(String controllerName, String[] params) { | ||||||
|  | 		String ende = ""; | ||||||
|  | 		for (String str : params) { | ||||||
|  | 			ende += str + ","; | ||||||
|  | 		} | ||||||
|  | 		ende = ende.substring(0, ende.length() - 1); | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s?%s", urlBase, controllerName, ende)); | ||||||
|  |  | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .GET() | ||||||
|  | 											 .build(); | ||||||
|  |  | ||||||
|  | 		try { | ||||||
|  | 			// Send the request and get the response | ||||||
|  | 			HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); | ||||||
|  |  | ||||||
|  | 			// Print the response status code and body | ||||||
|  | 			System.out.println("Status Code: " + httpResponse.statusCode() + httpResponse.body()); | ||||||
|  |  | ||||||
|  | 			return httpResponse.body(); | ||||||
|  |  | ||||||
|  | 			//System.out.println("Response Body: " + test); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| 	 * Methode für einen Put-Aufruf. Aktualisiert einen Eintrag. | 	 * Methode für einen Put-Aufruf. Aktualisiert einen Eintrag. | ||||||
| 	 * | 	 * | ||||||
| @@ -215,7 +253,6 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
| 	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)); | ||||||
|  |  | ||||||
| @@ -245,4 +282,93 @@ public class RestApiClient implements IRestAPI{ | |||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Startet einen guckt ob die mitgegebenen Anmeldedaten in der Kombination existieren. | ||||||
|  | 	 * | ||||||
|  | 	 * @param credentials Die Anmeldedaten in Json-String form | ||||||
|  | 	 * @return True oder false, je nach Erfolg des Anmeldeversuchs | ||||||
|  | 	 */ | ||||||
|  | 	public boolean anmeldeVersuch(String credentials){ | ||||||
|  |  | ||||||
|  | 		JsonObject json = gson.fromJson(credentials, JsonObject.class); | ||||||
|  | 		String benutzer = json.get("Benutzername").toString(); | ||||||
|  | 		benutzer = benutzer.substring(1, benutzer.length()-1); | ||||||
|  |  | ||||||
|  | 		String passwort = json.get("passwort").toString(); | ||||||
|  | 		passwort = passwort.substring(1, passwort.length()-1); | ||||||
|  |  | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/Benutzer/anmeldeVersuch?Benutzername=%s&passwort=%s", urlBase, benutzer, passwort)); | ||||||
|  | 		System.out.println(apiUri); | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .header("Content-Type", "application/json") | ||||||
|  | 											 .GET() | ||||||
|  | 											 .build(); | ||||||
|  |  | ||||||
|  | 		try { | ||||||
|  | 			// Send the request and get the response | ||||||
|  | 			HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); | ||||||
|  |  | ||||||
|  | 			// Print the response status code and body | ||||||
|  | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
|  | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
|  | 			if(httpResponse.body().equals("true")) | ||||||
|  | 				return true; | ||||||
|  | 			else | ||||||
|  | 				return false; | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return false; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Holt alle Gerichte eines mitgegebenen Tages aus der Datenbank | ||||||
|  | 	 * | ||||||
|  | 	 * @param datum Das angeforderte Datum in String Form (YYYY-MM-DD) | ||||||
|  | 	 * @return Ein Tagesplan Objekt mit allen Gerichten | ||||||
|  | 	 */ | ||||||
|  | 	public Tagesplan getGerichteOnTag(String datum){ | ||||||
|  |  | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichteOnTag?datum=%s", urlBase, datum)); | ||||||
|  | 		System.out.println(apiUri); | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .header("Content-Type", "application/json") | ||||||
|  | 											 .GET() | ||||||
|  | 											 .build(); | ||||||
|  |  | ||||||
|  | 		try { | ||||||
|  | 			// Send the request and get the response | ||||||
|  | 			HttpResponse<String> httpResponse = client.send(httpRequest, HttpResponse.BodyHandlers.ofString()); | ||||||
|  |  | ||||||
|  | 			// Print the response status code and body | ||||||
|  | 			System.out.println("Status Code: " + httpResponse.statusCode()); | ||||||
|  | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
|  |  | ||||||
|  | 			Tagesplan t = new Tagesplan(datum); | ||||||
|  |  | ||||||
|  | 			JsonElement jsonElement = JsonParser.parseString(httpResponse.body()); | ||||||
|  |  | ||||||
|  | 			JsonArray json = jsonElement.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 			for(int i = 0; i< json.size(); i++){ | ||||||
|  |  | ||||||
|  | 				JsonObject o = json.get(i).getAsJsonObject(); | ||||||
|  | 				String name = o.get("name").getAsString(); | ||||||
|  | 				float preis = o.get("preis").getAsFloat(); | ||||||
|  | 				String beschreibung = o.get("beschreibung").getAsString(); | ||||||
|  |  | ||||||
|  | 				t.getGerichte().add(new Mahlzeit(name, preis, beschreibung)); | ||||||
|  |  | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			return t; | ||||||
|  |  | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -5,6 +5,9 @@ import Logik.ElternAccount; | |||||||
| import Logik.Kind; | import Logik.Kind; | ||||||
| import Logik.MitarbeiterAccount; | import Logik.MitarbeiterAccount; | ||||||
| import RestAPISchnittstelle.RestApiClient; | import RestAPISchnittstelle.RestApiClient; | ||||||
|  | import com.google.gson.JsonArray; | ||||||
|  | import com.google.gson.JsonElement; | ||||||
|  | import com.google.gson.JsonParser; | ||||||
| import javafx.collections.ListChangeListener; | import javafx.collections.ListChangeListener; | ||||||
| import javafx.event.ActionEvent; | import javafx.event.ActionEvent; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| @@ -43,14 +46,30 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		kinder = new ArrayList<>(); | 		kinder = new ArrayList<>(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Hauptmenü wird angezeigt | ||||||
|  | 	 * | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	public void onZurueck(ActionEvent actionEvent) { | 	public void onZurueck(ActionEvent actionEvent) { | ||||||
| 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Der nutzer wird abgemeldet | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	public void onAbmelden(ActionEvent actionEvent) { | 	public void onAbmelden(ActionEvent actionEvent) { | ||||||
| 		VerwaltungApplication.abmelden(); | 		//VerwaltungApplication.abmelden(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Die Felder zum Erstellen von Kindern werden gelöscht | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	public void onTypMitarbeiter(ActionEvent actionEvent) { | 	public void onTypMitarbeiter(ActionEvent actionEvent) { | ||||||
| 		kindDaten.getChildren().clear(); | 		kindDaten.getChildren().clear(); | ||||||
| 	} | 	} | ||||||
| @@ -58,9 +77,12 @@ public class AccounterstellungMitarbeiter { | |||||||
| 	/** | 	/** | ||||||
| 	 * Einfügen der Eingabefelder für Kinder, wenn der Eltern-Radiobutton ausgewählt wird | 	 * Einfügen der Eingabefelder für Kinder, wenn der Eltern-Radiobutton ausgewählt wird | ||||||
| 	 * @param actionEvent | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
| 	 */ | 	 */ | ||||||
| 	public void onTypEltern(ActionEvent actionEvent) { | 	public void onTypEltern(ActionEvent actionEvent) { | ||||||
| 		//Einfügen der Eingabefelder für Kinder | 		//Einfügen der Eingabefelder für Kinder | ||||||
|  |  | ||||||
|  | 		//Einfügen der Überschrift | ||||||
| 		Label ueberschrift = new Label(); | 		Label ueberschrift = new Label(); | ||||||
| 		ueberschrift.setText("Daten des Kindes:"); | 		ueberschrift.setText("Daten des Kindes:"); | ||||||
| 		kindDaten.addRow(0); | 		kindDaten.addRow(0); | ||||||
| @@ -68,18 +90,21 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		kindDaten.addRow(1); | 		kindDaten.addRow(1); | ||||||
| 		kindDaten.add(ueberschrift,0,0); | 		kindDaten.add(ueberschrift,0,0); | ||||||
|  |  | ||||||
|  | 		//Einfügen der Eingabe für den Vornamen eines Kindes | ||||||
| 		kindDaten.addRow(1); | 		kindDaten.addRow(1); | ||||||
| 		Label vname = new Label("Vorname:"); | 		Label vname = new Label("Vorname:"); | ||||||
| 		kindDaten.add(vname, 0, 1); | 		kindDaten.add(vname, 0, 1); | ||||||
| 		TextField vnameEingabe = new TextField(); | 		TextField vnameEingabe = new TextField(); | ||||||
| 		kindDaten.add(vnameEingabe, 1, 1); | 		kindDaten.add(vnameEingabe, 1, 1); | ||||||
|  |  | ||||||
|  | 		//Einfügen der Eingabe für den Nachnamen eines Kindes | ||||||
| 		kindDaten.addRow(2); | 		kindDaten.addRow(2); | ||||||
| 		Label nname = new Label("Nachname:"); | 		Label nname = new Label("Nachname:"); | ||||||
| 		kindDaten.add(nname, 0, 2); | 		kindDaten.add(nname, 0, 2); | ||||||
| 		TextField nnameEingabe = new TextField(); | 		TextField nnameEingabe = new TextField(); | ||||||
| 		kindDaten.add(nnameEingabe, 1, 2); | 		kindDaten.add(nnameEingabe, 1, 2); | ||||||
|  |  | ||||||
|  | 		//Einfügen der Eingabe für den Geburtstag eines Kindes | ||||||
| 		kindDaten.addRow(3); | 		kindDaten.addRow(3); | ||||||
| 		Label geburtstag = new Label("Geburtstag: "); | 		Label geburtstag = new Label("Geburtstag: "); | ||||||
| 		kindDaten.add(geburtstag, 0, 3); | 		kindDaten.add(geburtstag, 0, 3); | ||||||
| @@ -87,11 +112,15 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		geburtstagEingabe.setEditable(false); | 		geburtstagEingabe.setEditable(false); | ||||||
| 		kindDaten.add(geburtstagEingabe, 1, 3); | 		kindDaten.add(geburtstagEingabe, 1, 3); | ||||||
|  |  | ||||||
|  | 		//Einfügen des bestätigen Buttons | ||||||
| 		kindDaten.addRow(4); | 		kindDaten.addRow(4); | ||||||
| 		Button hinzufuegen = new Button("hinzufügen"); | 		Button hinzufuegen = new Button("hinzufügen"); | ||||||
| 		kindDaten.add(hinzufuegen, 1, 4); | 		kindDaten.add(hinzufuegen, 1, 4); | ||||||
|  |  | ||||||
|  | 		if (kindDaten.getRowCount() < 5) { | ||||||
| 			kindDaten.addRow(5); | 			kindDaten.addRow(5); | ||||||
|  | 		} | ||||||
|  |  | ||||||
| 		//wird der Button zum hinzufügen eines Kindes geclickt wird dieses Event ausgelöst | 		//wird der Button zum hinzufügen eines Kindes geclickt wird dieses Event ausgelöst | ||||||
| 		hinzufuegen.setOnAction(e -> { | 		hinzufuegen.setOnAction(e -> { | ||||||
| 			Button neues = new Button(vnameEingabe.getText()); | 			Button neues = new Button(vnameEingabe.getText()); | ||||||
| @@ -130,6 +159,11 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		}); | 		}); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Generiert ein zufälliges Passwort bestehend aus Buchstaben zwischen A und Z | ||||||
|  | 	 * @return ein Passwort der länge pwLaenge | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	private String einmalPwGenerieren() { | 	private String einmalPwGenerieren() { | ||||||
| 		final int pwLaenge = 8; | 		final int pwLaenge = 8; | ||||||
| 		String pw = ""; | 		String pw = ""; | ||||||
| @@ -143,14 +177,16 @@ public class AccounterstellungMitarbeiter { | |||||||
| 	/** | 	/** | ||||||
| 	 * Prüft, ob in allen Textfeldern für die Eltern Text steht. | 	 * Prüft, ob in allen Textfeldern für die Eltern Text steht. | ||||||
| 	 * @return true, wenn kein Feld leer ist | 	 * @return true, wenn kein Feld leer ist | ||||||
|  | 	 * @author Sven Alteköster | ||||||
| 	 */ | 	 */ | ||||||
| 	private boolean eingabenGueltig() { | 	private boolean eingabenGueltig() { | ||||||
| 		return !accountname.getText().equals("") && !email.getText().equals("") && (typEltern.isSelected() || typMitarbeiter.isSelected()); | 		return !accountname.getText().equals("") && !email.getText().equals("") && (typEltern.isSelected() || typMitarbeiter.isSelected()); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| 	 * | 	 * Speichert die Eingegebenen Daten in der Datenbank, wenn diese noch nicht vorhanden sind | ||||||
| 	 * @param actionEvent | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
| 	 */ | 	 */ | ||||||
| 	public void onSpeichern(ActionEvent actionEvent) { | 	public void onSpeichern(ActionEvent actionEvent) { | ||||||
| 		if (eingabenGueltig()) { | 		if (eingabenGueltig()) { | ||||||
| @@ -160,15 +196,24 @@ public class AccounterstellungMitarbeiter { | |||||||
| 			//Schnittstelle zur RestAPI | 			//Schnittstelle zur RestAPI | ||||||
| 			RestApiClient api = new RestApiClient(); | 			RestApiClient api = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 			Gson gson = new Gson(); | ||||||
|  |  | ||||||
| 			//id, die das Elternobjekt bekommt, dass im laufe der Methode erstellt wird | 			//id, die das Elternobjekt bekommt, dass im laufe der Methode erstellt wird | ||||||
|  | 			String[] accName = {String.format("name=%s", accountname.getText())}; | ||||||
|  |  | ||||||
|  | 			String json = api.get("Benutzer", accName); | ||||||
| 			int id = api.nextId("Benutzer"); | 			int id = api.nextId("Benutzer"); | ||||||
|  | 			boolean kontoVorhanden = false; | ||||||
|  | 			if (!json.equals("false")) { | ||||||
|  | 				kontoVorhanden = true; | ||||||
|  | 				id = gson.fromJson(json, Account.class).getId(); | ||||||
|  | 			} | ||||||
|  |  | ||||||
| 			//Erstellen des neuen Accounts | 			//Erstellen des neuen Accounts | ||||||
| 			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(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText()); | ||||||
| 				System.out.println(neuer.getEmail()); |  | ||||||
| 				//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); | ||||||
| @@ -185,10 +230,11 @@ public class AccounterstellungMitarbeiter { | |||||||
| 			//Die Liste, zum Speichern der gespeicherten Liste wird zurückgesetzt, da die Kinder jetzt im Elternobjekt gespeichert werden | 			//Die Liste, zum Speichern der gespeicherten Liste wird zurückgesetzt, da die Kinder jetzt im Elternobjekt gespeichert werden | ||||||
| 			kinder.clear(); | 			kinder.clear(); | ||||||
|  |  | ||||||
| 			Gson gson = new Gson(); | 			//Das Elternelement wird in der DB gespeichert, wenn es keinen gleichnamigen Account gibt. | ||||||
|  | 			if (!kontoVorhanden) { | ||||||
| 			//Das Elternelement wird in der DB gespeichert. |  | ||||||
| 				api.post("Benutzer", gson.toJson(neuer)); | 				api.post("Benutzer", gson.toJson(neuer)); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  |  | ||||||
| 			//handelt es sich um einen Elternaccount, werden alle Kind-Objekte in der DB gespeichert | 			//handelt es sich um einen Elternaccount, werden alle Kind-Objekte in der DB gespeichert | ||||||
| 			if (neuer instanceof ElternAccount) { | 			if (neuer instanceof ElternAccount) { | ||||||
| @@ -203,5 +249,69 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		else { | 		else { | ||||||
| 			status.setText("Accounterstellung Fehlgeschlagen"); | 			status.setText("Accounterstellung Fehlgeschlagen"); | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|  | 		kindanzeige.getChildren().clear(); | ||||||
|  | 		kinder.clear(); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Lädt alle zugehörigen Daten aus der Datenbank, die mit dem eingegebenen Benutzernamen übereinstimmen | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
|  | 	public void onLaden(ActionEvent actionEvent) { | ||||||
|  | 		kindanzeige.getChildren().clear(); | ||||||
|  | 		kinder.clear(); | ||||||
|  |  | ||||||
|  | 		Gson gson = new Gson(); | ||||||
|  | 		RestApiClient api = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 		String[] params =  {String.format("name=%s", accountname.getText())}; | ||||||
|  | 		String jsonAcc = api.get("Benutzer", params); | ||||||
|  |  | ||||||
|  | 		Account acc; | ||||||
|  | 		//Handelt es sich um einen Mitarbeiter, wird dieser ausgewählt un die zugehörigen Felder werden ausgefüllt | ||||||
|  | 		if (jsonAcc.contains("\"rid\":\"0\"")) { | ||||||
|  | 			acc = gson.fromJson(jsonAcc, MitarbeiterAccount.class); | ||||||
|  |  | ||||||
|  | 			accountTyp.selectToggle(typMitarbeiter); | ||||||
|  | 		} | ||||||
|  | 		//Handelt es sich um einen Elternaccount werden die Felder ausgefüllt und alle Kinder geladen | ||||||
|  | 		else if (jsonAcc.contains("\"rid\":\"1\"")) { | ||||||
|  | 			acc = gson.fromJson(jsonAcc, ElternAccount.class); | ||||||
|  |  | ||||||
|  | 			accountTyp.selectToggle(typEltern); | ||||||
|  | 			onTypEltern(new ActionEvent()); | ||||||
|  |  | ||||||
|  | 			kindDaten.addRow(5); | ||||||
|  |  | ||||||
|  | 			String jsonString = api.get("Kind", acc.getId()); | ||||||
|  | 			JsonElement je = JsonParser.parseString(jsonString); | ||||||
|  | 			JsonArray ja = je.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 			//Alle Kinder werden als clickbarer Button eingefügt | ||||||
|  | 			for (JsonElement str : ja) { | ||||||
|  | 				Kind kind = gson.fromJson(str, Kind.class); | ||||||
|  |  | ||||||
|  | 				Button btn = new Button(); | ||||||
|  | 				btn.setText(kind.getVorname()); | ||||||
|  |  | ||||||
|  | 				kindanzeige.getChildren().add(btn); | ||||||
|  |  | ||||||
|  | 				//Wird der Button gecklickt, wird das Kind gelöscht | ||||||
|  | 				btn.setOnAction(a -> { | ||||||
|  | 					api.delete("Kind", kind.getId()); | ||||||
|  | 					//Der geclickte Button wird entfernt | ||||||
|  | 					((HBox) btn.getParent()).getChildren().remove(btn); | ||||||
|  | 				}); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 		} | ||||||
|  | 		//Wird der Account nicht gefunden, wird abgebrochen | ||||||
|  | 		else { | ||||||
|  | 			status.setText("Account nicht gefunden"); | ||||||
|  | 			return; | ||||||
|  | 		} | ||||||
|  | 		email.setText(acc.getEmail()); | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,10 +1,19 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Mahlzeit; | ||||||
|  | import Logik.Tagesplan; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
|  | import javafx.beans.value.ChangeListener; | ||||||
|  | import javafx.beans.value.ObservableValue; | ||||||
|  | import javafx.collections.FXCollections; | ||||||
|  | import javafx.collections.ObservableList; | ||||||
| import javafx.event.ActionEvent; | import javafx.event.ActionEvent; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| import javafx.geometry.Pos; | import javafx.geometry.Pos; | ||||||
| import javafx.scene.Node; | import javafx.scene.Node; | ||||||
|  | import javafx.scene.control.Button; | ||||||
| import javafx.scene.control.Control; | import javafx.scene.control.Control; | ||||||
|  | import javafx.scene.control.Label; | ||||||
| import javafx.scene.layout.ColumnConstraints; | import javafx.scene.layout.ColumnConstraints; | ||||||
| import javafx.scene.layout.GridPane; | import javafx.scene.layout.GridPane; | ||||||
| import javafx.scene.layout.Priority; | import javafx.scene.layout.Priority; | ||||||
| @@ -12,30 +21,62 @@ import javafx.scene.layout.RowConstraints; | |||||||
| import javafx.stage.Modality; | import javafx.stage.Modality; | ||||||
| import javafx.stage.Stage; | import javafx.stage.Stage; | ||||||
|  |  | ||||||
|  | import java.net.http.WebSocket; | ||||||
|  | import java.text.DateFormat; | ||||||
|  | import java.time.LocalTime; | ||||||
|  | import java.time.format.DateTimeFormatter; | ||||||
|  | import java.util.ArrayList; | ||||||
|  | import java.util.Date; | ||||||
|  |  | ||||||
|  | import static java.time.LocalTime.now; | ||||||
|  |  | ||||||
|  |  | ||||||
| public class EssensverwaltungMitarbeiterView { | public class EssensverwaltungMitarbeiterView { | ||||||
|  |  | ||||||
|  | 	public Label dateLabel; | ||||||
| 	@FXML | 	@FXML | ||||||
| 	private GridPane tagesplan; | 	private GridPane tagesplan; | ||||||
|  |  | ||||||
| 	public void initialize(){ | 	private Tagesplan t; | ||||||
| 		for (int i = 0; i < tagesplan.getColumnCount(); i++) { |  | ||||||
| 			ColumnConstraints cc = new ColumnConstraints(); |  | ||||||
| 			cc.setHgrow(Priority.ALWAYS); |  | ||||||
| 			cc.setFillWidth(true); |  | ||||||
| 			tagesplan.getColumnConstraints().add(cc); |  | ||||||
| 		} |  | ||||||
| 		VerwaltungApplication.responsiveBreiteGrid(tagesplan); |  | ||||||
|  |  | ||||||
| 		tagesplan.heightProperty().addListener((obs,oldValue,newValue) -> { | 	private String date; | ||||||
|  |  | ||||||
|  | 	private String day; | ||||||
|  |  | ||||||
|  | 	private String month; | ||||||
|  |  | ||||||
|  | 	private String year; | ||||||
|  |  | ||||||
|  | 	private ChangeListener listener; | ||||||
|  |  | ||||||
|  | 	public void initialize(){ | ||||||
|  |  | ||||||
|  | /* | ||||||
|  | 		(obs,oldValue,newValue) -> { | ||||||
| 			final int zeile = 1; | 			final int zeile = 1; | ||||||
| 			for (Node n : tagesplan.getChildren()){ | 			for (Node n : tagesplan.getChildren()){ | ||||||
| 				if(n instanceof Control  && GridPane.getRowIndex(n) == zeile){ | 				if(n instanceof Control  && GridPane.getRowIndex(n) == zeile){ | ||||||
| 					((Control) n).setPrefHeight(newValue.floatValue()); | 					((Control) n).setPrefHeight(newValue.floatValue()); | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 		}); | 		} | ||||||
|  | 		*/ | ||||||
|  |  | ||||||
|  | 		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); | ||||||
|  |  | ||||||
|  | 		dateLabel.setText(String.format("%s.%s.%s", day, month, year)); | ||||||
|  |  | ||||||
|  | 		initGrid(); | ||||||
|  | 		initGerichte(); | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public void onAbmelden(ActionEvent actionEvent) { | 	public void onAbmelden(ActionEvent actionEvent) { | ||||||
| 		VerwaltungApplication.sceneWechseln("login-view.fxml"); | 		VerwaltungApplication.sceneWechseln("login-view.fxml"); | ||||||
| 	} | 	} | ||||||
| @@ -61,4 +102,114 @@ public class EssensverwaltungMitarbeiterView { | |||||||
| 	public void onZurueck(ActionEvent actionEvent) { | 	public void onZurueck(ActionEvent actionEvent) { | ||||||
| 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode bei Klick auf Pfeil links, ändert das Datum und gibt neue Gerichte auf die GUI aus. | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 */ | ||||||
|  | 	public void pfeilLinks(ActionEvent actionEvent) { | ||||||
|  |  | ||||||
|  | 		tagesplan.getChildren().clear(); | ||||||
|  |  | ||||||
|  | 		day = String.valueOf(Integer.parseInt(day)-1); | ||||||
|  | 		date = String.format("%s-%s-%s", year, month, day); | ||||||
|  |  | ||||||
|  | 		dateLabel.setText(String.format("%s.%s.%s", day, month, year)); | ||||||
|  |  | ||||||
|  | 		initGerichte(); | ||||||
|  |  | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode bei Klick auf Pfeil rechts, ändert das Datum und gibt neue Gerichte auf die GUI aus. | ||||||
|  | 	 * @param actionEvent | ||||||
|  | 	 */ | ||||||
|  | 	public void pfeilRechts(ActionEvent actionEvent) { | ||||||
|  |  | ||||||
|  | 		tagesplan.getChildren().clear(); | ||||||
|  |  | ||||||
|  | 		day = String.valueOf(Integer.parseInt(day)+1); | ||||||
|  | 		date = String.format("%s-%s-%s", year, month, day); | ||||||
|  |  | ||||||
|  | 		dateLabel.setText(String.format("%s.%s.%s", day, month, year)); | ||||||
|  |  | ||||||
|  | 		initGerichte(); | ||||||
|  |  | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Initialisiert alle Gerichte des aktuellen Datums auf der Seite. | ||||||
|  | 	 */ | ||||||
|  | 	private void initGerichte(){ | ||||||
|  |  | ||||||
|  | 		tagesplan.getStyleClass().clear(); | ||||||
|  |  | ||||||
|  | 		t = new RestApiClient().getGerichteOnTag(date); | ||||||
|  |  | ||||||
|  | 		if(!t.getGerichte().isEmpty()) { | ||||||
|  | 			for (int i = 0; i < t.getGerichte().size(); i++) { | ||||||
|  | 				Label name = new Label(); | ||||||
|  | 				tagesplan.add(name, i, 0); | ||||||
|  | 				Label beschreibung = new Label(); | ||||||
|  | 				beschreibung.setWrapText(true); | ||||||
|  | 				tagesplan.add(beschreibung, i, 1); | ||||||
|  | 				Button loeschen = new Button("Löschen"); | ||||||
|  | 				tagesplan.add(loeschen, i ,2); | ||||||
|  | 				loeschen.setOnAction(this::loeschenButtonKlick); | ||||||
|  |  | ||||||
|  | 				name.setText(t.getGerichte().get(i).getName()); | ||||||
|  | 				beschreibung.setText(t.getGerichte().get(i).getBeschreibung()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 		else { | ||||||
|  | 			Label label = new Label(); | ||||||
|  |  | ||||||
|  | 			label.setText("Für diesen Tag sind keine Gerichte eingetragen"); | ||||||
|  | 			tagesplan.add(label, 0, 0); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		for (Node n : tagesplan.getChildren()) { | ||||||
|  | 			if (n instanceof Control) { | ||||||
|  | 				((Control) n).setPrefWidth(tagesplan.getWidth() / tagesplan.getColumnCount()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		for (Node n : tagesplan.getChildren()){ | ||||||
|  | 			if(n instanceof Control  && GridPane.getRowIndex(n) == 1){ | ||||||
|  | 				((Control) n).setPrefHeight(tagesplan.getHeight()); | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		tagesplan.getStyleClass().add("essensuebersicht_gridlines"); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void initGrid(){ | ||||||
|  | 		for (int i = 0; i < tagesplan.getColumnCount(); i++) { | ||||||
|  | 			ColumnConstraints cc = new ColumnConstraints(); | ||||||
|  | 			cc.setHgrow(Priority.ALWAYS); | ||||||
|  | 			cc.setFillWidth(true); | ||||||
|  | 			tagesplan.getColumnConstraints().add(cc); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		tagesplan.heightProperty().addListener((obs,oldValue,newValue) -> { | ||||||
|  | 			final int zeile = 1; | ||||||
|  | 			for (Node n : tagesplan.getChildren()){ | ||||||
|  | 				if(n instanceof Control  && GridPane.getRowIndex(n) == zeile){ | ||||||
|  | 					((Control) n).setPrefHeight(newValue.floatValue()); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 		}); | ||||||
|  |  | ||||||
|  | 		VerwaltungApplication.responsiveBreiteGrid(tagesplan); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	private void loeschenButtonKlick(ActionEvent a){ | ||||||
|  | 		Button btn = (Button) a.getSource(); | ||||||
|  | 		int col = GridPane.getColumnIndex(btn); | ||||||
|  | 		t.getGerichte().remove(col); | ||||||
|  | 		initGerichte(); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,9 +1,67 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Tagesplan; | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
| import javafx.event.ActionEvent; | 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 HauptmenueMitarbeiterView { | public class HauptmenueMitarbeiterView { | ||||||
|  |  | ||||||
|  |     @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 | ||||||
|  |      * @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 onAbmelden(ActionEvent actionEvent) { | ||||||
|         VerwaltungApplication.abmelden(); |         VerwaltungApplication.abmelden(); | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -3,4 +3,7 @@ package de.subway_surfers.vpr_app; | |||||||
| import javafx.scene.control.Button; | import javafx.scene.control.Button; | ||||||
|  |  | ||||||
| public class LoginView { | public class LoginView { | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -15,6 +15,10 @@ public class VerwaltungApplication extends Application { | |||||||
|  |  | ||||||
| 	private static Stage stage; | 	private static Stage stage; | ||||||
|  |  | ||||||
|  | 	public static void abmelden(){ | ||||||
|  | 		VerwaltungApplication.sceneWechseln("login-view.fxml"); | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	@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("login-view.fxml")); | ||||||
| @@ -110,10 +114,7 @@ public class VerwaltungApplication extends Application { | |||||||
|  |  | ||||||
| 			e.printStackTrace(); | 			e.printStackTrace(); | ||||||
| 		} | 		} | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	public static void abmelden() { |  | ||||||
| 		sceneWechseln("login-view.fxml"); |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
|   | |||||||
| @@ -1,28 +1,43 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
| import Logik.Account; |  | ||||||
| import RestAPISchnittstelle.RestApiClient; | import RestAPISchnittstelle.RestApiClient; | ||||||
| import javafx.event.ActionEvent; | import javafx.event.ActionEvent; | ||||||
| import javafx.fxml.FXML; | import javafx.fxml.FXML; | ||||||
| import javafx.fxml.FXMLLoader; | import javafx.fxml.FXMLLoader; | ||||||
| import javafx.scene.Scene; | import javafx.scene.Scene; | ||||||
| import javafx.scene.control.Alert; | import javafx.scene.control.*; | ||||||
| import javafx.scene.control.Button; |  | ||||||
| import javafx.scene.control.Label; |  | ||||||
| import javafx.stage.Stage; | import javafx.stage.Stage; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
|  |  | ||||||
| public class VerwaltungController { | public class VerwaltungController { | ||||||
|  |  | ||||||
|  | 	@FXML | ||||||
|  | 	public PasswordField passwortTextfield; | ||||||
|  | 	@FXML | ||||||
|  | 	public TextField benutzernameTextfield; | ||||||
|  |  | ||||||
| 	public void initialize(){ | 	public void initialize(){ | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
| 	/** | 	/** | ||||||
| 	 * Wird der Abmeldenbutton geklickt, wird der Nutzer angemeldet. | 	 * Wird der Anmeldenbutton geklickt, wird der Nutzer angemeldet. | ||||||
| 	 */ | 	 */ | ||||||
| 	public void onAnmeldenClick(ActionEvent actionEvent) { | 	public void onAnmeldenClick(ActionEvent actionEvent) { | ||||||
|  | 		RestApiClient client = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 		String credentials = String.format("{\"Benutzername\" : \"%s\", \"passwort\" : \"%s\"}", benutzernameTextfield.getText(), passwortTextfield.getText()); | ||||||
|  | 		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(); | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| @@ -51,6 +51,7 @@ | |||||||
|             <right> |             <right> | ||||||
|                 <HBox styleClass="button-untenrechts"> |                 <HBox styleClass="button-untenrechts"> | ||||||
|                     <Label fx:id="status"/> |                     <Label fx:id="status"/> | ||||||
|  |                     <Button text="Laden" onAction="#onLaden"/> | ||||||
|                     <Button text="Speichern" defaultButton="true" onAction="#onSpeichern"/> |                     <Button text="Speichern" defaultButton="true" onAction="#onSpeichern"/> | ||||||
|                 </HBox> |                 </HBox> | ||||||
|             </right> |             </right> | ||||||
|   | |||||||
| @@ -34,21 +34,16 @@ | |||||||
|                     </left> |                     </left> | ||||||
|                     <right> |                     <right> | ||||||
|                         <HBox styleClass="test" spacing="10"> |                         <HBox styleClass="test" spacing="10"> | ||||||
|                             <Button styleClass="pfeil, links"/> |                             <Button styleClass="pfeil, links" onAction="#pfeilLinks"/> | ||||||
|                             <Label text="Montag DD.MM.YY"/> |                             <Label fx:id="dateLabel"/> | ||||||
|                             <Button styleClass="pfeil"/> |                             <Button styleClass="pfeil" onAction="#pfeilRechts"/> | ||||||
|                         </HBox> |                         </HBox> | ||||||
|                     </right> |                     </right> | ||||||
|                 </BorderPane> |                 </BorderPane> | ||||||
|             </top> |             </top> | ||||||
|             <center> |             <center> | ||||||
|                 <AnchorPane> |                 <AnchorPane> | ||||||
|                     <GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" styleClass="essensuebersicht_gridlines"> |                     <GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" > | ||||||
|                         <Label text="GerichtName" GridPane.columnIndex="0" GridPane.rowIndex="0"/> |  | ||||||
|                         <Label GridPane.columnIndex="1" GridPane.rowIndex="0"/> |  | ||||||
|                         <Label GridPane.columnIndex="2" GridPane.rowIndex="0"/> |  | ||||||
|                         <Label GridPane.columnIndex="3" GridPane.rowIndex="0"/> |  | ||||||
|                         <Label GridPane.columnIndex="0" GridPane.rowIndex="1"/> |  | ||||||
|                     </GridPane> |                     </GridPane> | ||||||
|                 </AnchorPane> |                 </AnchorPane> | ||||||
|             </center> |             </center> | ||||||
|   | |||||||
| @@ -31,14 +31,7 @@ | |||||||
|                 </VBox> |                 </VBox> | ||||||
|             </left> |             </left> | ||||||
|             <right> |             <right> | ||||||
|                 <GridPane styleClass="hauptmenue_wochenuebersicht"> |                 <GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"> | ||||||
|                     <Label text="Montag" GridPane.columnIndex="0" GridPane.rowIndex="0"/> |  | ||||||
|                     <Label text="Dienstag" GridPane.columnIndex="1" GridPane.rowIndex="0"/> |  | ||||||
|                     <Label text="Mittwoch" GridPane.columnIndex="2" GridPane.rowIndex="0"/> |  | ||||||
|                     <Label text="Donnerstag" GridPane.columnIndex="3" GridPane.rowIndex="0"/> |  | ||||||
|                     <Label text="Freitag" GridPane.columnIndex="4" GridPane.rowIndex="0"/> |  | ||||||
|  |  | ||||||
|                     <Label text="Gericht1" styleClass="hauptmenue_gericht" GridPane.columnIndex="0" GridPane.rowIndex="1"/> |  | ||||||
|                 </GridPane> |                 </GridPane> | ||||||
|             </right> |             </right> | ||||||
|         </BorderPane> |         </BorderPane> | ||||||
|   | |||||||
| @@ -81,7 +81,7 @@ | |||||||
|      -fx-grid-lines-visible: true; |      -fx-grid-lines-visible: true; | ||||||
| } | } | ||||||
|  |  | ||||||
| .accounterstellung_links { | .accounterstellung_links, .button-untenrechts{ | ||||||
|     -fx-spacing: 20; |     -fx-spacing: 20; | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,9 +19,9 @@ | |||||||
|             </HBox> |             </HBox> | ||||||
|  |  | ||||||
|             <Label text="Benutzername" GridPane.rowIndex="1" GridPane.columnIndex="0"/> |             <Label text="Benutzername" GridPane.rowIndex="1" GridPane.columnIndex="0"/> | ||||||
|             <TextField GridPane.rowIndex="1" GridPane.columnIndex="1"/> |             <TextField fx:id="benutzernameTextfield" GridPane.rowIndex="1" GridPane.columnIndex="1"/> | ||||||
|             <Label text="Passwort" GridPane.rowIndex="2" GridPane.columnIndex="0"/> |             <Label text="Passwort" GridPane.rowIndex="2" GridPane.columnIndex="0"/> | ||||||
|             <PasswordField GridPane.rowIndex="2" GridPane.columnIndex="1"/> |             <PasswordField fx:id="passwortTextfield" GridPane.rowIndex="2" GridPane.columnIndex="1"/> | ||||||
|  |  | ||||||
|             <CheckBox text="Kennwort merken" GridPane.rowIndex="3" GridPane.columnIndex="0"/> |             <CheckBox text="Kennwort merken" GridPane.rowIndex="3" GridPane.columnIndex="0"/> | ||||||
|         </GridPane> |         </GridPane> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user