From c1d8393043396fa6ee19cab1c51886d3ce8c3c4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Dervaux?= <stephane.dervaux@inrae.fr>
Date: Fri, 15 Mar 2024 10:50:10 +0100
Subject: [PATCH] add new field end date for Process (& rename date to start
Date)
---
.../view/dataView/ProcessOverviewController.java | 10 +++++++---
.../po2vocabmanager/view/dataView/ProcessOverview.fxml | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/fr/inra/po2vocabmanager/view/dataView/ProcessOverviewController.java b/src/main/java/fr/inra/po2vocabmanager/view/dataView/ProcessOverviewController.java
index 9e0858b7..374a6eb8 100644
--- a/src/main/java/fr/inra/po2vocabmanager/view/dataView/ProcessOverviewController.java
+++ b/src/main/java/fr/inra/po2vocabmanager/view/dataView/ProcessOverviewController.java
@@ -47,7 +47,9 @@ public class ProcessOverviewController {
@FXML
TextField processType;
@FXML
- TextField date;
+ TextField startDate;
+ @FXML
+ TextField endDate;
@FXML
TitledPane stepAvailable;
@FXML
@@ -73,7 +75,8 @@ public class ProcessOverviewController {
public void setMainApp(MainApp mainApp) {
this.mainApp = mainApp;
processTitle.editableProperty().bind(mainApp.getEditProperty());
- date.editableProperty().bind(mainApp.getEditProperty());
+ startDate.editableProperty().bind(mainApp.getEditProperty());
+ endDate.editableProperty().bind(mainApp.getEditProperty());
processType.editableProperty().bind(mainApp.getEditProperty());
description.editableProperty().bind(mainApp.getEditProperty());
@@ -124,7 +127,8 @@ public class ProcessOverviewController {
UITools.simpleBindValue(generalFile.getCTitle(), processTitle);
- UITools.simpleBindValue(generalFile.getCDate(), date);
+ UITools.simpleBindValue(generalFile.getCStartDate(), startDate);
+ UITools.simpleBindValue(generalFile.getCEndDate(), endDate);
// UITools.simpleBindValue(generalFile.getCSampleCode(), sampleCode);
// UITools.simpleBindValue(generalFile.getCSampleName(), sampleName);
UITools.simpleBindValue(generalFile.getCType(), processType);
diff --git a/src/main/resources/fr/inra/po2vocabmanager/view/dataView/ProcessOverview.fxml b/src/main/resources/fr/inra/po2vocabmanager/view/dataView/ProcessOverview.fxml
index 8b448ec7..8809e7e2 100644
--- a/src/main/resources/fr/inra/po2vocabmanager/view/dataView/ProcessOverview.fxml
+++ b/src/main/resources/fr/inra/po2vocabmanager/view/dataView/ProcessOverview.fxml
@@ -65,15 +65,19 @@
</VBox>
<VBox GridPane.rowIndex="1">
<children>
- <Label text="Date : (YYYY-MM-DD)">
+ <Label text="Start date : (YYYY-MM-DD)">
</Label>
- <TextField fx:id="date">
+ <TextField fx:id="startDate">
</TextField>
</children>
</VBox>
- <VBox GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <VBox GridPane.columnIndex="1" GridPane.rowIndex="1">
+ <children>
+ <Label text="End date : (YYYY-MM-DD)" />
+ <TextField fx:id="endDate" />
+ </children></VBox>
</children>
</GridPane>
</content>
--
GitLab