Changeset 1841

Show
Ignore:
Timestamp:
12-05-11 15:46:03 (4 years ago)
Author:
s.h.sikkema@…
Message:

removed obsolete UI references to Excel. Fixed study data numbers not being able to print as european numbers.

Location:
trunk/grails-app
Files:
5 modified

Legend:

Unmodified
Added
Removed

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

    r1830 r1841  
    2121import java.text.DecimalFormat 
    2222import java.text.NumberFormat 
     23import org.dbnp.gdt.Template 
     24import org.dbnp.gdt.TemplateField 
    2325 
    2426class AssayService { 
    … …  
    9092 
    9193                        val = it.getFieldValue(headerField.name) 
    92                          
     94 
    9395                        // Convert RelTime fields to human readable strings 
    9496                        field = it.getField(headerField.name) 
    … …  
    98100                    } catch (NoSuchFieldException e) { /* pass */ } 
    99101 
    100                     val.toString()}] 
     102                    (val instanceof Number) ? val : val.toString()}] 
    101103                        } 
    102104                } 
    … …  
    625627                } 
    626628        } 
    627  
    628629} 

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

    r1790 r1841  
    1414  <body> 
    1515 
    16   <h1>Below you see a preview of the resulting Excel file, click OK to generate it</h1> 
     16  <h1>Below you see a preview of the resulting file, click OK to generate it</h1> 
    1717 
    1818  <table> 

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

    r1790 r1841  
    3838  <h1>Select the assay you want to export data from</h1> 
    3939 
    40   With this exporter you can export (meta) data about samples from an assay to an Excel file. 
     40  With this exporter you can export (meta) data about samples from an assay to a file. 
    4141  First, select a study from the first list and then select an assay from that study from the second list.<br /> 
    4242 

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

    r1827 r1841  
    3838  <div> 
    3939 
    40     <h1>Select the columns that you want to be included in the resulting Excel file</h1> 
     40    <h1>Select the columns that you want to be included in the resulting file</h1> 
    4141 
    4242    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). 

  • trunk/grails-app/views/common/_topnav.gsp

    r1838 r1841  
    2323      <a href="#">Export</a> 
    2424      <ul class="subnav"> 
    25         <li><g:link controller="assay" action="assayExport">Export Assay Data to Excel</g:link> </li> 
     25        <li><g:link controller="assay" action="assayExport">Export Assay Data to File</g:link> </li> 
    2626            <li><g:link controller="exporter" action="index">Export studies as SimpleTox Excel file</g:link></li> 
    2727      </ul>