Changeset 664
- Timestamp:
- Jul 19, 2010, 5:50:22 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy
r635 r664 318 318 flow.subjects[increment] = subject 319 319 320 // add the subject to the study 321 flow.study.addToSubjects( subject ) 322 320 323 // and remember the subject id with the template 321 324 def subjectsSize = (flow.subjectTemplates[subjectTemplateName].subjects.size()) ? (flow.subjectTemplates[subjectTemplateName].subjects.keySet().max() + 1) : 0 … … 341 344 // remove subject 342 345 if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) { 346 // from study as well 347 flow.study.removeFromSubjects( flow.subjects[ delete ] ) 348 343 349 // remove subject from templates 344 350 flow.subjectTemplates.each() { templateName, templateData -> … … 396 402 flow.eventGroups = [ new EventGroup(name: 'Group 1') ] 397 403 flow.eventTemplates = [:] 404 405 // add initial eventGroup to study 406 flow.study.addToEventGroups( flow.eventGroups[ 0 ] ) 398 407 } else if (!flash.values) { 399 408 // set flash.values.templateType based on the event instance … … 467 476 flow.events[ increment ] = newEvent 468 477 478 // ...add it to the study... 479 if (newEvent instanceof SamplingEvent) { 480 flow.study.addToSamplingEvents( newEvent ) 481 } else { 482 flow.study.addToEvents( newEvent ) 483 } 484 469 485 // ...and 'reset' the event object in the flow scope 470 486 flow.event = new Event(template: newEvent.template) … … 491 507 // remove event 492 508 if (flow.events[ delete ] && flow.events[ delete ] instanceof Event) { 509 // remove it from the study 510 flow.study.removeFromEvents( flow.events[ delete ] ) 511 512 // remove it from the map 493 513 flow.events.remove(delete) 494 514 flow.eventTemplates.each() { eventTemplate -> … … 539 559 } 540 560 541 flow.eventGroups[increment] = new EventGroup( name: groupName ) 561 // remember eventGroup 562 flow.eventGroups[ increment ] = new EventGroup( name: groupName ) 563 564 // and add the group to the study 565 flow.study.addToEventGroups( flow.eventGroups[ increment ] ) 542 566 543 567 success() … … 552 576 // remove the group with this specific id 553 577 if (flow.eventGroups[delete] && flow.eventGroups[delete] instanceof EventGroup) { 578 // remove the eventGroup from the study 579 flow.study.removeFromEventGroups( flow.eventGroups[ delete ] ) 580 554 581 // remove this eventGroup 555 582 flow.eventGroups.remove(delete) … … 646 673 eventGroup.subjects.each() { subject -> 647 674 def sampleName = (this.ucwords(subject.name) + '_' + eventName + '_' + new RelTime(event.startTime).toString()).replaceAll("([ ]{1,})", "") 648 649 flow.samples[flow.samples.size()] = [ 675 def incrementor = flow.samples.size() 676 677 flow.samples[ incrementor ] = [ 650 678 sample: new Sample( 651 679 parentSubject: subject, … … 658 686 subject: subject 659 687 ] 688 689 // and add this sample to the study 690 flow.study.addToSamples( flow.samples[ incrementor ].sample ) 660 691 } 661 692 } … … 780 811 781 812 // add events to study 813 /* 782 814 println ".add events to study" 783 815 flow.events.each() { event -> … … 786 818 // linked to this study 787 819 if (!flow.study.samplingEvents.find { e -> (e == event) }) { 788 flow.study.addToSamplingEvents( event)820 flow.study.addToSamplingEvents( event.value ) 789 821 } 790 822 } else { 791 823 // only add it if it does not yet exist 792 824 if (!flow.study.events.find { e -> (e == event) }) { 793 flow.study.addToEvents( event)825 flow.study.addToEvents( event.value ) 794 826 } 795 827 } … … 813 845 } 814 846 } 847 */ 815 848 816 849 // save study … … 1227 1260 flow.events.each() { 1228 1261 if (params.get('event_' + e + '_group_' + g) == 'on') { 1229 eventGroup.addToEvents(it )1262 eventGroup.addToEvents(it.value) 1230 1263 } 1231 1264 e++
Note: See TracChangeset
for help on using the changeset viewer.