Merge branch 'pr449'

bures · bures · commit dfac6cec8055 · 2018-08-05T17:27:26.000+05:30
diff --git a/lib/models/segments.js b/lib/models/segments.js
@@ -156,7 +156,7 @@ module.exports.get = (id, callback) => {
                                 rule.formatted = rule.value.value ? _('Selected') : _('Not selected');
                                 break;
                             default:
-                                rule.formatted = rule.value.value || '';
+                                rule.formatted = (rule.value.negate ? '!= ' : '') + (rule.value.value || '');
                         }
 
                         return rule;
@@ -327,6 +327,7 @@ module.exports.createRule = (segmentId, rule, callback) => {
                 break;
             default:
                 value = {
+                    negate: Number(rule.negate) ? 1 : 0,
                     value: rule.value
                 };
         }
@@ -418,7 +419,7 @@ module.exports.getRule = (id, callback) => {
                         rule.formatted = rule.value.value ? _('Selected') : _('Not selected');
                         break;
                     default:
-                        rule.formatted = rule.value.value || '';
+                        rule.formatted = (rule.value.negate ? '!= ' : '') + (rule.value.value || '');
                 }
 
                 return callback(null, rule);
@@ -491,6 +492,7 @@ module.exports.updateRule = (id, rule, callback) => {
                     break;
                 default:
                     value = {
+                        negate: Number(rule.negate) ? 1 : 0,
                         value: rule.value
                     };
             }
@@ -573,7 +575,8 @@ module.exports.getQuery = (id, prefix, callback) => {
         segment.rules.forEach(rule => {
             switch (rule.columnType.type) {
                 case 'string':
-                    query.push(prefix + '`' + rule.columnType.column + '` LIKE ?');
+                    let condition = rule.value.negate ? 'NOT LIKE' : 'LIKE';
+                    query.push(prefix + '`' + rule.columnType.column + '` ' + condition + ' ?');
                     values.push(rule.value.value);
                     break;
                 case 'boolean':
diff --git a/views/lists/segments/rule-configure.hbs b/views/lists/segments/rule-configure.hbs
@@ -23,6 +23,20 @@
     </div>
 
     {{#if columnTypeString}}
+        <div class="form-group">
+            <label for="negate" class="col-sm-2 control-label">{{#translate}}Condition{{/translate}}</label>
+            <div class="col-sm-10">
+                <select name="negate" id="negate" class="form-control">
+                    <option value="0">
+                        {{#translate}}Equals{{/translate}}
+                    </option>
+                    <option value="1" {{#if value.negate}} selected {{/if}}>
+                        {{#translate}}Not squals{{/translate}}
+                    </option>
+                </select>
+            </div>
+        </div>
+
         <div class="form-group">
             <label for="value" class="col-sm-2 control-label">{{#translate}}Value{{/translate}}</label>
             <div class="col-sm-10">
diff --git a/views/lists/segments/rule-edit.hbs b/views/lists/segments/rule-edit.hbs
@@ -28,6 +28,20 @@
     </div>
 
     {{#if columnTypeString}}
+        <div class="form-group">
+            <label for="negate" class="col-sm-2 control-label">{{#translate}}Condition{{/translate}}</label>
+            <div class="col-sm-10">
+                <select name="negate" id="negate" class="form-control">
+                    <option value="0">
+                        {{#translate}}Equals{{/translate}}
+                    </option>
+                    <option value="1" {{#if value.negate}} selected {{/if}}>
+                        {{#translate}}Not squals{{/translate}}
+                    </option>
+                </select>
+            </div>
+        </div>
+
         <div class="form-group">
             <label for="value" class="col-sm-2 control-label">{{#translate}}Value{{/translate}}</label>
             <div class="col-sm-10">
