bug fix

Author: dshao

pegr/grails-app/controllers/pegr/ReportController.groovy

@@ -370,6 +370,7 @@ class SampleDTO {
     String recommend
     List histories
     List sampleModules
+    List printModules
 }
 
 class ExperimentDTO {

pegr/grails-app/controllers/pegr/SampleController.groovy

@@ -539,7 +539,7 @@ class SampleController {
 
         def samples = reportService.fetchDataForSamples(sampleIds)
 
-        def modules = samples.collect { it.sampleModules }.flatten().unique()
+        def modules = samples.collect { it.printModules }.flatten().unique()
 
         if (modules.size() == 0) {
             modules = ["moduleSampleMetadata"]

pegr/grails-app/services/pegr/ReportService.groovy

@@ -300,7 +300,9 @@ class ReportService {
         def sampleDTOs = []
         def sample = Sample.get(sampleId)
         if (sample) {
-            def modules = []
+            def sampleModules = []
+            def printModules = []
+            
             def sampleDTO = getSampleDTO(sample)
             sample.sequencingExperiments.each { experiment ->
                 def expDTO = getExperimentDTO(experiment)
@@ -313,12 +315,14 @@ class ReportService {
                         def analysis = Analysis.findAllByAlignment(alignment)
                         def alignmentStatusDTO = getAlignmentStatusDTO(alignment, experiment, analysis)
                         sampleDTO.histories << alignmentStatusDTO.historyId
-                        modules << jsonSlurper.parseText(alignment.pipeline.sampleModules)
+                        sampleModules << jsonSlurper.parseText(alignment.pipeline.sampleModules)
+                        printModules << jsonSlurper.parseText(alignment.pipeline.printModules)
                     }
                 }
                 sampleDTO.experiments << expDTO
             }            
-            sampleDTO.sampleModules = modules.flatten().unique()
+            sampleDTO.sampleModules = sampleModules.flatten().unique()
+            sampleDTO.printModules = printModules.flatten().unique()
             sampleDTOs << sampleDTO
         }
         return sampleDTOs

pegr/grails-app/views/report/_moduleGelImage.gsp

@@ -1,3 +1,4 @@
+<g:if test="${imageMap}">
 <h3>Images</h3>
 <table class="table table-bordered" id="project-table">
     <thead>
@@ -28,4 +29,5 @@
             </td>
         </tr>
     </tbody>
-</table>
+</table>
+</g:if>