uuuhhhhhh
This commit is contained in:
		@@ -3,6 +3,8 @@ package Logik;
 | 
				
			|||||||
import java.util.ArrayList;
 | 
					import java.util.ArrayList;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
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;
 | 
				
			||||||
@@ -15,6 +17,22 @@ public class Mahlzeit {
 | 
				
			|||||||
		zutaten = new ArrayList<>();
 | 
							zutaten = new ArrayList<>();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						public Mahlzeit (int id, String name, float preis, String beschreibung) {
 | 
				
			||||||
 | 
							this.id = id;
 | 
				
			||||||
 | 
							this.name = name;
 | 
				
			||||||
 | 
							this.preis = preis;
 | 
				
			||||||
 | 
							this.beschreibung = beschreibung;
 | 
				
			||||||
 | 
							zutaten = new ArrayList<>();
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						public int getId() {
 | 
				
			||||||
 | 
							return id;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						public void setId(int id) {
 | 
				
			||||||
 | 
							this.id = id;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	public String getName() {
 | 
						public String getName() {
 | 
				
			||||||
		return name;
 | 
							return name;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
@@ -36,4 +54,6 @@ 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);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -371,4 +371,59 @@ 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,6 +3,9 @@ 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;
 | 
				
			||||||
@@ -23,6 +26,7 @@ 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;
 | 
				
			||||||
@@ -63,14 +67,14 @@ public class EssensverwaltungMitarbeiterView {
 | 
				
			|||||||
		*/
 | 
							*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		DateFormat dateFormat = DateFormat.getDateInstance();
 | 
							DateFormat dateFormat = DateFormat.getDateInstance();
 | 
				
			||||||
		date = dateFormat.format(new Date());
 | 
							date = LocalDate.now().toString();
 | 
				
			||||||
		date = date.replace('.', '-');
 | 
							//date = date.replace('.', '-');
 | 
				
			||||||
		day = date.split("-")[0];
 | 
							//day = date.split("-")[0];
 | 
				
			||||||
		month = date.split("-")[1];
 | 
							//month = date.split("-")[1];
 | 
				
			||||||
		year = date.split("-")[2];
 | 
							//year = date.split("-")[2];
 | 
				
			||||||
		date = String.format("%s-%s-%s", year, month, day);
 | 
							//date = String.format("%s-%s-%s", year, month, day);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dateLabel.setText(String.format("%s.%s.%s", day, month, year));
 | 
							dateLabel.setText(date);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		initGrid();
 | 
							initGrid();
 | 
				
			||||||
		initGerichte();
 | 
							initGerichte();
 | 
				
			||||||
@@ -111,10 +115,15 @@ public class EssensverwaltungMitarbeiterView {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		tagesplan.getChildren().clear();
 | 
							tagesplan.getChildren().clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		day = String.valueOf(Integer.parseInt(day)-1);
 | 
							LocalDate datum = LocalDate.parse(date);
 | 
				
			||||||
		date = String.format("%s-%s-%s", year, month, day);
 | 
							datum = datum.minusDays(1);
 | 
				
			||||||
 | 
							date = datum.toString();
 | 
				
			||||||
 | 
							dateLabel.setText(date);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dateLabel.setText(String.format("%s.%s.%s", day, month, year));
 | 
							//day = String.valueOf(Integer.parseInt(day)-1);
 | 
				
			||||||
 | 
							//date = String.format("%s-%s-%s", year, month, day);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//dateLabel.setText(String.format("%s.%s.%s", day, month, year));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		initGerichte();
 | 
							initGerichte();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -128,10 +137,15 @@ public class EssensverwaltungMitarbeiterView {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		tagesplan.getChildren().clear();
 | 
							tagesplan.getChildren().clear();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		day = String.valueOf(Integer.parseInt(day)+1);
 | 
							LocalDate datum = LocalDate.parse(date);
 | 
				
			||||||
		date = String.format("%s-%s-%s", year, month, day);
 | 
							datum = datum.plusDays(1);
 | 
				
			||||||
 | 
							date = datum.toString();
 | 
				
			||||||
 | 
							dateLabel.setText(date);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		dateLabel.setText(String.format("%s.%s.%s", day, month, year));
 | 
							//day = String.valueOf(Integer.parseInt(day)+1);
 | 
				
			||||||
 | 
							//date = String.format("%s-%s-%s", year, month, day);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							//dateLabel.setText(String.format("%s.%s.%s", day, month, year));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		initGerichte();
 | 
							initGerichte();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -143,6 +157,7 @@ public class EssensverwaltungMitarbeiterView {
 | 
				
			|||||||
	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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -206,7 +221,19 @@ public class EssensverwaltungMitarbeiterView {
 | 
				
			|||||||
	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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							String json = String.format("{\"name\" : \"%s\", \"datum\" : \"%s\"}", m.getName(), date);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							cl.delete("GibtsAm", id);
 | 
				
			||||||
		initGerichte();
 | 
							initGerichte();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,9 +52,6 @@
 | 
				
			|||||||
    </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>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user