Changeset 418 for trunk/grails-app

Timestamp:

May 17, 2010, 11:56:00 AM (12 years ago)

Author:

duh

Message:

• subjects can now be deleted properly
• event grouping works
• working on upgrading to grails 1.3 (added grails default stuff to ignore list)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (3 diffs)
• views/wizard/pages/_events.gsp (modified) (1 diff)

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

@@ -157 +157 @@
 
                                 if (!flow.subjects) {
-                                        flow.subjects = []
+                                        flow.subjects = [:]
                                         flow.subjectTemplates = [:]
                                 }
@@ -341 +341 @@
                                 }
 
-                                flow.eventGroups[increment] = new EventGroup(name: groupName)
+                                flow.eventGroups[increment] = new EventGroup( name: groupName )
                         }.to "events"
                         on("deleteEventGroup") {
@@ -651 +651 @@
                 // walk through eventGroups
                 def g = 0
-                flow.eventGroups.each() {
+
+                flow.eventGroups.each() { eventGroup ->
                         def e = 0
-                        def eventGroup = it
 
                         // reset events
                         eventGroup.events = new HashSet()
 
-                        // walk through events
+                        // iterate through events
                         flow.events.each() {
                                 if (params.get('event_' + e + '_group_' + g) == 'on') {

trunk/grails-app/views/wizard/pages/_events.gsp

@@ -53 +53 @@
                                 <div class="firstColumn">${eventId + 1}</div>
                                 <div class="firstColumn">
-                                        <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${eventId});" afterSuccess="onWizardPage()"/>
+                                        <wizard:ajaxButton name="deleteEvent" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${eventId});" afterSuccess="onWizardPage()"/>
                                 </div>
                                 <wizard:templateColumns id="${eventId}" entity="${events[ eventId ]}" template="${events[ eventId ].template}" name="event_${eventId}" class="column" />
                                 <g:if test="${eventGroups}"><g:each var="eventGroup" status="j" in="${eventGroups}">
                                 <div class="column">
-                                        <g:if test="${eventGroup.events.find{ it == event} }">
+                                        <g:if test="${eventGroup.events.find{ it == events[ eventId ] } }">
                                                 <input type="checkbox" name="event_${eventId}_group_${j}" checked="checked" />
                                         </g:if><g:else>