Compare commits
65 Commits
0a8d4e47ac
...
Max
Author | SHA1 | Date | |
---|---|---|---|
8b7a611e2a | |||
336a6fc89d | |||
0303458524 | |||
f97211ae84 | |||
f0bd39d3a6 | |||
c127cfb8a3 | |||
293c5f7fee | |||
956c723057 | |||
ee2685cd45 | |||
8f8597c0c9 | |||
a620c620f0 | |||
43f0aeb352 | |||
29c31841fa | |||
349a8f02cc | |||
58ab3e313c | |||
4bebd27617 | |||
bc4926aca8 | |||
7acd24e285 | |||
3edbca73f9 | |||
![]() |
f43dad000f | ||
0300b96bf4 | |||
53383f3a23 | |||
c6b4bc1cd1 | |||
450e08b8e7 | |||
17f0d66677 | |||
3ac92ea955 | |||
509dc31d62 | |||
a8e9d0ada4 | |||
f281bc9ef4 | |||
e817a7caa1 | |||
cac9a4f43a | |||
feba2a14b2 | |||
eea06a254f | |||
f0d87b0e43 | |||
c5a179a0d2 | |||
1073423b16 | |||
c182bd5714 | |||
c358366869 | |||
5c21ee1743 | |||
0741325aa6 | |||
9e8ca5cebf | |||
ee5fc5ded6 | |||
afb53d8863 | |||
57fb7ff997 | |||
39b9266067 | |||
245323383d | |||
![]() |
287ccd9ce5 | ||
1db44e7b22 | |||
f59bc8d27f | |||
26b713309f | |||
c5f7391631 | |||
17bf862890 | |||
c08e816e93 | |||
72a6d9a7e5 | |||
92d62509de | |||
0f52f19fc7 | |||
1b2a0c0309 | |||
![]() |
8dfe6547c9 | ||
0326d80a21 | |||
93a443ebe1 | |||
4780f4403b | |||
8e1084f034 | |||
042c78e0d4 | |||
2a3ac1498b | |||
412d9d7497 |
BIN
out/artifacts/VPR_App_jar/VPR_App.jar
Normal file
BIN
out/artifacts/VPR_App_jar/VPR_App.jar
Normal file
Binary file not shown.
@@ -3,15 +3,19 @@
|
||||
|
||||
package Logik;
|
||||
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
|
||||
public class Account {
|
||||
|
||||
// region Felder
|
||||
private String passwort;
|
||||
|
||||
private transient int id;
|
||||
private /*transient*/ int id;
|
||||
|
||||
private String name;
|
||||
|
||||
private String email;
|
||||
|
||||
private int rid;
|
||||
// endregion
|
||||
|
||||
@@ -32,6 +36,14 @@ public class Account {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
|
||||
public String getBenutzername() {
|
||||
return name;
|
||||
@@ -43,9 +55,22 @@ public class Account {
|
||||
// endregion
|
||||
|
||||
// region Konstruktoren
|
||||
public Account(String passwort, String name) {
|
||||
public Account(String passwort, String name, String email) {
|
||||
this.passwort = passwort;
|
||||
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;
|
||||
@@ -53,5 +78,4 @@ public class Account {
|
||||
rid = 1;
|
||||
}
|
||||
// endregion
|
||||
|
||||
}
|
||||
|
@@ -12,19 +12,10 @@ import java.util.ArrayList;
|
||||
public class ElternAccount extends Account {
|
||||
|
||||
// region Felder
|
||||
private String email;
|
||||
|
||||
private transient ArrayList<Kind> kinder;
|
||||
// endregion
|
||||
|
||||
// region Getter & Setter
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
public ArrayList<Kind> getKinder() {
|
||||
return kinder;
|
||||
@@ -37,8 +28,7 @@ public class ElternAccount extends Account {
|
||||
|
||||
// region Konstruktoren
|
||||
public ElternAccount(String passwort, String benutzername, String email) {
|
||||
super(passwort, benutzername);
|
||||
this.email = email;
|
||||
super(passwort, benutzername, email);
|
||||
kinder = new ArrayList<>();
|
||||
}
|
||||
// endregion
|
||||
|
@@ -6,7 +6,7 @@ public class Kind {
|
||||
|
||||
// region Felder
|
||||
|
||||
private transient int id;
|
||||
private /*transient*/ int id;
|
||||
private String name;
|
||||
private String vorname;
|
||||
private int bid;
|
||||
|
@@ -3,6 +3,8 @@ package Logik;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class Mahlzeit {
|
||||
|
||||
private int id;
|
||||
private String name;
|
||||
private float preis;
|
||||
private ArrayList<Zutat> zutaten;
|
||||
@@ -31,4 +33,11 @@ public class Mahlzeit {
|
||||
return beschreibung;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("Name: %s, Preis: %g, Beschreibung: %s", name, preis, beschreibung);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@@ -12,8 +12,8 @@ import java.util.ArrayList;
|
||||
public class MitarbeiterAccount extends Account {
|
||||
|
||||
// region Konstrukoren
|
||||
public MitarbeiterAccount(String passwort, String benutzername) {
|
||||
super(passwort, benutzername);
|
||||
public MitarbeiterAccount(String passwort, String benutzername, String email) {
|
||||
super(passwort, benutzername, email);
|
||||
}
|
||||
//endregion
|
||||
|
||||
|
@@ -9,6 +9,7 @@ public class Tagesplan {
|
||||
|
||||
public Tagesplan(String datum) {
|
||||
this.datum = datum;
|
||||
this.gerichte = new ArrayList<>();
|
||||
}
|
||||
|
||||
public ArrayList<Mahlzeit> getGerichte() {
|
||||
|
@@ -9,4 +9,10 @@ public class Zutat {
|
||||
public String getName(){
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return name;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -11,11 +11,13 @@ public interface IRestAPI {
|
||||
|
||||
// region Get
|
||||
|
||||
void get(String controllerName);
|
||||
String get(String controllerName);
|
||||
|
||||
void get (String controllerName, int id);
|
||||
String get (String controllerName, int id);
|
||||
|
||||
void get (String controllerName, int id, boolean bezahlt);
|
||||
String get (String controllerName, int id, boolean bezahlt);
|
||||
|
||||
String get(String controllerName, String[] params);
|
||||
|
||||
//endregion
|
||||
|
||||
|
@@ -1,24 +1,30 @@
|
||||
package RestAPISchnittstelle;
|
||||
|
||||
import java.net.ConnectException;
|
||||
import java.net.URI;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import Logik.ElternAccount;
|
||||
import Logik.Kind;
|
||||
import com.google.gson.Gson;
|
||||
import Logik.Mahlzeit;
|
||||
import Logik.Tagesplan;
|
||||
import com.google.gson.*;
|
||||
import javafx.scene.control.Alert;
|
||||
|
||||
/**
|
||||
* 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 int timeout = 10;
|
||||
|
||||
private final HttpClient client;
|
||||
|
||||
private final Gson gson;
|
||||
@@ -32,78 +38,27 @@ public class RestApiClient implements IRestAPI{
|
||||
|
||||
RestApiClient client1 = new RestApiClient();
|
||||
|
||||
client1.post("Gericht", "{\"name\" : \"Svens Beine\", \"69.69\", \"beschreibung\" : \"Muss net schmegge, muss wirge\"}");
|
||||
client1.delete("Kind", 15);
|
||||
|
||||
|
||||
Tagesplan t = client1.getGerichteOnTag("2023-12-17");
|
||||
|
||||
for(Mahlzeit m : t.getGerichte())
|
||||
System.out.println(m);
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode für einen Get-Aufruf. Ruft alle Elemente einer Tabelle auf.
|
||||
*
|
||||
* @param controllerName Name des aufzurufenden Controllers
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@Override
|
||||
public void get(String controllerName) {
|
||||
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());
|
||||
|
||||
Kind test = gson.fromJson(httpResponse.body(), Kind.class);
|
||||
|
||||
// Print the response status code and body
|
||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||
System.out.println("Response Body: " + test.getName());
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 void 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());
|
||||
|
||||
//System.out.println("Response Body: " + test);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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 void 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()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.uri(apiUri)
|
||||
.GET()
|
||||
.build();
|
||||
@@ -115,8 +70,143 @@ public class RestApiClient implements IRestAPI{
|
||||
// Print the response status code and body
|
||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||
System.out.println("Response Body: " + httpResponse.body());
|
||||
} catch (Exception e) {
|
||||
return httpResponse.body();
|
||||
}
|
||||
catch(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return null;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode für einen Get-Aufruf. Ruft ein spezifisches Element auf.
|
||||
*
|
||||
* @param controllerName Name des aufzurufenden Controllers
|
||||
* @param id Id der Aufzurufenden Zeile
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@Override
|
||||
public String get(String controllerName, int id) {
|
||||
URI apiUri = URI.create(String.format("%s/%s/%s", urlBase, controllerName, id));
|
||||
|
||||
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return null;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* --DEPRECATED--
|
||||
* 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?
|
||||
* @deprecated
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@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()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return null;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/***
|
||||
* Ein gefilterter Get Aufruf
|
||||
* @param controllerName
|
||||
* @param params
|
||||
* @return
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
@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()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return null;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,6 +216,7 @@ public class RestApiClient implements IRestAPI{
|
||||
* @param controllerName Name des aufzurufenden Controllers.
|
||||
* @param id Id des zu änderenden Eintrags.
|
||||
* @param jsonData JsonString mit den neuen Daten.
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@Override
|
||||
public void put(String controllerName, int id, String jsonData) {
|
||||
@@ -133,6 +224,7 @@ public class RestApiClient implements IRestAPI{
|
||||
URI apiUri = URI.create(String.format("%s/%s/%s", urlBase,controllerName, id));
|
||||
|
||||
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.uri(apiUri)
|
||||
.header("Content-Type", "application/json")
|
||||
.PUT(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8))
|
||||
@@ -145,7 +237,13 @@ public class RestApiClient implements IRestAPI{
|
||||
// Print the response status code and body
|
||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||
System.out.println("Response Body: " + httpResponse.body());
|
||||
} catch (Exception e) {
|
||||
}
|
||||
catch(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
@@ -155,6 +253,7 @@ public class RestApiClient implements IRestAPI{
|
||||
*
|
||||
* @param controllerName Name des aufzurufenden Controllers.
|
||||
* @param jsonData JsonString mit den Daten des Eintrags.
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@Override
|
||||
public void post(String controllerName, String jsonData) {
|
||||
@@ -163,6 +262,7 @@ public class RestApiClient implements IRestAPI{
|
||||
System.out.println(apiUri);
|
||||
|
||||
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.uri(apiUri)
|
||||
.header("Content-Type", "application/json")
|
||||
.POST(HttpRequest.BodyPublishers.ofString(jsonData, StandardCharsets.UTF_8))
|
||||
@@ -175,7 +275,13 @@ public class RestApiClient implements IRestAPI{
|
||||
// Print the response status code and body
|
||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||
System.out.println("Response Body: " + httpResponse.body());
|
||||
} catch (Exception e) {
|
||||
}
|
||||
catch(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
@@ -185,6 +291,7 @@ public class RestApiClient implements IRestAPI{
|
||||
*
|
||||
* @param controllerName Name des aufzurufenden Controllers
|
||||
* @param id Id des zu löschenden Eintrags.
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
@Override
|
||||
public void delete(String controllerName, int id) {
|
||||
@@ -193,6 +300,7 @@ public class RestApiClient implements IRestAPI{
|
||||
System.out.println(apiUri);
|
||||
|
||||
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.uri(apiUri)
|
||||
.header("Content-Type", "application/json")
|
||||
.DELETE()
|
||||
@@ -205,6 +313,237 @@ public class RestApiClient implements IRestAPI{
|
||||
// Print the response status code and body
|
||||
System.out.println("Status Code: " + httpResponse.statusCode());
|
||||
System.out.println("Response Body: " + httpResponse.body());
|
||||
}
|
||||
catch(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/***
|
||||
* Holt die nöchste Autoinkrement Id für den mitgegebenen Controller aus der Datenbank
|
||||
* @param controllerName
|
||||
* @return
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public int nextId(String controllerName){
|
||||
URI apiUri = URI.create(String.format("%s/%s/nextId", urlBase, controllerName));
|
||||
|
||||
HttpRequest httpRequest = HttpRequest.newBuilder()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return -1;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
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()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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{
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Falsche Anmeldedaten");
|
||||
alert.setHeaderText("Fehler!");
|
||||
alert.showAndWait();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
catch(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return false;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Ein Uwuwarteter Fehler ist aufgetreten!");
|
||||
alert.showAndWait();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
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()
|
||||
.timeout(Duration.ofSeconds(timeout))
|
||||
.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(ConnectException conex){
|
||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
||||
alert.setContentText("Verbindung zum Server konnte nicht aufgebaut werden!");
|
||||
alert.showAndWait();
|
||||
return null;
|
||||
}
|
||||
catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Holt die Id des Gerichtes mit dem mitgegebenen Namen an einem mitgegebenen Tag und gibt sie zurück
|
||||
* @param name
|
||||
* @param datum
|
||||
* @return
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public int getGerichtIdOnTag(String name, String datum){
|
||||
|
||||
URI apiUri = URI.create(String.format("%s/Tagesplan/getGerichtIdOnTag?name=%s&datum=%s", urlBase, name, 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());
|
||||
|
||||
JsonElement jsonElement = JsonParser.parseString(httpResponse.body());
|
||||
|
||||
JsonArray json = jsonElement.getAsJsonArray();
|
||||
|
||||
JsonObject o = json.get(0).getAsJsonObject();
|
||||
|
||||
return o.get("id").getAsInt();
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Löscht ein Gericht mit der mitgebenen Id aus der Datenbank
|
||||
* @param id
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public void deleteGericht(int id){
|
||||
URI apiUri = URI.create(String.format("%s/Tagesplan/%d", urlBase, 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("Delete Gericht: Response Body: " + httpResponse.body());
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
@@ -1,5 +1,13 @@
|
||||
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.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
@@ -8,11 +16,15 @@ import javafx.scene.layout.Background;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.VBox;
|
||||
import com.google.gson.Gson;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Random;
|
||||
|
||||
public class AccounterstellungMitarbeiter {
|
||||
|
||||
private @FXML TextField accountname;
|
||||
private @FXML TextField email;
|
||||
private @FXML Label status;
|
||||
private @FXML Label einmalpw;
|
||||
private @FXML HBox kindanzeige;
|
||||
@@ -21,26 +33,61 @@ public class AccounterstellungMitarbeiter {
|
||||
private @FXML RadioButton typEltern;
|
||||
private ToggleGroup accountTyp;
|
||||
|
||||
private ArrayList<Kind> kinder;
|
||||
|
||||
/**
|
||||
* Initialisiert die Accounterstellungsmaske
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void initialize() {
|
||||
//Die Radiobuttons zum auswählen eines Accountypes werden einer ToggleGroup hinzugefügt
|
||||
accountTyp = new ToggleGroup();
|
||||
accountTyp.getToggles().add(typEltern);
|
||||
accountTyp.getToggles().add(typMitarbeiter);
|
||||
|
||||
einmalpw.setText(einmalPwGenerieren());
|
||||
|
||||
//kinder wird initialisiert
|
||||
kinder = new ArrayList<>();
|
||||
}
|
||||
|
||||
/**
|
||||
* Hauptmenü wird angezeigt
|
||||
*
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void onZurueck(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
||||
}
|
||||
|
||||
/**
|
||||
* Der nutzer wird abgemeldet
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
/**
|
||||
* Die Felder zum Erstellen von Kindern werden gelöscht
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void onTypMitarbeiter(ActionEvent actionEvent) {
|
||||
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) {
|
||||
//Einfügen der Eingabefelder für Kinder
|
||||
|
||||
//Einfügen der Überschrift
|
||||
Label ueberschrift = new Label();
|
||||
ueberschrift.setText("Daten des Kindes:");
|
||||
kindDaten.addRow(0);
|
||||
@@ -48,18 +95,21 @@ public class AccounterstellungMitarbeiter {
|
||||
kindDaten.addRow(1);
|
||||
kindDaten.add(ueberschrift,0,0);
|
||||
|
||||
//Einfügen der Eingabe für den Vornamen eines Kindes
|
||||
kindDaten.addRow(1);
|
||||
Label vname = new Label("Vorname:");
|
||||
kindDaten.add(vname, 0, 1);
|
||||
TextField vnameEingabe = new TextField();
|
||||
kindDaten.add(vnameEingabe, 1, 1);
|
||||
|
||||
//Einfügen der Eingabe für den Nachnamen eines Kindes
|
||||
kindDaten.addRow(2);
|
||||
Label nname = new Label("Nachname:");
|
||||
kindDaten.add(nname, 0, 2);
|
||||
TextField nnameEingabe = new TextField();
|
||||
kindDaten.add(nnameEingabe, 1, 2);
|
||||
|
||||
//Einfügen der Eingabe für den Geburtstag eines Kindes
|
||||
kindDaten.addRow(3);
|
||||
Label geburtstag = new Label("Geburtstag: ");
|
||||
kindDaten.add(geburtstag, 0, 3);
|
||||
@@ -67,11 +117,16 @@ public class AccounterstellungMitarbeiter {
|
||||
geburtstagEingabe.setEditable(false);
|
||||
kindDaten.add(geburtstagEingabe, 1, 3);
|
||||
|
||||
//Einfügen des bestätigen Buttons
|
||||
kindDaten.addRow(4);
|
||||
Button hinzufuegen = new Button("hinzufügen");
|
||||
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 -> {
|
||||
Button neues = new Button(vnameEingabe.getText());
|
||||
|
||||
@@ -79,6 +134,7 @@ public class AccounterstellungMitarbeiter {
|
||||
boolean gebGueltig = false;
|
||||
boolean nnameGueltig = false;
|
||||
|
||||
//Wenn alle Eingabefelder für Kinder ausgefüllt sind ist die Eingabe gültig
|
||||
if (!vnameEingabe.getText().equals("")) {
|
||||
vnameGueltig = true;
|
||||
}
|
||||
@@ -92,10 +148,15 @@ public class AccounterstellungMitarbeiter {
|
||||
}
|
||||
|
||||
if (vnameGueltig && gebGueltig && nnameGueltig) {
|
||||
Kind kind = new Kind(nnameEingabe.getText(), vnameEingabe.getText(), 0);
|
||||
kinder.add(kind);
|
||||
kindanzeige.getChildren().add(neues);
|
||||
//Wird auf ein Kind in der Anzeige geclickt, wird es aus der Liste entfernt.
|
||||
neues.setOnAction(a -> {
|
||||
((HBox) neues.getParent()).getChildren().remove(neues);
|
||||
kinder.remove(kind);
|
||||
});
|
||||
//Die Eingabefelder werden zurückgesetzt
|
||||
vnameEingabe.setText("");
|
||||
nnameEingabe.setText("");
|
||||
geburtstagEingabe.getEditor().setText("");
|
||||
@@ -103,6 +164,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() {
|
||||
final int pwLaenge = 8;
|
||||
String pw = "";
|
||||
@@ -113,18 +179,148 @@ public class AccounterstellungMitarbeiter {
|
||||
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() {
|
||||
|
||||
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) {
|
||||
if (eingabenGueltig()) {
|
||||
status.setText("Daten Erfolgreich gespeichert");
|
||||
|
||||
//speichert das aktuelle Passwort zwischen
|
||||
String passwort = einmalpw.getText();
|
||||
|
||||
//generiert ein neues Einmalpasswort und zeigt es an
|
||||
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(passwort, 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(passwort, 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());
|
||||
}
|
||||
}
|
||||
|
@@ -1,11 +1,16 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import RestAPISchnittstelle.IRestAPI;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.control.Accordion;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.ScrollPane;
|
||||
import javafx.scene.control.TitledPane;
|
||||
import javafx.scene.layout.VBox;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -28,23 +33,28 @@ public class BestelluebersichtMitarbeiter {
|
||||
|
||||
accordion.setStyle("-fx-box-border: transparent;");
|
||||
|
||||
for (String s : datum) {
|
||||
TitledPane datumUeberschrift = new TitledPane(s, createGerichtAkkordion());
|
||||
for (String i : datum) {
|
||||
Accordion gerichtAkkordion = createGerichtAkkordion();
|
||||
|
||||
TitledPane datumUeberschrift = new TitledPane(i, gerichtAkkordion);
|
||||
|
||||
datumUeberschrift.getStyleClass().add("titledPaneUeberschrift");
|
||||
datumUeberschrift.animatedProperty().set(false);
|
||||
datumUeberschrift.setPadding(new Insets(0, 0, 15, 0));
|
||||
|
||||
//TitledPane personen = new TitledPane("Person", createPersonenAccordion());
|
||||
accordion.getPanes().add(datumUeberschrift);
|
||||
//gerichtAkkordion.getPanes().add(personen);
|
||||
}
|
||||
|
||||
scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
|
||||
scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
|
||||
}
|
||||
|
||||
private Accordion createGerichtAkkordion() {
|
||||
int anzahlGerichtA = 1;
|
||||
|
||||
public Accordion createGerichtAkkordion() {
|
||||
Accordion accordion = new Accordion();
|
||||
int anzahlGerichtA = 1;
|
||||
int anzahlGerichtB = 15;
|
||||
int anzahlGerichtC = 3;
|
||||
int anzahlGerichtD = 2;
|
||||
@@ -71,6 +81,7 @@ public class BestelluebersichtMitarbeiter {
|
||||
TitledPane tp = new TitledPane();
|
||||
tp.setText("GerichtB " + anzahlGerichtB + "-Mal " + preisGerichtB * anzahlGerichtB + " €");
|
||||
accordion.getPanes().addAll(tp);
|
||||
|
||||
}
|
||||
|
||||
if (anzahlGerichtC >= 1) {
|
||||
@@ -85,21 +96,49 @@ public class BestelluebersichtMitarbeiter {
|
||||
accordion.getPanes().addAll(tp);
|
||||
}
|
||||
|
||||
if(anzahlNachtischA >= 1){
|
||||
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 + " €");
|
||||
if (anzahlNachtischA >= 1) {
|
||||
|
||||
Label label2 = new Label("Hans Schwanz" + " für " + " Anja Arbeitslos");
|
||||
Label label3 = new Label("Drittes Label");
|
||||
|
||||
VBox vbox = new VBox(label2, label3);
|
||||
vbox.setAlignment(Pos.CENTER_LEFT);
|
||||
|
||||
TitledPane tp = new TitledPane("NachtischB " + "-Mal " + preisNachtischB * anzahlGerichtB + " €", vbox);
|
||||
|
||||
accordion.getPanes().addAll(tp);
|
||||
}
|
||||
|
||||
return accordion;
|
||||
}
|
||||
|
||||
/*
|
||||
public Accordion createPersonenAccordion() {
|
||||
Accordion accordion1 = new Accordion();
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
String kind = "Kind";
|
||||
String elternteil = "Max Heer";
|
||||
|
||||
Label label = new Label();
|
||||
label.setText(elternteil + " für " + kind);
|
||||
|
||||
// Erstellen Sie eine TitledPane für jedes Label
|
||||
TitledPane titledPane = new TitledPane("Kind Informationen", label);
|
||||
|
||||
// Fügen Sie die TitledPane zur Accordion hinzu
|
||||
accordion1.getPanes().add(titledPane);
|
||||
}
|
||||
|
||||
return accordion1;
|
||||
}
|
||||
*/
|
||||
|
||||
public void onAbmelden(ActionEvent event) {
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
@@ -0,0 +1,38 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.paint.Color;
|
||||
|
||||
public class ErsteLoginViewController {
|
||||
@FXML
|
||||
private Label text;
|
||||
@FXML
|
||||
private TextField passwort;
|
||||
@FXML
|
||||
private TextField bpasswort;
|
||||
@FXML
|
||||
private Label fehlertext;
|
||||
private String benutzername;
|
||||
public void initialize(){
|
||||
benutzername = "Test";
|
||||
text.setText("Willkommen, "+benutzername+"\n\nUm Sie und Ihre Kinder zu schützen, bitten wir Sie darum Ihr Einmalpasswort zu ändern.");
|
||||
}
|
||||
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onbestaetigen(ActionEvent actionEvent) {
|
||||
if(passwort.getText().equals(bpasswort.getText())){
|
||||
|
||||
}
|
||||
else{
|
||||
fehlertext.setText("Die Eingaben müssen identisch sein");
|
||||
fehlertext.setTextFill(Color.color(1, 0, 0));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@@ -0,0 +1,17 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import javafx.event.ActionEvent;
|
||||
|
||||
public class EssensverwaltungElternController {
|
||||
|
||||
public void onFilter(ActionEvent actionEvent) {}
|
||||
|
||||
public void pfeilLinks(ActionEvent actionEvent) {}
|
||||
|
||||
public void pfeilRechts(ActionEvent actionEvent) {}
|
||||
|
||||
public void onAbmelden(ActionEvent actionEvent) {}
|
||||
|
||||
public void onZurueck(ActionEvent actionEvent) {}
|
||||
|
||||
}
|
@@ -1,10 +1,22 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import Logik.Mahlzeit;
|
||||
import Logik.Tagesplan;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import javafx.beans.value.ChangeListener;
|
||||
import javafx.beans.value.ObservableValue;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Control;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.ColumnConstraints;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Priority;
|
||||
@@ -12,19 +24,184 @@ import javafx.scene.layout.RowConstraints;
|
||||
import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.net.http.WebSocket;
|
||||
import java.text.DateFormat;
|
||||
import java.time.LocalDate;
|
||||
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 Label dateLabel;
|
||||
@FXML
|
||||
private GridPane tagesplan;
|
||||
|
||||
private Tagesplan t;
|
||||
|
||||
private String date;
|
||||
|
||||
/**
|
||||
* Initialize des Controllers.
|
||||
* Setzt das Datum, holt die Gerichte ein und initialisiert die responsive grid.
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public void initialize(){
|
||||
|
||||
date = LocalDate.now().toString();
|
||||
|
||||
dateLabel.setText(date);
|
||||
|
||||
initGrid();
|
||||
initGerichte();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode beim klicken auf den Anmeldebutton. Meldet den User ab
|
||||
* @param actionEvent
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode beim klicken auf den Filter Button. Öffnet den Filter Dialog.
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void onFilter(ActionEvent actionEvent) {
|
||||
Stage stage = new Stage();
|
||||
VerwaltungApplication.sceneWechseln(stage, 450, 400, "inhaltsstoffe_filtern-view.fxml");
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode beim klicken auf den hinzufügen Button. Öffnet den Dialog zum hinzufügen eines Gerichtes zum aktuellen Tag.
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
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(420);
|
||||
gerichterstellung.minHeightProperty().set(600);
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode beim klicken auf den Zurück Button. Kehrt zum Startbildschirm zurück.
|
||||
* @param actionEvent
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void onZurueck(ActionEvent actionEvent) {
|
||||
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
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public void pfeilLinks(ActionEvent actionEvent) {
|
||||
|
||||
tagesplan.getChildren().clear();
|
||||
|
||||
LocalDate datum = LocalDate.parse(date);
|
||||
datum = datum.minusDays(1);
|
||||
date = datum.toString();
|
||||
dateLabel.setText(date);
|
||||
|
||||
initGerichte();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode bei Klick auf Pfeil rechts, ändert das Datum und gibt neue Gerichte auf die GUI aus.
|
||||
* @param actionEvent
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public void pfeilRechts(ActionEvent actionEvent) {
|
||||
|
||||
tagesplan.getChildren().clear();
|
||||
|
||||
LocalDate datum = LocalDate.parse(date);
|
||||
datum = datum.plusDays(1);
|
||||
date = datum.toString();
|
||||
dateLabel.setText(date);
|
||||
|
||||
initGerichte();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialisiert alle Gerichte des aktuellen Datums auf der Seite.
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
private void initGerichte(){
|
||||
|
||||
tagesplan.getStyleClass().clear();
|
||||
tagesplan.getChildren().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");
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialisiert das responsive grid.
|
||||
* @author Max Heer, Sven Alteköster
|
||||
*/
|
||||
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);
|
||||
}
|
||||
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
|
||||
|
||||
tagesplan.heightProperty().addListener((obs,oldValue,newValue) -> {
|
||||
final int zeile = 1;
|
||||
@@ -35,28 +212,31 @@ public class EssensverwaltungMitarbeiterView {
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
||||
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
|
||||
}
|
||||
|
||||
public void onFilter(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln(new Stage(), 600, 400, "inhaltsstoffe_filtern-view.fxml");
|
||||
/**
|
||||
* Methode beim klicken auf den Löschen Button eines Tagesplan Elementes
|
||||
* @param a
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
private void loeschenButtonKlick(ActionEvent a){
|
||||
Button btn = (Button) a.getSource();
|
||||
int col = GridPane.getColumnIndex(btn);
|
||||
Mahlzeit m = t.getGerichte().get(col);
|
||||
|
||||
RestApiClient cl = new RestApiClient();
|
||||
|
||||
int id = cl.getGerichtIdOnTag(t.getGerichte().get(col < 0 ? 0 : col).getName().replace(' ', '_'), date);
|
||||
|
||||
t.getGerichte().remove(col);
|
||||
|
||||
System.out.println("Die Id lautet: " + id + col);
|
||||
|
||||
cl.delete("GibtsAm", id);
|
||||
initGerichte();
|
||||
}
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
@@ -1,51 +1,217 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import Logik.Mahlzeit;
|
||||
import Logik.Zutat;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import com.google.gson.*;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.TextArea;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Pane;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class GerichterstellungMitarbeiterView {
|
||||
private @FXML HBox anzeigeInhaltsstoffe;
|
||||
private @FXML TextArea eingabeBeschreibung;
|
||||
private @FXML TextField eingabeName;
|
||||
private @FXML Button buttonInhaltsstoffe;
|
||||
private @FXML TextField eingabeInhaltsstoffe;
|
||||
|
||||
private ArrayList<Zutat> zutaten;
|
||||
private @FXML HBox anzeigeInhaltsstoffe;
|
||||
private @FXML TextArea eingabeBeschreibung;
|
||||
private @FXML TextField eingabeName;
|
||||
private @FXML Button buttonInhaltsstoffe;
|
||||
private @FXML TextField eingabeInhaltsstoffe;
|
||||
private @FXML Button speichernButton;
|
||||
private @FXML TextField eingabePreis;
|
||||
private @FXML DatePicker datePicker;
|
||||
private @FXML Label status;
|
||||
|
||||
public void initialize() {
|
||||
zutaten = new ArrayList<>();
|
||||
private ArrayList<Zutat> zutaten;
|
||||
private ArrayList<Mahlzeit> mahlzeiten;
|
||||
|
||||
//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 initialize() {
|
||||
zutaten = new ArrayList<>();
|
||||
mahlzeiten = new ArrayList<>();
|
||||
|
||||
public void onButtonInhaltsstoffeClick(ActionEvent actionEvent) {
|
||||
String text = eingabeInhaltsstoffe.getText();
|
||||
if (!text.equals("")) {
|
||||
eingabeInhaltsstoffe.setText("");
|
||||
//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());
|
||||
});
|
||||
}
|
||||
|
||||
Button neuerInhalt = new Button();
|
||||
neuerInhalt.setText(text);
|
||||
anzeigeInhaltsstoffe.getChildren().add(neuerInhalt);
|
||||
/**
|
||||
* Fügt den Eingebenen Inhaltsstoff aus dem zugehörigen Textfeld als Button hinzu
|
||||
* @param actionEvent
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void onButtonInhaltsstoffeClick(ActionEvent actionEvent) {
|
||||
String text = eingabeInhaltsstoffe.getText();
|
||||
if (!text.equals("")) {
|
||||
eingabeInhaltsstoffe.setText("");
|
||||
|
||||
Zutat neue = new Zutat(text);
|
||||
zutaten.add(neue);
|
||||
neuerInhalt.setOnAction(e -> {
|
||||
((HBox) neuerInhalt.getParent()).getChildren().remove(neuerInhalt);
|
||||
zutaten.remove(neue);
|
||||
});
|
||||
}
|
||||
}
|
||||
Button neuerInhalt = new Button();
|
||||
neuerInhalt.setText(text);
|
||||
anzeigeInhaltsstoffe.getChildren().add(neuerInhalt);
|
||||
|
||||
Zutat neue = new Zutat(text);
|
||||
zutaten.add(neue);
|
||||
//Wird der Inhaltsstoff angeklickt, wird er entfernt
|
||||
neuerInhalt.setOnAction(e -> {
|
||||
((HBox) neuerInhalt.getParent()).getChildren().remove(neuerInhalt);
|
||||
zutaten.remove(neue);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public void onSpeichernButtonClick() {
|
||||
String eingabe = eingabeName.getText();
|
||||
String beschreibung = eingabeBeschreibung.getText();
|
||||
float preis = Float.parseFloat(eingabePreis.getText());
|
||||
LocalDate datum = datePicker.getValue();
|
||||
|
||||
if (!eingabe.isEmpty() && !beschreibung.isEmpty()) {
|
||||
resetEingabeFelder();
|
||||
|
||||
Mahlzeit mahlzeit = new Mahlzeit(eingabe, preis, beschreibung);
|
||||
mahlzeiten.add(mahlzeit);
|
||||
status.setText("Mahlzeit hinzugefügt");
|
||||
|
||||
int datumId = datumBearbeiten(datum);
|
||||
System.out.println(datumId);
|
||||
|
||||
int gerichtId = gerichteAbfragen(mahlzeit);
|
||||
System.out.println(gerichtId);
|
||||
|
||||
inhaltsstoff();
|
||||
gibtsAm(gerichtId, datumId);
|
||||
}
|
||||
}
|
||||
|
||||
private void resetEingabeFelder() {
|
||||
eingabeName.setText("");
|
||||
eingabeBeschreibung.setText("");
|
||||
eingabePreis.setText("");
|
||||
eingabeInhaltsstoffe.setText("");
|
||||
}
|
||||
|
||||
private int datumBearbeiten(LocalDate datum) {
|
||||
RestApiClient restApiClient = new RestApiClient();
|
||||
String datumAsString = datum.toString();
|
||||
|
||||
JsonElement jsonElement = JsonParser.parseString(restApiClient.get("Tagesplan"));
|
||||
JsonArray jsonArray = jsonElement.getAsJsonArray();
|
||||
|
||||
for (JsonElement element : jsonArray) {
|
||||
JsonObject obj = element.getAsJsonObject();
|
||||
if (obj.get("datum").getAsString().equals(datumAsString)) {
|
||||
return Integer.parseInt(obj.get("id").getAsString());
|
||||
}
|
||||
}
|
||||
|
||||
restApiClient.post("Tagesplan", "{\"datum\":\"" + datumAsString + "\"}");
|
||||
|
||||
jsonElement = JsonParser.parseString(restApiClient.get("Tagesplan"));
|
||||
jsonArray = jsonElement.getAsJsonArray();
|
||||
|
||||
for (JsonElement element : jsonArray) {
|
||||
JsonObject obj = element.getAsJsonObject();
|
||||
if (obj.get("datum").getAsString().equals(datumAsString)) {
|
||||
return Integer.parseInt(obj.get("id").getAsString());
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
public void gibtsAm(int gid, int tid){
|
||||
RestApiClient restApiClient = new RestApiClient();
|
||||
|
||||
JsonObject gibtsAmJson = new JsonObject();
|
||||
|
||||
gibtsAmJson.addProperty("tid", tid);
|
||||
gibtsAmJson.addProperty("gid", gid);
|
||||
restApiClient.post("gibtsAm", gibtsAmJson.toString());
|
||||
}
|
||||
|
||||
public void inhaltsstoff() {
|
||||
RestApiClient restApiClient = new RestApiClient();
|
||||
ArrayList<Integer> ids = new ArrayList<>();
|
||||
|
||||
for (Zutat zutat : zutaten) {
|
||||
JsonElement jE = JsonParser.parseString(restApiClient.get("Inhaltsstoff"));
|
||||
JsonArray inhaltsstoffArray = jE.getAsJsonArray();
|
||||
|
||||
int id = -1;
|
||||
|
||||
for (JsonElement element : inhaltsstoffArray) {
|
||||
JsonObject inhatsstoff = element.getAsJsonObject();
|
||||
if (inhatsstoff.get("name").getAsString().equalsIgnoreCase(zutat.getName())) {
|
||||
id = inhatsstoff.get("id").getAsInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (id == -1) {
|
||||
JsonObject neuerInhaltsstoff = new JsonObject();
|
||||
neuerInhaltsstoff.addProperty("name", zutat.getName());
|
||||
restApiClient.post("Inhaltsstoff", neuerInhaltsstoff.toString());
|
||||
|
||||
jE = JsonParser.parseString(restApiClient.get("Inhaltsstoff"));
|
||||
inhaltsstoffArray = jE.getAsJsonArray();
|
||||
|
||||
JsonObject letzterInhaltsstoff = inhaltsstoffArray.get(inhaltsstoffArray.size() - 1).getAsJsonObject();
|
||||
id = letzterInhaltsstoff.get("id").getAsInt();
|
||||
System.out.println("Inhaltsstoff hinzugefügt: " + zutat.getName());
|
||||
}
|
||||
ids.add(id);
|
||||
}
|
||||
System.out.println("IDs der Inhaltsstoffe: " + ids);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private int gerichteAbfragen(Mahlzeit mahlzeit) {
|
||||
RestApiClient restApiClient = new RestApiClient();
|
||||
JsonElement je = JsonParser.parseString(restApiClient.get("Gericht"));
|
||||
JsonArray js = je.getAsJsonArray();
|
||||
|
||||
for (JsonElement element : js) {
|
||||
JsonObject mahlzeitJson = element.getAsJsonObject();
|
||||
String nameMahlzeit = mahlzeitJson.get("name").getAsString();
|
||||
|
||||
if (nameMahlzeit.equals(mahlzeit.getName())) {
|
||||
int id = Integer.parseInt(mahlzeitJson.get("id").getAsString());
|
||||
|
||||
// Update des existierenden Gerichts
|
||||
JsonObject updateGericht = new JsonObject();
|
||||
updateGericht.addProperty("id", id);
|
||||
updateGericht.addProperty("name", mahlzeit.getName());
|
||||
updateGericht.addProperty("preis", mahlzeit.getPreis());
|
||||
updateGericht.addProperty("beschreibung", mahlzeit.getBeschreibung());
|
||||
|
||||
restApiClient.put("Gericht", id, updateGericht.toString());
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
// Neues Gericht zur Datenbank hinzufügen, falls es nicht existiert
|
||||
JsonObject neuesGericht = new JsonObject();
|
||||
neuesGericht.addProperty("name", mahlzeit.getName());
|
||||
neuesGericht.addProperty("preis", mahlzeit.getPreis());
|
||||
neuesGericht.addProperty("beschreibung", mahlzeit.getBeschreibung());
|
||||
|
||||
restApiClient.post("Gericht", neuesGericht.toString());
|
||||
|
||||
// ID des neu hinzugefügten Gerichts abrufen
|
||||
je = JsonParser.parseString(restApiClient.get("Gericht"));
|
||||
js = je.getAsJsonArray();
|
||||
for (JsonElement element : js) {
|
||||
JsonObject mahlzeitJson = element.getAsJsonObject();
|
||||
if (mahlzeitJson.get("name").getAsString().equals(mahlzeit.getName())) {
|
||||
return Integer.parseInt(mahlzeitJson.get("id").getAsString());
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,68 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import Logik.Tagesplan;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
public class HauptmenueElternController {
|
||||
@FXML
|
||||
private GridPane wochenplan;
|
||||
private String date;
|
||||
private String day;
|
||||
private String month;
|
||||
private String year;
|
||||
|
||||
/**
|
||||
* Ruft die Methode zum Befüllen der Ansicht auf der Hauptseite auf
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void initialize(){
|
||||
wochenuebersichtFuellen();
|
||||
}
|
||||
/**
|
||||
* Methode zum initialisieren und befüllen der Tabelle im Hauptmenü
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void wochenuebersichtFuellen(){
|
||||
String dateanzeige;
|
||||
DateFormat dateFormat = DateFormat.getDateInstance();
|
||||
date = dateFormat.format(new Date());
|
||||
date = date.replace('.', '-');
|
||||
day = date.split("-")[0];
|
||||
month = date.split("-")[1];
|
||||
year = date.split("-")[2];
|
||||
date = String.format("%s-%s-%s", year, month, day);
|
||||
dateanzeige = String.format("%s.%s.%s",day,month,year);
|
||||
Tagesplan t = new RestApiClient().getGerichteOnTag(date);
|
||||
for(int i=0;i<5;i++){
|
||||
Label tag = new Label();
|
||||
wochenplan.add(tag, i, 0);
|
||||
tag.setText(dateanzeige);
|
||||
for(int j=0; j<t.getGerichte().size();j++){
|
||||
Label name = new Label();
|
||||
name.setWrapText(true);
|
||||
wochenplan.add(name, i, j+1);
|
||||
name.setText(t.getGerichte().get(j).getName());
|
||||
name.setPrefHeight(75);
|
||||
name.setTextAlignment(TextAlignment.CENTER);
|
||||
}
|
||||
day = String.valueOf(Integer.parseInt(day)+1);
|
||||
date = String.format("%s-%s-%s", year, month, day);
|
||||
dateanzeige = String.format("%s.%s.%s",day,month,year);
|
||||
t = new RestApiClient().getGerichteOnTag(date);
|
||||
}
|
||||
}
|
||||
public void onAbmelden(ActionEvent actionEvent) {}
|
||||
|
||||
public void onBestellungPlanen(ActionEvent actionEvent) {}
|
||||
|
||||
public void onBestellhistorieAnzeigen(ActionEvent actionEvent) {}
|
||||
|
||||
}
|
@@ -1,9 +1,68 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import Logik.Tagesplan;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
|
||||
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 der Hauptseite auf
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void initialize(){
|
||||
wochenuebersichtFuellen();
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode zum initialisieren und befüllen der Tabelle im Hauptmenü
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void wochenuebersichtFuellen(){
|
||||
String dateanzeige;
|
||||
date = LocalDate.now().toString();
|
||||
dateanzeige = date;
|
||||
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);
|
||||
}
|
||||
LocalDate datum = LocalDate.parse(date);
|
||||
datum = datum.plusDays(1);
|
||||
date = datum.toString();
|
||||
dateanzeige = date;
|
||||
t = new RestApiClient().getGerichteOnTag(date);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Methode beim klicken auf den Anmeldebutton. Meldet den User ab
|
||||
* @param actionEvent
|
||||
* @author Samuel Wolff
|
||||
*/
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
@@ -7,14 +7,21 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import Logik.Kind;
|
||||
import Logik.Zutat;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import com.google.gson.*;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.CheckBox;
|
||||
import javafx.scene.control.ListView;
|
||||
import javafx.scene.control.SelectionMode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class InhaltsstoffeFilternController {
|
||||
|
||||
private @FXML ListView<zutatListViewController> zutatListView;
|
||||
private @FXML ListView<Zutat> zutatListView;
|
||||
|
||||
private @FXML CheckBox speichernCheckBox;
|
||||
|
||||
@@ -22,11 +29,30 @@ public class InhaltsstoffeFilternController {
|
||||
|
||||
private @FXML Button fortfahrenButton;
|
||||
|
||||
private ArrayList<Zutat> zutaten;
|
||||
|
||||
/**
|
||||
* Initialisert sie InhaltsstoffeFiltern View
|
||||
* @author Sven Alteköster
|
||||
*/
|
||||
public void initialize(){
|
||||
//mehrere Inhaltsstoffe können ausgewählt werden
|
||||
zutatListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
|
||||
|
||||
// hier ListView füllen
|
||||
//Befüllen der ListView mit allen existierenden Inhaltsstoffen
|
||||
RestApiClient api = new RestApiClient();
|
||||
String json = api.get("Inhaltsstoff");
|
||||
|
||||
zutaten = new ArrayList<>();
|
||||
Gson gson = new Gson();
|
||||
|
||||
JsonElement je = JsonParser.parseString(json);
|
||||
JsonArray ja = je.getAsJsonArray();
|
||||
for (JsonElement e : ja) {
|
||||
JsonObject jo = e.getAsJsonObject();
|
||||
zutaten.add(gson.fromJson(jo, Zutat.class));
|
||||
}
|
||||
zutatListView.setItems(FXCollections.observableArrayList(zutaten));
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -3,4 +3,7 @@ package de.subway_surfers.vpr_app;
|
||||
import javafx.scene.control.Button;
|
||||
|
||||
public class LoginView {
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@@ -15,6 +15,10 @@ public class VerwaltungApplication extends Application {
|
||||
|
||||
private static Stage stage;
|
||||
|
||||
public static void abmelden(){
|
||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(Stage stage) throws IOException {
|
||||
FXMLLoader fxmlLoader = new FXMLLoader(VerwaltungApplication.class.getResource("login-view.fxml"));
|
||||
@@ -44,7 +48,6 @@ public class VerwaltungApplication extends Application {
|
||||
* Die Scene auf der aktuellen Stage wird durch die in der fxml-Datei definierte Scene ausgetauscht.
|
||||
*
|
||||
* Geschrieben: Sven Alteköster
|
||||
* Getestet:
|
||||
*
|
||||
* @param fxml name der zu ladenden fxml Datei.
|
||||
*/
|
||||
@@ -80,9 +83,7 @@ public class VerwaltungApplication extends Application {
|
||||
/**
|
||||
* in einem neuen Fenster wird die in der fxml-Datei definierte Scene gesetzt.
|
||||
* Die geladene Scene wird <b><u>nicht</u></b> zu der neuen Hauptstage.
|
||||
*
|
||||
* Geschrieben: Sven Alteköster
|
||||
* Getestet:
|
||||
*
|
||||
* @param neue Stage auf der die Scene gesetzt werden soll
|
||||
* @param width breite des neuen Fensters
|
||||
@@ -110,17 +111,13 @@ public class VerwaltungApplication extends Application {
|
||||
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public static void abmelden() {
|
||||
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
|
||||
*/
|
||||
|
@@ -1,26 +1,37 @@
|
||||
package de.subway_surfers.vpr_app;
|
||||
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Alert;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.stage.Stage;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class VerwaltungController {
|
||||
|
||||
@FXML
|
||||
public PasswordField passwortTextfield;
|
||||
@FXML
|
||||
public TextField benutzernameTextfield;
|
||||
|
||||
public void initialize(){
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Wird der Abmeldenbutton geklickt, wird der Nutzer angemeldet.
|
||||
* Wird der Anmeldenbutton geklickt, wird der Nutzer angemeldet.
|
||||
*/
|
||||
public void onAnmeldenClick(ActionEvent actionEvent) {
|
||||
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
||||
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");
|
||||
}
|
||||
}
|
@@ -6,6 +6,8 @@
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<!-- Erstellt von Sven Alteköster -->
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.AccounterstellungMitarbeiter"
|
||||
@@ -28,9 +30,9 @@
|
||||
<VBox styleClass="accounterstellung_links">
|
||||
<GridPane styleClass="accounterstellung_daten">
|
||||
<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"/>
|
||||
<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="typEltern" onAction="#onTypEltern" text="Eltern" GridPane.rowIndex="2" GridPane.columnIndex="1"/>
|
||||
</GridPane>
|
||||
@@ -51,6 +53,7 @@
|
||||
<right>
|
||||
<HBox styleClass="button-untenrechts">
|
||||
<Label fx:id="status"/>
|
||||
<Button text="Laden" onAction="#onLaden"/>
|
||||
<Button text="Speichern" defaultButton="true" onAction="#onSpeichern"/>
|
||||
</HBox>
|
||||
</right>
|
||||
|
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--Erstellt von Max Heer-->
|
||||
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<BorderPane prefHeight="400.0" prefWidth="600.0" stylesheets="@layout.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.subway_surfers.vpr_app.ErsteLoginViewController">
|
||||
<top>
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<right>
|
||||
<Button onAction="#onAbmelden" text="Abmelden" />
|
||||
</right>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<bottom>
|
||||
<BorderPane styleClass="button-untenrechts">
|
||||
<right>
|
||||
<Button defaultButton="true" onAction="#onbestaetigen" styleClass=".button" text="Bestätigen" />
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
<left>
|
||||
<AnchorPane BorderPane.alignment="CENTER">
|
||||
<children>
|
||||
<Label fx:id="text" layoutX="27.0" layoutY="34.0" text="Label" />
|
||||
<Label layoutX="27.0" layoutY="127.0" text="Passwort:" />
|
||||
<Label layoutX="27.0" layoutY="178.0" text="Passwort bestätigen:" />
|
||||
<TextField fx:id="passwort" layoutX="175.0" layoutY="122.0" />
|
||||
<TextField fx:id="bpasswort" layoutX="175.0" layoutY="173.0" />
|
||||
<Label layoutX="27.0" layoutY="216.0" fx:id="fehlertext"/>
|
||||
</children></AnchorPane>
|
||||
</left>
|
||||
</BorderPane>
|
@@ -0,0 +1,61 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Erstellt von Max Heer-->
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
<?import javafx.scene.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.EssensverwaltungElternController"
|
||||
prefHeight="400.0" prefWidth="600.0"
|
||||
stylesheets="@layout.css">
|
||||
<top>
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<right>
|
||||
<Button text="Abmelden" onAction="#onAbmelden"/>
|
||||
</right>
|
||||
<left>
|
||||
<Button text="Zurück" onAction="#onZurueck"/>
|
||||
</left>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<BorderPane>
|
||||
<top>
|
||||
<BorderPane>
|
||||
<left>
|
||||
<HBox styleClass="test" spacing="10">
|
||||
<Button text="Filter" onAction="#onFilter"/>
|
||||
<Label text="Bestellung Planen für: "/>
|
||||
<ComboBox fx:id="kindAuswahl"/>
|
||||
</HBox>
|
||||
</left>
|
||||
<right>
|
||||
<HBox styleClass="test" spacing="10">
|
||||
<Button styleClass="pfeil, links" onAction="#pfeilLinks"/>
|
||||
<Label fx:id="dateLabel"/>
|
||||
<Button styleClass="pfeil" onAction="#pfeilRechts"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<AnchorPane>
|
||||
<GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" >
|
||||
</GridPane>
|
||||
</AnchorPane>
|
||||
</center>
|
||||
</BorderPane>
|
||||
|
||||
</center>
|
||||
<bottom>
|
||||
<BorderPane styleClass="button-untenrechts">
|
||||
<right>
|
||||
<Button text="Bestätigen" defaultButton="true" styleClass=".button"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
</BorderPane>
|
@@ -34,21 +34,16 @@
|
||||
</left>
|
||||
<right>
|
||||
<HBox styleClass="test" spacing="10">
|
||||
<Button styleClass="pfeil, links"/>
|
||||
<Label text="Montag DD.MM.YY"/>
|
||||
<Button styleClass="pfeil"/>
|
||||
<Button styleClass="pfeil, links" onAction="#pfeilLinks"/>
|
||||
<Label fx:id="dateLabel"/>
|
||||
<Button styleClass="pfeil" onAction="#pfeilRechts"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<AnchorPane>
|
||||
<GridPane fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" 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 fx:id="tagesplan" AnchorPane.bottomAnchor="20" AnchorPane.rightAnchor="20" AnchorPane.leftAnchor="20" AnchorPane.topAnchor="20" >
|
||||
</GridPane>
|
||||
</AnchorPane>
|
||||
</center>
|
||||
@@ -57,9 +52,6 @@
|
||||
</center>
|
||||
<bottom>
|
||||
<BorderPane styleClass="button-untenrechts">
|
||||
<right>
|
||||
<Button text="Bestätigen" defaultButton="true" styleClass=".button"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</bottom>
|
||||
</BorderPane>
|
||||
|
@@ -1,11 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--Sven Alteköster-->
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
<?import javafx.scene.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<!-- Erstellt von Sven Alteköster -->
|
||||
|
||||
<?import javafx.geometry.Insets?>
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.GerichterstellungMitarbeiterView"
|
||||
@@ -14,19 +17,22 @@
|
||||
<center>
|
||||
<VBox styleClass="gerichterstellung_felder">
|
||||
<TextField fx:id="eingabeName" promptText="Name des Gerichtes" focusTraversable="false"/>
|
||||
<TextField fx:id="eingabePreis" promptText="Preis des Gerichtes" focusTraversable="false"/>
|
||||
<TextArea fx:id="eingabeBeschreibung" promptText="Beschreibung" focusTraversable="false"/>
|
||||
<HBox>
|
||||
<TextField fx:id="eingabeInhaltsstoffe" promptText="Inhaltsstoffe" focusTraversable="false"/>
|
||||
<Button fx:id="buttonInhaltsstoffe" onAction="#onButtonInhaltsstoffeClick" text="Hinzufügen"/>
|
||||
</HBox>
|
||||
<HBox fx:id="anzeigeInhaltsstoffe" />
|
||||
<HBox fx:id="anzeigeInhaltsstoffe" minHeight="30"/>
|
||||
<DatePicker fx:id="datePicker" maxWidth="Infinity"/>
|
||||
<Label fx:id="status"/>
|
||||
</VBox>
|
||||
</center>
|
||||
<bottom>
|
||||
<BorderPane>
|
||||
<right>
|
||||
<HBox styleClass="button_untenrechts">
|
||||
<Button text="Speichern" defaultButton="true"/>
|
||||
<Button fx:id="speichernButton" text="Speichern" defaultButton="true" onAction="#onSpeichernButtonClick"/>
|
||||
</HBox>
|
||||
</right>
|
||||
</BorderPane>
|
||||
|
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--Erstellt von Sven Alteköster und Max Heer-->
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
<?import javafx.scene.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<!-- Erstellt von Sven Alteköster -->
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.HauptmenueElternController"
|
||||
prefHeight="400.0" prefWidth="600.0"
|
||||
stylesheets="@layout.css">
|
||||
<top>
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<right>
|
||||
<Button text="Abmelden" onAction="#onAbmelden"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</top>
|
||||
<center>
|
||||
<BorderPane styleClass="main">
|
||||
<left>
|
||||
<VBox styleClass="hauptmenue_buttons_links">
|
||||
<Button text="Bestellung Planen" onAction="#onBestellungPlanen"/>
|
||||
<Button text="Bestellhistorie anzeigen" onAction="#onBestellhistorieAnzeigen"/>
|
||||
</VBox>
|
||||
</left>
|
||||
<right>
|
||||
<GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</center>
|
||||
</BorderPane>
|
@@ -25,21 +25,11 @@
|
||||
<VBox styleClass="hauptmenue_buttons_links">
|
||||
<Button text="Speiseplan" onAction="#onSpeiseplanClick"/>
|
||||
<Button text="Alle Bestellungen anzeigen" onAction="#onBestellungenAnzeigen"/>
|
||||
<Button text="Rechnungen herunterladen"/>
|
||||
<Button text="Daten importieren/Exportieren"/>
|
||||
<Button text="Account anlegen" onAction="#onAccountAnlegenClick"/>
|
||||
</VBox>
|
||||
</left>
|
||||
<right>
|
||||
<GridPane 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 fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
</center>
|
||||
|
@@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- @author Samuel Wolff
|
||||
Noch nicht getestet
|
||||
TODO Style einbauen
|
||||
-->
|
||||
<!--Samuel Wolff-->
|
||||
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
@@ -81,7 +81,7 @@
|
||||
-fx-grid-lines-visible: true;
|
||||
}
|
||||
|
||||
.accounterstellung_links {
|
||||
.accounterstellung_links, .button-untenrechts{
|
||||
-fx-spacing: 20;
|
||||
}
|
||||
|
||||
|
@@ -6,6 +6,8 @@
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<!-- Erstellt von Sven Alteköster -->
|
||||
|
||||
<BorderPane xmlns="http://javafx.com/javafx"
|
||||
xmlns:fx="http://javafx.com/fxml"
|
||||
fx:controller="de.subway_surfers.vpr_app.VerwaltungController"
|
||||
@@ -19,9 +21,9 @@
|
||||
</HBox>
|
||||
|
||||
<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"/>
|
||||
<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"/>
|
||||
</GridPane>
|
||||
|
@@ -1,10 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
@author Samuel Wolff
|
||||
Noch nicht getestet
|
||||
TODO Style einbinden
|
||||
-->
|
||||
<!--Samuel Wolff-->
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
|
@@ -1,10 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!--
|
||||
@author Samuel Wolff
|
||||
Noch nicht getestet
|
||||
TODO Style einbauen
|
||||
-->
|
||||
<!--Samuel Wolff-->
|
||||
|
||||
<?import java.lang.*?>
|
||||
<?import java.util.*?>
|
||||
|
Reference in New Issue
Block a user