From a0420336752d16bfa74d0292c3529d738c4f39d2 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Wed, 20 Mar 2019 00:16:05 -0300 Subject: [PATCH] Bug 22538: Add a noticeable alert about waiting holds In SCO, bug 21772 introduced holds information, but it lacked the capability to attract atention when any of those holds was in waiting status. Because SCO and opac-user uses the same include file for holds table, this bug applies to both modules. To test: 1) Have a patron with holds in waiting status and pending status. 2) Enable SCO module. 3) Holds tab label contains holds count, but doesn't inform that there is something that requires attention. 5) Holds tab content has no visual aid to recognize without reading effort which holds are in waiting status. 6) Apply this patch => SUCCESS: Holds tab label has a visual aid to indicate that something requires attention, and in holds table it's easy to recognize waiting holds without reading effort. 7) Sign off Sponsored-by: Pasco County Libraries --- koha-tmpl/opac-tmpl/bootstrap/css/sco.css | 4 ++++ .../opac-tmpl/bootstrap/en/includes/holds-table.inc | 1 + koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 16 ++++++++++++++-- opac/sco/sco-main.pl | 6 ++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css b/koha-tmpl/opac-tmpl/bootstrap/css/sco.css index 51464cb2c5..1f6fab4fae 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css +++ b/koha-tmpl/opac-tmpl/bootstrap/css/sco.css @@ -205,4 +205,8 @@ i.help { #sci_refresh_button { color: rgb(51, 51, 51); +} + +.tdlabel { + display:none; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index f570d8a962..d8e2ec4c3c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -104,6 +104,7 @@ Status: [% IF ( HOLD.is_waiting ) %] + [% IF ( HOLD.is_at_destination ) %] [% IF ( HOLD.found ) %] Item waiting at [% HOLD.branch.branchname | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 44084590ba..8477016426 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -9,9 +9,14 @@ [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] › Self checkout - +[% IF ( Koha.Preference('OpacFavicon') ) %] + +[% ELSE %] + +[% END %] [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %] [% Asset.css("lib/jquery/jquery-ui.css") | $raw %] +[% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %] [% Asset.css("css/sco.css") | $raw %] [% IF ( Koha.Preference('OPACUserCSS') ) %][% END %] [% IF ( Koha.Preference('SCOUserCSS') ) %][% END %] @@ -254,7 +259,14 @@
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 7fd6ee8e40..c78b21cefe 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -299,6 +299,11 @@ if ($borrower) { } my $holds = $patron->holds; + my $waiting_holds_count = 0; + + while(my $hold = $holds->next) { + $waiting_holds_count++ if $hold->is_waiting; + } $template->param( validuser => 1, @@ -310,6 +315,7 @@ if ($borrower) { patronid => $patronid, patronlogin => $patronlogin, patronpw => $patronpw, + waiting_holds_count => $waiting_holds_count, noitemlinks => 1 , borrowernumber => $borrower->{'borrowernumber'}, SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'), -- 2.11.0