Changeset 246 for trunk/grails-app/views/wizard/pages

Timestamp:

Mar 8, 2010, 6:25:07 PM (14 years ago)

Author:

duh

Message:

• increased session lifetime to 7 days
• improved wizard study template selector
• wizard study page now contains study template fields (which are not yet handled)
• added protocol selector to event descriptions page
• renamed the 'blood sampling' protocol to 'Blood sampling' (it was duplicately named 'Liver sampling')

Location:

trunk/grails-app/views/wizard/pages

Files:

• _eventDescriptions.gsp (modified) (4 diffs)
• _study.gsp (modified) (2 diffs)

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

@@ -23 +23 @@
         </span>
 
-        <span class="info">
-                <span class="title">Note!</span>
-                Currently 'classification' display all terms because there is no way to machine interpret
-                the different values. So please -for now- make sure to pick the Ontology reference applicable for
-                events until this particular challenge is solved.
-        </span>
-
         <wizard:textFieldElement name="name" description="Name" error="name" value="${values?.name}">
                 The name of the event description you are creating
@@ -36 +29 @@
                 A short description summarizing your event description
         </wizard:textFieldElement>
+        <wizard:protocolElement name="protocol" description="Protocol" error="protocol" value="${values?.protocol}" >
+                Select the protocol for this event description
+        </wizard:protocolElement>
         <wizard:checkBoxElement name="isSamplingEvent" description="Sampling event" error="isSamplingEvent" value="${values?.isSamplingEvent}">
                 Is this a sampling event description?
@@ -47 +43 @@
                         <div class="column">name</div>
                         <div class="column">description</div>
+                        <div class="column">protocol</div>
                         <div class="column">sampling event</div>
                         <div class="column">protocol</div>
@@ -58 +55 @@
                         <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>
+                        <div class="column"><wizard:protocolSelect name="eventDescription_${i}_protocol" value="${eventDescription.protocol}" /></div>
                         <div class="column"><g:checkBox name="eventDescription_${i}_isSamplingEvent" value="${eventDescription.isSamplingEvent}" /></div>
                         <div class="column"><g:if test="${eventDescription.protocol}">${eventDescription.protocol}</g:if><g:else>-</g:else></div>

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

@@ -21 +21 @@
         </span>
         
-        <wizard:templateElement name="template" description="Template" value="${study?.template}" entity="${dbnp.studycapturing.Subject}" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" >
+        <wizard:templateElement name="template" description="Template" value="${study?.template}" entity="${dbnp.studycapturing.Study}" addDummy="true" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" >
                 The template to use for this study
         </wizard:templateElement>
@@ -45 +45 @@
         <span class="info">
                 <span class="title">TODO</span>
-                This page should also contain the template fields of the study template selected above (if available). This is
-                scheduled for implementation in a later version
+                Below you will see the template fields of the study template selected above. These fields are not yet
+                properly handled so you can ignore them for now... To be completed at a later stage
         </span>
         
+        <wizard:templateElements entity="${study}" />
+
 </wizard:pageContent>