DDF-2644 Add boolean / number support to query / filter

 - Adds boolean support to cql writer / reader.
 - Adds boolean input to specifically handle boolean fields.
 - Adds number input to specifically handle number fields.
 - Adds support for boolean and number searching to both query and local filtering.

Author: andrewkfiedler

catalog/ui/catalog-ui-search/src/main/webapp/component/component.less

@@ -23,6 +23,7 @@
 @import 'ingest-menu/ingest-menu';
 @import 'ingest-details/ingest-details';
 @import 'input/input';
+@import 'input/boolean/input-boolean';
 @import 'input/date/input-date';
 @import 'input/bulk/input-bulk';
 @import 'input/enum/input-enum';

catalog/ui/catalog-ui-search/src/main/webapp/component/filter-comparator/filter-comparator.view.js

@@ -25,6 +25,8 @@ define([
     var geometryComparators = ['INTERSECTS'];
     var dateComparators = ['BEFORE', 'AFTER'];
     var stringComparators = ['CONTAINS', 'MATCHCASE', 'EQUALS'];
+    var numberComparators = ['>','<','=','>=','<='];
+    var booleanComparators = ['='];
 
     return Marionette.ItemView.extend({
         template: template,
@@ -59,19 +61,30 @@ define([
                         this.model.set('comparator', geometryComparators[0]);
                     }
                     return geometryComparators;
-                    break;
                 case 'DATE':
                     if (dateComparators.indexOf(this.model.get('comparator')) === -1){
                         this.model.set('comparator', dateComparators[0]);
                     }
                     return dateComparators;
-                    break;
+                case 'BOOLEAN':
+                    if (booleanComparators.indexOf(this.model.get('comparator')) === -1){
+                        this.model.set('comparator', booleanComparators[0]);
+                    }
+                    return booleanComparators;
+                case 'LONG':
+                case 'DOUBLE':
+                case 'FLOAT':
+                case 'INTEGER':
+                case 'SHORT':
+                    if (numberComparators.indexOf(this.model.get('comparator')) === -1){
+                        this.model.set('comparator', numberComparators[0]);
+                    }
+                    return numberComparators;
                 default:
                     if (stringComparators.indexOf(this.model.get('comparator')) === -1){
                         this.model.set('comparator', stringComparators[0]);
                     }
                     return stringComparators;
-                    break;
             }
         }
     });

catalog/ui/catalog-ui-search/src/main/webapp/component/filter/filter.view.js

@@ -37,7 +37,12 @@ define([
         INTERSECTS: 'INTERSECTS',
         CONTAINS: 'ILIKE',
         MATCHCASE: 'LIKE',
-        EQUALS: '='
+        EQUALS: '=',
+        '>': '>',
+        '<': '<',
+        '=': '=',
+        '<=': '<=',
+        '>=': '>=' 
     };
 
     var CQLtoComparator = {};
@@ -108,6 +113,20 @@ define([
                         this.model.set('comparator', 'BEFORE');
                     }
                     break;
+                case 'BOOLEAN': 
+                    if (['='].indexOf(currentComparator) === -1){
+                        this.model.set('comparator', '=');
+                    }
+                    break;
+                case 'LONG':
+                case 'DOUBLE':
+                case 'FLOAT':
+                case 'INTEGER':
+                case 'SHORT':
+                    if (['>', '<', '=', '>=', '<='].indexOf(currentComparator) === -1 ){
+                        this.model.set('comparator', '>');
+                    }
+                    break;
                 default:
                     if (['CONTAINS', 'MATCHCASE', 'EQUALS'].indexOf(currentComparator) === -1) {
                         this.model.set('comparator', 'CONTAINS');

catalog/ui/catalog-ui-search/src/main/webapp/component/input/boolean/input-boolean.hbs

@@ -0,0 +1,27 @@
+{{!--
+/**
+ * Copyright (c) Codice Foundation
+ *
+ * This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at
+ * <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ **/
+ --}}
+<div class="if-editing">
+    <label>
+        <input id="{{cid}}" value="{{value}}" placeholder="{{property.placeholder}}" name="{{property.id}}" type="checkbox" {{#if value}}checked{{/if}}>
+        <button class="checkbox-placeholder is-button is-neutral">
+            <span class="is-not-checked">false</span>
+            <span class="is-checked">true</span>
+        </button>
+    </label>
+</div>
+<div class="if-viewing">
+    <label>
+        {{value}}
+    </label>
+</div>

catalog/ui/catalog-ui-search/src/main/webapp/component/input/boolean/input-boolean.less

@@ -0,0 +1,41 @@
+@{customElementNamespace}input.is-boolean { 
+    input {
+        display: none;
+    }
+
+    .if-editing label {
+        width: 100%;
+        cursor: pointer;
+        height: @minimumButtonSize;
+    }
+
+    .checkbox-placeholder {
+        width: 100%;
+        padding-left: 10px;
+        border: 1px solid @lighten-inherited-background-color;
+        background: @lighten-inherited-background-color;
+        height: 100%;
+        text-align: left;
+
+        span {
+            font-size: @minimumFontSize;
+        }
+    }
+
+    .is-not-checked {
+        display: block;
+    }
+    
+    .is-checked {
+        display: none;
+    }
+
+    input:checked + button {
+        .is-checked {
+            display: block;
+        }
+        .is-not-checked {
+            display: none;
+        }
+    }
+}

catalog/ui/catalog-ui-search/src/main/webapp/component/input/boolean/input-boolean.view.js

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Codice Foundation
+ *
+ * This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser
+ * General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details. A copy of the GNU Lesser General Public License
+ * is distributed along with this program and can be found at
+ * <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ **/
+/*global require*/
+var Marionette = require('marionette');
+var template = require('./input-boolean.hbs');
+var InputView = require('../input.view');
+
+module.exports = InputView.extend({
+        template: template,
+        getCurrentValue: function(){
+            return this.$el.find('input').is(':checked');
+        },
+        handleValue: function(){
+            this.$el.find('input').attr('checked', Boolean(this.model.getValue()));
+        },
+        events: {
+            'click label': 'triggerCheckboxClick'
+        },
+        triggerCheckboxClick: function(){
+            this.$el.find('input').click();
+        }
+});

catalog/ui/catalog-ui-search/src/main/webapp/component/input/input.less

@@ -27,12 +27,14 @@
   }
 }
 
-@{customElementNamespace}input.is-text {
+@{customElementNamespace}input.is-text,
+@{customElementNamespace}input.is-number,
+@{customElementNamespace}input.is-boolean {
   input {
     height: @minimumButtonSize;
     width: 100%;
   }
-  label {
+  .if-viewing label {
     padding-left: 10px;
     line-height: @minimumButtonSize;
     margin: 0px;

catalog/ui/catalog-ui-search/src/main/webapp/component/input/number/input-number.hbs

@@ -0,0 +1,21 @@
+{{!--
+/**
+ * Copyright (c) Codice Foundation
+ *
+ * This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at
+ * <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ **/
+ --}}
+<div class="if-editing">
+    <input id="{{cid}}" value="{{value}}" placeholder="{{property.placeholder}}" name="{{property.id}}" type="number">
+</div>
+<div class="if-viewing">
+    <label>
+        {{value}}
+    </label>
+</div>

catalog/ui/catalog-ui-search/src/main/webapp/component/input/number/input-number.view.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Codice Foundation
+ *
+ * This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser
+ * General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details. A copy of the GNU Lesser General Public License
+ * is distributed along with this program and can be found at
+ * <http://www.gnu.org/licenses/lgpl.html>.
+ *
+ **/
+/*global require*/
+var Marionette = require('marionette');
+var template = require('./input-number.hbs');
+var InputView = require('../input.view');
+
+module.exports = InputView.extend({
+        template: template,
+        getCurrentValue: function(){
+            return Number(this.$el.find('input').val());
+        }
+});

catalog/ui/catalog-ui-search/src/main/webapp/component/property/property.js

@@ -91,6 +91,16 @@ define([
                 case 'LOCATION':
                     this.set('calculatedType', 'location');
                     break;
+                case 'BOOLEAN':
+                    this.set('calculatedType', 'boolean');
+                    break;
+                case 'LONG':
+                case 'DOUBLE':
+                case 'FLOAT':
+                case 'INTEGER':
+                case 'SHORT':
+                    this.set('calculatedType', 'number');
+                    break;
                 case 'STRING':
                 case 'GEOMETRY':
                 case 'XML':

catalog/ui/catalog-ui-search/src/main/webapp/component/value/value.collection.view.js

@@ -32,7 +32,6 @@ define([
                 case 'thumbnail':
                 case 'location':
                     return this.children.first().hasChanged();
-                    break;
                 case 'date':
                     var currentValue = this.children.map(function(childView){
                         return childView.getCurrentValue();
@@ -45,14 +44,20 @@ define([
                                 return dateValue;
                             }
                         }).toString();
-                    break;
+                case 'number':  //needed until cql result correctly returns numbers as numbers
+                    var currentValue = this.children.map(function(childView){
+                        return childView.getCurrentValue().toString();
+                    });
+                    currentValue.sort();
+                    return JSON.stringify(currentValue) !== JSON.stringify(this.model.getInitialValue().map(function(value){ 
+                        return Number(value).toString(); //handle cases of unnecessary number padding -> 22.0000
+                    }));
                 default:
                     var currentValue = this.children.map(function(childView){
                         return childView.getCurrentValue();
                     });
                     currentValue.sort();
                     return JSON.stringify(currentValue) !== JSON.stringify(this.model.getInitialValue());
-                    break;
             }
         },
         addNewValue: function (propertyModel){

catalog/ui/catalog-ui-search/src/main/webapp/component/value/value.view.js

@@ -24,9 +24,11 @@ define([
     'component/input/date/input-date.view',
     'component/input/location/input-location.view',
     'component/input/enum/input-enum.view',
-    'component/input/radio/input-radio.view'
+    'component/input/radio/input-radio.view',
+    'component/input/number/input-number.view',
+    'component/input/boolean/input-boolean.view'
 ], function (Marionette, _, $, template, CustomElements, InputView, InputThumbnailView, InputDateView,
-             InputLocationView, InputEnumView, InputRadioView) {
+             InputLocationView, InputEnumView, InputRadioView, InputNumberView, InputBooleanView) {
 
     return Marionette.LayoutView.extend({
         template: template,
@@ -70,8 +72,13 @@ define([
                             model: this.model
                         }));
                         break;
-                    case 'text':
-                        this.input.show(new InputView({
+                    case 'boolean':
+                        this.input.show(new InputBooleanView({
+                            model: this.model
+                        }));
+                        break;
+                    case 'number':
+                        this.input.show(new InputNumberView({
                             model: this.model
                         }));
                         break;

catalog/ui/catalog-ui-search/src/main/webapp/js/cql.js

@@ -29,6 +29,7 @@ define(function () {
             COMMA: /^,/,
             LOGICAL: /^(AND|OR)/i,
             VALUE: /^('([^']|'')*'|-?\d+(\.\d*)?|\.\d+)/,
+            BOOLEAN: /^(false|true)/i,
             LPAREN: /^\(/,
             RPAREN: /^\)/,
             SPATIAL: /^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,
@@ -73,9 +74,10 @@ define(function () {
             PROPERTY: ['COMPARISON', 'BETWEEN', 'COMMA', 'IS_NULL', 'BEFORE', 'AFTER', 'DURING'],
             BETWEEN: ['VALUE'],
             IS_NULL: ['END'],
-            COMPARISON: ['VALUE'],
+            COMPARISON: ['VALUE', 'BOOLEAN'],
             COMMA: ['GEOMETRY', 'VALUE', 'UNITS', 'PROPERTY'],
             VALUE: ['LOGICAL', 'COMMA', 'RPAREN', 'END'],
+            BOOLEAN: ['RPAREN'],
             SPATIAL: ['LPAREN'],
             UNITS: ['RPAREN'],
             LOGICAL: ['NOT', 'VALUE', 'SPATIAL', 'PROPERTY', 'LPAREN'],
@@ -183,6 +185,7 @@ define(function () {
                 case "VALUE":
                 case "TIME":
                 case "TIME_PERIOD":
+                case "BOOLEAN":
                     postfix.push(tok);
                     break;
                 case "COMPARISON":
@@ -302,7 +305,15 @@ define(function () {
                     } else {
                         return Number(tok.text);
                     }
-                    break;
+                case "BOOLEAN":
+                    switch(tok.text){
+                        case 'false':
+                            return false;
+                        case 'true':
+                            return true;
+                        default: 
+                            return false;
+                    }
                 case "SPATIAL":
                     switch (tok.text.toUpperCase()) {
                         case "BBOX":
@@ -458,6 +469,8 @@ define(function () {
                     return "'" + filter.replace(/'/g, "''") + "'";
                 } else if (typeof filter === "number") {
                     return String(filter);
+                } else if (typeof filter === "boolean") {
+                    return Boolean(filter);
                 }
                 break;
             default: