Luis Suarez / autoservicio-axion

Commit 609df1b5417cafaae79f50bc7ee934339f096fe5

Authored by Marcelo Puebla 2020-01-29 15:59:21 -0300

Exists in develop

Fix

Muestro nombre de articulo en modal de sinonimos

Showing 7 changed files with 47 additions and 37 deletions Show diff stats

main.js

Diff comments View file @ 609df1b

1	const { app, BrowserWindow } = require('electron')	1	const { app, BrowserWindow } = require('electron')
2		2
3	require('electron-debug')({ showDevTools: true });	3	require('electron-debug')({ showDevTools: true });
4		4
5	let win;	5	let win;
6		6
7	function createWindow() {	7	function createWindow() {
8	// Create the browser window.	8	// Create the browser window.
9	win = new BrowserWindow({	9	win = new BrowserWindow({
10	backgroundColor: '#ffffff',	10	backgroundColor: '#ffffff',
11	autoHideMenuBar: true,	11	autoHideMenuBar: true,
12	icon: `file://${__dirname}/dist/assets/logo.png`	12	icon: `file://${__dirname}/dist/autoservicio-axion/favicon.ico`
13	})	13	})
14		14
15	win.loadURL(`file://${__dirname}/dist/autoservicio-axion/index.html`)	15	win.loadURL(`file://${__dirname}/dist/autoservicio-axion/index.html`)
16		16
17	win.setFullScreen(true);	17	win.setFullScreen(true);
18		18
19	// uncomment below to open the //DevTools.	19	// uncomment below to open the //DevTools.
20	win.webContents.openDevTools()	20	win.webContents.openDevTools()
21		21
22	// Event when the window is closed.	22	// Event when the window is closed.
23	win.on('closed', function () {	23	win.on('closed', function () {
24	win = null	24	win = null
25	})	25	})
26		26
27	}	27	}
28		28
29	// Create window on electron intialization	29	// Create window on electron intialization
30	app.on('ready', createWindow)	30	app.on('ready', createWindow)
31		31
32	// Quit when all windows are closed.	32	// Quit when all windows are closed.
33	app.on('window-all-closed', function () {	33	app.on('window-all-closed', function () {
34		34
35	// On macOS specific close process	35	// On macOS specific close process
36	if (process.platform !== 'darwin') {	36	if (process.platform !== 'darwin') {
37	app.quit()	37	app.quit()
38	}	38	}
39	})	39	})
40		40
41	app.on('activate', function () {	41	app.on('activate', function () {
42	// macOS specific close process	42	// macOS specific close process
43	if (win === null) {	43	if (win === null) {
44	createWindow()	44	createWindow()
45	}	45	}
46	})	46	})
47		47

package.json

Diff comments View file @ 609df1b

1	{	1	{
2	"name": "autoservicio-axion",	2	"name": "autoservicio-axion",
3	"version": "0.0.1",	3	"version": "0.0.1",
4	"main": "main.js",	4	"main": "main.js",
5	"scripts": {	5	"scripts": {
6	"ng": "ng",	6	"ng": "ng",
7	"start": "ng serve --port 4206 --host 0.0.0.0 --disableHostCheck",	7	"start": "ng serve --port 4206 --host 0.0.0.0 --disableHostCheck",
8	"build": "ng build",	8	"build": "ng build",
9	"build-prod": "ng build --prod --aot=true --build--optimizer=true",	9	"build-prod": "ng build --prod --aot=true --build--optimizer=true",
10	"test": "ng test",	10	"test": "ng test",
11	"lint": "ng lint",	11	"lint": "ng lint",
12	"e2e": "ng e2e",	12	"e2e": "ng e2e",
13	"electron": "electron .",	13	"electron": "electron .",
14	"electron-build": "ng build --prod --aot=true --build--optimizer=true && electron .",	14	"electron-build": "ng build --prod --aot=true --build--optimizer=true && electron .",
15	"build-exe": "electron-packager . --platform=win32 --arch=x64 --asar"	15	"build-exe": "electron-packager . --platform=win32 --arch=x64"
16	},	16	},
17	"private": true,	17	"private": true,
18	"dependencies": {	18	"dependencies": {
19	"@angular/animations": "~8.2.14",	19	"@angular/animations": "~8.2.14",
20	"@angular/common": "~8.2.14",	20	"@angular/common": "~8.2.14",
21	"@angular/compiler": "~8.2.14",	21	"@angular/compiler": "~8.2.14",
22	"@angular/core": "~8.2.14",	22	"@angular/core": "~8.2.14",
23	"@angular/forms": "~8.2.14",	23	"@angular/forms": "~8.2.14",
24	"@angular/platform-browser": "~8.2.14",	24	"@angular/platform-browser": "~8.2.14",
25	"@angular/platform-browser-dynamic": "~8.2.14",	25	"@angular/platform-browser-dynamic": "~8.2.14",
26	"@angular/router": "~8.2.14",	26	"@angular/router": "~8.2.14",
27	"@types/jquery": "^3.3.31",	27	"@types/jquery": "^3.3.31",
28	"bootstrap": "^4.4.1",	28	"bootstrap": "^4.4.1",
29	"electron-debug": "^3.0.1",	29	"electron-debug": "^3.0.1",
30	"hammerjs": "^2.0.8",	30	"hammerjs": "^2.0.8",
31	"jquery": "^3.4.1",	31	"jquery": "^3.4.1",
32	"js-sha256": "^0.9.0",	32	"js-sha256": "^0.9.0",
33	"lodash": "^4.17.15",	33	"lodash": "^4.17.15",
34	"ngx-bootstrap": "^5.2.0",	34	"ngx-bootstrap": "^5.2.0",
35	"popper.js": "^1.16.0",	35	"popper.js": "^1.16.0",
36	"rxjs": "~6.4.0",	36	"rxjs": "~6.4.0",
37	"tslib": "^1.10.0",	37	"tslib": "^1.10.0",
38	"zone.js": "~0.9.1"	38	"zone.js": "~0.9.1"
39	},	39	},
40	"devDependencies": {	40	"devDependencies": {
41	"@angular-devkit/build-angular": "~0.803.20",	41	"@angular-devkit/build-angular": "~0.803.20",
42	"@angular/cli": "~8.3.20",	42	"@angular/cli": "~8.3.20",
43	"@angular/compiler-cli": "~8.2.14",	43	"@angular/compiler-cli": "~8.2.14",
44	"@angular/language-service": "~8.2.14",	44	"@angular/language-service": "~8.2.14",
45	"@fortawesome/fontawesome-free": "^5.12.0",	45	"@fortawesome/fontawesome-free": "^5.12.0",
46	"@types/jasmine": "~3.3.8",	46	"@types/jasmine": "~3.3.8",
47	"@types/jasminewd2": "~2.0.3",	47	"@types/jasminewd2": "~2.0.3",
48	"@types/lodash": "^4.14.149",	48	"@types/lodash": "^4.14.149",
49	"@types/node": "~8.9.4",	49	"@types/node": "~8.9.4",
50	"codelyzer": "^5.0.0",	50	"codelyzer": "^5.0.0",
51	"devtron": "^1.4.0",	51	"devtron": "^1.4.0",
52	"electron": "^7.1.6",	52	"electron": "^7.1.6",
53	"jasmine-core": "~3.4.0",	53	"jasmine-core": "~3.4.0",
54	"jasmine-spec-reporter": "~4.2.1",	54	"jasmine-spec-reporter": "~4.2.1",
55	"karma": "~4.1.0",	55	"karma": "~4.1.0",
56	"karma-chrome-launcher": "~2.2.0",	56	"karma-chrome-launcher": "~2.2.0",
57	"karma-coverage-istanbul-reporter": "~2.0.1",	57	"karma-coverage-istanbul-reporter": "~2.0.1",
58	"karma-jasmine": "~2.0.1",	58	"karma-jasmine": "~2.0.1",
59	"karma-jasmine-html-reporter": "^1.4.0",	59	"karma-jasmine-html-reporter": "^1.4.0",
60	"protractor": "~5.4.0",	60	"protractor": "~5.4.0",
61	"ts-node": "~7.0.0",	61	"ts-node": "~7.0.0",
62	"tslint": "~5.15.0",	62	"tslint": "~5.15.0",
63	"typescript": "~3.5.3"	63	"typescript": "~3.5.3"
64	}	64	}
65	}	65	}
66		66

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

Diff comments View file @ 609df1b

 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 {
   showSpinner = true;
   timeoutHandler: any;
   urlImagenes = `${APP_SETTINGS.apiDeboSuite}/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) => {
         this.showSpinner = false;
         console.error(error);
       });
   }
   setProductos() {
     this.articulos = JSON.parse(localStorage.getItem('articulos'));
     this.filterItems();
   }
   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) {
     this.modalRef = this.modalService.show(PromocionComponent, {
       initialState: { articulosPromo: [articulo] },
       class: 'modal-promo modal-dialog-centered'
     });
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     this.modalRef = this.modalService.show(SinonimoComponent, {
-      initialState: { sinonimos: sinonimosData },
+      initialState: {
+        sinonimos: sinonimosData,
+        articulo: articulo
+      },
       class: 'modal-promo modal-dialog-centered'
     });
     this.modalRef.content.onClose
       .subscribe((res: any) => {
         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/header-publicidad/header-publicidad.component.ts

Diff comments View file @ 609df1b

 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.apiDeboSuite}/imagenes/`;
   publicidades: IPublicidad[] = [];
   modalRef: 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) {
     this.modalRef = this.modalService.show(PromocionComponent,
       {
         initialState: {
           idArticulo: articulo.id
         },
         class: 'modal-promo modal-dialog-centered'
       });
   }
   openModalConfirmacion(articulo: IArticulo) {
     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: `¿DESEA AGREGAR ESTE ARTÍCULO`,
           footerMessageSecond: `a su carrito?`,
           footerConfirmation: articulo.PreVen,
           footerClose: `volver`
         },
         class: 'modal-promo modal-dialog-centered'
       });
     this.modalRef.content.onClose.subscribe(() => {
       this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt)
-      .subscribe((res: ISinonimo[]) => {
+        .subscribe((res: ISinonimo[]) => {
-        if (res.length) {
+          if (res.length) {
-          const sinonimos = [];
+            const sinonimos = [];
-          const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN');
+            const gruposArticulos = _.groupBy(res[0].productos, 'ID_SIN');
-          Object.keys(gruposArticulos).forEach(key => {
+            Object.keys(gruposArticulos).forEach(key => {
-            sinonimos.push({ productos: gruposArticulos[key] });
+              sinonimos.push({ productos: gruposArticulos[key] });
-          });
+            });
-          res = sinonimos;
+            res = sinonimos;
-          this.openModalSinonimos(res, articulo);
+            this.openModalSinonimos(res, articulo);
-        } else {
+          } else {
-          articulo.cantidad = 1;
+            articulo.cantidad = 1;
-          this.articuloService.setArticulo(articulo);
+            this.articuloService.setArticulo(articulo);
-        }
+          }
-      }, err => console.error(err));
+        }, err => console.error(err));
     });
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     const modalSinonimo = this.modalService.show(SinonimoComponent, {
-      initialState: { sinonimos: sinonimosData },
+      initialState: {
+        sinonimos: sinonimosData,
+        articulo: articulo
+      },
       class: 'modal-promo modal-dialog-centered'
     });
     modalSinonimo.content.onClose
-    .subscribe((res: any) => {
+      .subscribe((res: any) => {
-      for (const a of articulo.productos) {
+        for (const a of articulo.productos) {
-        for (const aRes of res.articulos) {
+          for (const aRes of res.articulos) {
-          if (a.idSinonimo === aRes.ID_SIN) {
+            if (a.idSinonimo === aRes.ID_SIN) {
-            a.CODA = aRes.CodArt;
+              a.CODA = aRes.CodArt;
-            a.CodArt = aRes.CodArt;
+              a.CodArt = aRes.CodArt;
-            a.SECA = aRes.CodSec;
+              a.SECA = aRes.CodSec;
-            aRes.CodSec = aRes.CodSec;
+              aRes.CodSec = aRes.CodSec;
-            a.PreVen = aRes.PreVen;
+              a.PreVen = aRes.PreVen;
-            a.id = aRes.id;
+              a.id = aRes.id;
-            a.DET_LAR = aRes.DET_LAR;
+              a.DET_LAR = aRes.DET_LAR;
-            a.DetArt = aRes.DetArt;
+              a.DetArt = aRes.DetArt;
+            }
           }
         }
-      }
+        this.articuloService.setArticulo(articulo);
-      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 @ 609df1b

 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.apiDeboSuite}/imagenes/`;
   constructor(
     public 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) {
     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.modalPromocion.hide();
         }
       }, err => console.error(err));
     this.mediaPantalla();
   }
   openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) {
     const modalSinonimo = this.modalService.show(SinonimoComponent, {
-      initialState: { sinonimos: sinonimosData },
+      initialState: {
+        sinonimos: sinonimosData,
+        articulo: articulo
+      },
       class: 'modal-promo modal-dialog-centered'
     });
     modalSinonimo.content.onClose
       .subscribe((res: any) => {
         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.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;
       }, 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.html

Diff comments View file @ 609df1b

1	<div class="bg-primary rounded text-white">	1	<div class="bg-primary rounded text-white">
2	<div class="modal-header">	2	<div class="modal-header">
3	<p class="h4 col-6 px-0 align-self-center">Eliga opciones {{sinonimos.length}}</p>	3	<p class="col-7 h4 px-0 align-self-center">{{articulo.DetArt}}</p>
4	<div class="col-6 text-right">	4	<div class="col-5 pr-0 text-right">
5	<p *ngFor="let s of sinonimos; let i = index">	5	<p *ngFor="let s of sinonimos; let i = index">
6	<span	6	<span
7	class="btn-effect"	7	class="btn-effect"
8	(click)="scrollTo(i)">	8	(click)="scrollTo(i)">
9	Ir a opción {{i+1}}	9	Ir a opción {{i+1}}
10	<i class="far fa-hand-point-left"></i>	10	<i class="far fa-hand-point-left"></i>
11	</span>	11	</span>
12	</p>	12	</p>
13	</div>	13	</div>
14	</div>	14	</div>
15		15
16	<div class="modal-body lista-sinonimos scroll-y-visible my-2 mr-2">	16	<div class="modal-body lista-sinonimos scroll-y-visible my-2 mr-2">
17	<div *ngFor="let s of sinonimos; let i = index">	17	<div *ngFor="let s of sinonimos; let i = index">
18	<div [id]="i"></div>	18	<div [id]="i"></div>
19	<hr [hidden]="i === 0" class="bg-white">	19	<hr [hidden]="i === 0" class="bg-white">
20	<div *ngFor="let articulo of s.productos">	20	<div *ngFor="let articulo of s.productos">
21	<div class="custom-control custom-checkbox">	21	<div class="custom-control custom-checkbox">
22	<input	22	<input
23	type="checkbox"	23	type="checkbox"
24	class="custom-control-input"	24	class="custom-control-input"
25	[(ngModel)]="articulo.seleccionado"	25	[(ngModel)]="articulo.seleccionado"
26	(click)="selectSinonimo(i, articulo)"	26	(click)="selectSinonimo(i, articulo)"
27	[id]="articulo.id">	27	[id]="articulo.id">
28	<label	28	<label
29	class="custom-control-label"	29	class="custom-control-label"
30	[for]="articulo.id">	30	[for]="articulo.id">
31	{{articulo.DET_LAR.toUpperCase()}}	31	{{articulo.DET_LAR.toUpperCase()}}
32	</label>	32	</label>
33	</div>	33	</div>
34	</div>	34	</div>
35	</div>	35	</div>
36	</div>	36	</div>
37		37
38	<div class="modal-footer">	38	<div class="modal-footer">
39	<div	39	<div
40	[ngClass]="validate()"	40	[ngClass]="validate()"
41	class="d-inline-block py-1 bg-white badge-pill text-primary"	41	class="d-inline-block py-1 bg-white badge-pill text-primary"
42	(click)="continue()">	42	(click)="continue()">
43	CONTINUAR	43	CONTINUAR
44	<img	44	<img
45	draggable="false"	45	draggable="false"
46	ondragstart="return false;"	46	ondragstart="return false;"
47	(contextmenu)="false"	47	(contextmenu)="false"
48	class="icon-30"	48	class="icon-30"
49	src="assets/img/ir-color.svg">	49	src="assets/img/ir-color.svg">
50	</div>	50	</div>
51	</div>	51	</div>
52	</div>	52	</div>
53		53

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

Diff comments View file @ 609df1b

 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;
   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;
     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', block: 'center' });
   }
 }