Changeset 1621 for trunk/grails-app

Timestamp:

Mar 11, 2011, 11:02:30 AM (11 years ago)

Author:

robert@…

Message:

Fixed some bugs in simple wizard and study view page

Location:

trunk/grails-app

Files:

• controllers/SandboxController.groovy (modified) (1 diff)
• controllers/dbnp/studycapturing/SimpleWizardController.groovy (modified) (1 diff)
• controllers/dbnp/studycapturing/StudyController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Study.groovy (modified) (5 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• views/study/list.gsp (modified) (1 diff)

trunk/grails-app/controllers/SandboxController.groovy

@@ -8 +8 @@
 
         def index = {
-
+                println Study.list();
+                
                 // Get the example study in a lazy way
                 def st = Study.get(1)

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

@@ -193 +193 @@
                 
                 missingFields {
+                        on( "refresh" ) {
+                                handleMissingFields( flow.study, params, flow );
+                                success();
+                        }.to "missingFields"
                         on( "next" ) {
                                 if( !handleMissingFields( flow.study, params, flow ) ) {

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

@@ -28 +28 @@
                 def offset = params.offset ? params.int( 'offset' ) : 0
         def studies = Study.giveReadableStudies( user, max, offset );
-
+                println "Studies: " + studies
         [studyInstanceList: studies, studyInstanceTotal: Study.countReadableStudies( user ), loggedInUser: user]
     }

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -460 +460 @@
                                 order("title", "asc")
                                 
-                        }
+                        }.unique()
                 }
 
@@ -472 +472 @@
                                 }
                         }
-                }
+                }.unique()
         }
 
@@ -491 +491 @@
                                         eq("publicstudy", true)
                                 }
-                        }
+                        }.unique()
                 } else if (user.hasAdminRights()) {
                         return c.list {
@@ -497 +497 @@
                                 firstResult(offset)
                                 order("title", "asc")
-                        }
+                        }.unique()
                 } else {
                         return c.list {
@@ -515 +515 @@
                                         }
                                 }
-                        }
+                        }.unique()
                 }
         }

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -406 +406 @@
                                 Cell cell = excelRow.getCell( i );
                                 
+                                if( !cell )
+                                        continue;
+                                        
                                 // get the MappingColumn information of the current cell
                                 def mc = mcmap[cell.getColumnIndex()]

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

@@ -87 +87 @@
                         <sec:ifLoggedIn>
                                 <span class="button"><g:link class="create" controller="studyWizard" params="[jump:'create']"><g:message code="default.new.label" args="[entityName]"/></g:link></span>
+                                <span class="button"><g:link class="create" controller="simpleWizard">Simple wizard</g:link></span>
                                 <span class="button"><a class="compare" href="#" onClick="$( 'form#list_extended' ).first().submit(); return false;">Compare selected studies</a></span>
                         </sec:ifLoggedIn>