From: Llewellyn Marshall <llewellyn.marshall@ncdcr.gov>
Date: Tue, 15 Nov 2022 18:29:33 +0000 (-0500)
Subject: on the holdings edit page grab all call number prefixes and suffixes from the databas... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=239081237a1622301e157dc770aa183214da60e2;p=working%2FEvergreen.git

on the holdings edit page grab all call number prefixes and suffixes from the database, filter them down in volcopy edit based on owning library of the copy.

add documentation & use fullpath instead of ancestors/descendants
---

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
index 2e295282a7..f41d33b762 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
@@ -46,7 +46,7 @@
       <div><label class="font-weight-bold" i18n>Prefix</label></div>
       <div>
         <eg-combobox [smallFormControl]="true" [(ngModel)]="batchVolPrefix">
-          <eg-combobox-entry *ngFor="let pfx of volcopy.commonData.acn_prefix"
+          <eg-combobox-entry *ngFor="let pfx of batchPrefixes()"
             [entryId]="pfx.id()" [entryLabel]="pfx.label()">
           </eg-combobox-entry>
         </eg-combobox>
@@ -73,7 +73,7 @@
       <div><label class="font-weight-bold" i18n>Suffix</label></div>
       <div>
         <eg-combobox [smallFormControl]="true" [(ngModel)]="batchVolSuffix">
-          <eg-combobox-entry *ngFor="let sfx of volcopy.commonData.acn_suffix"
+          <eg-combobox-entry *ngFor="let sfx of batchSuffixes()"
             [entryId]="sfx.id()" [entryLabel]="sfx.label()">
           </eg-combobox-entry>
         </eg-combobox>
@@ -294,7 +294,7 @@
                 <eg-combobox-entry
                   [entryId]="-1" entryLabel="<None>" i18n-entryLabel>
                 </eg-combobox-entry>
-                <eg-combobox-entry *ngFor="let pfx of volcopy.commonData.acn_prefix"
+                <eg-combobox-entry *ngFor="let pfx of orgPrefixes(orgNode.target.id())"
                   [entryId]="pfx.id()" [entryLabel]="pfx.label()">
                 </eg-combobox-entry>
               </eg-combobox>
@@ -322,7 +322,7 @@
                 <eg-combobox-entry
                   [entryId]="-1" entryLabel="<None>" i18n-entryLabel>
                 </eg-combobox-entry>
-                <eg-combobox-entry *ngFor="let sfx of volcopy.commonData.acn_suffix"
+                <eg-combobox-entry *ngFor="let sfx of orgSuffixes(orgNode.target.id())"
                   [entryId]="sfx.id()" [entryLabel]="sfx.label()">
                 </eg-combobox-entry>
               </eg-combobox>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
index 9370a0773a..1d2860c8ca 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
@@ -588,5 +588,37 @@ export class VolEditComponent implements OnInit {
             !this.volcopy.defaults.visible.batch_actions;
         this.volcopy.saveDefaults();
     }
+
+	// Retrieve call number prefixes for the work station OU
+	batchPrefixes(): IdlObject[]{
+		return this.orgPrefixes(this.auth.user().ws_ou());
+	}
+
+	// Retrieve call number suffixes for the work station OU
+	batchSuffixes(): IdlObject[]{
+		return this.orgSuffixes(this.auth.user().ws_ou());
+	}
+
+	// Given an org unit ID, find all call number prefixes belonging to
+	// the org unit, its ancestors, and its descendants
+    orgPrefixes(orgId: number): IdlObject[] {
+        let r = [];
+		this.org.fullPath(orgId,true).forEach( org => {
+			if(this.volcopy.callNumberPrefixMap[org])
+				this.volcopy.callNumberPrefixMap[org].forEach(prefix => r.push(prefix));
+		});
+		return r;
+    }
+
+	// Given an org unit ID, find all call number suffixes belonging to
+	// the org unit, its ancestors, and its descendants
+    orgSuffixes(orgId: number): IdlObject[] {
+        let r = [];
+		this.org.fullPath(orgId,true).forEach( org => {
+			if(this.volcopy.callNumberSuffixMap[org])
+				this.volcopy.callNumberSuffixMap[org].forEach(suffix => r.push(suffix));
+		});
+		return r;
+    }
 }
 
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
index ed023eeddd..960641e5ad 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
@@ -42,6 +42,8 @@ export class VolCopyService {
     currentContext: VolCopyContext;
 
     statCatEntryMap: {[id: number]: IdlObject} = {}; // entry id => entry
+	callNumberPrefixMap: {[key: string]: IdlObject[]} = {};
+	callNumberSuffixMap: {[key: string]: IdlObject[]} = {};
 
     templateNames: ComboboxEntry[] = [];
     templates: any = {};
@@ -107,10 +109,30 @@ export class VolCopyService {
         // specially in the markup.
         this.commonData.acn_prefix =
             this.commonData.acn_prefix.filter(pfx => pfx.id() !== -1);
-
+		// Map the call number prefixes by their owning libraries
+        this.commonData.acn_prefix.forEach(
+			pfx => {
+				let ol = pfx.owning_lib();
+                if (!this.callNumberPrefixMap[ol]) {
+                    this.callNumberPrefixMap[ol] = [];
+                }
+                this.callNumberPrefixMap[ol].push(pfx);				
+			}
+		);
+		
         this.commonData.acn_suffix =
             this.commonData.acn_suffix.filter(sfx => sfx.id() !== -1);
-
+		// Map the call number suffixes by their owning libraries
+        this.commonData.acn_suffix.forEach(
+			sfx => {
+				let ol = sfx.owning_lib();
+                if (!this.callNumberSuffixMap[ol]) {
+                    this.callNumberSuffixMap[ol] = [];
+                }
+                this.callNumberSuffixMap[ol].push(sfx);				
+			}
+		);
+		
         this.commonData.acp_status.forEach(
             stat => this.copyStatuses[stat.id()] = stat);
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
index deb7ad4036..de49876437 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat.pm
@@ -2039,14 +2039,14 @@ sub volcopy_data {
     
     $client->respond({
         acn_prefix => $e->search_asset_call_number_prefix([
-            {owning_lib => $org_ids},
+            {id => {'!=' => undef}},
             {order_by => {acnp => 'label_sortkey'}}
         ])
     });
 
     $client->respond({
         acn_suffix => $e->search_asset_call_number_suffix([
-            {owning_lib => $org_ids},
+            {id => {'!=' => undef}},
             {order_by => {acns => 'label_sortkey'}}
         ])
     });