Download as
Browse Code »

Commit b9072cb69d4dc0b8a8e11d88696d54d27a3352a1

Authored by Ronan Tavares Camargo
1 parent 31fcf878
Exists in master

Redmine #3716 - Bloquear botão de editar selecionados para quando existir apenas um item selecionado

Showing 2 changed files with 14 additions and 4 deletions   Show diff stats
citgrp-patrimonio-web/src/main/webapp/assets/js/angular/custom/controller/EntradaController.js
  Diff comments   View file @b9072cb
... ... @@ -615,7 +615,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
615 615  
616 616 $scope.openModalEditarSelecionados = function() {
617 617  
618   - countChecked();
  618 + $scope.countChecked();
619 619  
620 620 if($scope.qtdeChecked > 1) {
621 621  
... ... @@ -659,7 +659,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
659 659 };
660 660  
661 661 // Conta os bens checked para edicao em massa
662   - function countChecked() {
  662 + $scope.countChecked = function() {
663 663 $scope.qtdeChecked = 0;
664 664 if ($scope.entradaItemSelect.bensPatrimoniaisMaterial && $scope.entradaItemSelect.bensPatrimoniaisMaterial.length > 0) {
665 665 $scope.entradaItemSelect.bensPatrimoniaisMaterial.forEach(function(item){
... ... @@ -890,6 +890,7 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
890 890 }
891 891 $scope.totalPages = result.originalElement.totalPages;
892 892 $scope.totalItens = result.originalElement.totalItens;
  893 + $scope.countChecked();
893 894 $scope.setLoading(false);
894 895 });
895 896 }
... ... @@ -990,11 +991,20 @@ citApp.controller('EntradaController', ['$scope', '$timeout', 'FileUploader', 'E
990 991  
991 992 $scope.totalPages = result.originalElement.totalPages;
992 993 $scope.totalItens = result.originalElement.totalItens;
  994 +
  995 + if ($scope.checkAllItem) {
  996 + $scope.qtdeChecked = result.originalElement.totalItens;
  997 + }else{
  998 + $scope.qtdeChecked = 0;
  999 + }
  1000 +
993 1001 $scope.setLoading(false);
994 1002 });
995 1003 }
996 1004 });
997 1005 }
  1006 +
  1007 + $scope.countChecked();
998 1008 };
999 1009  
1000 1010 //Salva apenas os dados básicos da Entrada (1º passo)
... ...
citgrp-patrimonio-web/src/main/webapp/html/entrada/entradaEdit.html
  Diff comments   View file @b9072cb
... ... @@ -307,7 +307,7 @@
307 307  
308 308 <div class="panel-heading clearfix">
309 309 <div class="row">
310   - <div class="col-sm-2" ng-show="edit">
  310 + <div class="col-sm-2" ng-show="(edit && qtdeChecked > 1)">
311 311 <button title="{{$translate.instant('PATRIMONIO.LABEL.EDITAR_SELECIONADOS')}}" alt="{{$translate.instant('PATRIMONIO.LABEL.EDITAR_SELECIONADOS')}}" ng-disabled="!(editBens && entradaItemSelect.bensPatrimoniaisMaterial.length > 0)" class="btn btn-clear" type="button" ng-click="openModalEditarSelecionados()">
312 312 <i class="fa fa-pencil blue"></i>
313 313 <translate>PATRIMONIO.LABEL.EDITAR_SELECIONADOS</translate>
... ... @@ -386,7 +386,7 @@
386 386 </a>
387 387 </td>
388 388 <td class="text-center" style="width: 5%;" ng-show="editBens">
389   - <input type="checkbox" ng-model="bem.checked"/>
  389 + <input type="checkbox" ng-model="bem.checked" ng-click="countChecked()"/>
390 390 </td>
391 391 <td class="text-center" style="width: 5%;">
392 392 <span ng-show="!editBens">{{ bem.numeroPatrimonial? bem.numeroPatrimonial : $translate.instant('LABEL.NAO_DEFINIDO')}}</span>
... ...