story/bugfixes #48
9 changed files with 26 additions and 9 deletions
Binary file not shown.
|
@ -109,7 +109,6 @@ public class LockedNurseController {
|
|||
readAllAndShowInTableView();
|
||||
|
||||
}
|
||||
|
||||
@FXML
|
||||
public void handleMouseClick() {
|
||||
Nurse nurse = tableView.getSelectionModel().getSelectedItem();
|
||||
|
@ -137,5 +136,4 @@ public class LockedNurseController {
|
|||
}
|
||||
readAllAndShowInTableView();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -322,6 +322,13 @@ public class AllTreatmentController {
|
|||
}catch (SQLException exception){
|
||||
exception.printStackTrace();
|
||||
}
|
||||
if (selectedItem.calculateDeleteDate().isBefore(LocalDate.now())){
|
||||
try {
|
||||
dao.delete(selectedItem.getId());
|
||||
} catch (SQLException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
readAllAndShowInTableView();
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,8 @@
|
|||
tabClosingPolicy="UNAVAILABLE"
|
||||
xmlns="http://javafx.com/javafx/17.0.2-ea"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
minWidth="1200"
|
||||
minHeight="700"
|
||||
fx:controller="de.hitec.nhplus.main.MainWindowController"
|
||||
>
|
||||
<Tab fx:id="patientTab" text="Patienten">
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
<TableColumn
|
||||
fx:id="columnId"
|
||||
minWidth="40.0"
|
||||
maxWidth="40.0"
|
||||
text="ID"
|
||||
/>
|
||||
<TableColumn
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
<TableColumn
|
||||
fx:id="columnId"
|
||||
minWidth="40.0"
|
||||
maxWidth="40.0"
|
||||
text="ID"
|
||||
/>
|
||||
<TableColumn
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
<TableColumn
|
||||
fx:id="columnId"
|
||||
minWidth="40.0"
|
||||
maxWidth="40.0"
|
||||
text="ID"
|
||||
/>
|
||||
<TableColumn
|
||||
|
|
|
@ -21,38 +21,45 @@
|
|||
<TableColumn
|
||||
fx:id="columnId"
|
||||
minWidth="40.0"
|
||||
maxWidth="40.0"
|
||||
text="ID"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnPatientName"
|
||||
minWidth="80.0"
|
||||
prefWidth="150"
|
||||
text="Patient"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnNurseName"
|
||||
minWidth="80.0"
|
||||
prefWidth="150"
|
||||
text="Pflegekraft"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnDate"
|
||||
maxWidth="-1.0"
|
||||
minWidth="140.0"
|
||||
prefWidth="150.0"
|
||||
minWidth="60.0"
|
||||
maxWidth="100"
|
||||
prefWidth="90.0"
|
||||
text="Datum"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnBegin"
|
||||
minWidth="140.0"
|
||||
minWidth="60.0"
|
||||
maxWidth="100"
|
||||
prefWidth="60"
|
||||
text="Beginn"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnEnd"
|
||||
minWidth="140.0"
|
||||
minWidth="60.0"
|
||||
maxWidth="100"
|
||||
prefWidth="60"
|
||||
text="Ende"
|
||||
/>
|
||||
<TableColumn
|
||||
fx:id="columnDescription"
|
||||
minWidth="200.0"
|
||||
minWidth="80.0"
|
||||
text="Kurzbeschreibung"
|
||||
/>
|
||||
</columns>
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<TableColumn
|
||||
fx:id="columnId"
|
||||
minWidth="40.0"
|
||||
prefWidth="102.0"
|
||||
maxWidth="40.0"
|
||||
text="ID"
|
||||
/>
|
||||
<TableColumn
|
||||
|
|
Loading…
Reference in a new issue