Changeset 602

Timestamp:

Jun 23, 2010, 11:21:17 AM (13 years ago)

Author:

jahn

Message:

Several minor changes and cleaning up related to date repsentations communicated with SAM.

Location:

trunk/grails-app

Files:

• controllers/RestController.groovy (modified) (2 diffs)
• domain/dbnp/studycapturing/Event.groovy (modified) (1 diff)

trunk/grails-app/controllers/RestController.groovy

@@ -71 +71 @@
         * REST resource for the Simple Assay Module.
         * Provide a list of all assays for a given study
-        *
-        * Example for calling this resource: http://localhost:8080/gscf/rest/getAssays/json?externalStudyID=2
+        *
+        * Example for calling this resource: http://localhost:8080/gscf/rest/getAssays/json?externalStudyID=2
         *
         * @param  externalStudyID 
@@ -107 +107 @@
                                         'subject'       : sample.parentSubject.name,
                                         'event'         : sample.parentEvent.template.name,  // get the freaking name 
-                                        'startTime'     : sample.parentEvent.startTime
+                                        'startTime'     : sample.parentEvent.getDurationString()
                                 ] 
                                 items.push item 

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

@@ -56 +56 @@
         ]
 
-        // TODO: Jahn, could you indicate in a comment why these different duration functions exist?
-        def getDuration() {
-                return new RelTime(startTime, endTime);
+
+        /**
+         * Get extended, human readable string representing the duration between startTime and endTime 
+     *
+         * @return String
+         */
+        def getDurationString() {
+                return new RelTime(startTime, endTime).toPrettyRoundedString();
         }
 
+
+
         /**
-         * get a prettified duration
+         * Get short, human readable string representing the duration between startTime and endTime 
+     *
          * @return String
          */
-        static def getPrettyDuration(RelTime duration) {
-                return duration.toPrettyRoundedString();
+        def getShortDuration() {
+                return new RelTime(startTime, endTime).toPrettyRoundedString();
         }
 
-        def getPrettyDuration() {
-                getPrettyDuration(getDuration())
-        }
 
-        def getDurationString() {
-                def d = getDuration()
-                return getDuration().toPrettyString();
-        }
 
-        def getShortDuration() {
-                def d = getDuration()
-                return getDuration().toString();
-        }
+
+
 
         /**