LP1965326 Printer Settings Angular Port

Ports the Admin -> Workstation Admin -> Printer Settings interface to
Angular.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/core/hatch.service.ts b/Open-ILS/src/eg2/src/app/core/hatch.service.ts
index 45ba5f4..eecf098 100644 (file)
--- a/Open-ILS/src/eg2/src/app/core/hatch.service.ts
+++ b/Open-ILS/src/eg2/src/app/core/hatch.service.ts
@@ -1,5 +1,23 @@
 import {Injectable, EventEmitter} from '@angular/core';
 
+export type PrintContext = 'default' | 'receipt' | 'label' | 'mail' | 'offline';
+
+export const PRINT_CONTEXTS: PrintContext[] = [
+    'default',
+    'receipt',
+    'label',
+    'mail',
+    'offline'
+];
+
+export interface PrintConfig {
+    context: PrintContext;
+    printer: string;
+    autoMargins: boolean;
+    allPages: boolean;
+    pageRanges: number[];
+}
+
 export class HatchMessage {
     msgid: number;
     resolver: (HatchMessage) => void; // promise resolver
@@ -28,6 +46,7 @@ export class HatchService {
     isAvailable: boolean;
     msgId: number;
     messages: {[msgid: number]: HatchMessage};
+    printers: any[];
 
     constructor() {
         this.isAvailable = null;
@@ -129,5 +148,37 @@ export class HatchService {
         const msg = new HatchMessage({action: 'remove', key: key});
         return this.sendRequest(msg).then((m: HatchMessage) => m.response);
     }
+
+    getPrinterOptions(name: string): Promise<any> {
+        if (name === 'hatch_file_writer' || name === 'hatch_browser_printing') {
+            return Promise.resolve({});
+        }
+        const msg = new HatchMessage({action: 'printer-options', printer: name});
+        return this.sendRequest(msg).then((m: HatchMessage) => m.response);
+    }
+
+    getPrinters(): Promise<any[]> {
+        if (this.printers) { return Promise.resolve(this.printers); }
+
+        this.printers = [
+            {name: 'hatch_file_writer'},
+            {name: 'hatch_browser_printing'}
+        ];
+
+        const msg = new HatchMessage({action: 'printers'});
+        return this.sendRequest(msg).then((m: HatchMessage) => m.response)
+        .then(
+            printers => {
+                this.printers =
+                    printers.sort((p1, p2) => p1.name < p2.name ? -1 : 1)
+                    .concat(this.printers);
+
+                return this.printers;
+            },
+            err => {
+                return this.printers;
+            }
+        );
+    }
 }
 

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html
new file mode 100644 (file)
index 0000000..bd70efb
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.html
@@ -0,0 +1,306 @@
+<eg-staff-banner bannerText="Printer Settings" i18n-bannerText></eg-staff-banner>
+
+<eg-string #fileWriter i18n-text text="Hatch File Writer"></eg-string>
+<eg-string #browserPrinting i18n-text text="Browser Printing"></eg-string>
+
+
+<ng-template #attrSelect let-attr="attr" let-defAttr="defAttr" let-options="options">
+  <div class="col-lg-4">
+    <select class="form-control"
+      [(ngModel)]="printConfigs[context][attr]">
+      <option *ngFor="let value of printerOptions[attr]" 
+        [value]="value">{{value}}</option>
+    </select>
+  </div>
+  <div class="col-lg-3" i18n>Default: {{printerOptions[defAttr]}}</div>
+</ng-template>
+
+<div class="col-lg-10 offset-lg-1">
+
+  <div class="alert alert-warning m-3" *ngIf="!useHatchPrinting" i18n>
+    Hatch printing is not enabled on this browser.  The settings below will 
+    have no effect until Hatch printing is enabled.
+  </div>
+
+  <ul ngbNav #contextTabs="ngbNav" class="nav-tabs"
+    [activeId]="context" (navChange)="beforeTabChange($event)">
+    <li ngbNavItem="default"><a ngbNavLink i18n>Default</a></li>
+    <li ngbNavItem="receipt"><a ngbNavLink i18n>Receipt</a></li>
+    <li ngbNavItem="label"><a ngbNavLink i18n>Label</a></li>
+    <li ngbNavItem="mail"><a ngbNavLink i18n>Mail</a></li>
+    <li ngbNavItem="offline"><a ngbNavLink i18n>Offline</a></li>
+    <li ngbNavItem="test" class="ml-auto"><a ngbNavLink i18n>Test Printing</a></li>
+  </ul>
+
+  <div [ngbNavOutlet]="contextTabs"></div>
+
+  <ng-container *ngIf="!showTestView">
+
+    <div class="row mt-4">
+      <div class="col-lg-8">
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <div ngbDropdown>
+              <button class="btn btn-outline-dark"
+                ngbDropdownToggle i18n>Select Printer</button>
+              <div ngbDropdownMenu>
+                <button class="dropdown-item" 
+                  *ngFor="let printer of printers" (click)="setPrinter(printer.name, true)">
+                  {{getPrinterLabel(printer.name)}}
+                </button>
+              </div>
+            </div>
+          </div>
+          <input type="text" [disabled]="true" class="form-control" 
+            [value]="getPrinterLabel(printerName)"/>
+        </div>
+      </div>
+      <div class="col-lg-4">
+        <button class="btn btn-warning" 
+          (click)="resetConfig(context)" i18n>Reset Form</button>
+
+        <button class="btn btn-success ml-2" 
+          (click)="saveConfig(context)" i18n>Apply Changes</button>
+      </div>
+    </div>
+
+    <hr class="mt-2 mb-2"/>
+
+    <div class="row" *ngIf="virtualPrinter()">
+      <div class="col-lg-12">
+        <div class="alert alert-info" 
+          *ngIf="printConfigs[context].printer == 'hatch_file_writer'" i18n>
+          Hatch File Writer translates print output to plain text
+          and writes the content to a text file in the Hatch profile directory.
+          No additional settings are required.
+        </div>
+        <div class="alert alert-info" 
+          *ngIf="printConfigs[context].printer == 'hatch_browser_printing'" i18n>
+          Hatch Browser Printing sends print requests directly
+          to the browser, bypassing the external Hatch print mechanism. No 
+          additional settings are required.
+        </div>
+      </div>
+    </div>
+
+    <div class="row border" *ngIf="printConfigs[context] && !virtualPrinter()">
+      <div class="col-lg-12 common-form striped-even">
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Print Color</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'printColor', defAttr: 'defaultPrintColor' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Paper Source</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'paperSource', defAttr: 'defaultPaperSource' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Paper</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'paper', defAttr: 'defaultPaper' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Page Orientation</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'pageOrientation', defAttr: 'defaultPageOrientation' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Collation</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'collation', defAttr: 'defaultCollation' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Print Quality</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'printQuality', defAttr: 'defaultPrintQuality' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Print Sides</div>
+          <ng-container *ngTemplateOutlet="attrSelect; 
+            context: {attr: 'printSides', defAttr: 'defaultPrintSides' }">
+          </ng-container>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Number of Items</div>
+          <div class="col-lg-4">
+            <input type="number" min="1" class="form-control" 
+              [(ngModel)]="printConfigs[context].copies"/>
+          </div>
+          <div class="col-lg-3" i18n>Default: {{printerOptions.defaultCopies}}</div>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-1 form-check">
+            <input type="radio" class="form-check-input position-static"
+              [(ngModel)]="printConfigs[context].autoMargins" name="margins" [value]="true"/>
+          </div>
+          <div class="col-lg-3 font-weight-bold" i18n>Automatic Margins</div>
+          <div class="col-lg-4">
+            <select class="form-control" [disabled]="!printConfigs[context].autoMargins"
+              [(ngModel)]="printConfigs[context].marginType">
+              <option *ngFor="let value of printerOptions.marginType" 
+                [value]="value">{{value}}</option>
+            </select>
+          </div>
+          <div class="col-lg-3" i18n>Default: {{printerOptions.defaultMarginType}}</div>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-1 form-check">
+            <input type="radio" class="form-check-input position-static"
+              [(ngModel)]="printConfigs[context].autoMargins" name="margins" [value]="false"/>
+          </div>
+          <div class="col-lg-3 font-weight-bold" i18n>Manual Margins</div>
+          <div class="col-lg-4">
+            <div class="d-flex">
+              <div class="flex-1 mr-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>Left</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].autoMargins" 
+                    [(ngModel)]="printConfigs[context].leftMargin"/>
+                </div>
+              </div>
+              <div class="flex-1 ml-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>Top</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].autoMargins" 
+                    [(ngModel)]="printConfigs[context].topMargin"/>
+                </div>
+              </div>
+            </div>
+            <div class="d-flex mt-2">
+              <div class="flex-1 mr-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>Right</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].autoMargins" 
+                    [(ngModel)]="printConfigs[context].rightMargin"/>
+                </div>
+              </div>
+              <div class="flex-1 ml-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>Bottom</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].autoMargins" 
+                    [(ngModel)]="printConfigs[context].bottomMargin"/>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="row mt-2 pt-2">
+          <div class="col-lg-3 offset-lg-1 font-weight-bold" i18n>Page Ranges</div>
+          <div class="col-lg-4">
+            <div class="d-flex">
+              <div class="flex-1 mr-1 form-check form-check-inline">
+                <input type="radio" class="form-check-input" id="all-pages"
+                  [(ngModel)]="printConfigs[context].allPages" name="page-ranges" [value]="true"/>
+                <label class="form-check-intput" for="all-pages" i18n>All Pages</label>
+              </div>
+              <div class="flex-1 ml-1">
+                <input type="radio" class="form-check-input" id="page-range"
+                  [(ngModel)]="printConfigs[context].allPages" name="page-ranges" [value]="false"/>
+                <label class="form-check-intput" for="page-range" i18n>Page Range</label>
+              </div>
+            </div>
+            <div class="d-flex mt-2">
+              <div class="flex-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>Start</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].allPages" 
+                    [(ngModel)]="printConfigs[context].pageRanges[0]"/>
+                </div>
+              </div>
+              <div class="flex-1 ml-1">
+                <div class="input-group">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" i18n>End</span>
+                  </div>
+                  <input type="text" class="form-control" 
+                    [disabled]="printConfigs[context].allPages" 
+                    [(ngModel)]="printConfigs[context].pageRanges[1]"/>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+    <div class="row mt-4">
+      <div class="col-lg-12">
+        <h3 i18n>Compiled Printer Settings</h3>
+        <pre class="bg-light border rounded">{{printConfigs[context] | json}}</pre>
+      </div>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="showTestView">
+
+    <div class="row mt-3">
+      <div class="col-lg-12 d-flex">
+        <div class="flex-1"></div>
+        <div>
+          <button class="btn btn-success ml-auto" (click)="testPrint(false)"
+            i18n>Print</button>
+        </div>
+        <div class="ml-2">
+          <button class="btn btn-primary ml-auto" (click)="testPrint(true)" 
+            i18n>Print with Dialog</button>
+        </div>
+      </div>
+    </div>
+
+    <ul ngbNav #testTabs="ngbNav" class="nav-tabs mt-2" 
+      (navChange)="beforeTestTabChange($event)" [activeId]="testTab">
+      <li ngbNavItem="text">
+        <a ngbNavLink i18n>Plain Text</a>
+        <ng-template ngbNavContent>
+          <pre><textarea class="w-100" [(ngModel)]="testText" rows="16"></textarea></pre>
+        </ng-template>
+      </li>
+      <li ngbNavItem="html">
+        <a ngbNavLink i18n>HTML</a>
+        <ng-template ngbNavContent>
+          <pre><textarea class="w-100" [(ngModel)]="testHtml" rows="16"></textarea></pre>
+        </ng-template>
+      </li>
+    </ul>
+
+    <div [ngbNavOutlet]="testTabs"></div>
+
+  </ng-container>
+
+</div>
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.ts
new file mode 100644 (file)
index 0000000..25663dc
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.component.ts
@@ -0,0 +1,210 @@
+import {Component, OnInit, ViewChild} from '@angular/core';
+import {Router, ActivatedRoute} from '@angular/router';
+import {from} from 'rxjs';
+import {concatMap} from 'rxjs/operators';
+import {ServerStoreService} from '@eg/core/server-store.service';
+import {IdlObject} from '@eg/core/idl.service';
+import {NetService} from '@eg/core/net.service';
+import {PermService} from '@eg/core/perm.service';
+import {AuthService} from '@eg/core/auth.service';
+import {OrgService} from '@eg/core/org.service';
+import {EventService} from '@eg/core/event.service';
+import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component';
+import {HatchService, PrintContext, PrintConfig, PRINT_CONTEXTS} from '@eg/core/hatch.service';
+import {PrintService, PrintRequest} from '@eg/share/print/print.service';
+import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap';
+import {StringComponent} from '@eg/share/string/string.component';
+
+@Component({
+  templateUrl: 'printers.component.html'
+})
+export class PrintersComponent implements OnInit {
+
+    printers: any[];
+    printerName: string;
+    context: PrintContext = 'default';
+    showTestView = false;
+    printConfigs: {[ctx: string]: PrintConfig} = {};
+    printerOptions: any = {};
+    useHatchPrinting = false;
+    testTab = 'text';
+
+    marginLeft: number;
+    marginRight: number;
+    marginTop: number;
+    marginBottom: number;
+
+    textPrintContent = '';
+    htmlPrintContent = '';
+
+    testText = `1234567890
+
+12345678901234567890
+
+123456789012345678901234567890
+
+1234567890123456789012345678901234567890
+
+12345678901234567890123456789012345678901234567890
+
+12345678901234567890123456789012345678901234567890123456790`;
+
+    testHtml = `<div style="padding: 10px;">
+  <style>p { color: blue }</style>
+  <h2>Test HTML Print</h2>
+  <br/>
+  <p><b>More Content</b></p>
+  <br/>
+</div>`;
+
+
+    @ViewChild('fileWriter') private fileWriter: StringComponent;
+    @ViewChild('browserPrinting') private browserPrinting: StringComponent;
+
+    constructor(
+        private router: Router,
+        private route: ActivatedRoute,
+        private evt: EventService,
+        private net: NetService,
+        private serverStore: ServerStoreService,
+        private auth: AuthService,
+        private org: OrgService,
+        private hatch: HatchService,
+        private printer: PrintService,
+        private perm: PermService
+    ) {}
+
+    ngOnInit() {
+
+        this.serverStore.getItem('eg.hatch.enable.printing')
+        .then(use => this.useHatchPrinting = use);
+
+        this.hatch.getPrinters()
+        .then(printers => {
+
+            this.printers = printers;
+
+            return from(PRINT_CONTEXTS).pipe(concatMap(ctx => {
+                return from(
+                    this.getPrintConfig(ctx).then(conf => {
+                        if (conf) {
+                            this.printConfigs[ctx] = conf;
+                        } else {
+                            this.resetConfig(ctx);
+                        }
+                    })
+                );
+            })).toPromise();
+        })
+        .then(_ => this.setContext('default'));
+    }
+
+    getPrinterLabel(name: string): string {
+        switch (name) {
+            case 'hatch_file_writer':
+                return this.fileWriter ? this.fileWriter.text : '';
+            case 'hatch_browser_printing':
+                return this.browserPrinting ? this.browserPrinting.text : '';
+            default:
+                if (this.printers) {
+                    const p = this.printers.filter(p2 => p2.name === name)[0];
+                    return p ? p.name : '';
+                } else {
+                    return '';
+                }
+        }
+    }
+
+    virtualPrinter(): boolean {
+        const conf = this.printConfigs[this.context];
+        return conf && (
+            conf.printer === 'hatch_file_writer' ||
+            conf.printer === 'hatch_browser_printing'
+        );
+    }
+
+    setContext(c: PrintContext) {
+        this.context = c;
+        this.showTestView = false;
+
+        const conf = this.printConfigs[c as string];
+        if (conf) { this.setPrinter(conf.printer); }
+    }
+
+    getPrinterOptions(name: string): Promise<any> {
+        return this.hatch.getPrinterOptions(name).then(ops => {
+            this.printerOptions = ops;
+        });
+    }
+
+    resetConfig(c: PrintContext) {
+        this.printConfigs[c] = {
+            context: 'default',
+            printer: '',
+            autoMargins: true,
+            allPages: true,
+            pageRanges: []
+        };
+    }
+
+    saveConfig(context: PrintContext): Promise<any> {
+        return this.setPrintConfig(context, this.printConfigs[context]);
+    }
+
+    setPrinter(name: string, reset?: boolean): Promise<any> {
+        if (reset) { this.resetConfig(this.context); }
+
+        this.printerName = name;
+        this.printConfigs[this.context].printer = name;
+
+        return this.getPrinterOptions(name);
+    }
+
+    testPrint(withDialog: boolean) {
+        const req: PrintRequest = {
+            printContext: this.context,
+            showDialog: withDialog,
+            contentType: this.testTab === 'text' ? 'text/plain' : 'text/html',
+            text: this.testTab === 'text' ? this.testText : this.testHtml
+        };
+
+        this.printer.print(req);
+    }
+
+    useFileWriter(): boolean {
+        return (
+            this.printConfigs[this.context] &&
+            this.printConfigs[this.context].printer === 'hatch_file_writer'
+        );
+    }
+
+    useBrowserPrinting(): boolean {
+        return (
+            this.printConfigs[this.context] &&
+            this.printConfigs[this.context].printer === 'hatch_browser_printing'
+        );
+    }
+
+    beforeTabChange(evt: NgbNavChangeEvent) {
+        if (evt.nextId === 'test') {
+            this.showTestView = true;
+        } else {
+            this.showTestView = false;
+            this.setContext(evt.nextId as PrintContext);
+        }
+    }
+
+    beforeTestTabChange(evt: NgbNavChangeEvent) {
+        this.testTab = evt.nextId;
+    }
+
+    setPrintConfig(context: PrintContext, config: PrintConfig): Promise<any> {
+        return this.serverStore.setItem('eg.print.config.' + context, config);
+    }
+
+    getPrintConfig(context: PrintContext): Promise<PrintConfig> {
+        return this.serverStore.getItem(`eg.print.config.${context}`);
+    }
+}
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.module.ts
new file mode 100644 (file)
index 0000000..0afe68c
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/printers.module.ts
@@ -0,0 +1,18 @@
+import {NgModule} from '@angular/core';
+import {StaffCommonModule} from '@eg/staff/common.module';
+import {PrintersRoutingModule} from './routing.module';
+import {PrintersComponent} from './printers.component';
+
+@NgModule({
+  declarations: [
+    PrintersComponent,
+  ],
+  imports: [
+    StaffCommonModule,
+    PrintersRoutingModule
+  ]
+})
+
+export class ManagePrintersModule {}
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/routing.module.ts
new file mode 100644 (file)
index 0000000..ef48fba
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/printers/routing.module.ts
@@ -0,0 +1,17 @@
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {PrintersComponent} from './printers.component';
+
+const routes: Routes = [{
+  path: '',
+  component: PrintersComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+
+export class PrintersRoutingModule {
+}
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts
index 6996a85..e59b8bf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts
@@ -2,9 +2,13 @@ import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 
 const routes: Routes = [{
-    path: 'workstations',
-    loadChildren: () =>
-      import('./workstations/workstations.module').then(m => m.ManageWorkstationsModule)
+  path: 'workstations',
+  loadChildren: () =>
+    import('./workstations/workstations.module').then(m => m.ManageWorkstationsModule)
+}, {
+  path: 'printers',
+  loadChildren: () =>
+    import('./printers/printers.module').then(m => m.ManagePrintersModule)
 }];
 
 @NgModule({

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
index 61a8d08..0657f48 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_splash.tt2
@@ -16,7 +16,7 @@
       <div class="row new-entry">
         <div class="col-md-6">
           <span class="glyphicon glyphicon-print"></span>
-          <a target="_self" href="./admin/workstation/print/config">
+          <a href="/eg2/staff/admin/workstation/printers">
             [% l('Printer Settings') %]
           </a>
         </div>