Changeset 209 for trunk/grails-app/domain

Timestamp:

Feb 22, 2010, 6:35:37 PM (13 years ago)

Author:

duh

Message:

• added events, eventDescriptions, etc

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Event.groovy (modified) (4 diffs)
• EventDescription.groovy (modified) (1 diff)
• EventGroup.groovy (modified) (1 diff)

trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

@@ -7 +7 @@
  * to multiple subjects at the same time. That is why the actual description of the event is factored out into a more
  * general EventDescription class. Events that also lead to sample(s) should be instantiated as SamplingEvents.
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
  */
-class Event {
-
+class Event implements Serializable {
         Subject subject
         EventDescription eventDescription
@@ -19 +23 @@
 
         static hasMany = [
-                parameterStringValues : String, // stores both STRING and STRINGLIST items (latter should be checked against the list)
-                parameterIntegerValues : int,
-                parameterFloatValues : float
+                parameterStringValues: String, // stores both STRING and STRINGLIST items (latter should be checked against the list)
+                parameterIntegerValues: int,
+                parameterFloatValues: float,
         ]
 
+        static constraints = {
+                subject(nullable: true, blank: true)    // TODO: subject is to be removed from Event, and into EventGroup
+                startTime(nullable:false)
+                endTime(validator: {val, obj ->
+           if (val && val.before(obj.startTime)) {
+                return 'endTimeshouldbegreater'
+           }
+        })
+        }
 
         // time diff between end and start date
         // thus, do this manually as follows
-        def getDuration( date1, date2 ) {
+
+        def getDuration(date1, date2) {
                 def timeMillis = (date2.getTime() - date1.getTime()).abs()
                 def days = (timeMillis / (1000 * 60 * 60 * 24)).toInteger()
@@ -38 +52 @@
         }
 
-
         def getDuration() {
                 return getDuration(startTime, endTime)
         }
 
-
         // return a string that prints the duration sensibly.
         // the largest date unit (sec, min, h, day, week, month, or year)
         // is output
-        def getPrettyDuration( duration ) {
-             def handleNumerus = { number ,string ->
-                     return number.toString() + (number==1 ? string : string + 's' )
-             }
-             if( duration.getYears()   > 0 ) return handleNumerus( duration.getYears(), " year" )
-             if( duration.getMonths()  > 0 ) return handleNumerus( duration.getMonths(), " month" )
-             if( duration.getDays()    > 0 ) return handleNumerus( duration.getDays(), " day" )
-             if( duration.getHours()   > 0 ) return handleNumerus( duration.getHours(), " hour" )
-             if( duration.getMinutes() > 0 ) return handleNumerus( duration.getMinutes(), " minute" )
-                                             return handleNumerus( duration.getSeconds(), " second" )
+
+        def getPrettyDuration(duration) {
+                def handleNumerus = {number, string ->
+                        return number.toString() + (number == 1 ? string : string + 's')
+                }
+                if (duration.getYears() > 0) return handleNumerus(duration.getYears(), " year")
+                if (duration.getMonths() > 0) return handleNumerus(duration.getMonths(), " month")
+                if (duration.getDays() > 0) return handleNumerus(duration.getDays(), " day")
+                if (duration.getHours() > 0) return handleNumerus(duration.getHours(), " hour")
+                if (duration.getMinutes() > 0) return handleNumerus(duration.getMinutes(), " minute")
+                return handleNumerus(duration.getSeconds(), " second")
         }
-
 
         // convenience method. gives formatted string output for a duration
         def getPrettyDuration() {
-             getPrettyDuration( getDuration() )
+                getPrettyDuration(getDuration())
         }
 
-
         // convenience method. gives formatted string output for a duration
-        def getPrettyDuration( date1, date2 )
-        {
-             return  getPrettyDuration( getDuration( date1, date2 ) )
+        def getPrettyDuration(date1, date2) {
+                return getPrettyDuration(getDuration(date1, date2))
         }
-
 
         def getDurationString() {
@@ -78 +87 @@
         }
 
+        def getShortDuration() {
+                def d = getDuration()
+                def days = d.days
+                def hours = d.hours - (24 * days)
+                def minutes = d.minutes - (24 * 60 * days) - (60 * hours)
+                return "${days}d ${hours}:${minutes}"
+        }
 
         def isSamplingEvent() {
-                return ( this instanceof SamplingEvent )
-        }
-
+                return (this instanceof SamplingEvent)
+        }
 
         def String toString() {
                 return eventDescription ? eventDescription.name : ""
         }
-
 }

trunk/grails-app/domain/dbnp/studycapturing/EventDescription.groovy

@@ -21 +21 @@
 
         static constraints = {
+                name(nullable: false, blank: false)
+                description(nullable: false, blank: false)
                 classification(nullable: true, blank: true)
+                protocol(nullable: true, blank: true)
+        }
+
+        def String toString() {
+                return name
         }
 }

trunk/grails-app/domain/dbnp/studycapturing/EventGroup.groovy

@@ -1 +1 @@
 package dbnp.studycapturing
 
-class EventGroup {
-
+/**
+ * EventGroup groups events
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
+ */
+class EventGroup implements Serializable {
         String name
 
         static hasMany = [
-                subjects : Subject,
-                events : Event
+                subjects: Subject,
+                events: Event
         ]
 
-    static constraints = {
-    }
+        static constraints = {
+        }
 }