From d87ca9d20ca0ef73a01d3551a6e5ae3f16d889a2 Mon Sep 17 00:00:00 2001
From: ciro.junior <ciro.junior@centralit.com.br>
Date: Mon, 18 Apr 2016 16:35:53 -0300
Subject: [PATCH] [Redmine #4466] Inserindo botoes para os campos dinamicos.

---
 cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java                  |   1 +
 cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js |  77 ++++++++++++++++++++++++++++++++++++++++-------------------------------------
 cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html                    | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------
 3 files changed, 129 insertions(+), 87 deletions(-)

diff --git a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
index 8dc0efa..861229c 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
@@ -408,6 +408,7 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.TIPO_ASSINATURA", "Tipo de assinatura", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.CONTEUDO_HTML", "Conteúdo HTML", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.REMOVER_IMAGEM", "Remover imagem", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.CAMPOS_DINAMICOS", "Campos Dinâmicos", dominio, modulo));
 	}
 
 	/**
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
index 6e7da67..42e6b0f 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
@@ -18,12 +18,12 @@ citApp.controller('TarjaAssinaturaController',
 
   $scope.resetForm = function() {
 
-	  if($scope.tarjaAssinatura) {
-		  var originalTipoAssinatura = $scope.tarjaAssinatura.tipoAssinatura;
-		  $scope.tarjaAssinatura = {
-				tipoAssinatura : originalTipoAssinatura
-		  }
-	  }
+    if($scope.tarjaAssinatura) {
+      var originalTipoAssinatura = $scope.tarjaAssinatura.tipoAssinatura;
+      $scope.tarjaAssinatura = {
+        tipoAssinatura : originalTipoAssinatura
+      }
+    }
 
       if ($scope.uploaderLogo){
         $scope.uploaderLogo.clearQueue();
@@ -77,25 +77,25 @@ citApp.controller('TarjaAssinaturaController',
     $scope.edit= false
   }
 
-	$scope.fetchResult = function(){
-		angular.element('#searchTarjaAssinatura').scope().fetchResult();
-	};
-
-	$scope.removeImagem = function (){
-		if($scope.tarjaAssinatura.anexoImagem){
-			TarjaAssinaturaRepository.removeImagem($scope.tarjaAssinatura).then(function (result) {
-				$scope.tarjaAssinatura = result.originalElement;
-				if($scope.uploaderLogo.queue.length > 0){
-					$scope.uploaderLogo.clearQueue();
-			      }
-			})
-		}
-	}
-	$scope.openFile = function () {
-		if($scope.edit){
-			angular.element('#uploadLogoTarjaAssinatura').trigger('click');
-		}
-	}
+  $scope.fetchResult = function(){
+    angular.element('#searchTarjaAssinatura').scope().fetchResult();
+  };
+
+  $scope.removeImagem = function (){
+    if($scope.tarjaAssinatura.anexoImagem){
+      TarjaAssinaturaRepository.removeImagem($scope.tarjaAssinatura).then(function (result) {
+        $scope.tarjaAssinatura = result.originalElement;
+        if($scope.uploaderLogo.queue.length > 0){
+          $scope.uploaderLogo.clearQueue();
+            }
+      })
+    }
+  }
+  $scope.openFile = function () {
+    if($scope.edit){
+      angular.element('#uploadLogoTarjaAssinatura').trigger('click');
+    }
+  }
 
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
   $scope.uploaderLogo = new FileUploader({
@@ -152,19 +152,22 @@ citApp.controller('TarjaAssinaturaController',
   };
 
   $scope.getTarjaAssinatura = function(id, edit) {
-		$scope.resetForm();
-	    $scope.setLoadingGet(true);
-	    TarjaAssinaturaRepository.get(id).then(function(result) {
-	      $scope.tarjaAssinatura = result.originalElement;
-	      vincularIdTarjaUploader();
-	      $scope.edit = edit;
-	      $scope.setLoading(false);
-	    });
-	  };
+      $scope.setLoadingGet(true);
+      TarjaAssinaturaRepository.get(id).then(function(result) {
+        $scope.tarjaAssinatura = result.originalElement;
+        vincularIdTarjaUploader();
+        $scope.edit = edit;
+        $scope.setLoading(false);
+      });
+    };
 
   var vincularIdTarjaUploader = function () {
-  	if($scope.tarjaAssinatura.id){
-  		$scope.uploaderLogo.url += $scope.tarjaAssinatura.id;
-  	}
+    if($scope.tarjaAssinatura.id){
+      $scope.uploaderLogo.url += $scope.tarjaAssinatura.id;
+    }
   };
+
+  $scope.insertTextEditor = function(button){
+    CKEDITOR.instances.editorConteudo.insertText(button);
+  }
 }]);
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
index e701919..2f72f8f 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
@@ -38,62 +38,100 @@
 			<legend>
 				<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA</translate>
 			</legend>
-		</fieldset>
-		<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
-		<div class="row">
-			<div class="col-md-6">
-				<label-input ng-id="tarjaAssinatura.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-					ng-model="tarjaAssinatura.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
-					ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
-			</div>
-			<div class="col-md-4">
-				<label-input ng-id="tarjaAssinatura.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
-							ng-disabled="true" ng-model="tarjaAssinatura.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
-							ng-obrigatorio="false" ng-type="text" />
+
+			<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
+			<div class="row">
+				<div class="col-md-6">
+					<label-input ng-id="tarjaAssinatura.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
+						ng-model="tarjaAssinatura.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
+						ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
+				</div>
+				<div class="col-md-4">
+					<label-input ng-id="tarjaAssinatura.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
+								ng-disabled="true" ng-model="tarjaAssinatura.tipoAssinatura.descricao" form="tarjaAssinaturaForm"
+								ng-obrigatorio="false" ng-type="text" />
+				</div>
 			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12">
-				<div class="form-group" ng-disable="!edit">
-					<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-					<div ng-if="tarjaAssinatura.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogo" ng-click="openFile();">
-						<div nv-file-over="" uploader="uploaderLogo" over-class="another-file-over-class" class="well my-drop-zone">
-							<span ng-show="uploaderLogo.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
-							<span ng-show="uploaderLogo.queue.length > 0">{{uploaderLogo.queue[0].file.name}}</span>
+			<div class="row">
+				<div class="col-sm-12">
+					<div class="form-group" ng-disable="!edit">
+						<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
+						<div ng-if="tarjaAssinatura.anexoImagem.anexo == undefined" nv-file-drop="" uploader="uploaderLogo" ng-click="openFile();">
+							<div nv-file-over="" uploader="uploaderLogo" over-class="another-file-over-class" class="well my-drop-zone">
+								<span ng-show="uploaderLogo.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
+								<span ng-show="uploaderLogo.queue.length > 0">{{uploaderLogo.queue[0].file.name}}</span>
+							</div>
 						</div>
-					</div>
-					<input id="uploadLogoTarjaAssinatura" type="file" nv-file-select="" uploader="uploaderLogo" ng-show="false" />
-				</div><!-- .form-group -->
+						<input id="uploadLogoTarjaAssinatura" type="file" nv-file-select="" uploader="uploaderLogo" ng-show="false" />
+					</div><!-- .form-group -->
+				</div>
 			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12" ng-show="tarjaAssinatura.anexoImagem.anexo">
-				<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
+			<div class="row" >
+				<div class="col-sm-12" ng-show="tarjaAssinatura.anexoImagem.anexo">
+					<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
+				</div>
 			</div>
-		</div>
-		</br>
-		<div class="row">
-			<div class="col-sm-2" ng-show="tarjaAssinatura.anexoImagem.anexo && edit">
-				<button class="btn btn-warning" ng-click="removeImagem()">
-					<translate>ECM.LABEL.REMOVER_IMAGEM</translate>
-				</button>
+			<div class="row" style="margin-top: 10px;">
+				<div class="col-sm-2" ng-show="tarjaAssinatura.anexoImagem.anexo && edit">
+					<button class="btn btn-warning" ng-click="removeImagem()">
+						<translate>ECM.LABEL.REMOVER_IMAGEM</translate>
+					</button>
+				</div>
 			</div>
-		</div>
-		</br>
-		<div class="row">
-			<div class="col-md-12">
-				<div class="form-group">
-					<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted}">
-						<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-						<i ng-show="!tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
-							tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
-							tooltip-placement='top'></i>
-					</label>
-					<div id="tarjaAssinatura.conteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.conteudo" ></div>
-					<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.conteudo}}"
-							allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
+			<div class="row" style="margin-top: 10px;" ng-show="edit">
+				<div class="col-md-12">
+					<label class="control-label"><translate>ECM.LABEL.CAMPOS_DINAMICOS</translate></label>
 				</div>
 			</div>
-		</div>
+			<div class="row" style="margin-top: 10px;" ng-show="edit">
+				<div class="col-md-2">
+					<div ng-init="btnLogo='@logo@';">
+						<button ng-attr-id="btnLogo" class="btn btn-default btn-block" ng-click="insertTextEditor(btnLogo)">@logo@</button>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<div ng-init="btnNomeAssinante='@nome_assinante@';">
+						<button ng-attr-id="btnNomeAssinante" class="btn btn-default btn-block" ng-click="insertTextEditor(btnNomeAssinante)">@nome_assinante@</button>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<div ng-init="btnFuncaoAssinante='@funcao_assinante@';">
+						<button ng-attr-id="btnFuncaoAssinante" class="btn btn-default btn-block" ng-click="insertTextEditor(btnFuncaoAssinante)">@funcao_assinante@</button>
+					</div>
+				</div>
+			</div>
+			<div class="row" style="margin-top: 10px;" ng-show="edit">
+				<div class="col-md-2">
+					<div ng-init="btnDataAssinatura='@data_assinatura@';">
+						<button ng-attr-id="btnDataAssinatura" class="btn btn-default btn-block" ng-click="insertTextEditor(btnDataAssinatura)">@data_assinatura@</button>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<div ng-init="btnHoraAssinatura='@hora_assinatura@';">
+						<button ng-attr-id="btnHoraAssinatura" class="btn btn-default btn-block" ng-click="insertTextEditor(btnHoraAssinatura)">@hora_assinatura@</button>
+					</div>
+				</div>
+				<div class="col-md-2">
+					<div ng-init="btnCodigoAssinatura='@codigo_assinatura@';">
+						<button ng-attr-id="btnCodigoAssinatura" class="btn btn-default btn-block" ng-click="insertTextEditor(btnCodigoAssinatura)">@codigo_assinatura@</button>
+					</div>
+				</div>
+			</div>
+			<div class="row" style="margin-top: 10px;">
+				<div class="col-md-12">
+					<div class="form-group">
+						<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted}">
+							<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
+							<i ng-show="!tarjaAssinatura.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
+								tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
+								tooltip-placement='top'></i>
+						</label>
+						<div id="editorConteudo" ckeditor="options" ng-if='edit' ready="onReady()" ng-model="tarjaAssinatura.conteudo" ></div>
+						<iframe id="visualizacaoConteudoTarjaAssinatura" srcdoc="{{tarjaAssinatura.conteudo}}"
+								allowfullscreen class="iframe-report" ng-show="!edit" style="min-height: 100px !important;"></iframe>
+					</div>
+				</div>
+			</div>
+		</fieldset>
 	</form>
 </div><!-- .page-content -->
--
libgit2 0.21.2