diff --git a/src/main/webapp/app/entities/project/project-detail.component.html b/src/main/webapp/app/entities/project/project-detail.component.html index 8845265d5..71dcd1d74 100644 --- a/src/main/webapp/app/entities/project/project-detail.component.html +++ b/src/main/webapp/app/entities/project/project-detail.component.html @@ -1,4 +1,4 @@ -
+

: diff --git a/src/main/webapp/app/layouts/footer/footer.component.html b/src/main/webapp/app/layouts/footer/footer.component.html index 49cac681d..beb8913b6 100644 --- a/src/main/webapp/app/layouts/footer/footer.component.html +++ b/src/main/webapp/app/layouts/footer/footer.component.html @@ -1,3 +1,3 @@ -
+

diff --git a/src/main/webapp/app/layouts/main/main.component.html b/src/main/webapp/app/layouts/main/main.component.html index 5bcd12ab0..afee55452 100644 --- a/src/main/webapp/app/layouts/main/main.component.html +++ b/src/main/webapp/app/layouts/main/main.component.html @@ -1,11 +1,13 @@ +
-
- -
-
-
- - +
+ +
+
+
+ + +
+
-
diff --git a/src/main/webapp/app/layouts/main/main.component.ts b/src/main/webapp/app/layouts/main/main.component.ts index 1a6e2e249..9348fd838 100644 --- a/src/main/webapp/app/layouts/main/main.component.ts +++ b/src/main/webapp/app/layouts/main/main.component.ts @@ -1,7 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRouteSnapshot, NavigationEnd, Router } from '@angular/router'; +import { Observable } from 'rxjs'; import { JhiLanguageHelper } from '../../shared'; +import {PrintService} from "../../shared/util/print.service"; @Component({ selector: 'jhi-main', @@ -12,15 +14,20 @@ export class JhiMainComponent implements OnInit { constructor( private jhiLanguageHelper: JhiLanguageHelper, + private printService: PrintService, private router: Router, ) { } + public isPrintLocked$: Observable; + ngOnInit() { this.router.events.subscribe((event) => { if (event instanceof NavigationEnd) { this.jhiLanguageHelper.updateTitle(); } }); + this.isPrintLocked$ = this.printService.isPrintLocked$; + //this.isPrintLocked$.subscribe(setTo => console.log("now we updated main.html")); } } diff --git a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html index 9ccabfb42..7fe1929cf 100644 --- a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html +++ b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts index 395f31078..439b66ad8 100644 --- a/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts +++ b/src/main/webapp/app/shared/subject/subject-pair-dialog.component.ts @@ -14,11 +14,13 @@ import { SubjectPopupService } from './subject-popup.service'; import { Subject } from './subject.model'; import { ObservablePopupComponent } from '../util/observable-popup.component'; import { map, switchMap, tap } from 'rxjs/operators'; +import { JhiMainComponent } from '../../layouts/main/main.component'; +import { PrintService } from '../util/print.service'; @Component({ selector: 'jhi-subject-pair-dialog', templateUrl: './subject-pair-dialog.component.html', - styleUrls: ['subject-pair-dialog.component.scss', '../../../content/scss/_print.scss'], + styleUrls: ['subject-pair-dialog.component.scss'], }) export class SubjectPairDialogComponent implements OnInit, OnDestroy { readonly authorities: string[]; @@ -35,12 +37,24 @@ export class SubjectPairDialogComponent implements OnInit, OnDestroy { private oauthClientService: OAuthClientService, private pairInfoService: OAuthClientPairInfoService, private datePipe: DatePipe, + private printService: PrintService, @Inject(DOCUMENT) private doc) { this.authorities = ['ROLE_USER', 'ROLE_SYS_ADMIN']; } - exportHtmlToPDF() { - window.print(); + async exportHtmlToPDF() { + // let pp: PrintService = this.printService; + // window.onafterprint = function(){ + // console.log("Printing completed..."); + // //pp.togglePrintLock().then(_ => {}) + // } + + this.printService.setPrintLockTo(true); + await new Promise(r => setTimeout(r, 0.000000000000000000000000000000000000000000000000000001)); + window.print() + this.printService.setPrintLockTo(false); + } + ngOnInit() { if (this.subject.project && this.subject.project.persistentTokenTimeout) { this.allowPersistentToken = true; diff --git a/src/main/webapp/app/shared/subject/subject.component.html b/src/main/webapp/app/shared/subject/subject.component.html index 1de4a3d81..8a656f03c 100644 --- a/src/main/webapp/app/shared/subject/subject.component.html +++ b/src/main/webapp/app/shared/subject/subject.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/main/webapp/app/shared/util/print.service.ts b/src/main/webapp/app/shared/util/print.service.ts new file mode 100644 index 000000000..21f6b7f8e --- /dev/null +++ b/src/main/webapp/app/shared/util/print.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { BehaviorSubject } from "rxjs"; + +@Injectable({ providedIn: 'root' }) +export class PrintService { + + public isPrintLocked$: BehaviorSubject = new BehaviorSubject(false); + + constructor( + ) { + this.isPrintLocked$.subscribe(isPrintLocked => { + //console.log(`isPrintlocked: ${isPrintLocked}`) + }) + } + + setPrintLockTo(setTo: boolean) { + this.isPrintLocked$.next(setTo) + } +} diff --git a/src/main/webapp/content/scss/_print.scss b/src/main/webapp/content/scss/_print.scss index c241d3383..3036acac8 100644 --- a/src/main/webapp/content/scss/_print.scss +++ b/src/main/webapp/content/scss/_print.scss @@ -1,5 +1,3 @@ - - @media print { * {