[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.01-25-g1f530d5

Thu Jun 29 09:17:16 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, 17.05.x has been updated
       via  1f530d55ec7f8b857e40c31bf977bc1ce17ffa8e (commit)
       via  e911c0ccd70449675d2b246af4881c92df70afe2 (commit)
       via  d3d5457e8338327e3d447f0e631c17a745c67c30 (commit)
       via  2851d186f6c3376c0ae2b55b1e8c63bda87fded8 (commit)
       via  dae1a7ccdf49b8d99748a659c6fff80185980e7f (commit)
      from  45c31333a879e35ecf7ddc12d5305002c80ba065 (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 1f530d55ec7f8b857e40c31bf977bc1ce17ffa8e
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>

commit e911c0ccd70449675d2b246af4881c92df70afe2
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>

commit d3d5457e8338327e3d447f0e631c17a745c67c30
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>

commit 2851d186f6c3376c0ae2b55b1e8c63bda87fded8
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>

commit dae1a7ccdf49b8d99748a659c6fff80185980e7f
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>

-----------------------------------------------------------------------

Summary of changes:
 C4/Serials.pm                                  |  106 +++++++++++++-----------
 t/db_dependent/Serials/GetFictiveIssueNumber.t |   83 +++++++++++++++++--
 t/db_dependent/Serials/GetNextDate.t           |   12 ++-
 3 files changed, 140 insertions(+), 61 deletions(-)

hooks/post-receive
-- 
main Koha release repository