Download as
Browse Code »

Commit 0287d62964407d273860b8d5517528020c101dca

Authored by Ciro Junior
1 parent f2f94480
Exists in master

[Redmine #4466] 

Corrigindo comportamento do uploader de imagem.
Showing 5 changed files with 120 additions and 112 deletions   Show diff stats
cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
  Diff comments   View file @0287d62
@@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile; @@ -14,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
14 import br.com.centralit.api.dao.TarjaAssinaturaDao; 14 import br.com.centralit.api.dao.TarjaAssinaturaDao;
15 import br.com.centralit.api.model.TarjaAssinatura; 15 import br.com.centralit.api.model.TarjaAssinatura;
16 import br.com.centralit.api.model.TarjaAssinaturaVH; 16 import br.com.centralit.api.model.TarjaAssinaturaVH;
  17 +import br.com.centralit.api.service.AnexoImagemService;
17 import br.com.centralit.api.service.OrganizacaoService; 18 import br.com.centralit.api.service.OrganizacaoService;
18 import br.com.centralit.api.service.TarjaAssinaturaService; 19 import br.com.centralit.api.service.TarjaAssinaturaService;
19 import br.com.centralit.framework.model.AnexoImagem; 20 import br.com.centralit.framework.model.AnexoImagem;
@@ -42,6 +43,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu @@ -42,6 +43,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
42 @Autowired 43 @Autowired
43 private OrganizacaoService organizacaoService; 44 private OrganizacaoService organizacaoService;
44 45
  46 + @Autowired
  47 + private AnexoImagemService anexoImagemService;
  48 +
45 private TarjaAssinaturaDao tarjaAssinaturaDao; 49 private TarjaAssinaturaDao tarjaAssinaturaDao;
46 50
47 @Autowired 51 @Autowired
@@ -77,8 +81,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu @@ -77,8 +81,9 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
77 anexoImagem.setDescricao(file.getOriginalFilename()); 81 anexoImagem.setDescricao(file.getOriginalFilename());
78 anexoImagem.setOrganizacao(organizacao); 82 anexoImagem.setOrganizacao(organizacao);
79 83
80 - TarjaAssinatura tarjaAssinatura = (TarjaAssinatura) this.tarjaAssinaturaDao.getReference(idTarjaAssinatura);  
81 - tarjaAssinatura.setAnexoImagem(anexoImagem); 84 + AnexoImagem anexoImagemSaved = anexoImagemService.save(anexoImagem);
  85 + TarjaAssinatura tarjaAssinatura = (TarjaAssinatura) this.tarjaAssinaturaDao.find(idTarjaAssinatura);
  86 + tarjaAssinatura.setAnexoImagem(anexoImagemSaved);
82 this.merge(tarjaAssinatura); 87 this.merge(tarjaAssinatura);
83 } catch (IOException ioe) { 88 } catch (IOException ioe) {
84 LOG.error("N\u00e3o consegui anexar a imagem \u00e0 entidade TarjaAssinatura. Verifique a exce\u00e7\u00e3o para " 89 LOG.error("N\u00e3o consegui anexar a imagem \u00e0 entidade TarjaAssinatura. Verifique a exce\u00e7\u00e3o para "
cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
  Diff comments   View file @0287d62
@@ -53,7 +53,7 @@ public class TarjaAssinaturaController extends GenericController<TarjaAssinatura @@ -53,7 +53,7 @@ public class TarjaAssinaturaController extends GenericController<TarjaAssinatura
53 } 53 }
54 54
55 @ResponseBody 55 @ResponseBody
56 - @RequestMapping(value = "save", method = RequestMethod.POST, produces = "application/json") 56 + @RequestMapping(value = "/saveTarjaAssinatura", method = RequestMethod.POST, produces = "application/json")
57 public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception { 57 public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception {
58 58
59 ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView()); 59 ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView());
cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
  Diff comments   View file @0287d62
@@ -16,25 +16,26 @@ citApp.controller('TarjaAssinaturaController', @@ -16,25 +16,26 @@ citApp.controller('TarjaAssinaturaController',
16 DominioRepository, 16 DominioRepository,
17 FileUploader) { 17 FileUploader) {
18 18
  19 +
19 $scope.resetForm = function() { 20 $scope.resetForm = function() {
20 - $scope.tarjaAssinatura = {  
21 - assinaturaInterna : {},  
22 - assinaturaCertificado : {}  
23 - };  
24 - $scope.tipoAssinaturaInterna = {};  
25 - $scope.tipoAssinaturaCertificado = {};  
26 -  
27 - $scope.edit = false;  
28 - $timeout(function(){  
29 - if($scope.tarjaAssinaturaInternaForm && $scope.tarjaAssinaturaCertificadoForm){  
30 - $scope.tarjaAssinaturaInternaForm.$submitted = false;  
31 - $scope.tarjaAssinaturaCertificadoForm.$submitted = false;  
32 - $scope.tarjaAssinaturaInternaForm.$setPristine();  
33 - $scope.tarjaAssinaturaCertificadoForm.$setPristine(); 21 + $scope.tarjaAssinatura = {
  22 + assinaturaInterna : {tipoAssinatura : $scope.tipoAssinaturaInterna},
  23 + assinaturaCertificado : {tipoAssinatura : $scope.tipoAssinaturaCertificado}
  24 + };
  25 + if ($scope.uploaderLogoTarjaAssinaturaInterna && $scope.uploaderLogoTarjaAssinaturaCertificado){
  26 + $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
  27 + $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
34 } 28 }
35 - });  
36 - };  
37 - $scope.resetForm(); 29 +
  30 + $scope.edit = true;
  31 + $timeout(function(){
  32 + if($scope.tarjaAssinaturaForm){
  33 + $scope.tarjaAssinaturaForm.$submitted = false;
  34 + $scope.tarjaAssinaturaForm.$setPristine();
  35 + }
  36 + });
  37 + };
  38 + $scope.resetForm();
38 39
39 DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) { 40 DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) {
40 $scope.tipoAssinaturaInterna = result.originalElement; 41 $scope.tipoAssinaturaInterna = result.originalElement;
@@ -43,21 +44,29 @@ citApp.controller('TarjaAssinaturaController', @@ -43,21 +44,29 @@ citApp.controller('TarjaAssinaturaController',
43 $scope.tipoAssinaturaCertificado = result.originalElement; 44 $scope.tipoAssinaturaCertificado = result.originalElement;
44 }); 45 });
45 46
  47 + var vincularIdTarjaUploader = function () {
  48 + if($scope.tarjaAssinatura.assinaturaInterna.id && $scope.tarjaAssinatura.assinaturaCertificado.id){
  49 + $scope.uploaderLogoTarjaAssinaturaInterna.url += $scope.tarjaAssinatura.assinaturaInterna.id;
  50 + $scope.uploaderLogoTarjaAssinaturaCertificado.url += $scope.tarjaAssinatura.assinaturaCertificado.id;
  51 + }
  52 + };
  53 +
46 $scope.getAllTarjas = function(){ 54 $scope.getAllTarjas = function(){
47 - $scope.setLoadingGet(true);  
48 - TarjaAssinaturaRepository.getAllTarjas().then(function(result) {  
49 - $scope.tarjaAssinatura = result.originalElement;  
50 - $scope.setLoading(false);  
51 - });  
52 - }; 55 + $scope.setLoadingGet(true);
  56 + TarjaAssinaturaRepository.getAllTarjas().then(function(result) {
  57 + $scope.tarjaAssinatura = result.originalElement;
  58 + vincularIdTarjaUploader();
  59 + $scope.edit = false;
  60 + $scope.setLoading(false);
  61 + });
  62 + };
53 $scope.getAllTarjas(); 63 $scope.getAllTarjas();
54 64
55 - $scope.saveOrUpdate = function(formAssinaturaInterna, formAssinaturaCertificado){ 65 + $scope.saveOrUpdate = function(){
56 66
57 - formAssinaturaInterna.$submitted = true;  
58 - formAssinaturaCertificado.$submitted = true; 67 + $scope.tarjaAssinaturaForm.$submitted = true;
59 68
60 - if(formAssinaturaInterna.$invalid || formAssinaturaCertificado.$invalid){ 69 + if($scope.tarjaAssinaturaForm.$invalid){
61 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false); 70 $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
62 return; 71 return;
63 } 72 }
@@ -67,12 +76,11 @@ citApp.controller('TarjaAssinaturaController', @@ -67,12 +76,11 @@ citApp.controller('TarjaAssinaturaController',
67 TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) { 76 TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) {
68 $scope.tarjaAssinatura = result.originalElement; 77 $scope.tarjaAssinatura = result.originalElement;
69 $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO')); 78 $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO'));
70 - formAssinaturaInterna.$submitted = false;  
71 - formAssinaturaCertificado.$submitted = false; 79 + $scope.tarjaAssinaturaForm.$submitted = false;
72 $scope.setLoading(false); 80 $scope.setLoading(false);
73 - if(uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || uploaderLogoTarjaAssinaturaCertificado > 0){  
74 - uploaderLogoTarjaAssinaturaInterna.uploadAll();  
75 - uploaderLogoTarjaAssinaturaCertificado.uploadAll(); 81 + if($scope.uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || $scope.uploaderLogoTarjaAssinaturaCertificado.queue.length > 0){
  82 + $scope.uploaderLogoTarjaAssinaturaInterna.uploadAll();
  83 + $scope.uploaderLogoTarjaAssinaturaCertificado.uploadAll();
76 } 84 }
77 }); 85 });
78 }; 86 };
@@ -84,15 +92,14 @@ citApp.controller('TarjaAssinaturaController', @@ -84,15 +92,14 @@ citApp.controller('TarjaAssinaturaController',
84 } 92 }
85 93
86 //INSTANCIA DO OBJETO PARA FAZER UPLOAD 94 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
87 - var uploaderLogoTarjaAssinaturaInterna = $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({ 95 + $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({
88 autoUpload: false, 96 autoUpload: false,
89 queueLimit: 1, 97 queueLimit: 1,
90 - url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +  
91 - '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaInterna.id 98 + url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
92 }); 99 });
93 100
94 // FILTERS 101 // FILTERS
95 - uploaderLogoTarjaAssinaturaInterna.filters.push({ 102 + $scope.uploaderLogoTarjaAssinaturaInterna.filters.push({
96 name: 'imageFilter', 103 name: 'imageFilter',
97 fn: function(item , options) { 104 fn: function(item , options) {
98 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|'; 105 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -101,53 +108,52 @@ citApp.controller('TarjaAssinaturaController', @@ -101,53 +108,52 @@ citApp.controller('TarjaAssinaturaController',
101 }); 108 });
102 109
103 // CALLBACKS 110 // CALLBACKS
104 - uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {  
105 - uploaderLogoTarjaAssinaturaInterna.clearQueue(); 111 + $scope.uploaderLogoTarjaAssinaturaInterna.onWhenAddingFileFailed = function(item , filter, options) {
  112 + $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
106 console.info('onWhenAddingFileFailed', item, filter, options); 113 console.info('onWhenAddingFileFailed', item, filter, options);
107 }; 114 };
108 - uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) { 115 + $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingFile = function(fileItem) {
109 console.info('onAfterAddingFile', fileItem); 116 console.info('onAfterAddingFile', fileItem);
110 }; 117 };
111 - uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) { 118 + $scope.uploaderLogoTarjaAssinaturaInterna.onAfterAddingAll = function(addedFileItems) {
112 console.info('onAfterAddingAll', addedFileItems); 119 console.info('onAfterAddingAll', addedFileItems);
113 }; 120 };
114 - uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) { 121 + $scope.uploaderLogoTarjaAssinaturaInterna.onBeforeUploadItem = function(item) {
115 console.info('onBeforeUploadItem', item); 122 console.info('onBeforeUploadItem', item);
116 }; 123 };
117 - uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) { 124 + $scope.uploaderLogoTarjaAssinaturaInterna.onProgressItem = function(fileItem, progress) {
118 console.info('onProgressItem', fileItem, progress); 125 console.info('onProgressItem', fileItem, progress);
119 }; 126 };
120 - uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) { 127 + $scope.uploaderLogoTarjaAssinaturaInterna.onProgressAll = function(progress) {
121 console.info('onProgressAll', progress); 128 console.info('onProgressAll', progress);
122 }; 129 };
123 - uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) { 130 + $scope.uploaderLogoTarjaAssinaturaInterna.onSuccessItem = function(fileItem, response, status, headers) {
124 console.info('onSuccessItem', fileItem, response, status, headers); 131 console.info('onSuccessItem', fileItem, response, status, headers);
125 }; 132 };
126 - uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) { 133 + $scope.uploaderLogoTarjaAssinaturaInterna.onErrorItem = function(fileItem, response, status, headers) {
127 console.info('onErrorItem', fileItem, response, status, headers); 134 console.info('onErrorItem', fileItem, response, status, headers);
128 }; 135 };
129 - uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) { 136 + $scope.uploaderLogoTarjaAssinaturaInterna.onCancelItem = function(fileItem, response, status, headers) {
130 console.info('onCancelItem', fileItem, response, status, headers); 137 console.info('onCancelItem', fileItem, response, status, headers);
131 }; 138 };
132 - uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) { 139 + $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteItem = function(fileItem, response, status, headers) {
133 console.info('onCompleteItem', fileItem, response, status, headers); 140 console.info('onCompleteItem', fileItem, response, status, headers);
134 }; 141 };
135 - uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {  
136 - uploaderLogoTarjaAssinaturaInterna.clearQueue();  
137 - $scope.getTarjaAssinatura($scope.tarjaAssinatura); 142 + $scope.uploaderLogoTarjaAssinaturaInterna.onCompleteAll = function() {
  143 + $scope.uploaderLogoTarjaAssinaturaInterna.clearQueue();
  144 + $scope.getAllTarjas()
138 console.info('onCompleteAll'); 145 console.info('onCompleteAll');
139 }; 146 };
140 147
141 //INSTANCIA DO OBJETO PARA FAZER UPLOAD 148 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
142 - var uploaderLogoTarjaAssinaturaCertificado = $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({ 149 + $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({
143 autoUpload: false, 150 autoUpload: false,
144 queueLimit: 1, 151 queueLimit: 1,
145 - url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +  
146 - '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaCertificado.id 152 + url :'/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id + '&idTarjaAssinatura='
147 }); 153 });
148 154
149 // FILTERS 155 // FILTERS
150 - uploaderLogoTarjaAssinaturaCertificado.filters.push({ 156 + $scope.uploaderLogoTarjaAssinaturaCertificado.filters.push({
151 name: 'imageFilter', 157 name: 'imageFilter',
152 fn: function(item , options) { 158 fn: function(item , options) {
153 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|'; 159 var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
@@ -156,41 +162,40 @@ citApp.controller('TarjaAssinaturaController', @@ -156,41 +162,40 @@ citApp.controller('TarjaAssinaturaController',
156 }); 162 });
157 163
158 // CALLBACKS 164 // CALLBACKS
159 - uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {  
160 - uploaderLogoTarjaAssinaturaCertificado.clearQueue(); 165 + $scope.uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {
  166 + $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
161 console.info('onWhenAddingFileFailed', item, filter, options); 167 console.info('onWhenAddingFileFailed', item, filter, options);
162 }; 168 };
163 - uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) { 169 + $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {
164 console.info('onAfterAddingFile', fileItem); 170 console.info('onAfterAddingFile', fileItem);
165 }; 171 };
166 - uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) { 172 + $scope.uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {
167 console.info('onAfterAddingAll', addedFileItems); 173 console.info('onAfterAddingAll', addedFileItems);
168 }; 174 };
169 - uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) { 175 + $scope.uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {
170 console.info('onBeforeUploadItem', item); 176 console.info('onBeforeUploadItem', item);
171 }; 177 };
172 - uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) { 178 + $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {
173 console.info('onProgressItem', fileItem, progress); 179 console.info('onProgressItem', fileItem, progress);
174 }; 180 };
175 - uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) { 181 + $scope.uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {
176 console.info('onProgressAll', progress); 182 console.info('onProgressAll', progress);
177 }; 183 };
178 - uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) { 184 + $scope.uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {
179 console.info('onSuccessItem', fileItem, response, status, headers); 185 console.info('onSuccessItem', fileItem, response, status, headers);
180 }; 186 };
181 - uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) { 187 + $scope.uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {
182 console.info('onErrorItem', fileItem, response, status, headers); 188 console.info('onErrorItem', fileItem, response, status, headers);
183 }; 189 };
184 - uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) { 190 + $scope.uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {
185 console.info('onCancelItem', fileItem, response, status, headers); 191 console.info('onCancelItem', fileItem, response, status, headers);
186 }; 192 };
187 - uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) { 193 + $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {
188 console.info('onCompleteItem', fileItem, response, status, headers); 194 console.info('onCompleteItem', fileItem, response, status, headers);
189 }; 195 };
190 - uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {  
191 - uploaderLogoTarjaAssinaturaCertificado.clearQueue();  
192 - $scope.getTarjaAssinatura($scope.tarjaAssinatura); 196 + $scope.uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {
  197 + $scope.uploaderLogoTarjaAssinaturaCertificado.clearQueue();
  198 + $scope.getAllTarjas();
193 console.info('onCompleteAll'); 199 console.info('onCompleteAll');
194 }; 200 };
195 -  
196 }]); 201 }]);
cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
  Diff comments   View file @0287d62
@@ -8,6 +8,10 @@ citApp.factory('TarjaAssinaturaRepository', ['RestangularEcm', 'AbstractReposito @@ -8,6 +8,10 @@ citApp.factory('TarjaAssinaturaRepository', ['RestangularEcm', 'AbstractReposito
8 this.getAllTarjas = function() { 8 this.getAllTarjas = function() {
9 return restangularEcm.one(this.route + "/getAllTarjas" ).get(); 9 return restangularEcm.one(this.route + "/getAllTarjas" ).get();
10 }; 10 };
  11 +
  12 + this.save = function(tarjaAssinatura) {
  13 + return restangularEcm.all(this.route + "/saveTarjaAssinatura").post(tarjaAssinatura).then();
  14 + };
11 } 15 }
12 16
13 AbstractRepository.extend(TarjaAssinaturaRepository); 17 AbstractRepository.extend(TarjaAssinaturaRepository);
cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
  Diff comments   View file @0287d62
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
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="saveOrUpdate(tarjaAssinaturaInternaForm, tarjaAssinaturaCertificadoForm)" ng-show="edit"> 5 + <button class="btn btn-clear" ng-click="saveOrUpdate()" ng-show="edit">
6 <i class="fa fa-save green"></i> 6 <i class="fa fa-save green"></i>
7 <translate>LABEL.SALVAR</translate> 7 <translate>LABEL.SALVAR</translate>
8 </button> 8 </button>
@@ -28,15 +28,12 @@ @@ -28,15 +28,12 @@
28 </div><!-- .row --> 28 </div><!-- .row -->
29 </div><!-- .bar-buttons-action --> 29 </div><!-- .bar-buttons-action -->
30 30
31 -<!-- <h1 class="title"><translate>ECM.LABEL.TARJAS_ASSINATURA</translate></h1> -->  
32 -<!-- </br> -->  
33 <breadcrumb ng-workspace="workspace"></breadcrumb> 31 <breadcrumb ng-workspace="workspace"></breadcrumb>
34 - 32 + <form name="tarjaAssinaturaForm">
35 <tabset class="tabbable margin-top margin-bottom"> 33 <tabset class="tabbable margin-top margin-bottom">
36 - <tab> 34 + <tab active="activateTab()">
37 <tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading> 35 <tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading>
38 -  
39 - <form name="tarjaAssinaturaInternaForm"> 36 +<!-- <form name="tarjaAssinaturaInternaForm"> -->
40 <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p> 37 <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
41 <fieldset> 38 <fieldset>
42 <legend> 39 <legend>
@@ -46,56 +43,54 @@ @@ -46,56 +43,54 @@
46 <div class="row"> 43 <div class="row">
47 <div class="col-md-6"> 44 <div class="col-md-6">
48 <label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text" 45 <label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
49 - ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaInternaForm" ng-obrigatorio="true" 46 + ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
50 ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" /> 47 ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
51 </div> 48 </div>
52 <div class="col-md-4"> 49 <div class="col-md-4">
53 <label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text" 50 <label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
54 - ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaInternaForm" 51 + ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
55 ng-obrigatorio="false" ng-type="text" /> 52 ng-obrigatorio="false" ng-type="text" />
56 </div> 53 </div>
57 </div> 54 </div>
58 <div class="row"> 55 <div class="row">
59 <div class="col-sm-12"> 56 <div class="col-sm-12">
60 - <div class="form-group"> 57 + <div class="form-group" ng-disable="!edit">
61 <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label> 58 <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
62 - <div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna" onclick="$('#uploadLogoTarjaAssinaturaInterna').click();"> 59 + <div ng-if="tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna"
  60 + onclick="this.edit ? $('#uploadLogoTarjaAssinaturaInterna').click() : null">
63 <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone"> 61 <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone">
64 <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span> 62 <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
65 <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span> 63 <span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span>
66 </div> 64 </div>
67 </div> 65 </div>
68 <input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" /> 66 <input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" />
69 - <div ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0 && tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined">  
70 - <div ng-thumb="{ file: uploaderLogoTarjaAssinaturaInterna.queue._file, width: auto, height: auto }"></div>  
71 - </div>  
72 </div><!-- .form-group --> 67 </div><!-- .form-group -->
73 - <div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">  
74 - <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">  
75 - </div> 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;">
76 </div> 73 </div>
77 </div> 74 </div>
78 <div class="row"> 75 <div class="row">
79 <div class="col-md-12"> 76 <div class="col-md-12">
80 <div class="form-group"> 77 <div class="form-group">
81 - <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted}"> 78 + <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">
82 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span> 79 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
83 - <i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted" class='fa fa-warning red' 80 + <i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
84 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" 81 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
85 tooltip-placement='top'></i> 82 tooltip-placement='top'></i>
86 </label> 83 </label>
87 - <div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"  
88 - ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>  
89 - <iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe> 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>
90 </div> 86 </div>
91 </div> 87 </div>
92 </div> 88 </div>
93 - </form> 89 +<!-- </form> -->
94 </tab> 90 </tab>
  91 +
95 <tab> 92 <tab>
96 <tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading> 93 <tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading>
97 -  
98 - <form name="tarjaAssinaturaCertificadoForm">  
99 <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p> 94 <p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
100 <fieldset> 95 <fieldset>
101 <legend> 96 <legend>
@@ -105,12 +100,12 @@ @@ -105,12 +100,12 @@
105 <div class="row"> 100 <div class="row">
106 <div class="col-md-6"> 101 <div class="col-md-6">
107 <label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text" 102 <label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
108 - ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaCertificadoForm" ng-obrigatorio="true" 103 + ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
109 ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" /> 104 ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
110 </div> 105 </div>
111 <div class="col-md-4"> 106 <div class="col-md-4">
112 <label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text" 107 <label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
113 - ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaCertificadoForm" 108 + ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
114 ng-obrigatorio="false" ng-type="text" /> 109 ng-obrigatorio="false" ng-type="text" />
115 </div> 110 </div>
116 </div> 111 </div>
@@ -118,39 +113,38 @@ @@ -118,39 +113,38 @@
118 <div class="col-sm-12"> 113 <div class="col-sm-12">
119 <div class="form-group"> 114 <div class="form-group">
120 <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label> 115 <label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
121 - <div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado" onclick="$('#uploadLogoTarjaAssinaturaCertificado').click();"> 116 + <div ng-if="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado"
  117 + onclick="$('#uploadLogoTarjaAssinaturaCertificado').click()">
122 <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone"> 118 <div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone">
123 <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span> 119 <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
124 <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span> 120 <span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span>
125 </div> 121 </div>
126 </div> 122 </div>
127 <input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" /> 123 <input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" />
128 - <div ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0 && tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined">  
129 - <div ng-thumb="{ file: uploaderLogoTarjaAssinaturaCertificado.queue._file, width: auto, height: auto }"></div>  
130 - </div>  
131 </div><!-- .form-group --> 124 </div><!-- .form-group -->
132 - <div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo"> 125 + </div>
  126 + <div class="row">
  127 + <div class="col-sm-12" ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
133 <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;"> 128 <img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
134 </div> 129 </div>
135 </div> 130 </div>
136 </div> 131 </div>
  132 +
137 <div class="row"> 133 <div class="row">
138 <div class="col-md-12"> 134 <div class="col-md-12">
139 <div class="form-group"> 135 <div class="form-group">
140 - <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted}"> 136 + <label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted}">
141 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span> 137 <translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
142 - <i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted" class='fa fa-warning red' 138 + <i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
143 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}" 139 tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
144 tooltip-placement='top'></i> 140 tooltip-placement='top'></i>
145 </label> 141 </label>
146 - <div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"  
147 - ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>  
148 - <iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe> 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>
149 </div> 144 </div>
150 </div> 145 </div>
151 </div> 146 </div>
152 - </form>  
153 </tab> 147 </tab>
154 </tabset> 148 </tabset>
155 -</div>  
156 -<!-- .page-content --> 149 + </form>
  150 +</div><!-- .page-content -->