Download as
Browse Code »

Commit 4dd54e0b2467b02390c5131d177da2444866d2e9

Authored by erick.sato
1 parent fc775d74
Exists in master

[Redmine Atendimento #4281]Geração CSV list view

Showing 9 changed files with 16 additions and 6 deletions   Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/model/Contrato.java
  Diff comments   View file @4dd54e0
... ... @@ -119,7 +119,8 @@ public class Contrato extends PersistentObjectAuditOrganizacao {
119 119  
120 120 /** Atributo numeroAnoContrato. */
121 121 @Transient
122   - @JsonView({ ViewsContrato.OrdemFornecimentoListView.class,
  122 + @JsonView({ ViewsContrato.ContratoEditView.class,
  123 + ViewsContrato.OrdemFornecimentoListView.class,
123 124 ViewsContrato.ContratoAutoCompleteView.class,
124 125 ViewsContrato.CronogramaExecucaoEditView.class,
125 126 ViewsContrato.RegistroOcorrenciaEditView.class,
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js
  Diff comments   View file @4dd54e0
... ... @@ -10,7 +10,7 @@ citApp.controller('ContratoListController', ['$scope', 'ContratoRepository', 'Do
10 10 };
11 11  
12 12 // DEFINE CABEÇALHOS DA LISTAGEM
13   - $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] } ,
  13 + $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', typeMask: 'MASK_CONTRATO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] } ,
14 14 { title : $translate.instant('LABEL.TIPO_CONTRATO'), value : 'dominioTipoContrato.descricao' } ,
15 15 { title : $translate.instant('LABEL.DATA_VIGENCIA_INICIAL'), value : 'dataVigenciaInicial', filter : 'dateBR' },
16 16 { title : $translate.instant('LABEL.DATA_VIGENCIA_FINAL'), value : 'dataVigenciaFinal', filter : 'dateBR' },
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/CronogramaExecucaoListController.js
  Diff comments   View file @4dd54e0
1 1 'use strict';
2   -citApp.controller('CronogramaExecucaoListController', ['$scope', '$translate', '$timeout', 'CronogramaExecucaoRepository',
  2 +citApp.controller('CronogramaExecucaoListController', ['$scope', '$translate', '$timeout', 'CronogramaExecucaoRepository',
3 3 function CronogramaExecucaoListController($scope, $translate, $timeout, CronogramaExecucaoRepository) {
4 4  
5 5 $scope.resetForm = function() {
... ... @@ -14,6 +14,7 @@ citApp.controller('CronogramaExecucaoListController', ['$scope', '$translate', '
14 14 },{
15 15 value : 'contrato.numeroAnoContrato',
16 16 title : $translate.instant('LABEL.NUMERO_CONTRATO'),
  17 + typeMask: 'MASK_CONTRATO',
17 18 filter : 'maskContrato',
18 19 tamanho : 15
19 20 },{
... ... @@ -61,7 +62,7 @@ citApp.controller('CronogramaExecucaoListController', ['$scope', '$translate', '
61 62 $scope.url = '/cit-contratos-web/rest/cronogramaExecucao/gerarCronograma?idCronograma='+ $scope.cronogramaExecucaoChecked.id;
62 63 $scope.visualizarRelatorio($scope.url, $translate.instant("CONTRATOS.LABEL.CRONOGRAMA_EXECUCAO"));
63 64 }
64   -
  65 +
65 66 };
66 67  
67 68 $scope.remover = function() {
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EncerramentoContratoListController.js
  Diff comments   View file @4dd54e0
... ... @@ -16,6 +16,7 @@ citApp.controller('EncerramentoContratoListController', ['$scope', 'Encerramento
16 16 value : 'contrato.numeroAnoContrato',
17 17 title : $translate.instant('LABEL.NUM_CONTRATO'),
18 18 filter : 'maskContrato',
  19 + typeMask: 'MASK_CONTRATO',
19 20 tamanho : 15,
20 21 align : 'text-center'
21 22 },{
... ... @@ -32,6 +33,7 @@ citApp.controller('EncerramentoContratoListController', ['$scope', 'Encerramento
32 33 title : $translate.instant('LABEL.NUM_TERMO'),
33 34 tamanho : 8,
34 35 align : 'text-center',
  36 + typeMask: 'MASK_10_CODE_ANO',
35 37 mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2']
36 38 }];
37 39  
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/EstudoTecnicoListController.js
  Diff comments   View file @4dd54e0
... ... @@ -16,6 +16,7 @@ citApp.controller('EstudoTecnicoListController', ['$scope', 'EstudoTecnicoReposi
16 16 value : 'registroSequencial.sequencialAno',
17 17 title : $translate.instant('LABEL.NUM_ESTUDO_TECNICO'),
18 18 align : 'text-center',
  19 + typeMask: 'MASK_10_CODE_ANO',
19 20 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
20 21 },{
21 22 value : 'descricaoSolucao',
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/NotificacaoContratoListController.js
  Diff comments   View file @4dd54e0
... ... @@ -16,6 +16,7 @@ citApp.controller('NotificacaoContratoListController', ['$scope', '$translate',
16 16 value : 'codigo',
17 17 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_NOTIFICACAO_ABREV'),
18 18 tamanho : 20,
  19 + typeMask: 'MASK_10_CODE_ANO',
19 20 mask : [new RegExp(/(\d{2})(\d{1,4})$/), '$1/$2']
20 21 },{
21 22 value : 'dominioTipoSancao.descricao',
... ... @@ -25,6 +26,7 @@ citApp.controller('NotificacaoContratoListController', ['$scope', '$translate',
25 26 value : 'contrato.numeroAnoContrato',
26 27 title : $translate.instant('NOTIFICACAO_CONTRATO.NUMERO_CONTRATO_ABREV'),
27 28 tamanho : 15,
  29 + typeMask: 'MASK_CONTRATO',
28 30 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
29 31 }];
30 32  
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/OrdemFornecimentoListController.js
  Diff comments   View file @4dd54e0
... ... @@ -12,10 +12,10 @@ citApp.controller('OrdemFornecimentoListController', ['$scope', 'OrdemFornecimen
12 12 };
13 13  
14 14 $scope.headers = [
15   - { title : $translate.instant('LABEL.NUM_ORDEM_FORNECIMENTO'), value : 'numOrdemFornecimento', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] },
  15 + { title : $translate.instant('LABEL.NUM_ORDEM_FORNECIMENTO'), value : 'numOrdemFornecimento', typeMask: 'MASK_10_CODE_ANO', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] },
16 16 { title : $translate.instant('LABEL.DATA_EMISSAO'), value : 'dataEmissao', filter : 'dateBR' },
17 17 { title : $translate.instant('LABEL.SITUACAO'), value : 'dominioSituacao.descricao' },
18   - { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'contrato.numeroAnoContrato', filter : 'maskContrato' }];
  18 + { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'contrato.numeroAnoContrato', typeMask: 'MASK_CONTRATO', filter : 'maskContrato' }];
19 19  
20 20 // default criteria that will be sent to the server
21 21 $scope.filterCriteria = {
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/RegistroOcorrenciaListController.js
  Diff comments   View file @4dd54e0
... ... @@ -31,6 +31,7 @@ citApp.controller('RegistroOcorrenciaListController', ['$scope',
31 31 value : 'registroSequencial.sequencialAno',
32 32 title : $translate.instant('LABEL.NUMERO_OCORRENCIA'),
33 33 tamanho : 10,
  34 + typeMask: 'MASK_10_CODE_ANO',
34 35 mask : [new RegExp(/(\d{1})(\d{1,4})$/), '$1/$2']
35 36 }, {
36 37 value : 'tituloOcorrencia',
... ... @@ -40,6 +41,7 @@ citApp.controller('RegistroOcorrenciaListController', ['$scope',
40 41 value : 'contrato.numeroAnoContrato',
41 42 title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'),
42 43 tamanho : 10,
  44 + typeMask: 'MASK_CONTRATO',
43 45 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
44 46 }
45 47 ];
... ...
cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/TermoReferenciaListController.js
  Diff comments   View file @4dd54e0
... ... @@ -17,6 +17,7 @@ citApp.controller('TermoReferenciaListController', ['$scope', 'TermoReferenciaRe
17 17 value : 'codigo',
18 18 title : $translate.instant('LABEL.CODIGO'),
19 19 tamanho : 30,
  20 + typeMask: 'MASK_10_CODE_ANO',
20 21 mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2']
21 22 },{
22 23 value : 'objetoContratacao',
... ...