From 7007f863dae596d4b05a0bd269df068fba7d563f Mon Sep 17 00:00:00 2001 From: ROGERIO CASSIMIRO DE SOUZA Date: Thu, 14 Apr 2016 19:05:11 -0300 Subject: [PATCH] redmine #4463 sub tabela para tarefas --- cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java | 4 ++-- cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java | 2 +- cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js | 12 +++++++++++- cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html | 5 ++--- cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 5 files changed, 97 insertions(+), 17 deletions(-) diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java index 48a0fb1..2d66da9 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/PlanoClassificacao.java @@ -77,7 +77,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme private String codigo; /** Atributo nome. */ - @JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class }) + @JsonView({ ViewsEcm.PlanoClassificacaoListView.class, ViewsEcm.PlanoClassificacaoParent.class, ViewsEcm.PlanoClassificacaoAutocompleteRecursive.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoProcessoEdit.class, ViewsEcm.DocumentoGedEdit.class, ViewsEcm.ProcessoEdit.class, Views.UnidadeProcessoListView.class }) private String nome; /** Atributo observacao. */ @@ -100,7 +100,7 @@ public class PlanoClassificacao extends PersistentObjectAuditOrganizacao impleme private Boolean permitirUsarComoClassificacao; @Transient - @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class }) + @JsonView({ ViewsEcm.PlanoCLassificacaoAutoComplete.class, ViewsEcm.TipoDocumentoEdit.class, ViewsEcm.TipoProcessoEdit.class, Views.ProcessoList.class, Views.DocumentoGedEdit.class, ViewsEcm.TipoDocumentoPlanoClassificacaoAutoCompleteView.class}) private String assunto; /** Atributo tipoDestinacao. */ diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java index 728e3eb..bc62300 100644 --- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java +++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/Processo.java @@ -135,7 +135,7 @@ public class Processo extends PersistentObjectUnidade { /** Atributo assunto. */ @ManyToOne(fetch = FetchType.LAZY) - @JsonView({ Views.ProcessoList.class }) + @JsonView({ Views.ProcessoList.class, Views.UnidadeProcessoListView.class }) private PlanoClassificacao assunto; @JsonView({ Views.ProcessoEdit.class }) diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js index 9980a8a..7b99cae 100644 --- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js +++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/GerenciarProcessoListUnidadeController.js @@ -5,6 +5,8 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow $scope.$showAdvancedFilters = false; + $scope.processo = {}; + $scope.headers = [ { title : $translate.instant('ECM.LABEL.PROTOCOLO'), value : 'processo.nup' @@ -12,6 +14,9 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow title : $translate.instant('ECM.LABEL.TIPOPROCESSO'), value : 'processo.tipoProcesso.descricao' }, { + title : $translate.instant('ECM.LABEL.ASSUNTO'), + value : 'processo.assunto.nome' + }, { title : $translate.instant('ECM.LABEL.ATRIBUIDOA'), value : 'usuarioResponsavel.username' }, { @@ -36,10 +41,11 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow dir : 'asc', sort : 'processo.nup', limit : 10, - fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia'], + fields: ['id', 'processo.nup', 'processo.tipoProcesso.descricao', 'processo.assunto.nome','usuarioResponsavel.username', 'processo.status.descricao', 'processo.sigilo.tipoSigilo.descricao', 'processo.dataCriacao', 'processo.idProcessInstance', 'processo.dataReferencia', 'processo'], filters : [ { type : 'string', field : 'processo.nup'}, { type : 'string', field : 'processo.tipoProcesso.descricao'}, + { type : 'string', field : 'processo.assunto.nome'}, { type : 'string', field : 'usuarioResponsavel.username'}, { type : 'string', field : 'processo.status.descricao', listaDominio : []}, { type : 'string', field : 'processo.sigilo.tipoSigilo.descricao'}, @@ -64,4 +70,8 @@ citApp.controller('GerenciarProcessoListUnidadeController', ['$scope', 'workflow carregarDominiosStatusProcesso(); + $scope.obterTransclude = function() { + $scope.modelSelecionado = $scope.$$childTail.modelParent; + }; + }]); \ No newline at end of file diff --git a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html index d13f65b..17438e3 100644 --- a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html +++ b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/gerenciarProcessoListUnidade.html @@ -18,8 +18,7 @@ -
- + ng-exibir-coluna-selecao="false" transclude="tarefasPorProcesso.html" ng-model-parent="modelSelecionado" ng-custom-transclude="obterTransclude()"> +
\ No newline at end of file diff --git a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html index 5c3d76b..df4c571 100644 --- a/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html +++ b/cit-ecm-web/src/main/webapp/html/gerenciarProcesso/tarefasPorProcesso.html @@ -1,11 +1,82 @@ - - - - - - - - - -
TarefaBPE
vaiiicurinthia
+
+ + +
+
+
+ LABEL.DATA_DE_CRIACAO: {{modelSelecionado.processo.dataCriacao | filter : 'dateBR'}} + LABEL.DATA_RECEBIMENTO: {{modelSelecionado.processo.dataReferencia}} +
+ + +
+
+
+ + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
ESI.TAREFAPORTAL.LABEL.SITUACAO_INSTANCIA
+ + + 123456{{assignment.id}} + + cassimiro{{assignment.flowElement.name}} + + teste{{assignment.processInstance.businessProcess.description}} +
+ +
+
+
+ +
\ No newline at end of file -- libgit2 0.21.2