improve condition in launcher

api/core/scenario/scenario.export.js

@@ -29,6 +29,7 @@ function normalize(data) {
         } else {
             dictionnary[elem.id] = {
                 code: elem.code,
+                trueIf: elem.trueIf,
                 params: {
                     [elem.variablename]: elem.value
                 }
@@ -37,4 +38,4 @@ function normalize(data) {
         }
     });
     return newArray;
-}
+}

api/core/scenario/scenario.import.js

@@ -38,6 +38,7 @@ module.exports = function(params) {
                 return gladys.stateType.getByServiceFunction({service: splitted[0], function: splitted[1]})
                     .then(stateType => gladys.state.create({
                         state: stateType.id,
+                        trueIf: condition.trueIf,
                         condition_template: condition.condition_template,
                         active: condition.active,
                         launcher: launcher.id,
@@ -72,4 +73,4 @@ module.exports = function(params) {
             };
         });
 
-};
+};

api/core/scenario/scenario.queries.js

@@ -15,7 +15,7 @@ module.exports = {
       JOIN actiontypeparam ON (actionparam.actiontypeparam = actiontypeparam.id)
       WHERE action = ?;`,
     getStatesLauncher: `
-    SELECT statetype.*, state.id AS stateId, state.condition_template AS condition_template
+    SELECT statetype.*, state.id AS stateId, state.condition_template AS condition_template, trueIf
     FROM state
     INNER JOIN statetype ON state.state = statetype.id
     WHERE launcher = ?; 
@@ -27,7 +27,7 @@ module.exports = {
     WHERE launcher.id = ?;
   `,
   getStates: `
-    SELECT state.id, CONCAT(statetype.service, '.', statetype.function) as code, state.condition_template, state.active,
+    SELECT state.id, CONCAT(statetype.service, '.', statetype.function) as code, state.condition_template, state.active, state.trueIf, 
     stateparam.value, statetypeparam.variablename
     FROM state 
     JOIN statetype ON state.state = statetype.id

api/core/scenario/scenario.verifyconditions.js

@@ -53,10 +53,13 @@ function verify(statetype, params) {
              return verifyFunction(paramsToSend);
         })
         .then(function(scope) {
-
+
+            var trueIf = true
+            if(statetype.trueIf === 0)  trueIf = false
+
             // module can send raw response if he don't need the template
-            if(scope === true) return Promise.resolve(scope);
-            if(scope === false) return Promise.reject(new Error('conditions_not_verified'));
+            if(scope === trueIf) return Promise.resolve(scope);
+            if(scope === !trueIf) return Promise.reject(new Error('conditions_not_verified'));
 
             // if the scope is not a boolean, we inject it in the condition template
             try {

api/core/state/state.create.js

@@ -35,4 +35,4 @@ module.exports = function(state){
             return gladys.stateParam.create(paramsArray);
         })
         .then(() => createdState);
-};
+};

api/models/State.js

@@ -17,6 +17,11 @@ module.exports = {
             defaultsTo: true
         },
 
+        trueIf: {
+            type: 'boolean',
+            defaultsTo: true
+        },
+
         launcher: {
             model: 'Launcher',
             required: true

assets/js/app/scenario/scenario.controller.js

@@ -143,6 +143,7 @@
             var newState = {
                 launcher: vm.newLauncher.id,
                 state: stateType.id,
+                trueIf: true,
                 name: stateType.name
             };
 

assets/js/app/state/state.service.js

@@ -49,7 +49,8 @@
 
                 var newState = {
                     state: state.state,
-                    launcher: state.launcher
+                    launcher: state.launcher,
+                    trueIf: state.trueIf
                 };
 
                 // we create the condition template
@@ -82,4 +83,4 @@
         }
 
     }
-})();
+})();

config/locales/en.json

@@ -132,6 +132,7 @@
   "parameters-box-table-delete": "Delete",
   "parameters-box-left": "Left",
   "parameters-box-right": "Right",
+  "scenario-if-condition": "Condition is validated if",
   "scenario-list": "My scenario",
   "scenario-help": "Help",
   "scenario-table-event": "Trigger",
@@ -398,5 +399,8 @@
   "reset-password-new-password": "New Password",
   "reset-password-button": "Change my password",
   "reset-password-minimum-size-warning": "(Minimum 8 characters)",
-  "forgot-password-reset-failed": "Your password was not changed. Maybe the link was not valid anymore (It is valid only 2 hours), or maybe your password length was too low. Please try again."
+  "forgot-password-reset-failed": "Your password was not changed. Maybe the link was not valid anymore (It is valid only 2 hours), or maybe your password length was too low. Please try again.",
+  "True": "True",
+  "False": "False",
+  "is": "is"
 }

config/locales/fr.json

@@ -298,6 +298,7 @@
   "parameters-box-table-delete": "Supprimer",
   "parameters-box-left": "Gauche",
   "parameters-box-right": "Droite",
+  "scenario-if-condition": "La condition est validée si",
   "scenario-list": "Mes scénarios",
   "scenario-help": "Aide",
   "scenario-table-event": "Déclencheur",
@@ -562,5 +563,8 @@
   "reset-password-new-password": "Nouveau mot de passe",
   "reset-password-button": "Changer mon mot de passe",
   "reset-password-minimum-size-warning": "(Minimum 8 caractères)",
-  "forgot-password-reset-failed": "Le changement de votre mot de passe a échoué. Le lien n'était peut être plus valide (il n'est valide que 2 heures) ou le mot de passe était trop court. Merci de ré-essayer."
-}
+  "forgot-password-reset-failed": "Le changement de votre mot de passe a échoué. Le lien n'était peut être plus valide (il n'est valide que 2 heures) ou le mot de passe était trop court. Merci de ré-essayer.",
+  "True": "Vraie",
+  "False": "Fausse",
+  "is": "est"
+}

test/fixtures/state.json

@@ -3,12 +3,14 @@
         "id": 1,
         "launcher": 1,
         "state": 1,
-        "condition_template": "true"
+        "condition_template": "true",
+        "trueIf": 0
     },
     {
         "id": 2,
         "launcher": 3,
         "state": 2,
-        "condition_template": "true"
+        "condition_template": "true",
+        "trueIf": 0
     }
-]
+]

views/scenario/modal.ejs

@@ -182,7 +182,12 @@
 
                                  <form class="form-horizontal">
 
-                                    <h4>{{state.name}}</h4>
+                                   <center>
+                                       <h4>
+                                           <%= __('scenario-if-condition') %>&nbsp;&nbsp;<label class="btn btn-primary" style="cursor: default">{{state.name}}</label>&nbsp;<%= __('is') %>&nbsp;<button class="btn" ng-class="state.trueIf ? 'btn-primary' : 'btn-default'" ng-click="state.trueIf = true"><%= __('True') %></button>&nbsp;&nbsp;<button class="btn" ng-class="!state.trueIf ? 'btn-primary' : 'btn-default'" ng-click="state.trueIf = false"><%= __('False') %></button>
+                                       </h4>
+                                   </center>
+                                   <hr/>
 
                                    <!-- State Params -->
                                     <div class="form-group" ng-repeat="stateParam in state.params">
@@ -317,4 +322,4 @@
     </div>
 </div>
 </div>
-<!-- END OF MODAL -->
+<!-- END OF MODAL -->