Attachment #102962 for bug #17656

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

Lines 2666-2674 sub findSerialsByStatus { Link Here

(-)a/C4/Serials.pm (-2 / +2 lines)
2666	return @$serials;	2666	return @$serials;
2667	}	2667	}
2668		2668
2669	=head2 GessEnddate	2669	=head2 GuessEnddate
2670		2670
2671	my $enddate = GessEnddate($startdate_iso $frequencyid, $numberlength, $weeklength, $monthlength);	2671	my $enddate = GuessEnddate($startdate_iso $frequencyid, $numberlength, $weeklength, $monthlength);
2672		2672
2673	=cut	2673	=cut
2674		2674




    return split(';', $self->permanent_irregularity);
}

=head3 lengthtype

Return the length type (issues, weeks, months)

=cut

sub lengthtype {
    my ($self) = @_;

    if ($self->numberlength) {

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/Bug_17656-add-permanent-irregularities.perl (+9 lines)
	1	$DBversion = 'XXX';
	2	if( CheckVersion( $DBversion ) ) {
	3	if( !column_exists( 'subscription', 'permanent_irregularity' ) ) {
	4	$dbh->do( "ALTER TABLE `subscription` ADD permanent_irregularity MEDIUMTEXT AFTER irregularity" );
	5	}
	6
	7	SetVersion( $DBversion );
	8	print "Upgrade to $DBversion done (Bug 17656 - Irregularities in serial prediction pattern are planned only for current subscription)\n";
	9	}

Line 1 Link Here

(-)a/installer/data/mysql/atomicupdate/Bug_17656-add-permanent-irregularities.sql (-1 lines)
1	ALTER TABLE `subscription` ADD permanent_irregularity text AFTER irregularity;

Lines 1979-1984 CREATE TABLE `subscription` ( -- information related to the subscription Link Here

(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
1979	`firstacquidate` date default NULL, -- first issue received date	1979	`firstacquidate` date default NULL, -- first issue received date
1980	`manualhistory` tinyint(1) NOT NULL default 0, -- yes or no to managing the history manually	1980	`manualhistory` tinyint(1) NOT NULL default 0, -- yes or no to managing the history manually
1981	`irregularity` MEDIUMTEXT, -- any irregularities in the subscription	1981	`irregularity` MEDIUMTEXT, -- any irregularities in the subscription
		1982	`permanent_irregularity` MEDIUMTEXT,
1982	skip_serialseq BOOLEAN NOT NULL DEFAULT 0,	1983	skip_serialseq BOOLEAN NOT NULL DEFAULT 0,
1983	`letter` varchar(20) default NULL,	1984	`letter` varchar(20) default NULL,
1984	`numberpattern` integer default null, -- the numbering pattern used links to subscription_numberpatterns.id	1985	`numberpattern` integer default null, -- the numbering pattern used links to subscription_numberpatterns.id




</em></p>
[% daily_choice = [ {name => 'monday', desc => 'Monday', value => 1}, {name => 'tuesday', desc => 'Tuesday', value => 2}, {name => 'wednesday', desc => 'Wednesday', value => 3}, {name => 'thursday', desc => 'Thursday', value => 4}, {name => 'friday', desc => 'Friday', value => 5}, {name => 'saturday', desc => 'Saturday', value => 6}, {name => 'sunday', desc => 'Sunday', value => 7} ] %]

[% BLOCK days %]
    [% SWITCH d %]
        [% CASE 'monday' %]Monday
        [% CASE 'tuesday' %]Tuesday
        [% CASE 'wednesday' %]Wednesday
        [% CASE 'thursday' %]Thursday
        [% CASE 'friday' %]Friday
        [% CASE 'saturday' %]Saturday
        [% CASE 'sunday' %]Sunday
    [% END %]
[% END %]

[% FOREACH day IN daily_choice %]
    [% IF permanent_irreg.grep( day.value ).0 == day.value %]
        <input type="checkbox" name="permanent_irregularity"

               value="[% day.value %]" class="skip"
        />
    [% END %]
    <label for="[% day.name %]">[% PROCESS days d=day.name %]</label>
[% END %]




</em></p>
[% monthly_choice = [ {name => 'january', desc => 'January', value => 1}, {name => 'february', desc => 'February', value => 2}, {name => 'march', desc => 'March', value => 3}, {name => 'april', desc => 'April', value => 4}, {name => 'may', desc => 'May', value => 5}, {name => 'june', desc => 'June', value => 6}, {name => 'july', desc => 'July', value => 7}, {name => 'august', desc => 'August', value => 8}, {name => 'september', desc => 'September', value => 9}, {name => 'october', desc => 'October', value => 10}, {name => 'november', desc => 'November', value => 11}, {name => 'december', desc => 'December', value =>12} ] %]

[% BLOCK months %]
    [% SWITCH m %]
        [% CASE 'january' %]January
        [% CASE 'february' %]February
        [% CASE 'march' %]March
        [% CASE 'april' %]April
        [% CASE 'may' %]May
        [% CASE 'june' %]June
        [% CASE 'july' %]July
        [% CASE 'august' %]August
        [% CASE 'september' %]September
        [% CASE 'october' %]October
        [% CASE 'november' %]November
        [% CASE 'december' %]December
    [% END %]
[% END %]

[% FOREACH month IN monthly_choice %]
    [% IF permanent_irreg.grep( month.value ).0 == month.value %]
        <input type="checkbox" name="permanent_irregularity"

               value="[% month.value %]" class="skip"
        />
    [% END %]
    <label for="[% month.name %]">[% PROCESS months m=month.name %]</label>
[% END %]

Lines 34-40 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt (-1 / +1 lines)
34	<input type="hidden" id="nextacquidate" value="[% nextacquidate \| html %]" />	34	<input type="hidden" id="nextacquidate" value="[% nextacquidate \| html %]" />
35		35
36	<input type="hidden" id="to" value="[% enddate \| html %]" />	36	<input type="hidden" id="to" value="[% enddate \| html %]" />
37	<input type="hidden" id="subtype" value="[% subtype \| html %]" />	37	<input type="hidden" id="subtype" value="[% lengthtype \| html %]" />
38	<input type="hidden" id="sublength" value="[% sublength \| html %]" />	38	<input type="hidden" id="sublength" value="[% sublength \| html %]" />
39	<input type="hidden" id="numberingmethod" value="[% numberpattern.numberingmethod \| html %]" />	39	<input type="hidden" id="numberingmethod" value="[% numberpattern.numberingmethod \| html %]" />
40	<input type="hidden" id="lastvalue1" value="[% subscription.lastvalue1 \| html %]" />	40	<input type="hidden" id="lastvalue1" value="[% subscription.lastvalue1 \| html %]" />

Lines 141-147 if ( $op eq "renew" ) { Link Here

(-)a/serials/subscription-renew.pl (-2 / +2 lines)
141	}	141	}
142		142
143	my $subscription_o = Koha::Subscriptions->find($subscription->{subscriptionid});	143	my $subscription_o = Koha::Subscriptions->find($subscription->{subscriptionid});
144	my $subtype = $subscription_o->subtype;	144	my $lengthtype = $subscription_o->lengthtype;
145	my $nextexpected = GetNextExpected($subscriptionid);	145	my $nextexpected = GetNextExpected($subscriptionid);
146	my $enddate = GuessEnddate($subscription->{enddate} \|\| dt_from_string,	146	my $enddate = GuessEnddate($subscription->{enddate} \|\| dt_from_string,
147	$subscription->{periodicity},	147	$subscription->{periodicity},
Lines 166-172 if ( $op eq "renew" ) { Link Here
166	startdate => $newstartdate,	166	startdate => $newstartdate,
167	nextacquidate => $nextexpected->{planneddate},	167	nextacquidate => $nextexpected->{planneddate},
168	enddate => $enddate,	168	enddate => $enddate,
169	subtype => $subtype,	169	lengthtype => $lengthtype,
170	sublength => $sub_length,	170	sublength => $sub_length,
171	);	171	);
172	}	172	}





use Modern::Perl;

use Test::More tests => 10;
use Test::Warn;

BEGIN {

my $dt = DateTime->new(year => 2017, month => 1, day => 1);

eval { issue_number('2017', 'day'); };
is(ref($@), 'Koha::Exceptions::WrongParameter');
is($@, 'Date passed to issue_number is not a valid DateTime object');

is(issue_number($dt, 'day'), 7, '2017-01-01 is the seventh day of week');


is(issue_number($dt, 'week'), 37, '2022-09-17 is the week #37 of the year');

is(issue_number($dt, 'month'), 9, '2022-09-17 is the ninth month of the year');

is(issue_number($dt, 'foo'), 0, 'issue_number return 0 for others issue type');




    is( $subscription->frequency->id, $frequency->id, 'Koha::Subscription->frequency should return the correct frequency' );
};

subtest 'Koha::Subscription::lengthtype' => sub {
    plan tests => 3;

    my $subs = $builder->build({

        }
    });
    my $subscription = Koha::Subscriptions->find($subs->{subscriptionid});
    is($subscription->lengthtype, 'issues', 'Subscription with numberlength has issues type');

    my $subs2 = $builder->build({
        source => 'Subscription',

        }
    });
    my $subscription2 = Koha::Subscriptions->find($subs2->{subscriptionid});
    is($subscription2->lengthtype, 'weeks', 'Subscription with weeklength has weeks type');

    my $subs3 = $builder->build({
        source => 'Subscription',

        }
    });
    my $subscription3 = Koha::Subscriptions->find($subs3->{subscriptionid});
    is($subscription3->lengthtype, 'months', 'Subscription with monthlength has months type');
};

my $nb_of_subs = Koha::Subscriptions->search->count;
- 

Return to bug 17656

Lines 221-233 sub permanent_irregularities { Link Here

(-)a/Koha/Subscription.pm (-2 / +2 lines)
221	return split(';', $self->permanent_irregularity);	221	return split(';', $self->permanent_irregularity);
222	}	222	}
223		223
224	=head3 subtype	224	=head3 lengthtype
225		225
226	Return the length type (issues, weeks, months)	226	Return the length type (issues, weeks, months)
227		227
228	=cut	228	=cut
229		229
230	sub subtype {	230	sub lengthtype {
231	my ($self) = @_;	231	my ($self) = @_;
232		232
233	if ($self->numberlength) {	233	if ($self->numberlength) {

Lines 106-112 subtest 'Koha::Subscription->frequency' => sub { Link Here

(-)a/t/db_dependent/Koha/Subscription.t (-5 / +4 lines)
106	is( $subscription->frequency->id, $frequency->id, 'Koha::Subscription->frequency should return the correct frequency' );	106	is( $subscription->frequency->id, $frequency->id, 'Koha::Subscription->frequency should return the correct frequency' );
107	};	107	};
108		108
109	subtest 'Koha::Subscription::subtype' => sub {	109	subtest 'Koha::Subscription::lengthtype' => sub {
110	plan tests => 3;	110	plan tests => 3;
111		111
112	my $subs = $builder->build({	112	my $subs = $builder->build({
Lines 118-124 subtest 'Koha::Subscription::subtype' => sub { Link Here
118	}	118	}
119	});	119	});
120	my $subscription = Koha::Subscriptions->find($subs->{subscriptionid});	120	my $subscription = Koha::Subscriptions->find($subs->{subscriptionid});
121	is($subscription->subtype, 'issues', 'Subscription with numberlength has issues type');	121	is($subscription->lengthtype, 'issues', 'Subscription with numberlength has issues type');
122		122
123	my $subs2 = $builder->build({	123	my $subs2 = $builder->build({
124	source => 'Subscription',	124	source => 'Subscription',
Lines 129-135 subtest 'Koha::Subscription::subtype' => sub { Link Here
129	}	129	}
130	});	130	});
131	my $subscription2 = Koha::Subscriptions->find($subs2->{subscriptionid});	131	my $subscription2 = Koha::Subscriptions->find($subs2->{subscriptionid});
132	is($subscription2->subtype, 'weeks', 'Subscription with weeklength has weeks type');	132	is($subscription2->lengthtype, 'weeks', 'Subscription with weeklength has weeks type');
133		133
134	my $subs3 = $builder->build({	134	my $subs3 = $builder->build({
135	source => 'Subscription',	135	source => 'Subscription',
Lines 140-146 subtest 'Koha::Subscription::subtype' => sub { Link Here
140	}	140	}
141	});	141	});
142	my $subscription3 = Koha::Subscriptions->find($subs3->{subscriptionid});	142	my $subscription3 = Koha::Subscriptions->find($subs3->{subscriptionid});
143	is($subscription3->subtype, 'months', 'Subscription with monthlength has months type');	143	is($subscription3->lengthtype, 'months', 'Subscription with monthlength has months type');
144	};	144	};
145		145
146	my $nb_of_subs = Koha::Subscriptions->search->count;	146	my $nb_of_subs = Koha::Subscriptions->search->count;
147	-

Lines 4-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc (-1 / +13 lines)
4	</em></p>	4	</em></p>
5	[% daily_choice = [ {name => 'monday', desc => 'Monday', value => 1}, {name => 'tuesday', desc => 'Tuesday', value => 2}, {name => 'wednesday', desc => 'Wednesday', value => 3}, {name => 'thursday', desc => 'Thursday', value => 4}, {name => 'friday', desc => 'Friday', value => 5}, {name => 'saturday', desc => 'Saturday', value => 6}, {name => 'sunday', desc => 'Sunday', value => 7} ] %]	5	[% daily_choice = [ {name => 'monday', desc => 'Monday', value => 1}, {name => 'tuesday', desc => 'Tuesday', value => 2}, {name => 'wednesday', desc => 'Wednesday', value => 3}, {name => 'thursday', desc => 'Thursday', value => 4}, {name => 'friday', desc => 'Friday', value => 5}, {name => 'saturday', desc => 'Saturday', value => 6}, {name => 'sunday', desc => 'Sunday', value => 7} ] %]
6		6
		7	[% BLOCK days %]
		8	[% SWITCH d %]
		9	[% CASE 'monday' %]Monday
		10	[% CASE 'tuesday' %]Tuesday
		11	[% CASE 'wednesday' %]Wednesday
		12	[% CASE 'thursday' %]Thursday
		13	[% CASE 'friday' %]Friday
		14	[% CASE 'saturday' %]Saturday
		15	[% CASE 'sunday' %]Sunday
		16	[% END %]
		17	[% END %]
		18
7	[% FOREACH day IN daily_choice %]	19	[% FOREACH day IN daily_choice %]
8	[% IF permanent_irreg.grep( day.value ).0 == day.value %]	20	[% IF permanent_irreg.grep( day.value ).0 == day.value %]
9	<input type="checkbox" name="permanent_irregularity"	21	<input type="checkbox" name="permanent_irregularity"
Lines 17-21 Link Here
17	value="[% day.value %]" class="skip"	29	value="[% day.value %]" class="skip"
18	/>	30	/>
19	[% END %]	31	[% END %]
20	<label for="[% day.name %]">[% day.desc %]</label>	32	<label for="[% day.name %]">[% PROCESS days d=day.name %]</label>
21	[% END %]	33	[% END %]

Lines 17-23 Link Here

(-)a/t/Koha/DateUtils.t (-2 / +3 lines)
17		17
18	use Modern::Perl;	18	use Modern::Perl;
19		19
20	use Test::More tests => 9;	20	use Test::More tests => 10;
21	use Test::Warn;	21	use Test::Warn;
22		22
23	BEGIN {	23	BEGIN {
Lines 27-32 BEGIN { Link Here
27	my $dt = DateTime->new(year => 2017, month => 1, day => 1);	27	my $dt = DateTime->new(year => 2017, month => 1, day => 1);
28		28
29	eval { issue_number('2017', 'day'); };	29	eval { issue_number('2017', 'day'); };
		30	is(ref($@), 'Koha::Exceptions::WrongParameter');
30	is($@, 'Date passed to issue_number is not a valid DateTime object');	31	is($@, 'Date passed to issue_number is not a valid DateTime object');
31		32
32	is(issue_number($dt, 'day'), 7, '2017-01-01 is the seventh day of week');	33	is(issue_number($dt, 'day'), 7, '2017-01-01 is the seventh day of week');
Lines 41-46 is(issue_number($dt, 'day'), 6, '2022-09-17 is the sixth day of week'); Link Here
41		42
42	is(issue_number($dt, 'week'), 37, '2022-09-17 is the week #37 of the year');	43	is(issue_number($dt, 'week'), 37, '2022-09-17 is the week #37 of the year');
43		44
44	is(issue_number($dt, 'month'), 9, '2017-09-17 is the ninth month of the year');	45	is(issue_number($dt, 'month'), 9, '2022-09-17 is the ninth month of the year');
45		46
46	is(issue_number($dt, 'foo'), 0, 'issue_number return 0 for others issue type');	47	is(issue_number($dt, 'foo'), 0, 'issue_number return 0 for others issue type');