From b5b5f0cbf23528926f809655ae665faa8bc5b962 Mon Sep 17 00:00:00 2001 From: erick.sato Date: Fri, 6 May 2016 14:53:49 -0300 Subject: [PATCH] [Redmine Atendimento #4803]Paginação --- cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js | 40 ++++++++++++++++++++++++++++++++++++++-- cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 6 deletions(-) diff --git a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js index baf23cb..244ca2f 100644 --- a/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js +++ b/cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js @@ -244,6 +244,10 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic $scope.diasCompletos = []; $scope.URPossuiCatalogo = false; + + $scope.listaRequisicaoConsumoItens = []; + + $scope.listaAtendimento = []; $scope.requisicaoConsumo = { unidadeRequisitante : null, @@ -283,7 +287,8 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic } $scope.edit = edit; - + $scope.changeListRequisicaoConsumoItem(); + $scope.changeListAtendimentoRequisicao(); $scope.setLoadingGet(false); }); @@ -347,7 +352,7 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic $scope.requisicaoConsumo.requisicaoConsumoItens.push({materialConsumo : item, $TIPO_DECIMAL : item.unidadeArmazenamento.tipoNumerico.codigo === 1 ? 0 : 2}); - + $scope.changeListRequisicaoConsumoItem(); $timeout(function(){ $scope.requisicaoConsumoItem = null; @@ -538,5 +543,36 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic $scope.apresentarInfoAtendimentoItem = function(atendimento){ atendimento.$verInfo = !atendimento.$verInfo; }; + + $scope.filterCriteria = { + start : 1, + limit : 5, + }; + + $scope.filterCriteria2 = { + start : 1, + limit : 5, + }; + + $scope.changeListRequisicaoConsumoItem = function (){ + + $scope.listaRequisicaoConsumoItens = []; + var pagina = (($scope.filterCriteria.start - 1) * $scope.filterCriteria.limit); + $scope.listaRequisicaoConsumoItens = $scope.requisicaoConsumo.requisicaoConsumoItens.slice(pagina,(pagina + $scope.filterCriteria.limit)); + $scope.totalPages = $scope.requisicaoConsumo.requisicaoConsumoItens.length/$scope.filterCriteria.limit; + $scope.totalItens = $scope.requisicaoConsumo.requisicaoConsumoItens.length; + + }; + + $scope.changeListAtendimentoRequisicao = function (){ + $scope.listaAtendimento = []; + if($scope.atendimentos && $scope.atendimentos.length > 0){ + var pagina = (($scope.filterCriteria2.start - 1) * $scope.filterCriteria2.limit); + $scope.listaAtendimento = $scope.atendimentos.slice(pagina,(pagina + $scope.filterCriteria2.limit)); + $scope.totalPages2 = $scope.atendimentos.length/$scope.filterCriteria2.limit; + $scope.totalItens2 = $scope.atendimentos.length; + } + + }; }]); \ No newline at end of file diff --git a/cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html b/cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html index c4b3b84..e2a1f9b 100644 --- a/cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html +++ b/cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html @@ -182,7 +182,7 @@ - + LABEL.TABELA_VAZIA + + + +
+
+ LABEL.MOSTRANDO + {{totalItens > zero ? filterCriteria.start : zero}} + LABEL.ATE + {{filterCriteria.limit > totalItens ? totalItens : filterCriteria.limit}} + LABEL.DE + ({{totalItens}}) + PATRIMONIO.LABEL.BENS_PATRIMONIAIS. +
+
+ + + +
+
+ + + @@ -231,18 +254,18 @@ - ALMOXARIFADO.LABEL.NUMERO_ATENDIMENTO + ALMOXARIFADO.LABEL.DATA_ATENDIMENTO - + - {{atendimento.numeroAtendimento}} + {{atendimento.dataAtendimento}} @@ -266,6 +289,29 @@ + + + +
+
+ LABEL.MOSTRANDO + {{totalItens2 > zero ? filterCriteria2.start : zero}} + LABEL.ATE + {{filterCriteria2.limit > totalItens2 ? totalItens2 : filterCriteria2.limit}} + LABEL.DE + ({{totalItens2}}) + PATRIMONIO.LABEL.BENS_PATRIMONIAIS. +
+
+ + + +
+
+ + + -- libgit2 0.21.2