Download as
Browse Code »

Commit b5b5f0cbf23528926f809655ae665faa8bc5b962

Authored by erick.sato
1 parent d1059282
Exists in master

[Redmine Atendimento #4803]Paginação

Showing 2 changed files with 88 additions and 6 deletions   Show diff stats
cit-almoxarifado-web/src/main/webapp/assets/js/angular/custom/controller/RequisicaoConsumoController.js
  Diff comments   View file @b5b5f0c
... ... @@ -244,6 +244,10 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic
244 244 $scope.diasCompletos = [];
245 245  
246 246 $scope.URPossuiCatalogo = false;
  247 +
  248 + $scope.listaRequisicaoConsumoItens = [];
  249 +
  250 + $scope.listaAtendimento = [];
247 251  
248 252 $scope.requisicaoConsumo = {
249 253 unidadeRequisitante : null,
... ... @@ -283,7 +287,8 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic
283 287 }
284 288  
285 289 $scope.edit = edit;
286   -
  290 + $scope.changeListRequisicaoConsumoItem();
  291 + $scope.changeListAtendimentoRequisicao();
287 292 $scope.setLoadingGet(false);
288 293  
289 294 });
... ... @@ -347,7 +352,7 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic
347 352  
348 353 $scope.requisicaoConsumo.requisicaoConsumoItens.push({materialConsumo : item, $TIPO_DECIMAL : item.unidadeArmazenamento.tipoNumerico.codigo === 1 ? 0 : 2});
349 354  
350   -
  355 + $scope.changeListRequisicaoConsumoItem();
351 356 $timeout(function(){
352 357  
353 358 $scope.requisicaoConsumoItem = null;
... ... @@ -538,5 +543,36 @@ citApp.controller('RequisicaoConsumoController', ['$scope', '$filter', 'Requisic
538 543 $scope.apresentarInfoAtendimentoItem = function(atendimento){
539 544 atendimento.$verInfo = !atendimento.$verInfo;
540 545 };
  546 +
  547 + $scope.filterCriteria = {
  548 + start : 1,
  549 + limit : 5,
  550 + };
  551 +
  552 + $scope.filterCriteria2 = {
  553 + start : 1,
  554 + limit : 5,
  555 + };
  556 +
  557 + $scope.changeListRequisicaoConsumoItem = function (){
  558 +
  559 + $scope.listaRequisicaoConsumoItens = [];
  560 + var pagina = (($scope.filterCriteria.start - 1) * $scope.filterCriteria.limit);
  561 + $scope.listaRequisicaoConsumoItens = $scope.requisicaoConsumo.requisicaoConsumoItens.slice(pagina,(pagina + $scope.filterCriteria.limit));
  562 + $scope.totalPages = $scope.requisicaoConsumo.requisicaoConsumoItens.length/$scope.filterCriteria.limit;
  563 + $scope.totalItens = $scope.requisicaoConsumo.requisicaoConsumoItens.length;
  564 +
  565 + };
  566 +
  567 + $scope.changeListAtendimentoRequisicao = function (){
  568 + $scope.listaAtendimento = [];
  569 + if($scope.atendimentos && $scope.atendimentos.length > 0){
  570 + var pagina = (($scope.filterCriteria2.start - 1) * $scope.filterCriteria2.limit);
  571 + $scope.listaAtendimento = $scope.atendimentos.slice(pagina,(pagina + $scope.filterCriteria2.limit));
  572 + $scope.totalPages2 = $scope.atendimentos.length/$scope.filterCriteria2.limit;
  573 + $scope.totalItens2 = $scope.atendimentos.length;
  574 + }
  575 +
  576 + };
541 577  
542 578 }]);
543 579 \ No newline at end of file
... ...
cit-almoxarifado-web/src/main/webapp/html/requisicaoConsumo/requisicaoConsumoEdit.html
  Diff comments   View file @b5b5f0c
... ... @@ -182,7 +182,7 @@
182 182 </tr>
183 183 </thead>
184 184 <tbody>
185   - <tr ng-repeat="requisicaoConsumoItem in requisicaoConsumo.requisicaoConsumoItens">
  185 + <tr ng-repeat="requisicaoConsumoItem in listaRequisicaoConsumoItens">
186 186  
187 187 <td class="text-center">
188 188 <input type="radio" name="requisicaoConsumoItemChecked" ng-value="requisicaoConsumoItem"
... ... @@ -210,6 +210,29 @@
210 210 <td colspan="4" class="text-center"><translate>LABEL.TABELA_VAZIA</translate></td>
211 211 </tr>
212 212 </tbody>
  213 + <tfoot>
  214 + <tr>
  215 + <td colspan="5">
  216 + <div class="row">
  217 + <div class="col-sm-4 table-showing">
  218 + <translate>LABEL.MOSTRANDO</translate>
  219 + {{totalItens > zero ? filterCriteria.start : zero}}
  220 + <translate>LABEL.ATE</translate>
  221 + {{filterCriteria.limit > totalItens ? totalItens : filterCriteria.limit}}
  222 + <translate>LABEL.DE</translate>
  223 + ({{totalItens}})
  224 + <translate>PATRIMONIO.LABEL.BENS_PATRIMONIAIS</translate>.
  225 + </div><!-- .col -->
  226 + <div class="col-sm-8 text-right">
  227 +
  228 + <pagination rotate="true" max-size="10" total-items="totalItens" num-pages="totalPages" ng-model="filterCriteria.start" items-per-page="filterCriteria.limit"
  229 + class="pagination-sm" boundary-links="true" ng-change="changeListRequisicaoConsumoItem()" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;"></pagination>
  230 +
  231 + </div><!-- .col -->
  232 + </div><!-- .row -->
  233 + </td>
  234 + </tr>
  235 + </tfoot>
213 236 </table>
214 237 </div>
215 238 </div>
... ... @@ -231,18 +254,18 @@
231 254 <thead>
232 255 <tr>
233 256 <th width="5%" class="text-center"> </th>
234   - <th class="text-center"><translate>ALMOXARIFADO.LABEL.NUMERO_ATENDIMENTO</translate></th>
  257 + <th class="text-center"><requisicaoConsumo.requisicaoConsumoItens.length</translate></th>
235 258 <th class="text-center"><translate>ALMOXARIFADO.LABEL.DATA_ATENDIMENTO</translate></th>
236 259 </tr>
237 260 </thead>
238 261 <tbody>
239   - <tr ng-repeat-start="atendimento in atendimentos">
  262 + <tr ng-repeat-start="atendimento in listaAtendimento">
240 263 <td class="text-center">
241 264 <button type="button" ng-click="apresentarInfoAtendimentoItem(atendimento)">
242 265 <i class="ace-icon fa {{atendimento.$verInfo ? 'fa-minus' : 'fa-plus'}} bigger-125"></i>
243 266 </button>
244 267 </td>
245   - <td class="text-center">{{atendimento.numeroAtendimento}}</td>
  268 + <td class="teRequisicaoConsumoItemnto.numeroAtendimento}}</td>
246 269 <td class="text-center">{{atendimento.dataAtendimento}}</td>
247 270 </tr>
248 271 <tr ng-show="atendimento.$verInfo == true" class="table-subgrid" ng-repeat-end>
... ... @@ -266,6 +289,29 @@
266 289 </td>
267 290 </tr>
268 291 </tbody>
  292 + <tfoot>
  293 + <tr>
  294 + <td colspan="5">
  295 + <div class="row">
  296 + <div class="col-sm-4 table-showing">
  297 + <translate>LABEL.MOSTRANDO</translate>
  298 + {{totalItens2 > zero ? filterCriteria2.start : zero}}
  299 + <translate>LABEL.ATE</translate>
  300 + {{filterCriteria2.limit > totalItens2 ? totalItens2 : filterCriteria2.limit}}
  301 + <translate>LABEL.DE</translate>
  302 + ({{totalItens2}})
  303 + <translate>PATRIMONIO.LABEL.BENS_PATRIMONIAIS</translate>.
  304 + </div><!-- .col -->
  305 + <div class="col-sm-8 text-right">
  306 +
  307 + <pagination rotate="true" max-size="10" total-items="totalItens2" num-pages="totalPages2" ng-model="filterCriteria2.start" items-per-page="filterCriteria2.limit"
  308 + class="pagination-sm" boundary-links="true" ng-change="changeListAtendimentoRequisicao()" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;"></pagination>
  309 +
  310 + </div><!-- .col -->
  311 + </div><!-- .row -->
  312 + </td>
  313 + </tr>
  314 + </tfoot>
269 315 </table>
270 316 </div>
271 317 </fieldset>
... ...