From bf7b6f26c6a9ddfca4708f83ded5f9414de24f12 Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Tue, 19 Nov 2019 21:18:44 +0000 Subject: [PATCH] Temporary Fields upon Association/Disassociation - Optionally apply temporary Call Number, Circ Modifier, Item Status, and Shelving Location when associating an item with a course. - Reapply original values of the above-mentioned fields when disassociating an item from a course. Signed-off-by: Kyle Huckins Changes to be committed: modified: Open-ILS/examples/fm_IDL.xml modified: Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html modified: Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts modified: Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql --- Open-ILS/examples/fm_IDL.xml | 8 ++ .../course-associate-material.component.html | 94 ++++++++++++++++- .../course-associate-material.component.ts | 116 +++++++++++++++++++-- .../course-reserves/course-reserves.module.ts | 2 + .../XXXX.schema.course-materials-module.sql | 6 +- 5 files changed, 214 insertions(+), 12 deletions(-) diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index 12f064feb2..4d63fff0b6 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -3107,10 +3107,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + + + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html index 43fdc822be..488eea7191 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.html @@ -13,7 +13,7 @@
-
+
@@ -34,6 +34,91 @@
+
+
+
The following fields will be applied to the material added, and reverted once the course is no longer associated with the material.
+
+
+
+
+
+
+
+ Call Number +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ Circulation Modifier +
+
+ + +
+
+ +
+
+
+
+
+
+
+
+
+
+ Item Status +
+
+ + +
+
+ +
+
+
+
+
+
+
+
+ Shelving Location +
+
+ + +
+
+ +
+
+
+
+
+
@@ -45,8 +130,10 @@ - + + +
@@ -67,4 +154,7 @@ + + {{r.label}} + \ No newline at end of file diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts index cba573fff2..cd4005613a 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-associate-material.component.ts @@ -3,6 +3,7 @@ import {Observable, Observer, of} from 'rxjs'; import {DialogComponent} from '@eg/share/dialog/dialog.component'; import {AuthService} from '@eg/core/auth.service'; import {NetService} from '@eg/core/net.service'; +import {EventService} from '@eg/core/event.service'; import {OrgService} from '@eg/core/org.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {Pager} from '@eg/share/util/pager'; @@ -29,6 +30,14 @@ export class CourseAssociateMaterialComponent extends DialogComponent { @Input() table_name = "Course Materials"; @Input() barcodeInput: String; @Input() relationshipInput: String; + @Input() tempCallNumber: String; + @Input() tempStatus: Number; + @Input() tempLocation: Number; + @Input() tempCircMod: String; + @Input() isModifyingStatus: Boolean; + @Input() isModifyingCircMod: Boolean; + @Input() isModifyingCallNumber: Boolean; + @Input() isModifyingLocation: Boolean; currentCourse: IdlObject; materials: any[]; gridDataSource: GridDataSource; @@ -39,6 +48,7 @@ export class CourseAssociateMaterialComponent extends DialogComponent { private net: NetService, private pcrud: PcrudService, private org: OrgService, + private evt: EventService, private modal: NgbModal, private toast: ToastService ) { @@ -58,10 +68,11 @@ export class CourseAssociateMaterialComponent extends DialogComponent { this.gridDataSource.data.splice(this.gridDataSource.data.indexOf(item, 0), 1); item_ids.push(item.id()) }); - this.pcrud.search('acmcm', {course: this.currentCourse.id(), item: item_ids}).subscribe(res => { - res.isdeleted(true); - this.pcrud.autoApply(res).subscribe( + this.pcrud.search('acmcm', {course: this.currentCourse.id(), item: item_ids}).subscribe(material => { + material.isdeleted(true); + this.pcrud.autoApply(material).subscribe( val => { + this.resetItemFields(material); console.debug('deleted: ' + val); this.deleteSuccessString.current().then(str => this.toast.success(str)); }, @@ -73,24 +84,76 @@ export class CourseAssociateMaterialComponent extends DialogComponent { }); } + resetItemFields(material) { + this.pcrud.retrieve('acp', material.item(), + {flesh: 3, flesh_fields: {acp: ['call_number']}}).subscribe(copy => { + if (material.original_status()) { + copy.status(material.original_status()); + } + if (copy.circ_modifier() != material.original_circ_modifier()) { + copy.circ_modifier(material.original_circ_modifier()); + } + if (material.original_location()) { + copy.location(material.original_location()); + } + if (material.original_callnumber()) { + this.pcrud.retrieve('acn', material.original_callnumber()).subscribe(cn => { + this.updateItem(copy, cn.label(), true); + }); + } else { + this.updateItem(copy, copy.call_number().label(), false); + } + }); + } + associateItem(barcode, relationship) { if (barcode) { - this.pcrud.search('acp', {barcode: barcode}).subscribe(item => { + this.pcrud.search('acp', {barcode: barcode}, + {flesh: 3, flesh_fields: {acp: ['call_number']}}).subscribe(item => { let material = this.idl.create('acmcm'); material.item(item.id()); material.course(this.currentCourse.id()); if (relationship) material.relationship(relationship); + if (this.isModifyingStatus && this.tempStatus) { + material.original_status(item.status()); + item.status(this.tempStatus); + } + if (this.isModifyingLocation && this.tempLocation) { + material.original_location(item.location()); + item.location(this.tempLocation); + } + if (this.isModifyingCircMod) { + material.original_circ_modifier(item.circ_modifier()); + item.circ_modifier(this.tempCircMod); + if (!this.tempCircMod) item.circ_modifier(null); + } + if (this.isModifyingCallNumber) { + material.original_callnumber(item.call_number()); + } this.pcrud.create(material).subscribe( val => { console.debug('created: ' + val); - if (item.circ_lib() != this.currentCourse.owning_lib()) { - this.differentLibraryString.current().then(str => this.toast.warning(str)); - } else { - this.successString.current().then(str => this.toast.success(str)); - } + let new_cn = item.call_number().label(); + if (this.tempCallNumber) new_cn = this.tempCallNumber; + this.updateItem(item, new_cn, this.isModifyingCallNumber); + if (item.circ_lib() != this.currentCourse.owning_lib()) { + this.differentLibraryString.current().then(str => this.toast.warning(str)); + } else { + this.successString.current().then(str => this.toast.success(str)); + } this.fetchItem(item.id(), relationship); + + // Cleaning up inputs this.barcodeInput = ""; this.relationshipInput = ""; + this.tempStatus = null; + this.tempCircMod = null; + this.tempCallNumber = null; + this.tempLocation = null; + this.isModifyingCallNumber = false; + this.isModifyingCircMod = false; + this.isModifyingLocation = false; + this.isModifyingStatus = false; }, err => { this.failedString.current().then(str => this.toast.danger(str)); }); @@ -98,6 +161,41 @@ export class CourseAssociateMaterialComponent extends DialogComponent { } } + updateItem(item: IdlObject, call_number, updatingVolume) { + return new Promise((resolve, reject) => { + this.pcrud.update(item).subscribe(item_id => { + if (updatingVolume) { + let cn = item.call_number(); + return this.net.request( + 'open-ils.cat', 'open-ils.cat.call_number.find_or_create', + this.auth.token(), call_number, cn.record(), + this.currentCourse.owning_lib(), cn.prefix(), cn.suffix(), + cn.label_class() + ).subscribe(res => { + let event = this.evt.parse(res); + if (event) return; + return this.net.request( + 'open-ils.cat', 'open-ils.cat.transfer_copies_to_volume', + this.auth.token(), res.acn_id, [item.id()] + ).subscribe(transfered_res => { + console.debug("Copy transferred to volume with code " + transfered_res); + }, err => { + reject(err); + }, () => { + resolve(item); + }); + }, err => { + reject(err); + }, () => { + resolve(item); + }); + } else { + return this.pcrud.update(item); + } + }); + }); + } + fetchMaterials(pager: Pager): Observable { return new Observable(observer => { this.materials.forEach(material => { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts index 0518730187..c87331baef 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-reserves.module.ts @@ -4,6 +4,7 @@ import {AdminCommonModule} from '@eg/staff/admin/common.module'; import {CourseListComponent} from './course-list.component'; import {CourseAssociateMaterialComponent} from './course-associate-material.component'; import {CourseReservesRoutingModule} from './routing.module'; +import {ItemLocationSelectModule} from '@eg/share/item-location-select/item-location-select.module'; @NgModule({ declarations: [ @@ -13,6 +14,7 @@ import {CourseReservesRoutingModule} from './routing.module'; imports: [ AdminCommonModule, CourseReservesRoutingModule, + ItemLocationSelectModule, TreeModule ], exports: [ diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql index 30fe9134e3..47d7a95452 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.course-materials-module.sql @@ -21,7 +21,11 @@ CREATE TABLE asset.course_module_course_materials ( id SERIAL PRIMARY KEY, course INT NOT NULL REFERENCES asset.course_module_course (id), item INT NOT NULL REFERENCES asset.copy (id), - relationship TEXT + relationship TEXT, + original_location INT REFERENCES asset.copy_location, + original_status INT REFERENCES config.copy_status, + original_circ_modifier TEXT REFERENCES config.circ_modifier, + original_callnumber INT REFERENCES asset.call_number ); CREATE TABLE asset.course_module_non_cat_course_materials ( -- 2.11.0