[open-ils-commits] [GIT] Evergreen ILS branch master updated. 36f331390345e05e264e96a0d70d598e1f2bc263
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 24 10:25:36 EDT 2016
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 36f331390345e05e264e96a0d70d598e1f2bc263 (commit)
via 504076521062d6b52842e137e79877b1abf8f2a5 (commit)
via b39eaf4328563a8965a2fabfdad52b898795d116 (commit)
from a06fd5453a10f3edc5f632473ab050a036270246 (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 36f331390345e05e264e96a0d70d598e1f2bc263
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Aug 18 21:10:43 2016 -0400
LP#1612274: Release notes for improved holds interfaces
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc
new file mode 100644
index 0000000..2ba992c
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc
@@ -0,0 +1,14 @@
+Improved Holds Screens in My Account
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The grids in the My Account _Items on Hold_ and _Holds History_ interfaces are
+simplified. Data previously contained in their own Activate, Active, and Date
+Fulfilled columns are now incorporated into the Status columns. To further
+declutter the interface, the holds queue position will only show when the user
+most needs the information - before the hold has been captured.
+
+Distinct CSS classes have also been added for each hold status and each date
+that could potentially display in these holds interfaces. A new default style
+highlights the *Available* status in green and the *Suspended* status
+in red.
+
+
commit 504076521062d6b52842e137e79877b1abf8f2a5
Author: Kathy Lussier <klussier at masslnc.org>
Date: Thu Aug 11 13:24:00 2016 -0400
LP#1612274: Add distinct classes for hold statuses
With more data in the My Account hold status field, libraries may want to
style some statuses or dates differently so that they pop out to the user. Each
hold status and date now has its own class for more flexible styling.
The available status also now has a green, bold font and the suspended status
has a red, bold font.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 7f2c933..443e87e 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -832,6 +832,16 @@ div.result_table_utils_cont {
}
+.myopac-hold-available {
+ color: [% css_colors.text_greatnews %];
+ font-weight: bold;
+}
+
+.myopac-hold-suspended {
+ color: [% css_colors.text_badnews %];
+ font-weight: bold;
+}
+
#myopac_prefs_div .data_grid {
border-collapse:collapse;
}
diff --git a/Open-ILS/src/templates/opac/parts/hold_status.tt2 b/Open-ILS/src/templates/opac/parts/hold_status.tt2
index 183ead6..fe5f271 100644
--- a/Open-ILS/src/templates/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates/opac/parts/hold_status.tt2
@@ -1,50 +1,62 @@
[% BLOCK get_hold_status %]
<div>
- [%
- IF hold.hold.status == 4;
- l("Available") | html;
- IF ahr.shelf_expire_time;
- '<br/>';
- l('Expires [_1]',
- date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT)) | html;
- END;
-
- ELSIF hold.hold.status == 6;
- l("Canceled [_1]",
- date.format(ctx.parse_datetime(ahr.cancel_time), DATE_FORMAT)) | html;
-
- ELSIF hold.hold.status == 7;
- l("Suspended") | html;
- IF ahr.thaw_date;
- "<br/>";
- l("Activate On [_1]",
- date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT)) | html;
- END;
-
- ELSIF hold.hold.status == 9;
- l("Fulfilled [_1]",
- date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT))| html;
-
- ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0;
+ [% IF hold.hold.status == 4 %]
+ <span class="myopac-hold-available">[% l("Available") %] </span>
+ [% IF ahr.shelf_expire_time %]
+ <br/>
+ [% l("Expires") %]
+ <span class="myopac-shelf-expire">
+ [% date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT) %]
+ </span>
+ [% END %]
+
+
+ [% ELSIF hold.hold.status == 6 %]
+ <span class="myopac-hold-canceled"> [% l("Canceled") %] </span>
+ <span class="myopac-cancel-time">
+ [% date.format(ctx.parse_datetime(ahr.cancel_time), DATE_FORMAT) %]
+ </span>
+
+ [% ELSIF hold.hold.status == 7 %]
+ <span class="myopac-hold-suspended"> [% l("Suspended") %] </span>
+ [% IF ahr.thaw_date %]
+ <br/>
+ [% l("Activate On") %]
+ <span class="my-account-activate-time">
+ [% date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT) %]
+ </span>
+ [% END %]
+
+ [% ELSIF hold.hold.status == 9 %]
+ <span class="myopac-hold-fulfilled">[% l("Fulfilled") %]</span>
+ <span class="myopac-fulfill-time">
+ [% date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT) %]
+ </span>
+
+
+ [% ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0;
# estimated wait is delivered as seconds.
- SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400);
- l("Estimated wait: [quant,_1,day,days]", hwait) | html;
+ SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400) %]
+ <span class="myopac-hold-wait"> [% l("Estimated wait:") %] </span>
+ <span class="myopac-hold-wait-time">
+ [% l("[quant,_1,day,days]", hwait) | html %]
+ </span>
- ELSIF hold.hold.status == 3 OR hold.hold.status == 8;
- l("In Transit") | html;
+ [% ELSIF hold.hold.status == 3 OR hold.hold.status == 8 %]
+ <span class="myopac-transit"> [% l("In Transit") %] </span>
- ELSIF hold.hold.status < 3;
- l("Waiting for copy") | html;
- END
- %]
+ [% ELSIF hold.hold.status < 3 %]
+ <span class="myopac-uncaptured-hold"> [% l("Waiting for copy") %] </span>
+ [% END %]
</div>
<div>
[% # Only show the count for holds that have not been captured
- IF hold.hold.status < 3 OR hold.hold.status == 7;
- l('Hold #[_1] on [quant,_2, copy, copies]',
- hold.hold.queue_position, hold.hold.potential_copies) | html;
- END
- %]
+ IF hold.hold.status < 3 OR hold.hold.status == 7 %]
+ <span class="myopac-hold-count">
+ [% l('Hold #[_1] on [quant,_2, copy, copies]',
+ hold.hold.queue_position, hold.hold.potential_copies) | html %]
+ </span>
+ [% END %]
</div>
[% END %]
commit b39eaf4328563a8965a2fabfdad52b898795d116
Author: Kathy Lussier <klussier at masslnc.org>
Date: Wed Aug 10 23:41:51 2016 -0400
LP#1612274: Improve display of holds status in My Account
Collapse the data contained in the Activate, Active, and Date Fulfilled columns
into the status filed on the My Account holds and holds history interfaces.
This change cleans up the display and removes extraneous information that the
user doesn't need to see.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 65c3a6f..021d3bb 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1231,6 +1231,7 @@ Returns event on error or:
6 for 'canceled'
7 for 'suspended'
8 for 'captured, on wrong hold shelf'
+ 9 for 'fulfilled'
END_OF_DESC
}
}
@@ -1263,6 +1264,9 @@ sub _hold_status {
if ($hold->current_shelf_lib and $hold->current_shelf_lib ne $hold->pickup_lib) {
return 8;
}
+ if ($hold->fulfillment_time) {
+ return 9;
+ }
return 1 unless $hold->current_copy;
return 2 unless $hold->capture_time;
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index b266730..7f2c933 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -2079,19 +2079,14 @@ a.preflib_change {
table#acct_holds_main_header td:nth-of-type(3):before { content: "[% l('Author') %]"; }
table#acct_holds_main_header td:nth-of-type(4):before { content: "[% l('Format') %]"; }
table#acct_holds_main_header td:nth-of-type(5):before { content: "[% l('Pickup Location') %]"; }
- table#acct_holds_main_header td:nth-of-type(6):before { content: "[% l('Activate') %]"; }
- table#acct_holds_main_header td:nth-of-type(7):before { content: "[% l('Cancel on') %]"; }
- table#acct_holds_main_header td:nth-of-type(8):before { content: "[% l('Active') %]"; }
- table#acct_holds_main_header td:nth-of-type(9):before { content: "[% l('Status') %]"; }
+ table#acct_holds_main_header td:nth-of-type(6):before { content: "[% l('Cancel on') %]"; }
+ table#acct_holds_main_header td:nth-of-type(7):before { content: "[% l('Status') %]"; }
table#acct_holds_main_header td.hold_notes:before { content: "[% l('Notes') %]"; }
table#acct_holds_hist_header td:nth-of-type(1):before { content: "[% l('Title') %]";}
table#acct_holds_hist_header td:nth-of-type(2):before { content: "[% l('Author') %]"; }
table#acct_holds_hist_header td:nth-of-type(3):before { content: "[% l('Format') %]"; }
table#acct_holds_hist_header td:nth-of-type(4):before { content: "[% l('Pickup Location') %]"; }
- table#acct_holds_hist_header td:nth-of-type(5):before { content: "[% l('Activate') %]"; }
- table#acct_holds_hist_header td:nth-of-type(6):before { content: "[% l('Active') %]"; }
- table#acct_holds_hist_header td:nth-of-type(7):before { content: "[% l('Date Fulfilled') %]"; }
table#acct_holds_hist_header td:nth-of-type(8):before { content: "[% l('Status') %]"; }
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index a142bf5..44178b7 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -55,14 +55,11 @@
<table id='acct_holds_hist_header' class='table_no_border_space table_no_cell_pad' title="[% l('History of items on hold') %]">
<thead>
<tr>
- <th><span>[% l('Title') %]</span></td>
- <th><span>[% l('Author') %]</span></td>
- <th> <span>[% l('Format') %]</span></td>
- <th><span>[% l('Pickup Location') %]</span> </td>
- <th>[% l('Activate') %]</td>
- <th>[% l('Active') %]</td>
- <th>[% l('Date Fulfilled') %]</td>
- <th><span>[% l('Status') %]</span></td>
+ <td><span>[% l('Title') %]</span></td>
+ <td><span>[% l('Author') %]</span></td>
+ <td> <span>[% l('Format') %]</span></td>
+ <td><span>[% l('Pickup Location') %]</span> </td>
+ <td><span>[% l('Status') %]</span></td>
</tr>
</thead>
<tbody id='holds_temp_parent'>
@@ -96,25 +93,6 @@
[% ctx.get_aou(ahr.pickup_lib).name | html %]
</td>
<td>
- [% IF ahr.frozen == 't' AND ahr.thaw_date;
- date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
- END %]
- </td>
- <td>
- [% IF ahr.fulfillment_time;
- l('Fulfilled');
- ELSIF hold.hold.status == 6;
- l('Canceled');
- ELSE;
- l(ahr.frozen == 'f' ? 'Active' : 'Suspended');
- END %]
- </td>
- <td>
- [% IF ahr.fulfillment_time;
- date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT);
- END %]
- </td>
- <td>
<div name="acct_holds_status">
[% PROCESS get_hold_status hold=hold; %]
</div>
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 6c28275..7fc808c 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -109,9 +109,7 @@
<th>[% sort_head("author", l('Author')) %]</th>
<th>[% sort_head("format", l('Format')) %]</th>
<th>[% l('Pickup Location') %]</th>
- <th>[% l('Activate') %]</th>
<th>[% l('Cancel if not filled by') %]</th>
- <th>[% l('Active') %]</th>
<th>[% l('Status') %]</th>
<th>[% l('Notes') %]</th>
</tr>
@@ -225,19 +223,11 @@
[% ctx.get_aou(ahr.pickup_lib).name | html %]
</td>
<td>
- [% IF ahr.frozen == 't' AND ahr.thaw_date;
- date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
- END %]
- </td>
- <td>
[% IF ahr.expire_time;
date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT);
END %]
</td>
<td>
- [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
- </td>
- <td>
<div name="acct_holds_status">
[% PROCESS get_hold_status hold=hold; %]
</div>
diff --git a/Open-ILS/src/templates/opac/parts/hold_status.tt2 b/Open-ILS/src/templates/opac/parts/hold_status.tt2
index d6e838f..183ead6 100644
--- a/Open-ILS/src/templates/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates/opac/parts/hold_status.tt2
@@ -1,14 +1,30 @@
[% BLOCK get_hold_status %]
<div>
- [%
+ [%
IF hold.hold.status == 4;
l("Available") | html;
IF ahr.shelf_expire_time;
'<br/>';
- l('Expires [_1]',
+ l('Expires [_1]',
date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT)) | html;
END;
+ ELSIF hold.hold.status == 6;
+ l("Canceled [_1]",
+ date.format(ctx.parse_datetime(ahr.cancel_time), DATE_FORMAT)) | html;
+
+ ELSIF hold.hold.status == 7;
+ l("Suspended") | html;
+ IF ahr.thaw_date;
+ "<br/>";
+ l("Activate On [_1]",
+ date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT)) | html;
+ END;
+
+ ELSIF hold.hold.status == 9;
+ l("Fulfilled [_1]",
+ date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT))| html;
+
ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0;
# estimated wait is delivered as seconds.
SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400);
@@ -19,11 +35,16 @@
ELSIF hold.hold.status < 3;
l("Waiting for copy") | html;
- END
+ END
%]
</div>
<div>
- [% l('Hold #[_1] on [quant,_2, copy, copies]',
- hold.hold.queue_position, hold.hold.potential_copies) | html %]
+ [% # Only show the count for holds that have not been captured
+ IF hold.hold.status < 3 OR hold.hold.status == 7;
+ l('Hold #[_1] on [quant,_2, copy, copies]',
+ hold.hold.queue_position, hold.hold.potential_copies) | html;
+ END
+ %]
</div>
[% END %]
+
-----------------------------------------------------------------------
Summary of changes:
.../perlmods/lib/OpenILS/Application/Circ/Holds.pm | 4 +
Open-ILS/src/templates/opac/css/style.css.tt2 | 19 +++--
.../src/templates/opac/myopac/hold_history.tt2 | 32 ++-------
Open-ILS/src/templates/opac/myopac/holds.tt2 | 10 ---
Open-ILS/src/templates/opac/parts/hold_status.tt2 | 73 ++++++++++++++------
.../OPAC/improved-myopac-holds-screens.adoc | 14 ++++
6 files changed, 88 insertions(+), 64 deletions(-)
create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/improved-myopac-holds-screens.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list