Changeset 510

Timestamp:

Jun 2, 2010, 4:38:09 PM (13 years ago)

Author:

duh

Message:

• wizard saving second version

Location:

trunk/grails-app

Files:

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

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

@@ -497 +497 @@
                                         println ".saving wizard data..."
 
-                                        // save events
-                                        println ".saving events"
+                                        // add events to study
+                                        println ".add events to study"
                                         flow.events.each() { event ->
-                                                if (!event.save(flush:true)) {
-                                                        this.appendErrors(event, flash.errors)
-                                                        throw new Exception('error saving event')
-                                                }
-
-                                                // add to study
                                                 if (event instanceof SamplingEvent) {
                                                         flow.study.addToSamplingEvents(event)
@@ -511 +505 @@
                                                         flow.study.addToEvents(event)
                                                 }
-                                                
-                                                println ".saved event ["+event+"] of type ["+event.getClass()+"] (id: "+event.id+")"
                                         }
 
-                                        // save subjects
-                                        println ".saving subjects"
+                                        // add subjects to study
+                                        println ".add subjects to study"
                                         flow.subjects.each() { subjectId, subject ->
-                                                if (!subject.save(flush:true)) {
-                                                        this.appendErrors(subject.value, flash.errors)
-                                                        throw new Exception('error saving subject')
-                                                }
-
-                                                // add this subject to the study
                                                 flow.study.addToSubjects(subject)
-
-                                                println ".saved subject "+subject+" (id: "+subject.id+")"
                                         }
 
-                                        // save eventGroups
-                                        println ".saving eventGroups"
+                                        // add eventGroups to study
+                                        println ".add eventGroups to study"
                                         flow.eventGroups.each() { eventGroup ->
-                                                if (!eventGroup.save(flush:true)) {
-                                                        this.appendErrors(eventGroup, flash.errors)
-                                                        throw new Exception('error saving eventGroup')
-                                                }
-
-                                                // add to study
                                                 flow.study.addToEventGroups(eventGroup)
-
-                                                println ".saved eventGroup ["+eventGroup+"] (id: "+eventGroup.id+")"
                                         }
 

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -21 +21 @@
          * @return List
          */
-        static List<TemplateField> giveDomainFields() { return Study.domainFields }
+        static List<TemplateField> giveDomainFields() { return Study.domainFields }
 
-        static final List<TemplateField> domainFields =
-                [
-                        new TemplateField(
-                                name: 'title',
-                                type: TemplateFieldType.STRING),
-                        new TemplateField(
-                                name: 'startDate',
-                                type: TemplateFieldType.DATE,
-                                comment: 'Fill out the official start date or date of first action')
-                ]
+        static final List<TemplateField> domainFields =
+        [
+                new TemplateField(
+                        name: 'title',
+                        type: TemplateFieldType.STRING),
+                new TemplateField(
+                        name: 'startDate',
+                        type: TemplateFieldType.DATE,
+                        comment: 'Fill out the official start date or date of first action')
+        ]
 
         static hasMany = [
@@ -81 +81 @@
         }
 
-
         /**
          * Return the unique Event templates that are used in this study

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

@@ -67 +67 @@
         <g:each var="eventTemplate" in="${eventTemplates}">
                 <g:set var="showHeader" value="${true}" />
-                <h1>${eventTemplate.getValue().name} template</h1>
+                <h1>${eventTemplate.getValue().name}</h1>
         <div class="table">
                 <g:each var="eventId" in="${eventTemplate.getValue().events}">