Changeset 170

Timestamp:

Feb 3, 2010, 6:08:33 PM (9 years ago)

Author:

jahn

Message:

Fixed a bug in save().

File:

• trunk/grails-app/controllers/dbnp/studycapturing/EventController.groovy (modified) (6 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/EventController.groovy

@@ -66 +66 @@
 
 
-    // This action is not complete yet.
-    // (1) Need to include Sampling events.
-    // (2) This probably causes orphened PrtocolPrameters that have to be delt with.
-    // (3) Parts of this might have to be moved into the Domain object's save() method.
-    // (4) The correspoding view's params are bloated and contain redundancy.
-    // (5) The whole thing should be moved to update.
-    // (6) A "create" should be added.
 
     def save = {
@@ -78 +71 @@
         def event = Event.get(params["id"])
 
-
-        if( event==null ) {                         // this is an entirely new event
+        if( event==null ) {                                                        // this is an entirely new event
             render(action: "list", total:Event.count() )
         }
 
-        params["startTime"] = parseDate(params["startTime"])     // parse the date strings
+        params["startTime"] = parseDate(params["startTime"])                       // parse the date strings
         params["endTime"] = parseDate(params["endTime"])
 
@@ -93 +85 @@
         def protocolParameters = params["protocolParameter"]
 
-
-        if(oldProtocol<=>newProtocol) {                                             // protocol id changed
+        println "\n\nparams"
+        params.each{ println it }
+
+        if(oldProtocol<=>newProtocol) {                                            // protocol id changed
             event.eventDescription=EventDescription.get(newProtocol)
             event.parameterStringValues.clear()                                    // this does not propagate orphened parameters
             def protocol=Protocol.get(newProtocol)
             protocolParameters.each{ key, value ->
-                 def parameter=ProtocolParameter.get(key)
-                 event.parameterStringValues[key] = value
+                 def parameter=ProtocolParameter.get(key).name
+                 event.parameterStringValues[parameter] = value
             }
+            println event.parameterStringValues
+            event.eventDescription.protocol=protocol
         }
         else                                                                       // protocol is the same, values changed
@@ -107 +103 @@
             protocolParameters.each{ key, value ->
                  def parameter=ProtocolParameter.get(key)
-                 event.parameterStringValues[key]=value
+                 event.parameterStringValues[parameter.name]=value                 // changed from key to id
             }
 
         }
 
-        println "parameterStringValues: " + event.parameterStringValues
-
-        println "Old Protocol: " + event.eventDescription.protocol.id
-        println "New Protocol: " + params["protocol.id"]
-
-
-        println "Old: "
-        println event.parameterStringValues.each {
-                k,v -> println "${k}: ${v}\n"
-        }
-
-        println "New:"
-        protocolParameters.each{
-                k,v -> println "${k}: ${v}\n"
-        }
 
         if (event.save(flush: true)) {
@@ -171 +152 @@
 
 
+
+    // This action is not complete yet.
+    // (1) Need to include SamplingEvents.
+    // (2) This probably causes orphened PrtocolPrameters that have to be delt with.
+    //     The orphanes have to be managed centrally with the Protocols.
+    // (3) Parts of this might have to be moved into the Domain object's save() method.
+    // (4) The correspoding view's params are bloated and contain redundancy.
+    // (5) The whole thing should be moved to update.
+    // (6) A "create" should be added.
 
     def edit = {
@@ -223 +213 @@
     }
 
+
     def delete = {
         def eventInstance = Event.get(params.id)