From a361ae9bc10a15961a9ad5ebc77965da47183862 Mon Sep 17 00:00:00 2001
From: Eric Fernandez <efernandez@focasoftware.com>
Date: Mon, 3 Jun 2019 12:34:47 -0300
Subject: [PATCH] =?UTF-8?q?paginaci=C3=B3n=20ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/comprobantes/comprobantes.component.html | 24 +++++++++--------
 src/app/comprobantes/comprobantes.component.ts   | 33 ++++++++++++++++--------
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/app/comprobantes/comprobantes.component.html b/src/app/comprobantes/comprobantes.component.html
index 9dc487f..a5cf86e 100644
--- a/src/app/comprobantes/comprobantes.component.html
+++ b/src/app/comprobantes/comprobantes.component.html
@@ -74,25 +74,27 @@
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let articulo of articulosFiltro" [ngClass]="{'bg-success': articulo.done}">
+        <tr *ngFor="let articulo of getPaginaFiltro()" [ngClass]="{'bg-success': articulo.done}">
           <th><button type="button" class="" (click)="articulo.input = true">
             <i class="fa fa-window-close"></i>
           </button></th>
           <th>{{articulo.LI0}}</th>
-          <th *ngIf="!articulo.input">{{articulo.CAN}}</th>
+          <th *ngIf="!articulo.input">{{articulo.CAN}}/{{articulo.CAN}}</th>
           <th *ngIf="articulo.input">
             <input class="form-control-sm col-12"/>
           </th>
-          <th><button type="button" class="" (click)="articulo.done = true">
-            <i class="fa fa-check"></i>
-          </button></th>
+          <th>
+            <button type="button" class="" (click)="articulo.done = true">
+              <i class="fa fa-check"></i>
+            </button>
+          </th>
         </tr>
       </tbody>
     <tfoot>
       <nav *ngIf="articulosFiltro.length > 0" class="mr-auto">
         <ul class="pagination pagination-sm justify-content mb-0">
-          <li class="page-item" [ngClass]="{'disabled': pagina == 1}">
-              <a class="page-link" href="javascript:void();" (click)="paginar(articulosFiltro); pagina - 1">
+          <li class="page-item" [ngClass]="{'disabled': paginaActiva == 1}">
+              <a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva - 1">
                 <span aria-hidden="true">&laquo;</span>
                 <span class="sr-only">Anterior</span>
               </a>
@@ -100,16 +102,16 @@
           <li
             class="page-item"
             *ngFor="let pagina of paginas; index as i"
-            [ngClass]="{'active': pagina == currentPage}"
+            [ngClass]="{'active': pagina == paginaActiva}"
           >
             <a
               class="page-link"
               href="javascript:void();"
-              (click)="selectPage(pagina)"
+              (click)="paginaActiva = pagina"
             >{{pagina}}</a>
           </li>
-          <li class="page-item" [ngClass]="{'disabled': currentPage == lastPage}">
-            <a class="page-link" href="javascript:void();" (click)="paginar(articulosFiltro); pagina + 1">
+          <li class="page-item" [ngClass]="{'disabled': paginaActiva == paginas.length}">
+            <a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva + 1">
               <span aria-hidden="true">&raquo;</span>
               <span class="sr-only">Siguiente</span>
             </a>
diff --git a/src/app/comprobantes/comprobantes.component.ts b/src/app/comprobantes/comprobantes.component.ts
index 3a45493..a11274c 100644
--- a/src/app/comprobantes/comprobantes.component.ts
+++ b/src/app/comprobantes/comprobantes.component.ts
@@ -11,7 +11,7 @@ export class ComprobantesComponent implements OnInit {
 
   ngOnInit() {
 
-    this.obtenerConsulta()
+    this.obtenerConsulta();
   }
 
   filter = '';
@@ -19,23 +19,33 @@ export class ComprobantesComponent implements OnInit {
   cabecera = {};
   cuerpo = [];
   articulosFiltro = [];
-  pagina = 1;
+  paginaActiva = 1;
   paginas = [];
 
   fecha = new Date();
 
   filtrar(event: any) {
-    var filtro =  this.cuerpo.filter((param)=> {
-      return (param.LI0).toLocaleUpperCase().includes((event.target.value).toLocaleUpperCase());
+    this.articulosFiltro =  this.cuerpo.filter((param)=> {
+      return (param.LI0).toLocaleUpperCase().includes(
+        (event.target.value).toLocaleUpperCase()) ||
+        param.codigoBarras == event.target.value;
     });
 
-    this.paginar(filtro, this.pagina);
-    this.paginas.length = Math.round(filtro.length / 5);
+    this.paginar();
   }
 
-  paginar(filtro: any, pagina: any) {
-    this.articulosFiltro = filtro.slice(
-      filtro.length - 1 * pagina, filtro.length * this.pagina + 4);
+  paginar() {
+
+    var cantPaginas = Math.round(this.articulosFiltro.length / 5) + 1;
+    this.paginas = [];
+    for (let i = 0; i < cantPaginas; i++) {
+      this.paginas.push(i + 1);
+    }
+  }
+
+  getPaginaFiltro() {
+    return this.articulosFiltro.slice(
+      (this.paginaActiva - 1) * 5 , this.paginaActiva * 5);
   }
 
   obtenerConsulta() {
@@ -55,7 +65,8 @@ export class ComprobantesComponent implements OnInit {
       this.cuerpo = [
         {
           LI0: 'Mantel Combo Bolso CocaCola',
-          CAN: 5
+          CAN: 5,
+          codigoBarras: '7790667006462'
         },
         {
           LI0: 'Papas',
@@ -85,7 +96,7 @@ export class ComprobantesComponent implements OnInit {
   
       this.articulosFiltro = this.cuerpo;
 
-      this.paginar(this.articulosFiltro);
+      this.paginar();
     }, 500);
   }
 
-- 
1.9.1