[open-ils-commits] [GIT] Evergreen ILS branch master updated. 58579e840f471109abae23b28aa85a7c35ff992b
Evergreen Git
git at git.evergreen-ils.org
Thu May 25 09:07:23 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 58579e840f471109abae23b28aa85a7c35ff992b (commit)
from 4f578bef368ab0623ec8c87ccc328b426c445d5e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 58579e840f471109abae23b28aa85a7c35ff992b
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu May 18 15:17:51 2017 -0400
LP#1691801 Webstaff grid column move controls
Add options to grid "Configure Columns" interface for moving a column
left or right by one, all the way left, and all the way right.
Most recently modified column is styled so it's easier for users to track
the movement of a column.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index eff1037..bfde500 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -358,6 +358,10 @@ table.list tr.selected td { /* deprecated? */
cursor: e-resize;
}
+.eg-grid-column-last-mod {
+ background-color: #78FA89;
+}
+
.eg-grid-menu-item {
margin-right: 10px;
}
diff --git a/Open-ILS/src/templates/staff/share/t_autogrid.tt2 b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
index acf3b5c..cf5ac46 100644
--- a/Open-ILS/src/templates/staff/share/t_autogrid.tt2
+++ b/Open-ILS/src/templates/staff/share/t_autogrid.tt2
@@ -218,6 +218,7 @@
</div>
<div class="eg-grid-cell"
eg-grid-column-drag-dest
+ ng-class="{'eg-grid-column-last-mod' : lastModColumn==col.name}"
column="{{col.name}}"
eg-right-click="onContextMenu($event)"
ng-repeat="col in columns"
@@ -247,6 +248,10 @@
<div class="eg-grid-cell eg-grid-cell-conf-header">
<div class="eg-grid-conf-cell-entry">[% l('Expand') %]</div>
<div class="eg-grid-conf-cell-entry">[% l('Shrink') %]</div>
+ <div class="eg-grid-conf-cell-entry">[% l('Left') %]</div>
+ <div class="eg-grid-conf-cell-entry">[% l('Right') %]</div>
+ <div class="eg-grid-conf-cell-entry">[% l('Far Left') %]</div>
+ <div class="eg-grid-conf-cell-entry">[% l('Far Right') %]</div>
<div class="eg-grid-conf-cell-entry" ng-if="!disableMultiSort">[% l('Sort') %]</div>
</div>
<div class="eg-grid-cell"
@@ -256,15 +261,39 @@
<div class="eg-grid-conf-cell-entry">
<a href="" title="[% l('Make column wider') %]"
ng-click="modifyColumnFlex(col,1)">
- <span class="glyphicon glyphicon-fast-forward"></span>
+ <span class="glyphicon glyphicon-resize-full"></span>
</a>
</div>
<div class="eg-grid-conf-cell-entry">
<a href="" title="[% l('Make column narrower') %]"
ng-click="modifyColumnFlex(col,-1)">
+ <span class="glyphicon glyphicon-resize-small"></span>
+ </a>
+ </div>
+ <div class="eg-grid-conf-cell-entry">
+ <a href="" title="[% l('Move column left') %]"
+ ng-click="modifyColumnPos(col, -1)">
+ <span class="glyphicon glyphicon-backward"></span>
+ </a>
+ </div>
+ <div class="eg-grid-conf-cell-entry">
+ <a href="" title="[% l('Move column right') %]"
+ ng-click="modifyColumnPos(col, 1)">
+ <span class="glyphicon glyphicon-forward"></span>
+ </a>
+ </div>
+ <div class="eg-grid-conf-cell-entry">
+ <a href="" title="[% l('Move column far left') %]"
+ ng-click="modifyColumnPos(col, -10000)">
<span class="glyphicon glyphicon-fast-backward"></span>
</a>
</div>
+ <div class="eg-grid-conf-cell-entry">
+ <a href="" title="[% l('Move column far right') %]"
+ ng-click="modifyColumnPos(col, 10000)">
+ <span class="glyphicon glyphicon-fast-forward"></span>
+ </a>
+ </div>
<div class="eg-grid-conf-cell-entry" ng-if="!disableMultiSort">
<div ng-if="col.multisortable">
<input type='number' ng-model="col.sort"
diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index f85872b..7cbf9f2 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -747,9 +747,40 @@ angular.module('egGridMod',
column.flex = 1;
}
$scope.modifyColumnFlex = function(col, val) {
+ $scope.lastModColumn = col.name;
grid.modifyColumnFlex(col, val);
}
+ grid.modifyColumnPos = function(col, diff) {
+ var srcIdx, targetIdx;
+ angular.forEach(grid.columnsProvider.columns,
+ function(c, i) { if (c.name == col.name) srcIdx = i });
+
+ targetIdx = srcIdx + diff;
+ if (targetIdx < 0) {
+ targetIdx = 0;
+ } else if (targetIdx >= grid.columnsProvider.columns.length) {
+ // Target index follows the last visible column.
+ var lastVisible = 0;
+ angular.forEach(grid.columnsProvider.columns,
+ function(column, idx) {
+ if (column.visible) lastVisible = idx;
+ }
+ );
+ targetIdx = lastVisible + 1;
+ }
+
+ // Splice column out of old position, insert at new position.
+ grid.columnsProvider.columns.splice(srcIdx, 1);
+ grid.columnsProvider.columns.splice(targetIdx, 0, col);
+ }
+
+ $scope.modifyColumnPos = function(col, diff) {
+ $scope.lastModColumn = col.name;
+ return grid.modifyColumnPos(col, diff);
+ }
+
+
// handles click, control-click, and shift-click
$scope.handleRowClick = function($event, item) {
var index = grid.indexValue(item);
@@ -859,6 +890,7 @@ angular.module('egGridMod',
$scope.showGridConf = true;
}
+ delete $scope.lastModColumn;
$scope.gridColumnPickerIsOpen = false;
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/css/style.css.tt2 | 4 ++
Open-ILS/src/templates/staff/share/t_autogrid.tt2 | 31 +++++++++++++++++++-
Open-ILS/web/js/ui/default/staff/services/grid.js | 32 +++++++++++++++++++++
3 files changed, 66 insertions(+), 1 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list