Compare commits
	
		
			52 Commits
		
	
	
		
			7422271b9d
			...
			AccountsUe
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c358366869 | |||
| 39b9266067 | |||
| 1db44e7b22 | |||
| f59bc8d27f | |||
| 26b713309f | |||
| c5f7391631 | |||
| 17bf862890 | |||
| c08e816e93 | |||
| 72a6d9a7e5 | |||
| 92d62509de | |||
| 0f52f19fc7 | |||
| 1b2a0c0309 | |||
| 4780f4403b | |||
| 8e1084f034 | |||
| 042c78e0d4 | |||
| 0a8d4e47ac | |||
| 93ecea334f | |||
| 3c501d9cdb | |||
| 8be72640a7 | |||
| 2a3ac1498b | |||
| 78ca0419d8 | |||
| c967746bba | |||
| 19b9e17d0f | |||
| 98826d1b9f | |||
| a4c908c1ba | |||
| 3832d5a326 | |||
| 456e55a66e | |||
| eddd8d14dd | |||
| 8dd43b212e | |||
| 20db36e70e | |||
| 4ce1fa5204 | |||
| bf9c99672d | |||
| db26bca5a3 | |||
|   | 62521c5b5c | ||
| 71c2c5d005 | |||
| e12d6e6157 | |||
| 4a97fee7e7 | |||
| ea8c810f13 | |||
| ffd85c6519 | |||
| a34ae15b88 | |||
| bd3bf8e07c | |||
| 73416b60e0 | |||
| b77e42914f | |||
|   | 99419ed471 | ||
| 33ebabe083 | |||
| 7eea5b2a50 | |||
| e8d29f851c | |||
|   | cf4014f552 | ||
| 2b719ea39f | |||
| 2652f5e9ac | |||
|   | 05c829a633 | ||
|   | d24616fe00 | 
							
								
								
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							| @@ -7,9 +7,8 @@ | |||||||
|         <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_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK"> |   <component name="ProjectRootManager" version="2" languageLevel="JDK_X" 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> | ||||||
							
								
								
									
										1
									
								
								.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1
									
								
								.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							| @@ -2,5 +2,6 @@ | |||||||
| <project version="4"> | <project version="4"> | ||||||
|   <component name="VcsDirectoryMappings"> |   <component name="VcsDirectoryMappings"> | ||||||
|     <mapping directory="" vcs="Git" /> |     <mapping directory="" vcs="Git" /> | ||||||
|  |     <mapping directory="$PROJECT_DIR$" vcs="Git" /> | ||||||
|   </component> |   </component> | ||||||
| </project> | </project> | ||||||
							
								
								
									
										5
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -38,6 +38,11 @@ | |||||||
|             <version>${junit.version}</version> |             <version>${junit.version}</version> | ||||||
|             <scope>test</scope> |             <scope>test</scope> | ||||||
|         </dependency> |         </dependency> | ||||||
|  |         <dependency> | ||||||
|  |             <groupId>com.google.code.gson</groupId> | ||||||
|  |             <artifactId>gson</artifactId> | ||||||
|  |             <version>2.10.1</version> | ||||||
|  |         </dependency> | ||||||
|     </dependencies> |     </dependencies> | ||||||
|  |  | ||||||
|     <build> |     <build> | ||||||
|   | |||||||
| @@ -3,14 +3,20 @@ | |||||||
|  |  | ||||||
| package Logik; | package Logik; | ||||||
|  |  | ||||||
|  | import RestAPISchnittstelle.RestApiClient; | ||||||
|  |  | ||||||
| public class Account { | public class Account { | ||||||
|  |  | ||||||
| 	// region Felder | 	// region Felder | ||||||
| 	private String passwort; | 	private String passwort; | ||||||
|  |  | ||||||
| 	private int id; | 	private /*transient*/ int id; | ||||||
|  |  | ||||||
| 	private String benutzername; | 	private String name; | ||||||
|  |  | ||||||
|  | 	private String email; | ||||||
|  |  | ||||||
|  | 	private int rid; | ||||||
| 	// endregion | 	// endregion | ||||||
|  |  | ||||||
| 	// region Getter & Setter | 	// region Getter & Setter | ||||||
| @@ -30,21 +36,46 @@ public class Account { | |||||||
| 		this.id = id; | 		this.id = id; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	public String getEmail() { | ||||||
|  | 		return email; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void setEmail(String email) { | ||||||
|  | 		this.email = email; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
| 	public String getBenutzername() { | 	public String getBenutzername() { | ||||||
| 		return benutzername; | 		return name; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public void setBenutzername(String benutzername) { | 	public void setBenutzername(String benutzername) { | ||||||
| 		this.benutzername = benutzername; | 		this.name = benutzername; | ||||||
| 	} | 	} | ||||||
| 	// endregion | 	// endregion | ||||||
|  |  | ||||||
| 	// region Konstruktoren | 	// region Konstruktoren | ||||||
| 	public Account(String passwort, String benutzername) { | 	public Account(String passwort, String name, String email) { | ||||||
| 		this.passwort = passwort; | 		this.passwort = passwort; | ||||||
| 		this.benutzername = benutzername; | 		this.name = name; | ||||||
|  | 		this.email = email; | ||||||
|  |  | ||||||
|  | 		if(this instanceof MitarbeiterAccount) | ||||||
|  | 			rid = 0; | ||||||
|  | 		else if (this instanceof ElternAccount) | ||||||
|  | 			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 | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -7,25 +7,15 @@ | |||||||
| 
 | 
 | ||||||
| package Logik; | package Logik; | ||||||
| 
 | 
 | ||||||
| import java.nio.file.WatchEvent; |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| 
 | 
 | ||||||
| public class Benutzer extends Account { | public class ElternAccount extends Account { | ||||||
| 
 | 
 | ||||||
| 	// region Felder | 	// region Felder | ||||||
| 	private String email; | 	private transient ArrayList<Kind> kinder; | ||||||
| 
 |  | ||||||
| 	private ArrayList<Kind> kinder; |  | ||||||
| 	// endregion | 	// endregion | ||||||
| 
 | 
 | ||||||
| 	// region Getter & Setter | 	// region Getter & Setter | ||||||
| 	public String getEmail() { |  | ||||||
| 		return email; |  | ||||||
| 	} |  | ||||||
| 
 |  | ||||||
| 	public void setEmail(String email) { |  | ||||||
| 		this.email = email; |  | ||||||
| 	} |  | ||||||
| 
 | 
 | ||||||
| 	public ArrayList<Kind> getKinder() { | 	public ArrayList<Kind> getKinder() { | ||||||
| 		return kinder; | 		return kinder; | ||||||
| @@ -37,9 +27,8 @@ public class Benutzer extends Account { | |||||||
| 	// endregion | 	// endregion | ||||||
| 
 | 
 | ||||||
| 	// region Konstruktoren | 	// region Konstruktoren | ||||||
| 	public Benutzer(String passwort, String benutzername, String email) { | 	public ElternAccount(String passwort, String benutzername, String email) { | ||||||
| 		super(passwort, benutzername); | 		super(passwort, benutzername, email); | ||||||
| 		this.email = email; |  | ||||||
| 		kinder = new ArrayList<>(); | 		kinder = new ArrayList<>(); | ||||||
| 	} | 	} | ||||||
| 	// endregion | 	// endregion | ||||||
| @@ -5,11 +5,13 @@ import java.util.ArrayList; | |||||||
| public class Kind { | public class Kind { | ||||||
|  |  | ||||||
| 	// region Felder | 	// region Felder | ||||||
|  |  | ||||||
|  | 	private /*transient*/ int id; | ||||||
| 	private String name; | 	private String name; | ||||||
| 	private String vorname; | 	private String vorname; | ||||||
| 	private int id; | 	private int bid; | ||||||
| 	// TODO Zutat implementieren! |  | ||||||
| 	// private ArrayList<Zutat> filter; | 	private ArrayList<Zutat> filter; | ||||||
| 	// endregion | 	// endregion | ||||||
|  |  | ||||||
| 	// region Getter & Setter | 	// region Getter & Setter | ||||||
| @@ -37,8 +39,14 @@ public class Kind { | |||||||
| 		this.id = id; | 		this.id = id; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	// TODO Zutat implementieren! | 	public int getBid() { | ||||||
| 	/* | 		return bid; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void setBid(int bid) { | ||||||
|  | 		this.bid = bid; | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	public ArrayList<Zutat> getFilter() { | 	public ArrayList<Zutat> getFilter() { | ||||||
| 		return filter; | 		return filter; | ||||||
| 	} | 	} | ||||||
| @@ -46,14 +54,21 @@ public class Kind { | |||||||
| 	public void setFilter(ArrayList<Zutat> filter) { | 	public void setFilter(ArrayList<Zutat> filter) { | ||||||
| 		this.filter = filter; | 		this.filter = filter; | ||||||
| 	} | 	} | ||||||
| 	*/ |  | ||||||
| 	// endregion | 	// endregion | ||||||
|  |  | ||||||
| 	// region Konstruktoren | 	// region Konstruktoren | ||||||
| 	public Kind(String name, String vorname) { | 	public Kind(String name, String vorname, int bid) { | ||||||
| 		this.name = name; | 		this.name = name; | ||||||
| 		this.vorname = vorname; | 		this.vorname = vorname; | ||||||
|  | 		this.bid = bid; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	// endregion | 	// endregion | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 	@Override | ||||||
|  | 	public String toString() { | ||||||
|  | 		return String.format("%s %s, %d", vorname, name, id); | ||||||
|  | 	} | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,12 +1,12 @@ | |||||||
| package de.subway_surfers.vpr_app.logik; | package Logik; | ||||||
| 
 | 
 | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| 
 | 
 | ||||||
| public class Mahlzeit { | public class Mahlzeit { | ||||||
| 	private String name; | 	private String name; | ||||||
| 	private float preis; | 	private float            preis; | ||||||
| 	private ArrayList<Zutat> zutaten; | 	private ArrayList<Zutat> zutaten; | ||||||
| 	private String beschreibung; | 	private String           beschreibung; | ||||||
| 
 | 
 | ||||||
| 	public Mahlzeit (String name, float preis, String beschreibung) { | 	public Mahlzeit (String name, float preis, String beschreibung) { | ||||||
| 		this.name = name; | 		this.name = name; | ||||||
| @@ -12,8 +12,8 @@ import java.util.ArrayList; | |||||||
| public class MitarbeiterAccount extends Account { | public class MitarbeiterAccount extends Account { | ||||||
|  |  | ||||||
| 	// region Konstrukoren | 	// region Konstrukoren | ||||||
| 	public MitarbeiterAccount(String passwort, String benutzername) { | 	public MitarbeiterAccount(String passwort, String benutzername, String email) { | ||||||
| 		super(passwort, benutzername); | 		super(passwort, benutzername, email); | ||||||
| 	} | 	} | ||||||
| 	//endregion | 	//endregion | ||||||
|  |  | ||||||
| @@ -51,7 +51,7 @@ public class MitarbeiterAccount extends Account { | |||||||
| 	 * @param kinder Eine Liste mit allen zugehörigen Kindern des Accounts | 	 * @param kinder Eine Liste mit allen zugehörigen Kindern des Accounts | ||||||
| 	 */ | 	 */ | ||||||
| 	public void accountErstellen(String passwort, String benutzername, String email, ArrayList<Kind> kinder) { | 	public void accountErstellen(String passwort, String benutzername, String email, ArrayList<Kind> kinder) { | ||||||
| 		Benutzer newAccount = new Benutzer(passwort, benutzername, email); | 		ElternAccount newAccount = new ElternAccount(passwort, benutzername, email); | ||||||
| 		newAccount.setKinder(kinder); | 		newAccount.setKinder(kinder); | ||||||
| 		// Id muss aus der Datenbank geholt werden und dann gesetzt werden | 		// Id muss aus der Datenbank geholt werden und dann gesetzt werden | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -1,11 +1,11 @@ | |||||||
| package de.subway_surfers.vpr_app.logik; | package Logik; | ||||||
| 
 | 
 | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
| 
 | 
 | ||||||
| public class Tagesplan { | public class Tagesplan { | ||||||
| 
 | 
 | ||||||
| 	private ArrayList<Mahlzeit> gerichte; | 	private ArrayList<Mahlzeit> gerichte; | ||||||
| 	private String datum; | 	private String              datum; | ||||||
| 
 | 
 | ||||||
| 	public Tagesplan(String datum) { | 	public Tagesplan(String datum) { | ||||||
| 		this.datum = datum; | 		this.datum = datum; | ||||||
| @@ -1,4 +1,4 @@ | |||||||
| package de.subway_surfers.vpr_app.logik; | package Logik; | ||||||
| 
 | 
 | ||||||
| public class Zutat { | public class Zutat { | ||||||
| 	private String name; | 	private String name; | ||||||
							
								
								
									
										42
									
								
								src/main/java/RestAPISchnittstelle/IRestAPI.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								src/main/java/RestAPISchnittstelle/IRestAPI.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | |||||||
|  | /** | ||||||
|  |  * @author Samuel Wolff | ||||||
|  |  * noch nicht getestet | ||||||
|  |  * | ||||||
|  |  * TODO Json hinzufügen | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | package RestAPISchnittstelle; | ||||||
|  |  | ||||||
|  | public interface IRestAPI { | ||||||
|  |  | ||||||
|  | 	// region Get | ||||||
|  |  | ||||||
|  | 	String get(String controllerName); | ||||||
|  |  | ||||||
|  | 	String get (String controllerName, int id); | ||||||
|  |  | ||||||
|  | 	String get (String controllerName, int id, boolean bezahlt); | ||||||
|  |  | ||||||
|  | 	String get(String controllerName, String[] params); | ||||||
|  |  | ||||||
|  | 	//endregion | ||||||
|  |  | ||||||
|  | 	// region put | ||||||
|  |  | ||||||
|  | 	void put (String controllerName, int id, String jsonData); | ||||||
|  |  | ||||||
|  | 	// endregion | ||||||
|  |  | ||||||
|  | 	// region POST | ||||||
|  |  | ||||||
|  | 	void post (String controllerName, String jsonData); | ||||||
|  |  | ||||||
|  | 	// endregion | ||||||
|  |  | ||||||
|  | 	// region DELETE | ||||||
|  |  | ||||||
|  | 	void delete(String controllerName, int id); | ||||||
|  |  | ||||||
|  | 	// endregion | ||||||
|  |  | ||||||
|  | } | ||||||
							
								
								
									
										280
									
								
								src/main/java/RestAPISchnittstelle/RestApiClient.java
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										280
									
								
								src/main/java/RestAPISchnittstelle/RestApiClient.java
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,280 @@ | |||||||
|  | package RestAPISchnittstelle; | ||||||
|  |  | ||||||
|  | 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 Logik.ElternAccount; | ||||||
|  | import Logik.Kind; | ||||||
|  | import com.google.gson.*; | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * noch nicht getestet | ||||||
|  |  * TODO FERTIG MACHEN | ||||||
|  |  * @author Samuel Wolff | ||||||
|  |  */ | ||||||
|  | public class RestApiClient implements IRestAPI{ | ||||||
|  |  | ||||||
|  | 	private final String urlBase = "https://pbg2h22awo.web.pb.bib.de/VPR_Schnittstelle/VPR_Schnittstelle/restAPI.php"; | ||||||
|  |  | ||||||
|  | 	private final HttpClient client; | ||||||
|  |  | ||||||
|  | 	private final Gson gson; | ||||||
|  |  | ||||||
|  | 	public RestApiClient(){ | ||||||
|  | 		client = HttpClient.newHttpClient(); | ||||||
|  | 		gson = new Gson(); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public static void main(String[] args){ | ||||||
|  |  | ||||||
|  | 		RestApiClient client1 = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 		client1.delete("Kind", 15); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 		System.out.println(client1.nextId("Benutzer")); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode für einen Get-Aufruf. Ruft alle Elemente einer Tabelle auf. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public String get(String controllerName) { | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s", urlBase, controllerName)); | ||||||
|  |  | ||||||
|  | 		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()); | ||||||
|  | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
|  | 			return httpResponse.body(); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode für einen Get-Aufruf. Ruft ein spezifisches Element auf. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
|  | 	 * @param id Id der Aufzurufenden Zeile | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public String get(String controllerName, int id) { | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id)); | ||||||
|  |  | ||||||
|  | 		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 Get-Aufruf. Ruft ein spezielles Element auf. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
|  | 	 * @param id Id der Aufzurufenden Zeile | ||||||
|  | 	 * @param bezahlt TODO Warum ist das hier? | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public String get(String controllerName, int id, boolean bezahlt) { | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s?%s&%s", urlBase, controllerName, id, bezahlt)); | ||||||
|  |  | ||||||
|  | 		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()); | ||||||
|  | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
|  | 			return httpResponse.body(); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return null; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	@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. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers. | ||||||
|  | 	 * @param id Id des zu änderenden Eintrags. | ||||||
|  | 	 * @param jsonData JsonString mit den neuen Daten. | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public void put(String controllerName, int id, String jsonData) { | ||||||
|  |  | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s/%s", urlBase,controllerName, id)); | ||||||
|  |  | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .header("Content-Type", "application/json") | ||||||
|  | 											 .PUT(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||||
|  | 											 .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()); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode für einen Post-Aufruf. Fügt einen Eintrag in eine Datenbank hinzu. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers. | ||||||
|  | 	 * @param jsonData JsonString mit den Daten des Eintrags. | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public void post(String controllerName, String jsonData) { | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s", urlBase,controllerName)); | ||||||
|  |  | ||||||
|  | 		System.out.println(apiUri); | ||||||
|  |  | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .header("Content-Type", "application/json") | ||||||
|  | 											 .POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8)) | ||||||
|  | 											 .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()); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode für einen Delete-Aufruf. Löscht einen Eintrag mit einer Id. | ||||||
|  | 	 * | ||||||
|  | 	 * @param controllerName Name des aufzurufenden Controllers | ||||||
|  | 	 * @param id Id des zu löschenden Eintrags. | ||||||
|  | 	 */ | ||||||
|  | 	@Override | ||||||
|  | 	public void delete(String controllerName, int id) { | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s/%d", urlBase,controllerName, id)); | ||||||
|  |  | ||||||
|  | 		System.out.println(apiUri); | ||||||
|  |  | ||||||
|  | 		HttpRequest httpRequest = HttpRequest.newBuilder() | ||||||
|  | 											 .uri(apiUri) | ||||||
|  | 											 .header("Content-Type", "application/json") | ||||||
|  | 											 .DELETE() | ||||||
|  | 											 .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()); | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 	public int nextId(String controllerName){ | ||||||
|  | 		URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName)); | ||||||
|  |  | ||||||
|  | 		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()); | ||||||
|  | 			System.out.println("Response Body: " + httpResponse.body()); | ||||||
|  |  | ||||||
|  | 			JsonElement jsonElement = JsonParser.parseString(httpResponse.body()); | ||||||
|  | 			JsonArray jsonArray = jsonElement.getAsJsonArray(); | ||||||
|  |  | ||||||
|  | 			JsonObject json = jsonArray.get(0).getAsJsonObject(); | ||||||
|  |  | ||||||
|  | 			return json.get("auto_increment").getAsInt(); | ||||||
|  |  | ||||||
|  | 		} catch (Exception e) { | ||||||
|  | 			e.printStackTrace(); | ||||||
|  | 			return -1; | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -1,5 +1,13 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Account; | ||||||
|  | import Logik.ElternAccount; | ||||||
|  | import Logik.Kind; | ||||||
|  | import Logik.MitarbeiterAccount; | ||||||
|  | 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; | ||||||
| @@ -8,11 +16,15 @@ import javafx.scene.layout.Background; | |||||||
| import javafx.scene.layout.GridPane; | import javafx.scene.layout.GridPane; | ||||||
| import javafx.scene.layout.HBox; | import javafx.scene.layout.HBox; | ||||||
| import javafx.scene.layout.VBox; | import javafx.scene.layout.VBox; | ||||||
|  | import com.google.gson.Gson; | ||||||
|  |  | ||||||
|  | import java.util.ArrayList; | ||||||
| import java.util.Random; | import java.util.Random; | ||||||
|  |  | ||||||
| public class AccounterstellungMitarbeiter { | public class AccounterstellungMitarbeiter { | ||||||
|  |  | ||||||
|  | 	private @FXML TextField accountname; | ||||||
|  | 	private @FXML TextField email; | ||||||
| 	private @FXML Label status; | 	private @FXML Label status; | ||||||
| 	private @FXML Label einmalpw; | 	private @FXML Label einmalpw; | ||||||
| 	private @FXML HBox kindanzeige; | 	private @FXML HBox kindanzeige; | ||||||
| @@ -21,26 +33,56 @@ public class AccounterstellungMitarbeiter { | |||||||
| 	private @FXML RadioButton typEltern; | 	private @FXML RadioButton typEltern; | ||||||
| 	private       ToggleGroup accountTyp; | 	private       ToggleGroup accountTyp; | ||||||
|  |  | ||||||
|  | 	private ArrayList<Kind> kinder; | ||||||
|  |  | ||||||
| 	public void initialize() { | 	public void initialize() { | ||||||
|  | 		//Die Radiobuttons zum auswählen eines Accountypes werden einer ToggleGroup hinzugefügt | ||||||
| 		accountTyp = new ToggleGroup(); | 		accountTyp = new ToggleGroup(); | ||||||
| 		accountTyp.getToggles().add(typEltern); | 		accountTyp.getToggles().add(typEltern); | ||||||
| 		accountTyp.getToggles().add(typMitarbeiter); | 		accountTyp.getToggles().add(typMitarbeiter); | ||||||
|  |  | ||||||
| 		einmalpw.setText(einmalPwGenerieren()); | 		einmalpw.setText(einmalPwGenerieren()); | ||||||
|  |  | ||||||
|  | 		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(); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Einfügen der Eingabefelder für Kinder, wenn der Eltern-Radiobutton ausgewählt wird | ||||||
|  | 	 * @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 Ü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); | ||||||
| @@ -48,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); | ||||||
| @@ -67,11 +112,16 @@ 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); | ||||||
|  |  | ||||||
| 		kindDaten.addRow(5); | 		if (kindDaten.getRowCount() < 5) { | ||||||
|  | 			kindDaten.addRow(5); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		//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()); | ||||||
|  |  | ||||||
| @@ -79,6 +129,7 @@ public class AccounterstellungMitarbeiter { | |||||||
| 			boolean gebGueltig = false; | 			boolean gebGueltig = false; | ||||||
| 			boolean nnameGueltig = false; | 			boolean nnameGueltig = false; | ||||||
|  |  | ||||||
|  | 			//Wenn alle Eingabefelder für Kinder ausgefüllt sind ist die Eingabe gültig | ||||||
| 			if (!vnameEingabe.getText().equals("")) { | 			if (!vnameEingabe.getText().equals("")) { | ||||||
| 				vnameGueltig = true; | 				vnameGueltig = true; | ||||||
| 			} | 			} | ||||||
| @@ -92,10 +143,15 @@ public class AccounterstellungMitarbeiter { | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (vnameGueltig && gebGueltig && nnameGueltig) { | 			if (vnameGueltig && gebGueltig && nnameGueltig) { | ||||||
|  | 				Kind kind = new Kind(nnameEingabe.getText(), vnameEingabe.getText(), 0); | ||||||
|  | 				kinder.add(kind); | ||||||
| 				kindanzeige.getChildren().add(neues); | 				kindanzeige.getChildren().add(neues); | ||||||
|  | 				//Wird auf ein Kind in der Anzeige geclickt, wird es aus der Liste entfernt. | ||||||
| 				neues.setOnAction(a -> { | 				neues.setOnAction(a -> { | ||||||
| 					((HBox) neues.getParent()).getChildren().remove(neues); | 					((HBox) neues.getParent()).getChildren().remove(neues); | ||||||
|  | 					kinder.remove(kind); | ||||||
| 				}); | 				}); | ||||||
|  | 				//Die Eingabefelder werden zurückgesetzt | ||||||
| 				vnameEingabe.setText(""); | 				vnameEingabe.setText(""); | ||||||
| 				nnameEingabe.setText(""); | 				nnameEingabe.setText(""); | ||||||
| 				geburtstagEingabe.getEditor().setText(""); | 				geburtstagEingabe.getEditor().setText(""); | ||||||
| @@ -103,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 = ""; | ||||||
| @@ -113,16 +174,144 @@ public class AccounterstellungMitarbeiter { | |||||||
| 		return pw; | 		return pw; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Prüft, ob in allen Textfeldern für die Eltern Text steht. | ||||||
|  | 	 * @return true, wenn kein Feld leer ist | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	private boolean eingabenGueltig() { | 	private boolean eingabenGueltig() { | ||||||
| 		return true; | 		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 | ||||||
|  | 	 * @author Sven Alteköster | ||||||
|  | 	 */ | ||||||
| 	public void onSpeichern(ActionEvent actionEvent) { | 	public void onSpeichern(ActionEvent actionEvent) { | ||||||
| 		if (eingabenGueltig()) { | 		if (eingabenGueltig()) { | ||||||
| 			status.setText("Daten Erfolgreich gespeichert"); | 			//Zeigt generiert ein Einmalpasswort und zeigt es an | ||||||
| 			einmalpw.setText(einmalPwGenerieren()); | 			einmalpw.setText(einmalPwGenerieren()); | ||||||
|  |  | ||||||
|  | 			//Schnittstelle zur RestAPI | ||||||
|  | 			RestApiClient api = new RestApiClient(); | ||||||
|  |  | ||||||
|  | 			Gson gson = new Gson(); | ||||||
|  |  | ||||||
|  | 			//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"); | ||||||
|  | 			boolean kontoVorhanden = false; | ||||||
|  | 			if (!json.equals("false")) { | ||||||
|  | 				kontoVorhanden = true; | ||||||
|  | 				id = gson.fromJson(json, Account.class).getId(); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			//Erstellen des neuen Accounts | ||||||
|  | 			Account neuer; | ||||||
|  | 			//Handelt es sich um einen Elternaccount, werden alle Eingegebenen Kinder erstellt. | ||||||
|  | 			if (typEltern.isSelected()) { | ||||||
|  | 				neuer = new ElternAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText()); | ||||||
|  | 				//Kinder dem neuen Account hinzufügen | ||||||
|  | 				for (Kind k : kinder) { | ||||||
|  | 					((ElternAccount)neuer).getKinder().add(k); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 			else if (typMitarbeiter.isSelected()) { | ||||||
|  | 				neuer = new MitarbeiterAccount(String.format("%d",einmalpw.getText().hashCode()), accountname.getText(), email.getText()); | ||||||
|  | 			} | ||||||
|  | 			//Ist kein Radio Button ausgewählt, wird hier abgebrochen | ||||||
|  | 			else { | ||||||
|  | 				return; | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  | 			//Die Liste, zum Speichern der gespeicherten Liste wird zurückgesetzt, da die Kinder jetzt im Elternobjekt gespeichert werden | ||||||
|  | 			kinder.clear(); | ||||||
|  |  | ||||||
|  | 			//Das Elternelement wird in der DB gespeichert, wenn es keinen gleichnamigen Account gibt. | ||||||
|  | 			if (!kontoVorhanden) { | ||||||
|  | 				api.post("Benutzer", gson.toJson(neuer)); | ||||||
|  | 			} | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 			//handelt es sich um einen Elternaccount, werden alle Kind-Objekte in der DB gespeichert | ||||||
|  | 			if (neuer instanceof ElternAccount) { | ||||||
|  | 				for (Kind k : ((ElternAccount)neuer).getKinder()) { | ||||||
|  | 					//setzen des Fremdschlüssels bid | ||||||
|  | 					k.setBid(id); | ||||||
|  | 					api.post("Kind", gson.toJson(k)); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 			status.setText("Daten Erfolgreich gespeichert"); | ||||||
|  | 		} | ||||||
|  | 		else { | ||||||
|  | 			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()); | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,111 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.event.ActionEvent; | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.geometry.Insets; | ||||||
|  | import javafx.scene.control.Accordion; | ||||||
|  | import javafx.scene.control.ScrollPane; | ||||||
|  | import javafx.scene.control.TitledPane; | ||||||
|  |  | ||||||
|  | import java.util.ArrayList; | ||||||
|  | import java.util.List; | ||||||
|  |  | ||||||
|  | public class BestelluebersichtMitarbeiter { | ||||||
|  |  | ||||||
|  | 	@FXML | ||||||
|  | 	private ScrollPane scrollPane; | ||||||
|  |  | ||||||
|  | 	@FXML | ||||||
|  | 	private Accordion accordion; | ||||||
|  |  | ||||||
|  | 	public void initialize() { | ||||||
|  |  | ||||||
|  | 		List<String> datum = new ArrayList<>(); | ||||||
|  |  | ||||||
|  | 		datum.add("15.10.1999"); | ||||||
|  | 		datum.add("23.12.2002"); | ||||||
|  | 		datum.add("05.01.2020"); | ||||||
|  |  | ||||||
|  | 		accordion.setStyle("-fx-box-border: transparent;"); | ||||||
|  |  | ||||||
|  | 		for (String s : datum) { | ||||||
|  | 			TitledPane datumUeberschrift = new TitledPane(s, createGerichtAkkordion()); | ||||||
|  |  | ||||||
|  | 			datumUeberschrift.getStyleClass().add("titledPaneUeberschrift"); | ||||||
|  | 			datumUeberschrift.animatedProperty().set(false); | ||||||
|  | 			datumUeberschrift.setPadding(new Insets(0, 0, 15, 0)); | ||||||
|  |  | ||||||
|  | 			accordion.getPanes().add(datumUeberschrift); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); | ||||||
|  | 		scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	private Accordion createGerichtAkkordion() { | ||||||
|  | 		Accordion accordion = new Accordion(); | ||||||
|  | 		int anzahlGerichtA = 1; | ||||||
|  | 		int anzahlGerichtB = 15; | ||||||
|  | 		int anzahlGerichtC = 3; | ||||||
|  | 		int anzahlGerichtD = 2; | ||||||
|  |  | ||||||
|  | 		double preisGerichtA = 4.99; | ||||||
|  | 		double preisGerichtB = 9.99; | ||||||
|  | 		double preisGerichtC = 3.99; | ||||||
|  | 		double preisGerichtD = 12.49; | ||||||
|  |  | ||||||
|  | 		int anzahlNachtischA = 2; | ||||||
|  | 		int anzahlNachtischB = 213; | ||||||
|  |  | ||||||
|  | 		double preisNachtischA = 0.49; | ||||||
|  | 		double preisNachtischB = 99.49; | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 		if (anzahlGerichtA >= 1) { | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("GerichtA " + anzahlGerichtA + "-Mal " + preisGerichtA * anzahlGerichtA + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if (anzahlGerichtB >= 1) { | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("GerichtB " + anzahlGerichtB + "-Mal " + preisGerichtB * anzahlGerichtB + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if (anzahlGerichtC >= 1) { | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("GerichtC " + anzahlGerichtC + "-Mal " + preisGerichtC * anzahlGerichtC + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if (anzahlGerichtD >= 1) { | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("GerichtD " + anzahlGerichtD + "-Mal " + preisGerichtD * anzahlGerichtD + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if(anzahlNachtischA >= 1){ | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("NachtischA " + anzahlNachtischA + "-Mal " + preisNachtischA * anzahlNachtischA + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		if(anzahlNachtischA >= 1){ | ||||||
|  | 			TitledPane tp = new TitledPane(); | ||||||
|  | 			tp.setText("NachtischB " + anzahlNachtischB + "-Mal " + preisNachtischB * anzahlNachtischB + " €"); | ||||||
|  | 			accordion.getPanes().addAll(tp); | ||||||
|  | 		} | ||||||
|  |  | ||||||
|  | 		return accordion; | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onAbmelden(ActionEvent event) { | ||||||
|  | 		VerwaltungApplication.abmelden(); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onZurueck(ActionEvent actionEvent) { | ||||||
|  | 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -0,0 +1,64 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.event.ActionEvent; | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.geometry.Pos; | ||||||
|  | import javafx.scene.Node; | ||||||
|  | import javafx.scene.control.Control; | ||||||
|  | import javafx.scene.layout.ColumnConstraints; | ||||||
|  | import javafx.scene.layout.GridPane; | ||||||
|  | import javafx.scene.layout.Priority; | ||||||
|  | import javafx.scene.layout.RowConstraints; | ||||||
|  | import javafx.stage.Modality; | ||||||
|  | import javafx.stage.Stage; | ||||||
|  |  | ||||||
|  |  | ||||||
|  | public class EssensverwaltungMitarbeiterView { | ||||||
|  | 	@FXML | ||||||
|  | 	private GridPane tagesplan; | ||||||
|  |  | ||||||
|  | 	public void initialize(){ | ||||||
|  | 		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) -> { | ||||||
|  | 			final int zeile = 1; | ||||||
|  | 			for (Node n : tagesplan.getChildren()){ | ||||||
|  | 				if(n instanceof Control  && GridPane.getRowIndex(n) == zeile){ | ||||||
|  | 					((Control) n).setPrefHeight(newValue.floatValue()); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 		}); | ||||||
|  |  | ||||||
|  | 	} | ||||||
|  | 	public void onAbmelden(ActionEvent actionEvent) { | ||||||
|  | 		VerwaltungApplication.sceneWechseln("login-view.fxml"); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onFilter(ActionEvent actionEvent) { | ||||||
|  | 		Stage stage = new Stage(); | ||||||
|  | 		VerwaltungApplication.sceneWechseln(stage, 450, 400, "inhaltsstoffe_filtern-view.fxml"); | ||||||
|  |  | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onHinzufuegen(ActionEvent actionEvent) { | ||||||
|  | 		Stage gerichterstellung = new Stage(); | ||||||
|  |  | ||||||
|  | 		//solange das neu geöffnete Fenster offen ist, wird das Hauptfenster gesperrt | ||||||
|  | 		gerichterstellung.initModality(Modality.APPLICATION_MODAL); | ||||||
|  |  | ||||||
|  | 		VerwaltungApplication.sceneWechseln(gerichterstellung, 400, 530, "gerichterstellung_mitarbeiter-view.fxml"); | ||||||
|  |  | ||||||
|  | 		gerichterstellung.minWidthProperty().set(400); | ||||||
|  | 		gerichterstellung.minHeightProperty().set(530); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	public void onZurueck(ActionEvent actionEvent) { | ||||||
|  | 		VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml"); | ||||||
|  | 	} | ||||||
|  | } | ||||||
| @@ -0,0 +1,51 @@ | |||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Zutat; | ||||||
|  | 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.layout.HBox; | ||||||
|  | import javafx.scene.layout.Pane; | ||||||
|  |  | ||||||
|  | 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 ArrayList<Zutat> zutaten; | ||||||
|  |  | ||||||
|  |     public void initialize() { | ||||||
|  |         zutaten = new ArrayList<>(); | ||||||
|  |  | ||||||
|  |         //wird das Fenster vergrößert, wird das Eingabefeld für Inhaltstoffe und den Hinzufügenbutton | ||||||
|  |         // auf die volle breite vergrößert. | ||||||
|  |         ((Pane) eingabeInhaltsstoffe.getParent()).widthProperty().addListener((obs, oldValue, newValue) -> { | ||||||
|  |             //eingabeName, da dieses Feld immer die gesamte breite der Stage haben. | ||||||
|  |             eingabeInhaltsstoffe.setPrefWidth(eingabeName.getWidth() - buttonInhaltsstoffe.getPrefWidth()); | ||||||
|  |         }); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     public void onButtonInhaltsstoffeClick(ActionEvent actionEvent) { | ||||||
|  |         String text = eingabeInhaltsstoffe.getText(); | ||||||
|  |         if (!text.equals("")) { | ||||||
|  |             eingabeInhaltsstoffe.setText(""); | ||||||
|  |  | ||||||
|  |             Button neuerInhalt = new Button(); | ||||||
|  |             neuerInhalt.setText(text); | ||||||
|  |             anzeigeInhaltsstoffe.getChildren().add(neuerInhalt); | ||||||
|  |  | ||||||
|  |             Zutat neue = new Zutat(text); | ||||||
|  |             zutaten.add(neue); | ||||||
|  |             neuerInhalt.setOnAction(e -> { | ||||||
|  |                 ((HBox) neuerInhalt.getParent()).getChildren().remove(neuerInhalt); | ||||||
|  |                 zutaten.remove(neue); | ||||||
|  |             }); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -8,8 +8,16 @@ public class HauptmenueMitarbeiterView { | |||||||
|         VerwaltungApplication.abmelden(); |         VerwaltungApplication.abmelden(); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     public void onAccountAnlegen(ActionEvent actionEvent) { |     public void onAccountAnlegenClick(ActionEvent actionEvent) { | ||||||
|         VerwaltungApplication.sceneWechseln("accounterstellung_mitarbeiter.fxml"); |         VerwaltungApplication.sceneWechseln("accounterstellung_mitarbeiter.fxml"); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  |     public void onSpeiseplanClick(ActionEvent actionEvent) { | ||||||
|  |         VerwaltungApplication.sceneWechseln("essensverwaltung_mitarbeiter-view.fxml"); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     public void onBestellungenAnzeigen(ActionEvent actionEvent) { | ||||||
|  |         VerwaltungApplication.sceneWechseln("bestelluebersicht_mitarbeiter-view.fxml"); | ||||||
|  |     } | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -0,0 +1,32 @@ | |||||||
|  | /** | ||||||
|  |  * @author Samuel Wolff | ||||||
|  |  * noch nicht getestet | ||||||
|  |  */ | ||||||
|  | // TODO Alle Zutaten einlesen und Listview mit zutatListView Objekten füllen | ||||||
|  |  | ||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Kind; | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.scene.control.Button; | ||||||
|  | import javafx.scene.control.CheckBox; | ||||||
|  | import javafx.scene.control.ListView; | ||||||
|  |  | ||||||
|  | public class InhaltsstoffeFilternController { | ||||||
|  |  | ||||||
|  | 	private @FXML ListView<zutatListViewController> zutatListView; | ||||||
|  |  | ||||||
|  | 	private @FXML CheckBox speichernCheckBox; | ||||||
|  |  | ||||||
|  | 	private @FXML Button abbrechenButton; | ||||||
|  |  | ||||||
|  | 	private @FXML Button fortfahrenButton; | ||||||
|  |  | ||||||
|  | 	public void initialize(){ | ||||||
|  |  | ||||||
|  | 		// hier ListView füllen | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -0,0 +1,32 @@ | |||||||
|  | /** | ||||||
|  |  * @author Samuel Wolff | ||||||
|  |  * noch nicht getestet | ||||||
|  |  */ | ||||||
|  | // Noch nicht getestet | ||||||
|  |  | ||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.scene.control.Button; | ||||||
|  | import javafx.scene.control.RadioButton; | ||||||
|  | import javafx.scene.control.ToggleGroup; | ||||||
|  |  | ||||||
|  | public class RechnungFilterViewController { | ||||||
|  |  | ||||||
|  | 	private @FXML RadioButton alle; | ||||||
|  | 	private @FXML RadioButton nichtBezahlt; | ||||||
|  | 	private @FXML RadioButton bezahlt; | ||||||
|  |  | ||||||
|  | 	private ToggleGroup rButtons; | ||||||
|  |  | ||||||
|  | 	private @FXML Button abbrechenButton; | ||||||
|  | 	private @FXML Button fortfahrenButton; | ||||||
|  |  | ||||||
|  | 	public void initialize(){ | ||||||
|  | 		rButtons = new ToggleGroup(); | ||||||
|  | 		alle.setToggleGroup(rButtons); | ||||||
|  | 		nichtBezahlt.setToggleGroup(rButtons); | ||||||
|  | 		bezahlt.setToggleGroup(rButtons); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -2,8 +2,11 @@ package de.subway_surfers.vpr_app; | |||||||
|  |  | ||||||
| import javafx.application.Application; | import javafx.application.Application; | ||||||
| import javafx.fxml.FXMLLoader; | import javafx.fxml.FXMLLoader; | ||||||
|  | import javafx.scene.Node; | ||||||
| import javafx.scene.Scene; | import javafx.scene.Scene; | ||||||
| import javafx.scene.control.Alert; | import javafx.scene.control.Alert; | ||||||
|  | import javafx.scene.control.Control; | ||||||
|  | import javafx.scene.layout.GridPane; | ||||||
| import javafx.stage.Stage; | import javafx.stage.Stage; | ||||||
|  |  | ||||||
| import java.io.IOException; | import java.io.IOException; | ||||||
| @@ -23,7 +26,7 @@ public class VerwaltungApplication extends Application { | |||||||
| 		stage.setMinWidth(960); | 		stage.setMinWidth(960); | ||||||
| 		stage.setMinHeight(540); | 		stage.setMinHeight(540); | ||||||
|  |  | ||||||
| 		stage.setTitle("Hello!"); | 		//stage.setTitle("Hello!"); | ||||||
| 		stage.setScene(scene); | 		stage.setScene(scene); | ||||||
| 		stage.show(); | 		stage.show(); | ||||||
|  |  | ||||||
| @@ -92,10 +95,12 @@ public class VerwaltungApplication extends Application { | |||||||
| 		Stage akt = VerwaltungApplication.getStage(); | 		Stage akt = VerwaltungApplication.getStage(); | ||||||
| 		//neue Scene wird auf eine neue Stage gesetzt | 		//neue Scene wird auf eine neue Stage gesetzt | ||||||
| 		try { | 		try { | ||||||
| 			Scene scene = new Scene(fxmlLoader.load(), width, height); | 			Scene scene = new Scene(fxmlLoader.load()); | ||||||
| 			neue.setScene(scene); | 			neue.setScene(scene); | ||||||
|  |  | ||||||
| 			neue.show(); | 			neue.show(); | ||||||
|  | 			neue.setHeight(height); | ||||||
|  | 			neue.setWidth(width); | ||||||
| 		} | 		} | ||||||
| 		//wird die angegebene fxml Datei nicht gefunden, wird ein Alertfenster geöffnet | 		//wird die angegebene fxml Datei nicht gefunden, wird ein Alertfenster geöffnet | ||||||
| 		catch (IOException | RuntimeException e) { | 		catch (IOException | RuntimeException e) { | ||||||
| @@ -111,6 +116,24 @@ public class VerwaltungApplication extends Application { | |||||||
| 		sceneWechseln("login-view.fxml"); | 		sceneWechseln("login-view.fxml"); | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | 	/** | ||||||
|  | 	 * Methode zum automatischen vergrößern und verkleinern von Grids | ||||||
|  | 	 * | ||||||
|  | 	 * Geschrieben: Max Heer, Sven Alteköster | ||||||
|  | 	 * Getestet | ||||||
|  | 	 * | ||||||
|  | 	 * @param grid das responsiv sein soll | ||||||
|  | 	 */ | ||||||
|  | 	public static void responsiveBreiteGrid (GridPane grid) { | ||||||
|  | 		grid.widthProperty().addListener((obs, oldValue, newValue) -> { | ||||||
|  | 			for (Node n : grid.getChildren()) { | ||||||
|  | 				if (n instanceof Control) { | ||||||
|  | 					((Control) n).setPrefWidth(newValue.floatValue() / grid.getColumnCount()); | ||||||
|  | 				} | ||||||
|  | 			} | ||||||
|  | 		}); | ||||||
|  | 	} | ||||||
|  |  | ||||||
| 	public static void main(String[] args) { | 	public static void main(String[] args) { | ||||||
| 		launch(); | 		launch(); | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -1,5 +1,7 @@ | |||||||
| package de.subway_surfers.vpr_app; | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import Logik.Account; | ||||||
|  | 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; | ||||||
|   | |||||||
| @@ -1,18 +1,21 @@ | |||||||
| package de.subway_surfers.vpr_app.logik; | package de.subway_surfers.vpr_app.logik; | ||||||
|  |  | ||||||
|  | import Logik.Zutat; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  |  | ||||||
| public class Kind { | public class Kind { | ||||||
| 	private String name; |  | ||||||
| 	private String vorname; | 	private String           name; | ||||||
| 	private int id; | 	private String           vorname; | ||||||
|  | 	private int              id; | ||||||
| 	private ArrayList<Zutat> filter; | 	private ArrayList<Zutat> filter; | ||||||
|  |  | ||||||
| 	public Kind(String name, String vorname, int id) { | 	public Kind(String name, String vorname, int id) { | ||||||
| 		ArrayList<Zutat> filter = new ArrayList<>(); | 		ArrayList<Zutat> filter = new ArrayList<>(); | ||||||
| 		this.name = name; | 		this.name    = name; | ||||||
| 		this.vorname = vorname; | 		this.vorname = vorname; | ||||||
| 		this.id = id; | 		this.id      = id; | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	public String getName() { | 	public String getName() { | ||||||
|   | |||||||
| @@ -0,0 +1,32 @@ | |||||||
|  | // Programmiert von Samuel Wolff | ||||||
|  | /** | ||||||
|  |  * @author Samuel Wolff | ||||||
|  |  * noch nicht getestet | ||||||
|  |  */ | ||||||
|  | // TODO Sobald Zutat-Klasse implementiert ist Kommentare entfernen | ||||||
|  |  | ||||||
|  | package de.subway_surfers.vpr_app; | ||||||
|  |  | ||||||
|  | import javafx.fxml.FXML; | ||||||
|  | import javafx.scene.control.CheckBox; | ||||||
|  | import javafx.scene.control.Label; | ||||||
|  |  | ||||||
|  | public class zutatListViewController { | ||||||
|  |  | ||||||
|  | 	//private Zutat zutat; | ||||||
|  |  | ||||||
|  | 	private @FXML CheckBox isChecked; | ||||||
|  |  | ||||||
|  | 	private @FXML Label nameLabel; | ||||||
|  |  | ||||||
|  | 	/*public zutatListViewController(Zutat zutat){ | ||||||
|  | 		this.zutat = zutat; | ||||||
|  | 	}*/ | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 	public void initialize(){ | ||||||
|  | 		nameLabel.setText("ZutatA"); | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  |  | ||||||
|  | } | ||||||
| @@ -1,8 +1,11 @@ | |||||||
| module de.subway_surfers.vpr_app { | module de.subway_surfers.vpr_app { | ||||||
| 	requires javafx.controls; | 	requires javafx.controls; | ||||||
| 	requires javafx.fxml; | 	requires javafx.fxml; | ||||||
|  | 	requires java.net.http; | ||||||
|  | 	requires com.google.gson; | ||||||
|  |  | ||||||
|  |  | ||||||
| 	opens de.subway_surfers.vpr_app to javafx.fxml; | 	opens de.subway_surfers.vpr_app to javafx.fxml, com.google.gson; | ||||||
|  | 	opens Logik to com.google.gson; | ||||||
| 	exports de.subway_surfers.vpr_app; | 	exports de.subway_surfers.vpr_app; | ||||||
| } | } | ||||||
| @@ -28,9 +28,9 @@ | |||||||
|                 <VBox styleClass="accounterstellung_links"> |                 <VBox styleClass="accounterstellung_links"> | ||||||
|                     <GridPane styleClass="accounterstellung_daten"> |                     <GridPane styleClass="accounterstellung_daten"> | ||||||
|                         <Label text="Accountname:" GridPane.rowIndex="0" GridPane.columnIndex="0"/> |                         <Label text="Accountname:" GridPane.rowIndex="0" GridPane.columnIndex="0"/> | ||||||
|                         <TextField GridPane.rowIndex="0" GridPane.columnIndex="1"/> |                         <TextField fx:id="accountname" GridPane.rowIndex="0" GridPane.columnIndex="1"/> | ||||||
|                         <Label text="E-Mail:" GridPane.rowIndex="1" GridPane.columnIndex="0"/> |                         <Label text="E-Mail:" GridPane.rowIndex="1" GridPane.columnIndex="0"/> | ||||||
|                         <TextField GridPane.rowIndex="1" GridPane.columnIndex="1"/> |                         <TextField fx:id="email" GridPane.rowIndex="1" GridPane.columnIndex="1"/> | ||||||
|                         <RadioButton fx:id="typMitarbeiter" onAction="#onTypMitarbeiter" text="Mitarbeiter" GridPane.rowIndex="2" GridPane.columnIndex="0"/> |                         <RadioButton fx:id="typMitarbeiter" onAction="#onTypMitarbeiter" text="Mitarbeiter" GridPane.rowIndex="2" GridPane.columnIndex="0"/> | ||||||
|                         <RadioButton fx:id="typEltern" onAction="#onTypEltern" text="Eltern" GridPane.rowIndex="2" GridPane.columnIndex="1"/> |                         <RadioButton fx:id="typEltern" onAction="#onTypEltern" text="Eltern" GridPane.rowIndex="2" GridPane.columnIndex="1"/> | ||||||
|                     </GridPane> |                     </GridPane> | ||||||
| @@ -51,7 +51,8 @@ | |||||||
|             <right> |             <right> | ||||||
|                 <HBox styleClass="button-untenrechts"> |                 <HBox styleClass="button-untenrechts"> | ||||||
|                     <Label fx:id="status"/> |                     <Label fx:id="status"/> | ||||||
|                     <Button text="Speichern" onAction="#onSpeichern"/> |                     <Button text="Laden" onAction="#onLaden"/> | ||||||
|  |                     <Button text="Speichern" defaultButton="true" onAction="#onSpeichern"/> | ||||||
|                 </HBox> |                 </HBox> | ||||||
|             </right> |             </right> | ||||||
|         </BorderPane> |         </BorderPane> | ||||||
|   | |||||||
| @@ -0,0 +1,28 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <?import javafx.geometry.*?> | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <!-- Erstellt von Stefan Groß --> | ||||||
|  |  | ||||||
|  | <VBox 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.BestelluebersichtMitarbeiter"> | ||||||
|  |  | ||||||
|  |     <BorderPane styleClass="kopfzeile"> | ||||||
|  |         <left> | ||||||
|  |             <Button fx:id="zurueck" text="Zurück" onAction="#onZurueck"/> | ||||||
|  |         </left> | ||||||
|  |         <right> | ||||||
|  |             <Button fx:id="abmelden" text="Abmelden" onAction="#onAbmelden"/> | ||||||
|  |         </right> | ||||||
|  |     </BorderPane> | ||||||
|  |  | ||||||
|  |     <ScrollPane fx:id="scrollPane" fitToWidth="true" VBox.vgrow="ALWAYS"> | ||||||
|  |         <padding> | ||||||
|  |             <Insets bottom="30.0" left="30.0" right="30.0" top="30.0" /> | ||||||
|  |         </padding> | ||||||
|  |         <Accordion fx:id="accordion"> | ||||||
|  |         </Accordion> | ||||||
|  |     </ScrollPane> | ||||||
|  |  | ||||||
|  | </VBox> | ||||||
| @@ -0,0 +1,65 @@ | |||||||
|  | <?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.EssensverwaltungMitarbeiterView" | ||||||
|  |             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"/> | ||||||
|  |                             <Button text="Hinzufügen" onAction="#onHinzufuegen"/> | ||||||
|  |                         </HBox> | ||||||
|  |                     </left> | ||||||
|  |                     <right> | ||||||
|  |                         <HBox styleClass="test" spacing="10"> | ||||||
|  |                             <Button styleClass="pfeil, links"/> | ||||||
|  |                             <Label text="Montag DD.MM.YY"/> | ||||||
|  |                             <Button styleClass="pfeil"/> | ||||||
|  |                         </HBox> | ||||||
|  |                     </right> | ||||||
|  |                 </BorderPane> | ||||||
|  |             </top> | ||||||
|  |             <center> | ||||||
|  |                 <AnchorPane> | ||||||
|  |                     <GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" styleClass="essensuebersicht_gridlines"> | ||||||
|  |                         <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> | ||||||
|  |                 </AnchorPane> | ||||||
|  |             </center> | ||||||
|  |         </BorderPane> | ||||||
|  |  | ||||||
|  |     </center> | ||||||
|  |     <bottom> | ||||||
|  |         <BorderPane styleClass="button-untenrechts"> | ||||||
|  |             <right> | ||||||
|  |                 <Button text="Bestätigen" defaultButton="true" styleClass=".button"/> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </bottom> | ||||||
|  | </BorderPane> | ||||||
| @@ -0,0 +1,34 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <?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.GerichterstellungMitarbeiterView" | ||||||
|  |             prefHeight="400.0" prefWidth="600.0" | ||||||
|  |             stylesheets="@layout.css" styleClass="main"> | ||||||
|  |     <center> | ||||||
|  |        <VBox styleClass="gerichterstellung_felder"> | ||||||
|  |            <TextField fx:id="eingabeName" promptText="Name 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" /> | ||||||
|  |        </VBox> | ||||||
|  |     </center> | ||||||
|  |     <bottom> | ||||||
|  |         <BorderPane> | ||||||
|  |             <right> | ||||||
|  |                 <HBox styleClass="button_untenrechts"> | ||||||
|  |                     <Button text="Speichern" defaultButton="true"/> | ||||||
|  |                 </HBox> | ||||||
|  |             </right> | ||||||
|  |         </BorderPane> | ||||||
|  |     </bottom> | ||||||
|  | </BorderPane> | ||||||
| @@ -23,11 +23,11 @@ | |||||||
|         <BorderPane styleClass="main"> |         <BorderPane styleClass="main"> | ||||||
|             <left> |             <left> | ||||||
|                 <VBox styleClass="hauptmenue_buttons_links"> |                 <VBox styleClass="hauptmenue_buttons_links"> | ||||||
|                     <Button text="Speiseplan"/> |                     <Button text="Speiseplan" onAction="#onSpeiseplanClick"/> | ||||||
|                     <Button text="Alle Bestellungen anzeigen"/> |                     <Button text="Alle Bestellungen anzeigen" onAction="#onBestellungenAnzeigen"/> | ||||||
|                     <Button text="Rechnungen herunterladen"/> |                     <Button text="Rechnungen herunterladen"/> | ||||||
|                     <Button text="Daten importieren/Exportieren"/> |                     <Button text="Daten importieren/Exportieren"/> | ||||||
|                     <Button text="Account anlegen" onAction="#onAccountAnlegen"/> |                     <Button text="Accounts verwalten" onAction="#onAccountAnlegenClick"/> | ||||||
|                 </VBox> |                 </VBox> | ||||||
|             </left> |             </left> | ||||||
|             <right> |             <right> | ||||||
|   | |||||||
| @@ -0,0 +1,29 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <!-- @author Samuel Wolff | ||||||
|  |      Noch nicht getestet | ||||||
|  |      TODO Style einbauen | ||||||
|  | --> | ||||||
|  |  | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <VBox 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.InhaltsstoffeFilternController" styleClass="main"> | ||||||
|  |  | ||||||
|  |     <Label text="Nach Inhaltsstoffen filtern" /> | ||||||
|  |     <ListView fx:id="zutatListView" /> | ||||||
|  |  | ||||||
|  |     <BorderPane prefHeight="128.0" prefWidth="600.0" styleClass="filter_unten"> | ||||||
|  |         <left> | ||||||
|  |             <HBox> | ||||||
|  |                 <CheckBox fx:id="speichernCheckBox" text="Auswahl speichern " /> | ||||||
|  |             </HBox> | ||||||
|  |         </left> | ||||||
|  |         <right> | ||||||
|  |             <HBox styleClass="filter_unten"> | ||||||
|  |                 <Button fx:id="abbrechenButton" cancelButton="true" text="Abbrechen" /> | ||||||
|  |                 <Button fx:id="fortfahrenButton" defaultButton="true" text="Fortfahren" /> | ||||||
|  |             </HBox> | ||||||
|  |         </right> | ||||||
|  |     </BorderPane> | ||||||
|  | </VBox> | ||||||
| @@ -18,7 +18,7 @@ | |||||||
|     -fx-padding: 20; |     -fx-padding: 20; | ||||||
| } | } | ||||||
|  |  | ||||||
| .hauptmenue_buttons_links{ | .hauptmenue_buttons_links, .gerichterstellung_felder, .filter, .main, .filter_unten{ | ||||||
|     -fx-spacing: 20; |     -fx-spacing: 20; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -73,8 +73,15 @@ | |||||||
|     -fx-vgap: 10; |     -fx-vgap: 10; | ||||||
|     -fx-hgap: 10; |     -fx-hgap: 10; | ||||||
| } | } | ||||||
|  | .test { | ||||||
|  |     -fx-padding: 10 20; | ||||||
|  | } | ||||||
|  |  | ||||||
| .accounterstellung_links { | .essensuebersicht_gridlines { | ||||||
|  |      -fx-grid-lines-visible: true; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .accounterstellung_links, .button-untenrechts{ | ||||||
|     -fx-spacing: 20; |     -fx-spacing: 20; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -82,3 +89,24 @@ | |||||||
|     -fx-background-color: #FFDCDC; |     -fx-background-color: #FFDCDC; | ||||||
|     -fx-text-fill: #FFDCDC; |     -fx-text-fill: #FFDCDC; | ||||||
| } | } | ||||||
|  | .essensuebersicht_gridlines > * { | ||||||
|  |     -fx-alignment: center; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .pfeil{ | ||||||
|  |     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color; | ||||||
|  |     -fx-background-insets: 0 0 -1 0, 0; | ||||||
|  |     -fx-padding: 0.25em; | ||||||
|  |     -fx-shape: "M 0 -3.5 v 7 l 4 -3.5 z"; | ||||||
|  |     -fx-pref-width: 25; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | .links { | ||||||
|  |     -fx-rotate: 180; | ||||||
|  | } | ||||||
|  | .titledPaneUeberschrift > .title { | ||||||
|  |     -fx-pref-height: 50; | ||||||
|  |     -fx-padding: 10 10 16 10; | ||||||
|  |     -fx-font-size: 15; | ||||||
|  |     -fx-font-weight: bold; | ||||||
|  | } | ||||||
| @@ -31,7 +31,7 @@ | |||||||
|         <BorderPane> |         <BorderPane> | ||||||
|             <right> |             <right> | ||||||
|                 <VBox styleClass="button-untenrechts"> |                 <VBox styleClass="button-untenrechts"> | ||||||
|                     <Button text="Anmelden" onAction="#onAnmeldenClick"/> |                     <Button text="Anmelden" defaultButton="true" onAction="#onAnmeldenClick"/> | ||||||
|                 </VBox> |                 </VBox> | ||||||
|  |  | ||||||
|             </right> |             </right> | ||||||
|   | |||||||
| @@ -0,0 +1,30 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <!-- | ||||||
|  |     @author Samuel Wolff | ||||||
|  |     Noch nicht getestet | ||||||
|  |     TODO Style einbinden | ||||||
|  | --> | ||||||
|  |  | ||||||
|  | <?import java.lang.*?> | ||||||
|  | <?import java.util.*?> | ||||||
|  | <?import javafx.scene.*?> | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <VBox xmlns="http://javafx.com/javafx" | ||||||
|  |             xmlns:fx="http://javafx.com/fxml" | ||||||
|  |             fx:controller="de.subway_surfers.vpr_app.RechnungFilterViewController" | ||||||
|  |             prefHeight="400.0" prefWidth="600.0" | ||||||
|  |             stylesheets="@layout.css"> | ||||||
|  |  | ||||||
|  |     <RadioButton fx:id="alle" text="Alle anzeigen" /> | ||||||
|  |     <RadioButton fx:id="nichtBezahlt" text="Alle nicht bezahlten Anzeigen" /> | ||||||
|  |     <RadioButton fx:id="bezahlt" text="Alle bezahlten Anzeigen" /> | ||||||
|  |  | ||||||
|  |     <HBox> | ||||||
|  |         <Button fx:id="abbrechenButton" cancelButton="true" text="Abbruch" /> | ||||||
|  |         <Button fx:id="fortfahrenButton" defaultButton="true" text="Fortfahren" /> | ||||||
|  |     </HBox> | ||||||
|  |  | ||||||
|  | </VBox> | ||||||
| @@ -0,0 +1,24 @@ | |||||||
|  | <?xml version="1.0" encoding="UTF-8"?> | ||||||
|  |  | ||||||
|  | <!-- | ||||||
|  | @author Samuel Wolff | ||||||
|  | Noch nicht getestet | ||||||
|  | TODO Style einbauen | ||||||
|  | --> | ||||||
|  |  | ||||||
|  | <?import java.lang.*?> | ||||||
|  | <?import java.util.*?> | ||||||
|  | <?import javafx.scene.*?> | ||||||
|  | <?import javafx.scene.control.*?> | ||||||
|  | <?import javafx.scene.layout.*?> | ||||||
|  |  | ||||||
|  | <HBox xmlns="http://javafx.com/javafx" | ||||||
|  |             xmlns:fx="http://javafx.com/fxml" | ||||||
|  |             fx:controller="de.subway_surfers.vpr_app.zutatListViewController" | ||||||
|  |             prefHeight="400.0" prefWidth="600.0" | ||||||
|  |             stylesheets="@layout.css"> | ||||||
|  |  | ||||||
|  |     <CheckBox fx:id="isChecked" /> | ||||||
|  |     <Label fx:id="nameLabel" text="placeholder" /> | ||||||
|  |  | ||||||
|  | </HBox> | ||||||
		Reference in New Issue
	
	Block a user