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

1650 - Melhorias e Alterações no Projeto TLK

Browse Source
This commit is contained in:
Lucas Favaro da Silva
2018-09-05 16:48:44 -03:00
parent 75c904982d
commit b92f6ae4ce
4 changed files with 512 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
03 - Painéis/LANÇAMENTO - Despesas.xml
+17 -18
View File
@@ -148,7 +148,7 @@
engine.getField('dataLancamento').setRequired(true);
engine.getField('dataPessoal').setRequired(false);
engine.getField('dataCombustivel').setRequired(false);
engine.getField('placa').setRequired(true);
engine.getField('placa').setRequired(false);
engine.getField('cliente').setRequired(true);
engine.getField('categoria').setRequired(true);
engine.getField('valor').setRequired(true);
@@ -508,7 +508,7 @@
</sqlBuilderDataSource>
</datasource>
<key-field>chave_despesa_operacional</key-field>
<columns>
<columns>
<generated name="EXCLUIR" caption="" expand-ratio="0.02" >
<scriptColumnGenerator language="JavaScript">
<![CDATA[
@@ -532,7 +532,7 @@
}
});
engine.getField('tbLancamentos').refresh();
engine.getGlobalVariable('fncSubTotalOperacional')();
engine.getGlobalVariable('fncSubTotal')();
}
var msg = 'Confirma a exclusão?'
@@ -1043,10 +1043,8 @@
var db = libService.loadScript('db');
var dbVitruvio = new db('vitruvio');
dbVitruvio.transaction(function() {
//if (event.isChanged('DATA')) {
var sqlAtualiza = "UPDATE controle_despesas_operacionais SET data = :data, numero_documento = :nrDocumento, valor = :valor " +
" WHERE CHAVE_DESPESA_OPERACIONAL = :chave";
//}
var sqlAtualiza = "UPDATE controle_despesas_operacionais SET data = :data, numero_documento = :nrDocumento, valor = :valor " +
" WHERE CHAVE_DESPESA_OPERACIONAL = :chave";
this.update(sqlAtualiza, {
chave: Number(event.getItemId()),
data: event.getField('DATA').getValue(),
@@ -1195,7 +1193,7 @@
</Label>
</HorizontalLayout>
<HorizontalLayout width="100%" spacing="true">
<DBTable id="tbPessoal" type="number" width="100%" height="100%" expandRatio="1" rows="11" selectable="false" exportXLS="true" editable="true" >
<DBTable id="tbPessoal" type="number" width="100%" height="100%" expandRatio="1" rows="10" selectable="false" exportXLS="true" editable="true" >
<datasource>
<sqlBuilderDataSource connection-key="vitruvio" language="JavaScript">
<![CDATA[
@@ -1475,7 +1473,7 @@
</itemChange>
</events>
</DBTable>
<DBTable id="tbTotalSocios" align="TOP_LEFT" type="string" width="100%" expandRatio="0.3" rows="11" exportXLS="true" editable="false" selectable="false">
<DBTable id="tbTotalSocios" align="TOP_LEFT" type="string" width="100%" expandRatio="0.3" rows="10" exportXLS="true" editable="false" selectable="false">
<datasource>
<sqlBuilderDataSource connection-key="vitruvio" language="JavaScript">
<![CDATA[
@@ -1744,7 +1742,7 @@
</Label>
</HorizontalLayout>
<HorizontalLayout width="100%" spacing="true">
<DBTable id="tbCombustivel" requireFilter="true" immediate="true" showRowCount="true" type="number" width="100%" height="100%" expandRatio="0.75" rows="11" selectable="false" exportXLS="true" editable="true" >
<DBTable id="tbCombustivel" requireFilter="true" showRowCount="true" type="number" width="100%" height="100%" expandRatio="0.75" rows="10" selectable="false" exportXLS="true" editable="true" >
<datasource>
<sqlBuilderDataSource connection-key="vitruvio" language="JavaScript">
<![CDATA[
@@ -2078,13 +2076,13 @@
]]>
</scriptColumnGenerator>
</generated>
<column name="LITROS" caption="Litros" expand-ratio="0.05" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="VALOR_LITRO" caption="Vlr. litro" expand-ratio="0.05" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="TOTAL_COMBUSTIVEL" caption="Total" expand-ratio="0.05" align="RIGHT" decimalSeparator=","/>
<column name="KM_INICIAL" caption="Km inicial" expand-ratio="0.05" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="KM_FINAL" caption="Km final" expand-ratio="0.05" commitOnValueChange="true" editable="true" align="RIGHT" decimalSeparator=","/>
<column name="KM_RODADO" caption="Km Rodado" expand-ratio="0.05" align="RIGHT" decimalSeparator="," />
<column name="MEDIA_CONSUMO" caption="Média consumo" expand-ratio="0.05" align="RIGHT" decimalSeparator="," />
<column name="LITROS" caption="Litros" expand-ratio="0.05" commitOnValueChange="true" 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="TOTAL_COMBUSTIVEL" format="###0.00" caption="Total" expand-ratio="0.05" 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_FINAL" format="#.##0,00" caption="Km final" expand-ratio="0.05" commitOnValueChange="true" 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="MEDIA_CONSUMO" format="###0.00" caption="Média consumo" expand-ratio="0.05" align="RIGHT" decimalSeparator="," />
</columns>
<events>
<itemChange>
@@ -2120,7 +2118,7 @@
</itemChange>
</events>
</DBTable>
<DBTable id="tbTotalCombustivel" type="string" width="100%" expandRatio="0.25" rows="11" selectable="false" exportXLS="true" editable="false" >
<DBTable id="tbTotalCombustivel" type="string" width="100%" expandRatio="0.25" rows="10" selectable="false" exportXLS="true" editable="false" >
<datasource>
<sqlBuilderDataSource connection-key="vitruvio" language="JavaScript">
<![CDATA[
@@ -2162,6 +2160,7 @@
if (engine.getField('ftClienteCombustivel').getValue()) {
sql += " and cdc.chave_cliente = " + engine.getField('ftClienteCombustivel').getValue();
}
sql += " order by 1";
}
return sql;
}