From 4cc3e72d4ab3992a8d35536bf28bce677b41651d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 11 May 2018 12:36:31 -0400 Subject: [PATCH] LP#1775466 Grid / billing types continued Signed-off-by: Bill Erickson --- .../src/app/share/grid/grid-toolbar.component.html | 36 +++++++++++-------- .../src/eg2/src/app/share/grid/grid.component.css | 6 ++-- .../src/eg2/src/app/share/grid/grid.component.ts | 11 ++++++ .../server/config/billing_type.component.html | 15 ++++++++ .../admin/server/config/billing_type.component.ts | 42 ++++++++++++++-------- Open-ILS/src/eg2/src/styles.css | 6 +++- 6 files changed, 84 insertions(+), 32 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html index e950e253bf..9924e09e6a 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html @@ -3,7 +3,7 @@
-
@@ -14,9 +14,9 @@
- - - -
@@ -46,8 +54,8 @@
-
this.dataSource.requestPage(this.pager)) } + // Grid keyboard navigation handlers. @HostListener('window:keydown', ['$event']) onKeyDown(evt: KeyboardEvent) { if (evt.key == 'ArrowUp') { this.selectPreviousRow(); } else if (evt.key == 'ArrowDown') { this.selectNextRow(); + } else if (evt.key == 'ArrowRight') { + if (this.lastSelectedIndex) + this.onRowDblClick(this.getRowByIndex(this.lastSelectedIndex)); } } @@ -91,6 +95,13 @@ export class EgGridComponent implements OnInit, AfterViewInit { } } + getRowByIndex(index: any): any { + for (let idx = 0; idx < this.dataSource.data.length; idx++) { + if (index == this.getRowIndex(this.dataSource.data[idx])) + return this.dataSource.data[idx]; + } + } + // Returns all selected rows, regardless of whether they are // currently visible in the grid display. getSelectedRows(): any[] { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html index 2a50066757..d102c31cdc 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html @@ -1,6 +1,21 @@ +
+
+
+ Owning Library +
+ + +
+
+ +
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.ts index 6f61aff9d4..91d37a5bcd 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.ts @@ -1,9 +1,12 @@ import {Component, OnInit, TemplateRef, ViewChild} from '@angular/core'; +import {EgIdlObject} from '@eg/core/idl.service'; import {EgGridDataSource} from '@eg/share/grid/grid-data-source'; import {EgGridComponent} from '@eg/share/grid/grid.component'; import {EgToastService} from '@eg/share/toast/toast.service'; import {Pager} from '@eg/share/util/pager'; import {EgPcrudService} from '@eg/core/pcrud.service'; +import {EgOrgService} from '@eg/core/org.service'; +import {EgAuthService} from '@eg/core/auth.service'; import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; import {EgStringComponent} from '@eg/share/string/string.component'; @@ -18,26 +21,34 @@ export class BillingTypeComponent implements OnInit { @ViewChild('btEditDialog') btEditDialog: FmRecordEditorComponent; @ViewChild('successString') successString: EgStringComponent; @ViewChild('createString') createString: EgStringComponent; - createBillingType: () => any; - //deleteSelectedBillingTypes: (bts: any[]) => any; + contextOrg: EgIdlObject; constructor( + private org: EgOrgService, + private auth: EgAuthService, private pcrud: EgPcrudService, private toast: EgToastService ) { this.dataSource = new EgGridDataSource(); + } - this.createBillingType = () => { - this.btEditDialog.mode = 'create'; - this.btEditDialog.open().then( - ok => { - this.createString.current() - .then(str => this.toast.success(str)); - this.btGrid.reload(); - }, - err => { } - ); - } + + orgOnChange(org: EgIdlObject) { + console.log('orgOnChange called ' + org.id()); + this.contextOrg = org; + this.btGrid.reload(); + } + + createBillingType() { + this.btEditDialog.mode = 'create'; + this.btEditDialog.open().then( + ok => { + this.createString.current() + .then(str => this.toast.success(str)); + this.btGrid.reload(); + }, + err => { } + ); } deleteSelected(billingTypes) { @@ -46,13 +57,16 @@ export class BillingTypeComponent implements OnInit { } ngOnInit() { + this.contextOrg = this.org.get(this.auth.user().ws_ou()); this.dataSource.getRows = (pager: Pager, sort: any[]) => { + let searchOrgs = this.org.fullPath(this.contextOrg, true); + let orderBy = {}; if (sort.length) orderBy = {cbt: sort[0].name + ' ' + sort[0].dir}; - return this.pcrud.retrieveAll('cbt', { + return this.pcrud.search('cbt', {owner : searchOrgs}, { offset: pager.offset, limit: pager.limit, order_by: orderBy diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index fef77477a3..cc1ee6fdab 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -6,7 +6,7 @@ /** BS default fonts are huge */ -body, .form-control, .btn { +body, .form-control, .btn, .input-group-text { /* This more or less matches the font size of the angularjs client. * The default BS4 font of 1rem is comically large. */ @@ -49,6 +49,10 @@ h5 {font-size: .95rem} padding-right: .25rem; /* default .5rem */ } +.mat-icon-in-button { + line-height: inherit; +} + .material-icons { /** default is 24px which is pretty chunky */ font-size: 22px; -- 2.11.0