From 516d88f97681c009cba3e37c10f731bc5bf80f1d Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Mon, 3 Oct 2022 00:12:02 -0400 Subject: [PATCH] lp1959010 toward Staff View tab * make our Staff View tab with the new BibStaffView widget * seed our BibStaffView with BibSummary * first attempt at changing some identifiers with our seed code * experimenting with layout and stripping courses functionality * simplifying the layout for now and adding display fields * moar data * layout tweaks and propagate metabib attributes for Formats and Editions * don't cross the streams with metabib related * field names for the record and metabib variants of the catalog_summary call. This would otherwise break some links in search results involving bibs with metarecords. * hyperlinks for the formats and editions in the catalog staff view * fix catalog_summary vs catalog_summary.staff bug * searchOrg depth was being passed where a boolean was expected * This seems like a failure of TypeScript to detect.. type. What was going on here? * layout and css tweaking * fixing toc and relocating it and some other fields to column 1 * label fix Signed-off-by: Jason Etheridge Signed-off-by: Mary Llewellyn Signed-off-by: Galen Charlton --- .../src/app/share/catalog/bib-record.service.ts | 6 + .../app/staff/catalog/record/record.component.html | 9 +- .../app/staff/catalog/record/record.component.ts | 3 +- Open-ILS/src/eg2/src/app/staff/common.module.ts | 3 + .../bib-staff-view/bib-staff-view.component.css | 7 + .../bib-staff-view/bib-staff-view.component.html | 348 +++++++++++++++++++++ .../bib-staff-view/bib-staff-view.component.ts | 89 ++++++ .../lib/OpenILS/Application/Search/Biblio.pm | 51 ++- 8 files changed, 511 insertions(+), 5 deletions(-) create mode 100644 Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.css create mode 100644 Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html create mode 100644 Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.ts diff --git a/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts b/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts index a4dd0b0f2e..954906c10f 100644 --- a/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts +++ b/Open-ILS/src/eg2/src/app/share/catalog/bib-record.service.ts @@ -37,6 +37,9 @@ export class BibRecordSummary { id: number; // == record.id() for convenience metabibId: number; // If present, this is a metabib summary metabibRecords: number[]; // all constituent bib records + staffViewMetabibId: number; // to supplement a record summary + staffViewMetabibRecords: number[]; // to supplement a record summary + staffViewMetabibAttributes: any; // to supplement a record summary orgId: number; orgDepth: number; record: IdlObject; @@ -128,6 +131,9 @@ export class BibRecordService { .pipe(map(bibSummary => { const summary = new BibRecordSummary(bibSummary.record, orgId); summary.net = this.net; // inject + summary.staffViewMetabibId = Number(bibSummary.staff_view_metabib_id); + summary.staffViewMetabibRecords = bibSummary.staff_view_metabib_records; + summary.staffViewMetabibAttributes = bibSummary.staff_view_metabib_attributes; summary.display = bibSummary.display; summary.attributes = bibSummary.attributes; summary.holdCount = bibSummary.hold_count; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html index f0428fa7f8..c4384a0bae 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.html @@ -38,6 +38,13 @@
    +
  • + Staff View + + + + +
  • Item Table @@ -115,5 +122,3 @@
    - - diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts index 619a5a0f1f..294842a290 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts @@ -9,6 +9,7 @@ import {CatalogService} from '@eg/share/catalog/catalog.service'; import {BibRecordService, BibRecordSummary} from '@eg/share/catalog/bib-record.service'; import {StaffCatalogService} from '../catalog.service'; import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.component'; +import {BibStaffViewComponent} from '@eg/staff/share/bib-staff-view/bib-staff-view.component'; import {StoreService} from '@eg/core/store.service'; import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {MarcEditorComponent} from '@eg/staff/share/marc-edit/editor.component'; @@ -154,7 +155,7 @@ export class RecordComponent implements OnInit { this.bib.getBibSummary( this.recordId, this.searchContext.searchOrg.id(), - this.searchContext.searchOrg.ou_type().depth()).toPromise() + this.searchContext.isStaff).toPromise() .then(summary => { this.summary = this.staffCat.currentDetailRecordSummary = summary; diff --git a/Open-ILS/src/eg2/src/app/staff/common.module.ts b/Open-ILS/src/eg2/src/app/staff/common.module.ts index 1381be062c..d463853384 100644 --- a/Open-ILS/src/eg2/src/app/staff/common.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts @@ -12,6 +12,7 @@ import {OpChangeComponent} from '@eg/staff/share/op-change/op-change.component'; import {TitleComponent} from '@eg/share/title/title.component'; import {BucketDialogComponent} from '@eg/staff/share/buckets/bucket-dialog.component'; import {BibSummaryComponent} from '@eg/staff/share/bib-summary/bib-summary.component'; +import {BibStaffViewComponent} from '@eg/staff/share/bib-staff-view/bib-staff-view.component'; import {EgHelpPopoverComponent} from '@eg/share/eg-help-popover/eg-help-popover.component'; import {DatetimeValidatorDirective} from '@eg/share/validators/datetime_validator.directive'; import {MultiSelectComponent} from '@eg/share/multi-select/multi-select.component'; @@ -36,6 +37,7 @@ import {OfflineService} from '@eg/staff/share/offline.service'; OpChangeComponent, BucketDialogComponent, BibSummaryComponent, + BibStaffViewComponent, EgHelpPopoverComponent, DatetimeValidatorDirective, MultiSelectComponent, @@ -61,6 +63,7 @@ import {OfflineService} from '@eg/staff/share/offline.service'; OpChangeComponent, BucketDialogComponent, BibSummaryComponent, + BibStaffViewComponent, EgHelpPopoverComponent, DatetimeValidatorDirective, MultiSelectComponent, diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.css b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.css new file mode 100644 index 0000000000..668b919889 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.css @@ -0,0 +1,7 @@ +.eg-bib-staff-view { + padding-top: 1rem; +} + +.eg-bib-staff-view .list-group-item { + padding: .25rem .25rem 0; +} diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html new file mode 100644 index 0000000000..c42a68d8ed --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.html @@ -0,0 +1,348 @@ +
    +
    + + +
    + + +
    +
    Title:
    +
    + + {{summary.display.title}} + +
    +
    + + +
    +
    Series Title:
    +
    + +
    +
    + + +
    +
    Author:
    +
    + + {{summary.display.author}} + +
    +
    + + +
    +
    Creator:
    +
    + +
    +
    + + +
    +
    Performer:
    +
    + +
    +
    + + +
    +
    Edition:
    +
    + {{summary.display.edition}} +
    +
    + + +
    +
    Publisher:
    +
    + {{summary.display.publisher}} +
    +
    + + +
    +
    Production Credit:
    +
    + +
    +
    + + +
    +
    Type of Resource:
    +
    + {{summary.display.type_of_resource}} +
    +
    + + +
    +
    Physical Description:
    +
    +
      +
    • + {{_desc}} +
      • +
    +
    +
    + + +
    +
    General Note:
    +
    +
      +
    • + {{_note}} +
      • +
    +
    +
    + + +
    +
    Bibliography:
    +
    +
      +
    • + {{_bibliography}} +
      • +
    +
    +
    + + +
    +
    Table of Contents:
    +
    + {{summary.display.toc}} +
    +
    + + +
    +
    Thesis:
    +
    +
      +
    • + {{_thesis}} +
      • +
    +
    +
    + +
    + +
    + + +
    +
    ISBN:
    +
    + +
    +
    + + +
    +
    ISSN:
    +
    + +
    +
    + + +
    +
    UPC:
    +
    + +
    +
    + + +
    +
    Hold and Copy Counts:
    +
    +
      +
    • {{summary.holdCount}} hold requests
      • +
    • + Record is holdable. + Record is not holdable. +
      • +
    • + {{_count.available}} of {{_count.count}} copies available at {{orgName(_count.org_unit)}}. +
      • +
    +
    +
    + + +
    +
    Formats and Editions:
    +
    + +
    +
    + +
    + +
    + + +
    +
    Abstract:
    +
    + {{summary.display.abstract}} +
    +
    + + +
    +
    Subject:
    +
    + +
    +
    + + +
    +
    Subject Name:
    +
    + +
    +
    + + +
    +
    Subject Topic:
    +
    + +
    +
    + + +
    +
    Subject Geographic:
    +
    + +
    +
    + + +
    +
    Subject Temporal:
    +
    + +
    +
    + + +
    +
    Genre:
    +
    +
      +
    • + {{_genre}} +
      • +
    +
    +
    + +
    + +
    +
    diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.ts b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.ts new file mode 100644 index 0000000000..21657057f5 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/bib-staff-view/bib-staff-view.component.ts @@ -0,0 +1,89 @@ +import {Component, OnInit, Input} from '@angular/core'; +import {OrgService} from '@eg/core/org.service'; +import {BibRecordService, BibRecordSummary + } from '@eg/share/catalog/bib-record.service'; +import {ServerStoreService} from '@eg/core/server-store.service'; +import {CatalogService} from '@eg/share/catalog/catalog.service'; + +@Component({ + selector: 'eg-bib-staff-view', + templateUrl: 'bib-staff-view.component.html', + styleUrls: ['bib-staff-view.component.css'] +}) +export class BibStaffViewComponent implements OnInit { + + initDone = false; + + // True / false if the display is vertically expanded + private _exp: boolean; + set expand(e: boolean) { + this._exp = e; + if (this.initDone) { + this.saveExpandState(); + } + } + get expand(): boolean { return this._exp; } + + // If provided, the record will be fetched by the component. + @Input() recordId: number; + + // Otherwise, we'll use the provided bib summary object. + summary: BibRecordSummary; + @Input() set bibSummary(s: any) { + this.summary = s; + if (this.initDone && this.summary) { + this.summary.getBibCallNumber(); + } + } + + constructor( + private bib: BibRecordService, + private org: OrgService, + private store: ServerStoreService, + private cat: CatalogService + ) {} + + ngOnInit() { + + this.store.getItem('eg.cat.record.staff-view.collapse') + .then(value => this.expand = !value) + .then(_ => this.cat.fetchCcvms()) + .then(_ => { + if (this.summary) { + return this.summary.getBibCallNumber(); + } else { + if (this.recordId) { + return this.loadSummary(); + } + } + }).then(_ => this.initDone = true); + } + + saveExpandState() { + this.store.setItem('eg.cat.record.staff-view.collapse', !this.expand); + } + + loadSummary(): Promise { + return this.bib.getBibSummary( + this.recordId, + this.org.root().id(), + true // isStaff + ).toPromise() + .then(summary => { + this.summary = summary; + return summary.getBibCallNumber(); + }); + } + + orgName(orgId: number): string { + if (orgId) { + return this.org.get(orgId).shortname(); + } + } + + iconFormatLabel(code: string): string { + return this.cat.iconFormatLabel(code); + } +} + + diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm index f7a0c8b1fa..cfe1f68f54 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm @@ -3079,8 +3079,15 @@ __PACKAGE__->register_method( desc => q/ Stream of record summary objects including id, record, hold_count, copy_counts, display (metabib display - fields), attributes (metabib record attrs), plus - metabib_id and metabib_records for the metabib variant. + fields), and attributes (metabib record attrs). The + metabib variant of the call gets metabib_id and + metabib_records, and the regular record version also + gets some metabib information, but returns them as + staff_view_metabib_id, staff_view_metabib_records, and + staff_view_metabib_attributes. This is to mitigate the + need for code changes elsewhere where assumptions are + made when certain fields are returned. + / } } @@ -3142,6 +3149,46 @@ sub catalog_record_summary { get_one_metarecord_summary($self, $e, $org_id, $rec_id) : get_one_record_summary($self, $e, $org_id, $rec_id); + # Let's get Formats & Editions data FIXME: consider peer bibs? + unless ($is_meta) { + my $meta_search = $e->search_metabib_metarecord_source_map({source => $rec_id}); + if ($meta_search) { + $response->{staff_view_metabib_id} = $meta_search->[0]->metarecord; + my $maps = $e->search_metabib_metarecord_source_map({metarecord => $response->{staff_view_metabib_id}}); + my @metabib_records = map { $_->source } @$maps; + $response->{staff_view_metabib_records} = \@metabib_records; + + my $attributes = $U->get_bre_attrs(\@metabib_records); + # we get "243":{ + # "srce":{ + # "code":" ", + # "label":"National bibliographic agency" + # }, ...} + my $metabib_attr = {}; + + foreach my $bib_id ( keys %{ $attributes } ) { + foreach my $ctype ( keys %{ $attributes->{$bib_id} } ) { + # we want { + # "srce":{ " ": { "label": "National bibliographic agency", "count" : 1 } }, + # ... + # } + my $current_code = $attributes->{$bib_id}->{$ctype}->{code}; + my $code_label = $attributes->{$bib_id}->{$ctype}->{label}; + $metabib_attr->{$ctype} = {} unless $metabib_attr->{$ctype}; + if (! $metabib_attr->{$ctype}->{ $current_code }) { + $metabib_attr->{$ctype}->{ $current_code } = { + "label" => $code_label, + "count" => 1 + } + } else { + $metabib_attr->{$ctype}->{ $current_code }->{count}++; + } + } + } + $response->{staff_view_metabib_attributes} = $metabib_attr; + } + } + ($response->{copy_counts}) = $copy_method->run($org_id, $rec_id); $response->{first_call_number} = get_first_call_number( -- 2.11.0