From dd93b9752fcb25938e6c421cc88206664fb65688 Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Tue, 10 Dec 2019 19:03:17 +0000 Subject: [PATCH] LP1849212: Angular Course Page improvements, OPAC course search - Apply Course Users functionality to Angular Course Page Admin UI. - 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 - Set datatype of is_public on Course User to 'bool' from 'boolean' - Relabel is_public on Course User to "OPAC Viewable?" - Undo removal of fm-editor in Course List - Users with the MANAGE_RESERVES permission who are opted into the course module can view a new Course Info tab on the item record. - Course Info tab displays a list of all courses(with link to the Admin Course Page) item is associated with, and a list of all instructors associated with those courses. - Improvements to open-ils.circ.course_users.retrieve. - Improve visuals when logged in as administrator. - Implement Course Search OPAC page, based on Advanced Catalog Search - Edit Searchbar to include entry for Course Search Signed-off-by: Kyle Huckins Signed-off-by: Jane Sandberg Signed-off-by: Michele Morgan Signed-off-by: Galen Charlton --- Open-ILS/examples/fm_IDL.xml | 4 +- .../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-list.component.html | 23 +- .../course-reserves/course-list.component.ts | 144 ++------- .../course-page.component.html | 254 ++-------------- .../course-reserves/course-page.component.ts | 117 +------ .../eg2/src/app/staff/share/course.service.ts | 48 ++- .../perlmods/lib/OpenILS/Application/Circ.pm | 25 +- .../perlmods/lib/OpenILS/WWW/EGCatLoader.pm | 2 + .../lib/OpenILS/WWW/EGCatLoader/Course.pm | 196 ++++++++++++ .../src/templates/opac/course/results.tt2 | 114 +++++++ Open-ILS/src/templates/opac/course_search.tt2 | 95 ++++++ Open-ILS/src/templates/opac/css/style.css.tt2 | 4 + .../opac/parts/course_search/global_row.tt2 | 55 ++++ .../parts/course_search/qtype_selector.tt2 | 20 ++ .../opac/parts/record/copy_table.tt2 | 7 +- .../src/templates/opac/parts/searchbar.tt2 | 3 + .../staff/cat/item/t_course_pane.tt2 | 72 +++++ .../src/templates/staff/cat/item/t_view.tt2 | 3 + .../web/js/ui/default/staff/cat/item/app.js | 74 ++++- 23 files changed, 1300 insertions(+), 824 deletions(-) create mode 100644 Open-ILS/src/templates/opac/course/results.tt2 create mode 100644 Open-ILS/src/templates/opac/course_search.tt2 create mode 100644 Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 create mode 100644 Open-ILS/src/templates/opac/parts/course_search/qtype_selector.tt2 create mode 100644 Open-ILS/src/templates/staff/cat/item/t_course_pane.tt2 diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index db6946f293..9e896c9765 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -3121,7 +3121,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -3144,7 +3144,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + 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..1a3d9c6c64 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 @@ - + - - - - - -
- - - - + + + + +
- + hiddenFields="id,is_archived"> + \ 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 0361526439..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 -
- -
-
-
-
-
- - -
-
-
-
- -
-
+ + - - - - - - \ 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-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts index 37654963e7..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,44 +41,18 @@ 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 - @Input() userBarcode: String; - @Input() userRoleInput: String; 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 ) { - this.materialsDataSource = new GridDataSource(); } ngOnInit() { @@ -79,9 +60,6 @@ export class CoursePageComponent implements OnInit { this.course.getCourses([this.courseId]).then(course => { this.currentCourse = course[0]; }); - this.materialsDataSource.getRows = (pager: Pager, sort: any[]) => { - return this.loadMaterialsGrid(pager); - } } // Edit Tab @@ -100,84 +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)); - }); - }); - } - } - - deleteSelected(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)); - } - ); - }); - } } \ 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 de946c42d9..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 @@ -45,20 +45,33 @@ export class CourseService { } } - fleshMaterial(itemId, relationship?): Promise { + getUsers(course_ids?: Number[]): Promise { + if (!course_ids) { + return this.pcrud.retrieveAll('acmcu', + {}, {atomic: true}).toPromise(); + } else { + return this.pcrud.search('acmcu', {course: course_ids}, + {}, {atomic: true}).toPromise(); + } + } + + 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); @@ -66,6 +79,24 @@ export class CourseService { }); } + 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 = []; return new Promise((resolve, reject) => { @@ -145,6 +176,15 @@ export class CourseService { return response; } + 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); + new_user.course(args.currentCourse.id()); + new_user.usr(patron_id); + return this.pcrud.create(new_user).toPromise() + } + disassociateMaterials(courses) { return new Promise((resolve, reject) => { let course_ids = []; @@ -181,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); }, () => { diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm index 0a7c80f7fe..c48f6ce9c3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm @@ -1063,15 +1063,6 @@ __PACKAGE__->register_method( @params args : Supplied object to filter search. /); -__PACKAGE__->register_method( - method => 'fetch_courses', - autoritative => 1, - api_name => 'open-ils.circ.courses.retrieve', - signature => q/ - Returns an array of course materials. - @params course_id: The id of the course we want to retrieve - /); - sub fetch_course_materials { my ($self, $conn, $args) = @_; my $e = new_editor(); @@ -1126,6 +1117,15 @@ sub fetch_course_materials { return $targets; } +__PACKAGE__->register_method( + method => 'fetch_courses', + autoritative => 1, + api_name => 'open-ils.circ.courses.retrieve', + signature => q/ + Returns an array of course materials. + @params course_id: The id of the course we want to retrieve + /); + sub fetch_courses { my ($self, $conn, @course_ids) = @_; my $e = new_editor(); @@ -1169,7 +1169,7 @@ sub fetch_course_users { unless ($self->api_name =~ /\.staff/) and $e->allowed('MANAGE_RESERVES'); - $users->{list} = $e->search_asset_course_module_course_users($filter); + $users->{list} = $e->search_asset_course_module_course_users($filter, {order_by => {acmcu => 'id'}}); for my $course_user (@{$users->{list}}) { my $patron = {}; $patron->{id} = $course_user->id; @@ -1183,10 +1183,15 @@ sub fetch_course_users { my $final_user = {}; $final_user->{id} = $user->{id}; $final_user->{usr_role} = $user->{usr_role}; + $final_user->{patron_id} = $user->{patron_data}->id; $final_user->{first_given_name} = $user->{patron_data}->first_given_name; + $final_user->{second_given_name} = $user->{patron_data}->second_given_name; $final_user->{family_name} = $user->{patron_data}->family_name; $final_user->{pref_first_given_name} = $user->{patron_data}->pref_first_given_name; $final_user->{pref_family_name} = $user->{patron_data}->pref_family_name; + $final_user->{pref_second_given_name} = $user->{patron_data}->pref_second_given_name; + $final_user->{pref_suffix} = $user->{patron_data}->pref_suffix; + $final_user->{pref_prefix} = $user->{patron_data}->pref_prefix; push @$targets, $final_user; } diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm index 2a9548f13a..c252552045 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm @@ -145,6 +145,8 @@ sub load { return $self->load_simple("home") if $path =~ m|opac/home|; return $self->load_simple("css") if $path =~ m|opac/css|; + return $self->load_cresults if $path =~ m|opac/course/results|; + return $self->load_simple("course_search") if $path =~ m|opac/course_search|; return $self->load_simple("advanced") if $path =~ m:opac/(advanced|numeric|expert):; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Course.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Course.pm index bd340eadfb..496c043f3e 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Course.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Course.pm @@ -39,4 +39,200 @@ sub load_course { {course => $course_id} ); return Apache2::Const::OK; +} + +sub load_cresults { + my $self = shift; + my %args = @_; + my $internal = $args{internal}; + my $cgi = $self->cgi; + my $ctx = $self->ctx; + my $e = $self->editor; + my $limit = 10; + + $ctx->{page} = 'cresult' unless $internal; + $ctx->{ids} = []; + $ctx->{courses} = []; + $ctx->{hit_count} = 0; + $ctx->{search_ou} = $self->_get_search_lib(); + my $page = $cgi->param('page') || 0; + my $offset = $page * $limit; + my $results; + $ctx->{page_size} = $limit; + $ctx->{search_page} = $page; + $ctx->{pagable_limit} = 50; + + # fetch this page plus the first hit from the next page + if ($internal) { + $limit = $offset + $limit + 1; + $offset = 0; + } + + my ($user_query, $query, @queries, $modifiers) = _prepare_course_search($cgi, $ctx); + + return Apache2::Const::OK unless $query; + + $ctx->{user_query} = $user_query; + $ctx->{processed_search_query} = $query; + my $search_args = {}; + my $course_numbers = (); + + my $where_clause; + my $and_terms = []; + my $or_terms = []; + + # Handle is_archived checkbox and Org Selector + my $search_orgs = $U->get_org_descendants($ctx->{search_ou}); + push @$and_terms, {'owning_lib' => $search_orgs}; + push @$and_terms, {'-not' => {'+acmc' => 'is_archived'}} unless $query =~ qr\#include_archived\; + + # Now let's push the actual queries + for my $query_obj (@queries) { + my $type = $query_obj->{'qtype'}; + my $query = $query_obj->{'value'}; + my $bool = $query_obj->{'bool'}; + my $contains = $query_obj->{'contains'}; + my $operator = ($contains eq 'nocontains') ? '!~*' : '~*'; + my $search_query; + if ($type eq 'instructor') { + my $in = ($contains eq 'nocontains') ? "not in" : "in"; + $search_query = {'id' => {$in => { + 'from' => 'acmcu', + 'select' => {'acmcu' => ['course']}, + 'where' => {'usr' => {'in' => { + 'from' => 'au', + 'select' => {'au' => ['id']}, + 'where' => { + '-or' => [ + {'pref_first_given_name' => {'~*' => $query}}, + {'first_given_name' => {'~*' => $query}}, + {'pref_second_given_name' => {'~*' => $query}}, + {'second_given_name' => {'~*' => $query}}, + {'pref_family_name' => {'~*' => $query}}, + {'family_name' => {'~*' => $query}} + ] + } + }}} + }}}; + } else { + $search_query = ($contains eq 'nocontains') ? + {'+acmc' => { $type => {$operator => $query}}} : + {$type => {$operator => $query}}; + } + + if ($bool eq 'or') { + push @$or_terms, $search_query; + } + + if ($bool eq 'and') { + push @$and_terms, $search_query; + } + } + + if ($or_terms and @$or_terms > 0) { + if ($and_terms and @$and_terms > 0) { + push @$or_terms, $and_terms; + } + $where_clause = {'-or' => $or_terms}; + } else { + $where_clause = {'-and' => $and_terms}; + } + + my $hits = $e->json_query({ + "from" => "acmc", + "select" => {"acmc" => ['id']}, + "where" => $where_clause + }); + + my $results = $e->json_query({ + "from" => "acmc", + "select" => {"acmc" => [ + 'id', + 'name', + 'course_number', + 'section_number', + 'is_archived', + 'owning_lib' + ]}, + "limit" => $limit, + "offset" => $offset, + "order_by" => {"acmc" => ['id']}, + "where" => $where_clause + }); + for my $result (@$results) { + push @{$ctx->{courses}}, { + id => $result->{id}, + course_number => $result->{course_number}, + section_number => $result->{section_number}, + owning_lib => $result->{owning_lib}, + name => $result->{name}, + is_archived => $result->{is_archived}, + instructors => [] + } + } + + #$ctx->{courses} = $@courses;#[{id=>10, name=>"test", course_number=>"LIT"}]; + $ctx->{hit_count} = @$hits || 0; + #$ctx->{hit_count} = 0; + return Apache2::Const::OK; +} + +sub _prepare_course_search { + my ($cgi, $ctx) = @_; + + my ($user_query, @queries) = _prepare_query($cgi); + my $modifiers; + $user_query //= ''; + + my $query = $user_query; + $query .= ' ' . $ctx->{global_search_filter} if $ctx->{global_search_filter}; + + foreach ($cgi->param('modifier')) { + $query = ('#' . $_ . ' ' . $query) unless $query =~ qr/\#\Q$_/; + + } + # filters + foreach (grep /^fi:/, $cgi->param) { + /:(-?\w+)$/ or next; + my $term = join(",", $cgi->param($_)); + $query .= " $1($term)" if length $term; + } + + return () unless $query; + + return ($user_query, $query, @queries); +} + +sub _prepare_query { + my $cgi = shift; + + return $cgi->param('query') unless $cgi->param('qtype'); + + my %parts; + my @part_names = qw/qtype contains query bool modifier/; + $parts{$_} = [ $cgi->param($_) ] for (@part_names); + + my $full_query = ''; + my @queries; + for (my $i = 0; $i < scalar @{$parts{'qtype'}}; $i++) { + my ($qtype, $contains, $query, $bool, $modifier) = map { $parts{$_}->[$i] } @part_names; + next unless $query =~ /\S/; + + $contains = "" unless defined $contains; + + push @queries, { + contains => $contains, + bool => $bool, + qtype => $qtype, + value => $query + }; + + $bool = ($bool and $bool eq 'or') ? '||' : '&&'; + + $query = "$qtype:$query"; + + $full_query = $full_query ? "($full_query $bool $query)" : $query; + } + + return ($full_query, @queries); } \ No newline at end of file diff --git a/Open-ILS/src/templates/opac/course/results.tt2 b/Open-ILS/src/templates/opac/course/results.tt2 new file mode 100644 index 0000000000..f8ae3b971a --- /dev/null +++ b/Open-ILS/src/templates/opac/course/results.tt2 @@ -0,0 +1,114 @@ +[%- PROCESS "opac/parts/header.tt2"; + WRAPPER "opac/parts/base.tt2"; + INCLUDE "opac/parts/topnav.tt2"; + ctx.page_title = l("Course Search Results"); + page = CGI.param('page'); + page = page.match('^\d+$') ? page : 0; # verify page is a sane value + + page_count = (!ctx.page_size.defined || !ctx.hit_count.defined || ctx.page_size == 0) ? 1 : POSIX.ceil(ctx.hit_count / ctx.page_size); + + # We don't want search engines indexing search results + ctx.metalinks.push(''); + + PROCESS "opac/parts/misc_util.tt2"; + PROCESS get_library; + ctx.result_start = 1 + ctx.page_size * page; + ctx.result_stop = ctx.page_size * (page + 1); + IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; + + result_count = ctx.result_start; +-%] +

[% l('Course Search Results') %]

+[% INCLUDE "opac/parts/searchbar.tt2" %] +
+ +
+
+
+
+ [% PROCESS "opac/parts/result/paginate.tt2" %] + [% ctx.results_count_header = PROCESS results_count_header; + ctx.results_count_header %] +
+
+ + + + + + + + + + [% FOR course IN ctx.courses %] + [% course_url_path = ctx.opac_root _ '/course/' _ course.id; %] + [% # Do not pass "advanced params" to result detail code. + # Instead, pass the scrubed query in one-line form + del_parms = del_parms.merge(['query', 'bool', + 'qtype', 'contains', '_adv']); + add_parms.import( + {query => ctx.naive_query_scrub(ctx.user_query)} ); + %] + + + + + + + [% END %] + +
[% l('Search result number') %][% l('Course details') %]
+ [% result_count; result_count = result_count + 1 %]. + +
+ + [% course.course_number %]: [% l(course.name) %] + +
+ [% FOR instructor IN course.instructors %] + [% instructorString = ''; + IF instructor.pref_family_name; + instructorString = instructorString _ instructor.pref_family_name _ ', '; + ELSE; + instructorString = instructorString _ instructor.family_name _ ', '; + END; + IF instructor.pref_first_given_name; + instructorString = instructorString _ instructor.pref_first_given_name; + ELSE; + instructorString = instructorString _ instructor.first_given_name; + END; %] + + [% instructorString %] ([% l(instructor.usr_role) %]). + [% END %] +
+
+ [% l('Course Number') %]: [% course.course_number %] +
+
+ [% l('Section Number') %]: [% course.section_number %] +
+
+ 		+ [% ctx.get_aou(course.owning_lib).name %] +
+
+
+
+
+
+
+
+[%- END %] diff --git a/Open-ILS/src/templates/opac/course_search.tt2 b/Open-ILS/src/templates/opac/course_search.tt2 new file mode 100644 index 0000000000..979930a393 --- /dev/null +++ b/Open-ILS/src/templates/opac/course_search.tt2 @@ -0,0 +1,95 @@ +[%- PROCESS "opac/parts/header.tt2"; + WRAPPER "opac/parts/base.tt2"; + INCLUDE "opac/parts/topnav.tt2"; + ctx.page_title = l("Course Search"); + + PROCESS "opac/parts/misc_util.tt2"; + PROCESS get_library; + ctx.metalinks.push(''); +-%] + +

[% l('Course Search') %]

+ +
+ +
+ +
+
+
+ +
+ [% l("Course Search Input") %] +
+ +
+
+
+ +
+
+ [% PROCESS "opac/parts/org_selector.tt2" %] + [% INCLUDE build_org_selector show_loc_groups=1 id=org.id %] + + + + +
+
+
+ +
+ +
+
+
+
+
+ +[% END %] \ No newline at end of file diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index f998b7f927..3cb686af77 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -1427,6 +1427,10 @@ div.result_table_utils_cont { font-size: [% css_fonts.size_bigger %]; } +.search_courses_label { + font-size: [% css_fonts.size_bigger %]; +} + .lbl1 { font-size: [% css_fonts.size_bigger %]; font-weight:bold; diff --git a/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 b/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 new file mode 100644 index 0000000000..d68842f09b --- /dev/null +++ b/Open-ILS/src/templates/opac/parts/course_search/global_row.tt2 @@ -0,0 +1,55 @@ +[% + contains_options = [ + {value => 'contains', label => l('Contains')}, + {value => 'nocontains', label => l('Does not contain')} + ]; + contains = CGI.param('contains'); + queries = CGI.param('query'); + bools = CGI.param('bool'); + qtypes = CGI.param('qtype'); + rowcount = 3; + + # scalar.merge treats the scalar as a 1-item array + WHILE queries.size < rowcount; queries = queries.merge(['']); END; + WHILE bools.size < rowcount; bools = bools.merge(['and']); END; + WHILE qtypes.size < rowcount; qtypes = qtypes.merge(search.default_qtypes.${qtypes.size} ? [search.default_qtypes.${qtypes.size}] : ['keyword']); END; + + FOR qtype IN qtypes; + c = contains.shift; + b = bools.shift; + q = queries.shift; %] + + + + + + + + + + + [% INCLUDE "opac/parts/course_search/qtype_selector.tt2" + query_type=qtype %] + + + + + + [% l('Remove row') %] + + + +[% END %] diff --git a/Open-ILS/src/templates/opac/parts/course_search/qtype_selector.tt2 b/Open-ILS/src/templates/opac/parts/course_search/qtype_selector.tt2 new file mode 100644 index 0000000000..a9770b1fe0 --- /dev/null +++ b/Open-ILS/src/templates/opac/parts/course_search/qtype_selector.tt2 @@ -0,0 +1,20 @@ +[% query_types = [ + {value => "name", label => l("Title"), plural_label => l("Titles"), browse => 1}, + {value => "instructor", label => l("Instructor"), plural_label => l('Instructors')}, + {value => "course_number", label => l("Course Number")} +]; +-%] + diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 index c0a4bfc7fb..48d9c0da0b 100644 --- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 @@ -150,7 +150,10 @@ END; # FOREACH bib [% IF copy_info.courses.size > 0 || ctx.is_staff %] [% copy_info.circ_modifier | html %] - [% ELSIF ctx.is_staff %] + [% ELSIF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %] + + [% END %] + [% IF ctx.is_staff %] [% copy_info.age_protect ? ctx.get_crahp(copy_info.age_protect).name : l('None') | html %] @@ -171,8 +174,6 @@ END; # FOREACH bib '-'; END; %] - [% ELSIF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %] - [% END # is_staff %] [% IF ctx.is_staff OR serial_holdings %] [% # Show copy/volume hold links to staff (without diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2 index d86bd7dc2e..72139869a9 100644 --- a/Open-ILS/src/templates/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2 @@ -44,6 +44,9 @@ END; [% l('Advanced Search') %] [% l('Browse the Catalog') %] + [% IF ctx.get_org_setting(ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %] + [% l('Search for Courses') %] + [% END %] [% INCLUDE 'opac/parts/cart.tt2' %]
diff --git a/Open-ILS/src/templates/staff/cat/item/t_course_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_course_pane.tt2 new file mode 100644 index 0000000000..befa04abe9 --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/item/t_course_pane.tt2 @@ -0,0 +1,72 @@ +
+
+ [% l('You do not have sufficient permissions to view this page') %] +
+
+ +
+
+
+ [% l('No Associated Courses') %] +
+
+
+
+
+ [% l('Associated Courses') %] +
+
+ +
+
+ {{course.course_number()}}: {{course.name()}} +
+
+
+ +
+
+ [% l('No Associated Instructors') %] +
+
+
+
+
+ [% l('Associated Instructors') %] +
+
+ +
+
+ + + {{instructor.pref_family_name}}, + + + {{instructor.family_name}}, + + + {{instructor.pref_first_given_name}} + + + {{instructor.first_given_name}} + + + {{instructor.pref_second_given_name}} + + + {{instructor.second_given_name}} + + +
+
+
+ {{key.course}} + ({{key.role}}) +
+
+
+
+
+
+
diff --git a/Open-ILS/src/templates/staff/cat/item/t_view.tt2 b/Open-ILS/src/templates/staff/cat/item/t_view.tt2 index 1859865675..bf9eaa4817 100644 --- a/Open-ILS/src/templates/staff/cat/item/t_view.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/t_view.tt2 @@ -23,6 +23,9 @@
  • [% l('Triggered Events') %]
    • +
  • + [% l('Course Info') %] +
    • diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index 2237d75db9..2995069b28 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -777,21 +777,21 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD * Detail view -- shows one copy */ .controller('ViewCtrl', - ['$scope','$q','$location','$routeParams','$timeout','$window','egCore','egItem','egBilling','egCirc', -function($scope , $q , $location , $routeParams , $timeout , $window , egCore , itemSvc , egBilling , egCirc) { + ['$scope','$q','egGridDataProvider','$location','$routeParams','$timeout','$window','egCore','egItem','egBilling','egCirc', +function($scope , $q , egGridDataProvider , $location , $routeParams , $timeout , $window , egCore , itemSvc , egBilling , egCirc) { var copyId = $routeParams.id; $scope.args.copyId = copyId; $scope.tab = $routeParams.tab || 'summary'; $scope.context.page = 'detail'; $scope.summaryRecord = null; - + $scope.courseModulesOptIn = fetchCourseOptIn(); + $scope.has_course_perms = fetchCoursePerms(); $scope.edit = false; if ($scope.tab == 'edit') { $scope.tab = 'summary'; $scope.edit = true; } - // use the cached record info if (itemSvc.copy) { $scope.copy_alert_count = itemSvc.copy.copy_alerts().filter(function(aca) { @@ -998,6 +998,27 @@ console.debug($scope.copy_alert_count); }); } + // Check for Course Modules Opt-In to enable Course Info tab + function fetchCourseOptIn() { + return egCore.org.settings( + 'circ.course_materials_opt_in' + ).then(function(set) { + $scope.courseModulesOptIn = set['circ.course_materials_opt_in']; + + return $scope.courseModulesOptIn; + }); + } + + function fetchCoursePerms() { + return egCore.perm.hasPermAt('MANAGE RESERVES', true).then(function(orgIds) { + if(orgIds.indexOf(egCore.auth.user().ws_ou()) != -1){ + $scope.has_course_perms = true; + + return $scope.has_course_perms; + } + }); + } + $scope.addBilling = function(circ) { egBilling.showBillDialog({ xact_id : circ.id(), @@ -1172,6 +1193,47 @@ console.debug($scope.copy_alert_count); }) } + function loadCourseInfo() { + delete $scope.courses; + delete $scope.instructors; + delete $scope.course_ids; + delete $scope.instructors_exist; + if (!copyId) return; + $scope.course_ids = []; + $scope.courses = []; + $scope.instructors = {}; + + egCore.pcrud.search('acmcm', { + item: copyId + }, { + flesh: 3, + flesh_fields: { + acmcm: ['course'] + }, order_by: {acmc : 'id desc'} + }).then(null, null, function(material) { + + $scope.courses.push(material.course()); + egCore.net.request( + 'open-ils.circ', + 'open-ils.circ.course_users.retrieve', + material.course().id() + ).then(null, null, function(instructors) { + angular.forEach(instructors, function(instructor) { + var patron_id = instructor.patron_id.toString(); + if (!$scope.instructors[patron_id]) { + $scope.instructors[patron_id] = instructor; + $scope.instructors_exist = true; + $scope.instructors[patron_id]._linked_course = []; + } + $scope.instructors[patron_id]._linked_course.push({ + role: instructor.usr_role, + course: material.course().name() + }); + }); + }); + }); + } + // we don't need all data on all tabs, so fetch what's needed when needed. function loadTabData() { @@ -1194,6 +1256,10 @@ console.debug($scope.copy_alert_count); loadMostRecentTransit(); break; + case 'course': + loadCourseInfo(); + break; + case 'triggered_events': var url = $location.absUrl().replace(/\/staff.*/, '/actor/user/event_log'); url += '?copy_id=' + encodeURIComponent(copyId); -- 2.43.2