TLK/Controle_caixa
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1731 - Melhoria indicador "Gastos por caminhão"

Browse Source
This commit is contained in:
Lucas Favaro da Silva
2018-09-25 09:29:06 -03:00
parent b92f6ae4ce
commit 3f6642a1e9
14 changed files with 277 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
03 - Painéis/CADASTRO - Categoria.xml
+2 -2
View File
@@ -260,7 +260,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -293,7 +293,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Clientes.xml
+5 -5
View File
@@ -304,7 +304,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -337,7 +337,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
@@ -429,7 +429,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</events> </events>
</DBSearchField> </DBSearchField>
<HorizontalLayout spacing="true" width="100%" > <HorizontalLayout spacing="true" width="100%" >
<TextField type="number" id="idChave" width="100%" caption="Código" expandRatio="0.08" /> <TextField type="number" id="idChave" width="100%" caption="Código" expandRatio="0.08" />
<TextField type="string" id="idDescricao" text-transform="uppercase" caption="Descrição" required="true" width="100%" expandRatio="1" /> <TextField type="string" id="idDescricao" text-transform="uppercase" caption="Descrição" required="true" width="100%" expandRatio="1" />
</HorizontalLayout> </HorizontalLayout>
<TabLayout compact="true" width="100%"> <TabLayout compact="true" width="100%">
@@ -534,7 +534,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</HorizontalLayout> </HorizontalLayout>
</VerticalLayout> </VerticalLayout>
</Tab> </Tab>
<Tab caption="Usuários" visible="false"> <Tab caption="Usuários" visible="false">
<VerticalLayout margin="false" width="100%" > <VerticalLayout margin="false" width="100%" >
<Label id="lb2"> <Label id="lb2">
<value> <value>
@@ -557,7 +557,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<Tab caption="Impostos" visible="true" > <Tab caption="Impostos" visible="true" >
<VerticalLayout width="100%" margin="true" spacing="true" > <VerticalLayout width="100%" margin="true" spacing="true" >
<HorizontalLayout width="420" spacing="true" margin="false" > <HorizontalLayout width="420" spacing="true" margin="false" >
<DBComboBox type="string" id="idPraca" caption="Praça" width="100%" expandRatio="0.8" allowNullSelection="true"> <DBComboBox type="string" id="idPraca" caption="Praça" width="100%" expandRatio="0.8" allowNullSelection="true">
<datasource> <datasource>
<freeQuery connection-key="vitruvio"> <freeQuery connection-key="vitruvio">
<![CDATA[ <![CDATA[
03 - Painéis/CADASTRO - Combustivel.xml
+2 -2
View File
@@ -258,7 +258,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -291,7 +291,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Estados.xml
+2 -2
View File
@@ -262,7 +262,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CHAVE_ESTADO</key-field> <key-field>CHAVE_ESTADO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -295,7 +295,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Forma_de_Pagamento.xml
+2 -2
View File
@@ -257,7 +257,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -290,7 +290,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Fornecedores.xml
+2 -2
View File
@@ -266,7 +266,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -299,7 +299,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Funcionários.xml
+2 -2
View File
@@ -273,7 +273,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -306,7 +306,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Socio.xml
+2 -2
View File
@@ -275,7 +275,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -308,7 +308,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Sub_Categoria.xml
+4 -4
View File
@@ -248,8 +248,8 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
var sql = getSql(); var sql = getSql();
if(engine) { if(engine) {
var idPesquisaLista = engine.getField('idPesquisaLista').getValue(); var idPesquisaLista = engine.getField('idPesquisaLista').getValue();
if (idPesquisaLista != null) { if (idPesquisaLista && idPesquisaLista != null) {
sql = "SELECT * FROM ( " + sql + " ) T WHERE T.NOME LIKE UPPER('%" + idPesquisaLista + "%')"; sql = "SELECT * FROM ( " + sql + " ) T WHERE T.DESCRICAO LIKE UPPER('%" + idPesquisaLista + "%')";
} }
} }
return sql; return sql;
@@ -261,7 +261,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); 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> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Tipo_Frete.xml
+2 -2
View File
@@ -258,7 +258,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -291,7 +291,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/CADASTRO - Veiculos.xml
+3 -3
View File
@@ -256,7 +256,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
if(engine) { if(engine) {
var idPesquisaLista = engine.getField('idPesquisaLista').getValue(); var idPesquisaLista = engine.getField('idPesquisaLista').getValue();
if (idPesquisaLista != null) { if (idPesquisaLista != null) {
sql = "SELECT * FROM ( " + sql + " ) T WHERE T.NOME LIKE UPPER('%" + idPesquisaLista + "%')"; sql = "SELECT * FROM ( " + sql + " ) T WHERE T.PLACA LIKE UPPER('%" + idPesquisaLista + "%')";
} }
} }
return sql; return sql;
@@ -268,7 +268,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
<key-field>CODIGO</key-field> <key-field>CODIGO</key-field>
<columns> <columns>
<!-- icone de edição --> <!-- icone de edição -->
<generated name="Editar" align="CENTER" expand-ratio="0.2"> <generated name="Editar" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall); importClass(Packages.br.com.davinti.base.vaadin.components.resources.icons16x16.IconLibraryAPISmall);
@@ -301,7 +301,7 @@ xsi:schemaLocation="http://www.davinti.com.br/vitruvio/form/panel https://bitbuc
</generated> </generated>
<!-- icone de exclusão --> <!-- icone de exclusão -->
<generated name="Excluir" align="CENTER" expand-ratio="0.2"> <generated name="Excluir" align="CENTER" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
03 - Painéis/INDICADORES - Gastos Caminhao.xml
+100 -35
View File
File diff suppressed because one or more lines are too long
03 - Painéis/LANÇAMENTO - Créditos.xml
+21 -17
View File
@@ -448,6 +448,8 @@
" from controle_receitas_fretes ccf" + " from controle_receitas_fretes ccf" +
" where 1 = 2"; " where 1 = 2";
if (engine) { if (engine) {
var datainicio = engine.getField('dataInicio').getValue();
var datafinal = engine.getField('dataFinal').getValue();
sql = "Select ccf.chave_receita_frete, ccf.data, " + sql = "Select ccf.chave_receita_frete, ccf.data, " +
" (select co.nome from clientes co where co.codigo = ccf.chave_cliente) cliente," + " (select co.nome from clientes co where co.codigo = ccf.chave_cliente) cliente," +
" (select cv.placa from veiculo cv where cv.codigo = ccf.chave_veiculo) veiculo," + " (select cv.placa from veiculo cv where cv.codigo = ccf.chave_veiculo) veiculo," +
@@ -462,8 +464,10 @@
" ccf.valor_imposto valor_imposto, " + " ccf.valor_imposto valor_imposto, " +
" ccf.valor_liquido valor_liquido, " + " ccf.valor_liquido valor_liquido, " +
" ccf.placa_carreta placa_carreta " + " ccf.placa_carreta placa_carreta " +
" from controle_receitas_fretes ccf" + " from controle_receitas_fretes ccf";
" where ccf.data between '" + engine.getField('dataInicio') + "' and '" + engine.getField('dataFinal') + "'"; if (datainicio && datafinal) {
sql += " where ccf.data between '" + engine.getField('dataInicio') + "' and '" + engine.getField('dataFinal') + "'";
}
if (engine.getField('ftFuncionario').getValue()) { if (engine.getField('ftFuncionario').getValue()) {
sql += " and ccf.chave_funcionario = " + engine.getField('ftFuncionario').getValue(); sql += " and ccf.chave_funcionario = " + engine.getField('ftFuncionario').getValue();
} }
@@ -473,10 +477,10 @@
if (engine.getField('ftCliente').getValue()) { if (engine.getField('ftCliente').getValue()) {
sql += " and ccf.chave_cliente = " + engine.getField('ftCliente').getValue(); sql += " and ccf.chave_cliente = " + engine.getField('ftCliente').getValue();
} }
if (engine.getField('ftFrotaTerceiro').getValue() == 'F') { if (engine.getField('ftFrotaTerceiro').getValue() && engine.getField('ftFrotaTerceiro').getValue() == 'F') {
sql += " and ccf.frota_terceiro = 'F'"; sql += " and ccf.frota_terceiro = 'F'";
} }
if (engine.getField('ftFrotaTerceiro').getValue() == 'T') { if (engine.getField('ftFrotaTerceiro').getValue() && engine.getField('ftFrotaTerceiro').getValue() == 'T') {
sql += " and ccf.frota_terceiro = 'T'"; sql += " and ccf.frota_terceiro = 'T'";
} }
if (engine.getField('ftUfDestino').getValue()) { if (engine.getField('ftUfDestino').getValue()) {
@@ -539,7 +543,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="DATA" caption="Data" format="dd/MM/yyyy" expand-ratio="0.05" commitOnValueChange="true" editable="true" /> <column name="DATA" caption="Data" format="dd/MM/yyyy" commitOnValueChange="true" editable="true" />
<generated name="VEICULO" caption="Veículo" cache="false" expand-ratio="0.05" > <generated name="VEICULO" caption="Veículo" cache="false" expand-ratio="0.05" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
@@ -605,7 +609,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="PLACA_CARRETA" caption="Placa carreta" cache="false" expand-ratio="0.05" > <generated name="PLACA_CARRETA" caption="Placa carreta" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -670,7 +674,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="FUNCIONARIO" caption="Funcionário" cache="false" expand-ratio="0.1" > <generated name="FUNCIONARIO" caption="Funcionário" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -735,8 +739,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="CTE" caption="CTE" expand-ratio="0.1" editable="true" commitOnValueChange="true"/> <column name="CTE" caption="CTE" editable="true" commitOnValueChange="true"/>
<generated name="CLIENTE" caption="Cliente" cache="false" expand-ratio="0.1" > <generated name="CLIENTE" caption="Cliente" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -801,7 +805,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="TIPO_FRETE" caption="Tipo frete" cache="false" expand-ratio="0.1" > <generated name="TIPO_FRETE" caption="Tipo frete" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -867,7 +871,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="FROTA_TERCEIRO" caption="Frota" cache="false" expand-ratio="0.1" > <generated name="FROTA_TERCEIRO" caption="Frota" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -921,8 +925,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="VALOR_FRETE" caption="Valor frete" align="RIGHT" format="#.##0,00" commitOnValueChange="true" editable="true" expand-ratio="0.05" decimalSeparator="," /> <column name="VALOR_FRETE" caption="Valor frete" align="RIGHT" format="#.##0,00" commitOnValueChange="true" editable="true" decimalSeparator="," />
<generated name="UF_ORIGEM" caption="Uf Origem" cache="false" expand-ratio="0.03" > <generated name="UF_ORIGEM" caption="Uf Origem" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -983,7 +987,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="UF_DESTINO" caption="Uf Destino" cache="false" expand-ratio="0.05" > <generated name="UF_DESTINO" caption="Uf Destino" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1059,7 +1063,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="FORMA_PAGAMENTO" caption="Forma pagamento" cache="false" expand-ratio="0.1" > <generated name="FORMA_PAGAMENTO" caption="Forma pagamento" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1125,8 +1129,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="VALOR_IMPOSTO" caption="Valor impostos" format="###0.00" decimalSeparator="," expand-ratio="0.2"/> <column name="VALOR_IMPOSTO" caption="Valor impostos" format="###0.00" decimalSeparator="," />
<column name="VALOR_LIQUIDO" caption="Lucro (Frete - Impostos)" format="###0.00" decimalSeparator="," expand-ratio="1"/> <column name="VALOR_LIQUIDO" caption="Lucro (Frete - Impostos)" format="###0.00" decimalSeparator="," />
</columns> </columns>
<events> <events>
<itemChange> <itemChange>
03 - Painéis/LANÇAMENTO - Despesas.xml
+128 -102
View File
@@ -48,6 +48,19 @@
var db = vScriptService.loadScript('db', 'javascript'); var db = vScriptService.loadScript('db', 'javascript');
var vitruvio = new db('vitruvio'); var vitruvio = new db('vitruvio');
var sql = "Select replace(replace(replace(to_char(sum(cdo.valor), 'L9G999G990D99'),',','-' ),'.',','),'-','.') total from controle_despesas_operacionais cdo where cdo.data between '" + engine.getField('dataInicio') + "' and '" + engine.getField('dataFinal') + "'"; var sql = "Select replace(replace(replace(to_char(sum(cdo.valor), 'L9G999G990D99'),',','-' ),'.',','),'-','.') total from controle_despesas_operacionais cdo where cdo.data between '" + engine.getField('dataInicio') + "' and '" + engine.getField('dataFinal') + "'";
if (engine.getField('ftFuncionario').getValue()) {
sql += " and cdo.chave_funcionario = " + engine.getField('ftFuncionario').getValue();
}
if (engine.getField('ftPlaca').getValue()) {
sql += " and cdo.chave_veiculo = " + engine.getField('ftPlaca').getValue();
}
if (engine.getField('ftCliente').getValue()) {
sql += " and cdo.chave_cliente = " + engine.getField('ftCliente').getValue();
}
if (engine.getField('ftFornecedor').getValue()) {
sql += " and cdo.chave_fornecedor = " + engine.getField('ftFornecedor').getValue();
}
//sql += " order by data desc";
vitruvio.query(sql).each(function (r) { vitruvio.query(sql).each(function (r) {
if (r.total) { if (r.total) {
engine.getLabel('sub').setValue('<b><font color="red">Subtotal R' + r.total + '</font></b>'); engine.getLabel('sub').setValue('<b><font color="red">Subtotal R' + r.total + '</font></b>');
@@ -485,22 +498,23 @@
" (select cf.nome from funcionario cf where cf.codigo = cdo.chave_funcionario) funcionario," + " (select cf.nome from funcionario cf where cf.codigo = cdo.chave_funcionario) funcionario," +
" (select cf.razao_social from fornecedor cf where cf.codigo = cdo.chave_fornecedor) fornecedor," + " (select cf.razao_social from fornecedor cf where cf.codigo = cdo.chave_fornecedor) fornecedor," +
" cdo.observacoes," + " cdo.observacoes," +
" cdo.valor valor " + " cdo.valor valor from controle_despesas_operacionais cdo ";
//" trim(replace(replace(replace(to_char(cdo.valor, '9999999999D99'),',','-' ),'.',','),'-','.')) valor " + if (engine.getField('dataInicio').getValue()) {
" from controle_despesas_operacionais cdo where cdo.data between '" + engine.getField('dataInicio') + "' and '" + engine.getField('dataFinal') + "'"; sql += " where cdo.data between '" + engine.getField('dataInicio').getValue() + "' and '" + engine.getField('dataFinal').getValue() + "'";
if (engine.getField('ftFuncionario').getValue()) { }
sql += " and cdo.chave_funcionario = " + engine.getField('ftFuncionario').getValue(); if (engine.getField('ftFuncionario').getValue()) {
} sql += " and cdo.chave_funcionario = " + engine.getField('ftFuncionario').getValue();
if (engine.getField('ftPlaca').getValue()) { }
sql += " and cdo.chave_veiculo = " + engine.getField('ftPlaca').getValue(); if (engine.getField('ftPlaca').getValue()) {
} sql += " and cdo.chave_veiculo = " + engine.getField('ftPlaca').getValue();
if (engine.getField('ftCliente').getValue()) { }
sql += " and cdo.chave_cliente = " + engine.getField('ftCliente').getValue(); if (engine.getField('ftCliente').getValue()) {
} sql += " and cdo.chave_cliente = " + engine.getField('ftCliente').getValue();
if (engine.getField('ftFornecedor').getValue()) { }
sql += " and cdo.chave_fornecedor = " + engine.getField('ftFornecedor').getValue(); if (engine.getField('ftFornecedor').getValue()) {
} sql += " and cdo.chave_fornecedor = " + engine.getField('ftFornecedor').getValue();
sql += " order by data desc"; }
sql += " order by data desc";
} }
return sql; return sql;
} }
@@ -509,7 +523,7 @@
</datasource> </datasource>
<key-field>chave_despesa_operacional</key-field> <key-field>chave_despesa_operacional</key-field>
<columns> <columns>
<generated name="EXCLUIR" caption="" expand-ratio="0.02" > <generated name="EXCLUIR" caption="" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
@@ -557,8 +571,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="DATA" caption="Data" expand-ratio="0.05" editable="true" editValueRequired="false" commitOnValueChange="true"/> <column name="DATA" caption="Data" editable="true" editValueRequired="false" commitOnValueChange="true"/>
<generated name="CLIENTE" caption="Cliente" cache="false" expand-ratio="0.1" > <generated name="CLIENTE" caption="Cliente" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -619,7 +633,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="CATEGORIA" caption="Categoria" cache="false" expand-ratio="0.15" > <generated name="CATEGORIA" caption="Categoria" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -680,7 +694,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="SUBCATEGORIA" caption="Sub-categoria" cache="false" expand-ratio="0.15" > <generated name="SUBCATEGORIA" caption="Sub-categoria" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -741,8 +755,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="NUMERO_DOCUMENTO" caption="Nr. documento" expand-ratio="0.05" commitOnEnter="true" commitOnValueChange="true" editable="true" /> <column name="NUMERO_DOCUMENTO" caption="Nr. documento" commitOnEnter="true" commitOnValueChange="true" editable="true" />
<generated name="FORMAPAGAMENTO" caption="Forma pagamento" cache="false" expand-ratio="0.1" > <generated name="FORMAPAGAMENTO" caption="Forma pagamento" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -803,7 +817,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="VEICULO" caption="Placa" cache="false" expand-ratio="0.05" > <generated name="VEICULO" caption="Placa" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -864,7 +878,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="FUNCIONARIO" caption="Funcionário" cache="false" expand-ratio="0.1"> <generated name="FUNCIONARIO" caption="Funcionário" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -925,7 +939,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="FORNECEDOR" caption="Fornecedor" cache="false" expand-ratio="0.1"> <generated name="FORNECEDOR" caption="Fornecedor" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -987,7 +1001,7 @@
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="VALOR" caption="Valor" format="#.##0,00" editable="true" commitOnEnter="true" commitOnValueChange="true" align="RIGHT" decimalSeparator="," /> <column name="VALOR" caption="Valor" format="#.##0,00" editable="true" commitOnEnter="true" commitOnValueChange="true" align="RIGHT" decimalSeparator="," />
<generated name="OBSERVACOES" caption="Observações" expand-ratio="0.2"> <generated name="OBSERVACOES" caption="Observações" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme); importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme);
importClass(Packages.com.vaadin.ui.VerticalLayout); importClass(Packages.com.vaadin.ui.VerticalLayout);
@@ -1206,17 +1220,20 @@
" cdp.valor" + " cdp.valor" +
" from controle_despesas_pessoais cdp where 1=2"; " from controle_despesas_pessoais cdp where 1=2";
if (engine) { if (engine) {
sql = "Select cdp.chave_pessoal," + sql = "Select cdp.chave_pessoal," +
" cdp.data," + " cdp.data," +
" (select cc.descricao from categoria cc where cc.codigo = cdp.chave_categoria) categoria," + " (select cc.descricao from categoria cc where cc.codigo = cdp.chave_categoria) categoria," +
" (select cs.nome from socios cs where cs.codigo = cdp.chave_responsavel) responsavel," + " (select cs.nome from socios cs where cs.codigo = cdp.chave_responsavel) responsavel," +
" cdp.observacoes," + " cdp.observacoes," +
" cdp.valor valor" + " cdp.valor valor" +
" from controle_despesas_pessoais cdp where cdp.data between '" + engine.getField('dataInicioPessoal') + "' and '" + engine.getField('dataFinalPessoal') + "'"; " from controle_despesas_pessoais cdp ";
if (engine.getField('ftResponsavelPessoal').getValue()) { if (engine.getField('dataInicioPessoal').getValue()) {
sql += " and cdp.chave_responsavel = " + engine.getField('ftResponsavelPessoal').getValue(); sql += "where cdp.data between '" + engine.getField('dataInicioPessoal').getValue() + "' and '" + engine.getField('dataFinalPessoal').getValue() + "'";
} }
sql += " order by data desc"; if (engine.getField('ftResponsavelPessoal').getValue()) {
sql += " and cdp.chave_responsavel = " + engine.getField('ftResponsavelPessoal').getValue();
}
sql += " order by data desc";
} }
return sql; return sql;
} }
@@ -1225,7 +1242,7 @@
</datasource> </datasource>
<key-field>chave_pessoal</key-field> <key-field>chave_pessoal</key-field>
<columns> <columns>
<generated name="EXCLUIR" caption="Excluir" expand-ratio="0.1"> <generated name="EXCLUIR" caption="Excluir" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
@@ -1274,8 +1291,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="DATA" caption="Data" format="dd/MM/yyyy" expand-ratio="0.05" commitOnValueChange="true" editable="true" /> <column name="DATA" caption="Data" format="dd/MM/yyyy" commitOnValueChange="true" editable="true" />
<generated name="CATEGORIA" caption="Categoria" cache="false" expand-ratio="0.15" > <generated name="CATEGORIA" caption="Categoria" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1336,7 +1353,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="RESPONSAVEL" caption="Responsável" cache="false" expand-ratio="0.15" > <generated name="RESPONSAVEL" caption="Responsável" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1397,8 +1414,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="VALOR" caption="Valor" format="#.##0,00" expand-ratio="0.1" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator="," /> <column name="VALOR" caption="Valor" format="#.##0,00" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator="," />
<generated name="OBSERVACOES" caption="Observações" expand-ratio="0.2"> <generated name="OBSERVACOES" caption="Observações" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme); importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme);
importClass(Packages.com.vaadin.ui.VerticalLayout); importClass(Packages.com.vaadin.ui.VerticalLayout);
@@ -1485,12 +1502,14 @@
if (engine) { if (engine) {
sql = "Select cs.nome, replace(replace(replace(to_char(sum(cdp.valor), '9999999999D99'),',','-' ),'.',','),'-','.') total " + sql = "Select cs.nome, replace(replace(replace(to_char(sum(cdp.valor), '9999999999D99'),',','-' ),'.',','),'-','.') total " +
"from controle_despesas_pessoais " + "from controle_despesas_pessoais " +
"cdp inner join socios cs on cs.codigo = cdp.chave_responsavel " + "cdp inner join socios cs on cs.codigo = cdp.chave_responsavel ";
"where cdp.data between '" + engine.getField('dataInicioPessoal') + "' and '" + engine.getField('dataFinalPessoal') + "'"; if (engine.getField('dataInicioPessoal').getValue()) {
if (engine.getField('ftResponsavelPessoal').getValue()) { sql += " where cdp.data between '" + engine.getField('dataInicioPessoal').getValue() + "' and '" + engine.getField('dataFinalPessoal').getValue() + "'";
sql += " and cdp.chave_responsavel = " + engine.getField('ftResponsavelPessoal').getValue(); }
} if (engine.getField('ftResponsavelPessoal').getValue()) {
sql += " group by cs.nome"; sql += " and cdp.chave_responsavel = " + engine.getField('ftResponsavelPessoal').getValue();
}
sql += " group by cs.nome";
} }
return sql; return sql;
} }
@@ -1499,8 +1518,8 @@
</datasource> </datasource>
<key-field>NOME</key-field> <key-field>NOME</key-field>
<columns> <columns>
<column name="NOME" caption="Responsável" expand-ratio="1" /> <column name="NOME" caption="Responsável" />
<column name="TOTAL" caption="Total" expand-ratio="0.2" /> <column name="TOTAL" caption="Total" />
</columns> </columns>
</DBTable> </DBTable>
</HorizontalLayout> </HorizontalLayout>
@@ -1775,17 +1794,20 @@
"cdc.km_final, " + "cdc.km_final, " +
"cdc.km_rodado, " + "cdc.km_rodado, " +
"cdc.media_consumo " + "cdc.media_consumo " +
"from controle_despesas_combustiveis cdc where cdc.data between '" + engine.getField('dataInicioCombustivel') + "' and '" + engine.getField('dataFinalCombustivel') + "'"; "from controle_despesas_combustiveis cdc ";
if (engine.getField('ftPlacaCombustivel').getValue()) { if (engine.getField('dataInicioCombustivel').getValue()) {
sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue(); sql += " where cdc.data between '" + engine.getField('dataInicioCombustivel').getValue() + "' and '" + engine.getField('dataFinalCombustivel').getValue() + "'";
} }
if (engine.getField('ftCombustivel').getValue()) { if (engine.getField('ftPlacaCombustivel').getValue()) {
sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue(); sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue();
} }
if (engine.getField('ftClienteCombustivel').getValue()) { if (engine.getField('ftCombustivel').getValue()) {
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue(); sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue();
} }
sql += " order by data desc"; if (engine.getField('ftClienteCombustivel').getValue()) {
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue();
}
sql += " order by data desc";
} }
return sql; return sql;
} }
@@ -1794,7 +1816,7 @@
</datasource> </datasource>
<key-field>chave_despesa_combustivel</key-field> <key-field>chave_despesa_combustivel</key-field>
<columns> <columns>
<generated name="EXCLUIR" caption="" expand-ratio="0.05"> <generated name="EXCLUIR" caption="" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox); importClass(Packages.br.com.davinti.base.vaadin.components.layout.ConfirmationBox);
@@ -1843,8 +1865,8 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="DATA" caption="Data" format="dd/MM/yyyy" expand-ratio="0.05" commitOnValueChange="true" editable="true" /> <column name="DATA" caption="Data" format="dd/MM/yyyy" commitOnValueChange="true" editable="true" />
<generated name="PLACA" caption="Veículo" cache="false" expand-ratio="0.05" > <generated name="PLACA" caption="Veículo" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1905,7 +1927,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="CLIENTE" caption="Cliente" cache="false" expand-ratio="0.1" > <generated name="CLIENTE" caption="Cliente" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -1966,7 +1988,7 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="OBSERVACOES" caption="Observações" expand-ratio="0.2"> <generated name="OBSERVACOES" caption="Observações" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme); importClass(Packages.br.com.davinti.vitruvio.ui.core.VitruvioTheme);
importClass(Packages.com.vaadin.ui.VerticalLayout); importClass(Packages.com.vaadin.ui.VerticalLayout);
@@ -2015,7 +2037,7 @@
var script = new Generator(); var script = new Generator();
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<generated name="COMBUSTIVEL" caption="Combustível" cache="false" expand-ratio="0.15" > <generated name="COMBUSTIVEL" caption="Combustível" cache="false" >
<scriptColumnGenerator language="JavaScript"> <scriptColumnGenerator language="JavaScript">
<![CDATA[ <![CDATA[
importClass(Packages.com.vaadin.ui.ComboBox); importClass(Packages.com.vaadin.ui.ComboBox);
@@ -2076,13 +2098,13 @@
]]> ]]>
</scriptColumnGenerator> </scriptColumnGenerator>
</generated> </generated>
<column name="LITROS" caption="Litros" expand-ratio="0.05" commitOnValueChange="true" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator="," /> <column name="LITROS" caption="Litros" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator="," />
<column name="VALOR_LITRO" caption="Vlr. litro" expand-ratio="0.05" commitOnValueChange="true" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator=","/> <column name="VALOR_LITRO" caption="Vlr. litro" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="TOTAL_COMBUSTIVEL" format="###0.00" caption="Total" expand-ratio="0.05" align="RIGHT" decimalSeparator=","/> <column name="TOTAL_COMBUSTIVEL" format="###0.00" caption="Total" align="RIGHT" decimalSeparator=","/>
<column name="KM_INICIAL" format="#.##0,00" caption="Km inicial" expand-ratio="0.05" commitOnEnter="true" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator=","/> <column name="KM_INICIAL" format="#.##0,00" caption="Km inicial" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="KM_FINAL" format="#.##0,00" caption="Km final" expand-ratio="0.05" commitOnValueChange="true" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator=","/> <column name="KM_FINAL" format="#.##0,00" caption="Km final" commitOnEnter="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="KM_RODADO" format="###0.00" caption="Km Rodado" expand-ratio="0.05" align="RIGHT" decimalSeparator="," /> <column name="KM_RODADO" format="###0.00" caption="Km Rodado" align="RIGHT" decimalSeparator="," />
<column name="MEDIA_CONSUMO" format="###0.00" caption="Média consumo" expand-ratio="0.05" align="RIGHT" decimalSeparator="," /> <column name="MEDIA_CONSUMO" format="###0.00" caption="Média consumo" align="RIGHT" decimalSeparator="," />
</columns> </columns>
<events> <events>
<itemChange> <itemChange>
@@ -2133,34 +2155,38 @@
sql = "Select c.descricao, " + sql = "Select c.descricao, " +
"sum(cdc.litros) litros, " + "sum(cdc.litros) litros, " +
"replace(replace(replace(to_char(sum(cdc.total_combustivel), '9999999999D99'),',','-' ),'.',','),'-','.') total " + "replace(replace(replace(to_char(sum(cdc.total_combustivel), '9999999999D99'),',','-' ),'.',','),'-','.') total " +
"from combustivel c inner join controle_despesas_combustiveis cdc on c.codigo = cdc.chave_combustivel " + "from combustivel c inner join controle_despesas_combustiveis cdc on c.codigo = cdc.chave_combustivel ";
"where cdc.data between '" + engine.getField('dataInicioCombustivel') + "' and '" + engine.getField('dataFinalCombustivel') + "'"; if (engine.getField('dataInicioCombustivel').getValue()) {
if (engine.getField('ftPlacaCombustivel').getValue()) { sql += " where cdc.data between '" + engine.getField('dataInicioCombustivel').getValue() + "' and '" + engine.getField('dataFinalCombustivel').getValue() + "'";
sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue(); }
} if (engine.getField('ftPlacaCombustivel').getValue()) {
if (engine.getField('ftCombustivel').getValue()) { sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue();
sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue(); }
} if (engine.getField('ftCombustivel').getValue()) {
if (engine.getField('ftClienteCombustivel').getValue()) { sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue();
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue(); }
} if (engine.getField('ftClienteCombustivel').getValue()) {
sql += " group by c.descricao "; sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue();
sql += "union " + }
"Select 'TOTAL' descricao, " + sql += " group by c.descricao ";
"sum(cdc.litros) litros, " + sql += "union " +
"replace(replace(replace(to_char(sum(cdc.total_combustivel), '9999999999D99'),',','-' ),'.',','),'-','.') total " + "Select 'TOTAL' descricao, " +
"from combustivel c inner join controle_despesas_combustiveis cdc on c.codigo = cdc.chave_combustivel " + "sum(cdc.litros) litros, " +
"where cdc.data between '" + engine.getField('dataInicioCombustivel') + "' and '" + engine.getField('dataFinalCombustivel') + "'"; "replace(replace(replace(to_char(sum(cdc.total_combustivel), '9999999999D99'),',','-' ),'.',','),'-','.') total " +
if (engine.getField('ftPlacaCombustivel').getValue()) { "from combustivel c inner join controle_despesas_combustiveis cdc on c.codigo = cdc.chave_combustivel ";
sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue(); if (engine.getField('dataInicioCombustivel').getValue()) {
} sql += " where cdc.data between '" + engine.getField('dataInicioCombustivel').getValue() + "' and '" + engine.getField('dataFinalCombustivel').getValue() + "'";
if (engine.getField('ftCombustivel').getValue()) { }
sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue(); if (engine.getField('ftPlacaCombustivel').getValue()) {
} sql += " and cdc.chave_veiculo = " + engine.getField('ftPlacaCombustivel').getValue();
if (engine.getField('ftClienteCombustivel').getValue()) { }
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue(); if (engine.getField('ftCombustivel').getValue()) {
} sql += " and cdc.chave_combustivel = " + engine.getField('ftCombustivel').getValue();
sql += " order by 1"; }
if (engine.getField('ftClienteCombustivel').getValue()) {
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue();
}
sql += " order by 1";
} }
return sql; return sql;
} }
@@ -2169,9 +2195,9 @@
</datasource> </datasource>
<key-field>DESCRICAO</key-field> <key-field>DESCRICAO</key-field>
<columns> <columns>
<column name="DESCRICAO" caption="Combustível" expand-ratio="1"/> <column name="DESCRICAO" caption="Combustível" />
<column name="LITROS" caption="Litros" expand-ratio="0.2"/> <column name="LITROS" caption="Litros" />
<column name="TOTAL" caption="Total" expand-ratio="0.3" /> <column name="TOTAL" caption="Total" />
</columns> </columns>
</DBTable> </DBTable>
</HorizontalLayout> </HorizontalLayout>