[koha-commits] main Koha release repository branch master updated. v17.05.00-127-g7bcc226

Mon Jun 19 21:38:43 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, master has been updated
       via  7bcc226facc17eca9bc94cbab9535b2677462446 (commit)
       via  4e9701c36a6743eff72b8127de2cc79ff463013b (commit)
       via  8eae9660839750d95c53f6cc2a4287a6196f0cc6 (commit)
       via  f65ca90b0f3d12a22c02918a37131b0c1ff8bd5e (commit)
       via  e25f4670f36e53db44931cbbcfb3c5df2125c71a (commit)
       via  ffb1c87d2962b19a07798da3bf81bef328270145 (commit)
       via  05a49035ccff1d962ef0c21ca1b154e07ba5dba7 (commit)
       via  adfcd8d79c6691fb1062a2a5874a736b7792d303 (commit)
       via  d71fb0e17c87a39fc5abe7c9b2d866636c244347 (commit)
       via  285f6bd945373c06633b2c42621d754d93c37903 (commit)
       via  da10c3169b8cae71bf4a98b6585654a09704c323 (commit)
       via  768c5758a2bb34876528e64edbb9d651942668c9 (commit)
       via  3db0401366b8e099ab2046d68cf20a9f754e1eae (commit)
      from  4dd9236c6ebdfff33abcf97b6ea254ed1e63ffbe (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 7bcc226facc17eca9bc94cbab9535b2677462446
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu May 11 16:45:42 2017 +0000

    Bug 18582 - Hide empty rows in detailed suggestion view

    This patch adds a check for the existence of various template variables
    before showing the row containing that data. This will prevent the
    display of rows containing labels but no data in the suggestions
    detailed view.

    To test, apply the patch and go to Acquisitions -> Suggestions.

    View the detail page of various suggestions and confirm that only fields
    with data are displaying.

    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>

    Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4e9701c36a6743eff72b8127de2cc79ff463013b
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>

commit 8eae9660839750d95c53f6cc2a4287a6196f0cc6
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>

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

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

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

commit 05a49035ccff1d962ef0c21ca1b154e07ba5dba7
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>

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

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

commit 285f6bd945373c06633b2c42621d754d93c37903
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>

commit da10c3169b8cae71bf4a98b6585654a09704c323
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Jun 15 18:07:53 2017 -0400

    Bug 18807: t/db_dependent/www/batch.t fails

    get() does not take two parameters. fixed.
    prove and run koha qa test tools

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 768c5758a2bb34876528e64edbb9d651942668c9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 14 16:56:13 2017 -0300

    Bug 18807: Fix tests www/batch.t

    Several things are wrong here:
    1. It assumes that import_record_id is the biblionumber
    => Wrong, it is only true when the DB is empty and that the 2 AI equal 1
    2. The encoding in the template is 'UTF-8', not 'utf8', it leaded to
      "stage-marc-import.pl: marc21record.mrc: Unexpected charset UTF-8, expecting utf8"
    3. We did not test that the biblio was correctly imported

    Test plan:
    Make sure the tests now pass.
    For the www tests you need to set the following env vars:
    KOHA_USER, KOHA_PASS, KOHA_INTRANET_URL and KOHA_OPAC_URL

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 3db0401366b8e099ab2046d68cf20a9f754e1eae
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Jun 14 15:53:18 2017 -0300

    Bug 18806: Fix batch revert

    Since bug 18242: When a biblio is deleted, a new transaction is created.
    tools/manage-marc-import.pl use the AutoCommit flag, which does not
    allow nested transaction.
    AutoCommit must not be used.

    Test plan:
    Import a batch, then revert it.
    The biblios must have been correctly deleted, they were not before this
    patch

    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Serials.pm                                      |  189 ++++++++++-------
 .../prog/en/modules/suggestion/suggestion.tt       |   65 +++++-
 t/db_dependent/Serials/GetFictiveIssueNumber.t     |  220 ++++++++++++++++++++
 t/db_dependent/Serials/GetNextDate.t               |   77 ++++---
 t/db_dependent/www/batch.t                         |   21 +-
 tools/manage-marc-import.pl                        |   54 +++--
 6 files changed, 487 insertions(+), 139 deletions(-)
 create mode 100644 t/db_dependent/Serials/GetFictiveIssueNumber.t

hooks/post-receive
-- 
main Koha release repository