Changeset 1769 for trunk/grails-app/views/study/show_samples.gsp

Timestamp:

Apr 13, 2011, 11:51:47 AM (9 years ago)

Author:

robert@…

Message:

Added fields to study view and fixed strange values for parentEvent in samples overview

File:

• trunk/grails-app/views/study/show_samples.gsp (modified) (2 diffs)

trunk/grails-app/views/study/show_samples.gsp

@@ -12 +12 @@
                   <th>Parent Subject</th>
                   <th>Parent Sampling Event</th>
-
+                  <th>Parent Event Group</th>
 
                 <g:each in="${new dbnp.studycapturing.Sample().giveDomainFields()}" var="field">
@@ -82 +82 @@
                   </g:if>
                         <td>${sample.parentSubject?.name}</td>
-                        <td>${sample.parentEvent?.template?.name} at ${sample.parentEvent?.getStartTimeString()}</td>
+                        <td><g:if test="${sample.parentEvent}">${sample.parentEvent?.template?.name} at ${sample.parentEvent?.getStartTimeString()}</g:if></td>
+                        <td>${sample.parentEventGroup?.name}</td>
                   <g:each in="${sample.giveDomainFields()}" var="field">
                         <td><af:showTemplateField field="${field}" entity="${sample}" /></td>