Changeset 201 for trunk/grails-app/controllers/SearchableController.groovy

Timestamp:

Feb 16, 2010, 3:13:09 PM (12 years ago)

Author:

jahn

Message:

Added some features: subgrouping by event groups and times, select all and select none, autmatic checking of all samples belonging to a subject and of all samples and subjects belonging to a study. Beatufied some outputs.

Ideally, there should be some extra functionality for automatically putting samples into the right subgroup and for selecting the correct subgroup upon checking its commading subject or study.

File:

• trunk/grails-app/controllers/SearchableController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/SearchableController.groovy

@@ -27 +27 @@
 
     def selectsample = {
+
+
+            // produce error message here if studies don't contain samples!
+            // redirect back or use error
+
 
             println "in selectsample: "
@@ -80 +85 @@
 
                   // testing:
-                  // there is a lack of data in the mockup
-                  // as long as there are no groups in the bootstart,
+                  // there is a lack of data in the mockup (subject groups are still missing)
+                  // as long as there are no groups in the boot script,
                   // we use this
                   subgroups = studyGroups.size()<=0 ?
-                      ["subject group 1","subject group 2"] : studyGroups
+                       ["subject group 1","subject group 2"] : studyGroups
 
                   render(view:"selectsample",model:[selectedStudies:selectedStudies,selectedStudyIds:selectedStudyIds,subgroups:subgroups])
                   break
+
              case "Event Groups":
-                  render("Event Groups")
-                  subgroups=["event group 1","event group 2"]
+                  def eventGroups = []
+                  if(selectedStudies!=null)
+                  {
+                    selectedStudies.each{ study ->
+                         println study.id
+                         println study.samplingEvents.each{ eventGroups.add(it) }
+                    }
+                  }
+                  subgroups=eventGroups
                   render(view:"selectsample",model:[selectedStudies:selectedStudies,selectedStudyIds:selectedStudyIds,subgroups:subgroups])
                   break
+
              case "Starting Time Groups":
+
+                  def timeGroups = []
+                  if(selectedStudies!=null)
+                  {
+                    selectedStudies.each{ study ->
+                         println study.samplingEvents.each{ 
+                             def timeDiff = it.getPrettyDuration( study.startDate, it.startTime ) 
+                             if( !timeGroups.contains(timeDiff) ) timeGroups.add(timeDiff)
+                         }
+                    }
+                  }
+                  subgroups=timeGroups
                   render("Starting Time Groups")
-                  subgroups=["time group 1","time group 2"]
                   render(view:"selectsample",model:[selectedStudies:selectedStudies,selectedStudyIds:selectedStudyIds,subgroups:subgroups])
                   break
+
              case ">> Execute and continue with biomarker selection":
                   render("Starting Time Groups")