Attachment 120863 Details for Bug 17656 – Bug 17656: More meaningful messages in prediction pattern table

[patch] Bug 17656: More meaningful messages in prediction pattern table

Bug-17656-More-meaningful-messages-in-prediction-p.patch (text/plain), 6.34 KB, created by Alex Arnaud on 2021-05-12 11:38:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Arnaud

Created: 2021-05-12 11:38:14 UTC

Size: 6.34 KB

patch

obsolete

>From 031ecb57beb8152a6a56bba430cf4586cdb23c23 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
>
>---
> .../prog/en/includes/serials/subscription_daily_choice.inc | 12 ++++++++----
> .../prog/en/includes/serials/subscription_monthly_choice.inc | 12 ++++++++----
> .../prog/en/includes/serials/subscription_weekly_choice.inc | 10 +++++++---
> .../prog/en/modules/serials/showpredictionpattern.tt | 1 -
> koha-tmpl/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 9970100..5fd7e95 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 %]
> <label for="[% day.name | html %]" class="inline">[% PROCESS days d=day.name %]</label>
> [% 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 488ee98..0934709 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 %]
> <label for="[% month.name | html %]" class="inline">[% PROCESS months m=month.name %]</label>
> [% 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 43cb536..ab6f2a7 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>
> 
>- Choice the week(s) in the year where issues are never
>- published.
>+ Check weeks in the above list in order to keep them unpublished
>+ troughout upcoming renewals (permanent irregularities).
>+
>+
>+ Or check weeks in the "Not published" column below to set
>+ unpublished weeks for this subscription only.
> 
>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 f9373b3..342c558 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 @@
> End date is not consistent with subscription length.
> [% END %]
> [% IF (ask_for_irregularities) %]
>- Please check issues that are NOT published (irregularities)
> [% 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 6ab01c0..8db83a7 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 3638bcf..0fb289c 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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 17656: 68259 | 68261 | 68607 | 68608 | 68665 | 69124 | 69207 | 69279 | 69553 | 69814 | 69820 | 69915 | 70335 | 70336 | 70430 | 70619 | 75403 | 75404 | 75405 | 75406 | 75407 | 75408 | 75721 | 75722 | 75723 | 75724 | 75725 | 75726 | 75953 | 102724 | 102725 | 102726 | 102727 | 102728 | 102729 | 102730 | 102860 | 102861 | 102862 | 102863 | 102864 | 102865 | 102866 | 102867 | 102960 | 102961 | 102962 | 102963 | 102964 | 102965 | 102966 | 102967 | 102968 | 103623 | 103624 | 103625 | 103626 | 103627 | 103628 | 103629 | 103630 | 103631 | 103657 | 103658 | 103659 | 103660 | 103661 | 103662 | 103663 | 103664 | 103665 | 103667 | 117789 | 117790 | 117791 | 117792 | 117846 | 117851 | 117852 | 118856 | 119106 | 120863 | 121082 | 121083 | 121084 | 121085 | 121086 | 121087 | 121088 | 121192 | 121193 | 121194 | 121195 | 121196 | 121197 | 121198 | 121296 | 121297 | 121298 | 121299 | 121300 | 121301 | 121302 | 128489 | 128491 | 128492 | 128493 | 128494 | 128495 | 128496 | 128498 | 128499 | 128500 | 128501 | 128502 | 128503 | 128504 | 132412 | 132413 | 132415 | 132416 | 132417 | 132418 | 132447 | 132448 | 132692 | 132779