Download as
Browse Code »

Commit 00613adf0ee067811f5e6f527e733d3e76bf950e

Authored by erick.sato
2 parents ec038ef1 6ce28402
Exists in master

Merge branch 'ctr-pj-0001-sprint10' of http://ferramentasgo.centralit.com.br:808… 

…0/scm/git/cit-grp-contratos into ctr-pj-0001-sprint10
Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
cit-contratos-web/src/main/resources/reports/relatorioLiberacoesPagamento.jrxml
  Diff comments   View file @00613ad
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.0.final using JasperReports Library version 6.2.0 -->
  3 +<!-- 2016-04-01T16:14:36 -->
2 4 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="relatorioPenalidades" pageWidth="554" pageHeight="802" orientation="Landscape" whenNoDataType="AllSectionsNoDetail" columnWidth="554" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="2a9bde7e-349d-4f0b-b96c-98310606be6f">
3 5 <property name="ireport.zoom" value="1.5"/>
4 6 <property name="ireport.x" value="0"/>
5 7 <property name="ireport.y" value="0"/>
  8 + <property name="com.jaspersoft.studio.data.defaultdataadapter" value="citgrpdb"/>
6 9 <style name="table">
7 10 <box>
8 11 <pen lineWidth="1.0" lineColor="#000000"/>
... ... @@ -39,7 +42,7 @@ from cnt_ev_liberacao_pagamento lp
39 42 inner join cnt_cn_envolvido en on en.id = lp.responsavel_id
40 43 left join parceiro_colaborador pc on pc.id = en.envolvido_id
41 44 left join parceiro p on p.id = pc.id
42   - left join pessoa ps on ps.id = p.id
  45 + left join pessoa ps on ps.id = p.pessoa_id
43 46 inner join cnt_lp_empenho lpe on lpe.liberacaopagamento_id = lp.id
44 47 inner join cnt_cn_empenho cne on cne.id = lpe.contratoempenho_id
45 48 where c.id = $P{CONTRATO_ID} $P!{DATA_INICIAL_TOKEN} $P!{DATA_FINAL_TOKEN};]]>
... ... @@ -172,7 +175,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
172 175 <reportElement x="5" y="85" width="544" height="1" uuid="0a116f87-49ef-40ba-8e38-021384df19ac"/>
173 176 </line>
174 177 </band>
175   - <band height="75" splitType="Stretch">
  178 + <band height="151" splitType="Stretch">
176 179 <staticText>
177 180 <reportElement x="5" y="10" width="549" height="25" uuid="b507a610-f7ee-4c3b-9d62-3ac4f2da7706"/>
178 181 <box topPadding="0" leftPadding="5"/>
... ... @@ -182,7 +185,7 @@ where c.id = $P{CONTRATO_ID}]]&gt;
182 185 <text><![CDATA[1. Relatórios]]></text>
183 186 </staticText>
184 187 <componentElement>
185   - <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="30" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/>
  188 + <reportElement key="table 1" positionType="Float" x="15" y="40" width="534" height="60" isPrintWhenDetailOverflows="true" uuid="a2f9cf2e-2f72-4013-9cbd-94bd20ce6df2"/>
186 189 <jr:table xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd">
187 190 <datasetRun subDataset="liberacoesPagamento" uuid="164d2db9-5e45-482b-b184-e729be724bfd">
188 191 <datasetParameter name="REPORT_CONNECTION">
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ConsultaRelatoriosController.js
  Diff comments   View file @00613ad
... ... @@ -58,13 +58,12 @@ citApp.controller(&#39;ConsultaRelatoriosController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$timeou
58 58 return;
59 59 }
60 60 }
61   - $scope.setLoadingGet(true);
62 61 if(!$scope.isTiposRelatorioSelecionado) {
63   - $scope.setLoading(false);
64 62 //Mensagem de erro de campos obrigatorios não preenchidos
65 63 $scope.showAlert('error', $translate.instant('VALIDACAO.ALERTA_OBRIGATORIOS'), " ", false);
66 64 return;
67 65 }
  66 +
68 67 var idsRelatoriosSelecionados = '';
69 68 angular.forEach($scope.tiposRelatorios, function(relatorio) {
70 69 if(relatorio.$selected){
... ... @@ -81,7 +80,6 @@ citApp.controller(&#39;ConsultaRelatoriosController&#39;, [&#39;$scope&#39;, &#39;$filter&#39;, &#39;$timeou
81 80 '&dataInicial=' + dataInicial +
82 81 '&dataFinal=' + dataFinal;
83 82 $scope.visualizarRelatorio($scope.url, $translate.instant('CONTRATOS.LABEL.RELATORIOS'));
84   - $scope.setLoading(false);
85 83 };
86 84  
87 85 }]);
88 86 \ No newline at end of file
... ...