From 2ad9d9efaf1f662cb5ad45fe98d06b7ea21a9a46 Mon Sep 17 00:00:00 2001 From: rogerio.costa Date: Wed, 30 Mar 2016 10:33:32 -0300 Subject: [PATCH] [3576] - Ajustar modelo e cadastros: Tipo de documento, tipo de processo, documento e processo. --- cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoCredencialProcessoDaoHibernate.java | 2 ++ cit-ecm-api/src/main/java/br/com/centralit/api/model/CredencialProcesso.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++- cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java | 11 +++++------ cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoController.js | 946 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ 4 files changed, 520 insertions(+), 487 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoCredencialProcessoDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoCredencialProcessoDaoHibernate.java index c817144..44f3bfc 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoCredencialProcessoDaoHibernate.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/impl/HistoricoCredencialProcessoDaoHibernate.java @@ -5,9 +5,11 @@ import java.util.Collection; import org.springframework.stereotype.Repository; import br.com.centralit.api.dao.HistoricoCredencialProcessoDao; +import br.com.centralit.api.model.CredencialProcesso; import br.com.centralit.api.model.HistoricoCredencialProcesso; import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl; import br.com.centralit.framework.dao.arquitetura.SearchSeven; +import br.com.centralit.framework.util.UtilObjeto; import com.googlecode.genericdao.search.Filter; diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/CredencialProcesso.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/CredencialProcesso.java index de8c4d7..b91e9ce 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/CredencialProcesso.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/CredencialProcesso.java @@ -83,7 +83,7 @@ public class CredencialProcesso extends PersistentObjectAudit { /** Atributo processo. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.CredencialProcessoView.class}) + @JsonView({ Views.CredencialProcessoView.class }) private Processo processo; /** Atributo processoRemocao. */ @@ -204,6 +204,12 @@ public class CredencialProcesso extends PersistentObjectAudit { */ public Boolean getPermiteCredenciar() { + if (!UtilObjeto.isReferencia(permiteCredenciar)) { + + return Boolean.FALSE; + + } + return permiteCredenciar; } @@ -297,4 +303,44 @@ public class CredencialProcesso extends PersistentObjectAudit { this.historicoCredencialProcessos = historicoCredencialProcessos; } + /** + * Retorna o valor do atributo idTask + * + * @return Long + */ + public Long getIdTask() { + + return idTask; + } + + /** + * Define o valor do atributo idTask. + * + * @param idTask + */ + public void setIdTask(Long idTask) { + + this.idTask = idTask; + } + + /** + * Retorna o valor do atributo permiteEdicao + * + * @return Boolean + */ + public Boolean getPermiteEdicao() { + + return permiteEdicao; + } + + /** + * Define o valor do atributo permiteEdicao. + * + * @param permiteEdicao + */ + public void setPermiteEdicao(Boolean permiteEdicao) { + + this.permiteEdicao = permiteEdicao; + } + } diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java index df7eae7..02a7ba9 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/DocumentoGedServiceImpl.java @@ -779,12 +779,11 @@ public class DocumentoGedServiceImpl extends GenericServiceImpl 0; - if ( $scope.task.flowElement.actions.length == 1 ) { - $scope.flowAction = $scope.task.flowElement.actions[ 0 ]; - } - $scope.siglas = []; + // METODOS DE INICIACAO DO BPE + $scope.initialize = function () { + $scope.setLoading( true ); - // CARREGA O PROCESSO VINCULADO A TAREFA - $timeout( function () { - // console.log('idProcesso:' + $scope.idProcesso); - ProcessoRepository.get( $scope.idProcesso ).then( function ( result ) { - $scope.processo = result.originalElement; - $scope.apresentarCabecalho = true; - $scope.processo.idTask = $scope.task.id; + RuntimeManagerRepository.initializeUserTask( $scope.task.id ).then( function ( result ) { + $scope.task = result.originalElement.workItem; - CredencialProcessoRepository.obterCredencialUsuarioLogado( $scope.idProcesso ).then( function ( result ) { - $scope.credencialUsuarioProcesso = result.originalElement; - } ); + // VERIFICA SE A TASK(WORKITEM) JÁ FOI EXECULTADO + if ( $scope.task.status == 'CANCELLED' || $scope.task.status == 'COMPLETED' ) { + $scope.setLoading( false ); + $scope.showAlert( 'error', $translate.instant( 'ESI.MSG.TAREFA_JA_EXECUTADA' ) ); + return; + } - if ( $scope.$parent != undefined ) { - $scope.$parent.idProcesso = $scope.idProcesso; - } + // COLOCA AS VARIAVEIS DE RETORNO NO SCOPO + $scope.runtimeManagerUtils = new RuntimeManagerUtils( $scope, $scope, $translate, RuntimeManagerRepository ); + var idRetorno = ESI_RETURN + $scope.task.processInstance.id; + $scope[ idRetorno ] = new RuntimeEnvironmentOutput( result.originalElement ); + $scope.runtimeManagerUtils.setObjectValues( $scope[ idRetorno ] ); + // FIM - if ( angular.element( '#viewGerenciarProcesso' ).scope() != undefined ) { - var workspace = angular.element( '#viewGerenciarProcesso' ).scope().workspace; - angular.element( "#citapp-controller" ).scope().removeWorkspace( workspace.id ); - } + // VERIFICA SE EXISTE MAIS DE UMA AÇÃO NA EXECUÇÃO DO WORK ITEM + $scope.updateAction = $scope.task.flowElement.actions && $scope.task.flowElement.actions.length > 0; + if ( $scope.task.flowElement.actions.length == 1 ) { + $scope.flowAction = $scope.task.flowElement.actions[ 0 ]; + } + $scope.siglas = []; + + // CARREGA O PROCESSO VINCULADO A TAREFA + $timeout( function () { + // console.log('idProcesso:' + $scope.idProcesso); + ProcessoRepository.get( $scope.idProcesso ).then( function ( result ) { + $scope.processo = result.originalElement; + $scope.apresentarCabecalho = true; + $scope.processo.idTask = $scope.task.id; + + if ( $scope.$parent != undefined ) { + $scope.$parent.idProcesso = $scope.idProcesso; + } - $scope.tratimitado(); + if ( angular.element( '#viewGerenciarProcesso' ).scope() != undefined ) { + var workspace = angular.element( '#viewGerenciarProcesso' ).scope().workspace; + angular.element( "#citapp-controller" ).scope().removeWorkspace( workspace.id ); + } - $scope.setLoading( false ); - } ); + $scope.tratimitado(); - }, 400 ); + $scope.setLoading( false ); } ); - }; - // FIM EXECUTAR BPE - if ( $scope.task != null ) { - $scope.initialize(); - } + }, 400 ); + } ); + }; + // FIM EXECUTAR BPE - $scope.getProcesso = function ( processo ) { + if ( $scope.task != null ) { + $scope.initialize(); + } - $scope.setLoadingGet( true ); + $scope.getProcesso = function ( processo ) { - $scope.isHistoricoProcesso = true; + $scope.setLoadingGet( true ); - $scope.processo = processo; - $scope.idProcesso = $scope.processo.id; + $scope.isHistoricoProcesso = true; - $scope.setLoading( false ); + $scope.processo = processo; + $scope.idProcesso = $scope.processo.id; - }; + $scope.setLoading( false ); - } -] ); + }; + +}] ); -- libgit2 0.21.2