1731 - Melhoria indicador "Gastos por caminhão"

This commit is contained in:
2018-09-25 09:29:06 -03:00
parent b92f6ae4ce
commit 3f6642a1e9
14 changed files with 277 additions and 182 deletions
+4 -4
View File
@@ -248,8 +248,8 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
var sql = getSql();
if(engine) {
var idPesquisaLista = engine.getField('idPesquisaLista').getValue();
if (idPesquisaLista != null) {
sql = "SELECT * FROM ( " + sql + " ) T WHERE T.NOME LIKE UPPER('%" + idPesquisaLista + "%')";
if (idPesquisaLista && idPesquisaLista != null) {
sql = "SELECT * FROM ( " + sql + " ) T WHERE T.DESCRICAO LIKE UPPER('%" + idPesquisaLista + "%')";
}
}
return sql;
@@ -261,7 +261,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field>
<columns>
<!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2">
<generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript">
<![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -294,7 +294,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated>
<!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2">
<generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript">
<![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);