Changeset 1140 for trunk

Timestamp:

Nov 15, 2010, 8:25:49 PM (11 years ago)

Author:

t.w.abma@…

Message:

• added ability to add new ontologies in the "missing properties" step

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)
• views/importer/common/_missingproperties.gsp (modified) (3 diffs)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -144 +144 @@
 
     /**
-     * Method to save the missing properties
+     * Method to save the missing properties.
+     *
      * @param entity entity class we are using (dbnp.studycapturing.Subject etc.)
      */
 
     def saveMissingProperties = {
-
+        
         session.importer_importeddata.each { table ->
             table.each { entity ->
@@ -158 +159 @@
         }
 
-        render(view:"step3", model:[datamatrix:session.importer_importeddata])  
+        // a new ontology term was added, so stay at the current step otherwise go to the next step
+        if (params.updatefield) render(view:"step3_simple", model:[datamatrix:session.importer_importeddata])
+            else render(view:"step3", model:[datamatrix:session.importer_importeddata])
     }
 
@@ -340 +343 @@
         render templates as JSON
     }
+
+    def refresh = {
+       // params
+    }
 }

trunk/grails-app/views/importer/common/_missingproperties.gsp

@@ -20 +20 @@
 <script type="text/javascript" src="${resource(dir: 'js', file: 'importer.js')}"></script>
 
-
 <g:if env="production">
 <script type="text/javascript" src="${resource(dir: 'js', file: 'SelectAddMore.min.js')}"></script>
@@ -39 +38 @@
         onClose : function(scope) {
             //refreshWebFlow();?
+             //location.reload();
+             updatefield = '<input type = "hidden" name="updatefield" value="true" / >';
+             $('#missingpropertiesform').append(updatefield);
+
+             $('#missingpropertiesform').submit();
 
         }
@@ -48 +52 @@
 
 <div class="wizard" id="wizard">
-<g:form name="missingpropertiesform" action="saveMissingProperties">
+<g:form name="missingpropertiesform" id="missingpropertiesform" action="saveMissingProperties">
     <div class="table">
         <g:set var="showHeader" value="${true}"/>