Changeset 1799

Timestamp:

May 2, 2011, 12:38:14 PM (12 years ago)

Author:

robert@…

Message:

Adjusted assay exporting to use CSV export method

Location:

trunk/grails-app/controllers/dbnp

Files:

• query/AdvancedQueryController.groovy (modified) (2 diffs)
• studycapturing/AssayController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/query/AdvancedQueryController.groovy

@@ -553 +553 @@
                                                 module: "gscf",
                                                 name:"excel",
-                                                description: "Export as Excel",
+                                                description: "Export as CSV",
                                                 url: createLink( controller: "study", action: "exportToExcel", params: [ 'format': 'list', 'ids' : ids ] ),
                                                 submitUrl: createLink( controller: "study", action: "exportToExcel", params: [ 'format': 'list' ] ),
@@ -569 +569 @@
                                                 module: "gscf",
                                                 name:"excel",
-                                                description: "Export as Excel",
+                                                description: "Export as CSV",
                                                 url: createLink( controller: "assay", action: "exportToExcel", params: [ 'format': 'list', 'ids' : ids ] ),
                                                 submitUrl: createLink( controller: "assay", action: "exportToExcel", params: [ 'format': 'list' ] ),

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

@@ -292 +292 @@
                         return;
 
-                // If only 1 assay is asked for, don't bother with merging multiple assays.
-                // In that case just use the export method to export one assay per sheet
-                if( assays.size() == 1 )
-                        return exportToExcelAsSheets( params );
-
                 // Send headers to the browser so the user can download the file
-                def filename = 'export.xlsx'
+                def filename = 'export.csv'
                 response.setHeader("Content-disposition", "attachment;filename=\"${filename}\"")
                 response.setContentType("application/octet-stream")
@@ -326 +321 @@
 
                         def rowData   = assayService.convertColumnToRowStructure(mergedColumnWiseData)
-                        assayService.exportRowWiseDataToExcelFile( rowData, response.getOutputStream() )
+                        assayService.exportRowWiseDataToCSVFile( rowData, response.getOutputStream() )
 
                         response.outputStream.flush()