Fix #334 download script for selected samples

dshao · dshao · commit a9ef33c7228d · 2024-11-18T13:34:59.000-05:00
diff --git a/pegr/grails-app/controllers/pegr/ReportController.groovy b/pegr/grails-app/controllers/pegr/ReportController.groovy
@@ -263,8 +263,16 @@ class ReportController {
         [samples: samples, reportId: id]
     }
     
-    def downloadScript(Long reportId) {
-        def samples = reportService.fetchDataForReport(reportId)
+    def downloadScript() {
+        def reportId = params.get("reportId")
+        
+        def samples
+        if (reportId) {
+            samples = reportService.fetchDataForReport(reportId.toLong())
+        } else {
+            def sampleIds = session.checkedSample
+            samples = reportService.fetchDataForSamples(sampleIds)
+        }
         
         def filetypes = params.list('filetypes') 
         
diff --git a/pegr/grails-app/controllers/pegr/SampleController.groovy b/pegr/grails-app/controllers/pegr/SampleController.groovy
@@ -356,6 +356,10 @@ class SampleController {
         
         def modules = data.collect { it.sampleModules }.flatten().unique()
         
+        if (modules.size() == 0) {
+            modules = ["moduleSampleMetadata"]
+        }
+        
         render(template: '/report/details', model: [ sampleDTOs: data, modules: modules])
     }
 
diff --git a/pegr/grails-app/views/report/print.gsp b/pegr/grails-app/views/report/print.gsp
@@ -27,7 +27,9 @@
 </head>
 <body>
 <main class="container">
+    <g:if test="${!samplesOnly}">
     <h2>${report.name}</h2>
+    </g:if>
     <g:each in="${modules}" var="module">
         <g:render template="/report/${module}" model="['sampleList':sampleList]" />
     </g:each>    

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,10 @@ class SampleController {`
`356`	`356`
`357`	`357`	`def modules = data.collect { it.sampleModules }.flatten().unique()`
`358`	`358`
	`359`	`+ if (modules.size() == 0) {`
	`360`	`+ modules = ["moduleSampleMetadata"]`
	`361`	`+ }`
	`362`	`+`
`359`	`363`	`render(template: '/report/details', model: [ sampleDTOs: data, modules: modules])`
`360`	`364`	`}`
`361`	`365`