From 14e55e3a5f902f37e86b433f312643f10efe02ae Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
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 <victor@tuxayo.net>
---
 .../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 @@
-<p><em>
-    If there is a day (or more) in the week where issues are never
-    published, you can check corresponding boxes below.
-</em></p>
 [% 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 %]
     <label for="[% day.name | html %]" class="inline">[% PROCESS days d=day.name %]</label>
 [% END %]
+<p>
+    <em>Check days in the above list in order to keep them unpublished
+    troughout upcoming renewals (permanent irregularities).</em>
+</p>
+<p>
+    <em>Or check days in the "Not published" column below to set
+    unpublished days for this subscription only.</em>
+</p>
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 @@
-<p><em>
-    If there is a month (or more) in the year where issues are never
-    published, you can check corresponding boxes below.
-</em></p>
 [% 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 %]
     <label for="[% month.name | html %]" class="inline">[% PROCESS months m=month.name %]</label>
 [% END %]
+<p>
+    <em>Check months in the above list in order to keep them unpublished
+    troughout upcoming renewals (permanent irregularities).</em>
+</p>
+<p>
+    <em>Or check months in the "Not published" column below to set
+    unpublished months for this subscription only.</em>
+</p>
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 @@
             <ul class="dropdown-menu week-columns">
                 [% FOREACH p IN predictions_loop %]
                     <li>
-                        <a href="#" class="small">
+                        <a class="small" href="JavaScript:Void(0);">
                             [% IF permanent_irreg.grep( p.dow ).0 == p.dow %]
                                 <input type="checkbox" name="permanent_irregularity" value="[% p.dow | html %]" data-dow="[% p.dow | html %]" class="skip" checked="checked"/>
                             [% ELSE %]
@@ -23,6 +23,10 @@
     </div>
 </div>
 <p>
-    <em>Choice the week(s) in the year where issues are never
-    published.</em>
+    <em>Check weeks in the above list in order to keep them unpublished
+    troughout upcoming renewals (permanent irregularities).</em>
+</p>
+<p>
+    <em>Or check weeks in the "Not published" column below to set
+    unpublished weeks for this subscription only.</em>
 </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
index f9373b3446..342c5589f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt
@@ -4,7 +4,6 @@
   <p><em>End date is not consistent with subscription length.</em></p>
 [% END %]
 [% IF (ask_for_irregularities) %]
-    <p><em>Please check issues that are NOT published (irregularities)</em></p>
     [% IF (show_irregularity_options) %]
         <script>
         //<![CDATA[
diff --git a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js
index 6ab01c0b0a..8db83a79f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/showpredictionpattern.js
@@ -29,7 +29,7 @@ function Check_permanent_irregularities() {
     }
 }
 $(document).ready(function(){
-    $("#displayexample").on("change",".skip",function(){
+    $("#displayexample").on("change",".skip",function(e){
         Check_boxes( $(this).data("dow"));
     });
 });
diff --git a/koha-tmpl/intranet-tmpl/prog/js/subscription.js b/koha-tmpl/intranet-tmpl/prog/js/subscription.js
index 3638bcf90f..0fb289caad 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/subscription.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/subscription.js
@@ -65,7 +65,6 @@ function testPredictionPattern() {
         url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
         data: ajaxData,
         success: function(data) {
-console.log(data);
             showPredictionPatternTest( data );
             patternneedtobetested = 0;
         }
-- 
2.25.1