Download as
Browse Code »

Commit dc5382a2349b79c9ae95d43bda5352ec1e465750

Authored by THIAGO VIEIRA DI COIMBRA ROCHA
1 parent e97a6462
Exists in master

redmine #4592 Adicionada validacao, se e entrada esta concluida ou nao, quando s… 

…e inclui ou remove materias da entrada. Adicionada validacao da conclusado da entrada somente quando a entrdada estiver contabilizada.
Showing 1 changed file with 4 additions and 2 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
  Diff comments   View file @dc5382a
... ... @@ -344,7 +344,9 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
344 344 }
345 345  
346 346 BemPatrimonialTemporarioRepository.geraBensTemp(bemReferencia).then(function(result) {
347   -
  347 +
  348 + verificaAlteracaoAtributosEntrada();
  349 + $scope.saveOrUpdateEntrada();
348 350 formEntradaItem.$submitted = false;
349 351 $scope.setLoading(false);
350 352 });
... ... @@ -1132,7 +1134,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
1132 1134  
1133 1135 function verificaAlteracaoAtributosEntrada() {
1134 1136 var deferred = $q.defer();
1135   - if($scope.entrada.id){
  1137 + if($scope.entrada.id && ($scope.entrada.dataContabil !== undefined)){
1136 1138 EntradaRepository.verificaExistenciaBemPatrimonialTemporarioEntrada($scope.entrada.id).then(function(result){
1137 1139 if(!equal($scope.entrada, $scope.entradaOriginal) || result) {
1138 1140 $scope.entrada.isEntradaConcluida = false;
... ...