Changeset 1864 for trunk/grails-app/views/assay/assayExport/selectFields.gsp

Timestamp:

May 23, 2011, 4:36:00 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

in exporter: module error display improvements (ie. display on screen but still able to export); removed changes to simplewizard; removed unnecessary imports; should handle 'null' parent subject from samples correctly; should handle non number values from modules correctly; deselects module measurements in case of module error/no measurements; removed obsolete entry in topnav

File:

• trunk/grails-app/views/assay/assayExport/selectFields.gsp (modified) (3 diffs)

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

@@ -40 +40 @@
     <h1>Select the columns that you want to be included in the resulting file</h1>
 
+    <g:if test="${errorMessage}">
+    <div class="errormessage">${errorMessage}</div>
+    </g:if>
+
     In this step you can make a selection from the available fields stored in the database related to the samples, including measurement data from a module (if available).
 
@@ -47 +51 @@
       <g:each in="${fieldMap}" var="entry">
 
-          <assayExporter:categorySelector category="${entry.key}" ref="cat_${catNum}"/>
+          <assayExporter:categorySelector category="${entry.key}" name="cat_${catNum}" value="${true}" />
 
           <assayExporter:fieldSelectors ref="cat_${catNum}" fields="${entry.value}"/>
@@ -55 +59 @@
       </g:each>
 
-      <assayExporter:categorySelector category="Measurements" ref="cat_${catNum}"/>
+      <assayExporter:categorySelector category="Measurements" name="cat_${catNum}" value="${measurementTokens as Boolean}" />
       <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}" class="field" multiple="true" />
       <br /><br />