Download as
Browse Code »

Commit f235185bcea3d8dd7fdf08270a869d61c84617ea

Authored by geovane.filho
2 parents 4b1a89fa 1663761b
Exists in master

Merge branch 'adm-1.16.0'

Showing 24 changed files with 239 additions and 150 deletions   Show diff stats
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoBemPatrimonialDaoHibernate.java
  Diff comments   View file @f235185
... ... @@ -79,8 +79,8 @@ public class HistoricoBemPatrimonialDaoHibernate extends CitGenericDAOImpl imple
79 79  
80 80 search.addFilterEqual("bemPatrimonial.id", idBemPatrimonial);
81 81  
82   - search.addSorts(Sort.desc("id"), Sort.desc("dataOperacao"));
83   -
  82 + search.addSorts(Sort.desc("dataOperacao"), Sort.desc("id"));
  83 +
84 84 return this.search(search, this.persistentClass);
85 85 }
86 86  
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/BemPatrimonialServiceImpl.java
  Diff comments   View file @f235185
... ... @@ -649,7 +649,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
649 649 }
650 650  
651 651 // Verifica se é uma alteração pelo inventário
652   - if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {
  652 + if (UtilObjeto.isReferencia(alteracaoBemVH.getDominioTipoAlteracaoIndividual()) && alteracaoBemVH.getDominioTipoAlteracaoIndividual().getCodigo().equals(Dominio.TIPO_ALTERACAO_BEM_PATRIMONIAL_INDIVIDUAL_INVENTARIO)) {
653 653 this.alterarBemPorInventario(alteracaoBemVH);
654 654 }
655 655 }
... ... @@ -696,7 +696,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
696 696 BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
697 697 itensAlterados.add(itemValorLiquido);
698 698  
699   - if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
  699 + if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
700 700 Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
701 701  
702 702 BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
... ... @@ -1078,7 +1078,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl<BemPatrimonial
1078 1078 itensAlterados = new ArrayList<BemPatrimonialAlteracaoItem>();
1079 1079 }
1080 1080  
1081   - if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
  1081 + if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
1082 1082 Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
1083 1083  
1084 1084 BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
... ... @@ -1141,13 +1141,13 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
1141 1141 caracAnterior.setValorMaterialCaracteristica(caracNova.getValorMaterialCaracteristica());
1142 1142 }
1143 1143  
1144   - if (caracAnterior.getArquivo() != null && !caracAnterior.getArquivo().equals(caracNova.getArquivo())) {
  1144 + if (caracAnterior.getArquivo() != null && !java.util.Arrays.equals(caracAnterior.getArquivo(),caracNova.getArquivo())) {
1145 1145 BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
1146 1146 if (item != null) {
1147 1147 itensCarac.add(item);
1148 1148 }
1149 1149 caracAnterior.setArquivo(caracNova.getArquivo());
1150   - } else if (caracNova.getArquivo() != null && !caracNova.getArquivo().equals(caracAnterior.getArquivo())) {
  1150 + } else if (caracNova.getArquivo() != null && !java.util.Arrays.equals(caracNova.getArquivo(),caracAnterior.getArquivo())) {
1151 1151 BemPatrimonialAlteracaoItem item = new BemPatrimonialAlteracaoItem(campoCarac, caracDescricao, caracAnterior.getArquivo(), caracNova.getArquivo());
1152 1152 if (item != null) {
1153 1153 itensCarac.add(item);
... ... @@ -1377,7 +1377,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
1377 1377  
1378 1378 bemPatrimonial.setNumeroPatrimonial(novoNumeroPatrimonial);
1379 1379 for (BemPatrimonialAlteracaoItem bemPatrimonialAlteracaoItem : itensAlterados) {
1380   - if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId() == bemPatrimonial.getId()){
  1380 + if(bemPatrimonialAlteracaoItem.getBemPatrimonial() != null && bemPatrimonialAlteracaoItem.getBemPatrimonial().getId().doubleValue() == bemPatrimonial.getId().doubleValue()){
1381 1381 bemPatrimonialAlteracaoItem.setBemPatrimonial(bemPatrimonial);
1382 1382 }
1383 1383 }
... ... @@ -1464,7 +1464,7 @@ public class BemPatrimonialServiceImpl extends GenericServiceImpl&lt;BemPatrimonial
1464 1464 BemPatrimonialAlteracaoItem itemValorLiquido = new BemPatrimonialAlteracaoItem(campoValorLiquido, bemPatrimonial.getValorLiquido().toString(), alteracaoBemVH.getNovoValorBruto().toString());
1465 1465 itensAlterados.add(itemValorLiquido);
1466 1466  
1467   - if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante() != alteracaoBemVH.getVidaUtil() )) {
  1467 + if (alteracaoBemVH.getVidaUtil() != null && ( bemPatrimonial.getVidaUtilRestante().intValue() != alteracaoBemVH.getVidaUtil().intValue() )) {
1468 1468 Dominio campoVidaUtilRestante = this.dominioService.findByChaveAndCodigo(DominioMaterial.CAMPO_REFERENCIA, DominioMaterial.CAMPO_REFERENCIA_BEM_PATRIMONIAL_VIDA_UTIL_RESTANTE_CODIGO);
1469 1469  
1470 1470 BemPatrimonialAlteracaoItem itemVidaUtil = new BemPatrimonialAlteracaoItem(campoVidaUtilRestante, bemPatrimonial.getVidaUtilRestante().toString(), alteracaoBemVH.getVidaUtil().toString());
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/EntradaServiceImpl.java
  Diff comments   View file @f235185
... ... @@ -638,27 +638,26 @@ public class EntradaServiceImpl extends GenericServiceImpl&lt;EntradaPatrimonio, Lo
638 638 */
639 639 @Override
640 640 public boolean verificaExistenciaBensPatrimoniaisEntrada(Long idEntrada) {
641   -
642 641 EntradaPatrimonio entradaPatrimonio = find(idEntrada);
643   - List<BemPatrimonialTemporario> bensPatrimoniaisTemporarios;
644 642 List<BemPatrimonial> bensPatrimoniais;
  643 + List<BemPatrimonialTemporario> bensPatrimoniaisTemporarios;
645 644  
646   - if(entradaPatrimonio.getEntradasIten() != null) {
647   -
  645 + if(UtilObjeto.isReferencia(entradaPatrimonio.getEntradasIten()) && !entradaPatrimonio.getEntradasIten().isEmpty()) {
648 646 for (EntradaPatrimonioItem entradaPatrimonioItem : entradaPatrimonio.getEntradasIten()) {
649 647  
650   - bensPatrimoniaisTemporarios = bemPatrimonialTemporarioService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
651 648 bensPatrimoniais = bemPatrimonialService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
  649 + bensPatrimoniaisTemporarios = bemPatrimonialTemporarioService.findAllByEntradaItemId(entradaPatrimonioItem.getId());
652 650  
653   - if(bensPatrimoniaisTemporarios != null && !bensPatrimoniaisTemporarios.isEmpty()) {
  651 + if (!UtilObjeto.isReferencia(bensPatrimoniais) || bensPatrimoniais.isEmpty()) {
654 652 return false;
655 653 }
656 654  
657   - if(bensPatrimoniais == null || bensPatrimoniais.isEmpty()) {
  655 + if (UtilObjeto.isReferencia(bensPatrimoniaisTemporarios) && !bensPatrimoniaisTemporarios.isEmpty()) {
658 656 return false;
659 657 }
660   -
661 658 }
  659 + } else {
  660 + return false;
662 661 }
663 662 return true;
664 663 }
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/HistoricoBemPatrimonialServiceImpl.java
  Diff comments   View file @f235185
... ... @@ -1416,7 +1416,7 @@ public class HistoricoBemPatrimonialServiceImpl extends GenericServiceImpl&lt;Histo
1416 1416  
1417 1417 historicoBemPrincipal.setDominioClasseReferencia(classeReferencia);
1418 1418  
1419   - historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal.getCodigo());
  1419 + historicoBemPrincipal.setCodigoOperacao(adicaoBemPrincipal != null ? adicaoBemPrincipal.getCodigo() : null);
1420 1420  
1421 1421 return this.save(historicoBemPrincipal);
1422 1422  
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/SaidaTemporariaServiceImpl.java
  Diff comments   View file @f235185
... ... @@ -487,9 +487,10 @@ public class SaidaTemporariaServiceImpl extends GenericServiceImpl&lt;SaidaTemporar
487 487 for (Iterator<SaidaTemporariaItem> iterator = saida.getSaidaTemporariaItens().iterator(); iterator.hasNext();) {
488 488 this.saidaTemporariaItemService.removeById(iterator.next().getId());
489 489 }
  490 + return super.removeById(saida.getId());
490 491 }
  492 + return false;
491 493  
492   - return super.removeById(saida.getId());
493 494 }
494 495  
495 496 /**
... ...
citgrp-patrimonio-api/src/main/java/br/com/centralit/api/service/impl/TransferenciaServiceImpl.java
  Diff comments   View file @f235185
... ... @@ -249,7 +249,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl&lt;Transferencia,
249 249 } else {
250 250 boolean salvarNovaTransferencia = true;
251 251 for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
252   - if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){
  252 + if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
253 253 salvarNovaTransferencia = false;
254 254 break;
255 255 }
... ... @@ -271,7 +271,7 @@ public class TransferenciaServiceImpl extends GenericServiceImpl&lt;Transferencia,
271 271  
272 272 boolean salvarNovaTransferencia = true;
273 273 for (TransferenciaItem transferenciaItemTemp : transferenciaItemListTemp) {
274   - if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId() == transferencia.getEstruturaOrganizacionalDestino().getId()){
  274 + if(transferenciaItemTemp.getEstruturaOrganizacionalOrigem().getId().doubleValue() == transferencia.getEstruturaOrganizacionalDestino().getId().doubleValue()){
275 275 salvarNovaTransferencia = false;
276 276 break;
277 277 }
... ...
citgrp-patrimonio-web/src/main/java/br/com/centralit/controller/ReportEntradaController.java
  Diff comments   View file @f235185
... ... @@ -217,7 +217,7 @@ public class ReportEntradaController extends GenericController&lt;Entrada&gt; {
217 217 //Inicio relatorio de resumo
218 218 input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
219 219 inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
220   - String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
  220 + String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
221 221  
222 222 JasperDesign jasperDesign = JRXmlLoader.load(input);
223 223 JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
... ... @@ -319,7 +319,7 @@ public class ReportEntradaController extends GenericController&lt;Entrada&gt; {
319 319 //Inicio relatorio de resumo
320 320 input = this.getClass().getResourceAsStream("/reports/templateRetratoRepeat.jrxml");
321 321 inputSub = this.getClass().getResourceAsStream("/reports/entradaPatrimonioBensResumoContabil.jrxml");
322   - String titulo = this.internacionalizacaoService.getTranslate("LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
  322 + String titulo = this.internacionalizacaoService.getTranslate("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", this.getIdioma());
323 323  
324 324 JasperDesign jasperDesign = JRXmlLoader.load(input);
325 325 JasperDesign jasperDesignSubResumo = JRXmlLoader.load(inputSub);
... ...
citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
  Diff comments   View file @f235185
... ... @@ -408,6 +408,7 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
408 408 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_BEM_PATRIMONIAL_ANALITICO_UA_ENDERECO", "Relatório Analítico de Bens Móveis (Ordenado por Descrição - Agrupado por U.A./Endereço)", dominio, modulo));
409 409 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_BEM_PATRIMONIAL_FICHA_INDIVIDUAL", "Ficha Individual do Bem", dominio, modulo));
410 410 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_ANALITICO", "Entrada de Materiais - Analítico", dominio, modulo));
  411 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_RESUMO_CONTABIL", "Resumo por Código Contábil", dominio, modulo));
411 412 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_ENTRADA_PATRIMONIO_SINTETICO", "Entrada de Materiais - Sintético", dominio, modulo));
412 413 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_INVENTARIO_ANALITICO", "Relatório de Inventário Geral Agrupado por Conta Contábil Analítico", dominio, modulo));
413 414 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TITULO_INVENTARIO_BENS_ENCONTRADOS_EXTRAVIADO", "Bens Encontrados com Status Extraviado", dominio, modulo));
... ... @@ -579,6 +580,11 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
579 580 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.TRANSFERENCIA_CANCELADA", "Transferência cancelada", dominio, modulo));
580 581 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.ALTERAR_STATUS", "Alteração de status", dominio, modulo));
581 582 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BUSCA_INTERVALO_NUM_PATRIMONIAL", "Filtrar por intervalo de número patrimonial", dominio, modulo));
  583 +
  584 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_ATIVO", "Ativos", dominio, modulo));
  585 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_BAIXADO", "Baixados", dominio, modulo));
  586 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.LABEL.BEM_STATUS_OUTROS", "Outros", dominio, modulo));
  587 +
582 588  
583 589 }
584 590  
... ... @@ -644,6 +650,7 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
644 650 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.ESTRUTURA_ORGANIZACIONAL", "Detentor não possui estrutura organizacional vinculada em seu cadastro. Por gentileza, preencha tal informação para prosseguir.", dominio, modulo));
645 651 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.REMOVER_TODOS_ITEM_TRASNFERENCIA", "Não é permitido remover todos itens da transferência. Caso queira remover todos os bem, favor excluir a transferência.", dominio, modulo));
646 652 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.TRANSFERENCIA_ITEM_SEM_EO_ORIGEM", "O seguinte item não possui Estrutura Organizacional de Origem: ", dominio, modulo));
  653 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL", "Informe o status do bem patrimonial.", dominio, modulo));
647 654 }
648 655  
649 656 private void gerarMensagem(Dominio dominio, Modulo modulo, List<Internacionalizacao> internacionalizacaoList) {
... ... @@ -750,6 +757,13 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
750 757 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_VIDA_UTIL_CONTA_CONTABIL", "Carregar vida útil configurada na conta contábil do material", dominio, modulo));
751 758 internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_TAXA_RESIDUAL_CONTA_CONTABIL", "Carregar taxa residual configurada na conta contábil do material", dominio, modulo));
752 759 internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.DEFINICAO_DETENTOR_ANTERIOR_ULTIMA_OPERACAO", "Você não pode definir um detentor de um bem patrimonial com data anterior a da última operação do bem! Verifique a operação: ", dominio, modulo));
  760 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CONFIRMA_AUMENTAR_VIDA_UTIL", "Tem certeza que deseja aumentar a vida útil restante do bem?", dominio, modulo));
  761 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CONFIRMA_DIMINUIR_VIDA_UTIL", "Tem certeza que deseja diminuir a vida útil restante do bem?", dominio, modulo));
  762 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.NOVO_VALOR_REAVALIACAO", "O novo valor deve ser maior que o valor atual!", dominio, modulo));
  763 + internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.NOVO_VALOR_REDUCAO", "O novo valor deve ser menor que o valor atual!", dominio, modulo));
  764 + internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_REDUCAO", "O novo valor deve ser menor que o valor atual!", dominio, modulo));
  765 + internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_REAVALIACAO", "O novo valor deve ser maior que o valor atual!", dominio, modulo));
  766 + internacionalizacaoList.add(new Internacionalizacao("CODIGOERRO.NOVO_VALOR_RESIDUAL", "Novo valor residual não pode ser maior que o valor líquido atual do bem!", dominio, modulo));
753 767 }
754 768  
755 769 }
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidade.jrxml
  Diff comments   View file @f235185
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-17T16:51:42 -->
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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="540" leftMargin="10" rightMargin="45" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 5 <property name="ireport.zoom" value="2.0"/>
4 6 <property name="ireport.x" value="0"/>
... ... @@ -225,7 +227,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
225 227 </textElement>
226 228 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
227 229 </textField>
228   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  230 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
229 231 <reportElement stretchType="RelativeToTallestObject" x="445" y="0" width="95" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
230 232 <box>
231 233 <pen lineWidth="0.5"/>
... ... @@ -270,14 +272,14 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
270 272 </textField>
271 273 <textField isStretchWithOverflow="true">
272 274 <reportElement stretchType="RelativeToTallestObject" x="117" y="0" width="250" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
273   - <box>
  275 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
274 276 <pen lineWidth="0.5"/>
275 277 <topPen lineWidth="0.5"/>
276 278 <leftPen lineWidth="0.5"/>
277 279 <bottomPen lineWidth="0.5"/>
278 280 <rightPen lineWidth="0.5"/>
279 281 </box>
280   - <textElement verticalAlignment="Top">
  282 + <textElement>
281 283 <font size="6"/>
282 284 <paragraph leftIndent="2" rightIndent="2" spacingBefore="2"/>
283 285 </textElement>
... ... @@ -313,7 +315,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
313 315 <staticText>
314 316 <reportElement x="8" y="65" width="151" height="20" uuid="8062196d-7611-417a-80c6-8c660c62dfb9"/>
315 317 <textElement textAlignment="Center">
316   - <font size="8"/>
  318 + <font size="7"/>
317 319 </textElement>
318 320 <text><![CDATA[ ____/____/________]]></text>
319 321 </staticText>
... ... @@ -323,7 +325,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
323 325 <staticText>
324 326 <reportElement x="193" y="64" width="151" height="20" uuid="82461d39-28b0-4b90-a9ad-01302eb5446a"/>
325 327 <textElement textAlignment="Center">
326   - <font size="8"/>
  328 + <font size="7"/>
327 329 </textElement>
328 330 <text><![CDATA[ ____/____/________]]></text>
329 331 </staticText>
... ... @@ -337,7 +339,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
337 339 <staticText>
338 340 <reportElement x="380" y="65" width="151" height="20" uuid="d02d328f-07c3-4648-8316-1507f5321724"/>
339 341 <textElement textAlignment="Center">
340   - <font size="8"/>
  342 + <font size="7"/>
341 343 </textElement>
342 344 <text><![CDATA[ ____/____/________]]></text>
343 345 </staticText>
... ... @@ -369,7 +371,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
369 371 </textElement>
370 372 <text><![CDATA[Total Geral:]]></text>
371 373 </staticText>
372   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  374 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
373 375 <reportElement x="445" y="0" width="95" height="15" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
374 376 <box leftPadding="0" rightPadding="5">
375 377 <pen lineWidth="0.5"/>
... ... @@ -386,11 +388,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
386 388 </band>
387 389 </summary>
388 390 <noData>
389   - <band height="20">
  391 + <band height="17">
390 392 <staticText>
391   - <reportElement x="0" y="0" width="540" height="20" uuid="900d7ffc-b1e5-4c92-a0c1-a6f2c49dcceb"/>
  393 + <reportElement x="0" y="0" width="540" height="17" uuid="900d7ffc-b1e5-4c92-a0c1-a6f2c49dcceb">
  394 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  395 + </reportElement>
392 396 <textElement textAlignment="Center" verticalAlignment="Middle">
393   - <font isBold="true"/>
  397 + <font size="8" isBold="true"/>
394 398 </textElement>
395 399 <text><![CDATA[Seção vazia]]></text>
396 400 </staticText>
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeColaborador.jrxml
  Diff comments   View file @f235185
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-17T16:49:21 -->
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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="540" leftMargin="10" rightMargin="45" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 5 <property name="ireport.zoom" value="1.7715610000000017"/>
4 6 <property name="ireport.x" value="0"/>
... ... @@ -242,7 +244,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
242 244 </textElement>
243 245 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
244 246 </textField>
245   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  247 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
246 248 <reportElement stretchType="RelativeToTallestObject" x="455" y="0" width="84" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
247 249 <box leftPadding="0" rightPadding="5">
248 250 <pen lineWidth="1.0"/>
... ... @@ -286,7 +288,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
286 288 </textField>
287 289 <textField isStretchWithOverflow="true">
288 290 <reportElement stretchType="RelativeToTallestObject" x="114" y="0" width="275" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
289   - <box leftPadding="5">
  291 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
290 292 <pen lineWidth="1.0"/>
291 293 <topPen lineWidth="1.0"/>
292 294 <leftPen lineWidth="1.0"/>
... ... @@ -322,7 +324,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
322 324 <staticText>
323 325 <reportElement x="9" y="68" width="151" height="20" uuid="96c7b0f7-6df1-4b3d-b402-6acf9ee84373"/>
324 326 <textElement textAlignment="Center">
325   - <font size="8"/>
  327 + <font size="7"/>
326 328 </textElement>
327 329 <text><![CDATA[ ____/____/________]]></text>
328 330 </staticText>
... ... @@ -336,7 +338,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
336 338 <staticText>
337 339 <reportElement x="381" y="68" width="151" height="20" uuid="58f799a1-1ca5-4818-98c1-f83290a72990"/>
338 340 <textElement textAlignment="Center">
339   - <font size="8"/>
  341 + <font size="7"/>
340 342 </textElement>
341 343 <text><![CDATA[ ____/____/________]]></text>
342 344 </staticText>
... ... @@ -346,7 +348,7 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
346 348 <staticText>
347 349 <reportElement x="194" y="67" width="151" height="20" uuid="65f5bc7b-eb27-4b02-b5e7-2aec69805c58"/>
348 350 <textElement textAlignment="Center">
349   - <font size="8"/>
  351 + <font size="7"/>
350 352 </textElement>
351 353 <text><![CDATA[ ____/____/________]]></text>
352 354 </staticText>
... ... @@ -380,12 +382,12 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
380 382 <bottomPen lineWidth="1.0"/>
381 383 <rightPen lineWidth="1.0"/>
382 384 </box>
383   - <textElement textAlignment="Right">
  385 + <textElement textAlignment="Right" verticalAlignment="Middle">
384 386 <font size="7" isBold="true"/>
385 387 </textElement>
386 388 <text><![CDATA[Total Geral:]]></text>
387 389 </staticText>
388   - <textField pattern="#,##0.00">
  390 + <textField pattern="¤ #,##0.00">
389 391 <reportElement x="455" y="0" width="84" height="15" uuid="f612d70d-1255-41f5-9b55-37079653d5e0"/>
390 392 <box leftPadding="0" rightPadding="5">
391 393 <pen lineWidth="1.0"/>
... ... @@ -402,11 +404,13 @@ ORDER BY bemPatrimonial.numeroPatrimonial]]&gt;
402 404 </band>
403 405 </summary>
404 406 <noData>
405   - <band height="20">
  407 + <band height="17">
406 408 <staticText>
407   - <reportElement x="0" y="0" width="540" height="20" uuid="3d36021c-a694-4cb2-8199-781c472d5fa2"/>
  409 + <reportElement x="0" y="0" width="540" height="17" uuid="3d36021c-a694-4cb2-8199-781c472d5fa2">
  410 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  411 + </reportElement>
408 412 <textElement textAlignment="Center" verticalAlignment="Middle">
409   - <font isBold="true" isPdfEmbedded="true"/>
  413 + <font size="8" isBold="true" isPdfEmbedded="true"/>
410 414 </textElement>
411 415 <text><![CDATA[Seção Vazia]]></text>
412 416 </staticText>
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeInventarioPorUL.jrxml
  Diff comments   View file @f235185
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-17T15:54:52 -->
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="termoResponsabilidadeInventarioPorUL" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 5 <property name="ireport.zoom" value="1.5"/>
4 6 <property name="ireport.x" value="0"/>
... ... @@ -70,9 +72,11 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
70 72 <group name="Inventario">
71 73 <groupExpression><![CDATA[$P{idInventario}]]></groupExpression>
72 74 <groupHeader>
73   - <band height="20">
  75 + <band height="22">
74 76 <staticText>
75   - <reportElement x="0" y="5" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
  77 + <reportElement x="0" y="5" width="30" height="17" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
  78 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  79 + </reportElement>
76 80 <box>
77 81 <pen lineWidth="1.0"/>
78 82 <topPen lineWidth="1.0"/>
... ... @@ -86,7 +90,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
86 90 <text><![CDATA[Item]]></text>
87 91 </staticText>
88 92 <staticText>
89   - <reportElement x="30" y="5" width="59" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
  93 + <reportElement x="30" y="5" width="59" height="17" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
90 94 <box>
91 95 <pen lineWidth="1.0"/>
92 96 <topPen lineWidth="1.0"/>
... ... @@ -100,7 +104,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
100 104 <text><![CDATA[Patrimônio]]></text>
101 105 </staticText>
102 106 <staticText>
103   - <reportElement x="89" y="5" width="281" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
  107 + <reportElement x="89" y="5" width="281" height="17" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
104 108 <box>
105 109 <pen lineWidth="1.0"/>
106 110 <topPen lineWidth="1.0"/>
... ... @@ -114,7 +118,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
114 118 <text><![CDATA[Descrição]]></text>
115 119 </staticText>
116 120 <staticText>
117   - <reportElement x="370" y="5" width="66" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
  121 + <reportElement x="370" y="5" width="66" height="17" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
118 122 <box>
119 123 <pen lineWidth="1.0"/>
120 124 <topPen lineWidth="1.0"/>
... ... @@ -128,7 +132,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
128 132 <text><![CDATA[Sit. física]]></text>
129 133 </staticText>
130 134 <staticText>
131   - <reportElement x="436" y="5" width="73" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
  135 + <reportElement x="436" y="5" width="73" height="17" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
132 136 <box>
133 137 <pen lineWidth="1.0"/>
134 138 <topPen lineWidth="1.0"/>
... ... @@ -142,7 +146,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
142 146 <text><![CDATA[Valor aquisição]]></text>
143 147 </staticText>
144 148 <staticText>
145   - <reportElement x="509" y="5" width="66" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
  149 + <reportElement x="509" y="5" width="66" height="17" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
146 150 <box>
147 151 <pen lineWidth="1.0"/>
148 152 <topPen lineWidth="1.0"/>
... ... @@ -229,7 +233,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
229 233 </textElement>
230 234 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
231 235 </textField>
232   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  236 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
233 237 <reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
234 238 <box leftPadding="0" rightPadding="5">
235 239 <pen lineWidth="1.0"/>
... ... @@ -243,7 +247,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
243 247 </textElement>
244 248 <textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
245 249 </textField>
246   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  250 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
247 251 <reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="17" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
248 252 <box leftPadding="0" rightPadding="5">
249 253 <pen lineWidth="1.0"/>
... ... @@ -287,7 +291,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
287 291 </textField>
288 292 <textField isStretchWithOverflow="true">
289 293 <reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
290   - <box leftPadding="5">
  294 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
291 295 <pen lineWidth="1.0"/>
292 296 <topPen lineWidth="1.0"/>
293 297 <leftPen lineWidth="1.0"/>
... ... @@ -417,7 +421,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
417 421 </lastPageFooter>
418 422 <summary>
419 423 <band height="15" splitType="Stretch">
420   - <textField pattern="#,##0.00">
  424 + <textField pattern="¤ #,##0.00">
421 425 <reportElement x="509" y="0" width="66" height="15" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
422 426 <box leftPadding="0" rightPadding="5">
423 427 <pen lineWidth="1.0"/>
... ... @@ -431,7 +435,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
431 435 </textElement>
432 436 <textFieldExpression><![CDATA[$V{totalValorLiquido}]]></textFieldExpression>
433 437 </textField>
434   - <textField pattern="#,##0.00">
  438 + <textField pattern="¤ #,##0.00">
435 439 <reportElement x="436" y="0" width="73" height="15" uuid="ea2584d5-fab7-4341-afda-7a19d18b3c6f"/>
436 440 <box leftPadding="0" rightPadding="5">
437 441 <pen lineWidth="1.0"/>
... ... @@ -454,7 +458,7 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
454 458 <bottomPen lineWidth="0.0"/>
455 459 <rightPen lineWidth="0.0"/>
456 460 </box>
457   - <textElement textAlignment="Right">
  461 + <textElement textAlignment="Right" verticalAlignment="Middle">
458 462 <font size="7" isBold="true"/>
459 463 </textElement>
460 464 <text><![CDATA[Total (R$)]]></text>
... ... @@ -462,11 +466,13 @@ WHERE I.ID = $P{idInventario} AND EO.ID = $P{idUnidade}]]&gt;
462 466 </band>
463 467 </summary>
464 468 <noData>
465   - <band height="20">
  469 + <band height="17">
466 470 <staticText>
467   - <reportElement x="1" y="0" width="539" height="20" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9"/>
  471 + <reportElement x="1" y="0" width="539" height="17" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9">
  472 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  473 + </reportElement>
468 474 <textElement textAlignment="Center" verticalAlignment="Middle">
469   - <font isBold="true"/>
  475 + <font size="8" isBold="true"/>
470 476 </textElement>
471 477 <text><![CDATA[Seção Vazia]]></text>
472 478 </staticText>
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoResponsabilidadeUnidade.jrxml
  Diff comments   View file @f235185
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-17T15:44:54 -->
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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="575" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 5 <property name="ireport.zoom" value="1.5394743546921208"/>
4 6 <property name="ireport.x" value="0"/>
... ... @@ -121,9 +123,11 @@ OR T.DATAFIM IS NULL
121 123 <group name="Termo">
122 124 <groupExpression><![CDATA[$P{idTermo}]]></groupExpression>
123 125 <groupHeader>
124   - <band height="20">
  126 + <band height="21">
125 127 <staticText>
126   - <reportElement x="0" y="5" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
  128 + <reportElement x="0" y="5" width="30" height="16" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
  129 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  130 + </reportElement>
127 131 <box>
128 132 <pen lineWidth="0.5"/>
129 133 <topPen lineWidth="0.5"/>
... ... @@ -137,7 +141,7 @@ OR T.DATAFIM IS NULL
137 141 <text><![CDATA[Item]]></text>
138 142 </staticText>
139 143 <staticText>
140   - <reportElement x="30" y="5" width="59" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
  144 + <reportElement x="30" y="5" width="59" height="16" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
141 145 <box>
142 146 <pen lineWidth="0.5"/>
143 147 <topPen lineWidth="0.5"/>
... ... @@ -151,7 +155,7 @@ OR T.DATAFIM IS NULL
151 155 <text><![CDATA[Patrimônio]]></text>
152 156 </staticText>
153 157 <staticText>
154   - <reportElement x="89" y="5" width="281" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
  158 + <reportElement x="89" y="5" width="281" height="16" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
155 159 <box>
156 160 <pen lineWidth="0.5"/>
157 161 <topPen lineWidth="0.5"/>
... ... @@ -165,7 +169,7 @@ OR T.DATAFIM IS NULL
165 169 <text><![CDATA[Descrição]]></text>
166 170 </staticText>
167 171 <staticText>
168   - <reportElement x="370" y="5" width="66" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
  172 + <reportElement x="370" y="5" width="66" height="16" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
169 173 <box>
170 174 <pen lineWidth="0.5"/>
171 175 <topPen lineWidth="0.5"/>
... ... @@ -179,7 +183,7 @@ OR T.DATAFIM IS NULL
179 183 <text><![CDATA[Sit. Física]]></text>
180 184 </staticText>
181 185 <staticText>
182   - <reportElement x="436" y="5" width="73" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
  186 + <reportElement x="436" y="5" width="73" height="16" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
183 187 <box>
184 188 <pen lineWidth="0.5"/>
185 189 <topPen lineWidth="0.5"/>
... ... @@ -193,7 +197,7 @@ OR T.DATAFIM IS NULL
193 197 <text><![CDATA[Valor Aquisição]]></text>
194 198 </staticText>
195 199 <staticText>
196   - <reportElement x="509" y="5" width="66" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
  200 + <reportElement x="509" y="5" width="66" height="16" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
197 201 <box>
198 202 <pen lineWidth="0.5"/>
199 203 <topPen lineWidth="0.5"/>
... ... @@ -265,9 +269,9 @@ OR T.DATAFIM IS NULL
265 269 </band>
266 270 </pageHeader>
267 271 <detail>
268   - <band height="15" splitType="Prevent">
  272 + <band height="16" splitType="Prevent">
269 273 <textField isStretchWithOverflow="true">
270   - <reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="66" height="15" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
  274 + <reportElement stretchType="RelativeToTallestObject" x="370" y="0" width="66" height="16" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
271 275 <box>
272 276 <pen lineWidth="0.5"/>
273 277 <topPen lineWidth="0.5"/>
... ... @@ -280,8 +284,8 @@ OR T.DATAFIM IS NULL
280 284 </textElement>
281 285 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
282 286 </textField>
283   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
284   - <reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="15" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
  287 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
  288 + <reportElement stretchType="RelativeToTallestObject" x="436" y="0" width="73" height="16" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
285 289 <box>
286 290 <pen lineWidth="0.5"/>
287 291 <topPen lineWidth="0.5"/>
... ... @@ -295,8 +299,8 @@ OR T.DATAFIM IS NULL
295 299 </textElement>
296 300 <textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
297 301 </textField>
298   - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
299   - <reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="15" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
  302 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00" isBlankWhenNull="true">
  303 + <reportElement stretchType="RelativeToTallestObject" x="509" y="0" width="66" height="16" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
300 304 <box>
301 305 <pen lineWidth="0.5"/>
302 306 <topPen lineWidth="0.5"/>
... ... @@ -311,7 +315,9 @@ OR T.DATAFIM IS NULL
311 315 <textFieldExpression><![CDATA[$F{valorliquido}]]></textFieldExpression>
312 316 </textField>
313 317 <textField isStretchWithOverflow="true">
314   - <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="15" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3"/>
  318 + <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="16" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3">
  319 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  320 + </reportElement>
315 321 <box>
316 322 <pen lineWidth="0.5"/>
317 323 <topPen lineWidth="0.5"/>
... ... @@ -325,7 +331,7 @@ OR T.DATAFIM IS NULL
325 331 <textFieldExpression><![CDATA[$V{REPORT_COUNT}]]></textFieldExpression>
326 332 </textField>
327 333 <textField isStretchWithOverflow="true" isBlankWhenNull="false">
328   - <reportElement stretchType="RelativeToTallestObject" x="30" y="0" width="59" height="15" uuid="d5c91777-685e-4aa8-844a-d7dc07ab006d"/>
  334 + <reportElement stretchType="RelativeToTallestObject" x="30" y="0" width="59" height="16" uuid="d5c91777-685e-4aa8-844a-d7dc07ab006d"/>
329 335 <box>
330 336 <pen lineWidth="0.5"/>
331 337 <topPen lineWidth="0.5"/>
... ... @@ -334,20 +340,20 @@ OR T.DATAFIM IS NULL
334 340 <rightPen lineWidth="0.5"/>
335 341 </box>
336 342 <textElement textAlignment="Center" verticalAlignment="Middle">
337   - <font size="7"/>
  343 + <font size="6"/>
338 344 </textElement>
339 345 <textFieldExpression><![CDATA[$F{numeropatrimonial}]]></textFieldExpression>
340 346 </textField>
341 347 <textField isStretchWithOverflow="true">
342   - <reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="15" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
343   - <box>
  348 + <reportElement stretchType="RelativeToTallestObject" x="89" y="0" width="281" height="16" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
  349 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
344 350 <pen lineWidth="0.5"/>
345 351 <topPen lineWidth="0.5"/>
346 352 <leftPen lineWidth="0.5"/>
347 353 <bottomPen lineWidth="0.5"/>
348 354 <rightPen lineWidth="0.5"/>
349 355 </box>
350   - <textElement textAlignment="Left" verticalAlignment="Top">
  356 + <textElement textAlignment="Left">
351 357 <font size="6"/>
352 358 <paragraph leftIndent="2" rightIndent="2" spacingBefore="2" spacingAfter="3"/>
353 359 </textElement>
... ... @@ -508,12 +514,12 @@ OR T.DATAFIM IS NULL
508 514 <bottomPen lineWidth="1.0"/>
509 515 <rightPen lineWidth="1.0"/>
510 516 </box>
511   - <textElement textAlignment="Right">
  517 + <textElement textAlignment="Right" verticalAlignment="Middle">
512 518 <font size="7" isBold="true"/>
513 519 </textElement>
514 520 <text><![CDATA[Total (R$)]]></text>
515 521 </staticText>
516   - <textField pattern="#,##0.00" isBlankWhenNull="true">
  522 + <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
517 523 <reportElement x="436" y="0" width="73" height="15" uuid="8edb7008-d9dd-4dc4-b5be-029756c2e33b"/>
518 524 <box>
519 525 <topPen lineWidth="1.0"/>
... ... @@ -527,7 +533,7 @@ OR T.DATAFIM IS NULL
527 533 </textElement>
528 534 <textFieldExpression><![CDATA[$V{valorAquisicaoTotal}]]></textFieldExpression>
529 535 </textField>
530   - <textField pattern="#,##0.00" isBlankWhenNull="true">
  536 + <textField pattern="¤ #,##0.00" isBlankWhenNull="true">
531 537 <reportElement x="509" y="0" width="66" height="15" uuid="cb6e9a2a-b173-41b7-8f63-b93f25d01224"/>
532 538 <box>
533 539 <pen lineWidth="1.0"/>
... ... @@ -545,11 +551,13 @@ OR T.DATAFIM IS NULL
545 551 </band>
546 552 </summary>
547 553 <noData>
548   - <band height="20">
  554 + <band height="17">
549 555 <staticText>
550   - <reportElement x="1" y="0" width="539" height="20" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9"/>
  556 + <reportElement x="1" y="0" width="539" height="17" uuid="ad3f5bab-6291-42dd-a975-8e41d7f9a7e9">
  557 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  558 + </reportElement>
551 559 <textElement textAlignment="Center" verticalAlignment="Middle">
552   - <font isBold="true"/>
  560 + <font size="8" isBold="true"/>
553 561 </textElement>
554 562 <text><![CDATA[Seção Vazia]]></text>
555 563 </staticText>
... ...
citgrp-patrimonio-web/src/main/resources/reports/termoTransferencia.jrxml
  Diff comments   View file @f235185
1 1 <?xml version="1.0" encoding="UTF-8"?>
  2 +<!-- Created with Jaspersoft Studio version 6.2.2.final using JasperReports Library version 6.2.2 -->
  3 +<!-- 2016-05-17T15:23:27 -->
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="termoTransferencia" language="groovy" pageWidth="595" pageHeight="802" whenNoDataType="AllSectionsNoDetail" columnWidth="541" leftMargin="27" rightMargin="27" topMargin="20" bottomMargin="20" uuid="0c479051-3a36-4140-9683-aff6988775ce">
3 5 <property name="ireport.zoom" value="1.5"/>
4 6 <property name="ireport.x" value="0"/>
... ... @@ -176,9 +178,11 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
176 178 <group name="transferencia">
177 179 <groupExpression><![CDATA[$F{numerotermo}]]></groupExpression>
178 180 <groupHeader>
179   - <band height="15">
  181 + <band height="17">
180 182 <staticText>
181   - <reportElement x="0" y="0" width="30" height="15" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400"/>
  183 + <reportElement x="0" y="0" width="30" height="17" uuid="aa294020-2029-4f59-b3ad-5bc0bf803400">
  184 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  185 + </reportElement>
182 186 <box>
183 187 <pen lineWidth="0.5"/>
184 188 <topPen lineWidth="0.5"/>
... ... @@ -187,12 +191,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
187 191 <rightPen lineWidth="0.5"/>
188 192 </box>
189 193 <textElement textAlignment="Center" verticalAlignment="Middle">
190   - <font size="8" isBold="true"/>
  194 + <font size="7" isBold="true"/>
191 195 </textElement>
192 196 <text><![CDATA[Item]]></text>
193 197 </staticText>
194 198 <staticText>
195   - <reportElement x="30" y="0" width="60" height="15" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
  199 + <reportElement x="30" y="0" width="60" height="17" uuid="7d1ad9ec-3cd6-4f75-8dd2-c24398e4559c"/>
196 200 <box>
197 201 <pen lineWidth="0.5"/>
198 202 <topPen lineWidth="0.5"/>
... ... @@ -201,12 +205,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
201 205 <rightPen lineWidth="0.5"/>
202 206 </box>
203 207 <textElement textAlignment="Center" verticalAlignment="Middle">
204   - <font size="8" isBold="true"/>
  208 + <font size="7" isBold="true"/>
205 209 </textElement>
206 210 <text><![CDATA[N. Patrimonial]]></text>
207 211 </staticText>
208 212 <staticText>
209   - <reportElement x="90" y="0" width="267" height="15" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
  213 + <reportElement x="90" y="0" width="267" height="17" uuid="4f988f4b-9798-4381-97ec-ea456291c1a2"/>
210 214 <box>
211 215 <pen lineWidth="0.5"/>
212 216 <topPen lineWidth="0.5"/>
... ... @@ -215,12 +219,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
215 219 <rightPen lineWidth="0.5"/>
216 220 </box>
217 221 <textElement textAlignment="Center" verticalAlignment="Middle">
218   - <font size="8" isBold="true"/>
  222 + <font size="7" isBold="true"/>
219 223 </textElement>
220 224 <text><![CDATA[Descrição]]></text>
221 225 </staticText>
222 226 <staticText>
223   - <reportElement x="357" y="0" width="53" height="15" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
  227 + <reportElement x="357" y="0" width="53" height="17" uuid="30076d94-4ed8-4a74-ac4f-e7125f4b5d91"/>
224 228 <box>
225 229 <pen lineWidth="0.5"/>
226 230 <topPen lineWidth="0.5"/>
... ... @@ -229,12 +233,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
229 233 <rightPen lineWidth="0.5"/>
230 234 </box>
231 235 <textElement textAlignment="Center" verticalAlignment="Middle">
232   - <font size="8" isBold="true"/>
  236 + <font size="7" isBold="true"/>
233 237 </textElement>
234 238 <text><![CDATA[Sit. Física]]></text>
235 239 </staticText>
236 240 <staticText>
237   - <reportElement x="410" y="0" width="70" height="15" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
  241 + <reportElement x="410" y="0" width="70" height="17" uuid="e938fda5-ac45-4f7b-b6ea-9bbf5d3dd085"/>
238 242 <box>
239 243 <pen lineWidth="0.5"/>
240 244 <topPen lineWidth="0.5"/>
... ... @@ -243,12 +247,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
243 247 <rightPen lineWidth="0.5"/>
244 248 </box>
245 249 <textElement textAlignment="Center" verticalAlignment="Middle">
246   - <font size="8" isBold="true"/>
  250 + <font size="7" isBold="true"/>
247 251 </textElement>
248 252 <text><![CDATA[Valor Aquisição]]></text>
249 253 </staticText>
250 254 <staticText>
251   - <reportElement x="480" y="0" width="60" height="15" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
  255 + <reportElement x="480" y="0" width="60" height="17" uuid="e9efa9f7-9d89-4890-8f81-b1b761f66d31"/>
252 256 <box>
253 257 <pen lineWidth="0.5"/>
254 258 <topPen lineWidth="0.5"/>
... ... @@ -257,7 +261,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
257 261 <rightPen lineWidth="0.5"/>
258 262 </box>
259 263 <textElement textAlignment="Center" verticalAlignment="Middle">
260   - <font size="8" isBold="true"/>
  264 + <font size="7" isBold="true"/>
261 265 </textElement>
262 266 <text><![CDATA[Valor Líquido]]></text>
263 267 </staticText>
... ... @@ -266,7 +270,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
266 270 <groupFooter>
267 271 <band height="89" splitType="Prevent">
268 272 <componentElement>
269   - <reportElement key="observacao" style="table" mode="Opaque" x="0" y="27" width="541" height="61" isRemoveLineWhenBlank="true" uuid="0f574d69-33f7-46b5-b46d-360eab7dcd53"/>
  273 + <reportElement key="observacao" style="table" mode="Opaque" x="0" y="27" width="541" height="57" isRemoveLineWhenBlank="true" uuid="0f574d69-33f7-46b5-b46d-360eab7dcd53"/>
270 274 <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">
271 275 <datasetRun subDataset="observacao" uuid="463f4576-3ccd-4329-81c4-ae42dbfb0468">
272 276 <datasetParameter name="REPORT_CONNECTION">
... ... @@ -278,47 +282,56 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
278 282 <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
279 283 </datasetRun>
280 284 <jr:column width="136" uuid="a74f84ad-2cd8-4897-94a8-a7f366091e00">
281   - <jr:tableHeader style="table" height="30" rowSpan="1">
  285 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  286 + <jr:tableHeader style="table" height="20" rowSpan="1">
  287 + <property name="com.jaspersoft.studio.unit.height" value="px"/>
282 288 <staticText>
283   - <reportElement x="1" y="0" width="135" height="30" isRemoveLineWhenBlank="true" uuid="8eb13662-481b-49e4-984e-b6b122847381"/>
  289 + <reportElement x="0" y="0" width="136" height="20" isRemoveLineWhenBlank="true" uuid="8eb13662-481b-49e4-984e-b6b122847381"/>
284 290 <textElement>
285   - <font size="12" isBold="true"/>
  291 + <font size="8" isBold="true"/>
286 292 </textElement>
287 293 <text><![CDATA[Observações]]></text>
288 294 </staticText>
289 295 </jr:tableHeader>
290   - <jr:columnHeader style="table" height="30" rowSpan="1">
  296 + <jr:columnHeader style="table" height="20" rowSpan="1">
  297 + <property name="com.jaspersoft.studio.unit.height" value="px"/>
291 298 <staticText>
292   - <reportElement x="0" y="0" width="136" height="30" isRemoveLineWhenBlank="true" uuid="62c60451-b26a-4e6a-978a-f12d1c7de2de"/>
  299 + <reportElement x="0" y="0" width="136" height="20" isRemoveLineWhenBlank="true" uuid="62c60451-b26a-4e6a-978a-f12d1c7de2de"/>
293 300 <textElement textAlignment="Center" verticalAlignment="Middle">
294   - <font isBold="true"/>
  301 + <font size="7" isBold="true"/>
295 302 </textElement>
296 303 <text><![CDATA[Data]]></text>
297 304 </staticText>
298 305 </jr:columnHeader>
299   - <jr:detailCell style="table" height="21" rowSpan="1">
  306 + <jr:detailCell style="table" height="17" rowSpan="1">
  307 + <property name="com.jaspersoft.studio.unit.height" value="px"/>
300 308 <textField pattern="dd/MM/yyyy" isBlankWhenNull="true">
301   - <reportElement x="0" y="0" width="136" height="21" isRemoveLineWhenBlank="true" uuid="3f6766f1-a41e-4c6f-83e8-6a3dcb0b0b79"/>
302   - <textElement textAlignment="Center" verticalAlignment="Middle"/>
  309 + <reportElement x="0" y="0" width="136" height="17" isRemoveLineWhenBlank="true" uuid="3f6766f1-a41e-4c6f-83e8-6a3dcb0b0b79"/>
  310 + <textElement textAlignment="Center" verticalAlignment="Middle">
  311 + <font size="6"/>
  312 + </textElement>
303 313 <textFieldExpression><![CDATA[$F{data}]]></textFieldExpression>
304 314 </textField>
305 315 </jr:detailCell>
306 316 </jr:column>
307 317 <jr:column width="404" uuid="27db9bb5-a56d-4c00-9762-329b4dbb4d4b">
308   - <jr:tableHeader height="30" rowSpan="1"/>
309   - <jr:columnHeader style="table" height="30" rowSpan="1">
  318 + <jr:tableHeader height="20" rowSpan="1"/>
  319 + <jr:columnHeader style="table" height="20" rowSpan="1">
310 320 <staticText>
311   - <reportElement x="7" y="0" width="395" height="30" isRemoveLineWhenBlank="true" uuid="015c6ebf-590a-4bc8-bc32-2b07632409ba"/>
  321 + <reportElement x="0" y="0" width="404" height="20" isRemoveLineWhenBlank="true" uuid="015c6ebf-590a-4bc8-bc32-2b07632409ba"/>
312 322 <textElement textAlignment="Center" verticalAlignment="Middle">
313   - <font isBold="true"/>
  323 + <font size="7" isBold="true"/>
314 324 </textElement>
315 325 <text><![CDATA[Descrição]]></text>
316 326 </staticText>
317 327 </jr:columnHeader>
318   - <jr:detailCell style="table" height="21" rowSpan="1">
  328 + <jr:detailCell style="table" height="17" rowSpan="1">
319 329 <textField isBlankWhenNull="true">
320   - <reportElement x="7" y="0" width="395" height="21" isRemoveLineWhenBlank="true" uuid="146b284c-642f-4d11-8e53-2a9c837421ec"/>
321   - <textElement verticalAlignment="Middle"/>
  330 + <reportElement x="0" y="0" width="404" height="17" isRemoveLineWhenBlank="true" uuid="146b284c-642f-4d11-8e53-2a9c837421ec"/>
  331 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3"/>
  332 + <textElement verticalAlignment="Top">
  333 + <font size="6"/>
  334 + </textElement>
322 335 <textFieldExpression><![CDATA[$F{descricao}]]></textFieldExpression>
323 336 </textField>
324 337 </jr:detailCell>
... ... @@ -326,7 +339,9 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
326 339 </jr:table>
327 340 </componentElement>
328 341 <staticText>
329   - <reportElement x="357" y="0" width="53" height="14" uuid="4cc1dbc7-45bc-4061-9c5c-8c0838f12c13"/>
  342 + <reportElement x="357" y="0" width="53" height="17" uuid="4cc1dbc7-45bc-4061-9c5c-8c0838f12c13">
  343 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  344 + </reportElement>
330 345 <box leftPadding="0" rightPadding="5">
331 346 <pen lineWidth="0.5"/>
332 347 <topPen lineWidth="0.5"/>
... ... @@ -334,13 +349,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
334 349 <bottomPen lineWidth="0.5"/>
335 350 <rightPen lineWidth="0.5"/>
336 351 </box>
337   - <textElement textAlignment="Right">
338   - <font size="8" isBold="true"/>
  352 + <textElement textAlignment="Right" verticalAlignment="Middle">
  353 + <font size="7" isBold="true"/>
339 354 </textElement>
340 355 <text><![CDATA[Total (R$)]]></text>
341 356 </staticText>
342   - <textField pattern="#,##0.00">
343   - <reportElement x="480" y="0" width="60" height="14" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
  357 + <textField pattern="¤ #,##0.00">
  358 + <reportElement x="480" y="0" width="60" height="17" uuid="f289f8a4-a0bf-4dfb-b215-4b930d61645d"/>
344 359 <box leftPadding="0" rightPadding="5">
345 360 <pen lineWidth="0.5"/>
346 361 <topPen lineWidth="0.5"/>
... ... @@ -349,12 +364,12 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
349 364 <rightPen lineWidth="0.5"/>
350 365 </box>
351 366 <textElement textAlignment="Right" verticalAlignment="Middle">
352   - <font size="8"/>
  367 + <font size="6"/>
353 368 </textElement>
354 369 <textFieldExpression><![CDATA[$V{ValorTotalLiquido}]]></textFieldExpression>
355 370 </textField>
356   - <textField pattern="#,##0.00">
357   - <reportElement x="410" y="0" width="70" height="14" uuid="e6cc6c77-3be6-4394-b7db-106d701dc13b"/>
  371 + <textField pattern="¤ #,##0.00">
  372 + <reportElement x="410" y="0" width="70" height="17" uuid="e6cc6c77-3be6-4394-b7db-106d701dc13b"/>
358 373 <box leftPadding="0" rightPadding="5">
359 374 <pen lineWidth="0.5"/>
360 375 <topPen lineWidth="0.5"/>
... ... @@ -363,7 +378,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
363 378 <rightPen lineWidth="0.5"/>
364 379 </box>
365 380 <textElement textAlignment="Right" verticalAlignment="Middle">
366   - <font size="8"/>
  381 + <font size="6"/>
367 382 </textElement>
368 383 <textFieldExpression><![CDATA[$V{ValorTotalAquisicao}]]></textFieldExpression>
369 384 </textField>
... ... @@ -461,6 +476,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
461 476 </pageHeader>
462 477 <detail>
463 478 <band height="17" splitType="Prevent">
  479 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
464 480 <textField isStretchWithOverflow="true">
465 481 <reportElement stretchType="RelativeToTallestObject" x="357" y="0" width="53" height="17" uuid="0b759d00-6aa5-4457-a938-03216b202dad"/>
466 482 <box>
... ... @@ -475,7 +491,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
475 491 </textElement>
476 492 <textFieldExpression><![CDATA[$F{situacaofisica}]]></textFieldExpression>
477 493 </textField>
478   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  494 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
479 495 <reportElement stretchType="RelativeToTallestObject" x="410" y="0" width="70" height="17" uuid="b1210e79-0a51-483c-b295-aa7fdf18d78b"/>
480 496 <box>
481 497 <pen lineWidth="0.5"/>
... ... @@ -490,7 +506,7 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
490 506 </textElement>
491 507 <textFieldExpression><![CDATA[$F{valoraquisicao}]]></textFieldExpression>
492 508 </textField>
493   - <textField isStretchWithOverflow="true" pattern="#,##0.00">
  509 + <textField isStretchWithOverflow="true" pattern="¤ #,##0.00">
494 510 <reportElement stretchType="RelativeToTallestObject" x="480" y="0" width="60" height="17" uuid="49e6b325-2ff2-4e1e-9cdf-b428c8758844"/>
495 511 <box>
496 512 <pen lineWidth="0.5"/>
... ... @@ -506,7 +522,9 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
506 522 <textFieldExpression><![CDATA[$F{valorliquido}]]></textFieldExpression>
507 523 </textField>
508 524 <textField isStretchWithOverflow="true">
509   - <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="17" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3"/>
  525 + <reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="30" height="17" uuid="a6f97aca-5483-43de-b876-bf86f62d46d3">
  526 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  527 + </reportElement>
510 528 <box>
511 529 <pen lineWidth="0.5"/>
512 530 <topPen lineWidth="0.5"/>
... ... @@ -535,14 +553,14 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
535 553 </textField>
536 554 <textField isStretchWithOverflow="true">
537 555 <reportElement stretchType="RelativeToTallestObject" x="90" y="0" width="267" height="17" uuid="3ca60464-c7c0-4cf8-b1d7-fea0cbc41286"/>
538   - <box>
  556 + <box topPadding="3" leftPadding="3" bottomPadding="3" rightPadding="3">
539 557 <pen lineWidth="0.5"/>
540 558 <topPen lineWidth="0.5"/>
541 559 <leftPen lineWidth="0.5"/>
542 560 <bottomPen lineWidth="0.5"/>
543 561 <rightPen lineWidth="0.5"/>
544 562 </box>
545   - <textElement verticalAlignment="Middle">
  563 + <textElement verticalAlignment="Top">
546 564 <font size="6"/>
547 565 <paragraph leftIndent="3" rightIndent="3" spacingBefore="3"/>
548 566 </textElement>
... ... @@ -685,11 +703,13 @@ ORDER BY bemPatrimonial.numeroPatrimonialNumerico]]&gt;
685 703 </band>
686 704 </lastPageFooter>
687 705 <noData>
688   - <band height="20">
  706 + <band height="17">
689 707 <staticText>
690   - <reportElement x="1" y="0" width="540" height="20" uuid="0d12e090-0013-44f9-9cca-274f43b176d8"/>
  708 + <reportElement x="1" y="0" width="540" height="17" uuid="0d12e090-0013-44f9-9cca-274f43b176d8">
  709 + <property name="com.jaspersoft.studio.unit.height" value="pixel"/>
  710 + </reportElement>
691 711 <textElement textAlignment="Center" verticalAlignment="Middle">
692   - <font isBold="true"/>
  712 + <font size="8" isBold="true"/>
693 713 </textElement>
694 714 <text><![CDATA[Seção vazia]]></text>
695 715 </staticText>
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/BemPatrimonialController.js
  Diff comments   View file @f235185
... ... @@ -182,7 +182,7 @@ citApp.controller(&#39;BemPatrimonialController&#39;, [&#39;$scope&#39;, &#39;BemPatrimonialReposito
182 182 }
183 183  
184 184 if ($scope.bemPatrimonialAlteracao.vidaUtil && $scope.bemPatrimonialAlteracao.vidaUtil != $scope.bemPatrimonial.vidaUtilRestante) {
185   - var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';
  185 + var chave = $scope.bemPatrimonial.vidaUtilRestante < $scope.bemPatrimonialAlteracao.vidaUtil ? 'PATRIMONIO.MSG.CONFIRMA_AUMENTAR_VIDA_UTIL' : 'PATRIMONIO.MSG.CONFIRMA_DIMINUIR_VIDA_UTIL';
186 186 $scope.$openModalConfirm({
187 187 message: $translate.instant(chave),
188 188 callback: function () {
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaListController.js
  Diff comments   View file @f235185
... ... @@ -138,7 +138,9 @@ citApp.controller(&#39;EntradaListController&#39;, [&#39;$scope&#39;, &#39;EntradaRepository&#39;, &#39;$tra
138 138 $scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false );
139 139  
140 140 } else{
  141 + $scope.setLoadingPesquisa(true);
141 142 EntradaRepository.validaExistenciaBemMaterialEntrada($scope.entradaChecked.id).then(function(result){
  143 + $scope.setLoading(false);
142 144 if (result == true){
143 145 $scope.url = '/citgrp-patrimonio-web/rest/relatorioEntrada/relEntradaMaterialAnalitico?idEntrada='+ $scope.entradaChecked.id;
144 146  
... ... @@ -157,8 +159,9 @@ citApp.controller(&#39;EntradaListController&#39;, [&#39;$scope&#39;, &#39;EntradaRepository&#39;, &#39;$tra
157 159 $scope.showAlert("warning", $translate.instant("MSG.SELECIONE_UM_ITEM_PARA_RELATORIO") + " ", false );
158 160  
159 161 } else{
160   -
  162 + $scope.setLoadingPesquisa(true);
161 163 EntradaRepository.validaExistenciaBemMaterialEntrada($scope.entradaChecked.id).then(function(result){
  164 + $scope.setLoading(false);
162 165 if (result == true){
163 166 $scope.url = '/citgrp-patrimonio-web/rest/relatorioEntrada/relEntradaMaterialSintetico?idEntrada='+ $scope.entradaChecked.id;
164 167  
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/directive/BuscaBensPatrimoniaisDirective.js
  Diff comments   View file @f235185
... ... @@ -247,6 +247,12 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
247 247  
248 248 // Metodo responsavel por listar bens de acordo com filtros preenchidos
249 249 $scope.buscaBemFiltros = function() {
  250 +
  251 + if($scope.bemPatrimonialVH.$checkBemStatusOutros && ($scope.bemPatrimonialVH.idDominioStatus == undefined || $scope.bemPatrimonialVH.idDominioStatus == "")){
  252 + angular.element("#citapp-controller").scope().showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL"));
  253 + return;
  254 + }
  255 +
250 256 $scope.isSelectedAll(false);
251 257 $scope.lista = [];
252 258 var trazerBemNaoContabilizado = false;
... ... @@ -404,7 +410,7 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
404 410  
405 411 // RECUPERA LISTA E SETA RESULTADO NA GRID COM OS FILTROS INFORMADOS
406 412 $scope.fetchResultModal = function() {
407   -
  413 +
408 414 $scope.appController.setLoadingPesquisa(true);
409 415  
410 416 $scope.filterCriteriaModal = angular.copy($scope.filterCriteriaGrid);
... ... @@ -420,12 +426,21 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
420 426 // }
421 427  
422 428 //FILTER - ABA_GERAL
  429 +
  430 + if($scope.bemPatrimonialVH.$checkBemStatusAtivo && !$scope.bemPatrimonialVH.$checkBemStatusBaixado){
  431 + $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2, comparison: 'ne'});
  432 +
  433 + }else if(!$scope.bemPatrimonialVH.$checkBemStatusAtivo && $scope.bemPatrimonialVH.$checkBemStatusBaixado){
  434 + $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.codigo', value : 2});
  435 +
  436 + }else if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){
  437 + $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus});
  438 + }
  439 +
423 440 if($scope.bemPatrimonialVH.idDominioSituacaoFisica !== undefined && $scope.bemPatrimonialVH.idDominioSituacaoFisica != ""){
424 441 $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioSituacaoFisica.id', value : $scope.bemPatrimonialVH.idDominioSituacaoFisica});
425 442 }
426   - if($scope.bemPatrimonialVH.idDominioStatus !== undefined && $scope.bemPatrimonialVH.idDominioStatus != ""){
427   - $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'dominioStatus.id', value : $scope.bemPatrimonialVH.idDominioStatus});
428   - }
  443 +
429 444 if($scope.bemPatrimonialVH.$contaContabil != undefined && $scope.bemPatrimonialVH.$contaContabil != ''){
430 445 $scope.filterCriteriaModal.filters.push({type: 'numeric', field: 'material.contaContabil.id', value : $scope.bemPatrimonialVH.$contaContabil.id});
431 446 }
... ... @@ -993,6 +1008,11 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
993 1008 }
994 1009  
995 1010 $scope.retornarFiltro = function() {
  1011 + if($scope.bemPatrimonialVH.$checkBemStatusOutros && ($scope.bemPatrimonialVH.idDominioStatus == undefined || $scope.bemPatrimonialVH.idDominioStatus == "")){
  1012 + angular.element("#citapp-controller").scope().showAlert("error", $translate.instant("PATRIMONIO.VALIDACAO.INFORME_OUTRO_STATUS_BEM_PATRIMONIAL"));
  1013 + return;
  1014 + }
  1015 +
996 1016 $scope.fecharModalBuscaAvancada();
997 1017 $scope.filtros = $scope.bemPatrimonialVH;
998 1018 $scope.$parent.filterCriteria.start = 1;
... ... @@ -1096,6 +1116,10 @@ citApp.directive(&quot;componenteBuscaBensPatrimoniais&quot;, [&#39;BemPatrimonialRepository&#39;,
1096 1116 $scope.buscaBemFiltros();
1097 1117 });
1098 1118 }
  1119 +
  1120 + $scope.desmarcaBemStatusOutro = function(){
  1121 + $scope.bemPatrimonialVH.$checkBemStatusOutros = false;
  1122 + };
1099 1123  
1100 1124 }
1101 1125 };
... ...
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/directive/html/busca_avancada/abaGeral.html
  Diff comments   View file @f235185
  1 + <div class="row" style="margin-left: 1px;">
  2 + <input type="checkbox" ng-checked="checkBemStatusAtivo" ng-model="bemPatrimonialVH.$checkBemStatusAtivo" ng-click="desmarcaBemStatusOutro()"/><translate>PATRIMONIO.LABEL.BEM_STATUS_ATIVO</translate>
  3 + <input type="checkbox" ng-checked="checkBemStatusBaixado" ng-model="bemPatrimonialVH.$checkBemStatusBaixado" ng-click="desmarcaBemStatusOutro()"/><translate>PATRIMONIO.LABEL.BEM_STATUS_BAIXADO</translate>
  4 + <input type="checkbox" ng-checked="checkBemStatusOutros" ng-model="bemPatrimonialVH.$checkBemStatusOutros" ng-disabled="bemPatrimonialVH.$checkBemStatusAtivo || bemPatrimonialVH.$checkBemStatusBaixado" /><translate>PATRIMONIO.LABEL.BEM_STATUS_OUTROS</translate>
  5 + </div>
  6 +
1 7 <div class="row">
2 8 <div class="col-sm-4">
3   - <label-select ng-id="bemPatrimonialVH.idDominioSituacaoFisica" ng-model="bemPatrimonialVH.idDominioSituacaoFisica" ng-label="LABEL.SITUACAO" ng-list="situacoesFisicas" ng-custom-options="dominioSituacaoFisica.id as dominioSituacaoFisica.descricao for dominioSituacaoFisica"></label-select>
  9 + <label-select ng-id="bemPatrimonialVH.idDominioStatus" ng-obrigatorio="bemPatrimonialVH.$checkBemStatusOutros" ng-disabled="bemPatrimonialVH.$checkBemStatusAtivo || bemPatrimonialVH.$checkBemStatusBaixado" ng-model="bemPatrimonialVH.idDominioStatus" ng-label="PATRIMONIO.LABEL.STATUS" ng-list="status" ng-custom-options="dominioStatus.id as dominioStatus.descricao for dominioStatus"></label-select>
4 10 </div>
5 11 <div class="col-sm-4">
6   - <label-select ng-id="bemPatrimonialVH.idDominioStatus" ng-model="bemPatrimonialVH.idDominioStatus" ng-label="PATRIMONIO.LABEL.STATUS" ng-list="status" ng-custom-options="dominioStatus.id as dominioStatus.descricao for dominioStatus"></label-select>
  12 + <label-select ng-id="bemPatrimonialVH.idDominioSituacaoFisica" ng-model="bemPatrimonialVH.idDominioSituacaoFisica" ng-label="LABEL.SITUACAO" ng-list="situacoesFisicas" ng-custom-options="dominioSituacaoFisica.id as dominioSituacaoFisica.descricao for dominioSituacaoFisica"></label-select>
7 13 </div>
8 14 <div class="col-sm-4">
9 15 <auto-complete ng-find="findContaContabil(value)" ng-item="item.codigo + ' / ' + item.descricao" ng-label="LABEL.CONTA_CONTABIL" ng-model="bemPatrimonialVH.$contaContabil" ng-min-length="1"></auto-complete>
... ...
citgrp-patrimonio-web/src/main/webapp/html/bemPatrimonial/bemPatrimonialEdit.html
  Diff comments   View file @f235185
... ... @@ -150,7 +150,7 @@
150 150 <div class='col-sm-2'>
151 151 <label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
152 152 ng-label="PATRIMONIO.LABEL.NOVO_VALOR_MERCADO"
153   - label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REAVALIACAO')}}"
  153 + label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REAVALIACAO')}}"
154 154 form="bemPatrimonialForm" ng-model="bemPatrimonialAlteracao.novoValorBruto"
155 155 ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4"
156 156 ng-if="edit && bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 4">
... ... @@ -158,7 +158,7 @@
158 158  
159 159 <label-input-money ng-id="bemPatrimonialAlteracao.novoValorBruto"
160 160 ng-label="PATRIMONIO.LABEL.NOVO_VALOR_RECUPERAVEL"
161   - label-info-tooltip="{{$translate.instant('MSG.NOVO_VALOR_REDUCAO')}}"
  161 + label-info-tooltip="{{$translate.instant('PATRIMONIO.MSG.NOVO_VALOR_REDUCAO')}}"
162 162 form="bemPatrimonialForm"
163 163 ng-model="bemPatrimonialAlteracao.novoValorBruto"
164 164 ng-obrigatorio="bemPatrimonialAlteracao.dominioTipoAlteracaoIndividual.codigo == 5"
... ...
citgrp-patrimonio-web/src/main/webapp/html/definicaoDetentor/definicaoDetentorEdit.html
  Diff comments   View file @f235185
... ... @@ -74,7 +74,7 @@
74 74  
75 75 <div class="row">
76 76 <div class="col-sm-9">
77   - <auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>
  77 + <auto-complete ng-find="findColaborador(value)" form="definicaoDetentorForm" ng-acao-borracha="limparColaborador()" ng-obrigatorio="true" ng-set-result="setColaborador(item)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="definicaoDetentor.colaborador" ng-disabled="!edit"></auto-complete>
78 78 </div>
79 79 <!-- Haline decidiu por nao exibir esta propriedade ate que seja esclarecido o motivo do uso -->
80 80 <div class="col-sm-3" ng-if="false">
... ...
citgrp-patrimonio-web/src/main/webapp/html/emissaoTermoResponsabilidade/emissaoTermoResponsabilidadeEdit.html
  Diff comments   View file @f235185
... ... @@ -66,7 +66,7 @@
66 66 <div class="col-sm-3">
67 67 </div>
68 68 <div class="col-sm-4">
69   - <auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome"
  69 + <auto-complete ng-find="findColaborador(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome"
70 70 ng-id="colaborador" ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="colaborador" form="emissaoTermoResponsabilidadeForm"
71 71 ng-set-result="setColaborador()" ng-obrigatorio="{{codigoTipoMovimentacao == 2}}"></auto-complete>
72 72 </div>
... ...
citgrp-patrimonio-web/src/main/webapp/html/inventario/inventarioEdit.html
  Diff comments   View file @f235185
... ... @@ -596,7 +596,7 @@
596 596 <td colspan="4">
597 597 <div class="row" >
598 598 <div class="col-sm-6">
599   - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
  599 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
600 600 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario" form="formInventario" >
601 601 </auto-complete>
602 602 </div>
... ... @@ -829,7 +829,7 @@
829 829 <td colspan="4">
830 830 <div class="row" >
831 831 <div class="col-sm-6">
832   - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
  832 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
833 833 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
834 834 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
835 835 </auto-complete>
... ... @@ -1015,7 +1015,7 @@
1015 1015 <td colspan="4">
1016 1016 <div class="row" >
1017 1017 <div class="col-sm-5">
1018   - <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
  1018 + <auto-complete ng-find="findResponsavelInventario(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1019 1019 ng-label="PATRIMONIO.LABEL.RESPONSAVEL_PELO_INVENTARIO" ng-model="dadosBemPatrimonialSelecionado.inventarioBemPatrimonial.responsavelInventario"
1020 1020 ng-disabled="!dadosBemPatrimonialSelecionado.$isEditar" form="formInventario" >
1021 1021 </auto-complete>
... ... @@ -1926,7 +1926,7 @@
1926 1926 <label-input-data ng-id="dataSaidaTemporaria" form="formDialogSaidaTemporaria" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="false" ng-model="dataSaidaTemporaria"></label-input-data>
1927 1927 </div>
1928 1928 <div class="col-sm-12">
1929   - <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria"
  1929 + <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavelSaidaTemporaria" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="responsavelSaidaTemporaria"
1930 1930 form="formDialogSaidaTemporaria" ng-disabled="false" ng-obrigatorio="true">
1931 1931 </auto-complete>
1932 1932 </div>
... ...
citgrp-patrimonio-web/src/main/webapp/html/saidaTemporaria/saidaTemporariaEdit.html
  Diff comments   View file @f235185
... ... @@ -53,7 +53,7 @@
53 53 </legend>
54 54 <div class="row">
55 55 <div class="col-sm-9">
56   - <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete>
  56 + <auto-complete ng-find="findResponsavelSaida(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="responsavel" ng-label="PATRIMONIO.LABEL.RESPONSAVEL_SAIDA" ng-model="saidaTemporaria.responsavel" form="saidaTemporariaForm" ng-disabled="!edit" ng-obrigatorio="true"></auto-complete>
57 57 </div><!-- .col-sm-9 -->
58 58 <div class="col-sm-3">
59 59 <label-input-data ng-id="dataSaida" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_SAIDA" ng-obrigatorio="true" ng-disabled="!edit" ng-model="saidaTemporaria.dataSaida"></label-input-data>
... ...
citgrp-patrimonio-web/src/main/webapp/html/saidaTemporariaItem/saidaTemporariaItemEdit.html
  Diff comments   View file @f235185
... ... @@ -59,7 +59,7 @@
59 59 <legend><translate>PATRIMONIO.LABEL.DADOS_RETORNO</translate></legend>
60 60 <div class="row">
61 61 <div class="col-sm-9">
62   - <auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete>
  62 + <auto-complete ng-find="findRecebedor(value)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula']" ng-id="recebedor" ng-label="PATRIMONIO.LABEL.RECEBEDOR" ng-model="saidaTemporariaItem.recebedor" form="saidaTemporariaItemForm" ng-disabled="!editItem" ng-obrigatorio="true"></auto-complete>
63 63 </div><!-- .col-sm-9 -->
64 64 <div class="col-sm-3">
65 65 <label-input-data ng-id="saidaTemporariaItem.dataRetornoAlterada" form="saidaTemporariaForm" ng-label="PATRIMONIO.LABEL.DATA_DE_RETORNO" ng-obrigatorio="true" ng-disabled="!editItem" ng-model="saidaTemporariaItem.dataRetornoAlterada"></label-input-data>
... ...
citgrp-patrimonio-web/src/main/webapp/html/termoResponsabilidade/termoResponsabilidadeEdit.html
  Diff comments   View file @f235185
... ... @@ -55,7 +55,7 @@
55 55 <div class="col-sm-3">
56 56 </div>
57 57 <div class="col-sm-6">
58   - <auto-complete ng-find="findColaborador(value)" ng-set-result="setEstruturaColaborador(item)" ng-item="item.pessoa.nome + ' - ' + item.estruturaOrganizacional.nome" ng-id="termoResponsabilidade.colaborador"
  58 + <auto-complete ng-find="findColaborador(value)" ng-set-result="setEstruturaColaborador(item)" ng-item="item.pessoa.nome + ' - SIAPE: ' + item['matricula'] + ' - UN: ' + item.estruturaOrganizacional.nome" ng-id="termoResponsabilidade.colaborador"
59 59 ng-label="PATRIMONIO.LABEL.DETENTOR" ng-model="termoResponsabilidade.colaborador" ng-disabled="!edit" form="relarioResponsabilidadeForm" ng-obrigatorio="true"></auto-complete>
60 60 </div>
61 61 <div class="col-sm-3">
... ...