update
authorrougeronj
Fri, 23 Jan 2015 09:57:03 +0100
changeset 133 12f782a13fa2
parent 129 7181e1f28eb0
child 134 119b6193c493
update
client/annotviz/app/annotstimeline.html
client/annotviz/app/js/annotsvizview.js
--- a/client/annotviz/app/annotstimeline.html	Fri Jan 23 01:00:00 2015 +0100
+++ b/client/annotviz/app/annotstimeline.html	Fri Jan 23 09:57:03 2015 +0100
@@ -28,7 +28,8 @@
     <script>
 
         var annotationChannel = 'ANNOT';
-        var eventCode = 'test_1';
+        var eventCode = 'atelier2';
+        var eventCodeSessionDay1 = 'atelier2_jour2';
         var wsUri;
         if (window.location.protocol === 'file:') {
             wsUri = 'ws://127.0.0.1:8090/broadcast';
@@ -68,6 +69,7 @@
         var annotstimeline = new annotviz.AnnotsTimeLine({
         	stageView : stageView,
             logger: logger,
+            serverUrl: serverUrl,
             ws: new annotviz.WsWrapper(wsUriAnnotation, logger),
             xInit: 0,
             yInit: 0,
@@ -82,6 +84,7 @@
             circleX:500,
             circleY:450,
             eventCode: eventCode,
+            eventCodeSessionDay1: eventCodeSessionDay1,
             channel: annotationChannel,
             annotCategories: annotCategories
         });
--- a/client/annotviz/app/js/annotsvizview.js	Fri Jan 23 01:00:00 2015 +0100
+++ b/client/annotviz/app/js/annotsvizview.js	Fri Jan 23 09:57:03 2015 +0100
@@ -41,7 +41,9 @@
 	var stageView = opts.stageView;
 	var currentTime = Date.now() + 3600*1000;
 	var eventCode = opts.eventCode;
+	var eventCodeSessionDay1 = opts.eventCodeSessionDay1;
     var channel = opts.channel;
+    var serverUrl = opts.serverUrl;
 
 	stageView.registerComponent(this);
 
@@ -61,6 +63,7 @@
         radius: 200,
         eventCode: eventCode,
         channel: channel,
+        serverUrl: serverUrl,
         annotCategories: this.annotCategories
     });
 	
@@ -81,8 +84,9 @@
         maxCellHeight: (timeLineDay2.radius - timeLineDay2.radius*2/3)/4,
         radius: timeLineDay2.radius*2/3,
         annotCategories: this.annotCategories,
-        eventCode: eventCode,
+        eventCode: eventCodeSessionDay1,
         channel: channel,
+        serverUrl: serverUrl,
         showClockGraphics:false
     });