From 8e684b3309bbb343e5b106cd5a1ff4b6207be8cf Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Tue, 10 Dec 2019 22:09:49 +0000 Subject: [PATCH] Angular Course Page Improvements - Condense Course User functionality into its own component, usable as a dialog and inline. - Condense Course Material functionality into its own component, usable as a dialog and inline. - Add Return to Course List button - Move Archive Course button above tabs - Allow Editing of Course Users and Materials Signed-off-by: Kyle Huckins Changes to be committed: modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html copied: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts -> Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.html modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-users.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.html modified: Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts modified: Open-ILS/src/eg2/src/app/staff/share/course.service.ts --- .../course-associate-material.component.html | 286 ++++++++++++--------- .../course-associate-material.component.ts | 178 ++++++++----- .../course-associate-users.component.html | 123 ++++++--- .../course-associate-users.component.ts | 277 ++++++++++++-------- .../course-reserves/course-list.component.html | 25 +- .../local/course-reserves/course-list.component.ts | 144 ++--------- .../course-reserves/course-page.component.html | 285 ++------------------ .../local/course-reserves/course-page.component.ts | 198 +------------- .../src/eg2/src/app/staff/share/course.service.ts | 21 +- 9 files changed, 610 insertions(+), 927 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 65dfb71a77..a34e757679 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 @@ -1,134 +1,164 @@ - - - - - + + + + + + + + -
-

Course Materials

- -
-
-
-
-
-
- Barcode +
+

Course Materials

+ + + +
+
+
+
+
+
+
+
+ Barcode +
+
-
-
-
-
-
- Relationship +
+
+
+ Relationship +
+
-
-
- +
+
+ +
-
-
-
-
The following fields will be applied to the material added, and reverted once the course is no longer associated with the material.
+
+
+
The following fields will be applied to the material + added, and reverted once the course is no longer associated + with the material.
+
-
-
-
-
-
-
- Call Number +
+
+
+
+
+ Call Number +
-
- -
-
- + +
+
+ +
-
-
-
-
-
- Circulation Modifier +
+
+
+
+ Circulation Modifier +
-
- - -
-
- + + +
+
+ +
-
-
-
-
-
-
- Item Status +
+
+
+
+
+ Item Status +
-
- - -
-
- + + +
+
+ +
-
-
-
-
-
- Shelving Location +
+
+
+
+ Shelving Location +
-
- - -
-
- + + +
+
+ +
-
- - +
+ + - - - + + + + @@ -141,23 +171,37 @@
- - - - {{entry.barcode()}} - - - - - - - {{entry._title}} - - - - - {{r.label}} - - \ No newline at end of file +
+ + + + + {{entry.barcode()}} + + + + + + + {{entry._title}} + + + + +{{r.label}} + + + + + + + + + + \ No newline at end of file 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 404451ac0a..749bf9624a 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 @@ -1,4 +1,5 @@ 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'; @@ -12,6 +13,8 @@ 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'; @@ -21,14 +24,27 @@ import {CourseService} from '@eg/staff/share/course.service'; }) export class CourseAssociateMaterialComponent extends DialogComponent { - + @Input() currentCourse: IdlObject; + @Input() courseId: any; + @Input() displayMode: String; + materials: any[] = []; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; @ViewChild('materialsGrid', {static: true}) materialsGrid: GridComponent; - @ViewChild('deleteFailedString', { static: true }) deleteFailedString: StringComponent; - @ViewChild('deleteSuccessString', { static: true }) deleteSuccessString: StringComponent; - @ViewChild('successString', { static: true }) successString: StringComponent; - @ViewChild('failedString', { static: true }) failedString: StringComponent; - @ViewChild('differentLibraryString', { static: true }) differentLibraryString: StringComponent; - @Input() table_name = "Course Materials"; + @ViewChild('materialDeleteFailedString', { static: true }) + materialDeleteFailedString: StringComponent; + @ViewChild('materialDeleteSuccessString', { static: true }) + materialDeleteSuccessString: StringComponent; + @ViewChild('materialAddSuccessString', { static: true }) + materialAddSuccessString: StringComponent; + @ViewChild('materialAddFailedString', { static: true }) + materialAddFailedString: StringComponent; + @ViewChild('materialEditSuccessString', { static: true }) + materialEditSuccessString: StringComponent; + @ViewChild('materialEditFailedString', { static: true }) + materialEditFailedString: StringComponent; + @ViewChild('materialAddDifferentLibraryString', { static: true }) + materialAddDifferentLibraryString: StringComponent; + materialsDataSource: GridDataSource; @Input() barcodeInput: String; @Input() relationshipInput: String; @Input() tempCallNumber: String; @@ -39,53 +55,86 @@ export class CourseAssociateMaterialComponent extends DialogComponent { @Input() isModifyingCircMod: Boolean; @Input() isModifyingCallNumber: Boolean; @Input() isModifyingLocation: Boolean; - currentCourse: IdlObject; - materials: any[]; - gridDataSource: GridDataSource; constructor( private auth: AuthService, + private course: CourseService, + private event: EventService, private idl: IdlService, private net: NetService, - private pcrud: PcrudService, private org: OrgService, - private evt: EventService, - private modal: NgbModal, + private pcrud: PcrudService, + private route: ActivatedRoute, private toast: ToastService, - private courseSvc: CourseService + private modal: NgbModal ) { super(modal); - this.gridDataSource = new GridDataSource(); + this.materialsDataSource = new GridDataSource(); } ngOnInit() { - this.gridDataSource.getRows = (pager: Pager, sort: any[]) => { - return this.fetchMaterials(pager); + this.materialsDataSource.getRows = (pager: Pager, sort: any[]) => { + return this.loadMaterialsGrid(pager); } } - deleteSelected(items) { - let item_ids = []; - items.forEach(item => { - this.gridDataSource.data.splice(this.gridDataSource.data.indexOf(item, 0), 1); - item_ids.push(item.id()) + isDialog(): boolean { + return this.displayMode === 'dialog'; + } + + loadMaterialsGrid(pager: Pager): Observable { + return new Observable(observer => { + this.course.getMaterials(this.courseId).then(materials => { + materials.forEach(material => { + this.course.fleshMaterial(material).then(fleshed_material => { + this.materialsDataSource.data.push(fleshed_material); + }); + }); + }); + observer.complete(); }); - this.pcrud.search('acmcm', {course: this.currentCourse.id(), item: item_ids}).subscribe(material => { - material.isdeleted(true); - this.pcrud.autoApply(material).subscribe( - val => { - this.courseSvc.resetItemFields(material, this.currentCourse.owning_lib()); - console.debug('deleted: ' + val); - this.deleteSuccessString.current().then(str => this.toast.success(str)); + } + + editSelectedMaterials(itemFields: IdlObject[]) { + // Edit each IDL thing one at a time + const editOneThing = (item: IdlObject) => { + if (!item) { return; } + + this.showEditDialog(item).then( + () => editOneThing(itemFields.shift())); + }; + + editOneThing(itemFields.shift()); + } + + showEditDialog(course_material: IdlObject): Promise { + this.editDialog.mode = 'update'; + this.editDialog.recordId = course_material._id; + return new Promise((resolve, reject) => { + this.editDialog.open({size: 'lg'}).subscribe( + result => { + this.materialEditSuccessString.current() + .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 + ); + } else { + course_material._relationship = material.relationship(); + } + }); + resolve(result); }, - err => { - this.deleteFailedString.current() + error => { + this.materialEditFailedString.current() .then(str => this.toast.danger(str)); + reject(error); } ); }); } - + associateItem(barcode, relationship) { if (barcode) { let args = { @@ -101,59 +150,56 @@ export class CourseAssociateMaterialComponent extends DialogComponent { currentCourse: this.currentCourse } this.barcodeInput = null; - + this.pcrud.search('acp', {barcode: args.barcode}, { flesh: 3, flesh_fields: {acp: ['call_number']} }).subscribe(item => { - let associatedMaterial = this.courseSvc.associateMaterials(item, args); + let associatedMaterial = this.course.associateMaterials(item, args); associatedMaterial.material.then(res => { item = associatedMaterial.item; let new_cn = item.call_number().label(); if (this.tempCallNumber) new_cn = this.tempCallNumber; - this.courseSvc.updateItem(item, - this.currentCourse.owning_lib(), - new_cn, args.isModifyingCallNumber).then(resp => { - this.fetchItem(item.id(), args.relationship); + this.course.updateItem(item, this.currentCourse.owning_lib(), + new_cn, args.isModifyingCallNumber + ).then(resp => { + this.course.fleshMaterial(res).then(fleshed_material => { + this.materialsDataSource.data.push(fleshed_material); + }); if (item.circ_lib() != this.currentCourse.owning_lib()) { - this.differentLibraryString.current().then(str => this.toast.warning(str)); + this.materialAddDifferentLibraryString.current() + .then(str => this.toast.warning(str)); } else { - this.successString.current().then(str => this.toast.success(str)); + this.materialAddSuccessString.current() + .then(str => this.toast.success(str)); } }); }, err => { - this.failedString.current().then(str => this.toast.danger(str)); + this.materialAddFailedString.current() + .then(str => this.toast.danger(str)); }); }); } } - fetchMaterials(pager: Pager): Observable { - return new Observable(observer => { - this.materials.forEach(material => { - this.fetchItem(material.item, material.relationship); - }); - observer.complete(); + deleteSelectedMaterials(items) { + let item_ids = []; + items.forEach(item => { + this.materialsDataSource.data.splice(this.materialsDataSource.data.indexOf(item, 0), 1); + item_ids.push(item.id()) }); - } - - fetchItem(itemId, relationship): Promise { - return new Promise((resolve, reject) => { - this.net.request( - 'open-ils.circ', - 'open-ils.circ.copy_details.retrieve', - this.auth.token(), itemId - ).subscribe(res => { - if (res) { - let item = res.copy; - item.call_number(res.volume); - item.circ_lib(this.org.get(item.circ_lib())); - item._title = res.mvr.title(); - item._relationship = relationship; - this.gridDataSource.data.push(item); + this.pcrud.search('acmcm', {course: this.courseId, item: item_ids}).subscribe(material => { + material.isdeleted(true); + this.pcrud.autoApply(material).subscribe( + val => { + this.course.resetItemFields(material, this.currentCourse.owning_lib()); + console.debug('deleted: ' + val); + this.materialDeleteSuccessString.current().then(str => this.toast.success(str)); + }, + err => { + this.materialDeleteFailedString.current() + .then(str => this.toast.danger(str)); } - }, err => { - reject(err); - }, () => resolve(this.gridDataSource.data)); + ); }); } } \ No newline at end of file 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 079acd7167..a0969bfdd0 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 @@ -1,49 +1,81 @@ - - - - - + + + + + + -
-

Course Users

- -
-
-
-
-
-
- User Role +
+

Course Users

+ + + +
+
+
+
+
+
+
+
+ Patron Barcode +
+
-
-
-
-
-
-
-
-
- User +
+
+
+ Role
+
- +
+
+
+
+
+
+
+ Is Public Role? +
+
+
+
+ +
+
+
+
+
+
-
- -
-
- - +
+ + + + - - + @@ -52,6 +84,23 @@ + +
-
\ No newline at end of file +
+
+ + + + + + + + + + \ 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 b3be2c45f8..1b1ebfac47 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,102 +1,177 @@ -import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core'; -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'; -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 {ToastService} from '@eg/share/toast/toast.service'; -import {CourseService} from '@eg/staff/share/course.service'; - -@Component({ - selector: 'eg-course-associate-users-dialog', - templateUrl: './course-associate-users.component.html' -}) - -export class CourseAssociateUsersComponent extends DialogComponent { - - @ViewChild('usersGrid', {static: true}) usersGrid: GridComponent; - @ViewChild('deleteFailedString', { static: true }) deleteFailedString: StringComponent; - @ViewChild('deleteSuccessString', { static: true }) deleteSuccessString: StringComponent; - @ViewChild('successString', { static: true }) successString: StringComponent; - @ViewChild('failedString', { static: true }) failedString: StringComponent; - @ViewChild('differentLibraryString', { static: true }) differentLibraryString: StringComponent; - @Input() table_name = "Course Users"; - @Input() userRoleInput: String; - - idl_class = "acmcu"; - new_usr:any; - currentCourse: IdlObject; - users: any[]; - gridDataSource: GridDataSource; - - constructor( - private auth: AuthService, - private idl: IdlService, - private net: NetService, - private pcrud: PcrudService, - private org: OrgService, - private evt: EventService, - private modal: NgbModal, - private toast: ToastService, - private courseSvc: CourseService - ) { - super(modal); - this.gridDataSource = new GridDataSource(); - } - - ngOnInit() { - } - - /** - * Takes the user id and creates a course user based around it. - * @param user_input The inputted user Id. - */ - associateUsers(user_input) { - if (user_input) { - let user = this.idl.create('acmcu'); - user.course(this.currentCourse.id()); - user.usr(this.new_usr); - user.usr_role(user_input); - this.pcrud.create(user).subscribe( - val => { - console.debug('created: ' + val); - this.successString.current().then(str => this.toast.success(str)); - }, err => { - this.failedString.current().then(str => this.toast.danger(str)); - }) - } - } - - /** - * Delete a user based on the id selected from the grid. - * @param users - */ - deleteSelected(users) { - let user_ids = []; - users.forEach(user => { - this.gridDataSource.data.splice(this.gridDataSource.data.indexOf(user, 0), 1); - user_ids.push(user.id()) - }); - this.pcrud.remove(users).subscribe(user => { - this.pcrud.autoApply(user).subscribe( - val => { - console.debug('deleted: ' + val); - this.deleteSuccessString.current().then(str => this.toast.success(str)); - }, - err => { - this.deleteFailedString.current() - .then(str => this.toast.danger(str)); - } - ); - }); - } - +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 {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 {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'; + +@Component({ + selector: 'eg-course-associate-users-dialog', + templateUrl: './course-associate-users.component.html' +}) + +export class CourseAssociateUsersComponent extends DialogComponent implements OnInit { + @Input() currentCourse: IdlObject; + @Input() courseId: any; + @Input() displayMode: String; + users: any[] = []; + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; + @ViewChild('usersGrid', {static: true}) usersGrid: GridComponent; + @ViewChild('userDeleteFailedString', { static: true }) + userDeleteFailedString: StringComponent; + @ViewChild('userDeleteSuccessString', { static: true }) + userDeleteSuccessString: StringComponent; + @ViewChild('userAddSuccessString', { static: true }) + userAddSuccessString: StringComponent; + @ViewChild('userAddFailedString', { static: true }) + userAddFailedString: StringComponent; + @ViewChild('userEditSuccessString', { static: true }) + userEditSuccessString: StringComponent; + @ViewChild('userEditFailedString', { static: true }) + userEditFailedString: StringComponent; + usersDataSource: GridDataSource; + @Input() userBarcode: String; + @Input() userRoleInput: String; + @Input() 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 + ) { + super(modal); + this.usersDataSource = new GridDataSource(); + } + + ngOnInit() { + this.usersDataSource.getRows = (pager: Pager, sort: any[]) => { + return this.loadUsersGrid(pager); + } + } + + 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 = { + currentCourse: this.currentCourse, + barcode: barcode, + 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 + ).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)); + }); + }, err => { + this.userAddFailedString.current().then(str => this.toast.danger(str)); + }); + }); + } + } + + editSelectedUsers(userFields: IdlObject[]) { + // Edit each IDL thing one at a time + const editOneThing = (user: IdlObject) => { + if (!user) { return; } + + this.showEditDialog(user).then( + () => editOneThing(userFields.shift())); + }; + + editOneThing(userFields.shift()); + } + + showEditDialog(user: IdlObject): Promise { + this.editDialog.mode = 'update'; + this.editDialog.recordId = user._id; + return new Promise((resolve, reject) => { + this.editDialog.open({size: 'lg'}).subscribe( + 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(); + } + }); + resolve(result); + }, + error => { + this.userEditFailedString.current() + .then(str => this.toast.danger(str)); + reject(error); + } + ); + }); + } + + deleteSelectedUsers(users) { + let user_ids = []; + users.forEach(user => { + this.usersDataSource.data.splice(this.usersDataSource.data.indexOf(user, 0), 1); + user_ids.push(user.id()) + }); + 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)); + }, + err => { + this.userDeleteFailedString.current() + .then(str => this.toast.danger(str)); + } + ); + }); + } + } \ 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 d7312a9b96..459e872db2 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 @@ -4,17 +4,11 @@ - + - - - - - -
- - - - + + + + + -
- - - +
\ 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 ebde77643e..631c19fbe5 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 @@ -12,6 +12,7 @@ import {GridDataSource, GridColumn} from '@eg/share/grid/grid'; import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component'; import {StringComponent} from '@eg/share/string/string.component'; import {ToastService} from '@eg/share/toast/toast.service'; +import {LocaleService} from '@eg/core/locale.service'; import {CourseAssociateMaterialComponent } from './course-associate-material.component'; @@ -51,6 +52,7 @@ export class CourseListComponent implements OnInit { constructor( private auth: AuthService, private courseSvc: CourseService, + private locale: LocaleService, private net: NetService, private org: OrgService, private pcrud: PcrudService, @@ -89,28 +91,19 @@ export class CourseListComponent implements OnInit { }; } - navigateToCoursePage(id: any) { - this.router.navigate(["/staff/admin/local/asset/course_list/" + id]); - } - - showEditDialog(standingPenalty: IdlObject): Promise { - this.editDialog.mode = 'update'; - this.editDialog.recordId = standingPenalty['id'](); - return new Promise((resolve, reject) => { - this.editDialog.open({size: this.dialog_size}).subscribe( - result => { - this.successString.current() - .then(str => this.toast.success(str)); - this.grid.reload(); - resolve(result); - }, - error => { - this.updateFailedString.current() - .then(str => this.toast.danger(str)); - reject(error); - } - ); + navigateToCoursePage(id_arr: IdlObject[]) { + if (typeof id_arr == 'number') id_arr = [id_arr]; + let urls = []; + id_arr.forEach(id => {console.log(this.router.url); + urls.push([this.locale.currentLocaleCode() + this.router.url + '/' + id]); }); + if (id_arr.length == 1) { + this.router.navigate([this.router.url + '/' + id_arr[0]]); + } else { + urls.forEach(url => { + window.open(url) + }); + } } createNew() { @@ -134,12 +127,15 @@ export class CourseListComponent implements OnInit { editSelected(fields: IdlObject[]) { // Edit each IDL thing one at a time - const editOneThing = (field_object: IdlObject) => { - if (!field_object) { return; } - this.showEditDialog(field_object).then( - () => editOneThing(fields.shift())); - }; - editOneThing(fields.shift()); + let course_ids = []; + fields.forEach(field => { + if (typeof field['id'] == 'function') { + course_ids.push(field.id()); + } else { + course_ids.push(field['id']); + } + }); + this.navigateToCoursePage(course_ids); } archiveSelected(course: IdlObject[]) { @@ -182,99 +178,5 @@ export class CourseListComponent implements OnInit { ); }); }; - - fetchCourseMaterials(course, currentMaterials): Promise { - return new Promise((resolve, reject) => { - this.pcrud.search('acmcm', {course: course}).subscribe(res => { - if (res) this.fleshItemDetails(res.item(), res.relationship()); - }, err => { - reject(err); - }, () => resolve(this.courseMaterialDialog.gridDataSource.data)); - }); - } - - /** - * Uses the course id to fetch the different users associated with that course. - * @param course The course id - * @param currentMaterials - */ - fetchCourseUsers(course, currentMaterials): Promise { - return new Promise((resolve, reject) => { - this.pcrud.search('acmcu', {course: course}).subscribe(res => { - if(res) this.fleshUserDetails(res.usr(), res.usr_role()); - }, err => { - reject(err); - }, () => resolve(this.courseUserDialog.gridDataSource.data)); - }); - } - - /** - * Takes the user id from the course table, and cross references that with the user table, - * to find the right data. - * @param userId The user id that is to be cross referenced. - * @param usr_role The user role that is to be added to the grid. - */ - fleshUserDetails(userId, usr_role) { - return new Promise((resolve, reject) => { - this.pcrud.search("au", {id:userId}).subscribe(res => { - if (res) { - let user = res; - user._usr_role = usr_role; - this.courseUserDialog.gridDataSource.data.push(user); - } - }, err => { - reject(err); - }, () => resolve(this.courseMaterialDialog.gridDataSource.data)); - }); - } - - fleshItemDetails(itemId, relationship): Promise { - return new Promise((resolve, reject) => { - this.net.request( - 'open-ils.circ', - 'open-ils.circ.copy_details.retrieve', - this.auth.token(), itemId - ).subscribe(res => { - if (res) { - let item = res.copy; - item.call_number(res.volume); - item._title = res.mvr.title(); - item.circ_lib(this.org.get(item.circ_lib())); - item._relationship = relationship; - this.courseMaterialDialog.gridDataSource.data.push(item); - } - }, err => { - reject(err); - }, () => resolve(this.courseMaterialDialog.gridDataSource.data)); - }); - } - - openMaterialsDialog(course) { - let currentMaterials = [] - this.courseMaterialDialog.gridDataSource.data = []; - this.fetchCourseMaterials(course[0].id(), currentMaterials).then(res => { - this.courseMaterialDialog.currentCourse = course[0]; - this.courseMaterialDialog.materials = currentMaterials; - this.courseMaterialDialog.open({size: 'lg'}).subscribe(res => { - console.log(res); - }); - }); - } - - /** - * Opens the user dialog component using the course id - * @param course - */ - openUsersDialog(course) { - let currentUsers = [] - this.courseUserDialog.gridDataSource.data = []; - this.fetchCourseUsers(course[0].id(), currentUsers).then(res => { - this.courseUserDialog.currentCourse = course[0]; - this.courseUserDialog.users = currentUsers; - this.courseUserDialog.open({size: 'lg'}).subscribe(res => { - console.log(res); - }); - }); - } } 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 1b0f6345b3..20618071a1 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 @@ -4,6 +4,21 @@ [bannerStyle]="currentCourse.is_archived() == 't' ? 'alert-secondary' : null" [bannerIcon]="currentCourse.is_archived() == 't' ? 'lock' : null"> + +
+
+ + + keyboard_return + Return to Course List + +
+
@@ -11,12 +26,6 @@
-
-
- -
-
-
-
-
- Barcode -
- -
-
-
-
-
-
-
- Relationship -
- -
-
-
-
-
- -
-
-
-
-
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 -
-
- - -
-
- -
-
-
-
-
-
- -
- - - - - - - - - - - - - - - - -
-
- - - - {{entry.barcode()}} - - - - - - - {{entry._title}} - - - - - {{r.label}} - + + -
-
-
-
-
-
- Patron Barcode -
- -
-
-
-
-
- Role -
- -
-
-
-
-
-
-
-
- Is Public Role? -
-
-
-
- -
-
-
-
-
- -
-
-
-
- - - - - - - - - - - - - - - -
-
+ + - - - - - - - - - - + \ No newline at end of file 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 0d25c22ce3..6818a11f8d 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 @@ -16,6 +16,8 @@ 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'; +import {CourseAssociateMaterialComponent} from './course-associate-material.component'; @Component({ selector: 'eg-course-page', @@ -26,6 +28,11 @@ export class CoursePageComponent implements OnInit { currentCourse: IdlObject; courseId: any; + + @ViewChild('courseMaterialDialog', {static: true}) + private courseMaterialDialog: CourseAssociateMaterialComponent; + @ViewChild('courseUserDialog', {static: true}) + private courseUserDialog: CourseAssociateUsersComponent; // Edit Tab @ViewChild('archiveFailedString', { static: true }) @@ -34,45 +41,7 @@ export class CoursePageComponent implements OnInit { archiveSuccessString: StringComponent; // Materials Tab - materials: any[] = []; - @ViewChild('materialsGrid', {static: true}) materialsGrid: GridComponent; - @ViewChild('materialDeleteFailedString', { static: true }) - materialDeleteFailedString: StringComponent; - @ViewChild('materialDeleteSuccessString', { static: true }) - materialDeleteSuccessString: StringComponent; - @ViewChild('materialAddSuccessString', { static: true }) - materialAddSuccessString: StringComponent; - @ViewChild('materialAddFailedString', { static: true }) - materialAddFailedString: StringComponent; - @ViewChild('materialAddDifferentLibraryString', { static: true }) - materialAddDifferentLibraryString: StringComponent; - materialsDataSource: GridDataSource; - @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; - // Users Tab - users: any[] = []; - @ViewChild('usersGrid', {static: true}) usersGrid: GridComponent; - @ViewChild('userDeleteFailedString', { static: true }) - userDeleteFailedString: StringComponent; - @ViewChild('userDeleteSuccessString', { static: true }) - userDeleteSuccessString: StringComponent; - @ViewChild('userAddSuccessString', { static: true }) - userAddSuccessString: StringComponent; - @ViewChild('userAddFailedString', { static: true }) - userAddFailedString: StringComponent; - usersDataSource: GridDataSource; - @Input() userBarcode: String; - @Input() userRoleInput: String; - @Input() isPublicRole: Boolean; constructor( private auth: AuthService, private course: CourseService, @@ -84,8 +53,6 @@ export class CoursePageComponent implements OnInit { private route: ActivatedRoute, private toast: ToastService ) { - this.materialsDataSource = new GridDataSource(); - this.usersDataSource = new GridDataSource(); } ngOnInit() { @@ -93,12 +60,6 @@ export class CoursePageComponent implements OnInit { this.course.getCourses([this.courseId]).then(course => { this.currentCourse = course[0]; }); - this.usersDataSource.getRows = (pager: Pager, sort: any[]) => { - return this.loadUsersGrid(pager); - } - this.materialsDataSource.getRows = (pager: Pager, sort: any[]) => { - return this.loadMaterialsGrid(pager); - } } // Edit Tab @@ -117,150 +78,5 @@ export class CoursePageComponent implements OnInit { } // Materials Tab - loadMaterialsGrid(pager: Pager): Observable { - return new Observable(observer => { - this.course.getMaterials(this.courseId).then(materials => { - materials.forEach(material => { - this.course.fleshMaterial(material.item(), material.relationship()).then(fleshed_material => { - this.materialsDataSource.data.push(fleshed_material); - }); - }); - }); - observer.complete(); - }); - } - associateItem(barcode, relationship) { - if (barcode) { - let args = { - barcode: barcode, - relationship: relationship, - isModifyingCallNumber: this.isModifyingCallNumber, - isModifyingCircMod: this.isModifyingCircMod, - isModifyingLocation: this.isModifyingLocation, - isModifyingStatus: this.isModifyingStatus, - tempCircMod: this.tempCircMod, - tempLocation: this.tempLocation, - tempStatus: this.tempStatus, - currentCourse: this.currentCourse - } - this.barcodeInput = null; - - this.pcrud.search('acp', {barcode: args.barcode}, { - flesh: 3, flesh_fields: {acp: ['call_number']} - }).subscribe(item => { - let associatedMaterial = this.course.associateMaterials(item, args); - associatedMaterial.material.then(res => { - item = associatedMaterial.item; - let new_cn = item.call_number().label(); - if (this.tempCallNumber) new_cn = this.tempCallNumber; - this.course.updateItem(item, this.currentCourse.owning_lib(), - new_cn, args.isModifyingCallNumber - ).then(resp => { - this.course.fleshMaterial(item.id(), args.relationship).then(fleshed_material => { - this.materialsDataSource.data.push(fleshed_material); - }); - if (item.circ_lib() != this.currentCourse.owning_lib()) { - this.materialAddDifferentLibraryString.current() - .then(str => this.toast.warning(str)); - } else { - this.materialAddSuccessString.current() - .then(str => this.toast.success(str)); - } - }); - }, err => { - this.materialAddFailedString.current() - .then(str => this.toast.danger(str)); - }); - }); - } - } - - deleteSelectedMaterials(items) { - let item_ids = []; - items.forEach(item => { - this.materialsDataSource.data.splice(this.materialsDataSource.data.indexOf(item, 0), 1); - item_ids.push(item.id()) - }); - this.pcrud.search('acmcm', {course: this.courseId, item: item_ids}).subscribe(material => { - material.isdeleted(true); - this.pcrud.autoApply(material).subscribe( - val => { - this.course.resetItemFields(material, this.currentCourse.owning_lib()); - console.debug('deleted: ' + val); - this.materialDeleteSuccessString.current().then(str => this.toast.success(str)); - }, - err => { - this.materialDeleteFailedString.current() - .then(str => this.toast.danger(str)); - } - ); - }); - } - - // Users Tab - loadUsersGrid(pager: Pager): Observable { - return new Observable(observer => { - this.course.getUsers(this.courseId).then(users => { - users.forEach(user => { - console.log(user); - this.course.fleshUser(user.usr(), user.usr_role(), user.is_public()).then(fleshed_user => { - this.usersDataSource.data.push(fleshed_user); - }); - }); - }); - observer.complete(); - }); - } - - associateUser(barcode) { - if (barcode) { - let args = { - currentCourse: this.currentCourse, - barcode: barcode, - 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 - ).subscribe(patron => { - let associatedUser = this.course.associateUsers(patron, args).then(res => { - this.course.fleshUser( - patron, args.role, args.is_public - ).then(fleshed_user => { - this.usersDataSource.data.push(fleshed_user); - this.userAddSuccessString.current().then(str => this.toast.success(str)); - }); - }, err => { - this.userAddFailedString.current().then(str => this.toast.danger(str)); - }); - }); - } - } - - deleteSelectedUsers(users) { - let user_ids = []; - users.forEach(user => { - this.usersDataSource.data.splice(this.usersDataSource.data.indexOf(user, 0), 1); - user_ids.push(user.id()) - }); - 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)); - }, - err => { - this.userDeleteFailedString.current() - .then(str => this.toast.danger(str)); - } - ); - }); - } } \ No newline at end of file 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 798ea9bf20..6089bf26a7 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 @@ -55,20 +55,23 @@ export class CourseService { } } - fleshMaterial(itemId, relationship?): Promise { + 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(), itemId + 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())); - if (relationship) item._relationship = relationship; + item._id = material.id(); + if (material.relationship()) + item._relationship = material.relationship(); } }, err => { reject(err); @@ -76,17 +79,18 @@ export class CourseService { }); } - fleshUser(patron_id, role?, is_public?): Promise { + 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(), patron_id + this.auth.token(), course_user.usr() ).subscribe(patron => { user = patron; - if (role) user._role = role - if (is_public) user._is_public = is_public + 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)); @@ -173,7 +177,6 @@ export class CourseService { } associateUsers(patron_id, args) { - console.log(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); @@ -218,7 +221,7 @@ export class CourseService { this.pcrud.search('acmcu', {user: user_ids}).subscribe(user => { user.course(user_ids); this.pcrud.autoApply(user).subscribe(res => { - console.log(res); + console.debug(res); }, err => { reject(err); }, () => { -- 2.11.0