Downloading new action in installation steps and in update page

GladysAssistant · Sep 14, 2016 · ed34563 · ed34563
1 parent bd58186
commit ed34563
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 1 deletion.
diff --git a/assets/js/app/installation/installation.controller.js b/assets/js/app/installation/installation.controller.js
@@ -87,7 +87,7 @@
 
         vm.downloadStep = 1;
         vm.downloadProgress = 0;
-        var nbSteps = 8;
+        var nbSteps = 9;
 
         // get all modes
         updateService.updateModes()
@@ -105,6 +105,14 @@
               // get all events
              return updateService.updateEvents(); 
           })
+          .then(function(){
+
+              vm.downloadStep++;
+              vm.downloadProgress += 100/nbSteps;
+
+              // get all actions
+             return updateService.updateActions(); 
+          })
           .then(function(){
 
               vm.downloadStep++;

diff --git a/assets/js/app/system/system.controller.js b/assets/js/app/system/system.controller.js
@@ -57,6 +57,11 @@
                 // get all events
                 return updateService.updateEvents(); 
             })
+            .then(function(){
+
+                // get all actions
+                return updateService.updateActions(); 
+            })
             .then(function(){
 
                 // get all boxTypes

diff --git a/assets/js/app/update/update.service.js b/assets/js/app/update/update.service.js
@@ -20,6 +20,7 @@
 
         var service = {
             verify: verify,
+            updateActions: updateActions,
             updateEvents: updateEvents,
             updateModes: updateModes,
             updateBoxTypes: updateBoxTypes,
@@ -34,6 +35,10 @@
             return $http({method: 'GET', url: '/update/verify'});
         }
 
+        function updateActions(){
+            return $http({method: 'GET', url: '/update/action'});
+        }
+
         function updateEvents(){
             return $http({method: 'GET', url: '/update/event'});
         }

diff --git a/config/locales/en.json b/config/locales/en.json
@@ -85,6 +85,7 @@
   "installation-invalid-birthdate": "Invalid birthdate, should be in format YYYY-MM-DD.",
   "installation-downloading-modes": "Downloading modes...",
   "installation-downloading-sentences": "Downloading sentences...",
+  "installation-downloading-actions": "Downloading actions...",
   "installation-downloading-events": "Downloading events...",
   "installation-downloading-boxs": "Downloading boxs...",
   "installation-downloading-categories": "Downloading categories...",

diff --git a/config/locales/fr.json b/config/locales/fr.json
@@ -250,6 +250,7 @@
   "installation-invalid-birthdate": "Date de naissance invalide. Le format de la date doit être YYYY-MM-DD.",
   "installation-downloading-modes": "Téléchargement des modes...",
   "installation-downloading-sentences": "Téléchargement des commandes...",
+  "installation-downloading-actions": "Téléchargement des actions de scénarios...",
   "installation-downloading-events": "Téléchargement des évènements...",
   "installation-downloading-categories": "Téléchargement des catégories...",
   "installation-downloading-states": "Téléchargement des conditions...",