From 14e55e3a5f902f37e86b433f312643f10efe02ae Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Wed, 12 May 2021 13:37:43 +0200 Subject: [PATCH] Bug 17656: More meaningful messages in prediction pattern table Signed-off-by: Victor Grousset/tuxayo --- .../includes/serials/subscription_daily_choice.inc | 12 ++++++++---- .../includes/serials/subscription_monthly_choice.inc | 12 ++++++++---- .../includes/serials/subscription_weekly_choice.inc | 10 +++++++--- .../prog/en/modules/serials/showpredictionpattern.tt | 1 - .../intranet-tmpl/prog/js/showpredictionpattern.js | 2 +- koha-tmpl/intranet-tmpl/prog/js/subscription.js | 1 - 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc index 9970100150..5fd7e9577a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc @@ -1,7 +1,3 @@ -

- If there is a day (or more) in the week where issues are never - published, you can check corresponding boxes below. -

[% daily_choice = [ {name => 'monday', value => 1}, {name => 'tuesday', value => 2}, {name => 'wednesday', value => 3}, {name => 'thursday', value => 4}, {name => 'friday', value => 5}, {name => 'saturday', value => 6}, {name => 'sunday', value => 7} ] %] [% BLOCK days %] @@ -31,3 +27,11 @@ [% END %] [% END %] +

+ Check days in the above list in order to keep them unpublished + troughout upcoming renewals (permanent irregularities). +

+

+ Or check days in the "Not published" column below to set + unpublished days for this subscription only. +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc index 488ee98cf8..0934709106 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc @@ -1,7 +1,3 @@ -

- If there is a month (or more) in the year where issues are never - published, you can check corresponding boxes below. -

[% monthly_choice = [ {name => 'january', value => 1}, {name => 'february', value => 2}, {name => 'march', value => 3}, {name => 'april', value => 4}, {name => 'may', value => 5}, {name => 'june', value => 6}, {name => 'july', value => 7}, {name => 'august', value => 8}, {name => 'september', value => 9}, {name => 'october', value => 10}, {name => 'november', value => 11}, {name => 'december', value =>12} ] %] [% BLOCK months %] @@ -36,3 +32,11 @@ [% END %] [% END %] +

+ Check months in the above list in order to keep them unpublished + troughout upcoming renewals (permanent irregularities). +

+

+ Or check months in the "Not published" column below to set + unpublished months for this subscription only. +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc index 43cb536302..ab6f2a7075 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc @@ -8,7 +8,7 @@