Ignore:
Timestamp:
May 17, 2010, 3:26:48 PM (9 years ago)
Author:
keesvb
Message:

cleaned up BootStrap? and re-added Samples, updated study/show to also show sampling events in EventGroups?, added description field for Templates

File:
1 edited

Legend:

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

    r392 r421  
    147147                </tr>
    148148
    149                 <g:each in="${studyInstance.events}" var="event">
     149                <g:each in="${studyInstance.events + studyInstance.samplingEvents}" var="event">
    150150                  <tr>
    151151                    <td><g:link controller="event" action="show" id="${event.id}">${event.id}</g:link></td>
     
    187187              <tr>
    188188                <td><b>Name</b></td>
    189                 <td colspan="${studyInstance.giveEventTemplates().size()}"><b>Events</b></td>
     189                <td colspan="${studyInstance.giveAllEventTemplates().size()}"><b>Events</b></td>
    190190                <td><b>Subjects</b></td>
    191191              </tr>
    192192              <tr>
    193193                <td></td>
    194                 <g:each in="${studyInstance.giveEventTemplates()}" var="eventTemplate">
     194                <g:each in="${studyInstance.giveAllEventTemplates()}" var="eventTemplate">
    195195                  <td><b>${eventTemplate.name}</b></td>
    196196                </g:each>
     
    201201                  <td>${eventGroup.name}</td>
    202202
    203                   <g:each in="${studyInstance.giveEventTemplates()}" var="currentEventTemplate">
     203                  <g:each in="${studyInstance.giveAllEventTemplates()}" var="currentEventTemplate">
    204204                    <td>
    205205                      <g:each in="${eventGroup.events}" var="event">
Note: See TracChangeset for help on using the changeset viewer.