Luis Suarez / autoservicio-axion

Commit b023575075183e501158f6b2c825f048a5722014

Authored by Marcelo Puebla 2020-01-31 11:04:24 -0300

Exists in develop

Fix

Manejo de modales.

Showing 3 changed files with 25 additions and 5 deletions Show diff stats

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

Diff comments View file @ b023575

 import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { PromocionComponent } from 'src/app/shared/promocion/promocion.component';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
 import { SinonimoComponent } from 'src/app/shared/sinonimo/sinonimo.component';
 import { FiltroCategoriasComponent } from './filtro-categorias/filtro-categorias.component';
 import * as _ from 'lodash';
 import { ANIMATIONS } from 'src/app/utils/animations';
 @Component({
   selector: 'app-seleccion-articulos',
   templateUrl: './seleccion-articulos.component.html',
   styleUrls: ['./seleccion-articulos.component.scss'],
   animations: [ANIMATIONS.EnterLeaveY]
 })
 export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {
   loading = true;
   timeoutHandler: any;
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   articulos: IArticulo[] = [];
   auxArticulos: IArticulo[] = [];
   showQuantity = 100;
   searchTerm = '';
   ordenandoByVendidos = true;
   modalRef: BsModalRef;
   total = 0;
   @ViewChild(FiltroCategoriasComponent, { static: false }) filtroCategorias: FiltroCategoriasComponent;
   constructor(
     public articuloService: ArticuloService,
     private sinonimoService: SinonimoService,
     private modalService: BsModalService,
     private inactiveScreen: InactiveScreenService,
   ) { }
   ngOnInit() { }
   ngAfterViewInit(): void {
     this.filtroCategorias.getCategorias();
     this.mediaPantalla();
   }
   ngOnDestroy() {
     for (let i = 1; i <= this.modalService.getModalsCount(); i++) {
       this.modalService.hide(i);
     }
   }
   getProductos() {
     this.articuloService.getAll()
       .subscribe((result: IArticulo[]) => {
         this.articuloService.setArticulosSinImagen(result);
         if (this.filtroCategorias.queMostrar === 'ordenar') {
           this.filtroCategorias.categorias.forEach((categoria: ICategoria) => {
             const tempArticulos = result.filter((articulo: IArticulo) => {
               return articulo.categoria_selfservice === categoria.id;
             });
             result = tempArticulos;
           });
         }
         localStorage.setItem('articulos', JSON.stringify(result));
         this.setProductos();
       }, (error) => {
         console.error(error);
       });
   }
   setProductos() {
     this.articulos = JSON.parse(localStorage.getItem('articulos'));
     this.filterItems();
     this.loading = false;
   }
   filterItems() {
     if (this.filtroCategorias.categoriaActive === 0) {
       this.auxArticulos = this.articulos;
       return;
     }
     this.auxArticulos = this.articulos.filter(x => {
       return x.categoria_selfservice === this.filtroCategorias.categoriaActive;
     });
     this.ordenar();
   }
   ordenar() {
     if (this.ordenandoByVendidos) {
       this.auxArticulos.sort((a, b) => {
         return b.cantidadVendida - a.cantidadVendida;
       });
     }
   }
   selectArticulo(articulo: IArticulo) {
     this.getByID(articulo.id);
   }
   getByID(id: number) {
     this.articuloService.getById(id)
       .subscribe((res: IArticulo) => {
         if (res.FPP) {
           this.openModalPromos(res);
         } else {
           this.getSinonimos(res);
         }
       }, err => console.error(err));
   }
   getSinonimos(articulo: IArticulo) {
     this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
       .subscribe((res: any[]) => {
         if (res.length) {
           const sinonimos = [];
           const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN');
           Object.keys(gruposArticulos).forEach(key => {
             sinonimos.push({ productos: gruposArticulos[key] });
           });
           res = sinonimos;
           this.openModalSinonimos(res, articulo);
         } else {
           this.articuloService.setArticulo(articulo);
         }
       });
   }
   openModalPromos(articulo: IArticulo) {
     if (this.modalRef) return;
     this.articuloService.setArticulosSinImagen([articulo]);
     this.modalRef = this.modalService.show(PromocionComponent, {
       initialState: { articulosPromo: [articulo] },
       class: 'modal-dialog-centered',
       ignoreBackdropClick: true,
     });
     this.modalRef.content.onClose
       .subscribe(() => this.modalRef = null);
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
+    if (this.modalRef) return;
     this.modalRef = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
-      class: 'modal-dialog-centered'
+      class: 'modal-dialog-centered',
+      ignoreBackdropClick: true,
     });
     this.modalRef.content.onClose
       .subscribe((res: any) => {
+        this.modalRef = null;
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
               a.CODA = aRes.CodArt;
               a.CodArt = aRes.CodArt;
               a.SECA = aRes.CodSec;
               aRes.CodSec = aRes.CodSec;
               a.PreVen = aRes.PreVen;
               a.id = aRes.id;
               a.DET_LAR = aRes.DET_LAR;
               a.DetArt = aRes.DetArt;
             }
           }
         }
         this.articuloService.setArticulo(articulo);
       });
     this.mediaPantalla();
   }
   deleteArticulo(index: number) {
     this.articuloService.deleteArticulo(index);
   }
   increaseShow() {
     this.showQuantity += 100;
   }
   @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);
   }
   scrollX(el: HTMLElement, value) {
     el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     this.timeoutHandler = setInterval(() => {
       el.scroll({ behavior: 'smooth', left: value + el.scrollLeft });
     }, 500);
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $(`.cat-content,#cat-content,#content,.cat-btn,#boxCarrito,
         .cat-box,.img-categoria, .modal-content`)
         .addClass('media-pantalla')
         .addBack('media-pantalla');
     }
   }
 }

src/app/shared/promocion/promocion.component.ts

Diff comments View file @ b023575

 import { Component, OnInit, HostListener } from '@angular/core';
 import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { PromocionService } from 'src/app/services/promocion/promocion.service';
 import { Subject } from 'rxjs';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { SinonimoComponent } from '../sinonimo/sinonimo.component';
 import * as _ from 'lodash';
 @Component({
   selector: 'app-promocion',
   templateUrl: './promocion.component.html',
   styleUrls: ['./promocion.component.scss']
 })
 export class PromocionComponent implements OnInit {
   articulosPromo: IArticulo[] = [];
   promociones: IArticulo[] = [];
   onClose: Subject<any>;
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   loading = true;
+  modalSinonimo: BsModalRef;
+  isPromoSelected = false;
   constructor(
-    public modalPromocion: BsModalRef,
+    private modalPromocion: BsModalRef,
     private modalService: BsModalService,
     private articuloService: ArticuloService,
     private promocionService: PromocionService,
     private sinonimoService: SinonimoService,
     private inactiveScreen: InactiveScreenService,
   ) {
     this.onClose = new Subject();
   }
   ngOnInit() {
     this.getPromociones();
   }
   selectPromo(promo: IArticulo) {
+    if (this.isPromoSelected) return;
+    this.isPromoSelected = true;
     this.sinonimoService.getSinonimos(promo.CodSec, promo.CodArt)
       .subscribe((res: ISinonimo[]) => {
         if (res.length) {
           const sinonimos = [];
           const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN');
           Object.keys(gruposArticulos).forEach(key => {
             sinonimos.push({ productos: gruposArticulos[key] });
           });
           res = sinonimos;
           this.openModalSinonimos(res, promo);
         } else {
           promo.cantidad = 1;
           this.articuloService.setArticulo(promo);
           this.onClose.next();
           this.modalPromocion.hide();
         }
       }, err => console.error(err));
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
-    const modalSinonimo = this.modalService.show(SinonimoComponent, {
+    if (this.modalSinonimo) return;
+    this.modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
-      class: 'modal-dialog-centered'
+      class: 'modal-dialog-centered',
+      ignoreBackdropClick: true,
     });
-    modalSinonimo.content.onClose
+    this.modalSinonimo.content.onClose
       .subscribe((res: any) => {
+        this.modalSinonimo = null;
+        if (!res) {
+          this.onClose.next();
+          this.modalPromocion.hide();
+          return;
+        }
         for (const a of articulo.productos) {
           for (const aRes of res.articulos) {
             if (a.idSinonimo === aRes.ID_SIN) {
               a.CODA = aRes.CodArt;
               a.CodArt = aRes.CodArt;
               a.SECA = aRes.CodSec;
               aRes.CodSec = aRes.CodSec;
               a.PreVen = aRes.PreVen;
               a.id = aRes.id;
               a.DET_LAR = aRes.DET_LAR;
               a.DetArt = aRes.DetArt;
             }
           }
         }
         this.articuloService.setArticulo(articulo);
+        this.onClose.next();
         this.modalPromocion.hide();
       });
   }
   getPromociones() {
     const sector = this.articulosPromo[0].CodSec;
     const codigo = this.articulosPromo[0].CodArt;
     this.promocionService.getPromociones(sector, codigo)
       .subscribe((res: IArticulo[]) => {
         this.promociones = res;
         this.loading = false;
       }, error => { console.error(error); });
   }
   @HostListener('document:click', ['$event'])
   eventListener(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
   @HostListener('scroll', ['$event'])
   scrollEvent(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
     this.inactiveScreen.startTimeOutInactividad();
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('.modal-content').addClass('media-pantalla');
     }
   }
 }

src/app/shared/sinonimo/sinonimo.component.ts

Diff comments View file @ b023575

 import { Component, OnInit } from '@angular/core';
 import { ISinonimo } from 'src/app/interfaces/ISinonimo';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { Subject, forkJoin } from 'rxjs';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { element } from 'protractor';
 @Component({
   selector: 'app-sinonimo',
   templateUrl: './sinonimo.component.html',
   styleUrls: ['./sinonimo.component.scss']
 })
 export class SinonimoComponent implements OnInit {
   sinonimos: ISinonimo[] = [];
   isValid: boolean;
   onClose: Subject<any>;
   articulosSelected: IArticulo[] = [];
   articulo: IArticulo;
+  isSinonimoSelected = false;
   constructor(
     private modalRef: BsModalRef,
     private articuloService: ArticuloService,
   ) {
     this.onClose = new Subject();
     this.articulosSelected.length = this.sinonimos.length;
   }
   ngOnInit() { }
   selectSinonimo(index: number, articulo: IArticulo) {
     for (const a of this.sinonimos[index].productos) {
       a.seleccionado = false;
     }
     articulo.seleccionado = true;
     this.articulosSelected[index] = articulo;
   }
   validate() {
     this.isValid = true;
     for (const s of this.sinonimos) {
       for (const a of s.productos) {
         this.isValid = (!a.seleccionado) ? false : true;
         if (this.isValid) break;
       }
       if (!this.isValid) break;
     }
     return !this.isValid ? 'disabled' : 'btn-effect';
   }
   continue() {
     if (!this.isValid) return;
+    if (this.isSinonimoSelected) return;
+    this.isSinonimoSelected = true;
     const ID_SINS = [];
     const observables = [];
     for (const articulo of this.articulosSelected) {
       ID_SINS.push(articulo.ID_SIN);
     }
     for (const articulo of this.articulosSelected) {
       observables.push(this.articuloService.getById(articulo.id));
     }
     forkJoin(observables)
       .subscribe((res: IArticulo[]) => {
         for (const articulo of res) {
           for (const ID_SIN of ID_SINS) {
             articulo.ID_SIN = ID_SIN;
           }
         }
         this.modalRef.hide();
         this.onClose.next({
           articulos: res,
         });
       }, err => console.error(err));
   }
   scrollTo(index: number) {
     const el = document.getElementById(index.toString());
     el.scrollIntoView({ behavior: 'smooth' });
   }
   close() {
     this.modalRef.hide();
+    this.onClose.next();
   }
 }