Commit 38f25b31c7ea08abd0f643a8f7a52d8b742ebb19
1 parent
099584bd37
Exists in
develop
agrego img not found cuando la promo no tiene imagen
Showing
2 changed files
with
7 additions
and
8 deletions
Show diff stats
src/app/modules/admin/admin.component.ts
| 1 | import { Component, OnInit, HostListener, OnDestroy } from '@angular/core'; | 1 | import { Component, OnInit, HostListener, OnDestroy } from '@angular/core'; |
| 2 | import { Router } from '@angular/router'; | 2 | import { Router } from '@angular/router'; |
| 3 | import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service'; | 3 | import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service'; |
| 4 | 4 | ||
| 5 | @Component({ | 5 | @Component({ |
| 6 | selector: 'app-admin', | 6 | selector: 'app-admin', |
| 7 | templateUrl: './admin.component.html', | 7 | templateUrl: './admin.component.html', |
| 8 | styleUrls: ['./admin.component.scss'] | 8 | styleUrls: ['./admin.component.scss'] |
| 9 | }) | 9 | }) |
| 10 | 10 | ||
| 11 | export class AdminComponent implements OnInit, OnDestroy { | 11 | export class AdminComponent implements OnInit, OnDestroy { |
| 12 | constructor( | 12 | constructor( |
| 13 | private inactiveScreen: InactiveScreenService, | 13 | private inactiveScreen: InactiveScreenService, |
| 14 | ) { } | 14 | ) { } |
| 15 | 15 | ||
| 16 | ngOnInit() { | 16 | ngOnInit() { |
| 17 | this.inactiveScreen.startTimeOutInactividad(); | 17 | // this.inactiveScreen.startTimeOutInactividad(); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | ngOnDestroy() { | 20 | ngOnDestroy() { |
| 21 | clearTimeout(this.inactiveScreen.timerReposo); | 21 | // clearTimeout(this.inactiveScreen.timerReposo); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | @HostListener('document:click', ['$event']) | 24 | // @HostListener('document:click', ['$event']) |
| 25 | eventListener(event: Event) { | 25 | // eventListener(event: Event) { |
| 26 | clearTimeout(this.inactiveScreen.timerReposo); | 26 | // clearTimeout(this.inactiveScreen.timerReposo); |
| 27 | this.inactiveScreen.startTimeOutInactividad(); | 27 | // this.inactiveScreen.startTimeOutInactividad(); |
| 28 | } | 28 | // } |
| 29 | 29 | ||
| 30 | } | 30 | } |
| 31 | 31 |
src/app/shared/header-publicidad/header-publicidad.component.ts
| 1 | import { Component, OnInit, TemplateRef } from '@angular/core'; | 1 | import { Component, OnInit, TemplateRef } from '@angular/core'; |
| 2 | import { APP_SETTINGS } from 'src/etc/AppSettings'; | 2 | import { APP_SETTINGS } from 'src/etc/AppSettings'; |
| 3 | import { IPublicidad } from 'src/app/interfaces/IPublicidad'; | 3 | import { IPublicidad } from 'src/app/interfaces/IPublicidad'; |
| 4 | import { PublicidadService } from 'src/app/services/publicidad/publicidad.service'; | 4 | import { PublicidadService } from 'src/app/services/publicidad/publicidad.service'; |
| 5 | import { IArticulo } from 'src/app/interfaces/IArticulo'; | 5 | import { IArticulo } from 'src/app/interfaces/IArticulo'; |
| 6 | import { PromocionComponent } from '../promocion/promocion.component'; | 6 | import { PromocionComponent } from '../promocion/promocion.component'; |
| 7 | import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal'; | 7 | import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal'; |
| 8 | import { ArticuloService } from 'src/app/services/articulo/articulo.service'; | 8 | import { ArticuloService } from 'src/app/services/articulo/articulo.service'; |
| 9 | import { ConfirmacionComponent } from '../confirmacion/confirmacion.component'; | 9 | import { ConfirmacionComponent } from '../confirmacion/confirmacion.component'; |
| 10 | import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service'; | 10 | import { SinonimoService } from 'src/app/services/sinonimo/sinonimo.service'; |
| 11 | import { ISinonimo } from 'src/app/interfaces/ISinonimo'; | 11 | import { ISinonimo } from 'src/app/interfaces/ISinonimo'; |
| 12 | import { SinonimoComponent } from '../sinonimo/sinonimo.component'; | 12 | import { SinonimoComponent } from '../sinonimo/sinonimo.component'; |
| 13 | 13 | ||
| 14 | @Component({ | 14 | @Component({ |
| 15 | selector: 'app-header-publicidad', | 15 | selector: 'app-header-publicidad', |
| 16 | templateUrl: './header-publicidad.component.html', | 16 | templateUrl: './header-publicidad.component.html', |
| 17 | styleUrls: ['./header-publicidad.component.scss'] | 17 | styleUrls: ['./header-publicidad.component.scss'] |
| 18 | }) | 18 | }) |
| 19 | export class HeaderPublicidadComponent implements OnInit { | 19 | export class HeaderPublicidadComponent implements OnInit { |
| 20 | urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`; | 20 | urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`; |
| 21 | publicidades: IPublicidad[] = []; | 21 | publicidades: IPublicidad[] = []; |
| 22 | modalRef: BsModalRef; | 22 | modalRef: BsModalRef; |
| 23 | 23 | ||
| 24 | constructor( | 24 | constructor( |
| 25 | private publicidadService: PublicidadService, | 25 | private publicidadService: PublicidadService, |
| 26 | private articuloService: ArticuloService, | 26 | private articuloService: ArticuloService, |
| 27 | private modalService: BsModalService, | 27 | private modalService: BsModalService, |
| 28 | private sinonimoService: SinonimoService | 28 | private sinonimoService: SinonimoService |
| 29 | ) { } | 29 | ) { } |
| 30 | 30 | ||
| 31 | ngOnInit() { | 31 | ngOnInit() { |
| 32 | this.getPublicidades(); | 32 | this.getPublicidades(); |
| 33 | this.mediaPantalla(); | 33 | this.mediaPantalla(); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | getPublicidades() { | 36 | getPublicidades() { |
| 37 | this.publicidadService.getAll() | 37 | this.publicidadService.getAll() |
| 38 | .subscribe((res: IPublicidad[]) => { | 38 | .subscribe((res: IPublicidad[]) => { |
| 39 | this.publicidades = res; | 39 | this.publicidades = res; |
| 40 | }, err => console.error(err)); | 40 | }, err => console.error(err)); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | elegirArticulo(publicidad: IPublicidad) { | 43 | elegirArticulo(publicidad: IPublicidad) { |
| 44 | if (publicidad.id_articulo) this.getByID(publicidad.id_articulo); | 44 | if (publicidad.id_articulo) this.getByID(publicidad.id_articulo); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | getByID(id: number) { | 47 | getByID(id: number) { |
| 48 | this.articuloService.getById(id) | 48 | this.articuloService.getById(id) |
| 49 | .subscribe((res: IArticulo) => { | 49 | .subscribe((res: IArticulo) => { |
| 50 | if (res.FPP) { | 50 | if (res.FPP) { |
| 51 | this.openModalPromos(res); | 51 | this.openModalPromos(res); |
| 52 | return; | 52 | return; |
| 53 | } else { | 53 | } else { |
| 54 | this.openModalConfirmacion(res); | 54 | this.openModalConfirmacion(res); |
| 55 | return; | 55 | return; |
| 56 | } | 56 | } |
| 57 | }, err => console.error(err)); | 57 | }, err => console.error(err)); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | openModalPromos(articulo: IArticulo) { | 60 | openModalPromos(articulo: IArticulo) { |
| 61 | this.modalRef = this.modalService.show(PromocionComponent, | 61 | this.modalRef = this.modalService.show(PromocionComponent, |
| 62 | { | 62 | { |
| 63 | initialState: { | 63 | initialState: { |
| 64 | idArticulo: articulo.id | 64 | idArticulo: articulo.id |
| 65 | }, | 65 | }, |
| 66 | class: 'modal-promo modal-dialog-centered' | 66 | class: 'modal-promo modal-dialog-centered' |
| 67 | }); | 67 | }); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | openModalConfirmacion(articulo: IArticulo) { | 70 | openModalConfirmacion(articulo: IArticulo) { |
| 71 | console.log(articulo) | ||
| 72 | this.modalRef = this.modalService.show(ConfirmacionComponent, | 71 | this.modalRef = this.modalService.show(ConfirmacionComponent, |
| 73 | { | 72 | { |
| 74 | initialState: { | 73 | initialState: { |
| 75 | titleMessage: articulo.DET_LAR, | 74 | titleMessage: articulo.DET_LAR, |
| 76 | imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/image-not-found.jpg', | 75 | imagenPath: articulo.imagenes.length ? articulo.imagenes[0].imagen : 'assets/img/image-not-found.jpg', |
| 77 | footerMessageFirst: `¿DESEA AGREGAR ESTE ARTÍCULO`, | 76 | footerMessageFirst: `¿DESEA AGREGAR ESTE ARTÍCULO`, |
| 78 | footerMessageSecond: `a su carrito?`, | 77 | footerMessageSecond: `a su carrito?`, |
| 79 | footerConfirmation: articulo.PreVen, | 78 | footerConfirmation: articulo.PreVen, |
| 80 | footerClose: `volver` | 79 | footerClose: `volver` |
| 81 | }, | 80 | }, |
| 82 | class: 'modal-promo modal-dialog-centered' | 81 | class: 'modal-promo modal-dialog-centered' |
| 83 | }); | 82 | }); |
| 84 | this.modalRef.content.onClose.subscribe(() => { | 83 | this.modalRef.content.onClose.subscribe(() => { |
| 85 | this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt) | 84 | this.sinonimoService.getSinonimos(articulo.CodSec, articulo.CodArt) |
| 86 | .subscribe((res: ISinonimo[]) => { | 85 | .subscribe((res: ISinonimo[]) => { |
| 87 | if (res.length) { | 86 | if (res.length) { |
| 88 | this.openModalSinonimos(res, articulo); | 87 | this.openModalSinonimos(res, articulo); |
| 89 | } else { | 88 | } else { |
| 90 | articulo.cantidad = 1; | 89 | articulo.cantidad = 1; |
| 91 | this.articuloService.setArticulo(articulo); | 90 | this.articuloService.setArticulo(articulo); |
| 92 | } | 91 | } |
| 93 | }, err => console.error(err)); | 92 | }, err => console.error(err)); |
| 94 | }); | 93 | }); |
| 95 | this.mediaPantalla(); | 94 | this.mediaPantalla(); |
| 96 | } | 95 | } |
| 97 | 96 | ||
| 98 | openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { | 97 | openModalSinonimos(sinonimosData: ISinonimo[], articulo: IArticulo) { |
| 99 | const modalSinonimo = this.modalService.show(SinonimoComponent, { | 98 | const modalSinonimo = this.modalService.show(SinonimoComponent, { |
| 100 | initialState: { sinonimos: sinonimosData }, | 99 | initialState: { sinonimos: sinonimosData }, |
| 101 | class: 'modal-promo modal-dialog-centered' | 100 | class: 'modal-promo modal-dialog-centered' |
| 102 | }); | 101 | }); |
| 103 | modalSinonimo.content.onClose | 102 | modalSinonimo.content.onClose |
| 104 | .subscribe((res: any) => { | 103 | .subscribe((res: any) => { |
| 105 | for (const a of articulo.productos) { | 104 | for (const a of articulo.productos) { |
| 106 | if (a.idSinonimo === res.ID_SIN) { | 105 | if (a.idSinonimo === res.ID_SIN) { |
| 107 | a.CODA = res.articulo.CodArt; | 106 | a.CODA = res.articulo.CodArt; |
| 108 | a.CodArt = res.articulo.CodArt; | 107 | a.CodArt = res.articulo.CodArt; |
| 109 | a.SECA = res.articulo.CodSec; | 108 | a.SECA = res.articulo.CodSec; |
| 110 | a.CodSec = res.articulo.CodSec; | 109 | a.CodSec = res.articulo.CodSec; |
| 111 | a.PreVen = res.articulo.PreVen; | 110 | a.PreVen = res.articulo.PreVen; |
| 112 | a.id = res.articulo.id; | 111 | a.id = res.articulo.id; |
| 113 | a.DET_LAR = res.articulo.DET_LAR; | 112 | a.DET_LAR = res.articulo.DET_LAR; |
| 114 | a.DetArt = res.articulo.DetArt; | 113 | a.DetArt = res.articulo.DetArt; |
| 115 | } | 114 | } |
| 116 | } | 115 | } |
| 117 | this.articuloService.setArticulo(articulo); | 116 | this.articuloService.setArticulo(articulo); |
| 118 | }); | 117 | }); |
| 119 | } | 118 | } |
| 120 | 119 | ||
| 121 | mediaPantalla() { | 120 | mediaPantalla() { |
| 122 | if ($('body').hasClass('media-pantalla')) { | 121 | if ($('body').hasClass('media-pantalla')) { |
| 123 | $('#headerPublicidad,#headerPad').addClass('media-pantalla'); | 122 | $('#headerPublicidad,#headerPad').addClass('media-pantalla'); |
| 124 | } | 123 | } |
| 125 | } | 124 | } |
| 126 | } | 125 | } |
| 127 | 126 |