Changeset 150 for trunk/grails-app/controllers/dbnp/studycapturing

Timestamp:

Jan 29, 2010, 6:08:49 PM (13 years ago)

Author:

jahn

Message:

Updated editing of Events. RemoteFunction? calls work. Still needs cleaning up (but its Friday evening).

Location:

trunk/grails-app/controllers/dbnp/studycapturing

Files:

• EventController.groovy (modified) (7 diffs)
• EventDescriptionController.groovy (modified) (2 diffs)

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

@@ -2 +2 @@
 import java.text.SimpleDateFormat
 import dbnp.data.Term
+import dbnp.data.Ontology
 
 class EventController {
@@ -25 +26 @@
 
     def createForEventDescription = {
-
         if( params["id"]==null)
         {
@@ -50 +50 @@
     // Output format: "01/20/2010 20:45"
     // Note: the "am" amd "pm" suffixes are removed.
-
     def parseDate = {  st ->
             def subst = st.substring(0,16)
@@ -69 +68 @@
     def save = {
         println "In EventController.save: ${params}"
-
         params["startTime"] = parseDate(params["startTime"])     // parse the date strings
         params["endTime"] = parseDate(params["endTime"])
@@ -139 +137 @@
             def eDate = new Date( params["endTime"])
             def description = EventDescription.findById((params["eventDescription"])["id"])
-            return [testo:params.clone(), sDate:sDate, eDate:eDate, description:description ]
+            return [eventInstance:eventInstance, testo:params.clone(), sDate:sDate, eDate:eDate, description:description ]
         }
 
@@ -149 +147 @@
                 redirect(action: "list")
             }
-            return [testo:params.clone(), sDate:eventInstance.startTime, eDate:eventInstance.endTime, description:eventInstance.eventDescription]
-        }
-
-    }
-
-
+            return [eventInstance:eventInstance, testo:params.clone(), sDate:eventInstance.startTime, eDate:eventInstance.endTime, description:eventInstance.eventDescription]
+        }
+
+    }
 
 
@@ -204 +200 @@
     }
 
-
-
-    def createDummies = {
-
-         ["ONE","TWO"].each{ x -> println x }
-         def t = new Term()
-         t.name =  "homo politicus russicus"
-         t.ontology = "Ontology: Monkies and Typewriters"
-         t.accession = "up or down"
-         t.save()
-
-         def pp = new ProtocolParameter()
-         pp.name = "LSD reatment"
-         pp.unit = "Tt"
-         pp.description = "feed the LSD to the subject"
-         pp.reference = t
-         pp.type = "String"     // should become ProtocolParameterType at some point
-         pp.save()
-
-         def p = new Protocol()
-         p.name = "Hugo (dummy #1)"
-         p.reference = t
-         p.save()
-         p.addToParameters(pp)
-
-         def ppi = new ProtocolParameterInstance()
-         ppi.value = "1.2"
-         ppi.protocolParameter = pp
-         ppi.save()
-
-         def ppi2 = new ProtocolParameterInstance()
-         ppi2.value = "23.5"
-         ppi2.protocolParameter = pp
-         ppi2.save()
-
-         def pi = new ProtocolInstance()
-         pi.protocol = p.find("from Protocol p ")
-         pi.save()
-         pi.addToValues(ppi)
-         pi.addToValues(ppi2)
-
-         def s= new Subject()
-         s.name = "Vladimir Putin"
-         s.species = t
-         s.save()
-
-         def ed = new EventDescription()
-         ed.name = "dummmy name"
-         ed.description = "dummmy description"
-         ed.protocol = pi
-         ed.classification = Term.find("from Term t")
-         ed.save()
-
-         def sdfh = new SimpleDateFormat("dd/MM/yyyy hh:mm")
-         def eventInstance = new Event()
-         def someDate = sdfh.parse("29/11/2008 18:00")
-         eventInstance.subject = s
-         eventInstance.eventDescription= ed
-         eventInstance.startTime = someDate
-         eventInstance.endTime = someDate
-         if( eventInstance.save() )
-         { redirect( action:show, id: eventInstance.id ) }
-         else { chain( action:list ) }
-
-
-
-    }
+    def showMySample = {
+          render( view:"showMySample" )
+    }
+
+    
 }

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

@@ -47 +47 @@
 
     def showMyProtocol = {
+        println params  // dbg, remove
 
-        def protocol = ( params.protocol) ?  Protocol.get(params.protocol) : Protocol.find("for Protocol id")
-        def description = EventDescription.get(params.id)
-        def protocolInstance = description.protocol
+        def protocol = ( params.protocolid) ?  Protocol.get(params.protocolid) : Protocol.find("for Protocol id")
+        def event = Event.get(params.id)
+        def protocolInstance = event.eventDescription.protocol
 
         println params
+        println event
         println protocol
-        println description
         println protocolInstance
 
-
-        if( protocol.id==protocolInstance.protocol.id ) {
-            println "redner this FILLED rubish"
-            println protocolInstance
-            println "the fuck?"
-            render( view:"showMyProtocolFilled", model:["protocolInstance":protocolInstance] )
+        if( protocolInstance && protocolInstance && protocol.id==protocolInstance.id ) {
+            def parameterStringValues = event.parameterStringValues
+            println parameterStringValues
+            print "showFull"
+            render( view:"showMyProtocolFilled", model:["protocolInstance":protocolInstance,"event":event,"parameterStringValues":parameterStringValues] )
         }
         else {
-            println "redner this EMPTY rubish"
-            render( view: "showMyProtocolEmpty", model:[protocol:protocol] )
-            //render( view:"showMyProtocolEmpty", model:[protocol:protocol] )
+            print "showEmpty"
+            if(protocol!=null) render( view: "showMyProtocolEmpty", model:["protocolInstance":protocol] )
+            else               render( "NULL" )
         }
 }
@@ -131 +131 @@
 
 
-    /* Jahn - For development only
-     * Create one dummy instance of EventDescription */
-    def createDummies =
-    {
-         def newInstance = new EventDescription()
-         newInstance.name = "dummmy name"
-         newInstance.description = "dummmy description"
-         newInstance.protocol = ProtocolInstance.find("from ProtocolInstance p ")
-         newInstance.classification = Term.find("from Term t")
-
-         if( newInstance.save() )
-              { redirect( action:show, id: newInstance.id ) }
-         else { chain( action:list ) }
-    }
-
-
-    def test = { render("test") }
+    def test = { println "test"
+            render("test") }
 }