Download as
Browse Code »

Commit dbcca6be2b182a223e4f392ad788eb65c5581208

Authored by Ciro Junior
1 parent 6ba1f4be
Exists in master

alterando layout de abas para visao de lista

Showing 11 changed files with 110 additions and 333 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java
View file @6ba1f4b
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
1 -package br.com.centralit.api.model;  
2 -  
3 -import java.io.Serializable;  
4 -  
5 -import com.fasterxml.jackson.annotation.JsonView;  
6 -  
7 -import br.com.centralit.api.framework.json.ViewsEcm;  
8 -  
9 -public class TarjaAssinaturaVH implements Serializable{  
10 -  
11 - private static final long serialVersionUID = -82446677470229523L;  
12 -  
13 - @JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })  
14 - private TarjaAssinatura assinaturaInterna;  
15 -  
16 - @JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })  
17 - private TarjaAssinatura assinaturaCertificado;  
18 -  
19 -  
20 - public TarjaAssinatura getAssinaturaInterna() {  
21 -  
22 - return assinaturaInterna;  
23 - }  
24 -  
25 -  
26 - public void setAssinaturaInterna(TarjaAssinatura assinaturaInterna) {  
27 -  
28 - this.assinaturaInterna = assinaturaInterna;  
29 - }  
30 -  
31 -  
32 - public TarjaAssinatura getAssinaturaCertificado() {  
33 -  
34 - return assinaturaCertificado;  
35 - }  
36 -  
37 -  
38 - public void setAssinaturaCertificado(TarjaAssinatura assinaturaCertificado) {  
39 -  
40 - this.assinaturaCertificado = assinaturaCertificado;  
41 - }  
42 -}  
cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
  Diff comments   View file @dbcca6b
@@ -3,7 +3,6 @@ package br.com.centralit.api.service; @@ -3,7 +3,6 @@ package br.com.centralit.api.service;
3 import org.springframework.web.multipart.MultipartFile; 3 import org.springframework.web.multipart.MultipartFile;
4 4
5 import br.com.centralit.api.model.TarjaAssinatura; 5 import br.com.centralit.api.model.TarjaAssinatura;
6 -import br.com.centralit.api.model.TarjaAssinaturaVH;  
7 import br.com.centralit.framework.service.arquitetura.GenericService; 6 import br.com.centralit.framework.service.arquitetura.GenericService;
8 7
9 /** 8 /**
@@ -35,21 +34,6 @@ public interface TarjaAssinaturaService extends GenericService<TarjaAssinatura, @@ -35,21 +34,6 @@ public interface TarjaAssinaturaService extends GenericService<TarjaAssinatura,
35 34
36 /** 35 /**
37 * 36 *
38 - * Método responsável por retornar todas as tarjas de assinatura existentes no banco.  
39 - * Normalmente existem apenas dois tipos fixos de tarjas:</br>  
40 - * <ul>  
41 - * <li>Tarja de assinatura interna</li>  
42 - * <li>Tarja de assinatura de certificado digital</li>  
43 - * </ul>  
44 - *  
45 - * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)  
46 - *  
47 - * @return  
48 - */  
49 - TarjaAssinaturaVH getAllTarjas ();  
50 -  
51 - /**  
52 - *  
53 * M&eacute;todo respons&aacute;vel por salvar os dois tipos de tarjas de assinatura ao mesmo tempo 37 * M&eacute;todo respons&aacute;vel por salvar os dois tipos de tarjas de assinatura ao mesmo tempo
54 * 38 *
55 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>) 39 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
@@ -57,5 +41,5 @@ public interface TarjaAssinaturaService extends GenericService&lt;TarjaAssinatura, @@ -57,5 +41,5 @@ public interface TarjaAssinaturaService extends GenericService&lt;TarjaAssinatura,
57 * @param tarjaAssinaturaVH 41 * @param tarjaAssinaturaVH
58 * @return 42 * @return
59 */ 43 */
60 - TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH); 44 + TarjaAssinatura save (TarjaAssinatura tarjaAssinatura);
61 } 45 }
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
  Diff comments   View file @dbcca6b
@@ -344,7 +344,7 @@ public class InicializarEcmServiceImpl extends UtilStartup { @@ -344,7 +344,7 @@ public class InicializarEcmServiceImpl extends UtilStartup {
344 pgTarjaAssinatura = this.paginaService.saveIfNotExist(pgTarjaAssinatura); 344 pgTarjaAssinatura = this.paginaService.saveIfNotExist(pgTarjaAssinatura);
345 345
346 Menu menuTarjaAssinatura = new Menu("Tarja de Assinatura", pgTarjaAssinatura, menuCadastroBasico, 0, 9, null, null, null, null, modulo); 346 Menu menuTarjaAssinatura = new Menu("Tarja de Assinatura", pgTarjaAssinatura, menuCadastroBasico, 0, 9, null, null, null, null, modulo);
347 - menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "TarjaAssinatura", true, false, true)); 347 + menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "TarjaAssinatura", true, true, true));
348 this.menuService.mergeIfNotExist(menuTarjaAssinatura); 348 this.menuService.mergeIfNotExist(menuTarjaAssinatura);
349 } 349 }
350 350
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
  Diff comments   View file @dbcca6b
1 package br.com.centralit.api.service.impl; 1 package br.com.centralit.api.service.impl;
2 2
3 import java.io.IOException; 3 import java.io.IOException;
4 -import java.util.ArrayList;  
5 -import java.util.List;  
6 4
7 import org.apache.log4j.Logger; 5 import org.apache.log4j.Logger;
8 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,13 +11,11 @@ import org.springframework.web.multipart.MultipartFile; @@ -13,13 +11,11 @@ import org.springframework.web.multipart.MultipartFile;
13 11
14 import br.com.centralit.api.dao.TarjaAssinaturaDao; 12 import br.com.centralit.api.dao.TarjaAssinaturaDao;
15 import br.com.centralit.api.model.TarjaAssinatura; 13 import br.com.centralit.api.model.TarjaAssinatura;
16 -import br.com.centralit.api.model.TarjaAssinaturaVH;  
17 import br.com.centralit.api.service.AnexoImagemService; 14 import br.com.centralit.api.service.AnexoImagemService;
18 import br.com.centralit.api.service.OrganizacaoService; 15 import br.com.centralit.api.service.OrganizacaoService;
19 import br.com.centralit.api.service.TarjaAssinaturaService; 16 import br.com.centralit.api.service.TarjaAssinaturaService;
20 import br.com.centralit.framework.model.AnexoImagem; 17 import br.com.centralit.framework.model.AnexoImagem;
21 import br.com.centralit.framework.model.Organizacao; 18 import br.com.centralit.framework.model.Organizacao;
22 -import br.com.centralit.framework.model.arquitetura.PersistentObject;  
23 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl; 19 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
24 20
25 /** 21 /**
@@ -55,13 +51,8 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl&lt;TarjaAssinatu @@ -55,13 +51,8 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl&lt;TarjaAssinatu
55 this.validator = validator; 51 this.validator = validator;
56 } 52 }
57 53
58 - public TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH){  
59 - TarjaAssinaturaVH tarjaAssinaturaVHSaved = new TarjaAssinaturaVH();  
60 - if(tarjaAssinaturaVH.getAssinaturaInterna() != null && tarjaAssinaturaVH.getAssinaturaCertificado() != null){  
61 - tarjaAssinaturaVHSaved.setAssinaturaInterna(this.merge(tarjaAssinaturaVH.getAssinaturaInterna()));  
62 - tarjaAssinaturaVHSaved.setAssinaturaCertificado(this.merge(tarjaAssinaturaVH.getAssinaturaCertificado()));  
63 - }  
64 - return tarjaAssinaturaVHSaved; 54 + public TarjaAssinatura save (TarjaAssinatura tarjaAssinatura){
  55 + return this.merge(tarjaAssinatura);
65 } 56 }
66 57
67 @Override 58 @Override
@@ -90,27 +81,4 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl&lt;TarjaAssinatu @@ -90,27 +81,4 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl&lt;TarjaAssinatu
90 + "identificar a causa: ", ioe.getCause()); 81 + "identificar a causa: ", ioe.getCause());
91 } 82 }
92 } 83 }
93 -  
94 - /**{@inheritDoc}*/  
95 - @Override  
96 - public TarjaAssinaturaVH getAllTarjas () {  
97 -  
98 - TarjaAssinaturaVH tarjaAssinaturaVH = new TarjaAssinaturaVH();  
99 - List<PersistentObject> tarjas = tarjaAssinaturaDao.findAll();  
100 - List<TarjaAssinatura> tarjasAssinatura = new ArrayList<>();  
101 - for (PersistentObject item : tarjas) {  
102 - if(item instanceof TarjaAssinatura){  
103 - tarjasAssinatura.add((TarjaAssinatura) item);  
104 - }  
105 - }  
106 - for (TarjaAssinatura tarjaAssinatura : tarjasAssinatura) {  
107 - if(tarjaAssinatura.getTipoAssinatura().getCodigo() == 1L){  
108 - tarjaAssinaturaVH.setAssinaturaInterna(tarjaAssinatura);  
109 - continue;  
110 - }  
111 - tarjaAssinaturaVH.setAssinaturaCertificado(tarjaAssinatura);  
112 - }  
113 - return tarjaAssinaturaVH;  
114 - }  
115 -  
116 } 84 }
cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
  Diff comments   View file @dbcca6b
@@ -13,11 +13,9 @@ import org.springframework.web.multipart.MultipartFile; @@ -13,11 +13,9 @@ import org.springframework.web.multipart.MultipartFile;
13 13
14 import br.com.centralit.api.framework.json.ViewsEcm; 14 import br.com.centralit.api.framework.json.ViewsEcm;
15 import br.com.centralit.api.model.TarjaAssinatura; 15 import br.com.centralit.api.model.TarjaAssinatura;
16 -import br.com.centralit.api.model.TarjaAssinaturaVH;  
17 import br.com.centralit.api.service.TarjaAssinaturaService; 16 import br.com.centralit.api.service.TarjaAssinaturaService;
18 import br.com.centralit.framework.controller.GenericController; 17 import br.com.centralit.framework.controller.GenericController;
19 import br.com.centralit.framework.json.ResponseBodyWrapper; 18 import br.com.centralit.framework.json.ResponseBodyWrapper;
20 -import br.com.centralit.framework.view.ResultResponseVH;  
21 19
22 @Controller 20 @Controller
23 @RequestMapping("/rest/tarjaAssinatura") 21 @RequestMapping("/rest/tarjaAssinatura")
@@ -42,21 +40,10 @@ public class TarjaAssinaturaController extends GenericController&lt;TarjaAssinatura @@ -42,21 +40,10 @@ public class TarjaAssinaturaController extends GenericController&lt;TarjaAssinatura
42 } 40 }
43 41
44 @ResponseBody 42 @ResponseBody
45 - @RequestMapping(value = "/getAllTarjas", method = RequestMethod.GET, produces = "application/json")  
46 - public ResponseBodyWrapper getAllTarjas () {  
47 -  
48 - ResultResponseVH<TarjaAssinaturaVH> resultResponseVH = new ResultResponseVH<TarjaAssinaturaVH>(this.tarjaAssinaturaService.getAllTarjas());  
49 - ResponseBodyWrapper responseBody = new ResponseBodyWrapper(resultResponseVH, this.getEditView());  
50 -  
51 - return responseBody;  
52 -  
53 - }  
54 -  
55 - @ResponseBody  
56 @RequestMapping(value = "/saveTarjaAssinatura", method = RequestMethod.POST, produces = "application/json") 43 @RequestMapping(value = "/saveTarjaAssinatura", method = RequestMethod.POST, produces = "application/json")
57 - public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception { 44 + public ResponseBodyWrapper save(@RequestBody TarjaAssinatura tarjaAssinatura) throws Exception {
58 45
59 - ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView()); 46 + ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinatura), getEditView());
60 47
61 return responseBody; 48 return responseBody;
62 } 49 }
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
  Diff comments   View file @dbcca6b
@@ -19,12 +19,12 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;, @@ -19,12 +19,12 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;,
19 19
20 $scope.resetForm = function() { 20 $scope.resetForm = function() {
21 $scope.tarjaAssinatura = { 21 $scope.tarjaAssinatura = {
22 - assinaturaInterna : {tipoAssinatura : $scope.tipoAssinaturaInterna},  
23 - assinaturaCertificado : {tipoAssinatura : $scope.tipoAssinaturaCertificado} 22 + descricao : "",
  23 + tipoAssinatura : {}
24 }; 24 };
25 - if ($scope.uploaderLogoTarjaAssinaturaInterna && $scope.uploaderLogoTarjaAssinaturaCertificado){  
26 - $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();  
27 - $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue(); 25 +
  26 + if ($scope.uploaderLogo){
  27 + $scope.uploaderLogo.clearQueue();
28 } 28 }
29 29
30 $scope.edit = true; 30 $scope.edit = true;
@@ -35,7 +35,6 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;, @@ -35,7 +35,6 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;,
35 } 35 }
36 }); 36 });
37 }; 37 };
38 - $scope.resetForm();  
39 38
40 DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) { 39 DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) {
41 $scope.tipoAssinaturaInterna = result.originalElement; 40 $scope.tipoAssinaturaInterna = result.originalElement;
@@ -44,28 +43,21 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;, @@ -44,28 +43,21 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;,
44 $scope.tipoAssinaturaCertificado = result.originalElement; 43 $scope.tipoAssinaturaCertificado = result.originalElement;
45 }); 44 });
46 45
47 - $scope.getAllTarjas = function(){ 46 + $scope.getTarjaAssinatura = function(id, edit) {
  47 + $scope.resetForm();
48 $scope.setLoadingGet(true); 48 $scope.setLoadingGet(true);
49 - TarjaAssinaturaRepository.getAllTarjas().then(function(result) { 49 + TarjaAssinaturaRepository.get(id).then(function(result) {
50 $scope.tarjaAssinatura = result.originalElement; 50 $scope.tarjaAssinatura = result.originalElement;
51 - $scope.edit = false; 51 + $scope.edit = edit;
52 $scope.setLoading(false); 52 $scope.setLoading(false);
53 }); 53 });
54 }; 54 };
55 - $scope.getAllTarjas();  
56 -  
57 - var vincularIdTarjaUploader = function () {  
58 - if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){  
59 - $scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id;  
60 - $scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id;  
61 - }  
62 - };  
63 55
64 - $scope.saveOrUpdate = function(){ 56 + $scope.saveOrUpdate = function(form){
65 57
66 - $scope.tarjaAssinaturaForm.$submitted = true; 58 + form.$submitted = true;
67 59
68 - if($scope.tarjaAssinaturaForm.$invalid){ 60 + if(form.$invalid){
69 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false); 61 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
70 return; 62 return;
71 } 63 }
@@ -75,30 +67,34 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;, @@ -75,30 +67,34 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;,
75 TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) { 67 TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) {
76 $scope.tarjaAssinatura = result.originalElement; 68 $scope.tarjaAssinatura = result.originalElement;
77 $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO')); 69 $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO'));
78 - $scope.tarjaAssinaturaForm.$submitted = false; 70 + form.$submitted = false;
79 $scope.setLoading(false); 71 $scope.setLoading(false);
80 - if($scope.uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || $scope.uploaderLogoTarjaAssinaturaCertificado.queue.length > 0){  
81 - $scope.uploaderLogoTarjaAssinaturaInterna.uploadAll();  
82 - $scope.uploaderLogoTarjaAssinaturaCertificado.uploadAll(); 72 + if($scope.uploaderLogo.queue.length > 0){
  73 + $scope.uploaderLogo.uploadAll();
83 } 74 }
84 }); 75 });
85 }; 76 };
86 77
87 $scope.cancelarEdicao = function () { 78 $scope.cancelarEdicao = function () {
88 $scope.resetForm(); 79 $scope.resetForm();
89 - $scope.getAllTarjas(); 80 + $scope.$showPageSearchWorkspace($scope.workspace);
  81 + $scope.fetchResult();
90 $scope.edit= false 82 $scope.edit= false
91 } 83 }
92 84
  85 + $scope.fetchResult = function(){
  86 + angular.element('#searchTarjaAssinatura').scope().fetchResult();
  87 + };
  88 +
93 //INSTANCIA DO OBJETO PARA FAZER UPLOAD 89 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
94 - $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({ 90 + $scope.uploaderLogo = new FileUploader({
95 autoUpload: false, 91 autoUpload: false,
96 queueLimit: 1, 92 queueLimit: 1,
97 url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura=' 93 url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
98 }); 94 });
99 95
100 // FILTERS 96 // FILTERS
101 - $scope.uploaderLogoTarjaAssinaturaInterna.filters.push({ 97 + $scope.uploaderLogo.filters.push({
102 name: 'imageFilter', 98 name: 'imageFilter',
103 fn: function(item , options) { 99 fn: function(item , options) {
104 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|'; 100 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -107,96 +103,47 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;, @@ -107,96 +103,47 @@ citApp.controller(&#39;TarjaAssinaturaController&#39;,
107 }); 103 });
108 104
109 // CALLBACKS 105 // CALLBACKS
110 - $scope.uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {  
111 - $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue(); 106 + $scope.uploaderLogo.onWhenAddingFileFailed = function(item , filter, options) {
  107 + $scope.uploaderLogo.clearQueue();
112 console.info('onWhenAddingFileFailed', item, filter, options); 108 console.info('onWhenAddingFileFailed', item, filter, options);
113 }; 109 };
114 - $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) { 110 + $scope.uploaderLogo.onAfterAddingFile = function(fileItem) {
115 console.info('onAfterAddingFile', fileItem); 111 console.info('onAfterAddingFile', fileItem);
116 }; 112 };
117 - $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) { 113 + $scope.uploaderLogo.onAfterAddingAll = function(addedFileItems) {
118 console.info('onAfterAddingAll', addedFileItems); 114 console.info('onAfterAddingAll', addedFileItems);
119 }; 115 };
120 - $scope.uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) { 116 + $scope.uploaderLogo.onBeforeUploadItem = function(item) {
121 console.info('onBeforeUploadItem', item); 117 console.info('onBeforeUploadItem', item);
122 }; 118 };
123 - $scope.uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) { 119 + $scope.uploaderLogo.onProgressItem = function(fileItem, progress) {
124 console.info('onProgressItem', fileItem, progress); 120 console.info('onProgressItem', fileItem, progress);
125 }; 121 };
126 - $scope.uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) { 122 + $scope.uploaderLogo.onProgressAll = function(progress) {
127 console.info('onProgressAll', progress); 123 console.info('onProgressAll', progress);
128 }; 124 };
129 - $scope.uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) { 125 + $scope.uploaderLogo.onSuccessItem = function(fileItem, response, status, headers) {
130 console.info('onSuccessItem', fileItem, response, status, headers); 126 console.info('onSuccessItem', fileItem, response, status, headers);
131 }; 127 };
132 - $scope.uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) { 128 + $scope.uploaderLogo.onErrorItem = function(fileItem, response, status, headers) {
133 console.info('onErrorItem', fileItem, response, status, headers); 129 console.info('onErrorItem', fileItem, response, status, headers);
134 }; 130 };
135 - $scope.uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) { 131 + $scope.uploaderLogo.onCancelItem = function(fileItem, response, status, headers) {
136 console.info('onCancelItem', fileItem, response, status, headers); 132 console.info('onCancelItem', fileItem, response, status, headers);
137 }; 133 };
138 - $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) { 134 + $scope.uploaderLogo.onCompleteItem = function(fileItem, response, status, headers) {
139 console.info('onCompleteItem', fileItem, response, status, headers); 135 console.info('onCompleteItem', fileItem, response, status, headers);
140 }; 136 };
141 - $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {  
142 - $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();  
143 - $scope.getAllTarjas() 137 + $scope.uploaderLogo.onCompleteAll = function() {
  138 + $scope.uploaderLogo.clearQueue();
  139 + $scope.getTarjaAssinatura($scope.tarjaAssintura.id, $scope.edit)
144 console.info('onCompleteAll'); 140 console.info('onCompleteAll');
145 }; 141 };
146 142
147 -//INSTANCIA DO OBJETO PARA FAZER UPLOAD  
148 - $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({  
149 - autoUpload: false,  
150 - queueLimit: 1,  
151 - url :'/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='  
152 - });  
153 -  
154 - // FILTERS  
155 - $scope.uploaderLogoTarjaAssinaturaCertificado.filters.push({  
156 - name: 'imageFilter',  
157 - fn: function(item , options) {  
158 - var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';  
159 - return '|jpg|png|jpeg|bmp|gif|'.indexOf(type) !== -1;  
160 - }  
161 - });  
162 -  
163 - // CALLBACKS  
164 - $scope.uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {  
165 - $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();  
166 - console.info('onWhenAddingFileFailed', item, filter, options); 143 + var vincularIdTarjaUploader = function () {
  144 + if($scope.tarjaAssinatura.id){
  145 + $scope.uploaderLogoTarjaAssinatura.url += $scope.tarjaAssinatura.id;
  146 + }
167 }; 147 };
168 - $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {  
169 - console.info('onAfterAddingFile', fileItem);  
170 - };  
171 - $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {  
172 - console.info('onAfterAddingAll', addedFileItems);  
173 - };  
174 - $scope.uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {  
175 - console.info('onBeforeUploadItem', item);  
176 - };  
177 - $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {  
178 - console.info('onProgressItem', fileItem, progress);  
179 - };  
180 - $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {  
181 - console.info('onProgressAll', progress);  
182 - };  
183 - $scope.uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {  
184 - console.info('onSuccessItem', fileItem, response, status, headers);  
185 - };  
186 - $scope.uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {  
187 - console.info('onErrorItem', fileItem, response, status, headers);  
188 - };  
189 - $scope.uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {  
190 - console.info('onCancelItem', fileItem, response, status, headers);  
191 - };  
192 - $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {  
193 - console.info('onCompleteItem', fileItem, response, status, headers);  
194 - };  
195 - $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {  
196 - $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();  
197 - $scope.getAllTarjas();  
198 - console.info('onCompleteAll');  
199 - };  
200 -  
201 vincularIdTarjaUploader(); 148 vincularIdTarjaUploader();
202 }]); 149 }]);
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaListController.js
  Diff comments   View file @dbcca6b
@@ -17,8 +17,8 @@ citApp.controller(&#39;TarjaAssinaturaListController&#39;, @@ -17,8 +17,8 @@ citApp.controller(&#39;TarjaAssinaturaListController&#39;,
17 angular.element("#editTarjaAssinatura").scope().resetForm(); 17 angular.element("#editTarjaAssinatura").scope().resetForm();
18 }; 18 };
19 19
20 - $scope.headers = [ {title : $translate.instant('LABEL.TIPO_ASSINATURA'), value : 'dominio.tipoAssinatura' },  
21 - {title : $translate.instant('LABEL.DESCRICAO'), value : 'descricao' }]; 20 + $scope.headers = [ {title : $translate.instant('LABEL.DESCRICAO'), value : 'descricao' },
  21 + {title : $translate.instant('LABEL.TIPO_ASSINATURA'), value : 'dominio.tipoAssinatura' }];
22 22
23 $scope.filterCriteria = { 23 $scope.filterCriteria = {
24 start : 1, 24 start : 1,
@@ -34,14 +34,15 @@ citApp.controller(&#39;TarjaAssinaturaListController&#39;, @@ -34,14 +34,15 @@ citApp.controller(&#39;TarjaAssinaturaListController&#39;,
34 $scope.filterCriteria.filters[0].listaDominio = result; 34 $scope.filterCriteria.filters[0].listaDominio = result;
35 }); 35 });
36 36
37 - $scope.abrirVisualizar = function(edit){ 37 + $scope.editarVisualizarTarjaAssinatura = function(edit){
38 var tarjaAssinatura = $scope.tarjaAssinaturaChecked; 38 var tarjaAssinatura = $scope.tarjaAssinaturaChecked;
39 39
40 if(!tarjaAssinatura) { 40 if(!tarjaAssinatura) {
41 - $scope.showAlert('warning', !edit ? $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_VISUALIZACAO') : $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_EDICAO')); 41 + $scope.showAlert('warning', !edit ? $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_VISUALIZACAO') :
  42 + $translate.instant('MSG.SELECIONE_UM_ITEM_PARA_EDICAO'));
42 return; 43 return;
43 } 44 }
44 - angular.element('#editTarjaAssinatura').scope().getTarjaAssinatura(tarjaAssinatura, edit); 45 + angular.element('#editTarjaAssinatura').scope().getTarjaAssinatura(tarjaAssinatura.id, edit);
45 $scope.$showPageEditWorkspace($scope.workspace); 46 $scope.$showPageEditWorkspace($scope.workspace);
46 }; 47 };
47 }]); 48 }]);
cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
  Diff comments   View file @dbcca6b
@@ -5,10 +5,6 @@ citApp.factory(&#39;TarjaAssinaturaRepository&#39;, [&#39;RestangularEcm&#39;, &#39;AbstractReposito @@ -5,10 +5,6 @@ citApp.factory(&#39;TarjaAssinaturaRepository&#39;, [&#39;RestangularEcm&#39;, &#39;AbstractReposito
5 function TarjaAssinaturaRepository() { 5 function TarjaAssinaturaRepository() {
6 AbstractRepository.call(this, restangularEcm, 'rest/tarjaAssinatura'); 6 AbstractRepository.call(this, restangularEcm, 'rest/tarjaAssinatura');
7 7
8 - this.getAllTarjas = function() {  
9 - return restangularEcm.one(this.route + "/getAllTarjas" ).get();  
10 - };  
11 -  
12 this.save = function(tarjaAssinatura) { 8 this.save = function(tarjaAssinatura) {
13 return restangularEcm.all(this.route + "/saveTarjaAssinatura").post(tarjaAssinatura).then(); 9 return restangularEcm.all(this.route + "/saveTarjaAssinatura").post(tarjaAssinatura).then();
14 }; 10 };
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
  Diff comments   View file @dbcca6b
1 -<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'"></div>  
2 -<!-- <div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaList.html'" ng-show="workspace.$showSearch"></div> --> 1 +<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaList.html'" ng-show="workspace.$showSearch"></div>
  2 +<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'" ng-show="workspace.$showEdit"></div>
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
  Diff comments   View file @dbcca6b
@@ -30,121 +30,58 @@ @@ -30,121 +30,58 @@
30 30
31 <breadcrumb ng-workspace="workspace"></breadcrumb> 31 <breadcrumb ng-workspace="workspace"></breadcrumb>
32 <form name="tarjaAssinaturaForm"> 32 <form name="tarjaAssinaturaForm">
33 - <tabset class="tabbable margin-top margin-bottom">  
34 - <tab>  
35 - <tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading>  
36 -<!-- <form name="tarjaAssinaturaInternaForm"> -->  
37 - <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>  
38 - <fieldset>  
39 - <legend>  
40 - <translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_INTERNA</translate>  
41 - </legend>  
42 - </fieldset>  
43 - <div class="row">  
44 - <div class="col-md-6">  
45 - <label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"  
46 - ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"  
47 - ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />  
48 - </div>  
49 - <div class="col-md-4">  
50 - <label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"  
51 - ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaForm"  
52 - ng-obrigatorio="false" ng-type="text" />  
53 - </div>  
54 - </div>  
55 - <div class="row">  
56 - <div class="col-sm-12">  
57 - <div class="form-group" ng-disable="!edit">  
58 - <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>  
59 - <div ng-if="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna"  
60 - onclick="this.edit ? $('#uploadLogoTarjaAssinaturaInterna').click() : null">  
61 - <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone">  
62 - <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>  
63 - <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span>  
64 - </div>  
65 - </div>  
66 - <input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" />  
67 - </div><!-- .form-group -->  
68 - </div>  
69 - </div>  
70 - <div class="row">  
71 - <div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo">  
72 - <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">  
73 - </div>  
74 - </div>  
75 - <div class="row">  
76 - <div class="col-md-12">  
77 - <div class="form-group">  
78 - <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">  
79 - <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>  
80 - <i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'  
81 - tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"  
82 - tooltip-placement='top'></i>  
83 - </label>  
84 - <div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>  
85 - <iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaInterna.conteudo}}" allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>  
86 - </div>  
87 - </div>  
88 - </div>  
89 -<!-- </form> -->  
90 - </tab>  
91 -  
92 - <tab>  
93 - <tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading>  
94 - <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>  
95 - <fieldset>  
96 - <legend>  
97 - <translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_CERTIFICADO_DIGITAL</translate>  
98 - </legend>  
99 - </fieldset>  
100 - <div class="row">  
101 - <div class="col-md-6">  
102 - <label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"  
103 - ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"  
104 - ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />  
105 - </div>  
106 - <div class="col-md-4">  
107 - <label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"  
108 - ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaForm"  
109 - ng-obrigatorio="false" ng-type="text" />  
110 - </div>  
111 - </div>  
112 - <div class="row">  
113 - <div class="col-sm-12">  
114 - <div class="form-group">  
115 - <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>  
116 - <div ng-if="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado"  
117 - onclick="$('#uploadLogoTarjaAssinaturaCertificado').click()">  
118 - <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone">  
119 - <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>  
120 - <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span>  
121 - </div>  
122 - </div>  
123 - <input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" />  
124 - </div><!-- .form-group -->  
125 - </div>  
126 - <div class="row">  
127 - <div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">  
128 - <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">  
129 - </div>  
130 - </div>  
131 - </div>  
132 -  
133 - <div class="row">  
134 - <div class="col-md-12">  
135 - <div class="form-group">  
136 - <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted}">  
137 - <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>  
138 - <i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'  
139 - tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"  
140 - tooltip-placement='top'></i>  
141 - </label>  
142 - <div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>  
143 - <iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.assinaturaCertificado.conteudo}}"allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe> 33 + <fieldset>
  34 + <legend>
  35 + <translate>ECM.LABEL.DADOS_TARJA_ASSINATURA</translate>
  36 + </legend>
  37 + </fieldset>
  38 + <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
  39 + <div class="row">
  40 + <div class="col-md-6">
  41 + <label-input ng-id="tarjaAssinatura.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
  42 + ng-model="tarjaAssinatura.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
  43 + ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
  44 + </div>
  45 + <div class="col-md-4">
  46 + <label-input ng-id="tarjaAssinatura.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
  47 + ng-disabled="true" ng-model="tarjaAssinatura.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
  48 + ng-obrigatorio="false" ng-type="text" />
  49 + </div>
  50 + </div>
  51 + <div class="row">
  52 + <div class="col-sm-12">
  53 + <div class="form-group" ng-disable="!edit">
  54 + <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
  55 + <div ng-if="tarjaAssinatura.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogo"
  56 + onclick="$('#uploadLogoTarjaAssinatura').click()">
  57 + <div nv-file-over="" uploader="uploaderLogo" over-class="another-file-over-class" class="well my-drop-zone">
  58 + <span ng-show="uploaderLogo.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
  59 + <span ng-show="uploaderLogo.queue.length > 0">{{uploaderLogo.queue[0].file.name}}</span>
144 </div> 60 </div>
145 </div> 61 </div>
  62 + <input id="uploadLogoTarjaAssinatura" type="file" nv-file-select="" uploader="uploaderLogo" ng-show="false" />
  63 + </div><!-- .form-group -->
  64 + </div>
  65 + </div>
  66 + <div class="row">
  67 + <div class="col-sm-12" ng-show="tarjaAssinatura.anexoImagem.anexo">
  68 + <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
  69 + </div>
  70 + </div>
  71 + <div class="row">
  72 + <div class="col-md-12">
  73 + <div class="form-group">
  74 + <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted}">
  75 + <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
  76 + <i ng-show="!tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
  77 + tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
  78 + tooltip-placement='top'></i>
  79 + </label>
  80 + <div id="tarjaAssinatura.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.conteudo" ></div>
  81 + <iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.conteudo}}"
  82 + allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
146 </div> 83 </div>
147 - </tab>  
148 - </tabset> 84 + </div>
  85 + </div>
149 </form> 86 </form>
150 </div><!-- .page-content --> 87 </div><!-- .page-content -->
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaList.html
  Diff comments   View file @dbcca6b
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
2 <div class="bar-buttons-action fixed"> 2 <div class="bar-buttons-action fixed">
3 <div class="row"> 3 <div class="row">
4 <div class="col-sm-8 text-left"> 4 <div class="col-sm-8 text-left">
5 - <button class="btn btn-clear" ng-click="abrirVisualizar(false);"> 5 + <button class="btn btn-clear" ng-click="editarVisualizarTarjaAssinatura(false);">
6 <i class="fa fa-search blue"></i> 6 <i class="fa fa-search blue"></i>
7 <translate>LABEL.VISUALIZAR</translate> 7 <translate>LABEL.VISUALIZAR</translate>
8 </button> 8 </button>
9 - <button class="btn btn-clear" ng-click="abrirVisualizar(true);"> 9 + <button class="btn btn-clear" ng-click="editarVisualizarTarjaAssinatura(true);">
10 <i class="fa fa-pencil blue"></i> 10 <i class="fa fa-pencil blue"></i>
11 <translate>LABEL.EDITAR</translate> 11 <translate>LABEL.EDITAR</translate>
12 </button> 12 </button>
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 27
28 <breadcrumb ng-workspace="workspace"></breadcrumb> 28 <breadcrumb ng-workspace="workspace"></breadcrumb>
29 29
30 - <list-view ng-lista="tarjaAssinaturaList" ng-repository="TarjaAssinaturaRepository" ng-use-custom-remove="false" ng-headers="headers"  
31 - ng-filter-criteria="filterCriteria" ng-item-selecionado="tarjaAssinaturaChecked"></list-view>  
32 -</div>  
33 -<!-- .page-content --> 30 + <list-view ng-lista="tarjaAssinaturaList" ng-repository="TarjaAssinaturaRepository" ng-use-custom-remove="false"
  31 + ng-headers="headers" ng-filter-criteria="filterCriteria" ng-item-selecionado="tarjaAssinaturaChecked"></list-view>
  32 +</div><!-- .page-content -->