correção de busca simples

GUMGA · Nov 6, 2017 · aac1159 · aac1159
1 parent 7e81749
commit aac1159
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "gumga-query-filter-ng",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Gumga Query Filter",
   "main": "./src/index.js",
   "authors": [

diff --git a/dist/gumga-query-filter.js b/dist/gumga-query-filter.js
@@ -249,10 +249,13 @@ function Search($q, $timeout, $compile, $interpolate) {
         });
 
         result.forEach(function (field, index) {
-          var criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? '' : param);
-          if (ctrl.mapFields[field].type == 'number') {
+          var criteria = null;
+          if (param != undefined && param != null) {
+            criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? '' : param);
+          }
+          if (ctrl.mapFields[field].type == 'number' && param != undefined && param != null) {
             criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? 0 : Number(param));
-          } else if (ctrl.mapFields[field].type == 'date') {
+          } else if (ctrl.mapFields[field].type == 'date' && param) {
             criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? new Date() : new Date(param));
           } else if (ctrl.mapFields[field].type == 'string') {
             criteria.setFieldFunction('%s');

diff --git a/dist/gumga-query-filter.min.js b/dist/gumga-query-filter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gumga-query-filter-ng",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Gumga Query Filter",
   "main": "./src/index.js",
   "directories": {

diff --git a/src/factory/hql-factory.js b/src/factory/hql-factory.js
@@ -295,7 +295,7 @@ function HQLFactory($filter){
     }else if(querys[i].query.attribute.type == 'boolean') {
       query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, querys[i].query.value === 'true'));
     } else if(querys[i].query.attribute.type == 'number') {
-        query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, Number(querys[i].query.value)));
+      query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, Number(querys[i].query.value)));
     } else {        
       query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, querys[i].query.value));
     }

diff --git a/src/query/query.js b/src/query/query.js
@@ -187,10 +187,13 @@
             })
 
             result.forEach((field, index) => {
-              let criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? '' : param);
-              if(ctrl.mapFields[field].type == 'number') {
+              let criteria = null;
+              if(param != undefined && param != null){
+                criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? '' : param);
+              }
+              if(ctrl.mapFields[field].type == 'number' && param != undefined && param != null) {
                 criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? 0 : Number(param));
-              } else if(ctrl.mapFields[field].type == 'date') {
+              } else if(ctrl.mapFields[field].type == 'date' && param) {
                 criteria = new Criteria(field, getComparisonOperatorByType(field), param == undefined || param == null ? new Date() : new Date(param));
               } else if(ctrl.mapFields[field].type == 'string') {
                   criteria.setFieldFunction('%s');
@@ -207,11 +210,12 @@
                 }
               }
 
-              if(index == 0){
+              if(index == 0){ 
                 query = new GQuery(criteria);
               }else{
                 query = query.or(criteria);
               }
+
             });
 
             innerJoins.forEach(function(innerJoin) {