Commit 4a4e49eb by Jose Antonio

WebSocket scene

parent fff79ad3
...@@ -235,7 +235,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec ...@@ -235,7 +235,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
//Socket notify //Socket notify
io.socket.post('/scene', { io.socket.post('/scene', {
action: 'delete', action: 'delete',
data: {id:scene.id} scene: {id:scene.id}
}, function () {}); }, function () {});
//Reload active scene //Reload active scene
...@@ -272,7 +272,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec ...@@ -272,7 +272,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
active: scene.active, active: scene.active,
id_stu:scene.student}) id_stu:scene.student})
.success(function (scene) { .success(function (scene) {
var data= {name: scene.name, var data= {
id: scene.id,
name: scene.name,
active: scene.active, active: scene.active,
categories: scene.categories, categories: scene.categories,
student: scene.student, student: scene.student,
...@@ -641,20 +643,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec ...@@ -641,20 +643,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
// Add new listener to the event // Add new listener to the event
io.socket.off('vocabulary'); io.socket.off('vocabulary');
io.socket.on('vocabulary', function (data) { io.socket.on('vocabulary', function (data) {
// switch (data.action) {
// case 'add':
// $scope.loadPictos();
// break;
// case 'update':
// $scope.loadPictos();
// break;
// case 'delete':
// $scope.loadPictos();
// break;
// default:
// $scope.loadPictos();
// break;
// }
if(data.attributes.id_scene == $scope.viewingScene.id){ if(data.attributes.id_scene == $scope.viewingScene.id){
//Reload scene //Reload scene
$translate('reload_scene').then(function (translation) { $translate('reload_scene').then(function (translation) {
...@@ -665,6 +653,26 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec ...@@ -665,6 +653,26 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope.$apply(); $scope.$apply();
}); });
// Add new listener to the event
io.socket.off('scene');
io.socket.on('scene', function (data) {
if(data.action == "delete" && data.scene.id == $scope.viewingScene.id){
//Scene deleted
$translate('scene_deleted').then(function (translation) {
ngToast.success({ content: translation });
});
$scope.showActiveScene();
}else if(data.action == "update" && data.scene.id == $scope.viewingScene.id){
$translate('scene_updated').then(function (translation) {
ngToast.success({ content: translation });
});
$scope.showScene(data.scene.id);
}
$scope.loadScenesList();
$scope.$apply();
});
// Load pictos // Load pictos
$scope.showActiveScene(); $scope.showActiveScene();
$scope.loadScenesList(); $scope.loadScenesList();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment