Changeset 526 for trunk

Timestamp:

Jun 4, 2010, 11:42:05 AM (13 years ago)

Author:

duh

Message:

• beta version of loading and editing a study using the wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (4 diffs)
• views/common/_topnav.gsp (modified) (1 diff)
• views/wizard/pages/_events.gsp (modified) (1 diff)
• views/wizard/pages/_modify.gsp (modified) (1 diff)
• views/wizard/pages/_start.gsp (modified) (2 diffs)
• views/wizard/pages/_study.gsp (modified) (1 diff)
• views/wizard/pages/_subjects.gsp (modified) (1 diff)

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

@@ -82 +82 @@
                                 success()
                         }
-                        on("next").to "study"
+                        on("next") {
+                                // clean the flow scope
+                                flow.remove('study')
+                                flow.remove('subjects')
+                                flow.remove('subjectTemplates')
+                                flow.remove('event')
+                                flow.remove('events')
+                                flow.remove('eventGroups')
+                                flow.remove('eventTemplates')
+                        }.to "study"
                         on("modify").to "modify"
                 }
@@ -100 +109 @@
                         }.to "start"
                         on("next") {
-                                // TODO: loading a study is not yet implemented
-                                //       create a error stating this feature is
-                                //       not yet implemented
-                                flash.errors = [:]
-                                this.appendErrorMap(
-                                        ['study': 'Loading a study and modifying it has not yet been implemented. Please press \'cancel\' to go back to the initial page...'],
-                                        flash.errors
-                                )
-
-                                error()
-                        }.to "modify"
+                                // load study
+                                try {
+                                        flow.study = Study.findByTitle(params.study)
+
+                                        // recreate subjects
+                                        flow.subjects = [:]
+                                        flow.subjectTemplates = [:]
+                                        flow.study.subjects.each() { subject ->
+                                                def subjectIncrement = flow.subjects.size()
+                                                flow.subjects[ subjectIncrement ] = subject
+
+                                                // add subject template?
+                                                if (!flow.subjectTemplates[ subject.template.name ]) {
+                                                        flow.subjectTemplates[ subject.template.name ] = [
+                                                                name: subject.template.name,
+                                                                template: subject.template,
+                                                                subjects: [:]
+                                                        ]
+                                                }
+
+                                                // reference subject in template
+                                                flow.subjectTemplates[ subject.template.name ].subjects[ flow.subjectTemplates[ subject.template.name ].subjects.size() ] = subjectIncrement
+                                        }
+
+                                        // recreate events
+                                        flow.events = []
+                                        flow.eventGroups = []
+                                        flow.eventTemplates     = [:]
+                                        flow.study.events.each() { event ->
+                                                def eventIncrement = flow.events.size()
+                                                flow.events[ eventIncrement ] = event
+
+                                                // add event template?
+                                                if (!flow.eventTemplates[ event.template.name ]) {
+                                                        flow.eventTemplates[ event.template.name ] = [
+                                                                name: event.template.name,
+                                                                template: event.template,
+                                                                events: new ArrayList()
+                                                        ]
+                                                }
+
+                                                // reference event in template
+                                                flow.eventTemplates[ event.template.name ].events[ flow.eventTemplates[ event.template.name ].events.size() ] = eventIncrement
+
+                                                // set dummy event
+                                                flow.event = event
+                                        }
+
+                                        // recreate sample events
+                                        flow.study.samplingEvents.each() { event ->
+                                                def eventIncrement = flow.events.size()
+                                                flow.events[ eventIncrement ] = event
+
+                                                // add event template?
+                                                if (!flow.eventTemplates[ event.template.name ]) {
+                                                        flow.eventTemplates[ event.template.name ] = [
+                                                                name: event.template.name,
+                                                                template: event.template,
+                                                                events: new ArrayList()
+                                                        ]
+                                                }
+
+                                                // reference event in template
+                                                flow.eventTemplates[ event.template.name ].events[ flow.eventTemplates[ event.template.name ].events.size() ] = eventIncrement
+
+                                                // set dummy event
+                                                flow.event = event
+                                        }
+
+                                        // recreate eventGroups
+                                        flow.study.eventGroups.each() { eventGroup ->
+                                                flow.eventGroups[ flow.eventGroups.size() ] = eventGroup
+                                        }
+
+                                        success()
+                                } catch (Exception e) {
+                                        error()
+                                }
+                        }.to "study"
                 }
 
@@ -176 +253 @@
                                         flow.subjectTemplates = [:]
                                 }
+
                                 success()
                         }
@@ -670 +748 @@
          */
         def handleSubjects(flow, flash, params) {
-                def names = [:];
-                def errors = false;
-                def id = 0;
-
+                def names = [:]
+                def errors = false
+                def id = 0
+
+println flow.subjects
                 // iterate through subject templates
                 flow.subjectTemplates.each() { subjectTemplate ->
                         // iterate through subjects
-                        subjectTemplate.getValue().subjects.each() { subjectIncrement, subjectId ->
+                        subjectTemplate.value.subjects.each() { subjectIncrement, subjectId ->
                                 // iterate through fields (= template fields and domain properties)
                                 flow.subjects[ subjectId ].giveFields().each() { subjectField ->

trunk/grails-app/views/common/_topnav.gsp

@@ -9 +9 @@
       <ul class="subnav">
         <li><g:link controller="study" action="list">View studies</g:link></li>
-        <li><g:link controller="wizard" action="index">Create study</g:link></li>
+                  <li><g:link controller="wizard" action="index">Create study</g:link></li>
+                  <li><g:link controller="wizard" action="index">Edit study</g:link></li>
       </ul>
      </li>

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}</h1>
+                <h1>${eventTemplate.value.name}</h1>
         <div class="table">
-                <g:each var="eventId" in="${eventTemplate.getValue().events}">
+                <g:each var="eventId" in="${eventTemplate.value.events}">
                         <g:if test="${showHeader}">
                         <g:set var="showHeader" value="${false}" />

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

@@ -17 +17 @@
 <wizard:pageContent>
 
+        <span class="info">
+                <span class="title">Edit a study</span>
+                Select the study you would like to modify.
+                <b><i>Note: this functionality is currently in beta and has not been verified properly... use with care!</i></b>
+        </span>
+
         <wizard:studyElement name="study" description="Study" error="study" value="">
-                The study you would like to load and modify
+                The study you would like to load and edit
         </wizard:studyElement>
 
-        <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>this feature has not yet been implemented</li>
-                </ul>
-        </span>
-
-        <!-- g:render template="pages/demo" //-->
-
 </wizard:pageContent>

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

@@ -21 +21 @@
         <wizard:ajaxButton name="next" class="bigbutton" value="Create a new study" alt="Create a new study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
 
-        <wizard:ajaxButton name="modify" class="bigbutton" value="Modify an existing study" alt="Modify an existing study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
+        <wizard:ajaxButton name="modify" class="bigbutton" value="Edit an existing study" alt="Edit an existing study" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
 
         <span class="info">
@@ -36 +36 @@
                 You can do this by choosing Studies > Import data in the menu.
                 This part of the applications will help you to upload large studies. This import function can be used for all study components (study, subject and event information) at once.
-            <span class="title">Modify an existing study</span>
+            <span class="title">Edit an existing study</span>
                 Only study owners can modify a their own studies. This part of the application can be used to extend the study information, for instance with new measurements.
         </span>

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

@@ -20 +20 @@
                 In this step of the step-by-step study capturing tool all the basic information of a study can be filled out.
                 Keep in mind that the more and the more specific the information that is filled out, the more valuable the system will be.
-                Only the fields with an asterisks are obligatory.
-                Pick the study template of choice (currently a fixed set) and define your study values. In this prototype the
-                templated fields (below the 'note' box) are not yet handled so you can leave them empty for now.
+                Only the fields with an asterisks are obligatory. Pick the study template of choice (currently a fixed set) and define your study values.
         </span>
         

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

@@ -71 +71 @@
 </g:if>
 
-        <g:if env="development">
-        <span class="info">
-                <span class="known">Known issues</span>
-                <ul>
-                        <li>autocomplete fields (like ontologies) deselect the selected rows and hence don't replicate</li>
-                        <li>ontology fields should replicate value <i>and</i> hidden fields</li>
-                        <li>ontology hidden fields should be processed by the back-end as well (not yet implemented)</li>
-                        <li>ontology fields now show suggestions for <i>all</i> available ontologies. This has to be narrowed down in the future.</li>
-                        <li>ontology hidden fields should be handled by the taglibrary / controller as well</li>
-                </ul>
-        </span>
-        </g:if>
-
 </wizard:pageContent>