Ignore:
Timestamp:
Mar 8, 2010, 6:25:07 PM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/wizard/pages/_eventDescriptions.gsp

    r238 r246  
    2323        </span>
    2424
    25         <span class="info">
    26                 <span class="title">Note!</span>
    27                 Currently 'classification' display all terms because there is no way to machine interpret
    28                 the different values. So please -for now- make sure to pick the Ontology reference applicable for
    29                 events until this particular challenge is solved.
    30         </span>
    31 
    3225        <wizard:textFieldElement name="name" description="Name" error="name" value="${values?.name}">
    3326                The name of the event description you are creating
     
    3629                A short description summarizing your event description
    3730        </wizard:textFieldElement>
     31        <wizard:protocolElement name="protocol" description="Protocol" error="protocol" value="${values?.protocol}" >
     32                Select the protocol for this event description
     33        </wizard:protocolElement>
    3834        <wizard:checkBoxElement name="isSamplingEvent" description="Sampling event" error="isSamplingEvent" value="${values?.isSamplingEvent}">
    3935                Is this a sampling event description?
     
    4743                        <div class="column">name</div>
    4844                        <div class="column">description</div>
     45                        <div class="column">protocol</div>
    4946                        <div class="column">sampling event</div>
    5047                        <div class="column">protocol</div>
     
    5855                        <div class="column"><g:textField name="eventDescription_${i}_name" value="${eventDescription.name}" size="12" maxlength="12" /></div>
    5956                        <div class="column"><g:textField name="eventDescription_${i}_description" value="${eventDescription.description}" size="12" maxlength="12" /></div>
     57                        <div class="column"><wizard:protocolSelect name="eventDescription_${i}_protocol" value="${eventDescription.protocol}" /></div>
    6058                        <div class="column"><g:checkBox name="eventDescription_${i}_isSamplingEvent" value="${eventDescription.isSamplingEvent}" /></div>
    6159                        <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

    r240 r246  
    2121        </span>
    2222       
    23         <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()" >
     23        <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()" >
    2424                The template to use for this study
    2525        </wizard:templateElement>
     
    4545        <span class="info">
    4646                <span class="title">TODO</span>
    47                 This page should also contain the template fields of the study template selected above (if available). This is
    48                 scheduled for implementation in a later version
     47                Below you will see the template fields of the study template selected above. These fields are not yet
     48                properly handled so you can ignore them for now... To be completed at a later stage
    4949        </span>
    5050       
     51        <wizard:templateElements entity="${study}" />
     52
    5153</wizard:pageContent>
Note: See TracChangeset for help on using the changeset viewer.