# HG changeset patch
# User rougeronj
# Date 1422004199 -3600
# Node ID d3066fa80a8159181932d417c20063d6fb4428ae
# Parent  119b6193c4937fc43ba1fcf80e67b52ee9a24a4f
Add time code for day 1

diff -r 119b6193c493 -r d3066fa80a81 client/annotviz/app/annotstimeline.html
--- a/client/annotviz/app/annotstimeline.html	Fri Jan 23 09:58:21 2015 +0100
+++ b/client/annotviz/app/annotstimeline.html	Fri Jan 23 10:09:59 2015 +0100
@@ -29,7 +29,6 @@
 
         var annotationChannel = 'ANNOT';
         var eventCode = 'atelier2';
-        var eventCodeSessionDay1 = 'atelier2_jour2';
         var wsUri;
         if (window.location.protocol === 'file:') {
             wsUri = 'ws://127.0.0.1:8090/broadcast';
@@ -84,7 +83,6 @@
             circleX:500,
             circleY:450,
             eventCode: eventCode,
-            eventCodeSessionDay1: eventCodeSessionDay1,
             channel: annotationChannel,
             annotCategories: annotCategories
         });
diff -r 119b6193c493 -r d3066fa80a81 client/annotviz/app/annotsvizview.html
--- a/client/annotviz/app/annotsvizview.html	Fri Jan 23 09:58:21 2015 +0100
+++ b/client/annotviz/app/annotsvizview.html	Fri Jan 23 10:09:59 2015 +0100
@@ -24,16 +24,12 @@
 
         var pianorollChannel  = 'PIANOROLL';
         var annotationChannel = 'ANNOT';
-        var eventCode = 'test_1';
-        var serverUrl = "http://localhost:8080";
+        var eventCode = 'atelier2';
+        var eventCodeSessionDay1 = 'atelier2_jour2';
+        var serverUrl = "http://172.16.0.20:8080";
         var wsUri;
 
-        if (window.location.protocol === 'file:') {
-            wsUri = 'ws://172.16.0.20:8090/broadcast';
-        }
-        else {
-            wsUri = 'ws://' + window.location.hostname + ':8090/broadcast';
-        }
+        wsUri = 'ws://172.16.0.20:8090/broadcast';
         wsUriPianoroll = wsUri + '?channel=' + pianorollChannel + '&event_code=' + eventCode;
         wsUriAnnotation = wsUri + '?channel=' + annotationChannel + '&event_code=' + eventCode;
 
@@ -47,11 +43,13 @@
             urlCategories: serverUrl + "/p/api/v1/event/" + eventCode,
             logger: logger,
             stageView: stageView,
+            serverUrl:serverUrl,
             wsPianoroll: new annotviz.WsWrapper(wsUriPianoroll, logger),
             wsAnnot: new annotviz.WsWrapper(wsUriAnnotation, logger),
             timeBegin: Date.parse("2015-01-23T09:30:00+01:00"),
             timeEnd: Date.parse("2015-01-23T18:30:00+01:00"),
             eventCode: eventCode,
+            eventCodeSessionDay1: eventCodeSessionDay1,
             channel: annotationChannel
         });
 
diff -r 119b6193c493 -r d3066fa80a81 client/annotviz/app/js/annotstimeline.js
--- a/client/annotviz/app/js/annotstimeline.js	Fri Jan 23 09:58:21 2015 +0100
+++ b/client/annotviz/app/js/annotstimeline.js	Fri Jan 23 10:09:59 2015 +0100
@@ -117,6 +117,7 @@
                 jsonLoader.load();
                 currentPage++;
             }
+            console.log(res);
         };
         processResFunction();
 
diff -r 119b6193c493 -r d3066fa80a81 client/annotviz/app/js/annotsvizview.js
--- a/client/annotviz/app/js/annotsvizview.js	Fri Jan 23 09:58:21 2015 +0100
+++ b/client/annotviz/app/js/annotsvizview.js	Fri Jan 23 10:09:59 2015 +0100
@@ -42,6 +42,8 @@
 	var currentTime = Date.now() + 3600*1000;
 	var eventCode = opts.eventCode;
 	var eventCodeSessionDay1 = opts.eventCodeSessionDay1;
+	console.log("OUOAUOAUOAUAOUAOUA");
+	console.log(eventCodeSessionDay1);
     var channel = opts.channel;
     var serverUrl = opts.serverUrl;