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

2348 - Correções DRE

Browse Source
This commit is contained in:
Ana Elisa dos Santos
2019-03-01 16:56:44 +00:00
parent c557a76d8a
commit cc776a93b8
1 changed files with 261 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
03 - Painéis/DRE.xml
+6 -5
View File
@@ -92,7 +92,7 @@
var c = java.util.Calendar.getInstance(); var c = java.util.Calendar.getInstance();
var formatter = new java.text.SimpleDateFormat("dd/MM/yyyy"); var formatter = new java.text.SimpleDateFormat("dd/MM/yyyy");
c.setTime(engine.getField('dataInicio').getValue()); c.setTime(engine.getField('dataInicio').getValue());
var data = c.getTime(); var data = c.getTime();
var dataInicio = formatter.format(data); var dataInicio = formatter.format(data);
@@ -171,7 +171,7 @@
</Panel> </Panel>
<Panel width="100%" margin="true" expandRatio="0.8" > <Panel width="100%" margin="true" expandRatio="0.8" >
<VerticalLayout width="100%" spacing="true" align="TOP_LEFT" > <VerticalLayout width="100%" spacing="true" align="TOP_LEFT" >
<DBTable id="tbResultados" type="string" expandRatio="1" compact="true" width="100%" rows="5" selectable="false" editable="false" > <DBTable id="tbResultados" type="string" expandRatio="1" compact="true" width="100%" rows="5" selectable="false" editable="false" exportXLS="true" >
<datasource> <datasource>
<sqlBuilderDataSource connection-key="vitruvio" language="JavaScript"> <sqlBuilderDataSource connection-key="vitruvio" language="JavaScript">
<![CDATA[ <![CDATA[
@@ -183,7 +183,7 @@
var c = java.util.Calendar.getInstance(); var c = java.util.Calendar.getInstance();
var formatter = new java.text.SimpleDateFormat("dd/MM/yyyy"); var formatter = new java.text.SimpleDateFormat("dd/MM/yyyy");
c.setTime(engine.getField('dataInicio').getValue()); c.setTime(engine.getField('dataInicio').getValue());
var data = c.getTime(); var data = c.getTime();
var dataInicio = formatter.format(data); var dataInicio = formatter.format(data);
@@ -202,8 +202,9 @@
data = fDespesas.getTime(); data = fDespesas.getTime();
var dataFinalDespesas = formatter.format(data); var dataFinalDespesas = formatter.format(data);
sql = "select fnc_dre_pivot(to_date('" + dataInicio + "','dd/MM/yyyy'),to_date('" + dataFinal + "','dd/MM/yyyy'),to_date('" + dataInicioDespesas + "','dd/MM/yyyy'),to_date('" + dataFinalDespesas + "','dd/MM/yyyy')) as sql_return"; sql = "select fnc_dre_pivot2(to_date('" + dataInicio + "','dd/MM/yyyy'),to_date('" + dataFinal + "','dd/MM/yyyy'),to_date('" + dataInicioDespesas + "','dd/MM/yyyy'),to_date('" + dataFinalDespesas + "','dd/MM/yyyy')) as sql_return";
var ds = vQueryService.executeQuery('vitruvio', sql);
var ds = vQueryService.executeQuery('vitruvio', sql);
ds.next(); ds.next();
return ds.getString('sql_return'); return ds.getString('sql_return');