From 4155a7a2abeffe73db0403a25f7a514514090ba3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 31 Dec 2019 13:02:57 -0500 Subject: [PATCH] LP1850546 Call number browse grid Return to grid-shaped call number browse with denser data display for main CN browse UI. Signed-off-by: Bill Erickson Signed-off-by: Ruth Frasur --- .../app/share/catalog/catalog-url.service.ts | 2 ++ .../src/app/share/catalog/catalog.service.ts | 2 +- .../src/app/share/catalog/search-context.ts | 6 ++++ .../catalog/cnbrowse/results.component.html | 29 ++++++++++++++---- .../catalog/cnbrowse/results.component.ts | 30 ++++++++++++++++++- 5 files changed, 61 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts index 4c45a4e3c7..7b9698f2d3 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/catalog-url.service.ts @@ -126,6 +126,7 @@ export class CatalogUrlService { if (context.cnBrowseSearch.isSearchable()) { params.cnBrowseTerm = context.cnBrowseSearch.value; params.cnBrowsePage = context.cnBrowseSearch.offset; + params.cnBrowsePageSize = context.cnBrowseSearch.limit; } return params; @@ -198,6 +199,7 @@ export class CatalogUrlService { if (params.has('cnBrowseTerm')) { context.cnBrowseSearch.value = params.get('cnBrowseTerm'); context.cnBrowseSearch.offset = Number(params.get('cnBrowsePage')); + context.cnBrowseSearch.limit = Number(params.get('cnBrowsePageSize')); } const ts = context.termSearch; diff --git a/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts index 3b50f61e43..c80d0b2683 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/catalog.service.ts @@ -431,7 +431,7 @@ export class CatalogService { return this.net.request( 'open-ils.supercat', 'open-ils.supercat.call_number.browse', - cbs.value, ctx.searchOrg.shortname(), ctx.pager.limit, cbs.offset + cbs.value, ctx.searchOrg.shortname(), cbs.limit, cbs.offset ).pipe(tap(result => ctx.searchState = CatalogSearchState.COMPLETE)); } } diff --git a/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts b/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts index f993b8ccbc..7010d9eff3 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/search-context.ts @@ -158,9 +158,14 @@ export class CatalogCnBrowseContext { // e.g. -2 means 2 pages back (alphabetically) from the original search. offset: number; + // Maintain a separate page size limit since it will generally + // differ from other search page sizes. + limit: number; + reset() { this.value = ''; this.offset = 0; + this.limit = 5; // UI will modify } isSearchable() { @@ -171,6 +176,7 @@ export class CatalogCnBrowseContext { const ctx = new CatalogCnBrowseContext(); ctx.value = this.value; ctx.offset = this.offset; + ctx.limit = this.limit; return ctx; } diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html index 09a1f4e870..4aff584464 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html @@ -32,13 +32,30 @@ -
-
- - + +
+ + +
+
+
+ {{callNumber.prefix().label()}} {{callNumber.label()}} + {{callNumber.suffix().label()}} + @ {{orgName(callNumber.owning_lib())}} +
+
{{callNumber._bibSummary.display.title}}
+
{{callNumber._bibSummary.display.author}}
+
+
+ +
+
+ +
-
+ +
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts index 037b9ea88f..bddf40efd1 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, OnDestroy} from '@angular/core'; +import {Component, Input, OnInit, OnDestroy} from '@angular/core'; import {ActivatedRoute, Router, ParamMap} from '@angular/router'; import {Subscription} from 'rxjs'; import {IdlObject} from '@eg/core/idl.service'; @@ -8,6 +8,7 @@ import {CatalogUrlService} from '@eg/share/catalog/catalog-url.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; import {StaffCatalogService} from '../catalog.service'; import {BibRecordSummary} from '@eg/share/catalog/bib-record.service'; +import {OrgService} from '@eg/core/org.service'; @Component({ selector: 'eg-catalog-cn-browse-results', @@ -15,6 +16,12 @@ import {BibRecordSummary} from '@eg/share/catalog/bib-record.service'; }) export class CnBrowseResultsComponent implements OnInit, OnDestroy { + @Input() rowCount = 5; + rowIndexList: number[] = []; + + // hard-coded because it requires template changes. + colCount = 3; + searchContext: CatalogSearchContext; results: any[]; routeSub: Subscription; @@ -22,6 +29,7 @@ export class CnBrowseResultsComponent implements OnInit, OnDestroy { constructor( private router: Router, private route: ActivatedRoute, + private org: OrgService, private cat: CatalogService, private bib: BibRecordService, private catUrl: CatalogUrlService, @@ -30,6 +38,11 @@ export class CnBrowseResultsComponent implements OnInit, OnDestroy { ngOnInit() { this.searchContext = this.staffCat.searchContext; + + for (let idx = 0; idx < this.rowCount; idx++) { + this.rowIndexList.push(idx); + } + this.routeSub = this.route.queryParamMap.subscribe( (params: ParamMap) => this.browseByUrl(params) ); @@ -42,6 +55,7 @@ export class CnBrowseResultsComponent implements OnInit, OnDestroy { browseByUrl(params: ParamMap): void { this.catUrl.applyUrlParams(this.searchContext, params); const cbs = this.searchContext.cnBrowseSearch; + cbs.limit = this.rowCount * this.colCount; if (cbs.isSearchable()) { this.results = []; @@ -117,6 +131,20 @@ export class CnBrowseResultsComponent implements OnInit, OnDestroy { this.router.navigate( ['/staff/catalog/record/' + summary.id], {queryParams: params}); } + + resultSlice(rowIdx: number): number[] { + const offset = rowIdx * this.colCount; + return this.results.slice(offset, offset + this.colCount); + } + + isCenter(rowIdx: number, colIdx: number): boolean { + const total = this.rowCount * this.colCount; + return Math.floor(total / 2) === ((rowIdx * this.colCount) + colIdx); + } + + orgName(orgId: number): string { + return this.org.get(orgId).shortname(); + } } -- 2.43.2