Changeset 288 for trunk/grails-app/views

Timestamp:

Mar 21, 2010, 2:17:51 PM (12 years ago)

Author:

jahn

Message:

Event's create and edit action have been tested and are now working.

Also, the old problem of adding Samples has been addressed. When a new event is created as a SamplingEvent?, no new samples can be added directly. The reason for this is, that the event is not yet assigned to any Subject, and thus the non nullable subject field of a new sample (belonging to the new event) cannot be filled.
Similarly, when a SamplingEvent? event is edited, new samples can only be added, if the event already is assigned to belong to a subject. New samples are always added to the same subject as the first (random) sample belonging to the SamplingEvent?.

However, there are still open questions:

(1) Should the sample also be assigned to the samples of its subject's Study?

(2) Should a sample also be assigned, if there are no samples assigned yet, but there is a subject assigned to this event?

(3) Should the user be allowed to chose to assign a subject if the event is assigned to a Study that contains multiple subjects?

Location:

trunk/grails-app/views

Files:

• event/edit.gsp (modified) (1 diff)
• eventDescription/showPartial.gsp (modified) (1 diff)

trunk/grails-app/views/event/edit.gsp

@@ -178 +178 @@
 
 
-                            <!-- this part changes dynamically on select -->
+
+
 
                             <tbody id="preview">
+
+                                <!-- this part changes dynamically on select -->
                                 <g:include action='showPartial' controller='eventDescription' params="[protocolid:protocols[0].id]" id="${eventInstance.id}" />
+
+
+                                <!-- show checkbox when creating events -->
+                                <g:if test="${createNew}">
+                                <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="endTime"><g:message code="event.endTime.label" default="This is a Sampling event" /></label>
+                                </td>
+                                <td valign="top" class="name">
+                                    <g:checkBox name="isSamplingEvent" value="${false}" />
+                                </td>
+                                </tr>
+                                </g:if>
+
                             </tbody>
+
+
+
 
 

trunk/grails-app/views/eventDescription/showPartial.gsp

@@ -45 +45 @@
 
 
-                            <% showSample=true %>
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="endTime"><g:message code="event.endTime.label" default="This is a sampling event" /></label>
-                                </td>
-                                <td valign="top" class="name">
-                                     <g:checkBox name="isSamplingEvent" value="${false}" />
-                                </td>
-                            </tr>
 
-
-
-
-
-
-
-