From 8cc2970f65434d11642b6d1782886e16de6674b3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 1 May 2018 11:07:28 -0400 Subject: [PATCH] LP#1626157 grid experiment Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html | 5 ++++- Open-ILS/src/eg2/src/app/share/grid/grid-header.component.html | 6 +++++- Open-ILS/src/eg2/src/app/share/grid/grid.component.css | 7 +++++++ Open-ILS/src/eg2/src/app/share/util/pager.ts | 6 ++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html index 670cc6b8b4..c659033eca 100644 --- a/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html +++ b/Open-ILS/src/eg2/src/app/share/grid/grid-body.component.html @@ -3,9 +3,12 @@ [ngClass]="{'eg-grid-row-selected': selector[idx]}" *ngFor="let row of dataSource.getPage(pager) | async; let idx = index"> -
+
+
+ {{pager.rowNumber(idx)}} +
{{col.displayValue(row)}} 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 1a03da822e..b1003d402d 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 @@ -1,8 +1,12 @@
-
+
+
+ # +
+
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 d20ce1050b..8969cb1c33 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 @@ -33,3 +33,10 @@ display: flex; } +.eg-grid-cell-skinny { + width: 2.2em; + text-align: center; + flex: none; +} + + diff --git a/Open-ILS/src/eg2/src/app/share/util/pager.ts b/Open-ILS/src/eg2/src/app/share/util/pager.ts index e6ec13592e..b1d1861766 100644 --- a/Open-ILS/src/eg2/src/app/share/util/pager.ts +++ b/Open-ILS/src/eg2/src/app/share/util/pager.ts @@ -51,4 +51,10 @@ export class Pager { list.push(i); return list; } + + // Given a zero-based page-specific offset, return the where in the + // entire data set the row lives, 1-based for UI friendliness. + rowNumber(offset: number): number { + return this.offset + offset + 1; + } } -- 2.11.0