From: Bill Erickson Date: Tue, 8 May 2018 18:50:15 +0000 (-0400) Subject: LP#1775466 more grid X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=2b0bb7583a8836127f9a1fa1eb82730220c42e56;p=working%2FEvergreen.git LP#1775466 more grid Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html index 7ce0cf04d2..3af756c9b9 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-column-config.component.html @@ -10,21 +10,16 @@
-
Visible
-
Column Name
-
Move Up
-
Move Down
-
First Visible
-
Last Visible
-
Sort Priority
-
- -
+
Visible
+
Column Name
+
Move Up
+
Move Down
+
First Visible
+
Last Visible
+
Sort Priority
-
✓ @@ -43,29 +38,32 @@ arrow_downward
-
+
vertical_align_top
-
+
vertical_align_bottom
-
+
+ title="Sort Priority / Direction" i18n-title style='width:2.8em'/>
- +
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts index ad9e946d16..631c21e564 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts @@ -16,8 +16,10 @@ export class EgGridColumnComponent implements OnInit { @Input() flex: number; @Input() visible: boolean; @Input() hidden: boolean; - @Input() cellTemplate: TemplateRef; @Input() pkey: boolean; + @Input() sortable: boolean; + @Input() multiSortable: boolean; + @Input() cellTemplate: TemplateRef; // get a reference to our container grid. constructor( @@ -27,7 +29,7 @@ export class EgGridColumnComponent implements OnInit { ngOnInit() { if (!this.grid) { - console.warn('EgGridColumnComponent needs a [grid]'); + console.warn('EgGridColumnComponent needs an '); return; } @@ -39,6 +41,8 @@ export class EgGridColumnComponent implements OnInit { col.hidden = this.hidden; col.cellTemplate = this.cellTemplate; col.isPkey = this.pkey; + col.isSortable = this.sortable; + col.isMultiSortable = this.multiSortable; this.grid.columnSet.add(col); } } diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-data-source.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-data-source.ts index 66da827a78..af54b26edf 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-data-source.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-data-source.ts @@ -10,8 +10,13 @@ export class EgGridDataSource { getRows: (pager: Pager) => Observable; constructor() { + this.reset(); + } + + reset() { this.data = []; this.allRowsRetrieved = false; + if (this.pager) this.pager.resultCount = null; } setAllRetrieved() { @@ -21,7 +26,7 @@ export class EgGridDataSource { // called from the template -- no data fetching getPageOfRows(pager: Pager): any[] { - if (this && this.data) { + if (this.data) { return this.data.slice( pager.offset, pager.limit + pager.offset); } diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html index d2e419a18b..622de577ac 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html @@ -12,9 +12,10 @@ (drop)="onColumnDrop(col)" (dragover)="onColumnDragEnter($event, col)" (dragleave)="onColumnDragLeave($event, col)" - [ngClass]="{'eg-grid-header-cell dragover' : col.isDragTarget}" + [ngClass]="{'dragover' : col.isDragTarget}" class="eg-grid-cell eg-grid-header-cell" [ngStyle]="{flex:col.flex}"> - {{col.label}} + {{col.label}} + {{col.label}}
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html index a73f0b9996..4c985c20be 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html @@ -36,10 +36,19 @@ arrow_drop_down
- + build - Manage Columns + Manage Columns +
+ + + ✓ + ✗ + {{col.label}} + +
diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css index 8e41b2bb0b..a6f6bd86a0 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.css +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.css @@ -26,6 +26,12 @@ border-color: #b8daff; } +.eg-grid-header-cell a.sortable { + cursor: pointer; + color: #007bff; + text-decoration:underline; +} + .eg-grid-cell { flex: 1; /* applied per column */ padding: 6px; @@ -44,7 +50,7 @@ flex: none; } -.eg-grid-column-config-dialog.visible { +.eg-grid-column-config-dialog .visible { color: #000; background-color: rgb(201, 221, 225); border-bottom: 1px solid #888; diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts index 865ca900ea..35495d277c 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.component.ts @@ -18,6 +18,7 @@ export class EgGridComponent implements OnInit { @Input() dataSource: EgGridDataSource; @Input() idlClass: string; + @Input() isSortable: boolean; @Input() isMultiSortable: boolean; @Input() persistKey: string; @@ -37,6 +38,7 @@ export class EgGridComponent implements OnInit { ngOnInit() { this.columnSet = new EgGridColumnSet(this.idlClass); + this.columnSet.isSortable = this.isSortable; this.columnSet.isMultiSortable = this.isMultiSortable; this.gridSvc.generateColumns(this.columnSet); this.dataSource.requestPage(this.pager); diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.service.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.service.ts index 110ed2c4d0..6891907d4d 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid.service.ts +++ b/Open-ILS/src/eg2/src/app/share/grid/grid.service.ts @@ -82,6 +82,7 @@ export class EgGridColumn { cellTemplate: TemplateRef; isPkey: boolean; isDragTarget: boolean; + isSortable: boolean; isMultiSortable: boolean; } @@ -90,6 +91,7 @@ export class EgGridColumnSet { columns: EgGridColumn[]; idlClass: string; pkeyColumn: EgGridColumn; + isSortable: boolean; isMultiSortable: boolean; constructor(idlClass?: string) { @@ -105,12 +107,20 @@ export class EgGridColumnSet { col.visible = !col.hidden; - // If a column set is multisortable, all columns are multisortable - // by default. TODO: add isNotMultiSortable ? + this.applyColumnSortability(col); + + this.columns.push(col); + } + + applyColumnSortability(col: EgGridColumn) { + // column sortability defaults to the sortability of the column set. + if (col.isSortable === undefined && this.isSortable) + col.isSortable = true; + if (col.isMultiSortable === undefined && this.isMultiSortable) col.isMultiSortable = true; - this.columns.push(col); + if (col.isMultiSortable) col.isSortable = true; } displayColumns(): EgGridColumn[] { @@ -118,15 +128,15 @@ export class EgGridColumnSet { } insertBefore(source: EgGridColumn, target: EgGridColumn) { - let targetIdx = 0; - let sourceIdx = 0; + let targetIdx = -1; + let sourceIdx = -1; this.columns.forEach((col, idx) => { if (col.name == target.name) targetIdx = idx; }); this.columns.forEach((col, idx) => { if (col.name == source.name) sourceIdx = idx; }); - if (sourceIdx) + if (sourceIdx >= 0) this.columns.splice(sourceIdx, 1); this.columns.splice(targetIdx, 0, source); @@ -169,7 +179,6 @@ export class EgGridColumnSet { this.columns.splice(targetIdx, 0, col); } - } export class EgGridToolbarButton { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html index 538bbc75dd..94b39f5c74 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/server/config/billing_type.component.html @@ -1,7 +1,7 @@ - +