Changeset 1203 for trunk/grails-app/controllers

Timestamp:

Nov 25, 2010, 5:26:07 PM (10 years ago)

Author:

robert@…

Message:

Updated the events timeline in the study view, according to ticket #72

File:

• trunk/grails-app/controllers/dbnp/studycapturing/StudyController.groovy (modified) (2 diffs)

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

@@ -171 +171 @@
                 return;
             }
-            events = eventGroup?.events;
+            events = eventGroup?.events + eventGroup?.samplingEvents;
         }
 
@@ -186 +186 @@
             for( templateField in event.giveTemplateFields() ) {
                 def value = event.getFieldValue( templateField.name );
-                if( value ) {
-                    parameters << templateField.name + " = " + value;
-                }
-            }
-
-             json.events << [
-                'start':    new Date( startDate + event.startTime * 1000 ),
-                'end':      new Date( startDate + event.endTime * 1000 ),
-                'durationEvent': !event.isSamplingEvent(),
-                'title': event.template.name + " (" + parameters.join( ', ' ) + ")",
-                'description': parameters
-            ]
+                                if( value ) {
+                                        if( templateField.type == TemplateFieldType.RELTIME )
+                                                value = new RelTime( value ).toString();
+
+                        def param = templateField.name + " = " + value;
+
+                                        if( templateField.unit )
+                                                param += templateField.unit;
+
+                    parameters << param ;
+                }
+            }
+
+                        def description = parameters.join( '<br />\n' );
+
+                        if( event instanceof SamplingEvent ) {
+                                 json.events << [
+                                        'start':    new Date( startDate + event.startTime * 1000 ),
+                                        'end':      new Date( startDate + event.startTime * 1000 ),
+                                        'durationEvent': false,
+                                        'title': event.template.name,
+                                        'description': description
+                                ]
+                        } else {
+                                 json.events << [
+                                        'start':    new Date( startDate + event.startTime * 1000 ),
+                                        'end':      new Date( startDate + event.endTime * 1000 ),
+                                        'durationEvent': true,
+                                        'title': event.template.name,
+                                        'description': description
+                                ]
+                                
+                        }
         }
         render json as JSON