Changeset 497 for trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

Timestamp:

May 28, 2010, 4:19:06 PM (13 years ago)

Author:

roberth

Message:

Implemented RELTIME parsing and showing in the wizard.
Also made TEXT templatefields to show a textarea

File:

• trunk/grails-app/domain/dbnp/studycapturing/Event.groovy (modified) (3 diffs)

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

@@ -14 +14 @@
  */
 class Event extends TemplateEntity implements Serializable {
-        Date startTime
-        Date endTime
+        long startTime
+        long endTime
 
         /**
@@ -48 +48 @@
                         new TemplateField(
                                 name: 'startTime',
-                                type: TemplateFieldType.DATE),
+                                type: TemplateFieldType.RELTIME),
                         new TemplateField(
                                 name: 'endTime',
-                                type: TemplateFieldType.DATE)
+                                type: TemplateFieldType.RELTIME)
                 ]
 
-        /**
-         * get the event duration
-         * @return Duration
-         */
-        static def getDuration(date1, date2) {
-                def timeMillis = (date2.getTime() - date1.getTime()).abs()
-                def days = (timeMillis / (1000 * 60 * 60 * 24)).toInteger()
-                def hours = (timeMillis / (1000 * 60 * 60)).toInteger()
-                def minutes = (timeMillis / (1000 * 60)).toInteger()
-                def seconds = (timeMillis / 1000).toInteger()
-                def millis = (timeMillis % 1000).toInteger()
-
-                return new Duration(days, hours, minutes, seconds, millis)
-        }
-
         def getDuration() {
-                return getDuration(startTime, endTime)
+                return new RelTime(startTime, endTime);
         }
 
@@ -77 +62 @@
          * @return String
          */
-        static 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")
+        static def getPrettyDuration(RelTime duration) {
+            return duration.toPrettyRoundedString();
         }
 
         def getPrettyDuration() {
-                getPrettyDuration(getDuration())
-        }
-
-        static def getPrettyDuration(date1, date2) {
-                return getPrettyDuration(getDuration(date1, date2))
+            getPrettyDuration(getDuration())
         }
 
         def getDurationString() {
-                def d = getDuration()
-                return "${d.days} days, ${d.hours} hrs, ${d.minutes} min, ${d.seconds} sec."
+            def d = getDuration()
+            return getDuration().toPrettyString();
         }
 
         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 d = getDuration()
+            return getDuration().toString();
         }