Changeset 1617

Timestamp:

10-03-11 13:06:54 (3 years ago)

Author:

robert@…

Message:

Bugfix in advanced query

Location:

trunk/grails-app

Files:

• controllers/dbnp/exporter/ExporterController.groovy (modified) (4 diffs)
• controllers/dbnp/query/AdvancedQueryController.groovy (modified) (1 diff)
• views/exporter/index.gsp (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/exporter/ExporterController.groovy

@@ -50 +50 @@
 
     def export = {
-
+                def ids = params.list( 'ids' );
         def studies = []
-        for ( j in dbnp.studycapturing.Study.list() ){
-            if (params.containsKey(j.code)){
-                studies.add(j)
-            }
-        }
+                
+                ids.each {
+                        if( it.toString().isLong() ) {
+                                def study = Study.get( Long.valueOf( it ) );
+                                if( study )
+                                        studies << study
+                        }
+                }
         
         if(studies.size()>1){
@@ -63 +66 @@
             for (studyInstance in studies){
                 downloadFile(studyInstance,false)
-                files.add(new File("web-app/fileuploads/"+studyInstance.code+"_SimpleTox.xls"))
+                files.add(new File("web-app/fileuploads/"+studyInstance.id+"_SimpleTox.xls"))
             }
 
@@ -166 +169 @@
         if(dl) {
             println "Creation for downloading the file "+studyInstance.title+"_SimpleTox.xls"
-            response.setHeader("Content-disposition", "attachment;filename=\"${studyInstance.code}_SimpleTox.xls\"")
+            response.setHeader("Content-disposition", "attachment;filename=\"${studyInstance.title}_SimpleTox.xls\"")
             response.setContentType("application/octet-stream")
             wb.write(response.outputStream)
@@ -174 +177 @@
         // Create the file and save into ZIP
         if(!dl){
-            FileOutputStream fileOut = new FileOutputStream("web-app/fileuploads/"+studyInstance.code+"_SimpleTox.xls", true)
+            FileOutputStream fileOut = new FileOutputStream("web-app/fileuploads/"+studyInstance.id+"_SimpleTox.xls", true)
             wb.write(fileOut)
             fileOut.close()

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

@@ -579 +579 @@
                 switch(s.entity) {
                         case "Study":
-                                def exportParams = [:]
+                                def ids = []
                                 s.filterResults(selectedIds).each {
-                                        exportParams[ it.code ] = it.id;
+                                        ids << it.id
                                 }
+                                
                                 return [[
                                                 module: "gscf",
                                                 name:"simpletox",
                                                 description: "Export as SimpleTox",
-                                                url: createLink( controller: "exporter", action: "export", params: exportParams )
+                                                url: createLink( controller: "exporter", action: "export", params: [ 'ids' : ids ] )
                                         ]]
                         case "Sample":

trunk/grails-app/views/exporter/index.gsp

@@ -7 +7 @@
     <g:set var="entityName" value="${message(code: 'study.label', default: 'Study')}" />
     <title>SimpleTox Exporter</title>
-
-    
-
 
 </head>
@@ -41 +38 @@
               <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
 
-                  <td><input type="checkbox" name="${studyInstance.code}" id="checked_studies"></td>
+                  <td><input type="checkbox" name="ids" value="${studyInstance.id}" id="${studyInstance.title}"</td>
 
                   <td><g:link controller="study" action="show" id="${studyInstance.id}">${fieldValue(bean: studyInstance, field: "code")}</g:link></td>