From: Zavier Banks <zbanks@catalyte.io>
Date: Fri, 8 Nov 2019 22:30:32 +0000 (+0000)
Subject: LP#1849212 Angular Search Course Reserves Facet
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=95d012e8ce8530d228f23b81fdc79b809c2f9bc0;p=working%2FEvergreen.git

LP#1849212 Angular Search Course Reserves Facet

Signed-off-by: Zavier Banks <zbanks@catalyte.io>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
index ac99f25b9d..05fe7c9889 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/course-reserves/course-list.component.ts
@@ -22,11 +22,6 @@ export class CourseListComponent implements OnInit {
     @ViewChild('updateFailedString', { static: false }) updateFailedString: StringComponent;
     @ViewChild('deleteFailedString', { static: true }) deleteFailedString: StringComponent;
     @ViewChild('deleteSuccessString', { static: true }) deleteSuccessString: StringComponent;
-<<<<<<< HEAD
-    @ViewChild('flairTooltip', { static: true }) private flairTooltip: StringComponent;
-    rowFlairCallback: (row: any) => GridRowFlairEntry;
-=======
->>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
     @Input() sort_field: string;
     @Input() idl_class = "acmc";
     @Input() dialog_size: 'sm' | 'lg' = 'lg';
@@ -41,10 +36,6 @@ export class CourseListComponent implements OnInit {
 
     ngOnInit() {
         this.getSource();
-<<<<<<< HEAD
-        this.rowFlair();
-=======
->>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
     }
 
     /**
@@ -69,27 +60,6 @@ export class CourseListComponent implements OnInit {
         };
     }
 
-<<<<<<< HEAD
-    rowFlair() {
-        this.rowFlairCallback = (row: any): GridRowFlairEntry => {
-            const flair = {icon: null, title: null};
-            if (row.id() < 100) {
-                flair.icon = 'not_interested';
-                flair.title = this.flairTooltip.text;
-            }
-            return flair;
-        };
-    }
-
-    gridCellClassCallback = (row: any, col: GridColumn): string => {
-        if (col.name === 'id' && row.a[0] < 100) {
-            return 'text-danger';
-        }
-        return '';
-    }
-
-=======
->>>>>>> 3caf654095ad80baf21646630e2a9324bf0ad314
     showEditDialog(standingPenalty: IdlObject): Promise<any> {
         this.editDialog.mode = 'update';
         this.editDialog.recordId = standingPenalty['id']();