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

Timestamp:

Mar 17, 2010, 12:35:31 PM (12 years ago)

Author:

duh

Message:

• initial version of wizard storing data; known issue: while everything is saved properly, linked elements (subjects, events, etc) are not properly stored. I think it might be caused by the transaction in which everything is being done...
• added date/year select to datepickers
• added delete option to subjects view and controller logic

Location:

trunk/grails-app/views/wizard/pages

Files:

• _done.gsp (modified) (1 diff)
• _error.gsp (added)
• _eventDescriptions.gsp (modified) (2 diffs)
• _events.gsp (modified) (1 diff)
• _subjects.gsp (modified) (3 diffs)

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

@@ -16 +16 @@
 %>
 <wizard:pageContent>
-You are done!
 
         <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>persist the data to the database :) nothing is currently being saved...</li>
-                </ul>
+                <span class="todo">Finished!</span>
+                The study you have just created has been properly saved.
         </span>
+
 </wizard:pageContent>

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

@@ -45 +45 @@
                         <div class="column">protocol</div>
                         <div class="column">sampling event</div>
-                        <div class="column">protocol</div>
                 </div>
         <g:each var="eventDescription" status="i" in="${eventDescriptions}">
@@ -57 +56 @@
                         <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>
                 </div>
         </g:each>

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

@@ -79 +79 @@
         </div>
         <div class="sliderContainer">
-                <div class="slider"/>
+                <div class="slider"></div>
         </div>
 </g:if>
 
-        <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>parameter values should still be asked and implemented</li>
-                </ul>
-        </span>
+<span class="info">
+        <span class="todo">TODO</span>
+        <ul>
+                <li>parameter values should still be asked and implemented</li>
+        </ul>
+</span>
+        
 </wizard:pageContent>

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

@@ -19 +19 @@
                 <span class="title">Add subjects to your study</span>
                 In this screen you can add subjects to your study based on a given template. Note that the 'species' select will probably
-                move to the template as an ontology reference and will not be asked anymore.
+                move to the template as an ontology reference and will not be asked anymore.<br/>
+                <i>Note that you can edit multiple subjects at once by selecting multpiple rows by either ctrl-clicking them or dragging a selection over them.</i>
         </span>
 
@@ -36 +37 @@
                         <div class="header">
                                 <div class="firstColumn">#</div>
+                                <div class="firstColumn"></div>
                                 <div class="column">name</div>
                                 <div class="column">species</div>
@@ -42 +44 @@
                 <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
                         <div class="row">
-                                <div class="firstColumn">${subjectId}</div>
+                                <div class="firstColumn">${subjectId + 1}</div>
+                                <div class="firstColumn">
+                                        <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${subjectId});" afterSuccess="onWizardPage()" />
+                                </div>
                                 <div class="column"><g:textField name="subject_${subjectId}_name" value="${subjects[ subjectId ].name}" size="12" maxlength="12" /></div>
                                 <div class="column">