LP#1626157 grid experiment

Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 670cc6b..c659033 100644 (file)
--- 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">
 
-  <div class="eg-grid-cell eg-grid-checkbox-cell">
+  <div class="eg-grid-cell eg-grid-checkbox-cell eg-grid-cell-skinny">
     <input type='checkbox' [(ngModel)]="selector[idx]">
   </div>
+  <div class="eg-grid-cell eg-grid-header-cell eg-grid-number-cell eg-grid-cell-skinny">
+    {{pager.rowNumber(idx)}}
+  </div>
   <div class="eg-grid-cell eg-grid-body-cell" [ngStyle]="{flex:col.flex}"
     *ngFor="let col of columnSet.displayColumns()">
     {{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 1a03da8..b1003d4 100644 (file)
--- 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 @@
 
 <div class="eg-grid-row eg-grid-header-row">
-  <div class="eg-grid-cell eg-grid-header-cell eg-grid-checkbox-cell">
+  <div class="eg-grid-cell eg-grid-header-cell eg-grid-checkbox-cell eg-grid-cell-skinny">
     <input type='checkbox'> <!-- add click handlers ; shared selector mod -->
   </div>
+  <div class="eg-grid-cell eg-grid-header-cell eg-grid-number-cell eg-grid-cell-skinny">
+    #
+  </div>
+
 
     <div *ngFor="let col of columnSet.displayColumns()" 
       class="eg-grid-cell eg-grid-header-cell" [ngStyle]="{flex:col.flex}">

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 d20ce10..8969cb1 100644 (file)
--- 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 e6ec135..b1d1861 100644 (file)
--- 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;
+    }
 }