Changeset 421 for trunk/grails-app/views

Timestamp:

May 17, 2010, 3:26:48 PM (12 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:

• trunk/grails-app/views/study/show.gsp (modified) (3 diffs)

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

@@ -147 +147 @@
                 </tr>
 
-                <g:each in="${studyInstance.events}" var="event">
+                <g:each in="${studyInstance.events + studyInstance.samplingEvents}" var="event">
                   <tr>
                     <td><g:link controller="event" action="show" id="${event.id}">${event.id}</g:link></td>
@@ -187 +187 @@
               <tr>
                 <td><b>Name</b></td>
-                <td colspan="${studyInstance.giveEventTemplates().size()}"><b>Events</b></td>
+                <td colspan="${studyInstance.giveAllEventTemplates().size()}"><b>Events</b></td>
                 <td><b>Subjects</b></td>
               </tr>
               <tr>
                 <td></td>
-                <g:each in="${studyInstance.giveEventTemplates()}" var="eventTemplate">
+                <g:each in="${studyInstance.giveAllEventTemplates()}" var="eventTemplate">
                   <td><b>${eventTemplate.name}</b></td>
                 </g:each>
@@ -201 +201 @@
                   <td>${eventGroup.name}</td>
 
-                  <g:each in="${studyInstance.giveEventTemplates()}" var="currentEventTemplate">
+                  <g:each in="${studyInstance.giveAllEventTemplates()}" var="currentEventTemplate">
                     <td>
                       <g:each in="${eventGroup.events}" var="event">