Changeset 351

Timestamp:

Apr 19, 2010, 3:56:17 PM (13 years ago)

Author:

keesvb

Message:

removed EventDescription? and Protocol references from EventController?. Clean build should now work again.

File:

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

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

@@ -18 +18 @@
 
 
-    def createForEventDescription = {
+    /*def createForEventDescription = {
         if( params["id"]==null)
         {
@@ -36 +36 @@
             return [testo:params.clone(), sDate:eventInstance.startTime, eDate:eventInstance.endTime, description:eventInstance.eventDescription]
         }
-    }
+    }*/
 
 
@@ -204 +204 @@
         if( !(params['id']=~/^[\d]+$/) ) {
 
+            /* Not needed anymore: replace by template check?
+
             def description = new EventDescription()
             description.name = (params['name']==null || params['name'].replaceAll(/\S/,'').size()==0 ) ? '[no Name]' : params['name']
@@ -215 +217 @@
             else {
                 description.errors.each{ println it }
-            }
+            }*/
 
             def event = description.isSamplingEvent ? new SamplingEvent() : new Event();
@@ -259 +261 @@
             // save basic changes in event and event description
 
+            /* Not needed anymore: replace by template check?
+
             def description = event.eventDescription
             def oldProtocol = description.protocol
@@ -266 +270 @@
             description.description = (params['description']==null || params['description'].replaceAll(/\w/,'').size()==0 ) ? '[no description]' : params['description']
             description.isSamplingEvent = params['isSamplingEvent']=='on' ? true : false
+
+            */
+
             event.startTime = new Date(params["startTime"])
             event.endTime   = new Date(params["endTime"])
+
+
+            /* Not needed anymore: replace by template check?
 
 
@@ -290 +300 @@
                 // add all new parameter values
                 parseParamsForParameterValues( params, event )
-            }
+
+
+            }
+
+            */
 
 
@@ -316 +330 @@
             }
 
-            ((Event)event).eventDescription=description
+            //((Event)event).eventDescription=description
 
 
@@ -391 +405 @@
             def sDate = new Date()
             def eDate = new Date()
-            def description = new EventDescription()
-            return [eventInstance:eventInstance, testo:params.clone(), sDate:sDate, eDate:eDate, description:description, showSample:false, samples:null, createNew:true ]
+            //def description = new EventDescription()
+            return [eventInstance:eventInstance, testo:params.clone(), sDate:sDate, eDate:eDate,
+                    //description:description,
+            showSample:false, samples:null, createNew:true ]
         }
 
@@ -413 +429 @@
             }
 
-            return [eventInstance:eventInstance, testo:params.clone(), sDate:eventInstance.startTime, eDate:eventInstance.endTime, description:eventInstance.eventDescription, showSample:showSample, samples:samples, createNew:false ]
+            return [eventInstance:eventInstance, testo:params.clone(), sDate:eventInstance.startTime, eDate:eventInstance.endTime,
+                    // description:eventInstance.eventDescription,
+            showSample:showSample, samples:samples, createNew:false ]
         }