diff --git a/cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java b/cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java index 8ced841..90028e9 100644 --- a/cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java +++ b/cit-contratos-web/src/main/java/br/com/centralit/listener/StartupListenerContratos.java @@ -984,6 +984,7 @@ public class StartupListenerContratos extends UtilStartup implements Application internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.TERMO_REFERENCIA_PROJETO_BASICO", "Termo de referência/Projeto Básico", dominio, modulo)); internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.CONTRATO_SEM_VINCULO_TERMO", "Contrato selecionado está sem vínculo a um termo de referência.", dominio, modulo)); + internacionalizacaoList.add(new Internacionalizacao("CONTRATOS.LABEL.ENCERRAMENTO_CONTRATO", "Encerramento de contrato", dominio, modulo)); } private void gerarMensagem(Dominio dominio, Modulo modulo, List internacionalizacaoList) { diff --git a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js index d8337e4..f7f67ab 100644 --- a/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js +++ b/cit-contratos-web/src/main/webapp/assets/js/angular/custom/controller/ContratoListController.js @@ -10,10 +10,10 @@ citApp.controller('ContratoListController', ['$scope', 'ContratoRepository', 'Do }; // DEFINE CABEÇALHOS DA LISTAGEM - $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', filter : 'maskContrato' } , + $scope.headers = [ { title : $translate.instant('LABEL.NUMERO_ANO_CONTRATO'), value : 'numeroAnoContrato', mask : [new RegExp(/(\d{3})(\d{1,4})$/), '$1/$2'] } , { title : $translate.instant('LABEL.TIPO_CONTRATO'), value : 'dominioTipoContrato.descricao' } , - { title : $translate.instant('LABEL.DATA_VIGENCIA_INICIAL'), value : 'dataVigenciaInicial', filter : 'dateBR' }, - { title : $translate.instant('LABEL.DATA_VIGENCIA_FINAL'), value : 'dataVigenciaFinal', filter : 'dateBR' }, + { title : $translate.instant('LABEL.DATA_VIGENCIA_INICIAL'), value : 'dataVigenciaInicial', filter : 'dateBR' }, + { title : $translate.instant('LABEL.DATA_VIGENCIA_FINAL'), value : 'dataVigenciaFinal', filter : 'dateBR' }, { title : $translate.instant('LABEL.SITUACAO_ATUAL'), value : 'dominioSituacaoAtual.descricao' }]; // DIFINE FILTROS DE PESQUISA E CAMPOS QUE DEVEM SER APRESENTADOS NA LISTAGEM @@ -33,7 +33,7 @@ citApp.controller('ContratoListController', ['$scope', 'ContratoRepository', 'Do DominioRepository.findAllDominio('tipoContrato').then(function(result) { $scope.filterCriteria.filters[1].listaDominio = result; }); - + DominioRepository.findAllDominio('tipoSituacaoContrato').then(function(result) { $scope.filterCriteria.filters[4].listaDominio = result; }); @@ -52,7 +52,7 @@ citApp.controller('ContratoListController', ['$scope', 'ContratoRepository', 'Do angular.element('#editContrato').scope().getContrato(contrato.id, edit); $scope.$showPageEditWorkspace($scope.workspace); }; - + $scope.gerarRelatorioTermoContrato = function() { if(!$scope.contratoChecked){ @@ -61,7 +61,7 @@ citApp.controller('ContratoListController', ['$scope', 'ContratoRepository', 'Do $scope.url = '/cit-contratos-web/rest/contrato/gerarTermoContrato?idContrato='+ $scope.contratoChecked.id; $scope.visualizarRelatorio($scope.url, $translate.instant("LABEL.TITULO_CONTRATO")); } - + }; }]); \ No newline at end of file diff --git a/cit-contratos-web/src/main/webapp/html/contrato/contratoList.html b/cit-contratos-web/src/main/webapp/html/contrato/contratoList.html index fc7decf..d7713c8 100644 --- a/cit-contratos-web/src/main/webapp/html/contrato/contratoList.html +++ b/cit-contratos-web/src/main/webapp/html/contrato/contratoList.html @@ -18,7 +18,7 @@ LABEL.EDITAR - diff --git a/cit-contratos-web/src/main/webapp/html/cronogramaExecucao/cronogramaExecucaoList.html b/cit-contratos-web/src/main/webapp/html/cronogramaExecucao/cronogramaExecucaoList.html index 69985ba..f6ae938 100644 --- a/cit-contratos-web/src/main/webapp/html/cronogramaExecucao/cronogramaExecucaoList.html +++ b/cit-contratos-web/src/main/webapp/html/cronogramaExecucao/cronogramaExecucaoList.html @@ -28,6 +28,10 @@ CONTRATOS.LABEL.GERAR_CRONOGRAMA + + diff --git a/cit-contratos-web/src/main/webapp/html/encerramentoContrato/encerramentoContratoList.html b/cit-contratos-web/src/main/webapp/html/encerramentoContrato/encerramentoContratoList.html index 0d76eb5..a765a8f 100644 --- a/cit-contratos-web/src/main/webapp/html/encerramentoContrato/encerramentoContratoList.html +++ b/cit-contratos-web/src/main/webapp/html/encerramentoContrato/encerramentoContratoList.html @@ -26,6 +26,10 @@ LABEL.GERAR_ENCERRAMENTO_CONTRATO + + diff --git a/cit-contratos-web/src/main/webapp/html/estudoTecnico/estudoTecnicoList.html b/cit-contratos-web/src/main/webapp/html/estudoTecnico/estudoTecnicoList.html index bee95d5..518a05c 100644 --- a/cit-contratos-web/src/main/webapp/html/estudoTecnico/estudoTecnicoList.html +++ b/cit-contratos-web/src/main/webapp/html/estudoTecnico/estudoTecnicoList.html @@ -23,6 +23,10 @@ LABEL.REMOVER + + + + diff --git a/cit-contratos-web/src/main/webapp/html/ordemFornecimento/ordemFornecimentoList.html b/cit-contratos-web/src/main/webapp/html/ordemFornecimento/ordemFornecimentoList.html index 0cf69c1..51c1129 100644 --- a/cit-contratos-web/src/main/webapp/html/ordemFornecimento/ordemFornecimentoList.html +++ b/cit-contratos-web/src/main/webapp/html/ordemFornecimento/ordemFornecimentoList.html @@ -26,6 +26,10 @@ LABEL.GERAR_ORDEM_FORNECIMENTO + + diff --git a/cit-contratos-web/src/main/webapp/html/programa/programaList.html b/cit-contratos-web/src/main/webapp/html/programa/programaList.html index b7cf4c8..d4333c0 100644 --- a/cit-contratos-web/src/main/webapp/html/programa/programaList.html +++ b/cit-contratos-web/src/main/webapp/html/programa/programaList.html @@ -22,6 +22,10 @@ LABEL.REMOVER + + diff --git a/cit-contratos-web/src/main/webapp/html/questionario/questionarioList.html b/cit-contratos-web/src/main/webapp/html/questionario/questionarioList.html index 770d225..96299b1 100644 --- a/cit-contratos-web/src/main/webapp/html/questionario/questionarioList.html +++ b/cit-contratos-web/src/main/webapp/html/questionario/questionarioList.html @@ -23,6 +23,10 @@ LABEL.REMOVER + +