From e053954bc055ee2e66ae33a24222eb8b792a471b Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Sun, 9 Aug 2020 20:03:26 -0700 Subject: [PATCH] LP1849212: Improvements to course materials admin UI - Better order for acmc fm-editor - Add original item attributes to the course materials list - trim whitespace from barcodes - accessible labels in the course page - refactor course users - fix incorrect paths in course materials grid columns Signed-off-by: Jane Sandberg Signed-off-by: Michele Morgan Signed-off-by: Galen Charlton --- .../course-associate-material.component.html | 30 +++--- .../course-associate-material.component.ts | 12 +-- .../course-associate-users.component.html | 40 ++++---- .../course-associate-users.component.ts | 77 ++++---------- .../course-reserves/course-list.component.html | 19 ++-- .../local/course-reserves/course-list.component.ts | 64 +++++------- .../course-reserves/course-page.component.html | 1 + .../local/course-reserves/course-page.component.ts | 26 +---- .../admin/local/course-reserves/routing.module.ts | 2 +- .../app/staff/catalog/result/record.component.ts | 2 +- Open-ILS/src/eg2/src/app/staff/common.module.ts | 4 +- .../src/eg2/src/app/staff/share/course.service.ts | 113 +++++++-------------- .../src/app/staff/share/marc-edit/marcrecord.ts | 2 +- .../perlmods/lib/OpenILS/Application/Courses.pm | 3 +- 14 files changed, 151 insertions(+), 244 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html index 9acbe99c43..73e5bddc46 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html @@ -6,7 +6,7 @@ - +
@@ -28,9 +28,10 @@
- Barcode +
-
@@ -66,10 +67,10 @@
- Call Number +
-
@@ -217,15 +218,18 @@ - -
@@ -256,5 +260,5 @@ + hiddenFields="id,item,original_callnumber,original_status,original_location,original_circ_modifier,record,temporary_record"> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts index 541ea1a8b1..bb695193dd 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts @@ -132,9 +132,9 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements editOneThing(itemFields.shift()); } - showEditDialog(course_material: IdlObject): Promise { + showEditDialog(courseMaterial: IdlObject): Promise { this.editDialog.mode = 'update'; - this.editDialog.recordId = course_material._id; + this.editDialog.recordId = courseMaterial.id(); return new Promise((resolve, reject) => { this.editDialog.open({size: 'lg'}).subscribe( result => { @@ -142,11 +142,9 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements .then(str => this.toast.success(str)); this.pcrud.retrieve('acmcm', result).subscribe(material => { if (material.course() !== this.courseId) { - this.materialsDataSource.data.splice( - this.materialsDataSource.data.indexOf(course_material, 0), 1 - ); + this.materialsGrid.reload(); } else { - course_material._relationship = material.relationship(); + courseMaterial.relationship = material.relationship(); } }); resolve(result); @@ -163,7 +161,7 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements associateItem(barcode, relationship) { if (barcode) { const args = { - barcode: barcode, + barcode: barcode.trim(), relationship: relationship, isModifyingCallNumber: this.isModifyingCallNumber, isModifyingCircMod: this.isModifyingCircMod, diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html index a0969bfdd0..f96087deee 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html @@ -23,10 +23,10 @@
- Patron Barcode +
-
@@ -34,9 +34,9 @@
- Role +
- @@ -48,12 +48,12 @@
- Is Public Role? +
-
@@ -70,22 +70,22 @@
- + - - - - - - - - - - - + + + + + + + + + + +
@@ -103,4 +103,4 @@ [fieldOptions]="{course: {linkedSearchField: 'course_number'}}" [preloadLinkedValues]="true" hiddenFields="id,usr"> - \ No newline at end of file + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts index 1b1ebfac47..d9360ccb00 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts @@ -1,19 +1,14 @@ -import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Observable, Observer, of} from 'rxjs'; +import {Component, Input, ViewChild, OnInit} from '@angular/core'; 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'; -import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {GridDataSource} from '@eg/share/grid/grid'; import {GridComponent} from '@eg/share/grid/grid.component'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {StringComponent} from '@eg/share/string/string.component'; -import {StaffBannerComponent} from '@eg/staff/share/staff-banner.component'; import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {CourseService} from '@eg/staff/share/course.service'; @@ -25,11 +20,11 @@ import {CourseService} from '@eg/staff/share/course.service'; export class CourseAssociateUsersComponent extends DialogComponent implements OnInit { @Input() currentCourse: IdlObject; - @Input() courseId: any; + @Input() courseId: number; @Input() displayMode: String; users: any[] = []; @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; - @ViewChild('usersGrid', {static: true}) usersGrid: GridComponent; + @ViewChild('usersGrid') usersGrid: GridComponent; @ViewChild('userDeleteFailedString', { static: true }) userDeleteFailedString: StringComponent; @ViewChild('userDeleteSuccessString', { static: true }) @@ -43,19 +38,15 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On @ViewChild('userEditFailedString', { static: true }) userEditFailedString: StringComponent; usersDataSource: GridDataSource; - @Input() userBarcode: String; - @Input() userRoleInput: String; - @Input() isPublicRole: Boolean; + userBarcode: String; + userRoleInput: String; + isPublicRole: Boolean; constructor( private auth: AuthService, private course: CourseService, - private event: EventService, - private idl: IdlService, private net: NetService, - private org: OrgService, private pcrud: PcrudService, - private route: ActivatedRoute, private toast: ToastService, private modal: NgbModal ) { @@ -65,52 +56,36 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On ngOnInit() { this.usersDataSource.getRows = (pager: Pager, sort: any[]) => { - return this.loadUsersGrid(pager); - } + return this.course.getUsers([this.courseId]); + }; } isDialog(): boolean { return this.displayMode === 'dialog'; } - loadUsersGrid(pager: Pager): Observable { - return new Observable(observer => { - this.course.getUsers(this.courseId).then(users => { - users.forEach(user => { - this.course.fleshUser(user).then(fleshed_user => { - this.usersDataSource.data.push(fleshed_user); - }); - observer.complete(); - }); - }); - }); - } - associateUser(barcode) { if (barcode) { - let args = { + const args = { currentCourse: this.currentCourse, - barcode: barcode, + barcode: barcode.trim(), role: this.userRoleInput, is_public: this.isPublicRole - } + }; this.userBarcode = null; this.net.request( 'open-ils.actor', 'open-ils.actor.user.retrieve_id_by_barcode_or_username', - this.auth.token(), barcode + this.auth.token(), barcode.trim() ).subscribe(patron => { - let associatedUser = this.course.associateUsers(patron, args).then(res => { - this.course.fleshUser(res).then(fleshed_user => { - this.usersDataSource.data.push(fleshed_user); - this.userAddSuccessString.current().then(str => this.toast.success(str)); - }); + this.course.associateUsers(patron, args) + .then(() => this.usersGrid.reload()); }, err => { this.userAddFailedString.current().then(str => this.toast.danger(str)); - }); - }); + } + ); } } @@ -134,14 +109,7 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On result => { this.userEditSuccessString.current() .then(str => this.toast.success(str)); - this.pcrud.retrieve('acmcu', result).subscribe(u => { - if (u.course() != this.courseId) { - this.usersDataSource.data.splice(this.usersDataSource.data.indexOf(user, 0), 1); - } else { - user._is_public = u.is_public(); - user._role = u.usr_role(); - } - }); + this.usersGrid.reload(); resolve(result); }, error => { @@ -154,17 +122,14 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On } deleteSelectedUsers(users) { - let user_ids = []; - users.forEach(user => { - this.usersDataSource.data.splice(this.usersDataSource.data.indexOf(user, 0), 1); - user_ids.push(user.id()) - }); + const user_ids = []; this.pcrud.search('acmcu', {course: this.courseId, usr: user_ids}).subscribe(user => { user.isdeleted(true); this.pcrud.autoApply(user).subscribe( val => { console.debug('deleted: ' + val); this.userDeleteSuccessString.current().then(str => this.toast.success(str)); + this.usersGrid.reload(); }, err => { this.userDeleteFailedString.current() @@ -174,4 +139,4 @@ export class CourseAssociateUsersComponent extends DialogComponent implements On }); } -} \ No newline at end of file +} diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html index 1a3d9c6c64..54d0c7d420 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html @@ -1,20 +1,20 @@ - - - - - - + + + + + +
- + label="Create {{tableName}}" (onClick)="createNew()" i18n-label> @@ -32,6 +32,7 @@ - \ No newline at end of file + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts index 631c19fbe5..bc439a4018 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts @@ -1,11 +1,8 @@ import {Component, Input, ViewChild, OnInit} from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import {Router} from '@angular/router'; import {IdlObject} from '@eg/core/idl.service'; import {PcrudService} from '@eg/core/pcrud.service'; -import {AuthService} from '@eg/core/auth.service'; import {CourseService} from '@eg/staff/share/course.service'; -import {NetService} from '@eg/core/net.service'; -import {OrgService} from '@eg/core/org.service'; import {GridComponent} from '@eg/share/grid/grid.component'; import {Pager} from '@eg/share/util/pager'; import {GridDataSource, GridColumn} from '@eg/share/grid/grid'; @@ -24,8 +21,8 @@ import {CourseAssociateUsersComponent templateUrl: './course-list.component.html' }) -export class CourseListComponent implements OnInit { - +export class CourseListComponent implements OnInit { + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; @ViewChild('grid', { static: true }) grid: GridComponent; @ViewChild('successString', { static: true }) successString: StringComponent; @@ -41,32 +38,28 @@ export class CourseListComponent implements OnInit { @ViewChild('courseUserDialog', {static: true}) private courseUserDialog: CourseAssociateUsersComponent; - @Input() sort_field: string; - @Input() idl_class = "acmc"; + @Input() sortField: string; + @Input() idlClass = 'acmc'; @Input() dialog_size: 'sm' | 'lg' = 'lg'; - @Input() table_name = "Course"; + @Input() tableName = 'Course'; grid_source: GridDataSource = new GridDataSource(); currentMaterials: any[] = []; search_value = ''; constructor( - private auth: AuthService, private courseSvc: CourseService, private locale: LocaleService, - private net: NetService, - private org: OrgService, private pcrud: PcrudService, - private route: ActivatedRoute, private router: Router, private toast: ToastService - ){} + ) {} ngOnInit() { this.getSource(); - this.grid.onRowActivate.subscribe((course:IdlObject) => { - let idToEdit = course.id(); + this.grid.onRowActivate.subscribe((course: IdlObject) => { + const idToEdit = course.id(); this.navigateToCoursePage(idToEdit); - }) + }); } /** @@ -77,31 +70,31 @@ export class CourseListComponent implements OnInit { const orderBy: any = {}; if (sort.length) { // Sort specified from grid - orderBy[this.idl_class] = sort[0].name + ' ' + sort[0].dir; - } else if (this.sort_field) { + orderBy[this.idlClass] = sort[0].name + ' ' + sort[0].dir; + } else if (this.sortField) { // Default sort field - orderBy[this.idl_class] = this.sort_field; + orderBy[this.idlClass] = this.sortField; } const searchOps = { offset: pager.offset, limit: pager.limit, order_by: orderBy }; - return this.pcrud.retrieveAll(this.idl_class, searchOps, {fleshSelectors: true}) + return this.pcrud.retrieveAll(this.idlClass, searchOps, {fleshSelectors: true}); }; } navigateToCoursePage(id_arr: IdlObject[]) { - if (typeof id_arr == 'number') id_arr = [id_arr]; - let urls = []; + if (typeof id_arr === 'number') { id_arr = [id_arr]; } + const urls = []; id_arr.forEach(id => {console.log(this.router.url); urls.push([this.locale.currentLocaleCode() + this.router.url + '/' + id]); }); - if (id_arr.length == 1) { + if (id_arr.length === 1) { this.router.navigate([this.router.url + '/' + id_arr[0]]); } else { urls.forEach(url => { - window.open(url) + window.open(url); }); } } @@ -127,9 +120,9 @@ export class CourseListComponent implements OnInit { editSelected(fields: IdlObject[]) { // Edit each IDL thing one at a time - let course_ids = []; + const course_ids = []; fields.forEach(field => { - if (typeof field['id'] == 'function') { + if (typeof field['id'] === 'function') { course_ids.push(field.id()); } else { course_ids.push(field['id']); @@ -140,9 +133,8 @@ export class CourseListComponent implements OnInit { archiveSelected(course: IdlObject[]) { this.courseSvc.disassociateMaterials(course).then(res => { - course.forEach(course => { - console.log(course); - course.is_archived(true); + course.forEach(courseToArchive => { + courseToArchive.is_archived(true); }); this.pcrud.update(course).subscribe( val => { @@ -159,12 +151,12 @@ export class CourseListComponent implements OnInit { }); } - deleteSelected(idl_object: IdlObject[]) { - this.courseSvc.disassociateMaterials(idl_object).then(res => { - idl_object.forEach(idl_object => { - idl_object.isdeleted(true) + deleteSelected(idlObject: IdlObject[]) { + this.courseSvc.disassociateMaterials(idlObject).then(res => { + idlObject.forEach(object => { + object.isdeleted(true); }); - this.pcrud.autoApply(idl_object).subscribe( + this.pcrud.autoApply(idlObject).subscribe( val => { console.debug('deleted: ' + val); this.deleteSuccessString.current() @@ -177,6 +169,6 @@ export class CourseListComponent implements OnInit { () => this.grid.reload() ); }); - }; + } } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html index 97bff3fac1..39397d5792 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html @@ -33,6 +33,7 @@ mode="update" hiddenFieldsList="id,is_archived" idlClass="acmc" + fieldOrder="course_number,name,owning_lib,section_number" [preloadLinkedValues]="true" [record]="currentCourse"> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts index 6818a11f8d..df7a41a0b9 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts @@ -1,19 +1,8 @@ import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -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 {ActivatedRoute} from '@angular/router'; import {PcrudService} from '@eg/core/pcrud.service'; -import {Pager} from '@eg/share/util/pager'; -import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; -import {GridDataSource} from '@eg/share/grid/grid'; -import {GridComponent} from '@eg/share/grid/grid.component'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {StringComponent} from '@eg/share/string/string.component'; -import {StaffBannerComponent} from '@eg/staff/share/staff-banner.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {CourseService} from '@eg/staff/share/course.service'; import {CourseAssociateUsersComponent} from './course-associate-users.component'; @@ -33,7 +22,7 @@ export class CoursePageComponent implements OnInit { private courseMaterialDialog: CourseAssociateMaterialComponent; @ViewChild('courseUserDialog', {static: true}) private courseUserDialog: CourseAssociateUsersComponent; - + // Edit Tab @ViewChild('archiveFailedString', { static: true }) archiveFailedString: StringComponent; @@ -43,12 +32,7 @@ export class CoursePageComponent implements OnInit { // Materials Tab constructor( - private auth: AuthService, private course: CourseService, - private event: EventService, - private idl: IdlService, - private net: NetService, - private org: OrgService, private pcrud: PcrudService, private route: ActivatedRoute, private toast: ToastService @@ -56,7 +40,7 @@ export class CoursePageComponent implements OnInit { } ngOnInit() { - this.courseId = parseInt(this.route.snapshot.paramMap.get('id')); + this.courseId = +this.route.snapshot.paramMap.get('id'); this.course.getCourses([this.courseId]).then(course => { this.currentCourse = course[0]; }); @@ -78,5 +62,5 @@ export class CoursePageComponent implements OnInit { } // Materials Tab - -} \ No newline at end of file + +} diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts index 7c735dd2dd..fcd9cd5a75 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts @@ -16,4 +16,4 @@ const routes: Routes = [{ exports: [RouterModule] }) -export class CourseReservesRoutingModule {} \ No newline at end of file +export class CourseReservesRoutingModule {} diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts index 8eea36693d..fec6a9ee58 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts @@ -47,7 +47,7 @@ export class ResultRecordComponent implements OnInit, OnDestroy { ngOnInit() { this.searchContext = this.staffCat.searchContext; - this.loadCourseInformation(this.summary.id) + this.loadCourseInformation(this.summary.id); this.isRecordSelected = this.basket.hasRecordId(this.summary.id); // Watch for basket changes caused by other components 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 62c921c829..feb159d985 100644 --- a/Open-ILS/src/eg2/src/app/staff/common.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts @@ -18,7 +18,7 @@ import {MultiSelectComponent} from '@eg/share/multi-select/multi-select.componen import {NotBeforeMomentValidatorDirective} from '@eg/share/validators/not_before_moment_validator.directive'; import {PatronBarcodeValidatorDirective} from '@eg/share/validators/patron_barcode_validator.directive'; import {BroadcastService} from '@eg/share/util/broadcast.service'; -import {CourseService} from './share/course.service' +import {CourseService} from './share/course.service'; /** * Imports the EG common modules and adds modules common to all staff UI's. @@ -72,7 +72,7 @@ export class StaffCommonModule { providers: [ // Export staff-wide services AccessKeyService, AudioService, - BroadcastService + BroadcastService, CourseService ] }; diff --git a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts index 6089bf26a7..2aa18b7823 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts @@ -1,3 +1,4 @@ +import { Observable } from 'rxjs'; import {Injectable} from '@angular/core'; import {AuthService} from '@eg/core/auth.service'; import {EventService} from '@eg/core/event.service'; @@ -19,7 +20,7 @@ export class CourseService { ) {} isOptedIn(): Promise { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { this.org.settings('circ.course_materials_opt_in').then(res => { resolve(res['circ.course_materials_opt_in']); }); @@ -45,60 +46,22 @@ export class CourseService { } } - getUsers(course_ids?: Number[]): Promise { + getUsers(course_ids?: Number[]): Observable { + const flesher = { + flesh: 1, + flesh_fields: {'acmcu': ['usr']} + }; if (!course_ids) { return this.pcrud.retrieveAll('acmcu', - {}, {atomic: true}).toPromise(); + flesher); } else { return this.pcrud.search('acmcu', {course: course_ids}, - {}, {atomic: true}).toPromise(); + flesher); } } - fleshMaterial(material): Promise { - console.log(material) - return new Promise((resolve, reject) => { - let item = this.idl.create('acp'); - this.net.request( - 'open-ils.circ', - 'open-ils.circ.copy_details.retrieve', - this.auth.token(), material.item() - ).subscribe(res => { - if (res && res.copy) { - item = res.copy; - item.call_number(res.volume); - item._title = res.mvr.title(); - item.circ_lib(this.org.get(item.circ_lib())); - item._id = material.id(); - if (material.relationship()) - item._relationship = material.relationship(); - } - }, err => { - reject(err); - }, () => resolve(item)); - }); - } - - fleshUser(course_user): Promise { - return new Promise((resolve, reject) => { - let user = this.idl.create('au'); - this.net.request( - 'open-ils.actor', - 'open-ils.actor.user.fleshed.retrieve', - this.auth.token(), course_user.usr() - ).subscribe(patron => { - user = patron; - user._id = course_user.id(); - if (course_user.usr_role()) user._role = course_user.usr_role(); - if (course_user.is_public()) user._is_public = course_user.is_public(); - }, err => { - reject(err); - }, () => resolve(user)); - }); - } - getCoursesFromMaterial(copy_id): Promise { - let id_list = []; + const id_list = []; return new Promise((resolve, reject) => { return this.pcrud.search('acmcm', {item: copy_id}) @@ -114,15 +77,13 @@ export class CourseService { return this.getCourses(id_list).then(courses => { resolve(courses); }); - } }); }); } fetchCopiesInCourseFromRecord(record_id) { - let cp_list = []; - let course_list = []; + const cp_list = []; return new Promise((resolve, reject) => { this.net.request( 'open-ils.cat', @@ -143,13 +104,13 @@ export class CourseService { // Creating a new acmcm Entry associateMaterials(item, args) { - let material = this.idl.create('acmcm'); + const material = this.idl.create('acmcm'); material.item(item.id()); if (item.call_number() && item.call_number().record()) { material.record(item.call_number().record()); } material.course(args.currentCourse.id()); - if (args.relationship) material.relationship(args.relationship); + if (args.relationship) { material.relationship(args.relationship); } // Apply temporary fields to the item if (args.isModifyingStatus && args.tempStatus) { @@ -163,12 +124,12 @@ export class CourseService { if (args.isModifyingCircMod) { material.original_circ_modifier(item.circ_modifier()); item.circ_modifier(args.tempCircMod); - if (!args.tempCircMod) item.circ_modifier(null); + if (!args.tempCircMod) { item.circ_modifier(null); } } if (args.isModifyingCallNumber) { material.original_callnumber(item.call_number()); } - let response = { + const response = { item: item, material: this.pcrud.create(material).toPromise() }; @@ -177,18 +138,18 @@ export class CourseService { } associateUsers(patron_id, args) { - let new_user = this.idl.create('acmcu'); - if (args.is_public) new_user.is_public(args.is_public); - if (args.role) new_user.usr_role(args.role); + const new_user = this.idl.create('acmcu'); + if (args.is_public) { new_user.is_public(args.is_public); } + if (args.role) { new_user.usr_role(args.role); } new_user.course(args.currentCourse.id()); new_user.usr(patron_id); - return this.pcrud.create(new_user).toPromise() + return this.pcrud.create(new_user).toPromise(); } disassociateMaterials(courses) { return new Promise((resolve, reject) => { - let course_ids = []; - let course_library_hash = {}; + const course_ids = []; + const course_library_hash = {}; courses.forEach(course => { course_ids.push(course.id()); course_library_hash[course.id()] = course.owning_lib(); @@ -196,14 +157,14 @@ export class CourseService { this.pcrud.search('acmcm', {course: course_ids}).subscribe(material => { material.isdeleted(true); this.resetItemFields(material, course_library_hash[material.course()]); - this.pcrud.autoApply(material).subscribe(res => { + this.pcrud.autoApply(material).subscribe(() => { }, err => { reject(err); }, () => { resolve(material); }); }, err => { - reject(err) + reject(err); }, () => { resolve(courses); }); @@ -212,14 +173,14 @@ export class CourseService { disassociateUsers(user) { return new Promise((resolve, reject) => { - let user_ids = []; - let course_library_hash = {}; + const user_ids = []; + const course_library_hash = {}; user.forEach(course => { user_ids.push(course.id()); course_library_hash[course.id()] = course.owning_lib(); }); - this.pcrud.search('acmcu', {user: user_ids}).subscribe(user => { - user.course(user_ids); + this.pcrud.search('acmcu', {user: user_ids}).subscribe(u => { + u.course(user_ids); this.pcrud.autoApply(user).subscribe(res => { console.debug(res); }, err => { @@ -228,7 +189,7 @@ export class CourseService { resolve(user); }); }, err => { - reject(err) + reject(err); }, () => { resolve(user_ids); }); @@ -241,7 +202,7 @@ export class CourseService { if (material.original_status()) { copy.status(material.original_status()); } - if (copy.circ_modifier() != material.original_circ_modifier()) { + if (copy.circ_modifier() !== material.original_circ_modifier()) { copy.circ_modifier(material.original_circ_modifier()); } if (material.original_location()) { @@ -259,22 +220,22 @@ export class CourseService { updateItem(item: IdlObject, course_lib, call_number, updatingVolume) { return new Promise((resolve, reject) => { - this.pcrud.update(item).subscribe(item_id => { + this.pcrud.update(item).subscribe(() => { if (updatingVolume) { - let cn = item.call_number(); + const 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(), course_lib, cn.prefix(), cn.suffix(), cn.label_class() ).subscribe(res => { - let event = this.evt.parse(res); - if (event) return; + const 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); + console.debug('Copy transferred to volume with code ' + transfered_res); }, err => { reject(err); }, () => { @@ -286,9 +247,9 @@ export class CourseService { resolve(item); }); } else { - this.pcrud.update(item).subscribe(rse => { + this.pcrud.update(item).subscribe(() => { resolve(item); - }, err => { + }, () => { reject(item); }); } @@ -296,4 +257,4 @@ export class CourseService { }); } -} \ No newline at end of file +} diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts index 6dcaf24cb4..326f80a00c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts @@ -26,10 +26,10 @@ export interface MarcField { // Fields are immutable when it comes to controlfield vs. // data field. Stamp the value when stamping field IDs. isCtrlField: boolean; + indicator?: (ind: number) => any; // Pass-through to marcrecord.js isControlfield(): boolean; - indicator?: (ind: number) => any; deleteExactSubfields(...subfield: MarcSubfield[]): number; } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm index a12831c74d..836a9347df 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Courses.pm @@ -129,7 +129,8 @@ sub fetch_course_materials { if ($self->api_name =~ /\.fleshed/) { my $fleshing = { 'flesh' => 2, 'flesh_fields' => { - 'acmcm' => ['item', 'record'], + 'acmcm' => ['item', 'record', 'original_circ_modifier', + 'original_location', 'original_status'], 'acp' => ['call_number', 'circ_lib', 'location', 'status'], 'bre' => ['wide_display_entry'], } -- 2.11.0