13 }) |
13 }) |
14 .config(function($logProvider){ |
14 .config(function($logProvider){ |
15 $logProvider.debugEnabled(true); |
15 $logProvider.debugEnabled(true); |
16 }) |
16 }) |
17 .service('dataApi', function($resource, context) { |
17 .service('dataApi', function($resource, context) { |
18 console.log('dataApi',$resource, context); |
18 //console.log('dataApi',$resource, context); |
19 this.dataResource = $resource(context.urls.dataUrl); |
19 this.dataResource = $resource(context.urls.dataUrl); |
20 }) |
20 }) |
21 .service('dataModel', function(dataApi) { |
21 .service('dataModel', function(dataApi) { |
22 //console.log('dataModel',this,dataApi); |
22 //console.log('dataModel',this,dataApi); |
23 this.data = dataApi.dataResource.get(); |
23 this.data = dataApi.dataResource.get(); |
24 }) |
24 }) |
25 .controller('homeCtrl', function($scope, $location, dataModel, context, $interval){ |
25 .controller('homeCtrl', function($scope, $location, dataModel, context, $interval){ |
|
26 |
|
27 function getURLParameter(name) { |
|
28 return decodeURI( |
|
29 (new RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1] |
|
30 ); |
|
31 } |
|
32 |
26 //console.log('homeCtrl 1', $scope, $location, context); |
33 //console.log('homeCtrl 1', $scope, $location, context); |
27 console.log('homeCtrl 2', context); |
34 //console.log('homeCtrl 2', context); |
28 $scope.data = dataModel.data; |
35 $scope.data = dataModel.data; |
29 |
36 |
30 dataModel.data.$promise.then(function(data) { |
37 dataModel.data.$promise.then(function(data) { |
31 if(typeof data.categories!=='undefined' && data.categories.length>0){ |
38 if(typeof data.categories!=='undefined' && data.categories.length>0){ |
32 var cats = []; |
39 var cats = []; |
82 if (window.location.protocol === 'file:') { |
89 if (window.location.protocol === 'file:') { |
83 wsuri = 'ws://127.0.0.1:8090/annot'; |
90 wsuri = 'ws://127.0.0.1:8090/annot'; |
84 } else { |
91 } else { |
85 wsuri = 'ws://' + window.location.hostname + ':8090/annot'; |
92 wsuri = 'ws://' + window.location.hostname + ':8090/annot'; |
86 } |
93 } |
87 wsuri = wsuri + '?event=test'; |
94 var eventCode = $location.search().event; |
|
95 if(typeof eventCode==='undefined' || eventCode===''){ |
|
96 eventCode = getURLParameter('event'); |
|
97 if(typeof eventCode==='undefined' || eventCode===''){ |
|
98 alert('le code de l\'événement doit être indiqué dans l\'url selon "?event=CODE_EVENEMENT".'); |
|
99 return; |
|
100 } |
|
101 } |
|
102 wsuri = wsuri + '?event=' + eventCode; |
88 |
103 |
89 if ('WebSocket' in window) { |
104 if ('WebSocket' in window) { |
90 sock = new WebSocket(wsuri); |
105 sock = new WebSocket(wsuri); |
91 } else if ('MozWebSocket' in window) { |
106 } else if ('MozWebSocket' in window) { |
92 sock = new window.MozWebSocket(wsuri); |
107 sock = new window.MozWebSocket(wsuri); |
112 sock = null; |
127 sock = null; |
113 }; |
128 }; |
114 |
129 |
115 sock.onmessage = function(e) { |
130 sock.onmessage = function(e) { |
116 if(context.logging){ |
131 if(context.logging){ |
117 console.log('Got message: ', e.data); |
132 log('Got message: ', e.data); |
118 } |
133 } |
119 //var data_json = JSON.parse(e.data); |
134 //var data_json = JSON.parse(e.data); |
120 //showAlert('Annotation bien reçue.', true); |
135 //showAlert('Annotation bien reçue.', true); |
121 console.log('2 message', $scope.annotPile.length); |
136 //console.log('2 message', $scope.annotPile.length); |
122 if($scope.annotPile.length>0){ |
137 if($scope.annotPile.length>0){ |
123 var c = $scope.annotPile.shift(); |
138 var c = $scope.annotPile.shift(); |
124 //console.log('3 message', c); |
139 //console.log('3 message', c); |
125 var i; |
140 var i; |
126 if(c===false){ |
141 if(c===false){ |
186 $scope.selectedlevel = c.subcategories; |
201 $scope.selectedlevel = c.subcategories; |
187 $scope.returnVisStyle = {visibility:'show'}; |
202 $scope.returnVisStyle = {visibility:'show'}; |
188 } |
203 } |
189 else{ |
204 else{ |
190 // Send query |
205 // Send query |
191 console.log('send ntm', c); |
206 //console.log('send ntm', c); |
192 $scope.sendAnnotation(label, code, c); |
207 $scope.sendAnnotation(label, code, c); |
193 } |
208 } |
194 }; |
209 }; |
195 |
210 |
196 }); |
211 }); |