Merge pull request 'Tagespläne fix?' (#18) from samu_masken into master
Reviewed-on: #18
This commit is contained in:
commit
e817a7caa1
@ -4,7 +4,6 @@ import Logik.Tagesplan;
|
||||
import RestAPISchnittstelle.RestApiClient;
|
||||
import javafx.event.ActionEvent;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.text.TextAlignment;
|
||||
@ -13,6 +12,7 @@ import java.text.DateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
public class HauptmenueMitarbeiterView {
|
||||
|
||||
@FXML
|
||||
private GridPane wochenplan;
|
||||
private String date;
|
||||
@ -25,7 +25,7 @@ public class HauptmenueMitarbeiterView {
|
||||
* @author Max Heer
|
||||
*/
|
||||
public void initialize(){
|
||||
wochenuebersichtFuellen();
|
||||
wochenuebersichtFuellen();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -61,8 +61,9 @@ public class HauptmenueMitarbeiterView {
|
||||
t = new RestApiClient().getGerichteOnTag(date);
|
||||
}
|
||||
}
|
||||
|
||||
public void onAbmelden(ActionEvent actionEvent) {
|
||||
//VerwaltungApplication.abmelden();
|
||||
VerwaltungApplication.abmelden();
|
||||
}
|
||||
|
||||
public void onAccountAnlegenClick(ActionEvent actionEvent) {
|
||||
|
@ -27,12 +27,11 @@
|
||||
<Button text="Alle Bestellungen anzeigen" onAction="#onBestellungenAnzeigen"/>
|
||||
<Button text="Rechnungen herunterladen"/>
|
||||
<Button text="Daten importieren/Exportieren"/>
|
||||
<Button text="Accounts verwalten" onAction="#onAccountAnlegenClick"/>
|
||||
<Button text="Account anlegen" onAction="#onAccountAnlegenClick"/>
|
||||
</VBox>
|
||||
</left>
|
||||
<right>
|
||||
<GridPane fx:id="wochenplan" styleClass="hauptmenue_wochenuebersicht">
|
||||
|
||||
</GridPane>
|
||||
</right>
|
||||
</BorderPane>
|
||||
|
Loading…
Reference in New Issue
Block a user