Pārlūkot izejas kodu

Storno Rot

testBranch
Johannes pirms 10 gadiem
vecāks
revīzija
09940f6ddf
4 mainītis faili ar 17 papildinājumiem un 5 dzēšanām
  1. +6
    -2
      src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java
  2. +3
    -1
      src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
  3. +2
    -2
      src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java
  4. +6
    -0
      src/main/resources/log.fxml

+ 6
- 2
src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java Parādīt failu

@@ -33,14 +33,12 @@ public class LogController {

public LogController(MainController mainController) {
this.mainController = mainController;

}

@FXML
private void initialize(){
initColumns();
refreshLogFromDb();

}

private void initColumns(){
@@ -95,5 +93,11 @@ public class LogController {
}


private void clickedRefresh(){
refreshLogFromDb();
}




}

+ 3
- 1
src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java Parādīt failu

@@ -236,7 +236,9 @@ public class MainController {
}
setText(item.toString());
if (item.getStorniert()) {
setGraphic(new Label("<storniert> "));
Text text = new Text("<storniert> ");
text.setFill(Color.RED);
setGraphic(text);
setTextFill(Color.GRAY); //TODO
} else {
setTextFill(Color.BLACK);


+ 2
- 2
src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java Parādīt failu

@@ -201,9 +201,9 @@ public class StationsHistorieController {

if(!LocalDateTime.now().isBefore(selectedItem.getAufnahmeDatum())){
Alert alert = new Alert(Alert.AlertType.WARNING);
alert.setTitle("Information Dialog");
alert.setTitle("Stationsaufenthalt kann nicht entfernt werden!");
alert.setHeaderText(null);
alert.setContentText("I have a great message for you!");
alert.setContentText("Der Aufenthalt muss in der Zukunft liegen, um gel\u00f6scht werden zu k\u00f6nnen!");
alert.initOwner(btnStatHistCancel.getScene().getWindow());
alert.initModality(Modality.APPLICATION_MODAL);
alert.showAndWait();


+ 6
- 0
src/main/resources/log.fxml Parādīt failu

@@ -8,6 +8,12 @@
<?import java.net.URL?>
<VBox minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.LogController">
<children>
<ToolBar prefHeight="40.0" prefWidth="200.0">
<items>
<Pane HBox.hgrow="ALWAYS" />
<Button fx:id="btnRefresh" text="Liste aktualisieren" onAction="#clickedRefresh"/>
</items>
</ToolBar>
<TableView fx:id="tblLog" VBox.vgrow="ALWAYS">
<columns>
<TableColumn fx:id="colLogIp" editable="false" prefWidth="75.0" text="Ursprungs-IP" />


Notiek ielāde…
Atcelt
Saglabāt