From 87208fdf4365fd2fff54045dab7f8e71a5abb602 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Thu, 18 Jul 2019 15:20:39 -0400 Subject: [PATCH] LP1823367 Move away from "volume" moniker internally It isn't really correct to use "volume" and "call number" interchangeably. This code substitutes various forms of the second for various forms of the first within the internal variable and function names. To help contain the change, it tries to only do so for values which are native to eg2, and not leaking from or into other interfaces. Understanding that this change is somewhat disruptive, I still think it is in our overall best interest, as it will help us from falling into old habits, and it will help future coders better understand the relationship between the code and the interface. Note, this code does not change any filenames. This is for review purposes to allow the changes to be more easily observed. If accepted, we should change couple of affected filenames as well. Signed-off-by: Dan Wells Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- .../staff/catalog/hold/hold.component.html | 4 +- .../catalog/record/actions.component.html | 12 +- .../staff/catalog/record/actions.component.ts | 14 +- .../catalog/record/holdings.component.css | 2 +- .../catalog/record/holdings.component.html | 32 +-- .../catalog/record/holdings.component.ts | 272 +++++++++--------- .../delete-volcopy-dialog.component.html | 2 +- .../delete-volcopy-dialog.component.ts | 30 +- .../staff/share/holdings/holdings.module.ts | 6 +- .../staff/share/holdings/holdings.service.ts | 14 +- .../app/staff/share/holds/holds.service.ts | 6 +- 11 files changed, 197 insertions(+), 197 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html index a63c69a449..fa04d86ede 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/hold/hold.component.html @@ -222,8 +222,8 @@
{{ctx.holdMeta.bibSummary.display.author}}
- - {{ctx.holdMeta.volume.label()}} + + {{ctx.holdMeta.callNum.label()}}
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html index 1d3856da08..62008a47df 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/actions.component.html @@ -5,8 +5,8 @@ i18n-text text="Record Overlay Target Set"> - + @@ -23,7 +23,7 @@ - @@ -62,10 +62,10 @@ (Currently {{targets.holdTransfer.current}}) -
-

Delete {{numVols}} call numbers and {{numCopies}} copies?

+

Delete {{numCallNums}} call numbers and {{numCopies}} copies?

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts index ad0e673e5a..397837404c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/delete-volcopy-dialog.component.ts @@ -16,25 +16,25 @@ import {StringComponent} from '@eg/share/string/string.component'; */ @Component({ - selector: 'eg-delete-volcopy-dialog', + selector: 'eg-delete-holding-dialog', templateUrl: 'delete-volcopy-dialog.component.html' }) -export class DeleteVolcopyDialogComponent +export class DeleteHoldingDialogComponent extends DialogComponent implements OnInit { // List of "acn" objects which may contain copies. // Objects of either type marked "isdeleted" will be deleted. - @Input() volumes: IdlObject[]; + @Input() callNums: IdlObject[]; // If true, just ask the server to delete all attached copies // for any deleted call numbers. - // Note if this is true and a volume is provided that does not contain - // of its fleshed copies, the number of copies to delete will not be + // Note if this is true and a call number is provided that does not + // contain its fleshed copies, the number of copies to delete will not be // reported correctly. @Input() forceDeleteCopies: boolean; - numVols: number; + numCallNums: number; numCopies: number; numSucceeded: number; numFailed: number; @@ -59,17 +59,17 @@ export class DeleteVolcopyDialogComponent ngOnInit() {} open(args: NgbModalOptions): Observable { - this.numVols = 0; + this.numCallNums = 0; this.numCopies = 0; this.numSucceeded = 0; this.numFailed = 0; - this.volumes.forEach(vol => { - if (vol.isdeleted()) { - this.numVols++; + this.callNums.forEach(callNum => { + if (callNum.isdeleted()) { + this.numCallNums++; } - if (Array.isArray(vol.copies())) { - vol.copies().forEach(c => { + if (Array.isArray(callNum.copies())) { + callNum.copies().forEach(c => { if (c.isdeleted() || this.forceDeleteCopies) { // Marking copies deleted in forceDeleteCopies mode // is not required, but we do it here so we can @@ -81,8 +81,8 @@ export class DeleteVolcopyDialogComponent } }); - if (this.numVols === 0 && this.numCopies === 0) { - console.debug('Volcopy delete called with no usable data'); + if (this.numCallNums === 0 && this.numCopies === 0) { + console.debug('Holdings delete called with no usable data'); return throwError(false); } @@ -98,7 +98,7 @@ export class DeleteVolcopyDialogComponent this.net.request( 'open-ils.cat', 'open-ils.cat.asset.volume.fleshed.batch.update.override', - this.auth.token(), this.volumes, 1, flags + this.auth.token(), this.callNums, 1, flags ).toPromise().then( result => { const evt = this.evt.parse(result); diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts index d9ae4fb7e3..be495548ca 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.module.ts @@ -5,7 +5,7 @@ import {MarkDamagedDialogComponent} from './mark-damaged-dialog.component'; import {MarkMissingDialogComponent} from './mark-missing-dialog.component'; import {CopyAlertsDialogComponent} from './copy-alerts-dialog.component'; import {ReplaceBarcodeDialogComponent} from './replace-barcode-dialog.component'; -import {DeleteVolcopyDialogComponent} from './delete-volcopy-dialog.component'; +import {DeleteHoldingDialogComponent} from './delete-volcopy-dialog.component'; import {ConjoinedItemsDialogComponent} from './conjoined-items-dialog.component'; @NgModule({ @@ -14,7 +14,7 @@ import {ConjoinedItemsDialogComponent} from './conjoined-items-dialog.component' MarkMissingDialogComponent, CopyAlertsDialogComponent, ReplaceBarcodeDialogComponent, - DeleteVolcopyDialogComponent, + DeleteHoldingDialogComponent, ConjoinedItemsDialogComponent ], imports: [ @@ -25,7 +25,7 @@ import {ConjoinedItemsDialogComponent} from './conjoined-items-dialog.component' MarkMissingDialogComponent, CopyAlertsDialogComponent, ReplaceBarcodeDialogComponent, - DeleteVolcopyDialogComponent, + DeleteHoldingDialogComponent, ConjoinedItemsDialogComponent ], providers: [ diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts index 87b0ff1a9a..3c703e6373 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/holdings.service.ts @@ -7,7 +7,7 @@ import {AnonCacheService} from '@eg/share/util/anon-cache.service'; import {AuthService} from '@eg/core/auth.service'; import {EventService} from '@eg/core/event.service'; -interface NewVolumeData { +interface NewCallNumData { owner: number; label?: string; } @@ -25,16 +25,16 @@ export class HoldingsService { // Open the holdings editor UI in a new browser window/tab. spawnAddHoldingsUi( recordId: number, // Bib record ID - addToVols?: number[], // Add copies to / modify existing vols - volumeData?: NewVolumeData[], // Creating new volumes + addToCallNums?: number[], // Add copies to / modify existing CNs + callNumData?: NewCallNumData[], // Creating new call numbers hideCopies?: boolean) { // Hide the copy edit pane const raw: any[] = []; - if (addToVols) { - addToVols.forEach(volId => raw.push({callnumber: volId})); - } else if (volumeData) { - volumeData.forEach(data => raw.push(data)); + if (addToCallNums) { + addToCallNums.forEach(callNumId => raw.push({callnumber: callNumId})); + } else if (callNumData) { + callNumData.forEach(data => raw.push(data)); } if (raw.length === 0) { raw.push({}); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts index 91a45ae570..231b44cba5 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds/holds.service.ts @@ -39,8 +39,8 @@ export interface HoldRequest { // A fleshed hold request target object containing whatever data is // available for each hold type / target. E.g. a TITLE hold will -// not have a value for 'volume', but a COPY hold will, since all -// copies have volumes. Every HoldRequestTarget will have a bibId and +// not have a value for 'callNum', but a COPY hold will, since all +// copies have call numbers. Every HoldRequestTarget will have a bibId and // bibSummary. Some values come directly from the API call, others // applied locally. export interface HoldRequestTarget { @@ -50,7 +50,7 @@ export interface HoldRequestTarget { bibId?: number; bibSummary?: BibRecordSummary; part?: IdlObject; - volume?: IdlObject; + callNum?: IdlObject; copy?: IdlObject; issuance?: IdlObject; metarecord_filters?: any; -- 2.43.2