Changeset 217

Timestamp:

Feb 26, 2010, 4:32:43 PM (9 years ago)

Author:

duh

Message:

• adding support for event deletion

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (6 diffs)
• grails-app/views/wizard/pages/_eventDescriptions.gsp (modified) (2 diffs)
• grails-app/views/wizard/pages/_events.gsp (modified) (2 diffs)
• web-app/css/wizard.css (modified) (1 diff)

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

@@ -51 +51 @@
                                 [title: 'Subjects'],                    // subjects
                                 [title: 'Event Descriptions'],  // event descriptions
-                                [title: 'Events'],                              // events
+                                [title: 'Events'],                              // events and event grouping
                                 [title: 'Confirmation'],                // confirmation page
                                 [title: 'Done']                                 // finish page
@@ -214 +214 @@
                                 }
                         }.to "eventDescriptions"
+                        on("delete") {
+                                def delete = params.get('do') as int;
+
+                                // handle form data
+                                if (!this.handleEventDescriptions(flow, flash, params)) {
+                                        flash.values = params
+                                        error()
+                                } else {
+                                        success()
+                                }
+
+                                // remove eventDescription
+                                if (flow.eventDescriptions[ delete ] && flow.eventDescriptions[ delete ] instanceof EventDescription) {
+                                        // remove all events based on this eventDescription
+                                        for ( i in flow.events.size()..0 ) {
+                                                if (flow.events[ i ] && flow.events[ i ].eventDescription == flow.eventDescriptions[ delete ]) {
+                                                        flow.events.remove(i)
+                                                }
+                                        }
+
+                                        flow.eventDescriptions.remove(delete)
+                                }
+                        }.to "eventDescriptions"
                         on("previous") {
                                 flash.errors = new LinkedHashMap()
@@ -297 +320 @@
                                 }
                         }.to "events"
+                        on("deleteEvent") {
+                                flash.values = params
+                                def delete = params.get('do') as int;
+
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
+
+                                // remove event
+                                if (flow.events[ delete ] && flow.events[ delete ] instanceof Event) {
+                                        flow.events.remove(delete)
+                                }
+                        }.to "events"
                         on("addEventGroup") {
+                                flash.values = params
+                                
+                                // handle event groupings
+                                this.handleEventGrouping(flow, flash, params)
+
                                 def increment = flow.eventGroups.size()
                                 def groupName = "Group " + (increment + 1)
@@ -324 +364 @@
                         }.to "events"
                         on("deleteEventGroup") {
+                                flash.values = params
+                                
                                 def delete = params.get('do') as int;
 
@@ -340 +382 @@
                         }.to "eventDescriptions"
                         on("next") {
+                                flash.values = params
+                                
                                 flash.errors = new LinkedHashMap()
 
@@ -403 +447 @@
                                 if (params.get('event_' + e + '_group_' + g) == 'on') {
                                         eventGroup.addToEvents(it)
-                                        //} else {
-                                        //      eventGroup.events.minus(it)
                                 }
                                 e++

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

@@ -47 +47 @@
                 <div class="header">
                         <div class="firstColumn">#</div>
+                        <div class="firstColumn"></div>
                         <div class="column">name</div>
                         <div class="column">description</div>
@@ -56 +57 @@
                 <div class="row">
                         <div class="firstColumn">${i+1}</div>
+                        <div class="firstColumn">
+                                <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this event" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${i});" afterSuccess="onWizardPage()" />
+                        </div>
                         <div class="column"><g:textField name="eventDescription_${i}_name" value="${eventDescription.name}" size="12" maxlength="12" /></div>
                         <div class="column"><g:textField name="eventDescription_${i}_description" value="${eventDescription.description}" size="12" maxlength="12" /></div>

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

@@ -40 +40 @@
                 <div class="header">
                         <div class="firstColumn">#</div>
+                        <div class="firstColumn"></div>
                         <div class="column">eventDescription</div>
                         <div class="column">startTime</div>
@@ -57 +58 @@
                 <div class="row">
                         <div class="firstColumn">${i+1}</div>
+                        <div class="firstColumn">
+                                <wizard:ajaxButton name="deleteEvent" src="../images/icons/famfamfam/delete.png" alt="delete this event" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${i});" afterSuccess="onWizardPage()" />                               
+                        </div>
                         <div class="column">${event.eventDescription}</div>
                         <div class="column"><g:formatDate format="dd/MM/yyyy hh:mm" date="${event.startTime}" /></div>

trunk/web-app/css/wizard.css

@@ -26 +26 @@
     width: 16px;
     height: 16px;
-    margin-top: 5px;
 }