Luis Suarez / autoservicio-axion

Commit 1bdc4ea25070c0b63ab28830878b13d2ef7d5172

Authored by Marcelo Puebla 2020-02-14 10:43:24 -0300

Exists in develop

Merge branch 'develop' into 'develop'

Solo se muestran categorias con fecha vigente

See merge request !141

Showing 2 changed files Show diff stats

src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.html

Diff comments View file @ 1bdc4ea

 <!-- FILTRO CATEGORIAS -->
   <p class="h6 h-6 m-0 text-center"><small>CATEGORÍAS</small></p>
   <div class="row mx-0 h-94 justify-content-center align-items-center">
     <div class="col-auto btn-effect h-5 cat-btn">
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="h-100 d-block mx-auto rotate-90-neg"
         src="assets/img/ir-color.svg"
         (mousedown)="scrollY(templateCategorias, -100)"
         (mouseup)="mouseup()"
         (mouseleave)="mouseup()">
     </div>
     <!-- CATEGORIAS -->
     <div
       #templateCategorias
       class="col-12 px-0 mx-0 box-categorias border border-primary py-1
             border-left-0 rounded-right scroll-y cat-box"
       (scroll)="scrollEvent($event)">
       <div
         class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
         [ngClass]="{ 'active rounded shadow px-2': allActive, 'border-bottom-effect': !allActive }"
         (click)="selectCategoria(-1, 0)">
         <img
           draggable="false"
           ondragstart="return false;"
           (contextmenu)="false"
           class="col-12 img-fluid align-self-end d-none
                 d-sm-block rounded-circle h-50"
           src="assets/img/logo-spot.svg">
         <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">Todos</small>
       </div>
       <div *ngFor="let categoria of categorias; let i = index;">
         <div
           class="row mx-2 mb-2 h-25 h-lg-30 justify-content-center tab cat-content"
           [ngClass]="{ 'active rounded shadow px-2': categoria.selected,
                     'border-bottom-effect': !categoria.selected,
                     'media-pantalla': templateCategorias.classList.contains('media-pantalla')}"
           (click)="selectCategoria(i, categoria.id)"
           id="cat-content"
-          *ngIf="categoria.articulos > 0">
+          *ngIf="categoria.articulos > 0
+                && validarFecha(categoria.vigencia_desde, categoria.vigencia_hasta)">
           <img
           draggable="false"
           ondragstart="return false;"
           (contextmenu)="false"
           class="d-none d-sm-block rounded-circle w-auto h-auto col-12"
           src="{{urlImagenes}}{{categoria.path_imagen}}"
           onerror="this.src='assets/img/imagen-no-encontrada.jpg'">
           <small class="col-12 px-1 my-1 h-100 h-md-25 align-self-end text-center text-truncate">{{categoria.detalle}}</small>
         </div>
       </div>
     </div>
     <div class="col-auto btn-effect h-5 cat-btn">
       <img
         draggable="false"
         ondragstart="return false;"
         (contextmenu)="false"
         class="h-100 d-block mx-auto rotate-90"
         src="assets/img/ir-color.svg"
         (mousedown)="scrollY(templateCategorias, 100)"
         (mouseup)="mouseup()"
         (mouseleave)="mouseup()">
     </div>
   </div>

src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts

Diff comments View file @ 1bdc4ea

 import { Component, OnInit, HostListener, Output, EventEmitter } from '@angular/core';
 import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 @Component({
   selector: 'app-filtro-categorias',
   templateUrl: './filtro-categorias.component.html',
   styleUrls: ['./filtro-categorias.component.scss']
 })
 export class FiltroCategoriasComponent implements OnInit {
   @Output() getProductos = new EventEmitter<any>();
   @Output() setProductos = new EventEmitter<any>();
   @Output() filterItems = new EventEmitter<any>();
   categorias: ICategoria[] = [];
   timeoutHandler: any;
   categoriaActive = null;
   allActive = true;
   queMostrar = 'todos';
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   constructor(
     private categoriaService: CategoriaService,
     private inactiveScreen: InactiveScreenService
   ) { }
   ngOnInit() {
     this.mediaPantalla();
   }
   getCategorias() {
     this.categoriaService.getAll()
       .subscribe((categorias: ICategoria[]) => {
         switch (this.queMostrar) {
           case 'todos':
             this.categorias = categorias;
             this.categoriaActive = 0;
             break;
           case 'promociones':
             this.categorias = categorias;
             this.categoriaActive = 19;
             break;
           case 'ordenar':
             this.categorias = categorias.filter((categoria: ICategoria) => {
               return categoria.ES_PEDIDO;
             });
             this.categoriaActive = 4;
             break;
           default:
             this.categorias = categorias;
             this.categoriaActive = 0;
             break;
         }
         !localStorage.getItem('articulos') ?
           this.getProductos.emit() :
           this.setProductos.emit();
       });
     this.mediaPantalla();
   }
   selectCategoria(index: number, idCategoria?: number) {
     if (this.categoriaActive === idCategoria) return;
     this.categoriaActive = idCategoria;
     this.allActive = idCategoria === 0 ? true : false;
     this.categorias.forEach((categoria, i) => {
       categoria.selected = index === i ? true : false;
     });
     this.filterItems.emit();
   }
   @HostListener('scroll', ['$event'])
   scrollEvent(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
   mouseup() {
     if (!this.timeoutHandler) return;
     clearInterval(this.timeoutHandler);
   }
   scrollY(el: HTMLElement, value) {
     el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     this.timeoutHandler = setInterval(() => {
       el.scroll({ behavior: 'smooth', top: value + el.scrollTop });
     }, 500);
   }
+  validarFecha(fechaInicioString: string, fechaFinString: string) {
+    const fechaInicio = new Date(fechaInicioString);
+    const fechaFin = new Date(fechaFinString);
+    const fechaAux = Date.now();
+    const fechaHoy = new Date(fechaAux);
+    return (fechaHoy >= fechaInicio && fechaHoy <= fechaFin) ? true : false;
+  }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.cat-content,#cat-content')
         .addClass('media-pantalla')
         .addBack('media-pantalla');
     }
   }
 }