LP1908763 Survey column sorting broken

[Evergreen.git] / Open-ILS / src / eg2 / src / app / staff / admin / local / survey / survey.component.ts

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey.component.ts
index 9865a4b..7bec134 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/survey/survey.component.ts
@@ -30,6 +30,8 @@ export class SurveyComponent implements OnInit {
     @ViewChild('endSurveyFailedString', { static: true }) endSurveyFailedString: StringComponent;
     @ViewChild('endSurveySuccessString', { static: true }) endSurveySuccessString: StringComponent;
 
     @ViewChild('endSurveyFailedString', { static: true }) endSurveyFailedString: StringComponent;
     @ViewChild('endSurveySuccessString', { static: true }) endSurveySuccessString: StringComponent;
 

+    @Input() sortField: string;
+    @Input() idlClass='asv';

     @Input() dialogSize: 'sm' | 'lg' = 'lg';
 
     constructor(
     @Input() dialogSize: 'sm' | 'lg' = 'lg';
 
     constructor(


@@ -44,7 +46,21 @@ export class SurveyComponent implements OnInit {
 
     ngOnInit() {
         this.gridDataSource.getRows = (pager: Pager, sort: any[]) => {
 
     ngOnInit() {
         this.gridDataSource.getRows = (pager: Pager, sort: any[]) => {

-            return this.pcrud.retrieveAll('asv', {});
+           const orderBy: any = {};
+           if (sort.length) {
+               // Sort specified from grid
+               orderBy[this.idlClass] = sort[0].name + ' ' + sort[0].dir;
+           } else if (this.sortField) {
+               // Default sort field
+               orderBy[this.idlClass] = this.sortField;
+           }
+
+           const searchOps = {
+               offset: pager.offset,
+               limit: pager.limit,
+               order_by: orderBy
+           };
+            return this.pcrud.retrieveAll('asv', searchOps, {});

         };
 
         this.grid.onRowActivate.subscribe(
         };
 
         this.grid.onRowActivate.subscribe(