Changeset 229

Timestamp:

03-03-10 12:50:40 (7 years ago)

Author:

keesvb

Message:

updated study/show to show multiple subject templates

Location:

trunk/grails-app

Files:

• domain/dbnp/studycapturing/Study.groovy (modified) (1 diff)
• views/study/show.gsp (modified) (4 diffs)

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -51 +51 @@
 
         /**
+         * Return the unique Subject templates that are used in this study
+         */
+        def Set<Template> giveSubjectTemplates() {
+                TemplateEntity.giveTemplates(subjects);
+        }
+
+
+        /**
          * Returns the template of all subjects in the study
          * Throws an error if there are no or multiple subject templates
          */
-        def Template giveSubjectTemplate() {
-                TemplateEntity.giveTemplate(subjects);
-        }
+        // outcommented, we shouldn't make it too easy for ourselves by introducing uncertain assumptions (1 distinct template)
+        //def Template giveSubjectTemplate() {
+        //      TemplateEntity.giveTemplate(subjects);
+        //}
 
         /**
-         * Returns the template of all samples in the study
-         * Throws an error if there are no or multiple sample templates
+         * Returns the unique Sample templates that are used in the study
          */
-        def Template giveSampleTemplate() {
-                TemplateEntity.giveTemplate(samples);
+        def Template giveSampleTemplates() {
+                TemplateEntity.giveTemplates(samples);
         }
         /**

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

@@ -129 +129 @@
        </div>
 
-        <div id="subjects">
+       <div id="subjects">
+           <g:each in="${studyInstance.giveSubjectTemplates()}" var="template">
         <table>
           <tr>
@@ -135 +136 @@
             <td><b>Species</b></td>
             <td><b>Name</b></td>
-          <g:each in="${studyInstance.template.fields}" var="g">
+          <g:each in="${template.fields}" var="g">
             <td><b>
               <g:link controller="templateField" action="show" id="${g.id}">
@@ -143 +144 @@
           </tr>
 
-          <g:each in="${studyInstance.subjects}" var="s">
+          <g:each in="${studyInstance.subjects.findAll { it.template == template}}" var="s">
             <tr>
               <td><g:link controller="subject" action="show" id="${s.id}">${s.id}</g:link></td>
               <td>${s.species}</td>
               <td>${s.name}</td>
-              <g:each in="${studyInstance.template.fields}" var="g">
+              <g:each in="${template.fields}" var="g">
                <td>
                   <% print s.getFieldValue(g.toString())  %>
@@ -157 +158 @@
 
           </table>
+
+          </g:each>
       </div>