Changeset 1445

Timestamp:

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

Author:

s.h.sikkema@…

Message:

Rudimentary assay export functionality

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/AssayController.groovy (modified) (2 diffs)
• grails-app/services/dbnp/studycapturing/AssayService.groovy (added)
• grails-app/views/assay/selectAssay.gsp (modified) (2 diffs)
• test/unit/dbnp/studycapturing/AssayControllerTests.groovy (modified) (4 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>

trunk/test/unit/dbnp/studycapturing/AssayControllerTests.groovy

@@ -18 +18 @@
     protected void setUp() {
         super.setUp()
+        mockDomain(Assay, [new Assay(id:1)])
     }
 
@@ -25 +26 @@
 
     void testWrongAssayID() {
-        mockParams.assayId = 1
+        mockParams.assayId = 3
 
         controller.exportAssayAsExcel()
@@ -34 +35 @@
 
     void testExceptionHandling() {
+        mockParams.assayId = 1
+
+        controller.metaClass.'grailsApplication' = [
+                config: [modules: [metabolomics: [url: 'www.ab.com']]]
+        ]
+
         controller.assayService = [
-                collectAssayData:{a, b -> throw new Exception('msg1')},
-                exportColumnWiseDataToExcelFile:{a, b -> throw new Exception('msg2')}
+
+                collectAssayData:                   {a, b -> def e = new Exception('msga'); e.metaClass.cause = new Exception('msg1'); throw e },
+                exportColumnWiseDataToExcelFile:    {a, b -> def e = new Exception('msgb'); e.metaClass.cause = new Exception('msg2'); throw e }
+
         ]
+
         controller.exportAssayAsExcel()
 
         assertEquals 'Redirected action should match', [action: 'selectAssay'], redirectArgs
-        assertEquals 'Error message', 'java.lang.Exception: msg1', mockFlash.errorMessage
+        assertEquals 'Error message', 'msg1', mockFlash.errorMessage
 
         controller.assayService.collectAssayData = {a, b -> true}
@@ -47 +57 @@
 
         assertEquals 'Redirected action should match', [action: 'selectAssay'], redirectArgs
-        assertEquals 'Error message', 'java.lang.Exception: msg2', mockFlash.errorMessage
+        assertEquals 'Error message', 'msg2', mockFlash.errorMessage
 
     }