-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
printservice sets printlock from subject-pair-dialog.component.ts printlock is read from main.component.html. This needs a timeout in the print function call, hoping to resolve that still.
- Loading branch information
1 parent
1a376b2
commit e156b65
Showing
9 changed files
with
57 additions
and
17 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
src/main/webapp/app/entities/project/project-detail.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<div class="footer not-print" style="align-content: center"> | ||
<div class="footer" style="align-content: center"> | ||
<p [innerHTML]="'footer' | translate"></p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,13 @@ | ||
<div [ngClass]="(this.isPrintLocked$ | async) ? 'not-print' : ''"> | ||
<jhi-page-ribbon></jhi-page-ribbon> | ||
<div> | ||
<router-outlet name="navbar"></router-outlet> | ||
</div> | ||
<div class="container-fluid"> | ||
<div class="card jh-card"> | ||
<router-outlet></router-outlet> | ||
<router-outlet name="popup"></router-outlet> | ||
<div> | ||
<router-outlet name="navbar"></router-outlet> | ||
</div> | ||
<div class="container-fluid"> | ||
<div class="card jh-card"> | ||
<router-outlet></router-outlet> | ||
<router-outlet name="popup"></router-outlet> | ||
</div> | ||
<jhi-footer></jhi-footer> | ||
</div> | ||
<jhi-footer></jhi-footer> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/webapp/app/shared/subject/subject-pair-dialog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { Injectable } from '@angular/core'; | ||
import { BehaviorSubject } from "rxjs"; | ||
|
||
@Injectable({ providedIn: 'root' }) | ||
export class PrintService { | ||
|
||
public isPrintLocked$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false); | ||
|
||
constructor( | ||
) { | ||
this.isPrintLocked$.subscribe(isPrintLocked => { | ||
//console.log(`isPrintlocked: ${isPrintLocked}`) | ||
}) | ||
} | ||
|
||
setPrintLockTo(setTo: boolean) { | ||
this.isPrintLocked$.next(setTo) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
|
||
|
||
@media print { | ||
|
||
* { | ||
|