Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 11752: display the correct frequency for serial subscriptions in OPAC details

Browse source 
This fixes bootstrap and prog by modifying the description displayed
in the OPAC's detail of serials.

RM NOTE: this patch does not cover the case where custom serial
frequencies have been defined.

TESTING to reproduce
- create/find a serial with a 1/week periodicity (4 in the database)
- Find it in the opac-detail.pl, click "more details" at the bottom
- validate the string.  Before the patch, it will say:
"The current subscription began on 2013-12-06 and is issued every 3
 weeks for 26 issues"

The "every 3 weeks" is clearly wrong.
In fact any periodicity chosen would display a wrong description, not
matching the staff interface.

After the patch, the display is corrected.

As a bonus, the "every 2 years" now has a description, where it had
none before.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Blou 2014-02-12 12:03:08 -05:00 committed by Galen Charlton
parent 9064395892
commit 7f1e949ea0
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
View file

@ -39,42 +39,45 @@
<div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;"> <div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;">
<h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3> <h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3>
<p> <p>
The current subscription began on [% subscription_LOO.startdate %] and is issued every The current subscription began on [% subscription_LOO.startdate %] and is issued
[% IF ( subscription_LOO.periodicity1 ) %] [% IF ( subscription_LOO.periodicity1 ) %]
day twice per day
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity2 ) %] [% IF ( subscription_LOO.periodicity2 ) %]
week every day
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity3 ) %] [% IF ( subscription_LOO.periodicity3 ) %]
2 weeks three times per week
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity4 ) %] [% IF ( subscription_LOO.periodicity4 ) %]
3 weeks every week
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity5 ) %] [% IF ( subscription_LOO.periodicity5 ) %]
month every 2 weeks
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity6 ) %] [% IF ( subscription_LOO.periodicity6 ) %]
2 months every 3 weeks
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity7 ) %] [% IF ( subscription_LOO.periodicity7 ) %]
3 months every month
[% END %]
[% IF ( subscription_LOO.periodicity13 ) %]
4 months
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity8 ) %] [% IF ( subscription_LOO.periodicity8 ) %]
quarter every 2 months
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity9 ) %] [% IF ( subscription_LOO.periodicity9 ) %]
2 quarters every quarter
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity10 ) %] [% IF ( subscription_LOO.periodicity10 ) %]
year twice per year
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity11 ) %] [% IF ( subscription_LOO.periodicity11 ) %]
2 years every year
[% END %]
[% IF ( subscription_LOO.periodicity12 ) %]
every 2 years
[% END %]
[% IF ( subscription_LOO.periodicity13 ) %]
irregularly
[% END %] [% END %]
[% IF ( subscription_LOO.arrival1 ) %] [% IF ( subscription_LOO.arrival1 ) %]
on Monday on Monday

33
koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
View file

@ -21,42 +21,45 @@
[% FOREACH subscription_LOO IN subscription_LOOP %] [% FOREACH subscription_LOO IN subscription_LOOP %]
<div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;"> <div id="subscriptionline[% subscription_LOO.subscriptionid %]" style="border-bottom:1px solid #EEE;">
<h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3> <h3>Subscription information for [% subscription_LOO.bibliotitle %]</h3>
<p>The current subscription began on [% subscription_LOO.startdate %] and is issued every <p>The current subscription began on [% subscription_LOO.startdate %] and is issued
[% IF ( subscription_LOO.periodicity1 ) %] [% IF ( subscription_LOO.periodicity1 ) %]
day twice per day
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity2 ) %] [% IF ( subscription_LOO.periodicity2 ) %]
week every day
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity3 ) %] [% IF ( subscription_LOO.periodicity3 ) %]
2 weeks three times per week
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity4 ) %] [% IF ( subscription_LOO.periodicity4 ) %]
3 weeks every week
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity5 ) %] [% IF ( subscription_LOO.periodicity5 ) %]
month every 2 weeks
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity6 ) %] [% IF ( subscription_LOO.periodicity6 ) %]
2 months every 3 weeks
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity7 ) %] [% IF ( subscription_LOO.periodicity7 ) %]
3 months every month
[% END %]
[% IF ( subscription_LOO.periodicity13 ) %]
4 months
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity8 ) %] [% IF ( subscription_LOO.periodicity8 ) %]
quarter every 2 months
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity9 ) %] [% IF ( subscription_LOO.periodicity9 ) %]
2 quarters every quarter
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity10 ) %] [% IF ( subscription_LOO.periodicity10 ) %]
year twice per year
[% END %] [% END %]
[% IF ( subscription_LOO.periodicity11 ) %] [% IF ( subscription_LOO.periodicity11 ) %]
2 years every year
[% END %]
[% IF ( subscription_LOO.periodicity12 ) %]
every 2 years
[% END %]
[% IF ( subscription_LOO.periodicity13 ) %]
irregularly
[% END %] [% END %]
[% IF ( subscription_LOO.arrival1 ) %] [% IF ( subscription_LOO.arrival1 ) %]
on Monday on Monday