Changeset 1583

Timestamp:

Mar 2, 2011, 5:40:25 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

UI improvements to assay exporter (ticket #159)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/AssayController.groovy (modified) (4 diffs)
• services/dbnp/studycapturing/AssayService.groovy (modified) (4 diffs)
• taglib/dbnp/studycapturing/AssayExporterTagLib.groovy (added)
• views/assay/compileExportData.gsp (modified) (1 diff)
• views/assay/selectAssay.gsp (modified) (1 diff)
• views/assay/selectFields.gsp (modified) (1 diff)

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

@@ -150 +150 @@
             flash.errorMessage = e.message
             redirect action: 'selectAssay'
-                        return;
+                        return
 
         }
@@ -159 +159 @@
         flash.assayId = params.assayId
 
-        [fieldMap: fieldMap, measurementTokens: measurementTokens*.name]
+        [fieldMap: fieldMap, measurementTokens: measurementTokens.name]
     }
 
@@ -170 +170 @@
 
         def fieldMap = flash.fieldMap
-        def measurementTokens = flash.measurementTokens
 
         def fieldMapSelection = [:]
@@ -199 +198 @@
         if (params."cat_4" == 'on') {
 
-            measurementTokensSelection = params.measurementToken == 'null' ? measurementTokens : [ name: params.measurementToken]
+            def measurementToken = params.measurementToken
+
+            if (measurementToken) {
+
+                if (measurementToken instanceof String)
+                    measurementTokensSelection = [[name: measurementToken]]
+                else
+                    measurementTokensSelection = measurementToken.collect{[name: it]}
+
+            } else {
+                measurementTokensSelection = flash.measurementTokens
+            }
 
         }

trunk/grails-app/services/dbnp/studycapturing/AssayService.groovy

@@ -33 +33 @@
     def collectAssayTemplateFields(assay) throws Exception {
 
-        def getUsedTemplateFieldNames = { templateEntities ->
+        def getUsedTemplateFields = { templateEntities ->
 
             // gather all unique and non null template fields that haves values
@@ -40 +40 @@
                 field && templateEntities.any { it.fieldExists(field.name) && it.getFieldValue(field.name) }
 
-            }*.name
+            }.collect{[name: it.name, comment: it.comment]}
 
         }
@@ -53 +53 @@
         def samples = assay.samples
 
-        [   'Subject Data' :            getUsedTemplateFieldNames( samples*."parentSubject".unique() ),
-            'Sampling Event Data' :     getUsedTemplateFieldNames( samples*."parentEvent".unique() ),
-            'Sample Data' :             getUsedTemplateFieldNames( samples ),
-            'Event Group' :             ['name'],
+        [   'Subject Data' :            getUsedTemplateFields( samples*."parentSubject".unique() ),
+            'Sampling Event Data' :     getUsedTemplateFields( samples*."parentEvent".unique() ),
+            'Sample Data' :             getUsedTemplateFields( samples ),
+            'Event Group' :             [[name: 'name', comment: 'Name of Event Group']],
             'Module Measurement Data':  requestModuleMeasurementNames(assay)
         ]
@@ -172 +172 @@
         }
 
-        [   'Subject Data' :            getFieldValues(samples, fieldMap['Subject Data'], 'parentSubject'),
-            'Sampling Event Data' :     getFieldValues(samples, fieldMap['Sampling Event Data'], 'parentEvent'),
-            'Sample Data' :             getFieldValues(samples, fieldMap['Sample Data']),
+        [   'Subject Data' :            getFieldValues(samples, fieldMap['Subject Data']*.name, 'parentSubject'),
+            'Sampling Event Data' :     getFieldValues(samples, fieldMap['Sampling Event Data']*.name, 'parentEvent'),
+            'Sample Data' :             getFieldValues(samples, fieldMap['Sample Data']*.name),
             'Event Group' :             eventFieldMap,
-            'Module Measurement Data':  measurementTokens ? requestModuleMeasurements(assay, measurementTokens) : [:]
+            'Module Measurement Data':  measurementTokens*.name ? requestModuleMeasurements(assay, measurementTokens) : [:]
         ]
     }

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

@@ -13 +13 @@
   </head>
   <body>
+
+  <h1>Below you see a preview of the resulting Excel file, click OK to generate it</h1>
 
   <table>

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

@@ -33 +33 @@
     ${flash.errorMessage}
   </div>
-  %{--<g:form name="assaySelect" action="exportAssayAsExcel">--}%
+
+  <h1>Select the assay you want to export data from</h1>
+
   <g:form name="assaySelect" action="selectFields">
     <g:select optionKey="id" optionValue="title" name="studyId" from="${userStudies}" id="study"

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

@@ -11 +11 @@
   <meta name="layout" content="main" />
   <title>Select assay fields</title>
+  <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js', plugin: 'gdt')}"></script>
+  <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.qtip-1.0.0-rc3.min.js', plugin: 'gdt')}"></script>
+  <link rel="stylesheet" href="${resource(dir: 'css', file: 'templates.css')}"/>
 
   <style type="text/css">
-
-    .selectCategoryDiv{
-      float: left;
-      width: auto;
+    .category{
+      margin-left: 5px;
     }
 
-    .selectFieldDiv{
+    .field{
+      margin-left: 20px;
     }
 
-    .clear {clear: both;}
+    .element .helpIcon{
+      margin-top: 0;
+    }
+  </style>
 
-  </style>
+  <script type="text/javascript">
+    $(document).ready(function() {
+      attachHelpTooltips();
+    })
+  </script>
 </head>
   <body>
   <div>
+
+    <h1>Select the columns that you want to be included in the resulting Excel file</h1>
+
     <g:form name="fieldSelectForm" action="compileExportData">
-      <div class="selectCategoryDiv">
 
-        <g:set var="catNum" value="${0}"/>
+      <g:set var="catNum" value="${0}"/>
+      <g:each in="${fieldMap}" var="entry">
 
-        <g:each in="${fieldMap + ['Measurement tokens':'']}">
+          <assayExporter:categorySelector category="${entry.key}" ref="cat_${catNum}"/>
 
-          <assay:categorySelector category="${it.key}" ref="cat_${catNum}"/><br/>
+          <assayExporter:fieldSelectors ref="cat_${catNum}" fields="${entry.value}"/>
+
           <g:set var="catNum" value="${catNum + 1}"/>
 
-        </g:each>
+      </g:each>
 
-      </div>
-
-      <div class="selectFieldDiv">
-
-        <g:set var="catNum" value="${0}"/>
-
-        <g:each in="${fieldMap}">
-
-          <assay:fieldSelector ref="cat_${catNum}" fieldNames="${it.value}"/><br/>
-          <g:set var="catNum" value="${catNum + 1}"/>
-
-        </g:each>
-
-        <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" noSelection="${[null:'All tokens']}"/>
-
-      </div>
-
-      <div class="clear"></div>
-
+      <assayExporter:categorySelector category="Measurements" ref="cat_${catNum}"/>
+      <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" class="field" multiple="true"/>
+      <br /><br />
       <g:submitButton name="submit" value="Submit"/>
 
     </g:form>
+
   </div>
   </body>