correção na busca avançada por field do tipo boolean

GUMGA · Oct 5, 2017 · 3b8ce68 · 3b8ce68
1 parent c84a247
commit 3b8ce68
Show file tree

Hide file tree

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

diff --git a/dist/gumga-query-filter.js b/dist/gumga-query-filter.js
@@ -544,6 +544,8 @@ function HQLFactory($filter) {
       query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, value));
     } else if (querys[i].query.attribute.type == 'string') {
       query = new GQuery(null, createCriteriaLower(querys[i].query));
+    } 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 {
       query = new GQuery(null, new Criteria(querys[i].query.attribute.field, querys[i].query.condition.key, querys[i].query.value));
     }
@@ -1014,7 +1016,7 @@ function Filter(HQLFactory, $compile, $timeout, $interpolate, QueryModelFactory,
       }
 
       function validatonValue($value) {
-        return $value.isNOTHING() || $value.isUPDATING_ATTRIBUTE() || $value.isUPDATING_VALUE() || $value.isUPDATING_CONDITION() || !($value.isEVERYTHING_NEEDED() || !$value.isATTRIBUTE_AND_CONDITION()) || !isAnyQueryNotOk() && $value.isEVERYTHING_NEEDED();
+        return $value && ($value.isNOTHING() || $value.isUPDATING_ATTRIBUTE() || $value.isUPDATING_VALUE() || $value.isUPDATING_CONDITION() || !($value.isEVERYTHING_NEEDED() || !$value.isATTRIBUTE_AND_CONDITION()) || !isAnyQueryNotOk() && $value.isEVERYTHING_NEEDED());
       }
 
       function toggleEnum(event, key, field) {

diff --git a/dist/gumga-query-filter.min.js b/dist/gumga-query-filter.min.js
diff --git a/docs/1.9.2/app.js b/docs/1.9.2/app.js
@@ -0,0 +1,15 @@
+angular
+  .module('app', ['ui.bootstrap', 'gumga.rest', 'gumga.controller', 'gumga.genericfilter', 'gumga.queryfilter'])
+  .controller('Ctrl', ['gumgaController', 'GumgaRest', '$scope', '$http', function (gumgaController, GumgaRest, $scope, $http) {
+    var PessoaService = new GumgaRest('host-api');
+    gumgaController.createRestMethods($scope, PessoaService, 'pessoas');
+    $scope.pessoas.methods.get();
+
+    $scope.simple = function (field, param) {
+      console.info('GumgaQuery', 'Field: ' + field + ', Valor:' + param)
+    }
+
+    $scope.advanced = function (value) {
+      console.info('GumgaQuery', 'Value: ', value)
+    }
+  }])
diff --git a/docs/1.9.2/dist/gumga-query-filter.js b/docs/1.9.2/dist/gumga-query-filter.js
diff --git a/docs/1.9.2/dist/gumga-query-filter.min.js b/docs/1.9.2/dist/gumga-query-filter.min.js
diff --git a/docs/1.9.2/index.html b/docs/1.9.2/index.html
@@ -0,0 +1,294 @@
+<!DOCTYPE html>
+<html ng-app="app">
+  <head>
+    <meta charset="utf-8">
+    <title>gumga-query-filter-ng</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://gumga.github.io/components/style.css">
+    <!--<link rel="stylesheet" href="https://gumga.github.io/layout/dist/gumga-layout.css">-->
+
+  </head>
+  <body >
+
+    <nav class="navbar navbar-inverse" ng-controller="VersionController as ctrl">
+      <div class="container">
+        <div class="navbar-header">
+          <a class="navbar-brand" href="#">gumga-query-filter-ng</a>
+        </div>
+        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+          <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+              <a href="#"
+                 class="dropdown-toggle"
+                 data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ctrl.version}} <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                <li ng-repeat="version in ctrl.versions"><a href="../{{version}}">{{version}}</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </nav>
+
+    <div class="container" ng-controller="Ctrl as ctrl">
+      <div class="row">
+        <div class="col-xs-6">
+          <h2>Descrição</h2>
+          <p>O componente gumga-query-filter-ng é utilizado para executar pesquisas simples ou avançadas. Na busca simples pode escolher quais campos serão pesquisados pelo termo de entrada, já na pesquisa avançada, você pode adicionar tipos aos campos e concatar outros campos intercalando com operadores "E" ou "OU" entre cada um. Após query montada, o componente gera um hql que é enviado ao servidor </p>
+        </div>
+        <div class="col-xs-6">
+          <h3>Instalação</h3>
+          <pre><code class="prettyprint">// npm
+npm i gumga-query-filter-ng --save
+
+// bower
+bower install gumga-query-filter-ng --save
+
+// HTML
+&lt;script src="node_modules/gumga-query-filter-ng/dist/gumga-query-filter.min.js">&lt;/script>
+// ou
+&lt;script src="bower_components/gumga-query-filter-ng/dist/gumga-query-filter.min.js">&lt;/script>
+</code></pre>
+        </div>
+      </div>
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          Usando
+        </div>
+        <div class="panel-body">
+          <div class="row">
+            <div class="col-xs-6">
+              <gumga-query search="pessoas.methods.search(field,param)" advanced-search="pessoas.methods.advancedSearch(param)" search-text="Pesquisar"
+                saved-filters="pessoas.methods.getQuery(page)" save-query="pessoas.methods.postQuery(query, name)">
+                <search-field type="string" field="name" label="Nome"></search-field>
+                <search-field type="number" field="age" label="Idade" select="true"></search-field>
+                <advanced-search-field type="string" label="Nome" field="nome"></advanced-search-field>
+                <advanced-search-field type="number" label="Idade" field="idade"></advanced-search-field>
+                <advanced-search-field type="float" label="Peso" field="peso"></advanced-search-field>
+                <advanced-search-field type="money" label="Preço" field="preco"></advanced-search-field>
+                <advanced-search-field type="cpf" label="CPF" field="cpf"></advanced-search-field>
+              </gumga-query>
+            </div>
+            <div class="col-xs-6">
+              <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#html" aria-controls="html" role="tab" data-toggle="tab">HTML</a></li>
+                <li role="presentation"><a href="#js" aria-controls="js" role="tab" data-toggle="tab">JavaScript</a></li>
+              </ul>
+              <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="html">
+                  <pre><code class="prettyprint" ng-non-bindable>&lt;gumga-query
+  search-text="Pesquisar"
+  use-gquery="true"
+  search="pessoas.methods.searchWithGQuery(param)"
+  advanced-search="pessoas.methods.searchWithGQuery(param)">
+  &lt;search-field field="name" label="Nome">&lt;/search-field>
+  &lt;search-field field="age" label="Idade" select="true">&lt;/search-field>
+  &lt;search-field field="end.bairro" label="Bairro" left-join="enderecos as end">&lt;/search-field>
+  &lt;advanced-search-field type="string" label="Nome" field="nome">&lt;/advanced-search-field>
+  &lt;advanced-search-field type="number" label="Idade" field="idade">&lt;/advanced-search-field>
+  &lt;advanced-search-field type="float" label="Peso" field="peso">&lt;/advanced-search-field>
+  &lt;advanced-search-field type="money" label="Preço" field="preco">&lt;/advanced-search-field>
+  &lt;advanced-search-field type="cpf" label="CPF" field="cpf">&lt;/advanced-search-field>
+&lt;/gumga-query></code></pre>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="js">
+                  <pre><code class="prettyprint">angular
+  .module('app', ['ui.bootstrap', 'gumga.rest', 'gumga.controller', 'gumga.genericfilter', 'gumga.queryfilter'])
+  .controller('Ctrl', ['gumgaController', 'GumgaRest', '$scope', '$http', function (gumgaController, GumgaRest, $scope, $http) {
+    var PessoaService = new GumgaRest('host-api');
+    gumgaController.createRestMethods($scope, PessoaService, 'pessoas');
+    $scope.pessoas.methods.get();
+
+    $scope.simple = function (field, param) {
+      console.info('GumgaQuery', 'Field: ' + field + ', Valor:' + param)
+    }
+
+    $scope.advanced = function (value) {
+      console.info('GumgaQuery', 'Value: ', value)
+    }
+  }])</code></pre>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          Atributos
+        </div>
+        <table class="table table-striped">
+          <thead>
+            <tr>
+              <th>Parâmetro</th>
+              <th>Tipo</th>
+              <th>Requerido</th>
+              <th>Descrição</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td><strong>use-gquery</strong></td>
+              <td><code>Boolean</code></td>
+              <td>Não</td>
+              <td>Parâmetro usado para ativar/desativar o uso do GQuery.</td>
+            </tr>
+            <tr>
+              <td><strong>search</strong></td>
+              <td><code>Function</code></td>
+              <td>Sim</td>
+              <td>Parâmetro que irá conter uma função que será utilizada para executar a busca simples.Os parâmetros field e param são obrigatórios.</td>
+            </tr>
+            <tr>
+              <td><strong>advanced-search</strong></td>
+              <td><code>Function</code></td>
+              <td>Não</td>
+              <td>Parâmetro que irá conter uma função que será utilizada para executar a busca avançada. O parâmetro param é obrigatório.</td>
+            </tr>
+            <tr>
+              <td><strong>search-text</strong></td>
+              <td><code>String</code></td>
+              <td>Não</td>
+              <td>Parâmetro que irá conter uma string que será utilizada como label para o botão de pesquisa.</td>
+            </tr>
+            <tr>
+              <td><strong>saved-filters</strong></td>
+              <td><code>Function</code></td>
+              <td>Não</td>
+              <td>Deve retornar um <code>Array</code> com uma lista de queries salvas.</td>
+            </tr>
+            <tr>
+              <td><strong>save-query</strong></td>
+              <td><code>Function</code></td>
+              <td>Não</td>
+              <td>Função que salva a querie montada no componente.</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+
+
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          Search Field
+        </div>
+        <table class="table table-striped">
+          <thead>
+          <tr>
+            <th>Parâmetro</th>
+            <th>Tipo</th>
+            <th>Requerido</th>
+            <th>Descrição</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr>
+            <td><strong>field</strong></td>
+            <td><code>String</code></td>
+            <td>Sim</td>
+            <td>Atributo que será utilizado na busca HQL.</td>
+          </tr>
+          <tr>
+            <td><strong>label</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Rótulo que aparecerá na opção selecionada</td>
+          </tr>
+          <tr>
+            <td><strong>select</strong></td>
+            <td><code>Boolean</code></td>
+            <td>Não</td>
+            <td>Indica se o search-field virá selecionado por padrão</td>
+          </tr>
+          <tr>
+            <td><strong>type</strong></td>
+            <td><code>String</code>,<code>Number</code>,<code>Boolean</code></td>
+            <td>Não</td>
+            <td>Tipo do field buscado no HQL</td>
+          </tr>
+          <tr>
+            <td><strong>inner-join</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Recebe um HQL Inner Join. Pode ser utilizado somente se a opção use-gquery estiver ativa.</td>
+          </tr>
+          <tr>
+            <td><strong>left-join</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Recebe um HQL Left Join. Pode ser utilizado somente se a opção use-gquery estiver ativa.</td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+
+
+
+      <div class="panel panel-default">
+        <div class="panel-heading">
+          Advanced Search Field
+        </div>
+        <table class="table table-striped">
+          <thead>
+          <tr>
+            <th>Parâmetro</th>
+            <th>Tipo</th>
+            <th>Requerido</th>
+            <th>Descrição</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr>
+            <td><strong>field</strong></td>
+            <td><code>String</code></td>
+            <td>Sim</td>
+            <td>Atributo que será utilizado na busca HQL.</td>
+          </tr>
+          <tr>
+            <td><strong>label</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Rótulo que aparecerá na opção selecionada</td>
+          </tr>
+          <tr>
+            <td><strong>type</strong></td>
+            <td><code>String</code>,<code>Number</code>,<code>Boolean</code></td>
+            <td>Não</td>
+            <td>Tipo do field buscado no HQL</td>
+          </tr>
+          <tr>
+            <td><strong>inner-join</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Recebe um HQL Inner Join. Pode ser utilizado somente se a opção use-gquery estiver ativa.</td>
+          </tr>
+          <tr>
+            <td><strong>left-join</strong></td>
+            <td><code>String</code></td>
+            <td>Não</td>
+            <td>Recebe um HQL Left Join. Pode ser utilizado somente se a opção use-gquery estiver ativa.</td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+
+
+    </div>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/2.5.0/ui-bootstrap-tpls.min.js"></script>
+    <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/gumga-rest.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/gumga-controller.min.js"></script>
+    <script src="https://unpkg.com/[email protected]/dist/gumga-generic-filter.js"></script>
+    <script src="dist/gumga-query-filter.min.js"></script>
+
+    <script type="text/javascript" src="app.js"></script>
+    <script type="text/javascript" src="https://gumga.github.io/components/app.js"></script>
+
+  </body>
+</html>
diff --git a/docs/1.9.2/modal.html b/docs/1.9.2/modal.html
@@ -0,0 +1,21 @@
+<div class="modal-header">
+  <h3 class="modal-title">OneToMany Example</h3>
+</div>
+<div class="modal-body">
+  <div class="row">
+    <div class="col-sm-12">
+      <form name="ExampleOneToMany">
+        <label>Nome</label>
+        <input ng-model="entity.nome" class="form-control">
+      </form>
+    </div>
+  </div>
+</div>
+<div class="modal-footer">
+  <div class="row">
+    <div class="col-sm-12">
+      <button ng-click="cancelar()" class="btn btn-default">Cancelar</button>
+      <button ng-click="salvar(entity)" ng-disabled="!entity.nome" class="btn btn-primary">Salvar</button>
+    </div>
+  </div>
+</div>
diff --git a/docs/versions.json b/docs/versions.json
@@ -1 +1 @@
-["1.0.1", "1.3.0", "1.3.1", "1.4.0", "1.8.0", "1.9.0", "1.9.1"]
+["1.0.1", "1.3.0", "1.3.1", "1.4.0", "1.8.0", "1.9.0", "1.9.1", "1.9.2"]
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gumga-query-filter-ng",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Gumga Query Filter",
   "main": "./src/index.js",
   "directories": {