Changeset 1482 for trunk/src/groovy/dbnp/query/StudySearch.groovy

Timestamp:

Feb 2, 2011, 4:40:22 PM (10 years ago)

Author:

robert@…

Message:

Implemented saving of queries

File:

• trunk/src/groovy/dbnp/query/StudySearch.groovy (modified) (7 diffs)

trunk/src/groovy/dbnp/query/StudySearch.groovy

@@ -16 +16 @@
 
 import java.util.List;
+import java.util.Map;
 
 import dbnp.studycapturing.*
 import org.dbnp.gdt.*
+import org.apache.commons.logging.LogFactory;
 
 class StudySearch extends Search {
+        private static final log = LogFactory.getLog(this);
+        
         public StudySearch() {
+                super();
                 this.entity = "Study";
         }
@@ -59 +64 @@
         @Override
         void execute() {
-                // TODO: check for authorization for these studies?
-                def studies = Study.list();
+                super.execute();
 
+                def studies = Study.list().findAll { it.canRead( this.user ) };
+                
                 // If no criteria are found, return all studies
                 if( !criteria || criteria.size() == 0 ) {
@@ -75 +81 @@
                 studies = filterOnSamplingEventCriteria( studies );
                 studies = filterOnAssayCriteria( studies );
-
+                
                 studies = filterOnModuleCriteria( studies );
                 
@@ -81 +87 @@
                 results = studies;
         }
-        
+
         /**
          * Filters the given list of studies on the study criteria
@@ -97 +103 @@
          */
         protected List filterOnSubjectCriteria( List studies ) {
-                return filterOnTemplateEntityCriteria(studies, "Subject", { study, criterion -> 
+                return filterOnTemplateEntityCriteria(studies, "Subject", { study, criterion ->
                         return study.subjects?.collect { criterion.getFieldValue( it ); }
                 })
@@ -119 +125 @@
          */
         protected List filterOnEventCriteria( List studies ) {
-                return filterOnTemplateEntityCriteria(studies, "Event", { study, criterion -> 
+                return filterOnTemplateEntityCriteria(studies, "Event", { study, criterion ->
                         return study.events?.collect { criterion.getFieldValue( it ); }
                 })
         }
-        
+
         /**
-        * Filters the given list of studies on the sampling event criteria
-        * @param studies        Original list of studies
-        * @return                       List with all studies that match the event-criteria
-        */
-   protected List filterOnSamplingEventCriteria( List studies ) {
-                return filterOnTemplateEntityCriteria(studies, "SamplingEvent", { study, criterion -> 
+         * Filters the given list of studies on the sampling event criteria
+         * @param studies       Original list of studies
+         * @return                      List with all studies that match the event-criteria
+         */
+        protected List filterOnSamplingEventCriteria( List studies ) {
+                return filterOnTemplateEntityCriteria(studies, "SamplingEvent", { study, criterion ->
                         return study.samplingEvents?.collect { criterion.getFieldValue( it ); }
                 })
-   }
-        
+        }
+
         /**
          * Filters the given list of studies on the assay criteria
@@ -145 +151 @@
                 })
         }
+
+        /**
+         * Returns the saved field data that could be shown on screen. This means, the data
+         * is filtered to show only data of the query results. Also, the study title and sample
+         * name are filtered out, in order to be able to show all data on the screen without
+         * checking further
+         *
+         * @return      Map with the entity id as a key, and a field-value map as value
+         */
+        public Map getShowableResultFields() {
+                Map showableFields = super.getShowableResultFields()
+                showableFields.each { sampleElement ->
+                        sampleElement.value = sampleElement.value.findAll { fieldElement ->
+                                fieldElement.key != "Study title" && fieldElement.key != "Subject species"
+                        }
+                }
+                return showableFields
+        }
 }