Changeset 1224 for trunk/grails-app/views

Timestamp:

Nov 30, 2010, 5:12:08 PM (11 years ago)

Author:

robert@…

Message:

Fixed issue in study overview with double columns. See ticket #155

Location:

trunk/grails-app/views/study

Files:

• show_samples.gsp (modified) (4 diffs)
• show_subjects.gsp (modified) (4 diffs)

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

@@ -21 +21 @@
                   // Determine a union of the fields for all different
                   // samples in all studies. In order to show a proper list.
-                  // We want every field to appear just once,
-                  // so the list is filtered for unique values
+                  // We want every field to appear just once, so the list is filtered
+                  // for unique names. This ensures that different template fields with
+                  // the same name, show up in the same column. This might happen when
+                  // both humans and mice are shown, where humans have a weight in kgs
+                  // and mice have a weight in grams.
                   sampleTemplates = studyList*.giveSampleTemplates().flatten().unique()
 
@@ -30 +33 @@
                         showSampleFields = [];
                   } else {
-                        sampleFields = sampleTemplates*.fields.flatten().unique()
+                        sampleFields = sampleTemplates*.fields.flatten().name.unique()
                         if( !sampleFields ) {
                           sampleFields = [];
@@ -45 +48 @@
                                   // show the field and should not check any other
                                   // samples (hence the break)
-                                  if( sample.fieldExists( sampleField.name ) && sample.getFieldValue( sampleField.name ) ) {
+                                  if( sample.fieldExists( sampleField ) && sample.getFieldValue( sampleField ) ) {
                                         showSampleFields << sampleField;
                                         break;
@@ -84 +87 @@
                   </g:each>
 
-                  <g:each in="${showSampleFields}" var="field">
+                  <g:each in="${showSampleFields}" var="fieldname">
                         <td>
-                          <g:if test="${sample.fieldExists(field.name)}">
+                          <g:if test="${sample.fieldExists(fieldname)}">
+                                <g:set var="field" value="${sample.getField(fieldname)}" />
                                 <wizard:showTemplateField field="${field}" entity="${sample}" />
                           </g:if>

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

@@ -16 +16 @@
                         // Determine a union of the fields for all different
                         // subjects in all studies. In order to show a proper list.
-                        // We want every field to appear just once,
-                        // so the list is filtered for unique values
+                        // We want every field to appear just once, so the list is filtered
+                        // for unique names. This ensures that different template fields with
+                        // the same name, show up in the same column. This might happen when
+                        // both humans and mice are shown, where humans have a weight in kgs
+                        // and mice have a weight in grams.
                         subjectTemplates = studyList*.giveSubjectTemplates()?.flatten().unique()
                         if( !subjectTemplates ) {
@@ -23 +26 @@
                           subjectFields = [];
                         } else {
-                          subjectFields = subjectTemplates*.fields?.flatten().unique()
+                          subjectFields = subjectTemplates*.fields?.flatten().name.unique()
                           if( !subjectFields ) {
                                 subjectFields = [];
@@ -51 +54 @@
                                 // show the field and should not check any other
                                 // subjects (hence the break)
-                                if( subject.fieldExists( subjectField.name ) && subject.getFieldValue( subjectField.name ) ) {
+                                if( subject.fieldExists( subjectField ) && subject.getFieldValue( subjectField ) ) {
                                   showSubjectFields << subjectField;
                                   break;
@@ -80 +83 @@
                         </g:each>
 
-                        <g:each in="${showSubjectFields}" var="field">
+                        <g:each in="${showSubjectFields}" var="fieldname">
                           <td>
-                                <g:if test="${subject.fieldExists(field.name)}">
+                                <g:if test="${subject.fieldExists(fieldname)}">
+                                        <g:set var="field" value="${subject.getField(fieldname)}" />
                                         <wizard:showTemplateField field="${field}" entity="${subject}" />
                                 </g:if>