Changeset 536 for trunk/grails-app/domain

Timestamp:

Jun 7, 2010, 9:20:00 AM (13 years ago)

Author:

roberth

Message:

Samples are now shown in the study overview page. Also some tests are added and the bootstrap is updated to show some sample fields with a template

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Event.groovy (modified) (1 diff)
• Study.groovy (modified) (1 diff)
• TemplateEntity.groovy (modified) (1 diff)

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

@@ -84 +84 @@
         }
 
+        def belongsToGroup( Set<EventGroup> groups ){
+            def eventFound = false;
+            def that = this;
+            groups.each{ eventgroup ->
+                if( !eventFound ) {
+                    eventFound = ( that.id in eventgroup.events.id );
+                }
+            }
+
+            return eventFound;
+        }
+
         def String toString() {
                 return fieldExists('Description') ? getFieldValue('Description') : ""

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

@@ -66 +66 @@
         }
 
+        /**
+         * returns all events and sampling events that do not belong to a group
+         */
+        def Set<Event> getOrphanEvents() {
+            def orphans =
+                events.findAll{ event -> !event.belongsToGroup( eventGroups ) } +
+                samplingEvents.findAll { event -> !event.belongsToGroup( eventGroups ) };
+
+            return orphans;
+        }
+
         /**
          * Return the unique Subject templates that are used in this study

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

@@ -585 +585 @@
         /**
          * Convenience method. Returns all unique templates used within a collection of TemplateEntities.
+         *
+         * If the collection is empty, an empty set is returned. If none of the entities contains
+         * a template, also an empty set is returned.
          */
         static Set<Template> giveTemplates(Set<TemplateEntity> entityCollection) {
-                return entityCollection*.template.unique();
+            def set = entityCollection*.template.unique();
+
+            // If one or more entities does not have a template, the resulting
+            // set contains null. That is not what is meant.
+            return set.findAll { it != null };
         }