Attachment #70204 for bug #17047

View | Details | Raw Unified | Return to bug 17047
Collapse All | Expand All




    my (
        $nextseq,       $newlastvalue1, $newlastvalue2, $newlastvalue3,
        $newinnerloop1, $newinnerloop2, $newinnerloop3
    ) = GetNextSeq( $subscription, $pattern, $frequency, $planneddate );

$subscription is a hashref containing all the attributes of the table
'subscription'.
$pattern is a hashref containing all the attributes of the table
'subscription_numberpatterns'.
$frequency is a hashref containing all the attributes of the table 'subscription_frequencies'
$planneddate is a date string in iso format.
This function get the next issue for the subscription given on input arg

=cut

sub GetNextSeq {
    my ($subscription, $pattern, $frequency, $planneddate) = @_;

    return unless ($subscription and $pattern);


        if(@irreg > 0) {
            my $irregularities = {};
            $irregularities->{$_} = 1 foreach(@irreg);
            my $issueno = GetFictiveIssueNumber($subscription, $planneddate, $frequency) + 1;
            while($irregularities->{$issueno}) {
                $count++;
                $issueno++;


            #calculate the date of the last issue.
            for ( my $i = 1 ; $i <= $length ; $i++ ) {
                $enddate = GetNextDate( $subscription, $enddate, $frequency );
            }
        } elsif ( $subscription->{monthlength} ) {
            if ( $$subscription{startdate} ) {

    if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {
        my $subscription = GetSubscription($subscriptionid);
        my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
        my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});

        # next issue number
        my (
            $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
            $newinnerloop1, $newinnerloop2, $newinnerloop3
          )
          = GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );

        # next date (calculated from actual date & frequency parameters)
        my $nextpublisheddate = GetNextDate($subscription, $publisheddate, $frequency, 1);
        my $nextpubdate = $nextpublisheddate;
        $query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
                    WHERE  subscriptionid = ?";

    $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity,
    $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes,
    $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
    $location, $enddate, $skip_serialseq, $itemtype, $previousitemtype, $mana_id
    ) = @_;
    my $dbh = C4::Context->dbh;


            irregularity, numberpattern, locale, callnumber,
            manualhistory, internalnotes, serialsadditems, staffdisplaycount,
            opacdisplaycount, graceperiod, location, enddate, skip_serialseq,
            itemtype, previousitemtype, mana_id)
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?)
        |;
    my $sth = $dbh->prepare($query);
    $sth->execute(

        $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber,
        $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
        $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq,
        $itemtype, $previousitemtype, $mana_id
    );

    my $subscriptionid = $dbh->{'mysql_insertid'};

        my $expirationdate = GetExpirationDate($subscriptionid);

        my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);
        my $nextdate = GetNextDate($subscription, $res, $frequency);

        # only compare dates if both dates exist.
        if ($nextdate and $expirationdate) {


=head2 GetFictiveIssueNumber

$issueno = GetFictiveIssueNumber($subscription, $publishedate, $frequency);

Get the position of the issue published at $publisheddate, considering the
first issue (at firstacquidate) is at position 1, the next is at position 2, etc...

=cut

sub GetFictiveIssueNumber {
    my ($subscription, $publisheddate, $frequency) = @_;

    my $frequency = GetSubscriptionFrequency($subscription->{'periodicity'});
    my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;
    return if !$unit;
    my $issueno;


=head2 GetNextDate

$resultdate = GetNextDate($publisheddate,$subscription,$freqdata,$updatecount)

this function it takes the publisheddate and will return the next issue's date
and will skip dates if there exists an irregularity.
$publisheddate has to be an ISO date
$subscription is a hashref containing at least 'firstacquidate', 'irregularity', and 'countissuesperunit'
$frequency is a hashref containing frequency informations
$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database
- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be
skipped then the returned date will be 2007-05-10

=cut

sub GetNextDate {
    my ( $subscription, $publisheddate, $freqdata, $updatecount ) = @_;

    return unless $subscription and $publisheddate;

    my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});

    if ($freqdata->{'unit'}) {
        my ( $year, $month, $day ) = split /-/, $publisheddate;


        # Get the 'fictive' next issue number
        # It is used to check if next issue is an irregular issue.
        my $issueno = GetFictiveIssueNumber($subscription, $publisheddate, $freqdata) + 1;

        # Then get the next date
        my $unit = lc $freqdata->{'unit'};




package Koha::SharedContent;

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use JSON;
use HTTP::Request;
use LWP::UserAgent;

our $MANA_IP = "http://10.25.159.107:5000";

sub manaRequest {
    my $mana_request = shift;
    my $result;

    $mana_request->content_type('application/json');
    my $userAgent = LWP::UserAgent->new;
    my $response  = $userAgent->request($mana_request);

    if ( $response->code ne "204" ) {
        $result = from_json( $response->decoded_content );
    }
    $result->{code} = $response->code;

    return $result if ( $response->code =~ /^2..$/ );
}

sub manaNewUserPatchRequest {
    my $resource = shift;
    my $id       = shift;

    my $url = "$MANA_IP/$resource/$id.json/newUser";
    my $request = HTTP::Request->new( PATCH => $url );

    return manaRequest($request);
}

sub manaPostRequest {
    my $resource = shift;
    my $content  = shift;

    my $url = "$MANA_IP/$resource.json";
    my $request = HTTP::Request->new( POST => $url );

    $content->{bulk_import} = 0;
    my $json = to_json( $content, { utf8 => 1 } );
    $request->content($json);

    return manaRequest($request);
}

sub manaGetRequestWithId {
    my $resource = shift;
    my $id       = shift;

    my $url = "$MANA_IP/$resource/$id.json";
    my $request = HTTP::Request->new( GET => $url );

    return manaRequest($request);
}

sub manaGetRequest {
    my $resource   = shift;
    my $parameters = shift;

    $parameters = join '&',
      map { defined $parameters->{$_} ? $_ . "=" . $parameters->{$_} : () }
      keys %$parameters;
    my $url = "$MANA_IP/$resource.json?$parameters";
    my $request = HTTP::Request->new( GET => $url );

    return manaRequest($request);
}

1;

Lines 23-28 use Carp; Link Here

(-)a/Koha/Subscription.pm (+65 lines)
23		23
24	use Koha::Database;	24	use Koha::Database;
25	use Koha::Biblios;	25	use Koha::Biblios;
		26	use Koha::Biblioitems;
		27	use Koha::Subscriptions;
		28	use Koha::Subscription::Frequencies;
		29	use Koha::Subscription::Numberpatterns;
		30	use JSON;
26		31
27	use base qw(Koha::Object);	32	use base qw(Koha::Object);
28		33
Lines 52-57 sub biblio { Link Here
52		57
53	=cut	58	=cut
54		59
		60	sub get_search_info {
		61	my $searched_sub_id = shift;
		62	my $biblio = Koha::Biblios->find( { 'biblionumber' => $searched_sub_id } );
		63	my $biblioitem =
		64	Koha::Biblioitems->find( { 'biblionumber' => $searched_sub_id } );
		65
		66	my $sub_mana_info = {
		67	'title' => $biblio->title,
		68	'issn' => $biblioitem->issn,
		69	'ean' => $biblioitem->ean,
		70	'publishercode' => $biblioitem->publishercode
		71	};
		72	return $sub_mana_info;
		73	}
		74
		75	sub get_sharable_info {
		76	my $shared_sub_id = shift;
		77	my $subscription = Koha::Subscriptions->find($shared_sub_id);
		78	my $biblio = Koha::Biblios->find( $subscription->biblionumber );
		79	my $biblioitem = Koha::Biblioitems->find(
		80	{ 'biblionumber' => $subscription->biblionumber } );
		81	my $sub_frequency =
		82	Koha::Subscription::Frequencies->find( $subscription->periodicity );
		83	my $sub_numberpatteern =
		84	Koha::Subscription::Numberpatterns->find( $subscription->numberpattern );
		85
		86	my $sub_mana_info = {
		87	'title' => $biblio->title,
		88	'sfdescription' => $sub_frequency->description,
		89	'unit' => $sub_frequency->unit,
		90	'unitsperissue' => $sub_frequency->unitsperissue,
		91	'issuesperunit' => $sub_frequency->issuesperunit,
		92	'label' => $sub_numberpatteern->label,
		93	'sndescription' => $sub_numberpatteern->description,
		94	'numberingmethod' => $sub_numberpatteern->numberingmethod,
		95	'label1' => $sub_numberpatteern->label1,
		96	'add1' => $sub_numberpatteern->add1,
		97	'every1' => $sub_numberpatteern->every1,
		98	'whenmorethan1' => $sub_numberpatteern->whenmorethan1,
		99	'setto1' => $sub_numberpatteern->setto1,
		100	'numbering1' => $sub_numberpatteern->numbering1,
		101	'label2' => $sub_numberpatteern->label2,
		102	'add2' => $sub_numberpatteern->add2,
		103	'every2' => $sub_numberpatteern->every2,
		104	'whenmorethan2' => $sub_numberpatteern->whenmorethan2,
		105	'setto2' => $sub_numberpatteern->setto2,
		106	'numbering2' => $sub_numberpatteern->numbering2,
		107	'label3' => $sub_numberpatteern->label3,
		108	'add3' => $sub_numberpatteern->add3,
		109	'every3' => $sub_numberpatteern->every3,
		110	'whenmorethan3' => $sub_numberpatteern->whenmorethan3,
		111	'setto3' => $sub_numberpatteern->setto3,
		112	'numbering3' => $sub_numberpatteern->numbering3,
		113	'issn' => $biblioitem->issn,
		114	'ean' => $biblioitem->ean,
		115	'publishercode' => $biblioitem->publishercode
		116	};
		117	return $sub_mana_info;
		118	}
		119
55	sub _type {	120	sub _type {
56	return 'Subscription';	121	return 'Subscription';
57	}	122	}




package Koha::Subscription::Frequencies;

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use Koha::Database;
use Koha::Subscription::Frequency;
use base qw(Koha::Objects);

=head1 NAME

Koha::Subscription::Frequencies - Koha Subscription::Frequency object set class

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub _type {
    return 'SubscriptionFrequency';
}

=head3 object_class

=cut

sub object_class {
    return 'Koha::Subscription::Frequency';
}

=head1 AUTHOR

Morgane Alonso <morgane.alonso@biblibre.com>

=cut

1;




package Koha::Subscription::Frequency;

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use Koha::Database;
use base qw(Koha::Object);

=head1 NAME

Koha::Subscription::Frequency - Koha Subscription::Frequency Object class

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub _type {
    return 'SubscriptionFrequency';
}

=head1 AUTHOR

Morgane Alonso <morgane.alonso@biblibre.com>

=cut

1;




package Koha::Subscription::Numberpattern;

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use Koha::Database;
use base qw(Koha::Object);

=head1 NAME

Koha::SubscriptionNumberpattern - Koha SubscriptionNumberpattern Object class

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub _type {
    return 'SubscriptionNumberpattern';
}

=head1 AUTHOR

Morgane Alonso <morgane.alonso@biblibre.com>

=cut

1;




package Koha::Subscription::Numberpatterns;

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;
use Koha::Database;
use Koha::Subscription::Numberpattern;
use base qw(Koha::Objects);

=head1 NAME

Koha::SubscriptionNumberpatterns - Koha SubscriptionNumberpattern object set class

=head1 API

=head2 Class Methods

=cut

=head3 uniqeLabel

=cut

sub uniqueLabel {
    my ($self, $label) = @_;

    my $samelabel = Koha::Subscription::Numberpatterns->search({label => $label})->next();
    if ($samelabel) {
        my $i = 2;
        my $newlabel = $samelabel->label . " ($i)";
        while (my $othersamelabel = $self->search({label => $newlabel})->next()) {
            $i++;
            $newlabel = $samelabel->label . " ($i)";
        }
        $label = $newlabel;
    }
    return $label;
}

=head3 type

=cut

sub _type {
    return 'SubscriptionNumberpattern';
}

=head3 object_class

=cut

sub object_class {
    return 'Koha::Subscription::Numberpattern';
}

=head1 AUTHOR

Morgane Alonso <morgane.alonso@biblibre.com>

=cut

1;

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql (+1 lines)
	1	ALTER TABLE subscription ADD mana_id int(11);




[% USE KohaDates %]
<table id="mana_results_datatable">
    <thead>
        <tr>
            <th>ISSN</th>
            <th class="anti-the">Title</th>
            <th>Frequency</th>
            <th>Numbering pattern</th>
            <th class="NoSort">Number of users</th>
            <th class="title-string">Last Import</th>
            [% UNLESS search_only %]
              <th class="NoSort">Actions</th>
            [% END %]
        </tr>
    </thead>
    <tfoot>
        <tr>
            <td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
            <td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
            <td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search frequency" /></td>
            <td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search numbering pattern" /></td>
            <td></td>
            <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search last import" /></td>
            [% UNLESS search_only %]
              <td></td>
            [% END %]
        </tr>
    </tfoot>
    <tbody>
        [% FOREACH subscription IN subscriptions %]
            [% UNLESS subscription.cannotdisplay %]
                <tr id="row[% subscription.subscriptionid %]">
                    <td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
                    <td>[% subscription.title %]</a></td>
                    <td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
                    <td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
                    <td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
                    <td><span title="[% subscription.lastimport %]">[% subscription.lastimport | $KohaDates %]</span></td>
                    [% UNLESS search_only %]
                      <td><a style="cursor:pointer" onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</a></td>
                    [% END %]
                </tr>
            [% END %]
        [% END %]
    </tbody>
</table>

Lines 31-34 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (+3 lines)
31	</a>	31	</a>
32	</li>	32	</li>
33	<li><a href="/cgi-bin/koha/serials/add_fields.pl">Add subscription fields</a></li>	33	<li><a href="/cgi-bin/koha/serials/add_fields.pl">Add subscription fields</a></li>
		34	[% IF Koha.Preference('Mana') %]
		35	<li><a href="/cgi-bin/koha/serials/serials-search.pl?mana=1">Search on Mana</a></li>
		36	[% END %]
34	</ul>	37	</ul>

Lines 6-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (+105 lines)
6	[% ELSE %]	6	[% ELSE %]
7	<div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>	7	<div class="btn-group"><a id="newsubscription" class="btn btn-default btn-sm" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
8	[% END %]	8	[% END %]
		9	[% IF Koha.Preference('Mana') %]
		10	[% IF one_language_enabled==0 or mana_id %]
		11	<div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-small"><i class="fa fa-share-alt"></i> Share</a></div>
		12	[% ELSE %]
		13	<div class="btn-group" data-toggle="tooltip" title="Your email address will be associated to your sharing."><a class="btn btn-small" onclick="share()"><i class="fa fa-share-alt"></i> Share</a></div>
		14	[% END %]
		15	[% END %]
9	[% END %]	16	[% END %]
10		17
11	[% IF ( CAN_user_serials_edit_subscription \|\| CAN_user_serials_create_subscription \|\| CAN_user_serials_delete_subscription ) %]	18	[% IF ( CAN_user_serials_edit_subscription \|\| CAN_user_serials_create_subscription \|\| CAN_user_serials_delete_subscription ) %]
Lines 62-64 Link Here
62	[% END %]	69	[% END %]
63	</div>	70	</div>
64	[% END %]	71	[% END %]
		72
		73	<div id="mana_share_modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_share_modal_label" style="display: none;">
		74	<div class="modal-dialog">
		75	<div class="modal-content">
		76	<div class="modal-header">
		77	<h3 id="mana_share_modal_label">Share [% bibliotitle %] to Mana</h3>
		78	</div>
		79	<div class="modal-body">
		80	[% IF (mana_id) %]
		81	<div class="alert">
		82	<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwide it will do nothing.</p>
		83	</div>
		84	[% END %]
		85	[% IF ( languages_loop ) %]
		86	[% UNLESS ( one_language_enabled ) %]
		87	<div class="rows">
		88	<p>The frequency and the numberpattern of [% bibliotitle %] are :</p>
		89	<ol>
		90	<li><span class="label">Frequency : </span>
		91	[% frequency.description %]
		92	</li>
		93	<li><span class="label">Number pattern : </span>
		94	[% numberpattern.label %]
		95	</li>
		96	</ol>
		97	</div>
		98	<div class="rows">
		99	<form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
		100	<fieldset>
		101	<label for="mana_language">Language of your sharing :</label>
		102	<select id="mana_language" name="mana_language">
		103	[% FOREACH languages_loo IN languages_loop %]
		104	[% IF ( languages_loo.group_enabled ) %]
		105	[% IF ( languages_loo.plural ) %]
		106	[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
		107	[% IF ( sublanguages_loo.enabled ) %]
		108	[% IF ( sublanguages_loo.sublanguage_current ) %]
		109	<option value="[% languages_loo.rfc4646_subtag %]" selected>
		110	[% sublanguages_loo.native_description %]
		111	[% sublanguages_loo.script_description %]
		112	[% sublanguages_loo.region_description %]
		113	[% sublanguages_loo.variant_description %]
		114	([% sublanguages_loo.rfc4646_subtag %])
		115	</option>
		116	[% ELSE %]
		117	<option value="[% languages_loo.rfc4646_subtag %]">
		118	[% sublanguages_loo.native_description %]
		119	[% sublanguages_loo.script_description %]
		120	[% sublanguages_loo.region_description %]
		121	[% sublanguages_loo.variant_description %]
		122	([% sublanguages_loo.rfc4646_subtag %])
		123	</option>
		124	[% END %]
		125	[% END %]
		126	[% END %]
		127	[% ELSE %]
		128	[% IF ( languages_loo.group_enabled ) %]
		129	[% IF ( languages_loo.current ) %]
		130	<option value="[% languages_loo.rfc4646_subtag %]" selected>
		131	[% IF ( languages_loo.native_description ) %]
		132	[% languages_loo.native_description %]
		133	[% ELSE %]
		134	[% languages_loo.rfc4646_subtag %]
		135	[% END %]
136	</option>
137	[% ELSE %]
138	<option value="[% languages_loo.rfc4646_subtag %]">
139	[% IF ( languages_loo.native_description ) %]
140	[% languages_loo.native_description %]
141	[% ELSE %]
142	[% languages_loo.rfc4646_subtag %]
143	[% END %]
144	</option>
145	[% END %]
146	[% END %]
147	[% END %]
148	[% END %]
149	[% END %]
150	</select>
151	<input type="hidden" id="op" name="op" value="share"/>
152	<input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid %]"/>
153	</fieldset>
154	</form>
155	</div>
156	[% END %]
157	[% END %]
158	</div>
159	<div class="modal-footer">
160	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
161	[% IF one_language_enabled==0 %]
162	<button type="submit" form="mana_share_form" class="btn btn-primary">Share</button>
163	[% ELSE %]
164	<div class="btn-group"><a class="btn btn-primary" onclick="share()">Share</a></div>
165	[% END %]
166	</div>
167	</div>
168	</div>
169	</div>

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/mana-subscription-search-result.tt (+1 lines)
	1	[% INCLUDE 'mana-subscription-search-result.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt (+1 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
		2	[% USE Koha %]
2	[% SET footerjs = 1 %]	3	[% SET footerjs = 1 %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha &rsaquo; Serials [% biblionumber %]</title>	5	<title>Koha &rsaquo; Serials [% biblionumber %]</title>




[% USE AuthorisedValues %]
[% USE Branches %]
[% USE KohaDates %]
[% USE Koha %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Serials [% biblionumber %]</title>

                [% END %]
              </ol>
              <input type="hidden" name="searched" value="1" />
              [% IF ( mana ) %]<input type="hidden" name="mana" value="1" />[% END %]
              <fieldset class="action">
                <input type="submit" value="Search" />
              </fieldset>

        </form>
      </div>
      [% END %]
            [% IF ( done_searched ) %]
                [% IF ( total ) %]
                    <div id="serialstabs" class="toptabs" style="clear:both;">
                        <ul class="ui-tabs-nav">
                            [% IF mana %]
                                <li><a href="#mana">Mana ([% total || 0 %])</a></li>
                            [% ELSE %]
                                <li><a href="#opened">Open ([% openedsubscriptions.size || 0 %])</a></li>
                                <li><a href="#closed">Closed ([% closedsubscriptions.size || 0 %])</a></li>
                            [% END %]
                        </ul>
                        [% IF mana %]
                            <div id="mana">
                                [% INCLUDE 'mana-subscription-search-result.inc' %]
                            </div>
                        [% ELSE %]
            <div id="opened">
              [% IF openedsubscriptions %]
                <table id="osrlt">

                </div>
              [% END %]
            </div>
            [% END %]
          </div>
        [% ELSE %]
            <div class="dialog message">

  <div class="yui-b">
    [% INCLUDE 'serials-menu.inc' %]
    [% IF ( done_searched ) %]
    [% UNLESS ( mana ) %]
    <div id="advsearch">
        <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
          <fieldset class="brief">

              <fieldset class="action">
                <input type="submit" value="Search" />
              </fieldset>

            </div>
          </fieldset>
        </form>
      [% END %]
    [% END %]
  </div>
</div>


            $("#reopensub").click(function(){
                return confirm(_("Are you sure you want to reopen this subscription?"));
            });
            var manarlt = $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
                "sPaginationType": "four_button",
                "aoColumnDefs": [
                    { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
                ]
            }));
            var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
                "sPaginationType": "four_button",
                "aoColumnDefs": [
                    { 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
                ]
            }));

            var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
                "sPaginationType": "four_button",
                "aoColumnDefs": [
                    { 'bSortable': false, 'aTargets': [ 'NoSort' ] },
                    { 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
                ]
            } ) );

            manarlt.fnAddFilters("dt-filter", 750);
            osrlt.fnAddFilters("dt-filter", 750);
            csrlt.fnAddFilters("dt-filter", 750);

            $('#serialstabs').tabs();
            $("#reopensub").click(function(){
              return confirm(_("Are you sure you want to reopen this subscription?"));
            });
            [% IF ( mana ) %]
                $("label[for=callnumber], input#callnumber").hide();
                $("label[for=bookseller], input#bookseller").hide();
                $("label[for=branch], select#branch").hide();
                $("label[for=to], input#to").hide();
                $(".ui-datepicker-trigger").hide();
                $("label[for=location], select#location_filter").hide();
                [% FOR field IN additional_fields_for_subscription %]
                      $("label[for=additional_field_[% field.id %]], input#additional_field_[% field.id %]").hide();
                [% END %]
            [% END %]
        });
    </script>
[% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 / +25 lines)
1	[% USE KohaDates %]	1	[% USE KohaDates %]
2	[% USE Branches %]	2	[% USE Branches %]
		3	[% USE Koha %]
3	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle \|html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>	6	<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle \|html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
Lines 204-209 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
204		205
205	<div id="page_2">	206	<div id="page_2">
206	<div class="yui-u first">	207	<div class="yui-u first">
		208	<div id="mana_search" class="dialog message">
		209	<p>Frequency and Numbering pattern have been already proposed for this subscription on Mana. To show results, click <a style="cursor:pointer" data-toggle="modal" data-target="#mana_search_result">Here</a></p>
		210	</div>
207	<div id="subscription_form_planning">	211	<div id="subscription_form_planning">
208	<fieldset class="rows">	212	<fieldset class="rows">
209	<legend>Serials planning</legend>	213	<legend>Serials planning</legend>
Lines 468-477 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
468	</div>	472	</div>
469	[% END %]	473	[% END %]
470		474
		475	<input type="hidden" id="mana_id" name="mana_id" value=""/>
		476	<input type="hidden" id="sndescription" name="sndescription" value=""/>
		477	<input type="hidden" id="sfdescription" name="sfdescription" value=""/>
		478	<input type="hidden" id="unit" name="unit" value=""/>
		479	<input type="hidden" id="unitsperissue" name="unitsperissue" value=""/>
		480	<input type="hidden" id="issuesperunit" name="issuesperunit" value=""/>
471	<fieldset class="action">	481	<fieldset class="action">
472	<input type="button" id="subscription_add_previous" value="<< Previous" style="float:left;"/>	482	<input type="button" id="subscription_add_previous" value="<< Previous" style="float:left;"/>
473	<input id="testpatternbutton" type="button" value="Test prediction pattern" />	483	<input id="testpatternbutton" type="button" value="Test prediction pattern" />
474	<input type="submit" value="Save subscription" style="float:right;" accesskey="w" />	484	<input type="submit" onclick="removeDisabledAttr()" value="Save subscription" style="float:right;" accesskey="w"/>
475	</fieldset>	485	</fieldset>
476	</div>	486	</div>
477	</div>	487	</div>
Lines 483-488 fieldset.rows li.radio { width: 100%; } /* override staff-global.css */ Link Here
483	</div>	493	</div>
484	</div>	494	</div>
485	</div>	495	</div>
		496	<div id="mana_search_result" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mana_search_result_label" style="width: 90%; left:5%; margin-left: auto; display: none;">
		497	<div class="modal-dialog modal-lg">
		498	<div class="modal-content">
		499	<div class="modal-header">
		500	<h3 id="mana_search_result_label"></h3>
		501	</div>
		502	<div class="modal-body">
		503	</div>
		504	<div class="modal-footer">
		505	<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
		506	</div>
		507	</div>
		508	</div>
		509	</div>
486		510
487	[% MACRO jsinclude BLOCK %]	511	[% MACRO jsinclude BLOCK %]
488	[% INCLUDE 'calendar.inc' %]	512	[% INCLUDE 'calendar.inc' %]




   <div id="bd">
	<div id="yui-main">
	<div class="yui-b">
    [% INCLUDE 'serials-toolbar.inc' mana_id = mana_id %]

    <h1>Subscription for [% bibliotitle%] [% IF closed %](closed)[% END %]</h1>
    [% IF ( abouttoexpire ) %]

			</form>

	</div>
    [% END %] <!-- NEEDSCONFIRMATION -->
    [% IF mana_code.defined %]
        <div id="alert-community" class="dialog message">
            <p>
                [% IF (mana_code == 201) %]
                    The export is done, thank you for your contribution.
                [% ELSIF (mana_code == 200) %]
                    The model already exists on Mana, thank you for your contribution.
                [% END %]
            </p>
        </div>
    [% END %]

<div id="subscription_description" class="toptabs">
<ul class="ui-tabs-nav">

Lines 2-7 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-22 / +162 lines)
2		2
3	var globalnumpatterndata;	3	var globalnumpatterndata;
4	var globalfreqdata;	4	var globalfreqdata;
		5	var mananumpatterndata;
		6	var manafreqdata;
		7	var manaid;
5	var advancedpatternlocked;	8	var advancedpatternlocked;
6	var patternneedtobetested = 0;	9	var patternneedtobetested = 0;
7	if ( irregularity !== "" ){	10	if ( irregularity !== "" ){
Lines 85-115 function Check_page2(){ Link Here
85	}	88	}
86		89
87	function frequencyload(){	90	function frequencyload(){
88	$.getJSON("subscription-frequency.pl",{"frequency_id":document.f.frequency.value,ajax:'true'},	91	if ($("#frequency option:selected").val() === "mana"){
89	function(freqdata){	92	globalfreqdata=manafreqdata;
90	globalfreqdata=freqdata;	93	$("input[name='sfdescription']").val(manafreqdata.description);
91	if ( globalfreqdata.unit && globalfreqdata.unit.length == 0 ) {	94	$("input[name='unit']").val(manafreqdata.unit);
92	var option = $("#subtype option[value='issues']");	95	$("input[name='unitsperissue']").val(manafreqdata.unitsperissue);
93	$(option).attr('selected', 'selected');	96	$("input[name='issuesperunit']").val(manafreqdata.issuesperunit);
94	$("#subtype option[value!='issues']").prop('disabled', true)	97	if ($( "#numberpattern option:selected" ).val() === "mana" ) {
95	} else {	98	$("input[name='mana_id']").val(manaid);
96	$("#subtype option").prop('disabled', false)
97	}
98	}	99	}
99	)	100	} else {
		101	$.getJSON("subscription-frequency.pl",{"frequency_id":document.f.frequency.value,ajax:'true'},
		102	function(freqdata){
		103	globalfreqdata=freqdata;
		104	if ( globalfreqdata.unit && globalfreqdata.unit.length == 0 ) {
		105	var option = $("#subtype option[value='issues']");
		106	$(option).attr('selected', 'selected');
		107	$("#subtype option[value!='issues']").prop('disabled', true);
		108	} else {
		109	$("#subtype option").prop('disabled', false);
		110	}
		111	}
		112	);
		113	$("input[name='mana_id']").val("");
		114	}
100	}	115	}
101		116
102	function numberpatternload(){	117	function numberpatternload(){
103	$.getJSON("subscription-numberpattern.pl",{"numberpattern_id":document.f.numbering_pattern.value,ajax:'true'},	118	if($("#numberpattern option:selected" ).val() === "mana"){
104	function(numpatterndata){	119	globalnumpatterndata=mananumpatterndata;
105	globalnumpatterndata=numpatterndata;	120	$("input[name='sndescription']").val(mananumpatterndata.description);
106	if (globalnumpatterndata==undefined){	121	if($("#frequency option:selected" ).val() === "mana"){
107	return false;	122	$("input[name='mana_id']").val(manaid);
108	}
109	displaymoreoptions();
110	restoreAdvancedPattern();
111	}	123	}
112	);	124	if (globalnumpatterndata==undefined){
		125	return false;
		126	}
		127	displaymoreoptions();
		128	restoreAdvancedPattern();
		129	} else {
		130	$.getJSON("subscription-numberpattern.pl",{"numberpattern_id":document.f.numbering_pattern.value,ajax:'true'},
		131	function(numpatterndata){
		132	globalnumpatterndata=numpatterndata;
		133	if (globalnumpatterndata==undefined){
		134	return false;
		135	}
		136	displaymoreoptions();
		137	restoreAdvancedPattern();
		138	}
		139	);
		140	$("input[name='mana_id']").val("");
		141	}
113	}	142	}
114		143
115	function displaymoreoptions() {	144	function displaymoreoptions() {
Lines 275-281 function testPredictionPattern() { Link Here
275	'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',	304	'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
276	'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',	305	'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
277	'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',	306	'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
278	'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale'	307	'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale',
		308	'sfdescription', 'unitsperissue', 'issuesperunit', 'unit'
279	];	309	];
280	for(i in ajaxParams) {	310	for(i in ajaxParams) {
281	var param = ajaxParams[i];	311	var param = ajaxParams[i];
Lines 288-294 function testPredictionPattern() { Link Here
288	url:"/cgi-bin/koha/serials/showpredictionpattern.pl",	318	url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
289	data: ajaxData,	319	data: ajaxData,
290	success: function(data) {	320	success: function(data) {
291	$("#displayexample").html(data);	321	$("#displayexample").html(data).show();
292	patternneedtobetested = 0;	322	patternneedtobetested = 0;
293	}	323	}
294	});	324	});
Lines 362-369 function show_page_2() { Link Here
362	displaymoreoptions();	392	displaymoreoptions();
363	}	393	}
364		394
		395	function mana_search() {
		396	$.ajax({
		397	type: "POST",
		398	url: "/cgi-bin/koha/svc/mana/search",
		399	data: {biblionumber : $("#biblionumber").val()},
		400	dataType: "html",
		401	})
		402	.done( function( result ) {
		403	$("#mana_search_result .modal-body").html(result);
		404	$("#mana_search_result_label").text("Results from Mana");
		405	$("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
		406	"sPaginationType": "four_button",
		407	"aoColumnDefs": [
		408	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
		409	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		410	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		411	]
		412	}));
		413	if($("td.dataTables_empty").length == 0){
		414	$("#mana_search").show();
		415	}
		416	}).fail(function(result){
		417	});
		418	}
		419
		420	function mana_use(mana_id){
		421	$("tr").removeClass("selected");
		422	$("#row"+mana_id).addClass("selected");
		423	$.ajax( {
		424	type: "POST",
		425	url: "/cgi-bin/koha/svc/mana/use",
		426	data: {id : mana_id},
		427	dataType: "json",
		428	})
		429	.done(function(result){
		430	var select = document.getElementById('numberpattern');
		431	for(i = 0; i < select.length; i++){
		432	if(select[i].value === "mana"){
		433	select.remove(i);
		434	}
		435	}
		436	var optionnumpattern = document.createElement("option");
		437	optionnumpattern.text = result.label + " (mana)";
		438	optionnumpattern.selected = true;
		439	optionnumpattern.value="mana";
		440	select.add(optionnumpattern);
		441
		442	mananumpatterndata = {
		443	id:"mana",
		444	add1:result.add1,
		445	add2:result.add2,
		446	add3:result.add3,
		447	description:result.sndescription,
		448	displayorder:result.displayorder,
		449	every1:result.every1,
		450	every2:result.every2,
		451	every3:result.every3,
		452	label:result.label,
		453	label1:result.label1,
		454	label2:result.label2,
		455	label3:result.label3,
		456	numbering1:result.numbering1,
		457	numbering2:result.numbering2,
		458	numbering3:result.numbering3,
459	numberingmethod:result.numberingmethod,
460	setto1:result.setto1,
461	setto2:result.setto2,
462	setto3:result.setto3,
463	whenmorethan1:result.whenmorethan1,
464	whenmorethan2:result.whenmorethan2,
465	whenmorethan3:result.whenmorethan3,
466	};
467	select = document.getElementById("frequency");
468	for(i = 0; i < select.length; i++){
469	if(select[i].value === "mana"){
470	select.remove(i);
471	}
472	}
473	var optionfreq = document.createElement("option");
474	optionfreq.text = result.sfdescription + " (mana)";
475	optionfreq.selected = true;
476	optionfreq.value="mana";
477	select.add(optionfreq);
478	manafreqdata = {
479	id:"mana",
480	description:result.sfdescription,
481	displayorder:result.displayorder,
482	issuesperunit:result.issuesperunit,
483	unit:result.unit,
484	unitsperissue:result.unitsperissue,
485	};
486	manaid = result.id;
487	$("input[name='mana_id']").val(manaid);
488	$("#mana_search_result").modal("hide");
489	frequencyload();
490	numberpatternload();
491	}).fail( function( result ){
492	});
493	}
494
495	function removeDisabledAttr() {
496	$('select:disabled').removeAttr('disabled');
497	}
365		498
366	$(document).ready(function() {	499	$(document).ready(function() {
		500	$("#displayexample").hide();
		501	$("#mana_search_result").modal("hide");
367	$("#aqbooksellerid").on('keypress', function(e) {	502	$("#aqbooksellerid").on('keypress', function(e) {
368	if (e.keyCode == 13) {	503	if (e.keyCode == 13) {
369	e.preventDefault();	504	e.preventDefault();
Lines 447-452 $(document).ready(function() { Link Here
447	});	582	});
448	}	583	}
449		584
		585	$("#mana_search").hide();
		586
450	show_page_1();	587	show_page_1();
451	$("#subscription_add_form").on("submit",function(){	588	$("#subscription_add_form").on("submit",function(){
452	return Check_page2();	589	return Check_page2();
Lines 469-474 $(document).ready(function() { Link Here
469	});	606	});
470	$("#subscription_add_next").on("click",function(){	607	$("#subscription_add_next").on("click",function(){
471	if ( Check_page1() ){	608	if ( Check_page1() ){
		609	[% IF Koha.Preference('Mana') %]
		610	mana_search();
		611	[% END %]
472	show_page_2();	612	show_page_2();
473	}	613	}
474	});	614	});

Lines 33-38 use C4::Debug; Link Here

(-)a/misc/cronjobs/serialsUpdate.pl (-1 / +3 lines)
33	use C4::Serials;	33	use C4::Serials;
34	use C4::Log;	34	use C4::Log;
35	use Koha::DateUtils;	35	use Koha::DateUtils;
		36	use C4::Serials::Frequency;
36		37
37	use Date::Calc qw/Date_to_Days check_date/;	38	use Date::Calc qw/Date_to_Days check_date/;
38	use Getopt::Long;	39	use Getopt::Long;
Lines 118-124 while ( my $issue = $sth->fetchrow_hashref ) { Link Here
118	my $publisheddate = $issue->{publisheddate};	119	my $publisheddate = $issue->{publisheddate};
119		120
120	if ( $subscription && $publisheddate && $publisheddate ne "0000-00-00" ) {	121	if ( $subscription && $publisheddate && $publisheddate ne "0000-00-00" ) {
121	my $nextpublisheddate = GetNextDate( $subscription, $publisheddate );	122	my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});
		123	my $nextpublisheddate = GetNextDate( $subscription, $publisheddate, $freqdata );
122	my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });	124	my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
123		125
124	if ( $nextpublisheddate && $today ) {	126	if ( $nextpublisheddate && $today ) {




            require C4::Serials::Numberpattern;
            my $subscription = GetSubscription($subscriptionid);
            my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
            my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
            my $expected = GetNextExpected($subscriptionid);
            my (
                 $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
                 $newinnerloop1, $newinnerloop2, $newinnerloop3
            ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});

             ## We generate the next publication date
             my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
             ## Creating the new issue
             NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
                     1, $nextpublisheddate, $nextpublisheddate );




use Koha::AdditionalField;

use Koha::DateUtils;
use Koha::SharedContent;

my $query         = new CGI;
my $title         = $query->param('title_filter') || '';

my $expiration_date = $query->param('expiration_date_filter') || '';
my $routing       = $query->param('routing') || C4::Context->preference("RoutingSerials");
my $searched      = $query->param('searched') || 0;
my $mana      = $query->param('mana') || 0;
my @subscriptionids = $query->multi_param('subscriptionid');
my $op            = $query->param('op');


my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
my @subscriptions;
if ($searched){
    if ($mana) {
        my $result = Koha::SharedContent::manaGetRequest("subscription",{
            title        => $title,
            issn         => $ISSN,
            ean          => $EAN,
            publisher    => $publisher
        });
        @subscriptions = @{ $result->{data} };
    }
    else {
        @subscriptions = SearchSubscriptions(
        {
            biblionumber => $biblionumber,
            title        => $title,

            additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
            location     => $location,
            expiration_date => $expiration_date_dt,
        });
    }
}

if ($mana) {
    $template->param(
        subscriptions => \@subscriptions,
        total         => scalar @subscriptions,
        title_filter  => $title,
        ISSN_filter   => $ISSN,
        EAN_filter    => $EAN,
        callnumber_filter => $callnumber,
        publisher_filter => $publisher,
        bookseller_filter  => $bookseller,
        branch_filter => $branch,
        location_filter => $location,
        expiration_date_filter => $expiration_date_dt,
        done_searched => $searched,
        routing       => $routing,
        additional_field_filters => $additional_field_filters,
        additional_fields_for_subscription => $additional_fields,
        marcflavour   => (uc(C4::Context->preference("marcflavour"))),
        mana => $mana,
        search_only => 1
    );
}
else
{
    # to toggle between create or edit routing list options
    if ($routing) {
        for my $subscription ( @subscriptions) {
            $subscription->{routingedit} = check_routing( $subscription->{subscriptionid} );
        }
    }

    my (@openedsubscriptions, @closedsubscriptions);
    for my $sub ( @subscriptions ) {
        unless ( $sub->{closed} ) {
            push @openedsubscriptions, $sub
                unless $sub->{cannotdisplay};
        } else {
            push @closedsubscriptions, $sub
                unless $sub->{cannotdisplay};
        }
    }
}

    my @branches = Koha::Libraries->search( {}, { order_by => ['branchcode'] } );
    my @branches_loop;
    foreach my $b ( @branches ) {
        my $selected = 0;
        $selected = 1 if( defined $branch and $branch eq $b->branchcode );
        push @branches_loop, {
            branchcode  => $b->branchcode,
            branchname  => $b->branchname,
            selected    => $selected,
        };
    }
    location_filter => $location,
    expiration_date_filter => $expiration_date_dt,
    done_searched => $searched,
    routing       => $routing,
    additional_field_filters => $additional_field_filters,
    additional_fields_for_subscription => $additional_fields,
    marcflavour   => (uc(C4::Context->preference("marcflavour")))
);

    $template->param(
        openedsubscriptions => \@openedsubscriptions,
        closedsubscriptions => \@closedsubscriptions,
        total         => @openedsubscriptions + @closedsubscriptions,
        title_filter  => $title,
        ISSN_filter   => $ISSN,
        EAN_filter    => $EAN,
        callnumber_filter => $callnumber,
        publisher_filter => $publisher,
        bookseller_filter  => $bookseller,
        branch_filter => $branch,
        location_filter => $location,
        expiration_date_filter => $expiration_date_dt,
        branches_loop => \@branches_loop,
        done_searched => $searched,
        routing       => $routing,
        additional_field_filters => $additional_field_filters,
        additional_fields_for_subscription => $additional_fields,
        marcflavour   => (uc(C4::Context->preference("marcflavour"))),
        mana => $mana
    );
}
output_html_with_http_headers $query, $cookie, $template->output;




my $sublength = $input->param('sublength');
my $custompattern = $input->param('custompattern');


my $frequency;
if ( $frequencyid eq 'mana' ) {
    $frequency = {
        'id'            => undef,
        'displayorder'  => undef,
        'description'   => scalar $input->param('sfdescription') // '',
        'unitsperissue' => scalar $input->param('unitsperissue') // '',
        'issuesperunit' => scalar $input->param('issuesperunit') // '',
        'unit'          => scalar $input->param('unit') // ''
    };
}
else {
    $frequency = GetSubscriptionFrequency($frequencyid);
}

my %pattern = (
    numberingmethod => scalar $input->param('numberingmethod') // '',

    innerloop2      => scalar $input->param('innerloop2') // '',
    innerloop3      => scalar $input->param('innerloop3') // '',
    irregularity    => '',
    periodicity     => $frequencyid,
    countissuesperunit  => 1,
    firstacquidate  => $firstacquidate,
);

my $issuenumber;
if(defined $subscriptionid) {
    ($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date, $frequency);
} else {
    $issuenumber = 1;
}

    my %line;

    if(defined $date){
        $date = GetNextDate(\%subscription, $date, $frequency);
    }
    if(defined $date){
        $line{'publicationdate'} = $date;

        last;
    }

    ($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
    $issuenumber++;
    $line{'number'} = $calculated;
    $line{'issuenumber'} = $issuenumber;

Lines 36-41 use Koha::DateUtils; Link Here

(-)a/serials/subscription-add.pl (-7 / +74 lines)
36	use Koha::ItemTypes;	36	use Koha::ItemTypes;
37	use Carp;	37	use Carp;
38		38
		39	use Koha::Subscription::Numberpattern;
		40	use Koha::Subscription::Frequency;
		41	use Koha::SharedContent;
		42
39	#use Smart::Comments;	43	#use Smart::Comments;
40		44
41	our $query = CGI->new;	45	our $query = CGI->new;
Lines 286-300 sub _guess_enddate { Link Here
286	return $enddate;	290	return $enddate;
287	}	291	}
288		292
		293	sub manage_subscription_numbering_pattern_id {
		294	my $params;
		295	if ( $query->param('numbering_pattern') eq 'mana' ) {
		296	foreach (qw/numberingmethod label1 add1 every1 whenmorethan1 setto1
		297	numbering1 label2 add2 every2 whenmorethan2 setto2 numbering2
		298	label3 add3 every3 whenmorethan3 setto3 numbering3/) {
		299	$params->{$_} = $query->param($_) if $query->param($_);
		300	}
		301
		302	my $existing = Koha::Subscription::Numberpatterns->search($params)->next();
		303
		304	if ($existing) {
		305	return $existing->id;
		306	}
		307
		308	$params->{label} = Koha::Subscription::Numberpattern->uniqueLabel($query->param('patternname'));
		309	$params->{description} = $query->param('sndescription');
		310
		311
		312	my $subscription_np = Koha::Subscription::Numberpattern->new()->set($params)->store();
		313	return $subscription_np->id;
		314	}
		315
		316	return $query->param('numbering_pattern');
		317	}
		318
		319	sub manage_subscription_frequencies_id {
		320	my $periodicity;
		321	if ( $query->param('frequency') eq 'mana' ) {
		322	my $subscription_freq = Koha::Subscription::Frequency->new()->set(
		323	{
		324	description => $query->param('sfdescription'),
		325	unit => $query->param('unit'),
		326	unitsperissue => $query->param('unitsperissue'),
		327	issuesperunit => $query->param('issuesperunit'),
		328	}
		329	)->store();
		330	$periodicity = $subscription_freq->id;
		331	}
		332	else {
		333	$periodicity = $query->param('frequency');
		334	}
		335	return $periodicity;
		336	}
		337
289	sub redirect_add_subscription {	338	sub redirect_add_subscription {
		339	my $periodicity = manage_subscription_frequencies_id();
		340	my $numberpattern = manage_subscription_numbering_pattern_id();
		341
290	my $auser = $query->param('user');	342	my $auser = $query->param('user');
291	my $branchcode = $query->param('branchcode');	343	my $branchcode = $query->param('branchcode');
292	my $aqbooksellerid = $query->param('aqbooksellerid');	344	my $aqbooksellerid = $query->param('aqbooksellerid');
293	my $cost = $query->param('cost');	345	my $cost = $query->param('cost');
294	my $aqbudgetid = $query->param('aqbudgetid');	346	my $aqbudgetid = $query->param('aqbudgetid');
295	my $periodicity = $query->param('frequency');
296	my @irregularity = $query->multi_param('irregularity');	347	my @irregularity = $query->multi_param('irregularity');
297	my $numberpattern = $query->param('numbering_pattern');
298	my $locale = $query->param('locale');	348	my $locale = $query->param('locale');
299	my $graceperiod = $query->param('graceperiod') \|\| 0;	349	my $graceperiod = $query->param('graceperiod') \|\| 0;
300		350
Lines 324-329 sub redirect_add_subscription { Link Here
324	my $previousitemtype = $query->param('previousitemtype');	374	my $previousitemtype = $query->param('previousitemtype');
325	my $skip_serialseq = $query->param('skip_serialseq');	375	my $skip_serialseq = $query->param('skip_serialseq');
326		376
		377	my $mana_id;
		378	if ( $query->param('mana_id') ne "" ) {
		379	$mana_id = $query->param('mana_id');
		380	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
		381	}
		382	else {
		383	$mana_id = undef;
		384	}
		385
327	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );	386	my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );
328	my $enddate = output_pref( { str => scalar $query->param('enddate'), dateonly => 1, dateformat => 'iso' } );	387	my $enddate = output_pref( { str => scalar $query->param('enddate'), dateonly => 1, dateformat => 'iso' } );
329	my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );	388	my $firstacquidate = output_pref( { str => scalar $query->param('firstacquidate'), dateonly => 1, dateformat => 'iso' } );
Lines 335-341 sub redirect_add_subscription { Link Here
335	$enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)	394	$enddate = _guess_enddate($startdate, $periodicity, $numberlength, $weeklength, $monthlength)
336	}	395	}
337	}	396	}
338
339	my $subscriptionid = NewSubscription(	397	my $subscriptionid = NewSubscription(
340	$auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,	398	$auser, $branchcode, $aqbooksellerid, $cost, $aqbudgetid, $biblionumber,
341	$startdate, $periodicity, $numberlength, $weeklength,	399	$startdate, $periodicity, $numberlength, $weeklength,
Lines 344-350 sub redirect_add_subscription { Link Here
344	join(";",@irregularity), $numberpattern, $locale, $callnumber,	402	join(";",@irregularity), $numberpattern, $locale, $callnumber,
345	$manualhistory, $internalnotes, $serialsadditems,	403	$manualhistory, $internalnotes, $serialsadditems,
346	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,	404	$staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
347	$skip_serialseq	405	$skip_serialseq, $mana_id
348	);	406	);
349		407
350	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	408	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
Lines 374-386 sub redirect_mod_subscription { Link Here
374	? output_pref( { str => $nextacquidate, dateonly => 1, dateformat => 'iso' } )	432	? output_pref( { str => $nextacquidate, dateonly => 1, dateformat => 'iso' } )
375	: $firstacquidate;	433	: $firstacquidate;
376		434
377	my $periodicity = $query->param('frequency');	435	my $periodicity = manage_subscription_frequencies_id();
		436	my $numberpattern = manage_subscription_numbering_pattern_id();
378		437
379	my $subtype = $query->param('subtype');	438	my $subtype = $query->param('subtype');
380	my $sublength = $query->param('sublength');	439	my $sublength = $query->param('sublength');
381	my ($numberlength, $weeklength, $monthlength)	440	my ($numberlength, $weeklength, $monthlength)
382	= _get_sub_length( $subtype, $sublength );	441	= _get_sub_length( $subtype, $sublength );
383	my $numberpattern = $query->param('numbering_pattern');
384	my $locale = $query->param('locale');	442	my $locale = $query->param('locale');
385	my $lastvalue1 = $query->param('lastvalue1');	443	my $lastvalue1 = $query->param('lastvalue1');
386	my $innerloop1 = $query->param('innerloop1');	444	my $innerloop1 = $query->param('innerloop1');
Lines 403-408 sub redirect_mod_subscription { Link Here
403	my $previousitemtype = $query->param('previousitemtype');	461	my $previousitemtype = $query->param('previousitemtype');
404	my $skip_serialseq = $query->param('skip_serialseq');	462	my $skip_serialseq = $query->param('skip_serialseq');
405		463
		464	my $mana_id;
		465	if ( defined( $query->param('mana_id') ) ) {
		466	$mana_id = $query->param('mana_id');
		467	Koha::SharedContent::manaNewUserPatchRequest("subscription",$mana_id);
		468	}
		469	else {
		470	$mana_id = undef;
		471	}
		472
406	# Guess end date	473	# Guess end date
407	if(!defined $enddate \|\| $enddate eq '') {	474	if(!defined $enddate \|\| $enddate eq '') {
408	if($subtype eq "issues") {	475	if($subtype eq "issues") {
Lines 428-434 sub redirect_mod_subscription { Link Here
428	$status, $biblionumber, $callnumber, $notes, $letter,	495	$status, $biblionumber, $callnumber, $notes, $letter,
429	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,	496	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
430	$opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,	497	$opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
431	$skip_serialseq, $itemtype, $previousitemtype	498	$skip_serialseq, $itemtype, $previousitemtype, $mana_id
432	);	499	);
433		500
434	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );	501	my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );




use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
use Carp;

use LWP::UserAgent;
use Koha::SharedContent;
use Koha::Patrons;
use Koha::Subscriptions;
use Koha::Libraries;

my $query = new CGI;
my $op = $query->param('op') || q{};
my $issueconfirmed = $query->param('issueconfirmed');

$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)

if ($op eq 'del') {
    if ($$subs{'cannotedit'}){
        carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
        print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
        exit;
    }

    # Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues
    my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);
    my $linkedissues = CountIssues($subscriptionid);
    my $countitems   = HasItems($subscriptionid);
    if ($strictlyexpired == 0 || $linkedissues > 0 || $countitems>0) {
        $template->param(NEEDSCONFIRMATION => 1);
        if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
        if ($linkedissues     > 0) { $template->param("LINKEDISSUES" => 1); }
        if ($countitems       > 0) { $template->param("LINKEDITEMS"  => 1); }
    } else {
        $issueconfirmed = "1";
    }
    # If it's ok to delete the subscription, we do so
    if ($issueconfirmed eq "1") {
        &DelSubscription($subscriptionid);
        print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
        exit;
    }
}
elsif ( $op and $op eq "share" ) {
    my $mana_language;
    if ( $query->param('mana_language') ) {
        $mana_language = $query->param('mana_language');
    }
    else {
        $mana_language = C4::Context->preference('language');
    }

    my $mana_email;
    if ( $loggedinuser ne 0 ) {
        my $borrower = Koha::Patrons->find($loggedinuser);
        $mana_email = $borrower->email
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
        $mana_email = $borrower->emailpro
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
        $mana_email =
          Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
          if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
    }
    $mana_email = C4::Context->preference('KohaAdminEmailAddress')
      if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
    my %versions = C4::Context::get_versions();

    my $mana_info = {
        language    => $mana_language,
        kohaversion => $versions{'kohaVersion'},
        exportemail => $mana_email
    };
    my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
    $sub_mana_info = { %$sub_mana_info, %$mana_info };
    my $result = Koha::SharedContent::manaPostRequest( "subscription",
        $sub_mana_info );
    if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
        my $subscription = Koha::Subscriptions->find($subscriptionid);
        $subscription->set( { mana_id => $result->{id} } )->store;
        $subs->{mana_id} = $result->{id};
    }
    $template->param( mana_code => $result->{code} );
}

my $hasRouting = check_routing($subscriptionid);

(undef, $cookie, undef, undef)




#!/usr/bin/perl

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
#

use strict;
use warnings;

use Koha::SharedContent;
use Koha::Subscription;
use C4::Auth qw(check_cookie_auth), qw(get_template_and_user);
use C4::Output qw( output_with_http_headers );

use CGI;
use JSON;

my $input = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "serials/mana-subscription-search-result.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,

        # flagsrequired   => { serials => $permission },
        flagsrequired => { serials => 'create_subscription' },
        debug         => 1,
    }
);

my $biblionumber = $input->param('biblionumber');

my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);
my $result =
  Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
$template->param( subscriptions => $result->{data} );

output_with_http_headers $input, $cookie, $template->output, 'json';




#!/usr/bin/perl

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
#

use strict;
use warnings;

use Koha::SharedContent;
use C4::Auth qw(check_cookie_auth);

use CGI;
use JSON;


my $input = new CGI;
binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $input->cookie('CGISESSID'),
    { serials => 'create_subscription' } );

if ( $auth_status ne "ok" ) {
    exit 0;
}

my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );

my $subscription;
$subscription = $result->{data};

print(to_json($subscription));




#!/usr/bin/perl

# Copyright 2016 BibLibre Morgane Alonso
#
# This file is part of Koha
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use t::lib::TestBuilder;
use Test::More tests => 1;
use Koha::Database;

use_ok('Koha::SharedContent');

my $schema = Koha::Database->new->schema;
$schema->storage->txn_begin;    # mode insertion

Lines 19-31 Link Here

(-)a/t/db_dependent/Koha/Subscription.t (-1 / +84 lines)
19		19
20	use Modern::Perl;	20	use Modern::Perl;
21		21
22	use Test::More tests => 1;	22	use Test::More tests => 7;
23		23
		24	use t::lib::TestBuilder;
		25
		26	use Koha::Database;
24	use Koha::Subscription;	27	use Koha::Subscription;
25	use Koha::Biblio;	28	use Koha::Biblio;
		29	use Koha::Subscriptions;
		30	use Koha::Biblios;
26		31
27	my $schema = Koha::Database->new->schema;	32	my $schema = Koha::Database->new->schema;
28	$schema->storage->txn_begin;	33	$schema->storage->txn_begin;
		34	my $builder = t::lib::TestBuilder->new;
		35
		36	use_ok('Koha::Subscription');
29		37
30	subtest 'Koha::Subscription::biblio' => sub {	38	subtest 'Koha::Subscription::biblio' => sub {
31	plan tests => 1;	39	plan tests => 1;
Lines 39-44 subtest 'Koha::Subscription::biblio' => sub { Link Here
39	is($b->biblionumber, $biblio->biblionumber, 'Koha::Subscription::biblio returns the correct biblio');	47	is($b->biblionumber, $biblio->biblionumber, 'Koha::Subscription::biblio returns the correct biblio');
40	};	48	};
41		49
		50	my $nb_of_subs = Koha::Subscriptions->search->count;
		51	my $biblio_1 = $builder->build( { source => 'Biblio' } );
		52	my $bi_1 = $builder->build(
		53	{
		54	source => 'Biblioitem',
		55	value => {
		56	biblionumber => $biblio_1->{biblionumber}
		57	}
		58	}
		59	);
		60	my $sub_freq_1 = $builder->build( { source => 'SubscriptionFrequency' } );
		61	my $sub_np_1 = $builder->build( { source => 'SubscriptionNumberpattern' } );
		62	my $sub_1 = $builder->build(
		63	{
		64	source => 'Subscription',
		65	value => {
		66	biblionumber => $biblio_1->{biblionumber},
		67	periodicity => $sub_freq_1->{id},
		68	numberpattern => $sub_np_1->{id}
		69	}
		70	}
		71	);
		72
		73	is(
		74	Koha::Subscriptions->search->count,
		75	$nb_of_subs + 1,
		76	'The subscription should have been added'
		77	);
		78	is(
		79	$sub_1->{biblionumber},
		80	$biblio_1->{biblionumber},
		81	'The link between sub and biblio is well done'
		82	);
		83	is( $sub_1->{periodicity}, $sub_freq_1->{id},
		84	'The link between sub and sub_freq is well done' );
		85	is( $sub_1->{numberpattern},
		86	$sub_np_1->{id},
		87	'The link between sub and sub_numberpattern is well done' );
		88
		89	my $ref = {
		90	'title' => $biblio_1->{title},
		91	'notes' => $sub_1->{notes},
		92	'sfdescription' => $sub_freq_1->{description},
		93	'displayorder' => $sub_freq_1->{displayorder},
		94	'unit' => $sub_freq_1->{unit},
		95	'unitsperissue' => $sub_freq_1->{unitsperissue},
		96	'issuesperunit' => $sub_freq_1->{issuesperunit},
		97	'sndescription' => $sub_np_1->{description},
		98	'numberingmethod' => $sub_np_1->{numberingmethod},
		99	'label1' => $sub_np_1->{label1},
		100	'add1' => $sub_np_1->{add1},
		101	'every1' => $sub_np_1->{every1},
		102	'whenmorethan1' => $sub_np_1->{whenmorethan1},
		103	'setto1' => $sub_np_1->{setto1},
		104	'numbering1' => $sub_np_1->{numbering1},
		105	'label2' => $sub_np_1->{label2},
		106	'add2' => $sub_np_1->{add2},
		107	'every2' => $sub_np_1->{every2},
		108	'whenmorethan2' => $sub_np_1->{whenmorethan2},
		109	'setto2' => $sub_np_1->{setto2},
		110	'numbering2' => $sub_np_1->{numbering2},
		111	'label3' => $sub_np_1->{label3},
		112	'add3' => $sub_np_1->{add3},
		113	'every3' => $sub_np_1->{every3},
114	'whenmorethan3' => $sub_np_1->{whenmorethan3},
115	'setto3' => $sub_np_1->{setto3},
116	'numbering3' => $sub_np_1->{numbering3},
117	'issn' => $bi_1->{issn},
118	'ean' => $bi_1->{ean},
119	'publishercode' => $bi_1->{publishercode}
120	};
121
122	is_deeply( Koha::Subscription::get_sharable_info( $sub_1->{subscriptionid} ),
123	$ref, "get_sharable_info function is ok" );
124
42	$schema->storage->txn_rollback;	125	$schema->storage->txn_rollback;
43		126
44	1;	127	1;

Lines 288-294 my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscrip Link Here

(-)a/t/db_dependent/Serials.t (-1 / +2 lines)
288	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );	288	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );
289	my $publisheddate = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });	289	my $publisheddate = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
290	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );	290	( $total_issues, @serials ) = C4::Serials::GetSerials( $subscriptionid );
291	my $nextpublisheddate = C4::Serials::GetNextDate($subscription, $publisheddate, 1);	291	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
		292	my $nextpublisheddate = C4::Serials::GetNextDate($subscription, $publisheddate, $frequency, 1);
292	my @statuses = qw( 2 2 3 3 3 3 3 4 4 41 42 43 44 5 );	293	my @statuses = qw( 2 2 3 3 3 3 3 4 4 41 42 43 44 5 );
293	# Add 14 serials	294	# Add 14 serials
294	my $counter = 0;	295	my $counter = 0;




#!/usr/bin/perl

use C4::Context;
use Test::More tests => 18;
use Modern::Perl;
use Test::More tests => 5;

use Koha::Database;
use C4::Serials;
use C4::Serials::Frequency;

my $schema  = Koha::Database->new->schema;
$schema->storage->txn_begin;
my $dbh = C4::Context->dbh;
$dbh->{RaiseError} = 1;
$dbh->{AutoCommit} = 0;

use C4::Serials::Frequency;
use C4::Serials;

    # Add a frequency
    my $freq_irr = AddSubscriptionFrequency({
        description => "Irregular",
        unit => undef,
    });

# TEST CASE - 1 issue per day, no irregularities
my $frequency = {
    description   => "One issue per day",
    unit          => 'day',
    issuesperunit => 1,
    unitsperissue => 1,
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-12-31'), undef, 'Irregular: still undef' );
};

my $subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
    my $freq_1i_1y = AddSubscriptionFrequency({
        description => "1 issue per year",
        unit => 'year',
        issuesperunit => 1,
        unitsperissue => 1,
    });
    my $freq_1i_3y = AddSubscriptionFrequency({
        description => "1 issue per 3 years",
        unit => 'year',
        issuesperunit => 1,
        unitsperissue => 3,
    });
    my $freq_5i_1y = AddSubscriptionFrequency({
        description => "5 issues per year",
        unit => 'year',
        issuesperunit => 5,
        unitsperissue => 1,
    });
    my $freq_366i_1y = AddSubscriptionFrequency({
        description => "366 issue per year",
        unit => 'year',
        issuesperunit => 366,
        unitsperissue => 1,
    });

    # TEST CASE - 1 issue per year
    my $subscription = {
        periodicity => $freq_1i_1y,
        firstacquidate => '1972-02-10',
        countissuesperunit => 1,
    };
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-09'), 1, 'Feb 9 still 1' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-10'), 2, 'Feb 10 goes to 2' );

    # TEST CASE - 1 issue per 3 years
    $subscription->{periodicity} = $freq_1i_3y;
    $subscription->{firstacquidate} = '1972-02-20';
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1975-02-19'), 1, 'Feb 19, 1975 still 1' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1975-02-20'), 2, 'Feb 20, 1975 goes to 2' );

    # TEST CASE - 5 issues per year
    $subscription->{periodicity} = $freq_5i_1y;
    $subscription->{firstacquidate} = '1972-02-29'; #leap year
    $subscription->{countissuesperunit} = 1;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-11'), 1, 'May 11 still 1' );
    $subscription->{countissuesperunit} = 2;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-12'), 2, 'May 12 goes to 2' );
    $subscription->{countissuesperunit} = 5;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-27'), 5, 'Feb 27 should still be 5' );
    $subscription->{countissuesperunit} = 1;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-28'), 6, 'Feb 28 goes to 6' );

    # TEST CASE - 366 issues per year (hypothetical example)
    # Testing prevention of divide by zero
    $subscription->{periodicity} = $freq_366i_1y;
    $subscription->{firstacquidate} = '1972-02-29'; #leap year
    $subscription->{countissuesperunit} = 366;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-27'), 366, 'Feb 27 still at 366' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-28'), 732, 'Feb 28 goes to 732' );

};
my $issueNumber;

$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '1' );

$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '2' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '3' );

# TEST CASE - 2 issues per day, no irregularity
$frequency = {
    description   => "Two issues per day",
    unit          => 'day',
    issuesperunit => 2,
    unitsperissue => 1,
    my $subscription = {
        periodicity => $freq_1i_5m,
        firstacquidate => '1972-02-10',
        countissuesperunit => 1,
    };
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-07-09'), 1, 'Jul 9 still 1' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-07-10'), 2, 'Jul 10 goes to 2' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-05-09'), 3, 'May 9 still 3' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-05-10'), 4, 'May 10 goes to 4' );

    # TEST CASE - 4 issue per 1 months
    $subscription = {
        periodicity => $freq_4i_1m,
        firstacquidate => '1972-02-22',
        countissuesperunit => 1,
    };
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-28'), 1, 'Feb 28 still 1' );
    $subscription->{countissuesperunit} = 2;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-29'), 2, 'Feb 29 goes to 2' );
    $subscription->{countissuesperunit} = 4;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-21'), 4, 'Mar 21 still 4' );
    $subscription->{countissuesperunit} = 1;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-22'), 5, 'Mar 22 goes to 5' );

};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
    # First add a few frequencies
    my $freq_1i_7w = AddSubscriptionFrequency({
        description => "1 issue per 7 weeks",
        unit => 'week',
        issuesperunit => 1,
        unitsperissue => 7,
    });
    my $freq_3i_1w = AddSubscriptionFrequency({
        description => "3 issues per week",
        unit => 'week',
        issuesperunit => 3,
        unitsperissue => 1,
    });

    # TEST CASE - 1 issue per 7 weeks
    my $subscription = {
        periodicity => $freq_1i_7w,
        firstacquidate => '1972-02-10',
        countissuesperunit => 1,
    };
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-29'), 1, 'Mar 29 still 1' );
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-30'), 2, 'Mar 30 goes to 2' );

    # TEST CASE - 3 issue per 1 week
    $subscription = {
        periodicity => $freq_3i_1w,
        firstacquidate => '1972-02-03',
        countissuesperunit => 1,
    };
    $subscription->{countissuesperunit} = 3;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-09'), 3, 'Feb 9 still 3' );
    $subscription->{countissuesperunit} = 1;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-10'), 4, 'Feb 10 goes to 4' );
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '1' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '3' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '5' );

$subscription->{countissuesperunit} = 2;
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, '2' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, '4' );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, '6' );

# TEST CASE - 1 issue every 2 days, no irregularity
$frequency = {
    description   => "one issue every two days",
    unit          => 'day',
    issuesperunit => 1,
    unitsperissue => 2,
    # TEST CASE - 3 issue per day
    $subscription = {
        periodicity => $freq_3i_1d,
        firstacquidate => '1972-04-23',
        countissuesperunit => 1,
    };
    $subscription->{countissuesperunit} = 3;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-01'), 27, 'May 1 still 27' );
    $subscription->{countissuesperunit} = 1;
    is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-02'), 28, 'May 2 goes to 28' );
};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-04', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-05', $frequency );
is( $issueNumber, 3 );

# TEST CASE - 1 issue per week, no irregularity
$frequency = {
    description   => "one issue per week",
    unit          => 'week',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    firstacquidate     => '1970-01-01',
    irregularity       => '',
    countissuesperunit => 1,
};
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
is( $issueNumber, 1 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-08', $frequency );
is( $issueNumber, 2 );
$issueNumber =
  C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-15', $frequency );
is( $issueNumber, 3 );

$dbh->rollback;




    issuesperunit => 1,
    unitsperissue => 1,
};
my $id = AddSubscriptionFrequency($frequency);

my $subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
my $publisheddate = $subscription->{firstacquidate};

$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');

# TEST CASE - 1 issue per day, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',  # Skip the second and fourth issues
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-06');

# TEST CASE - 2 issues per day, no irregularity
$frequency = {
    description => "Two issues per day",
    unit => 'day',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');

# TEST CASE - 2 issues per day, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');

# TEST CASE - 1 issue every 2 days, no irregularity
$frequency = {
    description => "one issue every two days",
    unit => 'day',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-05');

# TEST CASE - 1 issue every 2 days, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-03');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');

# TEST CASE - 1 issue per week, no irregularity
$frequency = {
    description => "one issue per week",
    unit => 'week',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');

# TEST CASE - 1 issue per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-22');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');

# TEST CASE - 1 issue every 2 weeks, no irregularity
$frequency = {
    description => "one issue every 2 weeks",
    unit => 'week',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-12');

# TEST CASE - 1 issue every 2 weeks, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-12');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-26');

# TEST CASE - 2 issues per week, no irregularity
$frequency = {
    description => "two issues per week",
    unit => 'week',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
# when more than 1 issue per week, date is automatically set to the same day of
# week as firstacquidate
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-11');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-15');

# TEST CASE - 2 issues per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-04');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-11');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-22');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-25');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-29');

# TEST CASE - 6 issues per week, no irregularity
$frequency = {
    description => "six issues per week",
    unit => 'week',
    issuesperunit => 6,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-06',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-08');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-10');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-11');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-13');

# TEST CASE - 6 issues per week, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-06',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-07');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-09');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-13');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-14');

# TEST CASE - 1 issue per month, no irregularity
$frequency = {
    description => "1 issue per month",
    unit => 'month',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-01');

# TEST CASE - 1 issue per month, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-06-01');

# TEST CASE - 1 issue every 2 months, no irregularity
$frequency = {
    description => "1 issue every 2 months",
    unit => 'month',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-01');

# TEST CASE - 1 issue every 2 months, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;3',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-09-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-11-01');

# TEST CASE - 2 issues per month, no irregularity
$frequency = {
    description => "2 issues per month",
    unit => 'month',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-16', 'January has 31 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-16', 'February has only 28 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-03-01');

# TEST CASE - 2 issues per month, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-01-16', 'January has 31 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-02-16', 'February has only 28 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-04-16', 'April has 30 days');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-05-01');

# TEST CASE - 1 issue per year, no irregularity
$frequency = {
    description => "1 issue per year",
    unit => 'year',
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-01-01');

# TEST CASE - 1 issue per year, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1975-01-01');

# TEST CASE - 1 issue every 2 years, no irregularity
$frequency = {
    description => "1 issue every 2 years",
    unit => 'year',
    issuesperunit => 1,
    unitsperissue => 2,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1976-01-01');

# TEST CASE - 1 issue every 2 years, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '2;4',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1978-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1980-01-01');
# Move publisheddate to Feb 29 (leap year 1980)
$publisheddate = '1980-02-29';
$publisheddate = GetNextDate( $subscription, $publisheddate, $frequency );
is( $publisheddate, '1982-02-28', 'Test +2 year from Feb 29' );

# TEST CASE - 2 issues per year, no irregularity
$frequency = {
    description => "1 issue every 2 years",
    unit => 'year',
    issuesperunit => 2,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1972-01-01');

# TEST CASE - 2 issues per year, irregularities
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '3;5;6',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1970-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1971-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-01-01');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1973-07-02');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, '1974-01-01');

# TEST CASE - 9 issues per year, dates spread throughout month
$frequency = {
    description => "9 issues per year",
    unit => 'year',
    issuesperunit => 9,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-08-10',
    irregularity => '',
    countissuesperunit => 1,
};
my @dates = ( $subscription->{firstacquidate} );
foreach(1..27) {
    push @dates, GetNextDate( $subscription, $dates[-1], $frequency );
}
is( $dates[9],  '1971-08-10', 'Freq 9/yr, 1 year passed' );
is( $dates[18], '1972-08-10', 'Freq 9/yr, 2 years passed (leap year)' );
is( $dates[27], '1973-08-10', 'Freq 9/yr, 3 years passed' );
# Keep (first) position in cycle, but shift back 9 days
is( GetNextDate( $subscription, '1973-08-01', $frequency ), '1973-09-10', 'Back 9 days, without annual correction' );
# Set position to last in cycle, and shift back 9 days; annual correction
$subscription->{countissuesperunit} = 9;
is( GetNextDate( $subscription, '1973-08-01', $frequency ), '1973-09-15', 'Last in cycle, back 9 days, expect annual correction' );

# TEST CASE - Irregular
$frequency = {
    description => "Irregular",
    unit => undef,
    issuesperunit => 1,
    unitsperissue => 1,
};
$subscription = {
    periodicity => $id,
    firstacquidate => '1970-01-01',
    irregularity => '',
    countissuesperunit => 1,
};
$publisheddate = $subscription->{firstacquidate};
# GetNextDate always return undef if subscription is irregular
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
is($publisheddate, undef);

# GetNextDate returns undef if one of two first parameters is undef
$publisheddate = GetNextDate($subscription, undef, $frequency);
is($publisheddate, undef);
$publisheddate = GetNextDate(undef, $subscription->{firstacquidate}, $frequency);
is($publisheddate, undef);
$publisheddate = GetNextDate(undef, undef, $frequency);
is($publisheddate, undef);

$schema->storage->txn_rollback;




};
my $publisheddate = $subscription->{firstacquidate};

my $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: 3');

# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Tuesday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Friday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Sunday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Monday');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Tuesday');

# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: March');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: September');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: January');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: March');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: May');

# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Summer');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Spring');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Fall');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Winter');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'X: Spring');

# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 1, X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 1');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 2, X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Y: 3, X: 1');

# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4


$publisheddate = $subscription->{firstacquidate};

$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 1, X: 2');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 1');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 1, Y: 2, X: 4');
for (1..100) {
    $publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
    $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
}
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 1');
# 110th is here
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 3');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 4, X: 4');
$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
is($seq, 'Z: 4, Y: 5, X: 1');


$dbh->rollback;

sub _next_seq {
    my ($subscription, $pattern, $frequency, $publisheddate) = @_;
    my $seq;
    ($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},
        $subscription->{lastvalue3}, $subscription->{innerloop1},
        $subscription->{innerloop2}, $subscription->{innerloop3}) =
            GetNextSeq($subscription, $pattern, $frequency, $publisheddate);
    return $seq;
}
- 

Return to bug 17047

Lines 871-889 sub GetDistributedTo { Link Here

(-)a/C4/Serials.pm (-19 / +20 lines)
871	my (	871	my (
872	$nextseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	872	$nextseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
873	$newinnerloop1, $newinnerloop2, $newinnerloop3	873	$newinnerloop1, $newinnerloop2, $newinnerloop3
874	) = GetNextSeq( $subscription, $pattern, $planneddate );	874	) = GetNextSeq( $subscription, $pattern, $frequency, $planneddate );
875		875
876	$subscription is a hashref containing all the attributes of the table	876	$subscription is a hashref containing all the attributes of the table
877	'subscription'.	877	'subscription'.
878	$pattern is a hashref containing all the attributes of the table	878	$pattern is a hashref containing all the attributes of the table
879	'subscription_numberpatterns'.	879	'subscription_numberpatterns'.
		880	$frequency is a hashref containing all the attributes of the table 'subscription_frequencies'
880	$planneddate is a date string in iso format.	881	$planneddate is a date string in iso format.
881	This function get the next issue for the subscription given on input arg	882	This function get the next issue for the subscription given on input arg
882		883
883	=cut	884	=cut
884		885
885	sub GetNextSeq {	886	sub GetNextSeq {
886	my ($subscription, $pattern, $planneddate) = @_;	887	my ($subscription, $pattern, $frequency, $planneddate) = @_;
887		888
888	return unless ($subscription and $pattern);	889	return unless ($subscription and $pattern);
889		890
Lines 896-902 sub GetNextSeq { Link Here
896	if(@irreg > 0) {	897	if(@irreg > 0) {
897	my $irregularities = {};	898	my $irregularities = {};
898	$irregularities->{$_} = 1 foreach(@irreg);	899	$irregularities->{$_} = 1 foreach(@irreg);
899	my $issueno = GetFictiveIssueNumber($subscription, $planneddate) + 1;	900	my $issueno = GetFictiveIssueNumber($subscription, $planneddate, $frequency) + 1;
900	while($irregularities->{$issueno}) {	901	while($irregularities->{$issueno}) {
901	$count++;	902	$count++;
902	$issueno++;	903	$issueno++;
Lines 1039-1045 sub GetExpirationDate { Link Here
1039		1040
1040	#calculate the date of the last issue.	1041	#calculate the date of the last issue.
1041	for ( my $i = 1 ; $i <= $length ; $i++ ) {	1042	for ( my $i = 1 ; $i <= $length ; $i++ ) {
1042	$enddate = GetNextDate( $subscription, $enddate );	1043	$enddate = GetNextDate( $subscription, $enddate, $frequency );
1043	}	1044	}
1044	} elsif ( $subscription->{monthlength} ) {	1045	} elsif ( $subscription->{monthlength} ) {
1045	if ( $$subscription{startdate} ) {	1046	if ( $$subscription{startdate} ) {
Lines 1191-1206 sub ModSerialStatus { Link Here
1191	if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {	1192	if ( !$otherIssueExpected && $oldstatus == EXPECTED && $status != EXPECTED ) {
1192	my $subscription = GetSubscription($subscriptionid);	1193	my $subscription = GetSubscription($subscriptionid);
1193	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});	1194	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
		1195	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
1194		1196
1195	# next issue number	1197	# next issue number
1196	my (	1198	my (
1197	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	1199	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
1198	$newinnerloop1, $newinnerloop2, $newinnerloop3	1200	$newinnerloop1, $newinnerloop2, $newinnerloop3
1199	)	1201	)
1200	= GetNextSeq( $subscription, $pattern, $publisheddate );	1202	= GetNextSeq( $subscription, $pattern, $frequency, $publisheddate );
1201		1203
1202	# next date (calculated from actual date & frequency parameters)	1204	# next date (calculated from actual date & frequency parameters)
1203	my $nextpublisheddate = GetNextDate($subscription, $publisheddate, 1);	1205	my $nextpublisheddate = GetNextDate($subscription, $publisheddate, $frequency, 1);
1204	my $nextpubdate = $nextpublisheddate;	1206	my $nextpubdate = $nextpublisheddate;
1205	$query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?	1207	$query = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
1206	WHERE subscriptionid = ?";	1208	WHERE subscriptionid = ?";
Lines 1409-1415 sub NewSubscription { Link Here
1409	$innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity,	1411	$innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity,
1410	$numberpattern, $locale, $callnumber, $manualhistory, $internalnotes,	1412	$numberpattern, $locale, $callnumber, $manualhistory, $internalnotes,
1411	$serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,	1413	$serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
1412	$location, $enddate, $skip_serialseq, $itemtype, $previousitemtype	1414	$location, $enddate, $skip_serialseq, $itemtype, $previousitemtype, $mana_id
1413	) = @_;	1415	) = @_;
1414	my $dbh = C4::Context->dbh;	1416	my $dbh = C4::Context->dbh;
1415		1417
Lines 1423-1430 sub NewSubscription { Link Here
1423	irregularity, numberpattern, locale, callnumber,	1425	irregularity, numberpattern, locale, callnumber,
1424	manualhistory, internalnotes, serialsadditems, staffdisplaycount,	1426	manualhistory, internalnotes, serialsadditems, staffdisplaycount,
1425	opacdisplaycount, graceperiod, location, enddate, skip_serialseq,	1427	opacdisplaycount, graceperiod, location, enddate, skip_serialseq,
1426	itemtype, previousitemtype)	1428	itemtype, previousitemtype, mana_id)
1427	VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)	1429	VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?, ?)
1428	\|;	1430	\|;
1429	my $sth = $dbh->prepare($query);	1431	my $sth = $dbh->prepare($query);
1430	$sth->execute(	1432	$sth->execute(
Lines 1435-1441 sub NewSubscription { Link Here
1435	$firstacquidate, $irregularity, $numberpattern, $locale, $callnumber,	1437	$firstacquidate, $irregularity, $numberpattern, $locale, $callnumber,
1436	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,	1438	$manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
1437	$opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq,	1439	$opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq,
1438	$itemtype, $previousitemtype	1440	$itemtype, $previousitemtype, $mana_id
1439	);	1441	);
1440		1442
1441	my $subscriptionid = $dbh->{'mysql_insertid'};	1443	my $subscriptionid = $dbh->{'mysql_insertid'};
Lines 2166-2172 sub abouttoexpire { Link Here
2166	my $expirationdate = GetExpirationDate($subscriptionid);	2168	my $expirationdate = GetExpirationDate($subscriptionid);
2167		2169
2168	my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);	2170	my ($res) = $dbh->selectrow_array('select max(planneddate) from serial where subscriptionid = ?', undef, $subscriptionid);
2169	my $nextdate = GetNextDate($subscription, $res);	2171	my $nextdate = GetNextDate($subscription, $res, $frequency);
2170		2172
2171	# only compare dates if both dates exist.	2173	# only compare dates if both dates exist.
2172	if ($nextdate and $expirationdate) {	2174	if ($nextdate and $expirationdate) {
Lines 2232-2238 sub GetSubscriptionsFromBorrower { Link Here
2232		2234
2233	=head2 GetFictiveIssueNumber	2235	=head2 GetFictiveIssueNumber
2234		2236
2235	$issueno = GetFictiveIssueNumber($subscription, $publishedate);	2237	$issueno = GetFictiveIssueNumber($subscription, $publishedate, $frequency);
2236		2238
2237	Get the position of the issue published at $publisheddate, considering the	2239	Get the position of the issue published at $publisheddate, considering the
2238	first issue (at firstacquidate) is at position 1, the next is at position 2, etc...	2240	first issue (at firstacquidate) is at position 1, the next is at position 2, etc...
Lines 2251-2259 date (in GetNextDate) or the next issue number (in GetNextSeq). Link Here
2251	=cut	2253	=cut
2252		2254
2253	sub GetFictiveIssueNumber {	2255	sub GetFictiveIssueNumber {
2254	my ($subscription, $publisheddate) = @_;	2256	my ($subscription, $publisheddate, $frequency) = @_;
2255		2257
2256	my $frequency = GetSubscriptionFrequency($subscription->{'periodicity'});
2257	my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;	2258	my $unit = $frequency->{unit} ? lc $frequency->{'unit'} : undef;
2258	return if !$unit;	2259	return if !$unit;
2259	my $issueno;	2260	my $issueno;
Lines 2397-2408 sub _get_next_date_year { Link Here
2397		2398
2398	=head2 GetNextDate	2399	=head2 GetNextDate
2399		2400
2400	$resultdate = GetNextDate($publisheddate,$subscription)	2401	$resultdate = GetNextDate($publisheddate,$subscription,$freqdata,$updatecount)
2401		2402
2402	this function it takes the publisheddate and will return the next issue's date	2403	this function it takes the publisheddate and will return the next issue's date
2403	and will skip dates if there exists an irregularity.	2404	and will skip dates if there exists an irregularity.
2404	$publisheddate has to be an ISO date	2405	$publisheddate has to be an ISO date
2405	$subscription is a hashref containing at least 'periodicity', 'firstacquidate', 'irregularity', and 'countissuesperunit'	2406	$subscription is a hashref containing at least 'firstacquidate', 'irregularity', and 'countissuesperunit'
		2407	$frequency is a hashref containing frequency informations
2406	$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database	2408	$updatecount is a boolean value which, when set to true, update the 'countissuesperunit' in database
2407	- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be	2409	- eg if periodicity is monthly and $publisheddate is 2007-02-10 but if March and April is to be
2408	skipped then the returned date will be 2007-05-10	2410	skipped then the returned date will be 2007-05-10
Lines 2415-2425 Return undef if subscription is irregular Link Here
2415	=cut	2417	=cut
2416		2418
2417	sub GetNextDate {	2419	sub GetNextDate {
2418	my ( $subscription, $publisheddate, $updatecount ) = @_;	2420	my ( $subscription, $publisheddate, $freqdata, $updatecount ) = @_;
2419		2421
2420	return unless $subscription and $publisheddate;	2422	return unless $subscription and $publisheddate;
2421		2423
2422	my $freqdata = GetSubscriptionFrequency($subscription->{'periodicity'});
2423		2424
2424	if ($freqdata->{'unit'}) {	2425	if ($freqdata->{'unit'}) {
2425	my ( $year, $month, $day ) = split /-/, $publisheddate;	2426	my ( $year, $month, $day ) = split /-/, $publisheddate;
Lines 2439-2445 sub GetNextDate { Link Here
2439		2440
2440	# Get the 'fictive' next issue number	2441	# Get the 'fictive' next issue number
2441	# It is used to check if next issue is an irregular issue.	2442	# It is used to check if next issue is an irregular issue.
2442	my $issueno = GetFictiveIssueNumber($subscription, $publisheddate) + 1;	2443	my $issueno = GetFictiveIssueNumber($subscription, $publisheddate, $freqdata) + 1;
2443		2444
2444	# Then get the next date	2445	# Then get the next date
2445	my $unit = lc $freqdata->{'unit'};	2446	my $unit = lc $freqdata->{'unit'};

Line 0 Link Here

(-)a/Koha/SharedContent.pm (+90 lines)
		1	package Koha::SharedContent;
		2
		3	# Copyright 2016 BibLibre Morgane Alonso
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 3 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	use Modern::Perl;
		21	use JSON;
		22	use HTTP::Request;
		23	use LWP::UserAgent;
		24
		25	our $MANA_IP = "http://10.25.159.107:5000";
		26
		27	sub manaRequest {
		28	my $mana_request = shift;
		29	my $result;
		30
		31	$mana_request->content_type('application/json');
		32	my $userAgent = LWP::UserAgent->new;
		33	my $response = $userAgent->request($mana_request);
		34
		35	if ( $response->code ne "204" ) {
		36	$result = from_json( $response->decoded_content );
		37	}
		38	$result->{code} = $response->code;
		39
		40	return $result if ( $response->code =~ /^2..$/ );
		41	}
		42
		43	sub manaNewUserPatchRequest {
		44	my $resource = shift;
		45	my $id = shift;
		46
		47	my $url = "$MANA_IP/$resource/$id.json/newUser";
		48	my $request = HTTP::Request->new( PATCH => $url );
		49
		50	return manaRequest($request);
		51	}
		52
		53	sub manaPostRequest {
		54	my $resource = shift;
		55	my $content = shift;
		56
		57	my $url = "$MANA_IP/$resource.json";
		58	my $request = HTTP::Request->new( POST => $url );
		59
		60	$content->{bulk_import} = 0;
		61	my $json = to_json( $content, { utf8 => 1 } );
		62	$request->content($json);
		63
		64	return manaRequest($request);
65	}
66
67	sub manaGetRequestWithId {
68	my $resource = shift;
69	my $id = shift;
70
71	my $url = "$MANA_IP/$resource/$id.json";
72	my $request = HTTP::Request->new( GET => $url );
73
74	return manaRequest($request);
75	}
76
77	sub manaGetRequest {
78	my $resource = shift;
79	my $parameters = shift;
80
81	$parameters = join '&',
82	map { defined $parameters->{$_} ? $_ . "=" . $parameters->{$_} : () }
83	keys %$parameters;
84	my $url = "$MANA_IP/$resource.json?$parameters";
85	my $request = HTTP::Request->new( GET => $url );
86
87	return manaRequest($request);
88	}
89
90	1;

Line 0 Link Here

(-)a/Koha/Subscription/Frequencies.pm (+57 lines)
	1	package Koha::Subscription::Frequencies;
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 3 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21	use Koha::Database;
	22	use Koha::Subscription::Frequency;
	23	use base qw(Koha::Objects);
	24
	25	=head1 NAME
	26
	27	Koha::Subscription::Frequencies - Koha Subscription::Frequency object set class
	28
	29	=head1 API
	30
	31	=head2 Class Methods
	32
	33	=cut
	34
	35	=head3 type
	36
	37	=cut
	38
	39	sub _type {
	40	return 'SubscriptionFrequency';
	41	}
	42
	43	=head3 object_class
	44
	45	=cut
	46
	47	sub object_class {
	48	return 'Koha::Subscription::Frequency';
	49	}
	50
	51	=head1 AUTHOR
	52
	53	Morgane Alonso <morgane.alonso@biblibre.com>
	54
	55	=cut
	56
	57	1;

Line 0 Link Here

(-)a/Koha/Subscription/Frequency.pm (+48 lines)
	1	package Koha::Subscription::Frequency;
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 3 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21	use Koha::Database;
	22	use base qw(Koha::Object);
	23
	24	=head1 NAME
	25
	26	Koha::Subscription::Frequency - Koha Subscription::Frequency Object class
	27
	28	=head1 API
	29
	30	=head2 Class Methods
	31
	32	=cut
	33
	34	=head3 type
	35
	36	=cut
	37
	38	sub _type {
	39	return 'SubscriptionFrequency';
	40	}
	41
	42	=head1 AUTHOR
	43
	44	Morgane Alonso <morgane.alonso@biblibre.com>
	45
	46	=cut
	47
	48	1;

Line 0 Link Here

(-)a/Koha/Subscription/Numberpattern.pm (+48 lines)
	1	package Koha::Subscription::Numberpattern;
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it under the
	8	# terms of the GNU General Public License as published by the Free Software
	9	# Foundation; either version 3 of the License, or (at your option) any later
	10	# version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
	13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
	14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License along
	17	# with Koha; if not, write to the Free Software Foundation, Inc.,
	18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
	19
	20	use Modern::Perl;
	21	use Koha::Database;
	22	use base qw(Koha::Object);
	23
	24	=head1 NAME
	25
	26	Koha::SubscriptionNumberpattern - Koha SubscriptionNumberpattern Object class
	27
	28	=head1 API
	29
	30	=head2 Class Methods
	31
	32	=cut
	33
	34	=head3 type
	35
	36	=cut
	37
	38	sub _type {
	39	return 'SubscriptionNumberpattern';
	40	}
	41
	42	=head1 AUTHOR
	43
	44	Morgane Alonso <morgane.alonso@biblibre.com>
	45
	46	=cut
	47
	48	1;

Line 0 Link Here

(-)a/Koha/Subscription/Numberpatterns.pm (+77 lines)
		1	package Koha::Subscription::Numberpatterns;
		2
		3	# Copyright 2016 BibLibre Morgane Alonso
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 3 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License along
		17	# with Koha; if not, write to the Free Software Foundation, Inc.,
		18	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		19
		20	use Modern::Perl;
		21	use Koha::Database;
		22	use Koha::Subscription::Numberpattern;
		23	use base qw(Koha::Objects);
		24
		25	=head1 NAME
		26
		27	Koha::SubscriptionNumberpatterns - Koha SubscriptionNumberpattern object set class
		28
		29	=head1 API
		30
		31	=head2 Class Methods
		32
		33	=cut
		34
		35	=head3 uniqeLabel
		36
		37	=cut
		38
		39	sub uniqueLabel {
		40	my ($self, $label) = @_;
		41
		42	my $samelabel = Koha::Subscription::Numberpatterns->search({label => $label})->next();
		43	if ($samelabel) {
		44	my $i = 2;
		45	my $newlabel = $samelabel->label . " ($i)";
		46	while (my $othersamelabel = $self->search({label => $newlabel})->next()) {
		47	$i++;
		48	$newlabel = $samelabel->label . " ($i)";
		49	}
		50	$label = $newlabel;
		51	}
		52	return $label;
		53	}
		54
		55	=head3 type
		56
		57	=cut
		58
		59	sub _type {
		60	return 'SubscriptionNumberpattern';
		61	}
		62
		63	=head3 object_class
		64
65	=cut
66
67	sub object_class {
68	return 'Koha::Subscription::Numberpattern';
69	}
70
71	=head1 AUTHOR
72
73	Morgane Alonso <morgane.alonso@biblibre.com>
74
75	=cut
76
77	1;

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/mana-subscription-search-result.inc (+46 lines)
	1	[% USE KohaDates %]
	2	<table id="mana_results_datatable">
	3	<thead>
	4	<tr>
	5	<th>ISSN</th>
	6	<th class="anti-the">Title</th>
	7	<th>Frequency</th>
	8	<th>Numbering pattern</th>
	9	<th class="NoSort">Number of users</th>
	10	<th class="title-string">Last Import</th>
	11	[% UNLESS search_only %]
	12	<th class="NoSort">Actions</th>
	13	[% END %]
	14	</tr>
	15	</thead>
	16	<tfoot>
	17	<tr>
	18	<td><input type="text" class="dt-filter" data-column_num="0" placeholder="Search ISSN" /></td>
	19	<td><input type="text" class="dt-filter" data-column_num="1" placeholder="Search title" /></td>
	20	<td><input type="text" class="dt-filter" data-column_num="2" placeholder="Search frequency" /></td>
	21	<td><input type="text" class="dt-filter" data-column_num="3" placeholder="Search numbering pattern" /></td>
	22	<td></td>
	23	<td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search last import" /></td>
	24	[% UNLESS search_only %]
	25	<td></td>
	26	[% END %]
	27	</tr>
	28	</tfoot>
	29	<tbody>
	30	[% FOREACH subscription IN subscriptions %]
	31	[% UNLESS subscription.cannotdisplay %]
	32	<tr id="row[% subscription.subscriptionid %]">
	33	<td>[% IF ( subscription.issn ) %][% subscription.issn %][% END %]</td>
	34	<td>[% subscription.title %]</a></td>
	35	<td>[% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %]</td>
	36	<td>[% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %]</td>
	37	<td>[% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %]</td>
	38	<td><span title="[% subscription.lastimport %]">[% subscription.lastimport \| $KohaDates %]</span></td>
	39	[% UNLESS search_only %]
	40	<td><a style="cursor:pointer" onclick="mana_use([% subscription.id %])"> <i class="fa fa-inbox"></i> Use</a></td>
	41	[% END %]
	42	</tr>
	43	[% END %]
	44	[% END %]
	45	</tbody>
	46	</table>

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-7 / +66 lines)
1	[% USE AuthorisedValues %]	1	[% USE AuthorisedValues %]
2	[% USE Branches %]	2	[% USE Branches %]
3	[% USE KohaDates %]	3	[% USE KohaDates %]
		4	[% USE Koha %]
4	[% SET footerjs = 1 %]	5	[% SET footerjs = 1 %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Koha &rsaquo; Serials [% biblionumber %]</title>	7	<title>Koha &rsaquo; Serials [% biblionumber %]</title>
Lines 92-97 Link Here
92	[% END %]	93	[% END %]
93	</ol>	94	</ol>
94	<input type="hidden" name="searched" value="1" />	95	<input type="hidden" name="searched" value="1" />
		96	[% IF ( mana ) %]<input type="hidden" name="mana" value="1" />[% END %]
95	<fieldset class="action">	97	<fieldset class="action">
96	<input type="submit" value="Search" />	98	<input type="submit" value="Search" />
97	</fieldset>	99	</fieldset>
Lines 99-111 Link Here
99	</form>	101	</form>
100	</div>	102	</div>
101	[% END %]	103	[% END %]
102	[% IF ( done_searched ) %]	104	[% IF ( done_searched ) %]
103	[% IF ( total ) %]	105	[% IF ( total ) %]
104	<div id="serialstabs" class="toptabs" style="clear:both;">	106	<div id="serialstabs" class="toptabs" style="clear:both;">
105	<ul class="ui-tabs-nav">	107	<ul class="ui-tabs-nav">
106	<li><a href="#opened">Open ([% openedsubscriptions.size \|\| 0 %])</a></li>	108	[% IF mana %]
107	<li><a href="#closed">Closed ([% closedsubscriptions.size \|\| 0 %])</a></li>	109	<li><a href="#mana">Mana ([% total \|\| 0 %])</a></li>
108	</ul>	110	[% ELSE %]
		111	<li><a href="#opened">Open ([% openedsubscriptions.size \|\| 0 %])</a></li>
		112	<li><a href="#closed">Closed ([% closedsubscriptions.size \|\| 0 %])</a></li>
		113	[% END %]
		114	</ul>
		115	[% IF mana %]
		116	<div id="mana">
		117	[% INCLUDE 'mana-subscription-search-result.inc' %]
		118	</div>
		119	[% ELSE %]
109	<div id="opened">	120	<div id="opened">
110	[% IF openedsubscriptions %]	121	[% IF openedsubscriptions %]
111	<table id="osrlt">	122	<table id="osrlt">
Lines 323-328 Link Here
323	</div>	334	</div>
324	[% END %]	335	[% END %]
325	</div>	336	</div>
		337	[% END %]
326	</div>	338	</div>
327	[% ELSE %]	339	[% ELSE %]
328	<div class="dialog message">	340	<div class="dialog message">
Lines 336-341 Link Here
336	<div class="yui-b">	348	<div class="yui-b">
337	[% INCLUDE 'serials-menu.inc' %]	349	[% INCLUDE 'serials-menu.inc' %]
338	[% IF ( done_searched ) %]	350	[% IF ( done_searched ) %]
		351	[% UNLESS ( mana ) %]
339	<div id="advsearch">	352	<div id="advsearch">
340	<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">	353	<form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
341	<fieldset class="brief">	354	<fieldset class="brief">
Lines 408-417 Link Here
408	<fieldset class="action">	421	<fieldset class="action">
409	<input type="submit" value="Search" />	422	<input type="submit" value="Search" />
410	</fieldset>	423	</fieldset>
		424
411	</div>	425	</div>
412	</fieldset>	426	</fieldset>
413	</form>	427	</form>
414	[% END %]	428	[% END %]
		429	[% END %]
415	</div>	430	</div>
416	</div>	431	</div>
417		432
Lines 452-457 Link Here
452	$("#reopensub").click(function(){	467	$("#reopensub").click(function(){
453	return confirm(_("Are you sure you want to reopen this subscription?"));	468	return confirm(_("Are you sure you want to reopen this subscription?"));
454	});	469	});
		470	var manarlt = $("#mana_results_datatable").dataTable($.extend(true, {}, dataTablesDefaults, {
		471	"sPaginationType": "four_button",
		472	"aoColumnDefs": [
		473	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
		474	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		475	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		476	]
		477	}));
		478	var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
		479	"sPaginationType": "four_button",
		480	"aoColumnDefs": [
		481	{ 'bSortable': false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
		482	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
		483	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		484	]
		485	}));
		486
		487	var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
		488	"sPaginationType": "four_button",
		489	"aoColumnDefs": [
		490	{ 'bSortable': false, 'aTargets': [ 'NoSort' ] },
		491	{ 'sType': "anti-the", 'aTargets' : [ 'anti-the'] }
		492	]
		493	} ) );
		494
		495	manarlt.fnAddFilters("dt-filter", 750);
		496	osrlt.fnAddFilters("dt-filter", 750);
		497	csrlt.fnAddFilters("dt-filter", 750);
		498
		499	$('#serialstabs').tabs();
		500	$("#reopensub").click(function(){
		501	return confirm(_("Are you sure you want to reopen this subscription?"));
		502	});
		503	[% IF ( mana ) %]
		504	$("label[for=callnumber], input#callnumber").hide();
		505	$("label[for=bookseller], input#bookseller").hide();
		506	$("label[for=branch], select#branch").hide();
		507	$("label[for=to], input#to").hide();
		508	$(".ui-datepicker-trigger").hide();
		509	$("label[for=location], select#location_filter").hide();
		510	[% FOR field IN additional_fields_for_subscription %]
		511	$("label[for=additional_field_[% field.id %]], input#additional_field_[% field.id %]").hide();
		512	[% END %]
		513	[% END %]
455	});	514	});
456	</script>	515	</script>
457	[% END %]	516	[% END %]

Lines 18-24 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +13 lines)
18	<div id="bd">	18	<div id="bd">
19	<div id="yui-main">	19	<div id="yui-main">
20	<div class="yui-b">	20	<div class="yui-b">
21	[% INCLUDE 'serials-toolbar.inc' %]	21	[% INCLUDE 'serials-toolbar.inc' mana_id = mana_id %]
22		22
23	<h1>Subscription for [% bibliotitle%] [% IF closed %](closed)[% END %]</h1>	23	<h1>Subscription for [% bibliotitle%] [% IF closed %](closed)[% END %]</h1>
24	[% IF ( abouttoexpire ) %]	24	[% IF ( abouttoexpire ) %]
Lines 47-53 Link Here
47	</form>	47	</form>
48		48
49	</div>	49	</div>
50	[% END %] <!-- NEEDSCONFIRMATION -->	50	[% END %] <!-- NEEDSCONFIRMATION -->
		51	[% IF mana_code.defined %]
		52	<div id="alert-community" class="dialog message">
		53	<p>
		54	[% IF (mana_code == 201) %]
		55	The export is done, thank you for your contribution.
		56	[% ELSIF (mana_code == 200) %]
		57	The model already exists on Mana, thank you for your contribution.
		58	[% END %]
		59	</p>
		60	</div>
		61	[% END %]
51		62
52	<div id="subscription_description" class="toptabs">	63	<div id="subscription_description" class="toptabs">
53	<ul class="ui-tabs-nav">	64	<ul class="ui-tabs-nav">

Lines 74-87 if($op eq 'gennext' && @subscriptionid){ Link Here

(-)a/serials/serials-collection.pl (-2 / +4 lines)
74	require C4::Serials::Numberpattern;	74	require C4::Serials::Numberpattern;
75	my $subscription = GetSubscription($subscriptionid);	75	my $subscription = GetSubscription($subscriptionid);
76	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});	76	my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
		77	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
77	my $expected = GetNextExpected($subscriptionid);	78	my $expected = GetNextExpected($subscriptionid);
78	my (	79	my (
79	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,	80	$newserialseq, $newlastvalue1, $newlastvalue2, $newlastvalue3,
80	$newinnerloop1, $newinnerloop2, $newinnerloop3	81	$newinnerloop1, $newinnerloop2, $newinnerloop3
81	) = GetNextSeq($subscription, $pattern, $expected->{publisheddate});	82	) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
82		83
83	## We generate the next publication date	84	## We generate the next publication date
84	my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);	85	my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
		86	my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
85	## Creating the new issue	87	## Creating the new issue
86	NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},	88	NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
87	1, $nextpublisheddate, $nextpublisheddate );	89	1, $nextpublisheddate, $nextpublisheddate );

Lines 38-43 use C4::Serials; Link Here

(-)a/serials/serials-search.pl (-36 / +86 lines)
38	use Koha::AdditionalField;	38	use Koha::AdditionalField;
39		39
40	use Koha::DateUtils;	40	use Koha::DateUtils;
		41	use Koha::SharedContent;
41		42
42	my $query = new CGI;	43	my $query = new CGI;
43	my $title = $query->param('title_filter') \|\| '';	44	my $title = $query->param('title_filter') \|\| '';
Lines 52-57 my $location = $query->param('location_filter') \|\| ''; Link Here
52	my $expiration_date = $query->param('expiration_date_filter') \|\| '';	53	my $expiration_date = $query->param('expiration_date_filter') \|\| '';
53	my $routing = $query->param('routing') \|\| C4::Context->preference("RoutingSerials");	54	my $routing = $query->param('routing') \|\| C4::Context->preference("RoutingSerials");
54	my $searched = $query->param('searched') \|\| 0;	55	my $searched = $query->param('searched') \|\| 0;
		56	my $mana = $query->param('mana') \|\| 0;
55	my @subscriptionids = $query->multi_param('subscriptionid');	57	my @subscriptionids = $query->multi_param('subscriptionid');
56	my $op = $query->param('op');	58	my $op = $query->param('op');
57		59
Lines 95-101 for my $field ( @$additional_fields ) { Link Here
95	my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;	97	my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
96	my @subscriptions;	98	my @subscriptions;
97	if ($searched){	99	if ($searched){
98	@subscriptions = SearchSubscriptions(	100	if ($mana) {
		101	my $result = Koha::SharedContent::manaGetRequest("subscription",{
		102	title => $title,
		103	issn => $ISSN,
		104	ean => $EAN,
		105	publisher => $publisher
		106	});
		107	@subscriptions = @{ $result->{data} };
		108	}
		109	else {
		110	@subscriptions = SearchSubscriptions(
99	{	111	{
100	biblionumber => $biblionumber,	112	biblionumber => $biblionumber,
101	title => $title,	113	title => $title,
Lines 108-153 if ($searched){ Link Here
108	additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],	120	additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
109	location => $location,	121	location => $location,
110	expiration_date => $expiration_date_dt,	122	expiration_date => $expiration_date_dt,
111	}	123	});
112	);	124	}
113	}	125	}
114		126
115	# to toggle between create or edit routing list options	127	if ($mana) {
116	if ($routing) {	128	$template->param(
117	for my $subscription ( @subscriptions) {	129	subscriptions => \@subscriptions,
118	$subscription->{routingedit} = check_routing( $subscription->{subscriptionid} );	130	total => scalar @subscriptions,
119	}	131	title_filter => $title,
		132	ISSN_filter => $ISSN,
		133	EAN_filter => $EAN,
		134	callnumber_filter => $callnumber,
		135	publisher_filter => $publisher,
		136	bookseller_filter => $bookseller,
		137	branch_filter => $branch,
		138	location_filter => $location,
		139	expiration_date_filter => $expiration_date_dt,
		140	done_searched => $searched,
		141	routing => $routing,
		142	additional_field_filters => $additional_field_filters,
		143	additional_fields_for_subscription => $additional_fields,
		144	marcflavour => (uc(C4::Context->preference("marcflavour"))),
		145	mana => $mana,
		146	search_only => 1
		147	);
120	}	148	}
		149	else
		150	{
		151	# to toggle between create or edit routing list options
		152	if ($routing) {
		153	for my $subscription ( @subscriptions) {
		154	$subscription->{routingedit} = check_routing( $subscription->{subscriptionid} );
		155	}
		156	}
121		157
122	my (@openedsubscriptions, @closedsubscriptions);	158	my (@openedsubscriptions, @closedsubscriptions);
123	for my $sub ( @subscriptions ) {	159	for my $sub ( @subscriptions ) {
124	unless ( $sub->{closed} ) {	160	unless ( $sub->{closed} ) {
125	push @openedsubscriptions, $sub	161	push @openedsubscriptions, $sub
126	unless $sub->{cannotdisplay};	162	unless $sub->{cannotdisplay};
127	} else {	163	} else {
128	push @closedsubscriptions, $sub	164	push @closedsubscriptions, $sub
129	unless $sub->{cannotdisplay};	165	unless $sub->{cannotdisplay};
		166	}
130	}	167	}
131	}
132		168
133	$template->param(	169	my @branches = Koha::Libraries->search( {}, { order_by => ['branchcode'] } );
134	openedsubscriptions => \@openedsubscriptions,	170	my @branches_loop;
135	closedsubscriptions => \@closedsubscriptions,	171	foreach my $b ( @branches ) {
136	total => @openedsubscriptions + @closedsubscriptions,	172	my $selected = 0;
137	title_filter => $title,	173	$selected = 1 if( defined $branch and $branch eq $b->branchcode );
138	ISSN_filter => $ISSN,	174	push @branches_loop, {
139	EAN_filter => $EAN,	175	branchcode => $b->branchcode,
140	callnumber_filter => $callnumber,	176	branchname => $b->branchname,
141	publisher_filter => $publisher,	177	selected => $selected,
142	bookseller_filter => $bookseller,	178	};
143	branch_filter => $branch,	179	}
144	location_filter => $location,
145	expiration_date_filter => $expiration_date_dt,
146	done_searched => $searched,
147	routing => $routing,
148	additional_field_filters => $additional_field_filters,
149	additional_fields_for_subscription => $additional_fields,
150	marcflavour => (uc(C4::Context->preference("marcflavour")))
151	);
152		180
		181	$template->param(
		182	openedsubscriptions => \@openedsubscriptions,
		183	closedsubscriptions => \@closedsubscriptions,
		184	total => @openedsubscriptions + @closedsubscriptions,
		185	title_filter => $title,
		186	ISSN_filter => $ISSN,
		187	EAN_filter => $EAN,
		188	callnumber_filter => $callnumber,
		189	publisher_filter => $publisher,
		190	bookseller_filter => $bookseller,
		191	branch_filter => $branch,
		192	location_filter => $location,
		193	expiration_date_filter => $expiration_date_dt,
		194	branches_loop => \@branches_loop,
		195	done_searched => $searched,
		196	routing => $routing,
		197	additional_field_filters => $additional_field_filters,
		198	additional_fields_for_subscription => $additional_fields,
		199	marcflavour => (uc(C4::Context->preference("marcflavour"))),
		200	mana => $mana
		201	);
		202	}
153	output_html_with_http_headers $query, $cookie, $template->output;	203	output_html_with_http_headers $query, $cookie, $template->output;

Lines 56-62 my $subtype = $input->param('subtype'); Link Here

(-)a/serials/showpredictionpattern.pl (-5 / +18 lines)
56	my $sublength = $input->param('sublength');	56	my $sublength = $input->param('sublength');
57	my $custompattern = $input->param('custompattern');	57	my $custompattern = $input->param('custompattern');
58		58
59	my $frequency = GetSubscriptionFrequency($frequencyid);	59
		60	my $frequency;
		61	if ( $frequencyid eq 'mana' ) {
		62	$frequency = {
		63	'id' => undef,
		64	'displayorder' => undef,
		65	'description' => scalar $input->param('sfdescription') // '',
		66	'unitsperissue' => scalar $input->param('unitsperissue') // '',
		67	'issuesperunit' => scalar $input->param('issuesperunit') // '',
		68	'unit' => scalar $input->param('unit') // ''
		69	};
		70	}
		71	else {
		72	$frequency = GetSubscriptionFrequency($frequencyid);
		73	}
60		74
61	my %pattern = (	75	my %pattern = (
62	numberingmethod => scalar $input->param('numberingmethod') // '',	76	numberingmethod => scalar $input->param('numberingmethod') // '',
Lines 98-111 my %subscription = ( Link Here
98	innerloop2 => scalar $input->param('innerloop2') // '',	112	innerloop2 => scalar $input->param('innerloop2') // '',
99	innerloop3 => scalar $input->param('innerloop3') // '',	113	innerloop3 => scalar $input->param('innerloop3') // '',
100	irregularity => '',	114	irregularity => '',
101	periodicity => $frequencyid,
102	countissuesperunit => 1,	115	countissuesperunit => 1,
103	firstacquidate => $firstacquidate,	116	firstacquidate => $firstacquidate,
104	);	117	);
105		118
106	my $issuenumber;	119	my $issuenumber;
107	if(defined $subscriptionid) {	120	if(defined $subscriptionid) {
108	($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date);	121	($issuenumber) = C4::Serials::GetFictiveIssueNumber(\%subscription, $date, $frequency);
109	} else {	122	} else {
110	$issuenumber = 1;	123	$issuenumber = 1;
111	}	124	}
Lines 135-141 while( $i < 1000 ) { Link Here
135	my %line;	148	my %line;
136		149
137	if(defined $date){	150	if(defined $date){
138	$date = GetNextDate(\%subscription, $date);	151	$date = GetNextDate(\%subscription, $date, $frequency);
139	}	152	}
140	if(defined $date){	153	if(defined $date){
141	$line{'publicationdate'} = $date;	154	$line{'publicationdate'} = $date;
Lines 156-162 while( $i < 1000 ) { Link Here
156	last;	169	last;
157	}	170	}
158		171
159	($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern);	172	($calculated, $subscription{'lastvalue1'}, $subscription{'lastvalue2'}, $subscription{'lastvalue3'}, $subscription{'innerloop1'}, $subscription{'innerloop2'}, $subscription{'innerloop3'}) = GetNextSeq(\%subscription, \%pattern, $frequency);
160	$issuenumber++;	173	$issuenumber++;
161	$line{'number'} = $calculated;	174	$line{'number'} = $calculated;
162	$line{'issuenumber'} = $issuenumber;	175	$line{'issuenumber'} = $issuenumber;

Lines 33-38 use Koha::Acquisition::Bookseller; Link Here

(-)a/serials/subscription-detail.pl (-12 / +59 lines)
33	use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;	33	use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/;
34	use Carp;	34	use Carp;
35		35
		36	use LWP::UserAgent;
		37	use Koha::SharedContent;
		38	use Koha::Patrons;
		39	use Koha::Subscriptions;
		40	use Koha::Libraries;
		41
36	my $query = new CGI;	42	my $query = new CGI;
37	my $op = $query->param('op') \|\| q{};	43	my $op = $query->param('op') \|\| q{};
38	my $issueconfirmed = $query->param('issueconfirmed');	44	my $issueconfirmed = $query->param('issueconfirmed');
Lines 68-98 my ($totalissues,@serialslist) = GetSerials($subscriptionid); Link Here
68	$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)	74	$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
69		75
70	if ($op eq 'del') {	76	if ($op eq 'del') {
71	if ($$subs{'cannotedit'}){	77	if ($$subs{'cannotedit'}){
72	carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";	78	carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
73	print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");	79	print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
74	exit;	80	exit;
75	}	81	}
76		82
77	# Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues	83	# Asking for confirmation if the subscription has not strictly expired yet or if it has linked issues
78	my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);	84	my $strictlyexpired = HasSubscriptionStrictlyExpired($subscriptionid);
79	my $linkedissues = CountIssues($subscriptionid);	85	my $linkedissues = CountIssues($subscriptionid);
80	my $countitems = HasItems($subscriptionid);	86	my $countitems = HasItems($subscriptionid);
81	if ($strictlyexpired == 0 \|\| $linkedissues > 0 \|\| $countitems>0) {	87	if ($strictlyexpired == 0 \|\| $linkedissues > 0 \|\| $countitems>0) {
82	$template->param(NEEDSCONFIRMATION => 1);	88	$template->param(NEEDSCONFIRMATION => 1);
83	if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }	89	if ($strictlyexpired == 0) { $template->param("NOTEXPIRED" => 1); }
84	if ($linkedissues > 0) { $template->param("LINKEDISSUES" => 1); }	90	if ($linkedissues > 0) { $template->param("LINKEDISSUES" => 1); }
85	if ($countitems > 0) { $template->param("LINKEDITEMS" => 1); }	91	if ($countitems > 0) { $template->param("LINKEDITEMS" => 1); }
86	} else {	92	} else {
87	$issueconfirmed = "1";	93	$issueconfirmed = "1";
88	}	94	}
89	# If it's ok to delete the subscription, we do so	95	# If it's ok to delete the subscription, we do so
90	if ($issueconfirmed eq "1") {	96	if ($issueconfirmed eq "1") {
91	&DelSubscription($subscriptionid);	97	&DelSubscription($subscriptionid);
92	print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");	98	print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
93	exit;	99	exit;
94	}	100	}
95	}	101	}
		102	elsif ( $op and $op eq "share" ) {
		103	my $mana_language;
		104	if ( $query->param('mana_language') ) {
		105	$mana_language = $query->param('mana_language');
		106	}
		107	else {
		108	$mana_language = C4::Context->preference('language');
		109	}
		110
		111	my $mana_email;
		112	if ( $loggedinuser ne 0 ) {
		113	my $borrower = Koha::Patrons->find($loggedinuser);
		114	$mana_email = $borrower->email
		115	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		116	$mana_email = $borrower->emailpro
		117	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		118	$mana_email =
		119	Koha::Libraries->find( C4::Context->userenv->{'branch'} )->branchemail
		120	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		121	}
		122	$mana_email = C4::Context->preference('KohaAdminEmailAddress')
		123	if ( ( not defined($mana_email) ) or ( $mana_email eq '' ) );
		124	my %versions = C4::Context::get_versions();
		125
		126	my $mana_info = {
		127	language => $mana_language,
		128	kohaversion => $versions{'kohaVersion'},
		129	exportemail => $mana_email
		130	};
		131	my $sub_mana_info = Koha::Subscription::get_sharable_info($subscriptionid);
		132	$sub_mana_info = { %$sub_mana_info, %$mana_info };
		133	my $result = Koha::SharedContent::manaPostRequest( "subscription",
		134	$sub_mana_info );
		135	if ( $result->{code} eq "200" and $result->{code} eq "201" ) {
		136	my $subscription = Koha::Subscriptions->find($subscriptionid);
		137	$subscription->set( { mana_id => $result->{id} } )->store;
		138	$subs->{mana_id} = $result->{id};
		139	}
		140	$template->param( mana_code => $result->{code} );
		141	}
		142
96	my $hasRouting = check_routing($subscriptionid);	143	my $hasRouting = check_routing($subscriptionid);
97		144
98	(undef, $cookie, undef, undef)	145	(undef, $cookie, undef, undef)

Line 0 Link Here

(-)a/svc/mana/search (+62 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19	#
	20
	21	use strict;
	22	use warnings;
	23
	24	use Koha::SharedContent;
	25	use Koha::Subscription;
	26	use C4::Auth qw(check_cookie_auth), qw(get_template_and_user);
	27	use C4::Output qw( output_with_http_headers );
	28
	29	use CGI;
	30	use JSON;
	31
	32	my $input = new CGI;
	33
	34	my ( $auth_status, $sessionID ) =
	35	check_cookie_auth( $input->cookie('CGISESSID'),
	36	{ serials => 'create_subscription' } );
	37
	38	if ( $auth_status ne "ok" ) {
	39	exit 0;
	40	}
	41
	42	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
	43	{
	44	template_name => "serials/mana-subscription-search-result.tt",
	45	query => $input,
	46	type => "intranet",
	47	authnotrequired => 0,
	48
	49	# flagsrequired => { serials => $permission },
	50	flagsrequired => { serials => 'create_subscription' },
	51	debug => 1,
	52	}
	53	);
	54
	55	my $biblionumber = $input->param('biblionumber');
	56
	57	my $sub_mana_info = Koha::Subscription::get_search_info($biblionumber);
	58	my $result =
	59	Koha::SharedContent::manaGetRequest( "subscription", $sub_mana_info );
	60	$template->param( subscriptions => $result->{data} );
	61
	62	output_with_http_headers $input, $cookie, $template->output, 'json';

Line 0 Link Here

(-)a/svc/mana/use (+48 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha.
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19	#
	20
	21	use strict;
	22	use warnings;
	23
	24	use Koha::SharedContent;
	25	use C4::Auth qw(check_cookie_auth);
	26
	27	use CGI;
	28	use JSON;
	29
	30
	31	my $input = new CGI;
	32	binmode STDOUT, ":encoding(UTF-8)";
	33	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
	34
	35	my ( $auth_status, $sessionID ) =
	36	check_cookie_auth( $input->cookie('CGISESSID'),
	37	{ serials => 'create_subscription' } );
	38
	39	if ( $auth_status ne "ok" ) {
	40	exit 0;
	41	}
	42
	43	my $result = Koha::SharedContent::manaGetRequestWithId("subscription", $input->param('id') );
	44
	45	my $subscription;
	46	$subscription = $result->{data};
	47
	48	print(to_json($subscription));

Line 0 Link Here

(-)a/t/db_dependent/Koha/SharedContent.t (+29 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2016 BibLibre Morgane Alonso
	4	#
	5	# This file is part of Koha
	6	#
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	#
	12	# Koha is distributed in the hope that it will be useful, but
	13	# WITHOUT ANY WARRANTY; without even the implied warranty of
	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	# GNU General Public License for more details.
	16	#
	17	# You should have received a copy of the GNU General Public License
	18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	19
	20	use Modern::Perl;
	21
	22	use t::lib::TestBuilder;
	23	use Test::More tests => 1;
	24	use Koha::Database;
	25
	26	use_ok('Koha::SharedContent');
	27
	28	my $schema = Koha::Database->new->schema;
	29	$schema->storage->txn_begin; # mode insertion

Lines 1-220 Link Here

(-)a/t/db_dependent/Serials/GetFictiveIssueNumber.t (-207 / +113 lines)
1	#!/usr/bin/perl	1	#!/usr/bin/perl
2		2
3	# This test deals with GetFictiveIssueNumber (from C4::Serials)	3	use C4::Context;
4		4	use Test::More tests => 18;
5	use Modern::Perl;	5	use Modern::Perl;
6	use Test::More tests => 5;
7
8	use Koha::Database;
9	use C4::Serials;
10	use C4::Serials::Frequency;
11		6
12	my $schema = Koha::Database->new->schema;
13	$schema->storage->txn_begin;
14	my $dbh = C4::Context->dbh;	7	my $dbh = C4::Context->dbh;
		8	$dbh->{RaiseError} = 1;
		9	$dbh->{AutoCommit} = 0;
15		10
16	subtest 'Tests for irregular frequency' => sub {	11	use C4::Serials::Frequency;
17	plan tests => 2;	12	use C4::Serials;
18
19	# Add a frequency
20	my $freq_irr = AddSubscriptionFrequency({
21	description => "Irregular",
22	unit => undef,
23	});
24		13
25	# Test it	14	# TEST CASE - 1 issue per day, no irregularities
26	my $subscription = {	15	my $frequency = {
27	periodicity => $freq_irr,	16	description => "One issue per day",
28	firstacquidate => '1972-02-07',	17	unit => 'day',
29	};	18	issuesperunit => 1,
30	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-12-31'), undef, 'Irregular: should be undef' );	19	unitsperissue => 1,
31	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-12-31'), undef, 'Irregular: still undef' );
32	};	20	};
33		21
34	subtest 'Tests for yearly frequencies' => sub {	22	my $subscription = {
35	plan tests => 10;	23	firstacquidate => '1970-01-01',
36		24	irregularity => '',
37	# First add a few frequencies	25	countissuesperunit => 1,
38	my $freq_1i_1y = AddSubscriptionFrequency({
39	description => "1 issue per year",
40	unit => 'year',
41	issuesperunit => 1,
42	unitsperissue => 1,
43	});
44	my $freq_1i_3y = AddSubscriptionFrequency({
45	description => "1 issue per 3 years",
46	unit => 'year',
47	issuesperunit => 1,
48	unitsperissue => 3,
49	});
50	my $freq_5i_1y = AddSubscriptionFrequency({
51	description => "5 issues per year",
52	unit => 'year',
53	issuesperunit => 5,
54	unitsperissue => 1,
55	});
56	my $freq_366i_1y = AddSubscriptionFrequency({
57	description => "366 issue per year",
58	unit => 'year',
59	issuesperunit => 366,
60	unitsperissue => 1,
61	});
62
63	# TEST CASE - 1 issue per year
64	my $subscription = {
65	periodicity => $freq_1i_1y,
66	firstacquidate => '1972-02-10',
67	countissuesperunit => 1,
68	};
69	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-09'), 1, 'Feb 9 still 1' );
70	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-10'), 2, 'Feb 10 goes to 2' );
71
72	# TEST CASE - 1 issue per 3 years
73	$subscription->{periodicity} = $freq_1i_3y;
74	$subscription->{firstacquidate} = '1972-02-20';
75	is( C4::Serials::GetFictiveIssueNumber($subscription, '1975-02-19'), 1, 'Feb 19, 1975 still 1' );
76	is( C4::Serials::GetFictiveIssueNumber($subscription, '1975-02-20'), 2, 'Feb 20, 1975 goes to 2' );
77
78	# TEST CASE - 5 issues per year
79	$subscription->{periodicity} = $freq_5i_1y;
80	$subscription->{firstacquidate} = '1972-02-29'; #leap year
81	$subscription->{countissuesperunit} = 1;
82	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-11'), 1, 'May 11 still 1' );
83	$subscription->{countissuesperunit} = 2;
84	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-12'), 2, 'May 12 goes to 2' );
85	$subscription->{countissuesperunit} = 5;
86	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-27'), 5, 'Feb 27 should still be 5' );
87	$subscription->{countissuesperunit} = 1;
88	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-28'), 6, 'Feb 28 goes to 6' );
89
90	# TEST CASE - 366 issues per year (hypothetical example)
91	# Testing prevention of divide by zero
92	$subscription->{periodicity} = $freq_366i_1y;
93	$subscription->{firstacquidate} = '1972-02-29'; #leap year
94	$subscription->{countissuesperunit} = 366;
95	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-27'), 366, 'Feb 27 still at 366' );
96	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-02-28'), 732, 'Feb 28 goes to 732' );
97
98	};	26	};
99		27	my $issueNumber;
100	subtest 'Tests for monthly frequencies' => sub {	28
101	plan tests => 8;	29	$issueNumber =
102		30	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
103	# First add a few frequencies	31	is( $issueNumber, '1' );
104	my $freq_1i_5m = AddSubscriptionFrequency({	32
105	description => "1 issue per 5 months",	33	$issueNumber =
106	unit => 'month',	34	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
107	issuesperunit => 1,	35	is( $issueNumber, '2' );
108	unitsperissue => 5,	36	$issueNumber =
109	});	37	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
110	my $freq_4i_1m = AddSubscriptionFrequency({	38	is( $issueNumber, '3' );
111	description => "4 issue per month",	39
112	unit => 'month',	40	# TEST CASE - 2 issues per day, no irregularity
113	issuesperunit => 4,	41	$frequency = {
114	unitsperissue => 1,	42	description => "Two issues per day",
115	});	43	unit => 'day',
116		44	issuesperunit => 2,
117	# TEST CASE - 1 issue per 5 months	45	unitsperissue => 1,
118	my $subscription = {
119	periodicity => $freq_1i_5m,
120	firstacquidate => '1972-02-10',
121	countissuesperunit => 1,
122	};
123	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-07-09'), 1, 'Jul 9 still 1' );
124	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-07-10'), 2, 'Jul 10 goes to 2' );
125	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-05-09'), 3, 'May 9 still 3' );
126	is( C4::Serials::GetFictiveIssueNumber($subscription, '1973-05-10'), 4, 'May 10 goes to 4' );
127
128	# TEST CASE - 4 issue per 1 months
129	$subscription = {
130	periodicity => $freq_4i_1m,
131	firstacquidate => '1972-02-22',
132	countissuesperunit => 1,
133	};
134	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-28'), 1, 'Feb 28 still 1' );
135	$subscription->{countissuesperunit} = 2;
136	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-29'), 2, 'Feb 29 goes to 2' );
137	$subscription->{countissuesperunit} = 4;
138	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-21'), 4, 'Mar 21 still 4' );
139	$subscription->{countissuesperunit} = 1;
140	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-22'), 5, 'Mar 22 goes to 5' );
141
142	};	46	};
143		47	$subscription = {
144	subtest 'Tests for weekly frequencies' => sub {	48	firstacquidate => '1970-01-01',
145	plan tests => 4;	49	irregularity => '',
146		50	countissuesperunit => 1,
147	# First add a few frequencies
148	my $freq_1i_7w = AddSubscriptionFrequency({
149	description => "1 issue per 7 weeks",
150	unit => 'week',
151	issuesperunit => 1,
152	unitsperissue => 7,
153	});
154	my $freq_3i_1w = AddSubscriptionFrequency({
155	description => "3 issues per week",
156	unit => 'week',
157	issuesperunit => 3,
158	unitsperissue => 1,
159	});
160
161	# TEST CASE - 1 issue per 7 weeks
162	my $subscription = {
163	periodicity => $freq_1i_7w,
164	firstacquidate => '1972-02-10',
165	countissuesperunit => 1,
166	};
167	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-29'), 1, 'Mar 29 still 1' );
168	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-30'), 2, 'Mar 30 goes to 2' );
169
170	# TEST CASE - 3 issue per 1 week
171	$subscription = {
172	periodicity => $freq_3i_1w,
173	firstacquidate => '1972-02-03',
174	countissuesperunit => 1,
175	};
176	$subscription->{countissuesperunit} = 3;
177	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-09'), 3, 'Feb 9 still 3' );
178	$subscription->{countissuesperunit} = 1;
179	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-02-10'), 4, 'Feb 10 goes to 4' );
180	};	51	};
181		52	$issueNumber =
182	subtest 'Tests for dayly frequencies' => sub {	53	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
183	plan tests => 4;	54	is( $issueNumber, '1' );
184		55	$issueNumber =
185	# First add a few frequencies	56	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
186	my $freq_1i_12d = AddSubscriptionFrequency({	57	is( $issueNumber, '3' );
187	description => "1 issue per 12 days",	58	$issueNumber =
188	unit => 'day',	59	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
189	issuesperunit => 1,	60	is( $issueNumber, '5' );
190	unitsperissue => 12,	61
191	});	62	$subscription->{countissuesperunit} = 2;
192	my $freq_3i_1d = AddSubscriptionFrequency({	63	$issueNumber =
193	description => "3 issues per day",	64	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
194	unit => 'day',	65	is( $issueNumber, '2' );
195	issuesperunit => 3,	66	$issueNumber =
196	unitsperissue => 1,	67	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
197	});	68	is( $issueNumber, '4' );
198		69	$issueNumber =
199	# TEST CASE - 1 issue per 12 days	70	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
200	my $subscription = {	71	is( $issueNumber, '6' );
201	periodicity => $freq_1i_12d,	72
202	firstacquidate => '1972-03-16',	73	# TEST CASE - 1 issue every 2 days, no irregularity
203	countissuesperunit => 1,	74	$frequency = {
204	};	75	description => "one issue every two days",
205	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-27'), 1, 'Mar 27 still 1' );	76	unit => 'day',
206	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-03-28'), 2, 'Mar 28 goes to 2' );	77	issuesperunit => 1,
207		78	unitsperissue => 2,
208	# TEST CASE - 3 issue per day
209	$subscription = {
210	periodicity => $freq_3i_1d,
211	firstacquidate => '1972-04-23',
212	countissuesperunit => 1,
213	};
214	$subscription->{countissuesperunit} = 3;
215	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-01'), 27, 'May 1 still 27' );
216	$subscription->{countissuesperunit} = 1;
217	is( C4::Serials::GetFictiveIssueNumber($subscription, '1972-05-02'), 28, 'May 2 goes to 28' );
218	};	79	};
219		80	$subscription = {
220	$schema->storage->txn_rollback;	81	firstacquidate => '1970-01-01',
		82	irregularity => '',
		83	countissuesperunit => 1,
		84	};
		85	$issueNumber =
		86	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
		87	is( $issueNumber, 1 );
		88	$issueNumber =
		89	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
		90	is( $issueNumber, 1 );
		91	$issueNumber =
		92	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-03', $frequency );
		93	is( $issueNumber, 2 );
		94	$issueNumber =
		95	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-04', $frequency );
		96	is( $issueNumber, 2 );
		97	$issueNumber =
		98	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-05', $frequency );
		99	is( $issueNumber, 3 );
		100
		101	# TEST CASE - 1 issue per week, no irregularity
		102	$frequency = {
		103	description => "one issue per week",
		104	unit => 'week',
		105	issuesperunit => 1,
		106	unitsperissue => 1,
		107	};
		108	$subscription = {
		109	firstacquidate => '1970-01-01',
		110	irregularity => '',
		111	countissuesperunit => 1,
		112	};
		113	$issueNumber =
		114	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-01', $frequency );
		115	is( $issueNumber, 1 );
		116	$issueNumber =
		117	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-02', $frequency );
		118	is( $issueNumber, 1 );
		119	$issueNumber =
		120	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-08', $frequency );
		121	is( $issueNumber, 2 );
		122	$issueNumber =
		123	C4::Serials::GetFictiveIssueNumber( $subscription, '1970-01-15', $frequency );
		124	is( $issueNumber, 3 );
		125
		126	$dbh->rollback;

Lines 43-58 my $subscription = { Link Here

(-)a/t/db_dependent/Serials/GetNextSeq.t (-63 / +62 lines)
43	};	43	};
44	my $publisheddate = $subscription->{firstacquidate};	44	my $publisheddate = $subscription->{firstacquidate};
45		45
46	my $seq = _next_seq($subscription, $pattern, $publisheddate);	46	my $seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
47	is($seq, 'X: 2');	47	is($seq, 'X: 2');
48	$publisheddate = GetNextDate($subscription, $publisheddate);	48	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
49	$seq = _next_seq($subscription, $pattern, $publisheddate);	49	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
50	is($seq, 'X: 4');	50	is($seq, 'X: 4');
51	$publisheddate = GetNextDate($subscription, $publisheddate);	51	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
52	$seq = _next_seq($subscription, $pattern, $publisheddate);	52	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
53	is($seq, 'X: 2');	53	is($seq, 'X: 2');
54	$publisheddate = GetNextDate($subscription, $publisheddate);	54	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
55	$seq = _next_seq($subscription, $pattern, $publisheddate);	55	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
56	is($seq, 'X: 3');	56	is($seq, 'X: 3');
57		57
58	# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7	58	# TEST CASE 2 - 1 variable, use 'dayname' numbering, from 1 to 7
Lines 79-97 $pattern = { Link Here
79		79
80	$publisheddate = $subscription->{firstacquidate};	80	$publisheddate = $subscription->{firstacquidate};
81		81
82	$seq = _next_seq($subscription, $pattern, $publisheddate);	82	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
83	is($seq, 'X: Tuesday');	83	is($seq, 'X: Tuesday');
84	$publisheddate = GetNextDate($subscription, $publisheddate);	84	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
85	$seq = _next_seq($subscription, $pattern, $publisheddate);	85	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
86	is($seq, 'X: Friday');	86	is($seq, 'X: Friday');
87	$publisheddate = GetNextDate($subscription, $publisheddate);	87	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
88	$seq = _next_seq($subscription, $pattern, $publisheddate);	88	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
89	is($seq, 'X: Sunday');	89	is($seq, 'X: Sunday');
90	$publisheddate = GetNextDate($subscription, $publisheddate);	90	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
91	$seq = _next_seq($subscription, $pattern, $publisheddate);	91	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
92	is($seq, 'X: Monday');	92	is($seq, 'X: Monday');
93	$publisheddate = GetNextDate($subscription, $publisheddate);	93	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
94	$seq = _next_seq($subscription, $pattern, $publisheddate);	94	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
95	is($seq, 'X: Tuesday');	95	is($seq, 'X: Tuesday');
96		96
97	# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2	97	# TEST CASE 3 - 1 variable, use 'monthname' numbering, from 0 to 11 by step of 2
Lines 118-136 $pattern = { Link Here
118		118
119	$publisheddate = $subscription->{firstacquidate};	119	$publisheddate = $subscription->{firstacquidate};
120		120
121	$seq = _next_seq($subscription, $pattern, $publisheddate);	121	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
122	is($seq, 'X: March');	122	is($seq, 'X: March');
123	$publisheddate = GetNextDate($subscription, $publisheddate);	123	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
124	$seq = _next_seq($subscription, $pattern, $publisheddate);	124	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
125	is($seq, 'X: September');	125	is($seq, 'X: September');
126	$publisheddate = GetNextDate($subscription, $publisheddate);	126	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
127	$seq = _next_seq($subscription, $pattern, $publisheddate);	127	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
128	is($seq, 'X: January');	128	is($seq, 'X: January');
129	$publisheddate = GetNextDate($subscription, $publisheddate);	129	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
130	$seq = _next_seq($subscription, $pattern, $publisheddate);	130	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
131	is($seq, 'X: March');	131	is($seq, 'X: March');
132	$publisheddate = GetNextDate($subscription, $publisheddate);	132	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
133	$seq = _next_seq($subscription, $pattern, $publisheddate);	133	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
134	is($seq, 'X: May');	134	is($seq, 'X: May');
135		135
136	# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3	136	# TEST CASE 4 - 1 variable, use 'season' numbering, from 0 to 3
Lines 157-175 $pattern = { Link Here
157		157
158	$publisheddate = $subscription->{firstacquidate};	158	$publisheddate = $subscription->{firstacquidate};
159		159
160	$seq = _next_seq($subscription, $pattern, $publisheddate);	160	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
161	is($seq, 'X: Summer');	161	is($seq, 'X: Summer');
162	$publisheddate = GetNextDate($subscription, $publisheddate);	162	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
163	$seq = _next_seq($subscription, $pattern, $publisheddate);	163	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
164	is($seq, 'X: Spring');	164	is($seq, 'X: Spring');
165	$publisheddate = GetNextDate($subscription, $publisheddate);	165	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
166	$seq = _next_seq($subscription, $pattern, $publisheddate);	166	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
167	is($seq, 'X: Fall');	167	is($seq, 'X: Fall');
168	$publisheddate = GetNextDate($subscription, $publisheddate);	168	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
169	$seq = _next_seq($subscription, $pattern, $publisheddate);	169	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
170	is($seq, 'X: Winter');	170	is($seq, 'X: Winter');
171	$publisheddate = GetNextDate($subscription, $publisheddate);	171	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
172	$seq = _next_seq($subscription, $pattern, $publisheddate);	172	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
173	is($seq, 'X: Spring');	173	is($seq, 'X: Spring');
174		174
175	# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4	175	# TEST CASE 5 - 2 variables, from 1 to 12, and from 1 to 4
Lines 196-214 $pattern = { Link Here
196		196
197	$publisheddate = $subscription->{firstacquidate};	197	$publisheddate = $subscription->{firstacquidate};
198		198
199	$seq = _next_seq($subscription, $pattern, $publisheddate);	199	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
200	is($seq, 'Y: 1, X: 2');	200	is($seq, 'Y: 1, X: 2');
201	$publisheddate = GetNextDate($subscription, $publisheddate);	201	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
202	$seq = _next_seq($subscription, $pattern, $publisheddate);	202	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
203	is($seq, 'Y: 2, X: 1');	203	is($seq, 'Y: 2, X: 1');
204	$publisheddate = GetNextDate($subscription, $publisheddate);	204	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
205	$seq = _next_seq($subscription, $pattern, $publisheddate);	205	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
206	is($seq, 'Y: 2, X: 3');	206	is($seq, 'Y: 2, X: 3');
207	$publisheddate = GetNextDate($subscription, $publisheddate);	207	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
208	$seq = _next_seq($subscription, $pattern, $publisheddate);	208	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
209	is($seq, 'Y: 2, X: 4');	209	is($seq, 'Y: 2, X: 4');
210	$publisheddate = GetNextDate($subscription, $publisheddate);	210	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
211	$seq = _next_seq($subscription, $pattern, $publisheddate);	211	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
212	is($seq, 'Y: 3, X: 1');	212	is($seq, 'Y: 3, X: 1');
213		213
214	# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4	214	# TEST CASE 6 - 3 variables, from 1 to 12, from 1 to 8, and from 1 to 4
Lines 235-278 $pattern = { Link Here
235		235
236	$publisheddate = $subscription->{firstacquidate};	236	$publisheddate = $subscription->{firstacquidate};
237		237
238	$seq = _next_seq($subscription, $pattern, $publisheddate);	238	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
239	is($seq, 'Z: 1, Y: 1, X: 2');	239	is($seq, 'Z: 1, Y: 1, X: 2');
240	$publisheddate = GetNextDate($subscription, $publisheddate);	240	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
241	$seq = _next_seq($subscription, $pattern, $publisheddate);	241	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
242	is($seq, 'Z: 1, Y: 2, X: 1');	242	is($seq, 'Z: 1, Y: 2, X: 1');
243	$publisheddate = GetNextDate($subscription, $publisheddate);	243	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
244	$seq = _next_seq($subscription, $pattern, $publisheddate);	244	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
245	is($seq, 'Z: 1, Y: 2, X: 3');	245	is($seq, 'Z: 1, Y: 2, X: 3');
246	$publisheddate = GetNextDate($subscription, $publisheddate);	246	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
247	$seq = _next_seq($subscription, $pattern, $publisheddate);	247	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
248	is($seq, 'Z: 1, Y: 2, X: 4');	248	is($seq, 'Z: 1, Y: 2, X: 4');
249	for (1..100) {	249	for (1..100) {
250	$publisheddate = GetNextDate($subscription, $publisheddate);	250	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
251	$seq = _next_seq($subscription, $pattern, $publisheddate);	251	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
252	}	252	}
253	$publisheddate = GetNextDate($subscription, $publisheddate);	253	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
254	$seq = _next_seq($subscription, $pattern, $publisheddate);	254	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
255	is($seq, 'Z: 4, Y: 4, X: 1');	255	is($seq, 'Z: 4, Y: 4, X: 1');
256	# 110th is here	256	# 110th is here
257	$publisheddate = GetNextDate($subscription, $publisheddate);	257	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
258	$seq = _next_seq($subscription, $pattern, $publisheddate);	258	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
259	is($seq, 'Z: 4, Y: 4, X: 3');	259	is($seq, 'Z: 4, Y: 4, X: 3');
260	$publisheddate = GetNextDate($subscription, $publisheddate);	260	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
261	$seq = _next_seq($subscription, $pattern, $publisheddate);	261	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
262	is($seq, 'Z: 4, Y: 4, X: 4');	262	is($seq, 'Z: 4, Y: 4, X: 4');
263	$publisheddate = GetNextDate($subscription, $publisheddate);	263	$publisheddate = GetNextDate($subscription, $publisheddate, $frequency);
264	$seq = _next_seq($subscription, $pattern, $publisheddate);	264	$seq = _next_seq($subscription, $pattern, $frequency, $publisheddate);
265	is($seq, 'Z: 4, Y: 5, X: 1');	265	is($seq, 'Z: 4, Y: 5, X: 1');
266		266
267		267
268	$dbh->rollback;	268	$dbh->rollback;
269		269
270	sub _next_seq {	270	sub _next_seq {
271	my ($subscription, $pattern, $publisheddate) = @_;	271	my ($subscription, $pattern, $frequency, $publisheddate) = @_;
272	my $seq;	272	my $seq;
273	($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},	273	($seq, $subscription->{lastvalue1}, $subscription->{lastvalue2},
274	$subscription->{lastvalue3}, $subscription->{innerloop1},	274	$subscription->{lastvalue3}, $subscription->{innerloop1},
275	$subscription->{innerloop2}, $subscription->{innerloop3}) =	275	$subscription->{innerloop2}, $subscription->{innerloop3}) =
276	GetNextSeq($subscription, $pattern, $publisheddate);	276	GetNextSeq($subscription, $pattern, $frequency, $publisheddate);
277	return $seq;	277	return $seq;
278	}	278	}
279	-