Allow cancelled control strategies to be re-run; display status as Wa…

…iting when control strategy hasn't started running yet
USEPA · Jan 25, 2016 · 67ee451 · 67ee451
1 parent 5e20f87
commit 67ee451
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/...emissions/framework/client/cost/controlstrategy/editor/EditControlStrategySummaryTab.java b/...emissions/framework/client/cost/controlstrategy/editor/EditControlStrategySummaryTab.java
@@ -651,7 +651,7 @@ private Project project(String projectName) throws EmfException {
     public void setRunMessage(ControlStrategy controlStrategy) {
         messagePanel.clear();
         updateStartDate(controlStrategy);
-        updateSummaryPanelValuesExceptStartDate("Running", "", null, null);
+        updateSummaryPanelValuesExceptStartDate("Waiting", "", null, null);
     }
 
     public void refresh(ControlStrategy controlStrategy, ControlStrategyResult[] controlStrategyResults) {

diff --git a/...epa/emissions/framework/client/cost/controlstrategy/editor/EditControlStrategyWindow.java b/...epa/emissions/framework/client/cost/controlstrategy/editor/EditControlStrategyWindow.java
@@ -355,7 +355,6 @@ else if (selection == JOptionPane.NO_OPTION){
 //                    validatePath(outputTabView.getExportFolder());
                     controlStrategy.setDeleteResults(deleteResults);
                     controlStrategy.setExportDirectory(outputTabView.getExportFolder());
-                    controlStrategy.setRunStatus("Waiting");
                     //get all values from various tabs and persist to strategy object
                     save();
                     controlStrategy.setStartDate(new Date());

diff --git a/EMF/src/services/gov/epa/emissions/framework/services/cost/ControlStrategyServiceImpl.java b/EMF/src/services/gov/epa/emissions/framework/services/cost/ControlStrategyServiceImpl.java
@@ -310,11 +310,6 @@ public synchronized void removeResultDatasets(Integer[] ids, User user) throws E
     public synchronized void runStrategy(User user, int controlStrategyId) throws EmfException {
         Session session = sessionFactory.getSession();
         try {
-            // first see if the strategy has been canceled, is so don't run it...
-            String runStatus = dao.getControlStrategyRunStatus(controlStrategyId, session);
-            if (runStatus.equals("Cancelled"))
-                return;
-
             ControlStrategy strategy = getById(controlStrategyId);
             validateSectors(strategy);
             //get rid of for now, since we don't auto export anything