Changeset 217
- Timestamp:
- Feb 26, 2010, 4:32:43 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy
r216 r217 51 51 [title: 'Subjects'], // subjects 52 52 [title: 'Event Descriptions'], // event descriptions 53 [title: 'Events'], // events 53 [title: 'Events'], // events and event grouping 54 54 [title: 'Confirmation'], // confirmation page 55 55 [title: 'Done'] // finish page … … 214 214 } 215 215 }.to "eventDescriptions" 216 on("delete") { 217 def delete = params.get('do') as int; 218 219 // handle form data 220 if (!this.handleEventDescriptions(flow, flash, params)) { 221 flash.values = params 222 error() 223 } else { 224 success() 225 } 226 227 // remove eventDescription 228 if (flow.eventDescriptions[ delete ] && flow.eventDescriptions[ delete ] instanceof EventDescription) { 229 // remove all events based on this eventDescription 230 for ( i in flow.events.size()..0 ) { 231 if (flow.events[ i ] && flow.events[ i ].eventDescription == flow.eventDescriptions[ delete ]) { 232 flow.events.remove(i) 233 } 234 } 235 236 flow.eventDescriptions.remove(delete) 237 } 238 }.to "eventDescriptions" 216 239 on("previous") { 217 240 flash.errors = new LinkedHashMap() … … 297 320 } 298 321 }.to "events" 322 on("deleteEvent") { 323 flash.values = params 324 def delete = params.get('do') as int; 325 326 // handle event groupings 327 this.handleEventGrouping(flow, flash, params) 328 329 // remove event 330 if (flow.events[ delete ] && flow.events[ delete ] instanceof Event) { 331 flow.events.remove(delete) 332 } 333 }.to "events" 299 334 on("addEventGroup") { 335 flash.values = params 336 337 // handle event groupings 338 this.handleEventGrouping(flow, flash, params) 339 300 340 def increment = flow.eventGroups.size() 301 341 def groupName = "Group " + (increment + 1) … … 324 364 }.to "events" 325 365 on("deleteEventGroup") { 366 flash.values = params 367 326 368 def delete = params.get('do') as int; 327 369 … … 340 382 }.to "eventDescriptions" 341 383 on("next") { 384 flash.values = params 385 342 386 flash.errors = new LinkedHashMap() 343 387 … … 403 447 if (params.get('event_' + e + '_group_' + g) == 'on') { 404 448 eventGroup.addToEvents(it) 405 //} else {406 // eventGroup.events.minus(it)407 449 } 408 450 e++ -
trunk/grails-app/views/wizard/pages/_eventDescriptions.gsp
r214 r217 47 47 <div class="header"> 48 48 <div class="firstColumn">#</div> 49 <div class="firstColumn"></div> 49 50 <div class="column">name</div> 50 51 <div class="column">description</div> … … 56 57 <div class="row"> 57 58 <div class="firstColumn">${i+1}</div> 59 <div class="firstColumn"> 60 <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()" /> 61 </div> 58 62 <div class="column"><g:textField name="eventDescription_${i}_name" value="${eventDescription.name}" size="12" maxlength="12" /></div> 59 63 <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
r216 r217 40 40 <div class="header"> 41 41 <div class="firstColumn">#</div> 42 <div class="firstColumn"></div> 42 43 <div class="column">eventDescription</div> 43 44 <div class="column">startTime</div> … … 57 58 <div class="row"> 58 59 <div class="firstColumn">${i+1}</div> 60 <div class="firstColumn"> 61 <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()" /> 62 </div> 59 63 <div class="column">${event.eventDescription}</div> 60 64 <div class="column"><g:formatDate format="dd/MM/yyyy hh:mm" date="${event.startTime}" /></div> -
trunk/web-app/css/wizard.css
r216 r217 26 26 width: 16px; 27 27 height: 16px; 28 margin-top: 5px;29 28 } 30 29
Note: See TracChangeset
for help on using the changeset viewer.