Changeset 1031

Timestamp:

01-11-10 14:54:35 (3 years ago)

Author:

robert@…

Message:

Bug in study comparison view fixed, so multiple studies can be compared

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyController.groovy (modified) (1 diff)
• views/study/list.gsp (modified) (1 diff)

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

@@ -74 +74 @@
      */
     def list_extended = {
+                // If nothing has been selected, redirect the user
+                if( !params.id ) 
+                        redirect( action: 'list' )
+
+                // Check whether one id has been selected or multiple.
+                def ids = params.id
+                if( ids instanceof String )
+                        redirect( action: 'show', id: ids )
+
+                // Parse strings to a long
+                def long_ids = []
+                ids.each { long_ids.add( Long.parseLong( it ) ) }
+
+                println( long_ids )
+
         def startTime = System.currentTimeMillis()
-        params.max = Math.min(params.max ? params.int('max') : 10, 100)
-        
-        def studyList = Study.list(params)
+                def c = Study.createCriteria()
+
+        def studyList = c {
+                        maxResults( Math.min(params.max ? params.int('max') : 10, 100) )
+                        'in'( "id", long_ids )
+                }
         render(view:'show',model:[studyList: studyList, studyInstanceTotal: Study.count(), multipleStudies: ( studyList.size() > 1 ) ] )
     }

trunk/grails-app/views/study/list.gsp

@@ -34 +34 @@
               <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
 
-                  <td><input type="checkbox" name="${studyInstance.title}" id="${studyInstance.title}"></td>
+                  <td><input type="checkbox" name="id" value="${studyInstance.id}" id="${studyInstance.title}"></td>
 
                   <td><g:link action="show" id="${studyInstance.id}">${fieldValue(bean: studyInstance, field: "code")}</g:link></td>