client/app/app.js
changeset 36 5d392dea4f49
parent 34 dc21d793b5d4
child 42 926f0426ce78
equal deleted inserted replaced
35:139737335c8a 36:5d392dea4f49
    93             }
    93             }
    94             var eventCode = $location.search().event;
    94             var eventCode = $location.search().event;
    95             if(typeof eventCode==='undefined' || eventCode===''){
    95             if(typeof eventCode==='undefined' || eventCode===''){
    96                 eventCode = getURLParameter('event');
    96                 eventCode = getURLParameter('event');
    97                 if(typeof eventCode==='undefined' || eventCode===''){
    97                 if(typeof eventCode==='undefined' || eventCode===''){
    98                     alert('le code de l\'événement doit être indiqué dans l\'url selon "?event=CODE_EVENEMENT".');
    98                     alert('le code de l\'événement doit être indiqué dans l\'url selon ?event=CODE_EVENEMENT.');
    99                     return;
    99                     return;
   100                 }
   100                 }
   101             }
   101             }
   102             wsuri = wsuri + '?event=' + eventCode;
   102             wsuri = wsuri + '?event=' + eventCode;
   103 
   103 
   126                     showAlert('Communication interrompue : la socket vient de se fermer.', false);
   126                     showAlert('Communication interrompue : la socket vient de se fermer.', false);
   127                     sock = null;
   127                     sock = null;
   128                 };
   128                 };
   129 
   129 
   130                 sock.onmessage = function(e) {
   130                 sock.onmessage = function(e) {
       
   131                     var data_json = JSON.parse(e.data);
       
   132                     //console.log('1', data_json);
   131                     if(context.logging){
   133                     if(context.logging){
   132                         log('Got message: ', e.data);
   134                         log('Got message: ' + e.data);
   133                     }
   135                     }
   134                     //var data_json = JSON.parse(e.data);
       
   135                     //showAlert('Annotation bien reçue.', true);
   136                     //showAlert('Annotation bien reçue.', true);
   136                     //console.log('2 message', $scope.annotPile.length);
   137                     //console.log('2 message', $scope.annotPile.length);
   137                     if($scope.annotPile.length>0){
   138                     if($scope.annotPile.length>0){
   138                         var c = $scope.annotPile.shift();
   139                         var c = $scope.annotPile.shift();
   139                         //console.log('3 message', c);
   140                         //console.log('3 message', c);
       
   141                         //console.log('2',data_json.status,data_json.status==='OK');
       
   142                         var ok = data_json.status==='OK';
   140                         var i;
   143                         var i;
   141                         if(c===false){
   144                         if(c===false){
   142                             //showAlert('Annotation envoyée.', true);
   145                             //showAlert('Annotation envoyée.', true);
   143                             $scope.sendBtnSuccess = true;
   146                             $scope.sendBtnSuccess = ok;
   144                             i = $interval(function(){ $interval.cancel(i); $scope.sendBtnSuccess = false; }, 2000, 1);
   147                             $scope.sendBtnError = !ok;
       
   148                             i = $interval(function(){ $interval.cancel(i); $scope.sendBtnSuccess = false; $scope.sendBtnError = false; }, 2000, 1);
   145                         }
   149                         }
   146                         else{
   150                         else{
   147                             c.sendSuccess = true;
   151                             c.sendSuccess = ok;
   148                             i = $interval(function(){ $interval.cancel(i); c.sendSuccess = false; }, 2000, 1);
   152                             c.sendError = !ok;
       
   153                             i = $interval(function(){ $interval.cancel(i); c.sendSuccess = false; c.sendError = false; }, 2000, 1);
   149                         }
   154                         }
   150                         if(!$scope.$$phase) {
   155                         if(!$scope.$$phase) {
   151                             $scope.$apply();
   156                             $scope.$apply();
   152                         }
   157                         }
   153                     }
   158                     }