From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 24 Mar 2014 15:57:55 +0000 (-0400)
Subject: web staff autogrid
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cb2528a864056382f5e8c39047874136e220e5c0;p=working%2FEvergreen.git

web staff autogrid

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2 b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
index 0e575c2f18..ef601a8fa6 100644
--- a/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/parts/t_autogrid.tt2
@@ -6,8 +6,6 @@
     background-color: rgb(248, 248, 248);
   }
 
-  .eg-grid-scroll {overflow-y:scroll; height: 600px}
-
   .eg-grid-row {
     width: 100%;
     display: flex;
@@ -70,9 +68,23 @@
     padding-right: 1px;
   }
 
+  /* hack to make the header columns line up with the content columns
+     when the scroll bar is visible along the right side of the content
+     columns. TODO: if this varies enough by browser, we'll need to
+     calculate the width instead. */
+  .eg-grid-scroll > .eg-grid-header-row, 
+  .eg-grid-scroll > .eg-grid-conf-row { 
+    padding-right: 15px;
+  }
+  .eg-grid-scroll > .eg-grid-content-body {
+    overflow-y:scroll; 
+    height: 600px; /* TODO: configurable */
+  }
+
 </style>
 
-<div class="eg-grid" ng-class="{'eg-grid-as-conf' : showGridConf}">
+<div class="eg-grid" 
+  ng-class="{'eg-grid-as-conf' : showGridConf,'eg-grid-scroll' : isScroll}">
   <!-- import embedded eg-grid-field defs via no-op transclude -->
   <div ng-transclude></div>
 
@@ -128,25 +140,27 @@
 
   <!-- ============== -->
   <!-- grid data rows -->
-  <div class="eg-grid-row" 
-      ng-repeat="item in list.items"
-      ng-class="{'eg-grid-row-selected' : itemIsSelected(item)}">
-    <div class="eg-grid-cell eg-grid-cell-1" 
-      ng-click="handleRowClick($event, item)">
-      {{$index + 1 + list.pageOffset}}
-    </div>
-    <div class="eg-grid-cell eg-grid-cell-1">
-      <!-- ng-click=handleRowClick here has unintended 
-           consequences and is unnecessary, avoid it -->
-      <input type='checkbox'  
-        ng-model="list.selected[list.indexValue(item)]"/>
-    </div>
-    <div class="eg-grid-cell"
-        ng-click="handleRowClick($event, item)"
-        ng-repeat="column in list.allColumns"
-        style="flex:{{column.flex}}"
-        ng-show="list.displayColumns[column.name]">
-      {{list.fieldValue(item, column.name) | egGridvalueFilter:column}}
+  <div class="eg-grid-content-body">
+    <div class="eg-grid-row" 
+        ng-repeat="item in list.items"
+        ng-class="{'eg-grid-row-selected' : itemIsSelected(item)}">
+      <div class="eg-grid-cell eg-grid-cell-1" 
+        ng-click="handleRowClick($event, item)">
+        {{$index + 1 + list.pageOffset}}
+      </div>
+      <div class="eg-grid-cell eg-grid-cell-1">
+        <!-- ng-click=handleRowClick here has unintended 
+             consequences and is unnecessary, avoid it -->
+        <input type='checkbox'  
+          ng-model="list.selected[list.indexValue(item)]"/>
+      </div>
+      <div class="eg-grid-cell"
+          ng-click="handleRowClick($event, item)"
+          ng-repeat="column in list.allColumns"
+          style="flex:{{column.flex}}"
+          ng-show="list.displayColumns[column.name]">
+        {{list.fieldValue(item, column.name) | egGridvalueFilter:column}}
+      </div>
     </div>
   </div>
 </div>
diff --git a/Open-ILS/src/templates/staff/test/t_autogrid.tt2 b/Open-ILS/src/templates/staff/test/t_autogrid.tt2
index a7546e3592..885c1d4475 100644
--- a/Open-ILS/src/templates/staff/test/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/test/t_autogrid.tt2
@@ -28,7 +28,6 @@
   <eg-grid-field name="parent_ou_shortname" path="parent_ou.shortname" label="[% l('Parent SN') %]"></eg-grid-field>
 </eg-grid>
 
-<!--
 <h1>AutoGrid w/ Auto Fields</h1>
 
 <eg-grid
@@ -38,5 +37,4 @@
   sort="testGridSort"
   query="testGridQuery"
   auto-fields="true"/>
--->
 
diff --git a/Open-ILS/web/js/ui/default/staff/services/autogrid.js b/Open-ILS/web/js/ui/default/staff/services/autogrid.js
index e7f74bd1c5..9bc5978f03 100644
--- a/Open-ILS/web/js/ui/default/staff/services/autogrid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/autogrid.js
@@ -326,7 +326,12 @@ angular.module('egGridMod', ['egCoreMod', 'egListMod', 'egUiMod', 'ui.bootstrap'
         require : '^egGrid',
         restrict : 'AE',
         transclude : true,
-        scope : {name : '@', path : '@', label : '@', flex : '@'},
+        scope : {
+            name  : '@', // required; unique name
+            path  : '@', // optional; flesh path
+            label : '@', // optional; display label
+            flex  : '@', // optoinal; default flex width
+        },
         template : '<div></div>', // NOOP template
         link : function(scope, element, attrs, egGridCtrl) {
             egGridCtrl.addColumn(scope);