updated equipment list heading 'update' to 'parse', made parser confi…

…g saving characteristics more robust with respect to entering and exiting parseOnlyMode
surnorte · May 7, 2015 · e4bcabe · e4bcabe
1 parent 6cc11e3
commit e4bcabe
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 15 deletions.
diff --git a/grails-app/assets/javascripts/parser/ParserUI.js b/grails-app/assets/javascripts/parser/ParserUI.js
@@ -307,6 +307,7 @@ function ParserUI(parsingController){
     this.handleFirstPlateCellRangeChange = function(){
         var selectedCellRange = _self.getFirstPlateCellRange();
 
+
         try {
             _self.parsingController.selectCells(selectedCellRange);
         } catch (error){
@@ -1034,13 +1035,25 @@ function ParserUI(parsingController){
     };
 
     this.handleSaveAsConfig = function(){
-        try {
-            _self.parsingController.saveAsParsingConfigToServer();
-        } catch (error){
-            _self.displayError(error);
+        if (_self.parseOnlyModeOn){
+            _self.switchOutOfParseOnlyMode();
+        } else {
+            try {
+                _self.parsingController.saveAsParsingConfigToServer();
+            } catch (error){
+                _self.displayError(error);
+            }
         }
     };
 
+    this.switchSaveAsButtonToModifyAsNewParsingConfig = function(){
+        saveAsConfigButton.innerHTML = "Modify as new Parsing Configuration";
+    };
+
+    this.switchSaveAsButtonBackToSaveAs = function(){
+        saveAsConfigButton.innerHTML = "Save As";
+    };
+
 
 
     this.switchToParseOnlyMode = function(){
@@ -1056,6 +1069,7 @@ function ParserUI(parsingController){
         addFeatureButton.style.display = "none";
         deleteFeatureButton.style.display = "none";
 
+        _self.switchSaveAsButtonToModifyAsNewParsingConfig();
         _self.parseOnlyModeOn = true;
     };
 
@@ -1067,11 +1081,12 @@ function ParserUI(parsingController){
         firstPlateCellRangeElement = switchSpanToTextInput(firstPlateCellRangeElement);
         featureCellRangeElement = switchSpanToTextInput(featureCellRangeElement);
         featureCategoryElement = switchSpanToTextInput(featureCategoryElement);
-        applyFirstPlateButton.style.display = "block";
-        newFeatureButton.style.display = "block";
-        addFeatureButton.style.display = "block";
-        deleteFeatureButton.style.display = "block";
+        applyFirstPlateButton.style.display = "inline";
+        newFeatureButton.style.display = "inline";
+        addFeatureButton.style.display = "inline";
+        deleteFeatureButton.style.display = "inline";
 
+        _self.switchSaveAsButtonBackToSaveAs();
         _self.parseOnlyModeOn = false;
     };
 
@@ -1080,6 +1095,7 @@ function ParserUI(parsingController){
     function switchTextInputToSpan(element){
         var span = document.createElement("span");
         span.innerHTML = element.value;
+        span.id = element.id;
         $(element).replaceWith(span);
         return span;
     }

diff --git a/grails-app/assets/javascripts/parser/ParsingController.js b/grails-app/assets/javascripts/parser/ParsingController.js
@@ -105,12 +105,7 @@ function ParsingController(){
 
             _self.createOrUpdateParsingConfig();
         } else if (oldStage === ParsingController.PLATE){
-            if (!_self.parsingConfig.plate){
-                throw new ParsingControllerError(ParsingControllerError.PLATE_NOT_DEFINED,
-                    "leave plate stage",
-                    "general",
-                    "change stages");
-            }
+
         } else if (oldStage === ParsingController.FEATURES){
 
         } else if (oldStage === ParsingController.EXPERIMENT) {
@@ -140,6 +135,13 @@ function ParsingController(){
 
             _self.selectCells = selectCellsPlates;
         } else if (newStage === ParsingController.FEATURES){
+            if (!_self.parsingConfig.plate){
+                throw new ParsingControllerError(ParsingControllerError.PLATE_NOT_DEFINED,
+                    "leave plate stage",
+                    "general",
+                    "change stages");
+            }
+
             // fill the listing of features in the UI and clear fields like for new
             // feature
             if (_self.parsingConfig){
@@ -158,6 +160,13 @@ function ParsingController(){
             _self.parserUI.loadFeatureList(_self.parsingConfig.getFeatureNames());
             _self.selectCells = selectCellsFeatures;
         } else if (newStage === ParsingController.EXPERIMENT) {
+            if (!_self.parsingConfig.plate){
+                throw new ParsingControllerError(ParsingControllerError.PLATE_NOT_DEFINED,
+                    "leave plate stage",
+                    "general",
+                    "change stages");
+            }
+
             if (!_self.parserUI.getParsingID()){
                 throw new ParsingControllerError(
                                 ParsingControllerError.PARSING_CONFIG_NOT_SAVED_TO_SERVER,
@@ -437,6 +446,7 @@ function ParsingController(){
                 _self.parserUI.displayMessage("Your assay machine output file data was "+
                 "successfully stored on server.");
                 _self.parserUI.disableSaveButton();
+                _self.parserUI.switchToParseOnlyMode();
             }
         });
 
@@ -558,6 +568,8 @@ function ParsingController(){
         serverCommunicator.saveParsingConfigToServer(_self.parsingConfig,
                                                      ServerCommunicator.SAVE_NEW,
                                                      null);
+        _self.parserUI.enableSaveButton();
+        window.canUpdate = true;
     };
 
     _self.saveConfigToServerCallback = function(response){

diff --git a/grails-app/views/equipment/index.gsp b/grails-app/views/equipment/index.gsp
@@ -50,7 +50,7 @@
 
 												<g:sortableColumn property="dateCreated" title="${message(code: 'equipment.date.label', default: 'Date')}" />
 
-												<th>Update</th>
+												<th>Parse</th>
 												<th>Delete</th>
 
 											</tr>