Merge branch 'master' into 'develop'

Master(benjamin) See merge request !23

Merge branch 'master' into 'develop'
Master(benjamin) See merge request !23
Marcelo Puebla
2 parents 9cb0d72e9b 7188ed6ca8
Showing 2 changed files Show diff stats
src/app/modules/admin/admin.component.ts
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
@@ -17,16 +17,16 @@ export class AdminComponent implements OnInit {
     ) { }
  
   ngOnInit() {
-    // this.startTimeOutInactividad();
+    this.startTimeOutInactividad();
   }
  
   @HostListener('document:click', ['$event'])
  
-  // documentClick(event: MouseEvent) {
-  //   if (event) {
-  //     this.restartTimer();
-  //   }
-  // }
+  documentClick(event: MouseEvent) {
+    if (event) {
+      this.restartTimer();
+    }
+  }
  
   restartTimer() {
     clearTimeout(this.timerReposo);
@@ -139,6 +139,9 @@ export class SeleccionArticulosComponent implements OnInit {
       this.getPromociones();
       }, err => console.error(err));
     this.modalRef = this.modalService.show(templatePromos, { class: 'custom-modal modal-dialog-centered', backdrop: 'static' });
+    setTimeout(() => {
+      this.modalRef.hide();
+    }, 80000);
   }
  
   getPromociones() {
...	...	@@ -17,16 +17,16 @@ export class AdminComponent implements OnInit {
17	17	) { }
18	18
19	19	ngOnInit() {
20		- // this.startTimeOutInactividad();
	20	+ this.startTimeOutInactividad();
21	21	}
22	22
23	23	@HostListener('document:click', ['$event'])
24	24
25		- // documentClick(event: MouseEvent) {
26		- // if (event) {
27		- // this.restartTimer();
28		- // }
29		- // }
	25	+ documentClick(event: MouseEvent) {
	26	+ if (event) {
	27	+ this.restartTimer();
	28	+ }
	29	+ }
30	30
31	31	restartTimer() {
32	32	clearTimeout(this.timerReposo);
...	...	@@ -139,6 +139,9 @@ export class SeleccionArticulosComponent implements OnInit {
139	139	this.getPromociones();
140	140	}, err => console.error(err));
141	141	this.modalRef = this.modalService.show(templatePromos, { class: 'custom-modal modal-dialog-centered', backdrop: 'static' });
	142	+ setTimeout(() => {
	143	+ this.modalRef.hide();
	144	+ }, 80000);
142	145	}
143	146
144	147	getPromociones() {