[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.09-28-gf5da355
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 29 22:42:29 CEST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 16.11.x has been updated
via f5da355d4f2fc4435d1581afa0cbb462e9f389f0 (commit)
via 6fc14901b51e20d8964b20d0c8274e6529b2a361 (commit)
via 43ff7d25e5916a00b6ab2c51a2951d06ed9f1759 (commit)
via 94704e9a5acf520607e66fd383f2c4f023c63f23 (commit)
via 7e4130ac5aec5dd53fba7c22aa3bc5b8423b2b47 (commit)
via db0a98f89c8716a81ecc80191878bf6b347ab3ab (commit)
via e3a5b725c8bb656bc2c965e6caa3218076c44e80 (commit)
via 3776f59601b5277daca1a55ddfeb37da67cdc818 (commit)
via e45832e1b336a5415a1f07f2830812a4e40c56ca (commit)
via c055167608f50b5e70ca55b24a91cd2e4169d64b (commit)
via c310e428693e9f0c846090a7dd953fce7f5d8e14 (commit)
from 7fe57c48eb63127c7f2c0fda592100971f3898b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f5da355d4f2fc4435d1581afa0cbb462e9f389f0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jun 21 12:41:22 2017 -0300
Update mailmap - Jonathan Druart
I do not longer work at biblibre
(cherry picked from commit 2702b4688e31e62fb6851b7979dc56011d38ce89)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit bb14ce9d657f2a30621a0a6465809cef1f820f3c)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 6fc14901b51e20d8964b20d0c8274e6529b2a361
Author: Marc Véron <veron at veron.ch>
Date: Wed Jun 14 11:10:56 2017 +0200
Bug 18800: Patron card images: Add some more explanation to upload page and fix small translatabiity issue
The file
koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tt
has a small translatability issue (sentence splitting by html tags).
This patch fixes it and adds a little bit more explanation about
uploading, using and replacing such images.
To test:
- Verify that text changes make sense
- Apply patch
- Go to Home > Tools > Patron card creator > Images and verify
that the page displays properly
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 053fbaf9267cce79ba80d23389b26f46a91111f8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e5ad6741bac0996d635c61ea2b3aee403c46954e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 43ff7d25e5916a00b6ab2c51a2951d06ed9f1759
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 31 16:19:35 2017 +0200
Bug 18697: Final polishing
GetFictiveIssueNumber:
Returns undef instead of 0 for irregular frequencies. Also added to POD.
Removed unused variable $wkno.
Adding a return makes the if(unit) unneeded.
Replaced (a+b)/b by 1+a/b.
_delta_units:
Added a comment about its parameters.
GetFictiveIssueNumber.t:
Adjusted the tests for irregular frequencies accordingly.
Test plan:
[1] Run t/db_dependent/Serials/GetFictiveIssueNumber.t
[2] Run t/db_dependent/Serials/GetNextDate.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 4e9701c36a6743eff72b8127de2cc79ff463013b)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1f530d55ec7f8b857e40c31bf977bc1ce17ffa8e)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 94704e9a5acf520607e66fd383f2c4f023c63f23
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 31 15:20:40 2017 +0200
Bug 18697: Adjusting unit tests for dayly serial frequencies
No changes were needed for GetNextDate.t.
In GetFictiveIssueNumber.t we add a subtest for daily frequencies.
Test plan:
[1] Run t/db_dependent/Serials/GetFictiveIssueNumber.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 8eae9660839750d95c53f6cc2a4287a6196f0cc6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit e911c0ccd70449675d2b246af4881c92df70afe2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 7e4130ac5aec5dd53fba7c22aa3bc5b8423b2b47
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 30 16:44:46 2017 +0200
Bug 18697: Fix date calculation for dayly frequencies in Serials
The changes in _get_next_date_day are actually only cosmetic. The sub
now reads exactly the same as its counterparts for other units, but
the results are exactly the same as before.
In GetFictiveIssueNumber we now call _delta_units for each type of unit.
The two Delta_Days calls are moved to _delta_units. Note that this also
is a cosmetic change; results should be exactly the same.
Test plan:
[1] Edit a subscription. Test predication pattern for some daily freq.
[2] Run t/db_dependent/GetNextDate.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit f65ca90b0f3d12a22c02918a37131b0c1ff8bd5e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit d3d5457e8338327e3d447f0e631c17a745c67c30)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit db0a98f89c8716a81ecc80191878bf6b347ab3ab
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 30 15:56:22 2017 +0200
Bug 18697: Adjusting unit tests for weekly serial frequencies
Corrections and added unit tests following the changes of the first patch.
GetFictiveIssueNumber.t: New subtest for weekly frequencies.
GetNextDate.t: Correcting a few dates one day. If we use 2/week, we will
calculate an interval of 3 days and correct with 4 days at the end of
the cycle. The connection with firstacqui is not relevant anymore.
Test plan:
[1] Run t/db_dependent/Serials/GetFictiveIssueNumber.t
[2] Run t/db_dependent/Serials/GetNextDate.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit e25f4670f36e53db44931cbbcfb3c5df2125c71a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 2851d186f6c3376c0ae2b55b1e8c63bda87fded8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e3a5b725c8bb656bc2c965e6caa3218076c44e80
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 30 15:01:52 2017 +0200
Bug 18697: Fix date calculations for weekly frequencies in Serials
Same solution applied as in bug 18356/18607. Consistency++
The code in _get_next_date_week is again very similar to the code in
_get_next_date_month or _get_next_date_year. I will not merge them here,
but we could consider that in the future.
Code in GetFictiveIssueNo has been adjusted similarly to month and year.
Test plan:
[1] Do not apply this patch. Create a subscription for 3/week.
When the first issue date is on a Saturday or Sunday, the
intervals in the prediction pattern are 0,0,7,0,0,7,etc.
Starting on Wed-Fri 1,1,5,etc. Starting on Mon-Tue 2,2,3,etc.
[2] Apply this patch. Check again.
The interval should be always 2,2,3 now and no longer depend on the
day_of_week of first issue date.
[3] Check another weekly frequency with multiple units per issue.
Say 1 issue/3 weeks.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit ffb1c87d2962b19a07798da3bf81bef328270145)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit dae1a7ccdf49b8d99748a659c6fff80185980e7f)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 3776f59601b5277daca1a55ddfeb37da67cdc818
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon May 29 12:08:40 2017 +0200
Bug 18607: Adjusting unit tests for monthly serial frequencies
The changes in the first patch require some corrections as well as
additional test cases.
GetNextDate.t: Since the calculation for multiple issues per unit has
slightly changed, a few dates (day 15 or day 16) have been changed in the
unit test; when we use 2/month, the algorithm now always adds 15 days.
Added a few test descriptions in this regard too.
GetFictiveIssueNumber.t: Add the monthly subtest with two test cases. In
the first case we tests multiple units per issue, and in the second case
we test multiple issues per unit (month).
Test plan:
[1] Run t/db_dependent/Serials/GetFictiveIssueNumber.t
[2] Run t/db_dependent/Serials/GetNextDate.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 05a49035ccff1d962ef0c21ca1b154e07ba5dba7)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 45c31333a879e35ecf7ddc12d5305002c80ba065)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e45832e1b336a5415a1f07f2830812a4e40c56ca
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 16 14:46:55 2017 +0200
Bug 18607: Fix date calculations for monthly frequencies in Serials
Similarly to the solution of bug 18356, this patch fixes the date
calculation for monthly frequencies.
The calculation in GetFictiveIssueNumber now makes use of the new
_delta_units sub introduced on bug 18356.
The calculation in _get_next_date_month is also very similar to the one
in _get_next_date_year. I do not merge them here, but this could still
be considered later on. At least consistency is achieved now between
both routines. The connection with firstacquidate has been cut thru
just like for year units.
Test plan:
[1] Without this patch, look at the prediction pattern for a
subscription with first issue on Feb 21 and 5 per month. The first
issues will be 21, 22, 23, 24, 25. Then jumping to 21, 23, 25, etc.
[2] Apply the patch. Look at the same prediction pattern. You will now
see 6 day intervals and a new cycle starting on the 21st.
So Feb 21, 27, Mar 5, 11, 17 and Mar 21, 27, etc.
[3] Edit an subscription. Try a few other monthly frequencies.
[4] The next patch adjusts related unit tests.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit adfcd8d79c6691fb1062a2a5874a736b7792d303)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit a5370edb9b90150f7aa4000c42ec523b9c0cbea8)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c055167608f50b5e70ca55b24a91cd2e4169d64b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Tue May 9 17:01:46 2017 +0200
Bug 18356: Fix date calculations for yearly frequencies in Serials
The problem as described on BZ 18356 is a combination of an error in
GetFictiveIssueNumber and GetNextDate for unit==year.
[1] In GetNextDate the Add_Delta_YM calculation should be applied only to
frequencies based on years per unit.
In the case of multiple units per year we calculate the number of days to
add. And if we have reached the end of a cycle, we correct the
rounding applied in the cycle.
NOTE 1: We obsolete the idea here of rebasing dates on firstacqui. In case
of manual adjustments, we probably do not want it. And otherwise we do not
need it anymore due to the correction at the end of a cycle.
NOTE 2: The calls to Add_Delta_YM are intentionally not corrected for leap
years. Say you start at 2016-02-29. If you use 1/yr or 1/2yr, you will
switch to the Feb 28th in the following years. In 2020 there will be no
switch to Feb 29 again; if someone should need it, please use a manual
adjustment. This is probably highly exceptional.
[2] In GetFictiveIssueNumber the year should be decreased by one if you
have more units per year and you did not yet reach firstacqui day and
month. This affects calculations in GetNextDate with irregularities.
NOTE 1: I added a wrapper around Date::Calc::N_Delta_YMD in order to improve
its results; this will especially be needed when we use it later for
month units.
NOTE 2: In case of manual adjustments this calculation does not really make
sense. Another report should deal with improving irregularities.
Test plan:
[1] Verify that both GetNextDate.t as well as GetFictiveIssueNumber.t pass.
[2] Look at the prediction pattern for a few frequencies.
For example: 1 iss/y, 1 iss/2y, 5 iss/y.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit d71fb0e17c87a39fc5abe7c9b2d866636c244347)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 07672a77c666354578467c2a35c0f2ea7e512c73)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c310e428693e9f0c846090a7dd953fce7f5d8e14
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 11 10:47:22 2017 +0200
Bug 18356: Extend GetNextDate.t, add GetFictiveIssueNumber.t (unit=year)
This patch deals with tests for yearly frequencies.
Adjust/extend GetNextDate.t:
[1] Adjust mixup of units/issues in a description.
[2] Add testing +2 years on 29-2 of leap year for freq 1 issue/2 years.
[3] Add tests for freq 9 issues/year.
Add GetFictiveIssueNumber.t:
[1] Two subtests are provided for irregular frequencies (very trivial) and
for year frequencies (with four specific test cases).
Test plan:
[1] Run t/db_dependent/Serials/GetNextDate.t
[2] Run t/db_dependent/Serials/GetFictiveIssueNumber.t
Note: Without the second patch both tests should fail. This shows the need
of the adjustments in the second patch.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit 285f6bd945373c06633b2c42621d754d93c37903)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
(cherry picked from commit 1d30b33e7e7a352743208960efcf6f1f26a07853)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
.mailmap | 2 +-
C4/Serials.pm | 189 ++++++++++-------
.../en/modules/help/patroncards/image-manage.tt | 8 +-
.../prog/en/modules/patroncards/image-manage.tt | 11 +-
t/db_dependent/Serials/GetFictiveIssueNumber.t | 220 ++++++++++++++++++++
t/db_dependent/Serials/GetNextDate.t | 77 ++++---
6 files changed, 397 insertions(+), 110 deletions(-)
create mode 100644 t/db_dependent/Serials/GetFictiveIssueNumber.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list