Changeset 1827 for trunk/grails-app

Timestamp:

May 9, 2011, 4:39:18 PM (10 years ago)

Author:

s.h.sikkema@…

Message:

added different assay export possibilities (tab delimited, csv (comma and semicolon);

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/AssayController.groovy (modified) (4 diffs)
• services/dbnp/studycapturing/AssayService.groovy (modified) (2 diffs)
• views/assay/assayExport/selectFields.gsp (modified) (1 diff)

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

@@ -171 +171 @@
                                 }
 
+                // collect the assay data according to user selecting
                                 def assayData           = assayService.collectAssayData(flow.assay, fieldMapSelection, measurementTokens)
                                 flow.rowData            = assayService.convertColumnToRowStructure(assayData)
 
+                // prepare the assay data preview
                                 def previewRows         = Math.min(flow.rowData.size()    as int, 5) - 1
                                 def previewCols         = Math.min(flow.rowData[0].size() as int, 5) - 1
@@ -179 +181 @@
                                 flow.assayDataPreview   = flow.rowData[0..previewRows].collect{ it[0..previewCols] as ArrayList }
 
+                // store the selected file type in the flow
+                flow.exportFileType = params.exportFileType
+
                         }.to "compileExportData"
 
@@ -185 +190 @@
 
                 compileExportData {
-                        on ("ok"){session.rowData = flow.rowData}.to "export"
+                        on ("ok"){
+                session.rowData = flow.rowData
+                session.exportFileType = flow.exportFileType
+            }.to "export"
                         on ("cancel").to "selectAssay"
                 }
@@ -204 +212 @@
         def doExport = {
 
-                def filename = 'export.csv'
+        // make sure we're coming from the export flow, otherwise redirect there
+        if (!(session.rowData && session.exportFileType))
+            redirect(action: 'assayExportFlow')
+
+        // process requested output file type
+        def outputDelimiter, outputFileExtension
+
+        switch(session.exportFileType) {
+            case 2: // Comma delimited csv
+                outputDelimiter = ','
+                outputFileExtension = '.csv'
+                break
+            case 3: // Semicolon delimited csv
+                outputDelimiter = ';'
+                outputFileExtension = '.csv'
+                break
+            default: // Tab delimited with .txt extension
+                outputDelimiter = '\t'
+                outputFileExtension = '.txt'
+        }
+
+                def filename = "export.$outputFileExtension"
                 response.setHeader("Content-disposition", "attachment;filename=\"${filename}\"")
                 response.setContentType("application/octet-stream")
                 try {
 
-                        //                      assayService.exportRowWiseDataToExcelFile(session.rowData, response.outputStream)
-                        assayService.exportRowWiseDataToCSVFile(session.rowData, response.outputStream)
+                        // assayService.exportRowWiseDataToExcelFile(session.rowData, response.outputStream)
+                        assayService.exportRowWiseDataToCSVFile(session.rowData, response.outputStream, outputDelimiter)
 
                         // clear the data from the session
                         session.removeAttribute('rowData')
+                        session.removeAttribute('exportFileType')
 
                 } catch (Exception e) {

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

@@ -520 +520 @@
          * @return
          */
-        def exportRowWiseDataToCSVFile(rowData, outputStream) {
+        def exportRowWiseDataToCSVFile(rowData, outputStream, outputDelimiter = '\t') {
 
         outputStream << rowData.collect { row ->
@@ -544 +544 @@
               addQuotes ? "\"$s\"" : s
 
-          }.join(',')
+          }.join(outputDelimiter)
         }.join('\n')
 

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

@@ -58 +58 @@
       <g:select name="measurementToken" id="measurementToken" from="${measurementTokens}" value="${measurementTokens}" class="field" multiple="true" />
       <br /><br />
+
+      <h1>Select type of resulting file</h1>
+      <g:radioGroup name="exportFileType" labels="['Tab delimited (.txt)', 'Comma Separated: USA/UK (.csv)', 'Semicolon Separated: European (.csv)']" values="[1,2,3]" value="1" >
+        <p>${it.radio} ${it.label}</p>
+      </g:radioGroup>
       <g:submitButton name="submit" value="Submit"/>