Marcelo Puebla / autoservicio-axion

Commit 2faef52ed0128c936c0e8bcc970db4421fc59028

Authored by Marcelo Puebla 2020-02-06 22:49:19 -0300

1 parent 411952c8b2

Exists in develop

Fix

en seleccion de sinonimo

Showing 4 changed files with 13 additions and 28 deletions Show diff stats

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

Diff comments View file @ 2faef52

 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, i) => {
             sinonimos.push({ productos: gruposArticulos[key] });
             sinonimos[i].cantidad = articulo.productos[i].cantidad;
             sinonimos[i].cantidadRestante = articulo.productos[i].cantidad;
           });
           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',
       ignoreBackdropClick: true,
     });
     this.modalRef.content.onClose
       .subscribe((res: any) => {
         this.modalRef = null;
         if (!res) return;
-        for (const a of articulo.productos) {
+        articulo.productos = res.articulos;
-          for (const aRes of res.articulos) {
-            if (a.idSinonimo === aRes.ID_SIN) {
-              this.articuloService.changeArticulo(a, aRes);
-            }
-          }
-        }
         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/header-publicidad/header-publicidad.component.ts

Diff comments View file @ 2faef52

 import { Component, OnInit, TemplateRef } from '@angular/core';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
 import { IPublicidad } from 'src/app/interfaces/IPublicidad';
 import { PublicidadService } from 'src/app/services/publicidad/publicidad.service';
 import { IArticulo } from 'src/app/interfaces/IArticulo';
 import { PromocionComponent } from '../promocion/promocion.component';
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { ArticuloService } from 'src/app/services/articulo/articulo.service';
 import { ConfirmacionComponent } from '../confirmacion/confirmacion.component';
 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-header-publicidad',
   templateUrl: './header-publicidad.component.html',
   styleUrls: ['./header-publicidad.component.scss']
 })
 export class HeaderPublicidadComponent implements OnInit {
   urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
   publicidades: IPublicidad[] = [];
   modalRef: BsModalRef;
   modalSinonimo: BsModalRef;
   constructor(
     private publicidadService: PublicidadService,
     private articuloService: ArticuloService,
     private modalService: BsModalService,
     private sinonimoService: SinonimoService
   ) { }
   ngOnInit() {
     this.getPublicidades();
     this.mediaPantalla();
   }
   getPublicidades() {
     this.publicidadService.getAll()
       .subscribe((res: IPublicidad[]) => {
         this.publicidades = res;
       }, err => console.error(err));
   }
   elegirArticulo(publicidad: IPublicidad) {
     if (publicidad.id_articulo) this.getByID(publicidad.id_articulo);
   }
   getByID(id: number) {
     this.articuloService.getById(id)
       .subscribe((res: IArticulo) => {
         if (res.FPP) {
           this.openModalPromos(res);
           return;
         } else {
           this.openModalConfirmacion(res);
           return;
         }
       }, err => console.error(err));
   }
   openModalPromos(articulo: IArticulo) {
     if (this.modalRef) return;
     this.modalRef = this.modalService.show(PromocionComponent,
       {
         initialState: {
           idArticulo: articulo.id
         },
         class: 'modal-dialog-centered'
       });
   }
   openModalConfirmacion(articulo: IArticulo) {
     if (this.modalRef) return;
     this.articuloService.setArticulosSinImagen([articulo]);
     this.modalRef = this.modalService.show(ConfirmacionComponent,
       {
         initialState: {
           titleMessage: articulo.DET_LAR,
           imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/imagen-no-encontrada.jpg',
           footerMessageFirst: `¿QUERÉS AGREGAR ESTE COMBO`,
           footerMessageSecond: `a tu carrito?`,
           footerConfirmation: articulo.PreVen
         },
         ignoreBackdropClick: true,
         class: 'modal-dialog-centered'
       });
     this.modalRef.content.onClose.subscribe((resClose) => {
       this.modalRef = null;
       if (!resClose) return;
       this.sinonimoService.getSinonimos(articulo.CodSec, articulo.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, articulo);
           } else {
             articulo.cantidad = 1;
             this.articuloService.setArticulo(articulo);
           }
         }, err => console.error(err));
     });
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     if (this.modalSinonimo) return;
     this.modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
       class: 'modal-dialog-centered'
     });
     this.modalSinonimo.content.onClose
       .subscribe((res: any) => {
         this.modalSinonimo = null;
-        for (const a of articulo.productos) {
+        if (!res) return;
-          for (const aRes of res.articulos) {
+        articulo.productos = res.articulos;
-            if (a.idSinonimo === aRes.ID_SIN) {
-              this.articuloService.changeArticulo(a, aRes);
-            }
-          }
-        }
         this.articuloService.setArticulo(articulo);
       });
   }
   mediaPantalla() {
     if ($('body').hasClass('media-pantalla')) {
       $('#headerPublicidad,#headerPad').addClass('media-pantalla');
     }
   }
 }

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

Diff comments View file @ 2faef52

 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(
     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.articuloService.getById(promo.id)
       .subscribe((resPromo: IArticulo) => {
         promo = resPromo;
         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));
       }, err => console.error(err));
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     if (this.modalSinonimo) return;
     this.modalSinonimo = this.modalService.show(SinonimoComponent, {
       initialState: {
         sinonimos: sinonimosData,
         articulo
       },
       class: 'modal-dialog-centered',
       ignoreBackdropClick: true,
     });
     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) {
+        articulo.productos = res.articulos;
-          for (const aRes of res.articulos) {
-            if (a.idSinonimo === aRes.ID_SIN) {
-              this.articuloService.changeArticulo(a, aRes);
-            }
-          }
-        }
         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 @ 2faef52

1	import { Component, OnInit } from '@angular/core';	1	import { Component, OnInit } from '@angular/core';
2	import { ISinonimo } from 'src/app/interfaces/ISinonimo';	2	import { ISinonimo } from 'src/app/interfaces/ISinonimo';
3	import { IArticulo } from 'src/app/interfaces/IArticulo';	3	import { IArticulo } from 'src/app/interfaces/IArticulo';
4	import { BsModalRef } from 'ngx-bootstrap/modal';	4	import { BsModalRef } from 'ngx-bootstrap/modal';
5	import { Subject, forkJoin } from 'rxjs';	5	import { Subject, forkJoin } from 'rxjs';
6	import { ArticuloService } from 'src/app/services/articulo/articulo.service';	6	import { ArticuloService } from 'src/app/services/articulo/articulo.service';
7	import { element } from 'protractor';	7	import { element } from 'protractor';
8		8
9	@Component({	9	@Component({
10	selector: 'app-sinonimo',	10	selector: 'app-sinonimo',
11	templateUrl: './sinonimo.component.html',	11	templateUrl: './sinonimo.component.html',
12	styleUrls: ['./sinonimo.component.scss']	12	styleUrls: ['./sinonimo.component.scss']
13	})	13	})
14	export class SinonimoComponent implements OnInit {	14	export class SinonimoComponent implements OnInit {
15	sinonimos: ISinonimo[] = [];	15	sinonimos: ISinonimo[] = [];
16	isValid: boolean;	16	isValid: boolean;
17	onClose: Subject<any>;	17	onClose: Subject<any>;
18	articulo: IArticulo;	18	articulo: IArticulo;
19	isSinonimoSelected = false;	19	isSinonimoSelected = false;
20	currentIndex = 0;	20	currentIndex = 0;
21		21
22	constructor(	22	constructor(
23	private modalRef: BsModalRef,	23	private modalRef: BsModalRef,
24	private articuloService: ArticuloService,	24	private articuloService: ArticuloService,
25	) {	25	) {
26	this.onClose = new Subject();	26	this.onClose = new Subject();
27	}	27	}
28		28
29	ngOnInit() {	29	ngOnInit() {
30	for (const s of this.sinonimos) {	30	for (const s of this.sinonimos) {
31	for (const a of s.productos) {	31	for (const a of s.productos) {
32	a.cantidad = 0;	32	a.cantidad = 0;
33	}	33	}
34	}	34	}
35	}	35	}
36		36
37	validate() {	37	validate() {
38	this.isValid = true;	38	this.isValid = true;
39	for (const s of this.sinonimos) {	39	for (const s of this.sinonimos) {
40	if (s.cantidadRestante > 0) {	40	if (s.cantidadRestante > 0) {
41	this.isValid = false;	41	this.isValid = false;
42	break;	42	break;
43	}	43	}
44	}	44	}
45	return !this.isValid ? 'disabled' : 'btn-effect';	45	return !this.isValid ? 'disabled' : 'btn-effect';
46	}	46	}
47		47
48	continue() {	48	continue() {
49	if (!this.isValid) return;	49	if (!this.isValid) return;
50	if (this.isSinonimoSelected) return;	50	if (this.isSinonimoSelected) return;
51	this.isSinonimoSelected = true;	51	this.isSinonimoSelected = true;
52	const ID_SINS = [];
53	const observables = [];	52	const observables = [];
		53	const cantidades = [];
54		54
55	// for (const articulo of this.articulosSelected) {	55	for (const s of this.sinonimos) {
56	// ID_SINS.push(articulo.ID_SIN);	56	for (const articulo of s.productos) {
57	// observables.push(this.articuloService.getById(articulo.id));	57	if (articulo.cantidad === 0) continue;
58	// }	58	cantidades.push(articulo.cantidad);
59		59	observables.push(this.articuloService.getById(articulo.id));
		60	}
		61	}
60	forkJoin(observables)	62	forkJoin(observables)
61	.subscribe((res: IArticulo[]) => {	63	.subscribe((res: IArticulo[]) => {
62	res.forEach((articulo, i) => {	64	res.forEach((articulo, i) => {
63	articulo.ID_SIN = ID_SINS[i];	65	articulo.cantidad = cantidades[i];
64	});	66	});
65	this.modalRef.hide();	67	this.modalRef.hide();
66	this.onClose.next({	68	this.onClose.next({
67	articulos: res,	69	articulos: res,
68	});	70	});
69	}, err => console.error(err));	71	}, err => console.error(err));
70	}	72	}
71		73
72	sumarCantidadSinonimo(articulo: IArticulo, i: number) {	74	sumarCantidadSinonimo(articulo: IArticulo, i: number) {
73	if (this.sinonimos[i].cantidadRestante === 0) return;	75	if (this.sinonimos[i].cantidadRestante === 0) return;
74	articulo.cantidad++;	76	articulo.cantidad++;
75	this.sinonimos[i].cantidadRestante--;	77	this.sinonimos[i].cantidadRestante--;
76	}	78	}
77		79
78	restarCantidadSinonimo(articulo: IArticulo, i: number) {	80	restarCantidadSinonimo(articulo: IArticulo, i: number) {
79	if (this.sinonimos[i].cantidadRestante === this.sinonimos[i].cantidad) return;	81	if (this.sinonimos[i].cantidadRestante === this.sinonimos[i].cantidad) return;
80	if (articulo.cantidad === 0) return;	82	if (articulo.cantidad === 0) return;
81	articulo.cantidad--;	83	articulo.cantidad--;
82	this.sinonimos[i].cantidadRestante++;	84	this.sinonimos[i].cantidadRestante++;
83	}	85	}
84		86
85	scrollTo(index: number) {	87	scrollTo(index: number) {
86	const el = document.getElementById(index.toString());	88	const el = document.getElementById(index.toString());
87	el.scrollIntoView({ behavior: 'smooth' });	89	el.scrollIntoView({ behavior: 'smooth' });
88	}	90	}
89		91
90	close() {	92	close() {
91	this.modalRef.hide();	93	this.modalRef.hide();
92	this.onClose.next();	94	this.onClose.next();
93	}	95	}
94		96
95	}	97	}