From 378977faa8b245fb221a25b3ceeb2bf350535ba7 Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Mon, 14 Sep 2015 20:53:15 +0000
Subject: [PATCH] adding start/end date to Gui
---
.../src/gov/anl/dm/esafsync/ExperimentList.java | 8 ++++++--
.../esafsync/serviceconn/StorageServiceConnection.java | 10 +++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
index fdfca2ca..ad4c9ce3 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/ExperimentList.java
@@ -295,7 +295,9 @@ class ExperimentList extends JFrame
for (int i = 0; i < selection.length; i++) {
String experimentName = EXPERIMENT_PREFIX+(String)table.getModel().getValueAt(selection[i], Column.NAME.ordinal());
String description = (String)table.getModel().getValueAt(selection[i], Column.DESCRIPTION.ordinal());
- if (sconnection.addExperiment(experimentName, description) != ServiceConnection.ServiceConnectionStatus.SUCCESS) {
+ String startDate = (String)table.getModel().getValueAt(selection[i], Column.START_DATE.ordinal());
+ String endDate = (String)table.getModel().getValueAt(selection[i], Column.END_DATE.ordinal());
+ if (sconnection.addExperiment(experimentName, description, startDate, endDate) != ServiceConnection.ServiceConnectionStatus.SUCCESS) {
continue;
}
addRole((String)table.getModel().getValueAt(selection[i], Column.MANAGER.ordinal()), experimentName, Role.MANAGER);
@@ -381,7 +383,9 @@ class ExperimentList extends JFrame
for (int i = 0; i < selection.length; i++) {
String experimentName = EXPERIMENT_PREFIX+(String)table.getModel().getValueAt(selection[i], Column.NAME.ordinal());
String description = (String)table.getModel().getValueAt(selection[i], Column.DESCRIPTION.ordinal());
- if (sconnection.addExperiment(experimentName, description) != ServiceConnection.ServiceConnectionStatus.SUCCESS) {
+ String startDate = (String)table.getModel().getValueAt(selection[i], Column.START_DATE.ordinal());
+ String endDate = (String)table.getModel().getValueAt(selection[i], Column.END_DATE.ordinal());
+ if (sconnection.addExperiment(experimentName, description, startDate, endDate) != ServiceConnection.ServiceConnectionStatus.SUCCESS) {
continue;
}
addRole((String)table.getModel().getValueAt(selection[i], Column.MANAGER.ordinal()), experimentName, Role.MANAGER);
diff --git a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/StorageServiceConnection.java b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/StorageServiceConnection.java
index 2e8bf06c..43a4961c 100644
--- a/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/StorageServiceConnection.java
+++ b/tools/ExperimentSynchronizer/src/gov/anl/dm/esafsync/serviceconn/StorageServiceConnection.java
@@ -11,6 +11,8 @@ public class StorageServiceConnection extends ServiceConnection{
static final String EXPERIMENT_NAME = "name";
static final String EXPERIMENT_DESCRIPTION = "description";
static final String EXPERIMENT_TYPE_ID = "experimentTypeId";
+ static final String EXPERIMENT_START_DATE = "startDate";
+ static final String EXPERIMENT_END_DATE = "endDate";
}
class StorageServUrl {
@@ -19,7 +21,7 @@ public class StorageServiceConnection extends ServiceConnection{
static final String START_EXPERIMENT = "/experiments/start";
}
- public int addExperiment(String name, String description) {
+ public int addExperiment(String name, String description, String startDate, String endDate) {
Map<String, String> data = new HashMap<>();
if (name == null) {
JOptionPane.showMessageDialog(null, "The experiment name is null", "Error",JOptionPane.ERROR_MESSAGE);
@@ -29,6 +31,12 @@ public class StorageServiceConnection extends ServiceConnection{
}
if (description != null) {
data.put(Keyword.EXPERIMENT_DESCRIPTION, encode(description));
+ }
+ if (startDate != null) {
+ data.put(Keyword.EXPERIMENT_START_DATE, encode(startDate));
+ }
+ if (endDate != null) {
+ data.put(Keyword.EXPERIMENT_END_DATE, encode(endDate));
}
data.put(Keyword.EXPERIMENT_TYPE_ID, ESAF_EXPERIMENT_TYPE);
return invokeSessionPostRequest(StorageServUrl.EXPERIMENT, data);
--
GitLab