Changeset 1445 for trunk/grails-app

Timestamp:

Jan 27, 2011, 1:43:36 PM (10 years ago)

Author:

s.h.sikkema@…

Message:

Rudimentary assay export functionality

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/AssayController.groovy (modified) (2 diffs)
• services/dbnp/studycapturing/AssayService.groovy (added)
• views/assay/selectAssay.gsp (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/AssayController.groovy

@@ -141 +141 @@
         Assay assay = Assay.get(params.assayId)
 
+        // check if assay exists
         if (!assay) {
             flash.errorMessage = "No assay found with id: $params.assayId."
@@ -159 +160 @@
         } catch (Exception e) {
 
-            flash.errorMessage = e.toString()
+            flash.errorMessage = e.cause?.message ?: e.message
             redirect action: 'selectAssay'
 

trunk/grails-app/views/assay/selectAssay.gsp

@@ -14 +14 @@
       function updateAssay(jsonData, selectID) {
         var a = eval(jsonData);
-        var sel = $('#'+selectID).empty()
+        var sel = $('#'+selectID).empty();
         
         $(a).each(function(i, el){
-          sel.append($("<option></option>").attr("value",el.id).text(el.name));
-        });
+          sel.append($("<option></option>").attr("value",el.id).text(el.name))
+        })
       }
+
+      $(document).ready(function(){
+        // trigger change event to load assay based on currently selected study.
+        // After pressing 'Back', the browser may use last selected study.
+        $('#study').change()
+
+      })
     </script>
   </head>
@@ -27 +34 @@
   </div>
   <g:form name="assaySelect" action="exportAssayAsExcel">
-    <g:select optionKey="id" optionValue="title" name="studyId" from="${userStudies}"
-            onChange="${remoteFunction(controller:'study',action:'ajaxGetAssays',params:'\'id=\'+escape(this.value)',onComplete: 'updateAssay(XMLHttpRequest.responseText, \'assay\')')}"/>
-    <g:select optionKey="id" name="assayId" id="assay" from="${assays}"/>
+    <g:select optionKey="id" optionValue="title" name="studyId" from="${userStudies}" id="study"
+      onChange="${remoteFunction(controller:'study',action:'ajaxGetAssays',params:'\'id=\'+escape(this.value)',onComplete: 'updateAssay(XMLHttpRequest.responseText, \'assay\')')}"/>
+    <g:select optionKey="id" name="assayId" id="assay" from=""/>
+    %{--<g:select optionKey="id" name="assayId" id="assay" from="${assays}"/>--}%
     <g:submitButton name="submit" value="Submit"/>
   </g:form>