lp1849212 Angular Catalog Show Link to Course

- Add a column retrieving the names of courses linked to materials
when opted into the Course Reserves functionality.
- Expand the bib record summary when opted in to display all courses
associated with an item.

 Changes to be committed:
	modified:   Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
	modified:   Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
	modified:   Open-ILS/src/eg2/src/app/staff/common.module.ts
	modified:   Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html
	modified:   Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.ts
	modified:   Open-ILS/src/eg2/src/app/staff/share/course.service.ts

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
index 64bd5dc..0ca63cf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-reserves.module.ts
@@ -1,11 +1,11 @@
 import {NgModule} from '@angular/core';
 import {TreeModule} from '@eg/share/tree/tree.module';
+import {StaffCommonModule} from '@eg/staff/common.module';
 import {AdminCommonModule} from '@eg/staff/admin/common.module';
 import {CourseListComponent} from './course-list.component';
 import {CourseAssociateMaterialComponent} from './course-associate-material.component';
 import {CourseReservesRoutingModule} from './routing.module';
 import {ItemLocationSelectModule} from '@eg/share/item-location-select/item-location-select.module';
-import {CourseService} from '@eg/staff/share/course.service';
 
 @NgModule({
   declarations: [
@@ -13,6 +13,7 @@ import {CourseService} from '@eg/staff/share/course.service';
     CourseAssociateMaterialComponent
   ],
   imports: [
+    StaffCommonModule,
     AdminCommonModule,
     CourseReservesRoutingModule,
     ItemLocationSelectModule,
@@ -21,7 +22,6 @@ import {CourseService} from '@eg/staff/share/course.service';
   exports: [
   ],
   providers: [
-    CourseService
   ]
 })
 

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
index 8c511c3..ab44c6c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
@@ -35,6 +35,10 @@
   <span *ngIf="!context.holdable(copy)" i18n>No</span>
 </ng-template>
 
+<ng-template #courseTemplate let-copy="row">
+  <div *ngFor="let course of copy._courses">{{course.course_number()}}</div>
+</ng-template>
+
 <div class='eg-copies w-100 mt-3'>
   <eg-grid #copyGrid [dataSource]="gridDataSource" 
     [disableSelect]="true" [cellTextGenerator]="cellTextGenerator"
@@ -62,6 +66,9 @@
     <eg-grid-column i18n-label label="Holdable?" name="holdable" 
       [cellTemplate]="holdableTemplate" [cellContext]="copyContext">
     </eg-grid-column>
+    <eg-grid-column i18n-label label="Course" name="course"
+      [cellTemplate]="courseTemplate" *ngIf="usingCourseModule">
+    </eg-grid-column>
     <eg-grid-column i18n-label label="Status" path="copy_status">
     </eg-grid-column>
     <eg-grid-column i18n-label label="Due Date" path="due_date" datatype="timestamp">

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
index bfc2b03..69e2971 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
@@ -7,6 +7,7 @@ import {Pager} from '@eg/share/util/pager';
 import {OrgService} from '@eg/core/org.service';
 import {GridDataSource, GridColumn, GridCellTextGenerator} from '@eg/share/grid/grid';
 import {GridComponent} from '@eg/share/grid/grid.component';
+import {CourseService} from '@eg/staff/share/course.service';
 
 @Component({
   selector: 'eg-catalog-copies',
@@ -16,6 +17,7 @@ export class CopiesComponent implements OnInit {
 
     recId: number;
     initDone = false;
+    usingCourseModule = false;
     gridDataSource: GridDataSource;
     copyContext: any; // grid context
     @ViewChild('copyGrid', { static: true }) copyGrid: GridComponent;
@@ -32,6 +34,7 @@ export class CopiesComponent implements OnInit {
     cellTextGenerator: GridCellTextGenerator;
 
     constructor(
+        private course: CourseService,
         private net: NetService,
         private org: OrgService,
         private staffCat: StaffCatalogService,
@@ -41,6 +44,9 @@ export class CopiesComponent implements OnInit {
 
     ngOnInit() {
         this.initDone = true;
+        this.course.isOptedIn().then(res => {
+            this.usingCourseModule = res;
+        });
 
         this.gridDataSource.getRows = (pager: Pager, sort: any[]) => {
             // sorting not currently supported
@@ -90,6 +96,13 @@ export class CopiesComponent implements OnInit {
             pager.offset,
             this.staffCat.prefOrg ? this.staffCat.prefOrg.id() : null
         ).pipe(map(copy => {
+            this.org.settings('circ.course_materials_opt_in').then(res => {
+                if (res['circ.course_materials_opt_in']) {
+                    this.course.getCoursesFromMaterial(copy.id).then(courseList => {
+                        copy._courses = courseList;
+                    });
+                }
+            });
             copy.active_date = copy.active_date || copy.create_date;
             return copy;
         }));

diff --git a/Open-ILS/src/eg2/src/app/staff/common.module.ts b/Open-ILS/src/eg2/src/app/staff/common.module.ts
index 5b9645e..70bcbad 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts
@@ -17,6 +17,7 @@ import {DatetimeValidatorDirective} from '@eg/share/validators/datetime_validato
 import {MultiSelectComponent} from '@eg/share/multi-select/multi-select.component';
 import {NotBeforeMomentValidatorDirective} from '@eg/share/validators/not_before_moment_validator.directive';
 import {PatronBarcodeValidatorDirective} from '@eg/share/validators/patron_barcode_validator.directive';
+import {CourseService} from './share/course.service'
 
 /**
  * Imports the EG common modules and adds modules common to all staff UI's.
@@ -69,7 +70,8 @@ export class StaffCommonModule {
             ngModule: StaffCommonModule,
             providers: [ // Export staff-wide services
                 AccessKeyService,
-                AudioService
+                AudioService,
+                CourseService
             ]
         };
     }

diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html
index 3fd9558..0dea4ba 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.html
@@ -91,6 +91,25 @@
               <div class="flex-1">{{summary.record.edit_date() | date:'short'}}</div>
             </div>
           </li>
+          <ng-container *ngIf="expand && has_course">
+            <li class="list-group-item">
+              <div class="d-flex">
+                <div class="flex-1 font-weight-bold" i18n>Associated Courses</div>
+              </div>
+            </li>
+            <li class="list-group-item" *ngFor="let course of courses">
+              <div class="d-flex">
+                <div class="flex-1 font-weight-bold" i18n>Course Name:</div>
+                <div class="flex-3">{{course.name()}}</div>
+                <div class="flex-1 font-weight-bold" i18n>Course Number:</div>
+                <div class="flex-1">{{course.course_number()}}</div>
+                <div class="flex-1 font-weight-bold" i18n>Section Number:</div>
+                <div class="flex-1">{{course.section_number()}}</div>
+                <div class="flex-1 font-weight-bold" i18n>Owning Library:</div>
+                <div class="flex-1">{{this.org.get(course.owning_lib()).shortname()}}</div>
+              </div>
+            </li>
+          </ng-container>
         </ul>
       </div>
     </div><!-- col -->

diff --git a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.ts b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.ts
index 39b8944..edd73bf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/bib-summary/bib-summary.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit, Input} from '@angular/core';
 import {OrgService} from '@eg/core/org.service';
+import {CourseService} from '@eg/staff/share/course.service';
 import {BibRecordService, BibRecordSummary
     } from '@eg/share/catalog/bib-record.service';
 import {ServerStoreService} from '@eg/core/server-store.service';
@@ -13,6 +14,8 @@ import {CatalogService} from '@eg/share/catalog/catalog.service';
 export class BibSummaryComponent implements OnInit {
 
     initDone = false;
+    has_course = false;
+    courses: any;
 
     // True / false if the display is vertically expanded
     private _exp: boolean;
@@ -33,6 +36,7 @@ export class BibSummaryComponent implements OnInit {
         this.summary = s;
         if (this.initDone && this.summary) {
             this.summary.getBibCallNumber();
+            this.loadCourseInformation(this.summary.record.id());
         }
     }
 
@@ -40,13 +44,15 @@ export class BibSummaryComponent implements OnInit {
         private bib: BibRecordService,
         private org: OrgService,
         private store: ServerStoreService,
-        private cat: CatalogService
+        private cat: CatalogService,
+        private course: CourseService
     ) {}
 
     ngOnInit() {
 
         if (this.summary) {
             this.summary.getBibCallNumber();
+            this.loadCourseInformation(this.summary.record.id());
         } else {
             if (this.recordId) {
                 this.loadSummary();
@@ -63,6 +69,7 @@ export class BibSummaryComponent implements OnInit {
     }
 
     loadSummary(): void {
+        this.loadCourseInformation(this.recordId);
         this.bib.getBibSummary(this.recordId).toPromise()
         .then(summary => {
             summary.getBibCallNumber();
@@ -71,6 +78,19 @@ export class BibSummaryComponent implements OnInit {
         });
     }
 
+    loadCourseInformation(record_id) {
+        this.org.settings('circ.course_materials_opt_in').then(setting => {
+            if (setting['circ.course_materials_opt_in']) {
+                this.course.fetchCopiesInCourseFromRecord(record_id).then(course_list => {
+                    this.courses = course_list;
+                    this.has_course = true;
+                });
+            } else {
+                this.has_course = false;
+            }
+        });
+    }
+
     orgName(orgId: number): string {
         if (orgId) {
             return this.org.get(orgId).shortname();

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 c8b60cc..cca2882 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/course.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/course.service.ts
@@ -1,9 +1,12 @@
+import {Injectable} from '@angular/core';
 import {AuthService} from '@eg/core/auth.service';
 import {EventService} from '@eg/core/event.service';
 import {IdlObject, IdlService} from '@eg/core/idl.service';
 import {NetService} from '@eg/core/net.service';
+import {OrgService} from '@eg/core/org.service';
 import {PcrudService} from '@eg/core/pcrud.service';
 
+@Injectable()
 export class CourseService {
 
     constructor(
@@ -11,9 +14,71 @@ export class CourseService {
         private evt: EventService,
         private idl: IdlService,
         private net: NetService,
+        private org: OrgService,
         private pcrud: PcrudService
     ) {}
 
+    isOptedIn(): Promise<any> {
+        return new Promise((resolve, reject) => {
+            this.org.settings('circ.course_materials_opt_in').then(res => {
+                resolve(res['circ.course_materials_opt_in']);
+            });
+        });
+    }
+    getCourses(course_ids?: Number[]): Promise<IdlObject[]> {
+        if (!course_ids) {
+            return this.pcrud.retrieveAll('acmc',
+                {}, {atomic: true}).toPromise();
+        } else {
+            return this.pcrud.search('acmc', {id: course_ids},
+                {}, {atomic: true}).toPromise();
+        }
+    }
+
+    getCoursesFromMaterial(copy_id): Promise<any> {
+        let id_list = [];
+        return new Promise((resolve, reject) => {
+
+            return this.pcrud.search('acmcm', {item: copy_id})
+            .subscribe(materials => {
+                if (materials) {
+                    id_list.push(materials.course());
+                }
+            }, err => {
+                console.log(err);
+                reject(err);
+            }, () => {
+                if (id_list.length) {
+                    return this.getCourses(id_list).then(courses => {
+                        resolve(courses);
+                    });
+                    
+                }
+            });
+        });
+    }
+
+    fetchCopiesInCourseFromRecord(record_id) {
+        let cp_list = [];
+        let course_list = [];
+        return new Promise((resolve, reject) => {
+            this.net.request(
+                'open-ils.cat',
+                'open-ils.cat.asset.copy_tree.global.retrieve',
+                this.auth.token(), record_id
+            ).subscribe(copy_tree => {
+                copy_tree.forEach(cn => {
+                    cn.copies().forEach(cp => {
+                        cp_list.push(cp.id());
+                    });
+                });
+            }, err => reject(err),
+            () => {
+                resolve(this.getCoursesFromMaterial(cp_list));
+            });
+        });
+    }
+
     disassociateMaterials(courses) {
         return new Promise((resolve, reject) => {
             let course_ids = [];