Changeset 953 for trunk

Timestamp:

Oct 20, 2010, 6:16:20 PM (13 years ago)

Author:

j.a.m.wesbeek@…

Message:

• resolved issue #125 ( ​https://trac.nbic.nl/gscf/ticket/125 ); introduced a warning when a samplingEvent has not been added to an eventGroup

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (2 diffs)
• views/wizard/pages/_unassigned_samplingEvent_warning.gsp (added)

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

@@ -448 +448 @@
                                 // handle form data
                                 eventPage(flow, flash, params) ? success() : error()
-                        }.to "groups"
+                        }.to "eventsNext"
                         on("quickSave") {
                                 // handle form data
                                 eventPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                }
+
+                // decide to show a warning page or not
+                eventsNext {
+                        action {
+                                def assigned = false
+
+                                // check if all sampling events are in an eventGroup
+                                flow.study.samplingEvents.each() { samplingEvent ->
+                                        // iterate through eventGroups
+                                        flow.study.eventGroups.each() { eventGroup ->
+                                                if ( eventGroup.samplingEvents.find { it.equals(samplingEvent) } ) {
+                                                        assigned = true
+                                                }
+                                        }
+                                }
+
+                                if (assigned) {
+                                        toGroupsPage()
+                                } else {
+                                        toWarningPage()
+                                }
+                        }
+                        on("toWarningPage").to "unassignedSamplingEventWarning"
+                        on("toGroupsPage").to "groups"
+                }
+
+                // warning page for unassigned samplingEvent
+                unassignedSamplingEventWarning {
+                        render(view: "_unassigned_samplingEvent_warning")
+                        onRender {
+                                flow.page = 4
+                                success()
+                        }
+                        on("next").to "groups"
+                        on("previous").to "events"
                 }
 
@@ -475 +511 @@
                         }.to "waitForSave"
                 }
-
-                // decide to show a warning page or not
-
 
                 // sample 'previous' page with warning