From 733cd7b6cc03416335f13686e456f407b2c2c545 Mon Sep 17 00:00:00 2001
From: geovane.filho <geovane.filho@centralit.com.br>
Date: Thu, 5 May 2016 10:56:35 -0300
Subject: [PATCH] Redmine #4783 Terminando reestruturação básica das wizards de entrada de materiais.

---
 cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js | 12 +++++-------
 cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoEdit.html                |  2 +-
 cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoPg3.html                 |  8 ++------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
index b1c470c..e028fae 100644
--- a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
+++ b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/EntradaAlmoxarifadoController.js
@@ -856,13 +856,11 @@ citApp.controller('EntradaAlmoxarifadoController', ['$scope', '$filter', 'FileUp
   
   //Funcao especifica que retorna se o formulario de documentos esta valido
   function validStepDocumentos() {
-      $scope.stepValid = true;
-
-      if ($scope.entradaAlmoxarifadoForm.documentosForm.$invalid) {
-          $scope.stepValid = false;
-      }
-
-      return $scope.stepValid;
+	  $scope.stepValid = true;
+	  if ($scope.entradaAlmoxarifadoForm.documentosForm.$invalid || !$scope.entradaAlmoxarifado.documentos.length > 0) {
+		  $scope.stepValid = false;
+	  }
+	  return $scope.stepValid;
   };
 
 }]);
diff --git a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoEdit.html b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoEdit.html
index 1b48a0a..cd6a966 100644
--- a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoEdit.html
+++ b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoEdit.html
@@ -64,7 +64,7 @@
 											<a href="#void" class="title" style="text-decoration: none;"><translate>LABEL.MATERIAIS</translate></a>
 										</li>
 										
-										<li ng-class="{'active': isCurrentStep(2), 'complete' : ((isCurrentStep(2) || isCurrentStep(3)) && !entradaAlmoxarifadoForm.documentosForm.$invalid), 'invalid' : ((entradaAlmoxarifadoForm.documentosForm.$submitted || step > 1) && entradaAlmoxarifadoForm.documentosForm.$invalid) && (isCurrentStep(2) || isCurrentStep(3))}"
+										<li ng-class="{'active': isCurrentStep(2), 'complete' : ((isCurrentStep(2) || isCurrentStep(3)) && !entradaAlmoxarifadoForm.documentosForm.$invalid), 'invalid' : ((entradaAlmoxarifadoForm.documentosForm.$submitted || step > 1) && entradaAlmoxarifadoForm.documentosForm.$invalid) && (isCurrentStep(2) || isCurrentStep(3)) && entradaAlmoxarifado.documentos.length < 1}"
 											ng-click="setCurrentStep(2)" title="{{$translate.instant('ALMOXARIFADO.LABEL.DOCUMENTOS')}}" alt="{{$translate.instant('ALMOXARIFADO.LABEL.DOCUMENTOS')}}">
 											<span class="step">3</span>
 											<a href="#void" class="title" style="text-decoration: none;"><translate>ALMOXARIFADO.LABEL.DOCUMENTOS</translate></a>
diff --git a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoPg3.html b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoPg3.html
index a9555e8..164ce14 100644
--- a/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoPg3.html
+++ b/cit-almoxarifado-web/src/main/webapp/html/entradaAlmoxarifado/entradaAlmoxarifadoPg3.html
@@ -1,12 +1,8 @@
 <ng-form name="documentosForm" novalidate autocomplete="off">
 	<div class="page-content">
 		<fieldset>
-			<legend>
-				<translate>ALMOXARIFADO.LABEL.DOCUMENTOS</translate>
-			</legend>
-			
-			
-			
+			<componente-associar-documentos ng-documentos="entradaAlmoxarifado.documentos" ng-edit="edit" ng-uploader="uploader" ng-workspace="$parent.workspace" form="documentosForm"
+					ng-obrigatorio="true"></componente-associar-documentos>
 		</fieldset>
 	</div> <!-- /.page-content -->
 </ng-form>
\ No newline at end of file
--
libgit2 0.21.2