From bce10dddb54e4a328f5ed714bddf31b89200a3a5 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Tue, 12 Apr 2016 14:06:23 -0300
Subject: [PATCH] Redmine #4426

---
 cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js       | 71 ++++++++++++++++++++++++++++++++++++++++++++---------------------------
 cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html |  7 ++++++-
 2 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js b/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js
index fe39275..e8a2c09 100644
--- a/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js
+++ b/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/AssociarDocumentoDirective.js
@@ -68,16 +68,23 @@ citApp.directive("componenteAssociarDocumentos", ["$translate",
 					scope: this
 				});
 			};
-
-			$scope.inicializarModalDocumentos = function(){
-				$scope.editDocumento = true;
+			
+			function resetModalDocumentos(){
 				$scope.documento = {
 					anexos : [],
 					$uuid : getUuid()
 				};
+				
 				if($scope.uploader.queue && $scope.uploader.queue.length > 0){
 					$scope.uploader.queue.splice($scope.uploader.queue[0], 1);
 				}
+			}
+
+			$scope.inicializarModalDocumentos = function(){
+				$scope.editDocumento = true;
+				
+				resetModalDocumentos();
+				
 				$scope.openModal('modal-documentos.html', 'md');
 			};
 
@@ -86,34 +93,44 @@ citApp.directive("componenteAssociarDocumentos", ["$translate",
 		         console.info('onCompleteAll');
 		     };
 
-		     $scope.salvarAdicionarDocumento = function(formDialogDocumentos){
+		     $scope.salvarAdicionarDocumento = function(formDialogDocumentos, continuarEditando){
 		    	var hoje = new Date();
 		    	formDialogDocumentos.$submitted = true;
-		 		if(formDialogDocumentos.$valid && !(converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje)){
-		 			$scope.documento.uploadsDocumento = $scope.uploader.getNotUploadedItems();
-
-		 			if ($scope.documentos == undefined || $scope.documentos == null) {
-		 				$scope.documentos = [];
-		 			}
-		 			$scope.dominiosTipoDocumento.forEach(function (tipoDocumento, key) {
-		 				if($scope.documento.dominioTipoDocumento.id === tipoDocumento.id){
-		 					$scope.documento.dominioTipoDocumento = tipoDocumento.originalElement;
-		 				}
-		 			});
-		 			$scope.documentos.forEach(function (documento, key) {
-						if(documento.$uuid && $scope.documento.$uuid && documento.$uuid === $scope.documento.$uuid ||  documento.id && $scope.documento.id && documento.id === $scope.documento.id ){
-				 			$scope.documentos.splice(key, 1);
-						}
-					});
-		 			$scope.documentos.push($scope.documento);
-		 			$scope.$modalInstance.dismiss('cancel');
-		 		} else if(formDialogDocumentos.$valid && (converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje)){
-
-		 			$scope.$parent.showAlert('error', $translate.instant('VALIDACAO.DATA_EMISSAO_DATA_ATUAL'));
-		 		}else if(formDialogDocumentos.$invalid){
-
+		    	
+		    	if(formDialogDocumentos.$invalid){
 		 			$scope.$parent.showAlert('error', $translate.instant('VALIDACAO.ALERTA_OBRIGATORIOS'));
+		 			return;
 		 		}
+		    	
+		    	if(converterStringEmDate($scope.documento.dataEmissao).getTime() > hoje){
+		 			$scope.$parent.showAlert('error', $translate.instant('VALIDACAO.DATA_EMISSAO_DATA_ATUAL'));
+		 			return;
+		 		}
+		    	
+	 			$scope.documento.uploadsDocumento = $scope.uploader.getNotUploadedItems();
+
+	 			if ($scope.documentos == undefined || $scope.documentos == null) {
+	 				$scope.documentos = [];
+	 			}
+	 			$scope.dominiosTipoDocumento.forEach(function (tipoDocumento, key) {
+	 				if($scope.documento.dominioTipoDocumento.id === tipoDocumento.id){
+	 					$scope.documento.dominioTipoDocumento = tipoDocumento.originalElement;
+	 				}
+	 			});
+	 			$scope.documentos.forEach(function (documento, key) {
+					if(documento.$uuid && $scope.documento.$uuid && documento.$uuid === $scope.documento.$uuid ||  documento.id && $scope.documento.id && documento.id === $scope.documento.id ){
+			 			$scope.documentos.splice(key, 1);
+					}
+				});
+	 			$scope.documentos.push($scope.documento);
+	 			
+	 			if(continuarEditando){
+	 				formDialogDocumentos.$submitted = false;
+	 				formDialogDocumentos.$setPristine();
+	 				resetModalDocumentos();
+	 			}else{
+	 				$scope.$modalInstance.dismiss('cancel');
+	 			}
 		 	};
 		 	
 		 	$scope.removerDocumento = function(){
diff --git a/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html b/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html
index b38ea70..85d949f 100644
--- a/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html
+++ b/cit-tabelas-corp-web/src/main/webapp/assets/js/angular/custom/directive/html/dialog_associar_documetos.html
@@ -1,9 +1,14 @@
 <form name="formDialogDocumentos" novalidade>
 	<div class="modal-header">
-		<button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos)">
+		<button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos, false)">
 			<i class="fa fa-save green"></i>
 			<translate>LABEL.SALVAR</translate>
 		</button>
+		
+		<button class="btn btn-clear" type="button" ng-show="editDocumento" ng-click="salvarAdicionarDocumento(formDialogDocumentos, true)">
+			<i class="fa fa-save green"></i>
+			<translate>LABEL.ADICIONAR_CONTINUAR</translate>
+		</button>
 	
 		<button ng-click="$dismiss('cancel');" type="button" class="btn btn-clear">
 			<i class="fa fa-times red"></i>
--
libgit2 0.21.2