From c40005e39f26bce92eff2ec55cbfb276c44f0338 Mon Sep 17 00:00:00 2001
From: Ronan Tavares Camargo <ronan.camargo@centralit.com.br>
Date: Tue, 10 May 2016 09:29:33 -0300
Subject: [PATCH] Redmine #4832

---
 citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java   |  2 ++
 citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js | 28 ++++++++++++----------------
 citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html                    | 32 ++++++++++++++++++++++++--------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java b/citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
index 4ebdb4c..0ba9afb 100644
--- a/citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
+++ b/citgrp-patrimonio-web/src/main/java/br/com/centralit/listener/StartupListenerPatrimonio.java
@@ -745,6 +745,8 @@ public class StartupListenerPatrimonio extends UtilStartup implements Applicatio
 		internacionalizacaoList.add(new Internacionalizacao("VALIDACAO.EXCLUSAO_TRANSFERENCIA_IMPOSSIVEL" , "Não é possível excluir a transferência, pois houve movimentação após a transferência!", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.ACAO_ALTERAR_STATUS", "Esta ação irá realizar uma alteração de status do bem patrimonial", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.SELECIONE_ALTERAR_STATUS", "Selecione um status para realizar a alteração.", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_VIDA_UTIL_CONTA_CONTABIL", "Carregar vida útil configurada na conta contábil do material", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("PATRIMONIO.MSG.CARREGAR_TAXA_RESIDUAL_CONTA_CONTABIL", "Carregar taxa residual configurada na conta contábil do material", dominio, modulo));
 	}
 
 }
diff --git a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
index 4915563..12629c3 100644
--- a/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
+++ b/citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
@@ -1211,6 +1211,18 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
                 $scope.showAlert('error', $translate.instant('VALIDACAO.ALERTA_OBRIGATORIOS'));
             }
         };
+        
+        $scope.loadTaxaResidual = function(){
+        	ContaContabilRepository.findContaContabilPorMaterial($scope.entradaItem.material.id).then(function(result) {
+        		$scope.bemPatrimonial.percentualNaoDepreciavel = result.percentualNaoDepreciavel;
+        	});
+        }
+        
+        $scope.loadVidaUtil = function(){
+        	ContaContabilRepository.findContaContabilPorMaterial($scope.entradaItem.material.id).then(function(result) {
+        		$scope.bemPatrimonial.vidaUtilOriginal = result.vidaUtil;
+        	});
+        }
 
         $scope.salvaBensTemp = function(entradaItemId) {
             if ($scope.entradaItemSelect.bensPatrimoniaisMaterial && $scope.entradaItemSelect.bensPatrimoniaisMaterial.length > 0) {
@@ -1732,22 +1744,6 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
         });
 
         //Watch para calcular valor unitario
-		$scope.$watch('entradaItem.material', function() {
-		    $timeout(function() {
-		        if ($scope.step == 1 && $scope.entrada.dominioTipoRecebimento.codigo == 3 && ($scope.entradaItem && ($scope.entradaItem.material &&
-		        		$scope.entradaItem.material.id))) {
-		        	ContaContabilRepository.findContaContabilPorMaterial($scope.entradaItem.material.id).then(function(result) {
-		        		$scope.bemPatrimonial.percentualNaoDepreciavel = result.percentualNaoDepreciavel;
-		        	});
-		        } else {
-		        	if ($scope.bemPatrimonial) {
-		        		$scope.bemPatrimonial.percentualNaoDepreciavel = null;
-		        	}
-		        }
-		    });
-		});
-
-        //Watch para calcular valor unitario
         $scope.$watch('entradaItemSelect.entradaItem', function() {
 
         	if($scope.step == 2) {
diff --git a/citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html b/citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html
index 4e916af..adba7de 100644
--- a/citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html
+++ b/citgrp-patrimonio-web/src/main/webapp/html/entrada/dialog_entrada_item.html
@@ -2,8 +2,7 @@
 	<div class="modal-header">
 	    <button class="btn btn-clear" type="button" ng-hide="!editaInfoEntrada" ng-click="addEntradaItem(formEntradaItem, numeroPatrimonialInicial)">
 	        <i class="fa fa-save green"></i>
-	       <translate ng-show="!entradaItem.id">LABEL.SALVAR</translate>
-	       <translate ng-show="entradaItem.id">LABEL.SALVAR_ALTERACAO_ITEM</translate>
+	       <translate>LABEL.SALVAR</translate>
 	    </button>
 
 	    <button title="{{$translate.instant('LABEL.CANCELAR')}}" alt="{{$translate.instant('LABEL.CANCELAR')}}" ng-click="$dismiss('cancel');" class="btn btn-clear" ng-if="editaInfoEntrada" type="button">
@@ -92,14 +91,31 @@
 							</div>
 							
 							<div class="col-sm-2" ng-if="entrada.dominioTipoRecebimento.codigo == 3">
-								<label-input-number ng-max-number="10000" ng-min-number="0" ng-type="text" 
-									ng-id="bemPatrimonial.vidaUtil" ng-obrigatorio="entrada.dominioTipoRecebimento.codigo == 3"
-									ng-label="LABEL.VIDA_UTIL_EM_MESES" ng-disabled="!edit" ng-model="bemPatrimonial.vidaUtilOriginal" ng-custom-maxlength="5"/>
+								<label for="bemPatrimonial.vidaUtil" 
+									ng-class="{'has-error': formEntradaItem['bemPatrimonial.vidaUtil'].$error.required && (!formEntradaItem['bemPatrimonial.vidaUtil'].$pristine || formEntradaItem.$submitted)}">
+									<translate>LABEL.VIDA_UTIL_EM_MESES</translate>
+									<span class='red'>*</span>
+									<i ng-if="formEntradaItem['bemPatrimonial.vidaUtil'].$error.required && (!formEntradaItem['bemPatrimonial.vidaUtil'].$pristine || formEntradaItem.$submitted)" class='fa fa-warning red' tooltip="{{$translate.instant('LABEL.VIDA_UTIL_EM_MESES')}} {{$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"></i>
+									<i class="fa fa-download black" style="cursor: pointer;" ng-click="loadVidaUtil()"
+										tooltip="{{$translate.instant('PATRIMONIO.MSG.CARREGAR_VIDA_UTIL_CONTA_CONTABIL')}}" ng-if="entradaItem.material.id"></i>
+								</label>
+								<label-input-number ng-max-number="10000" ng-min-number="0" ng-type="text"
+									ng-id="bemPatrimonial.vidaUtil" ng-obrigatorio="true" form="formEntradaItem"
+									ng-disabled="!edit" ng-model="bemPatrimonial.vidaUtilOriginal" ng-custom-maxlength="5"/>
 								</label-input-number>
-							</div>		
+							</div>
+							
 							<div class="col-sm-2" ng-if="entrada.dominioTipoRecebimento.codigo == 3">
-								<label-input-percent ng-type="text" only-number ng-max-number="100" ng-min-number="0" ng-precision-number="2" ng-id="bemPatrimonial.percentualNaoDepreciavel" ng-obrigatorio="entrada.dominioTipoRecebimento.codigo == 3"
-									ng-label="PATRIMONIO.LABEL.TAXA_RESIDUAL" ng-disabled="!edit" ng-model="bemPatrimonial.percentualNaoDepreciavel"/>
+								<label for="bemPatrimonial.percentualNaoDepreciavel" 
+									ng-class="{'has-error': formEntradaItem['bemPatrimonial.percentualNaoDepreciavel'].$error.required && (!formEntradaItem['bemPatrimonial.percentualNaoDepreciavel'].$pristine || formEntradaItem.$submitted)}">
+									<translate>PATRIMONIO.LABEL.TAXA_RESIDUAL</translate>
+									<span class='red'>*</span>
+									<i ng-if="formEntradaItem['bemPatrimonial.percentualNaoDepreciavel'].$error.required && (!formEntradaItem['bemPatrimonial.percentualNaoDepreciavel'].$pristine || formEntradaItem.$submitted)" class='fa fa-warning red' tooltip="{{$translate.instant('PATRIMONIO.LABEL.TAXA_RESIDUAL')}} {{$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"></i>
+									<i class="fa fa-download black" style="cursor: pointer;" ng-click="loadTaxaResidual()"
+										tooltip="{{$translate.instant('PATRIMONIO.MSG.CARREGAR_TAXA_RESIDUAL_CONTA_CONTABIL')}}" ng-if="entradaItem.material.id"></i>
+								</label>
+								<label-input-percent ng-type="text" only-number ng-max-number="100" ng-min-number="0" ng-precision-number="2" ng-id="bemPatrimonial.percentualNaoDepreciavel" ng-obrigatorio="true"
+									ng-disabled="!edit" ng-model="bemPatrimonial.percentualNaoDepreciavel" form="formEntradaItem"/>
 							</div>							
 						</div> <!-- .row -->						
 					</fieldset>
--
libgit2 0.21.2