Ignore:
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

Location:
trunk/grails-app/views/assay/assayExport
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/assay/assayExport/compileExportData.gsp

    r1841 r1864  
    1414  <body>
    1515
    16   <h1>Below you see a preview of the resulting file, click OK to generate it</h1>
     16  <h1>Below you see a preview of the resulting file, click OK to download</h1>
     17
     18  <g:if test="${errorMessage}">
     19  <div class="errormessage">${errorMessage}</div>
     20  </g:if>
    1721
    1822  <table>
  • trunk/grails-app/views/assay/assayExport/selectFields.gsp

    r1841 r1864  
    4040    <h1>Select the columns that you want to be included in the resulting file</h1>
    4141
     42    <g:if test="${errorMessage}">
     43    <div class="errormessage">${errorMessage}</div>
     44    </g:if>
     45
    4246    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).
    4347
     
    4751      <g:each in="${fieldMap}" var="entry">
    4852
    49           <assayExporter:categorySelector category="${entry.key}" ref="cat_${catNum}"/>
     53          <assayExporter:categorySelector category="${entry.key}" name="cat_${catNum}" value="${true}" />
    5054
    5155          <assayExporter:fieldSelectors ref="cat_${catNum}" fields="${entry.value}"/>
     
    5559      </g:each>
    5660
    57       <assayExporter:categorySelector category="Measurements" ref="cat_${catNum}"/>
     61      <assayExporter:categorySelector category="Measurements" name="cat_${catNum}" value="${measurementTokens as Boolean}" />
    5862      <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}" class="field" multiple="true" />
    5963      <br /><br />
Note: See TracChangeset for help on using the changeset viewer.