Changeset 219

Timestamp:

Mar 1, 2010, 5:47:26 PM (13 years ago)

Author:

jahn

Message:

EventDescription? in progress. This is still ugly, because it uses a lot of JS to avoid to much loading from the server; however, the JS lines are just dumped into the page. Instead of this dumping, the JS should go into a tag library or something similar.

Still missing are: (1) a popup box for adding parameter string lists, (2) parsing the parameters form the view into the database in the model upon completion of the action.

File:

• trunk/grails-app/controllers/dbnp/studycapturing/EventDescriptionController.groovy (modified) (2 diffs)

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

@@ -47 +47 @@
 
     def showMyProtocol = {
-
-        def protocol = ( params.protocolid) ?  Protocol.get(params.protocolid) : Protocol.find("for Protocol id")
-        def event = Event.get(params.id)
-        def protocolInstance = event.eventDescription.protocol
-
-        if( protocolInstance && protocolInstance && protocol.id==protocolInstance.id ) {
-            def parameterStringValues = event.parameterStringValues
-            render( view:"showMyProtocolFilled", model:["protocolInstance":protocolInstance,"event":event,"parameterStringValues":parameterStringValues] )
+        def description = EventDescription.get(params.id)
+        if( description.protocol==null ) {
+            protocol = new Protocol()
+            render( view:"showMyProtocolEmpty", model:[protocol:protocol,description:description] )
         }
         else {
-            if(protocol!=null) render( view: "showMyProtocolEmpty", model:["protocolInstance":protocol] )
-            else               render( "NULL" )
+            render( view: "showMyProtocolFilled", model:[protocol:description.protocol,description:description] )
         }
-}
+    }
+
+
+    def showMyProtocolEmpty = {
+       println "in showMyProtocolEmpty"
+    }
+
+
+    def showMyProtocolFilled = {
+       println "in showMyProtocolFilled"
+    }
+
+
+
 
 
@@ -121 +129 @@
 
 
-    def test = { println "test"
-            render("test") }
+    def test = { render(params) }
+
+    def test2 = {
+        def eventDescriptionInstance = EventDescription.get(params.id)
+        if (!eventDescriptionInstance) {
+            flash.message = "${message(code: 'default.not.found.message', args: [message(code: 'eventDescription.label', default: 'EventDescription'), params.id])}"
+            redirect(action: "list")
+        }
+        else {
+            return [eventDescriptionInstance: eventDescriptionInstance]
+        }
+    }
+
+
+    def addProtocolParameter = {
+        render( action:"showProtocolParameters", model:['addNew':true] )
+    }
+
+
+    def showProtocolParameters = {
+        println params
+
+        def description = EventDescription.get(params.id)
+        def protocol =  description.protocol==null ? new Protocol() : description.protocol
+
+        if( params['addOneParameter']=='true') {    // add a new parameter
+            println "adding"
+            def parameter = new ProtocolParameter()
+            protocol.addToParameters(parameter)
+        }
+
+        def list = []
+        protocol.parameters.each {
+            list.add(it)
+            list.sort{ a,b -> a.name <=> b.name }
+        }
+
+        render( view:"showProtocolParameters", model:[protocol:protocol,description:description,list:list] )
+    }
+
 }