Compare commits
No commits in common. "29c31841fa41155071cd4927858f1eec58adeaaa" and "58ab3e313cacbb3cc302c4a3f3d52b382224c612" have entirely different histories.
29c31841fa
...
58ab3e313c
@ -1,10 +1,10 @@
|
|||||||
package Logik;
|
package Logik;
|
||||||
|
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
public class Mahlzeit {
|
public class Mahlzeit {
|
||||||
|
|
||||||
private int id;
|
|
||||||
private String name;
|
private String name;
|
||||||
private float preis;
|
private float preis;
|
||||||
private ArrayList<Zutat> zutaten;
|
private ArrayList<Zutat> zutaten;
|
||||||
@ -17,6 +17,7 @@ public class Mahlzeit {
|
|||||||
zutaten = new ArrayList<>();
|
zutaten = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
@ -38,6 +39,4 @@ public class Mahlzeit {
|
|||||||
return String.format("Name: %s, Preis: %g, Beschreibung: %s", name, preis, beschreibung);
|
return String.format("Name: %s, Preis: %g, Beschreibung: %s", name, preis, beschreibung);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -461,59 +461,4 @@ public class RestApiClient implements IRestAPI{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -3,9 +3,6 @@ package de.subway_surfers.vpr_app;
|
|||||||
import Logik.Mahlzeit;
|
import Logik.Mahlzeit;
|
||||||
import Logik.Tagesplan;
|
import Logik.Tagesplan;
|
||||||
import RestAPISchnittstelle.RestApiClient;
|
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.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
@ -26,7 +23,6 @@ import javafx.stage.Stage;
|
|||||||
|
|
||||||
import java.net.http.WebSocket;
|
import java.net.http.WebSocket;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.time.LocalTime;
|
import java.time.LocalTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -45,47 +41,52 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
|
|
||||||
private String date;
|
private String date;
|
||||||
|
|
||||||
/**
|
private String day;
|
||||||
* Initialize des Controllers.
|
|
||||||
* Setzt das Datum, holt die Gerichte ein und initialisiert die responsive grid.
|
private String month;
|
||||||
* @author Samuel Wolff
|
|
||||||
*/
|
private String year;
|
||||||
|
|
||||||
|
private ChangeListener listener;
|
||||||
|
|
||||||
public void initialize(){
|
public void initialize(){
|
||||||
|
|
||||||
date = LocalDate.now().toString();
|
/*
|
||||||
|
(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());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
dateLabel.setText(date);
|
DateFormat dateFormat = DateFormat.getDateInstance();
|
||||||
|
date = dateFormat.format(new Date());
|
||||||
|
date = date.replace('.', '-');
|
||||||
|
day = date.split("-")[0];
|
||||||
|
month = date.split("-")[1];
|
||||||
|
year = date.split("-")[2];
|
||||||
|
date = String.format("%s-%s-%s", year, month, day);
|
||||||
|
|
||||||
|
dateLabel.setText(String.format("%s.%s.%s", day, month, year));
|
||||||
|
|
||||||
initGrid();
|
initGrid();
|
||||||
initGerichte();
|
initGerichte();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode beim klicken auf den Anmeldebutton. Meldet den User ab
|
|
||||||
* @param actionEvent
|
|
||||||
* @author Max Heer
|
|
||||||
*/
|
|
||||||
public void onAbmelden(ActionEvent actionEvent) {
|
public void onAbmelden(ActionEvent actionEvent) {
|
||||||
VerwaltungApplication.sceneWechseln("login-view.fxml");
|
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) {
|
public void onFilter(ActionEvent actionEvent) {
|
||||||
Stage stage = new Stage();
|
Stage stage = new Stage();
|
||||||
VerwaltungApplication.sceneWechseln(stage, 450, 400, "inhaltsstoffe_filtern-view.fxml");
|
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) {
|
public void onHinzufuegen(ActionEvent actionEvent) {
|
||||||
Stage gerichterstellung = new Stage();
|
Stage gerichterstellung = new Stage();
|
||||||
|
|
||||||
@ -98,11 +99,6 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
gerichterstellung.minHeightProperty().set(600);
|
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) {
|
public void onZurueck(ActionEvent actionEvent) {
|
||||||
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
VerwaltungApplication.sceneWechseln("hauptmenue_mitarbeiter-view.fxml");
|
||||||
}
|
}
|
||||||
@ -110,16 +106,15 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
/**
|
/**
|
||||||
* Methode bei Klick auf Pfeil links, ändert das Datum und gibt neue Gerichte auf die GUI aus.
|
* Methode bei Klick auf Pfeil links, ändert das Datum und gibt neue Gerichte auf die GUI aus.
|
||||||
* @param actionEvent
|
* @param actionEvent
|
||||||
* @author Samuel Wolff
|
|
||||||
*/
|
*/
|
||||||
public void pfeilLinks(ActionEvent actionEvent) {
|
public void pfeilLinks(ActionEvent actionEvent) {
|
||||||
|
|
||||||
tagesplan.getChildren().clear();
|
tagesplan.getChildren().clear();
|
||||||
|
|
||||||
LocalDate datum = LocalDate.parse(date);
|
day = String.valueOf(Integer.parseInt(day)-1);
|
||||||
datum = datum.minusDays(1);
|
date = String.format("%s-%s-%s", year, month, day);
|
||||||
date = datum.toString();
|
|
||||||
dateLabel.setText(date);
|
dateLabel.setText(String.format("%s.%s.%s", day, month, year));
|
||||||
|
|
||||||
initGerichte();
|
initGerichte();
|
||||||
|
|
||||||
@ -128,16 +123,15 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
/**
|
/**
|
||||||
* Methode bei Klick auf Pfeil rechts, ändert das Datum und gibt neue Gerichte auf die GUI aus.
|
* Methode bei Klick auf Pfeil rechts, ändert das Datum und gibt neue Gerichte auf die GUI aus.
|
||||||
* @param actionEvent
|
* @param actionEvent
|
||||||
* @author Samuel Wolff
|
|
||||||
*/
|
*/
|
||||||
public void pfeilRechts(ActionEvent actionEvent) {
|
public void pfeilRechts(ActionEvent actionEvent) {
|
||||||
|
|
||||||
tagesplan.getChildren().clear();
|
tagesplan.getChildren().clear();
|
||||||
|
|
||||||
LocalDate datum = LocalDate.parse(date);
|
day = String.valueOf(Integer.parseInt(day)+1);
|
||||||
datum = datum.plusDays(1);
|
date = String.format("%s-%s-%s", year, month, day);
|
||||||
date = datum.toString();
|
|
||||||
dateLabel.setText(date);
|
dateLabel.setText(String.format("%s.%s.%s", day, month, year));
|
||||||
|
|
||||||
initGerichte();
|
initGerichte();
|
||||||
|
|
||||||
@ -145,12 +139,10 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialisiert alle Gerichte des aktuellen Datums auf der Seite.
|
* Initialisiert alle Gerichte des aktuellen Datums auf der Seite.
|
||||||
* @author Samuel Wolff
|
|
||||||
*/
|
*/
|
||||||
private void initGerichte(){
|
private void initGerichte(){
|
||||||
|
|
||||||
tagesplan.getStyleClass().clear();
|
tagesplan.getStyleClass().clear();
|
||||||
tagesplan.getChildren().clear();
|
|
||||||
|
|
||||||
t = new RestApiClient().getGerichteOnTag(date);
|
t = new RestApiClient().getGerichteOnTag(date);
|
||||||
|
|
||||||
@ -191,10 +183,6 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
tagesplan.getStyleClass().add("essensuebersicht_gridlines");
|
tagesplan.getStyleClass().add("essensuebersicht_gridlines");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialisiert das responsive grid.
|
|
||||||
* @author Max Heer, Sven Alteköster
|
|
||||||
*/
|
|
||||||
public void initGrid(){
|
public void initGrid(){
|
||||||
for (int i = 0; i < tagesplan.getColumnCount(); i++) {
|
for (int i = 0; i < tagesplan.getColumnCount(); i++) {
|
||||||
ColumnConstraints cc = new ColumnConstraints();
|
ColumnConstraints cc = new ColumnConstraints();
|
||||||
@ -215,24 +203,10 @@ public class EssensverwaltungMitarbeiterView {
|
|||||||
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
|
VerwaltungApplication.responsiveBreiteGrid(tagesplan);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Methode beim klicken auf den Löschen Button eines Tagesplan Elementes
|
|
||||||
* @param a
|
|
||||||
*/
|
|
||||||
private void loeschenButtonKlick(ActionEvent a){
|
private void loeschenButtonKlick(ActionEvent a){
|
||||||
Button btn = (Button) a.getSource();
|
Button btn = (Button) a.getSource();
|
||||||
int col = GridPane.getColumnIndex(btn);
|
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);
|
t.getGerichte().remove(col);
|
||||||
|
|
||||||
System.out.println("Die Id lautet: " + id + col);
|
|
||||||
|
|
||||||
cl.delete("GibtsAm", id);
|
|
||||||
initGerichte();
|
initGerichte();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,7 +9,6 @@ import javafx.scene.layout.GridPane;
|
|||||||
import javafx.scene.text.TextAlignment;
|
import javafx.scene.text.TextAlignment;
|
||||||
|
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.time.LocalDate;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
public class HauptmenueMitarbeiterView {
|
public class HauptmenueMitarbeiterView {
|
||||||
@ -35,8 +34,14 @@ public class HauptmenueMitarbeiterView {
|
|||||||
*/
|
*/
|
||||||
public void wochenuebersichtFuellen(){
|
public void wochenuebersichtFuellen(){
|
||||||
String dateanzeige;
|
String dateanzeige;
|
||||||
date = LocalDate.now().toString();
|
DateFormat dateFormat = DateFormat.getDateInstance();
|
||||||
dateanzeige = date;
|
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);
|
Tagesplan t = new RestApiClient().getGerichteOnTag(date);
|
||||||
for(int i=0;i<5;i++){
|
for(int i=0;i<5;i++){
|
||||||
Label tag = new Label();
|
Label tag = new Label();
|
||||||
@ -50,19 +55,13 @@ public class HauptmenueMitarbeiterView {
|
|||||||
name.setPrefHeight(75);
|
name.setPrefHeight(75);
|
||||||
name.setTextAlignment(TextAlignment.CENTER);
|
name.setTextAlignment(TextAlignment.CENTER);
|
||||||
}
|
}
|
||||||
LocalDate datum = LocalDate.parse(date);
|
day = String.valueOf(Integer.parseInt(day)+1);
|
||||||
datum = datum.plusDays(1);
|
date = String.format("%s-%s-%s", year, month, day);
|
||||||
date = datum.toString();
|
dateanzeige = String.format("%s.%s.%s",day,month,year);
|
||||||
dateanzeige = date;
|
|
||||||
t = new RestApiClient().getGerichteOnTag(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) {
|
public void onAbmelden(ActionEvent actionEvent) {
|
||||||
VerwaltungApplication.abmelden();
|
VerwaltungApplication.abmelden();
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,9 @@
|
|||||||
</center>
|
</center>
|
||||||
<bottom>
|
<bottom>
|
||||||
<BorderPane styleClass="button-untenrechts">
|
<BorderPane styleClass="button-untenrechts">
|
||||||
|
<right>
|
||||||
|
<Button text="Bestätigen" defaultButton="true" styleClass=".button"/>
|
||||||
|
</right>
|
||||||
</BorderPane>
|
</BorderPane>
|
||||||
</bottom>
|
</bottom>
|
||||||
</BorderPane>
|
</BorderPane>
|
||||||
|
Loading…
Reference in New Issue
Block a user