Changeset 1769


Ignore:
Timestamp:
Apr 13, 2011, 11:51:47 AM (6 years ago)
Author:
robert@…
Message:

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

Location:
trunk/grails-app/views/study
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/views/study/show_events_table.gsp

    r1461 r1769  
    120120
    121121                  <g:each in="${showTemplates}" var="currentEventTemplate">
    122                         <g:if test="${showProperties[ currentEventTemplate.name ].size() == 0}">
    123                           <td>&nbsp;</td>
    124                         </g:if>
    125                         <g:else>
    126122                          <%
    127123                                def templateEvents = (eventGroup.events + eventGroup.samplingEvents).findAll { it.template == currentEventTemplate }.sort { a, b -> a.startTime <=> b.startTime }.asType(List)
     
    132128                                <td class="templateFieldValue"><af:showTemplateField field="${field}" entity="${event}" /></td>
    133129                          </g:each>
    134                         </g:else>
    135130                  </g:each>
    136131
  • trunk/grails-app/views/study/show_samples.gsp

    r1461 r1769  
    1212                  <th>Parent Subject</th>
    1313                  <th>Parent Sampling Event</th>
    14 
     14                  <th>Parent Event Group</th>
    1515
    1616                <g:each in="${new dbnp.studycapturing.Sample().giveDomainFields()}" var="field">
     
    8282                  </g:if>
    8383                        <td>${sample.parentSubject?.name}</td>
    84                         <td>${sample.parentEvent?.template?.name} at ${sample.parentEvent?.getStartTimeString()}</td>
     84                        <td><g:if test="${sample.parentEvent}">${sample.parentEvent?.template?.name} at ${sample.parentEvent?.getStartTimeString()}</g:if></td>
     85                        <td>${sample.parentEventGroup?.name}</td>
    8586                  <g:each in="${sample.giveDomainFields()}" var="field">
    8687                        <td><af:showTemplateField field="${field}" entity="${sample}" /></td>
Note: See TracChangeset for help on using the changeset viewer.