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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt (-2 / +1 lines)
Lines 341-347 Link Here
341
                    'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
341
                    'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
342
                    'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
342
                    'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
343
                    'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
343
                    'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
344
                    'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale'
344
                    'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale', 'from'
345
                ];
345
                ];
346
                for(i in ajaxParams) {
346
                for(i in ajaxParams) {
347
                    var param = ajaxParams[i];
347
                    var param = ajaxParams[i];
Lines 349-355 Link Here
349
                    if(value.length > 0)
349
                    if(value.length > 0)
350
                        ajaxData[param] = value;
350
                        ajaxData[param] = value;
351
                }
351
                }
352
353
                $.ajax({
352
                $.ajax({
354
                    url: "/cgi-bin/koha/serials/showpredictionpattern.pl",
353
                    url: "/cgi-bin/koha/serials/showpredictionpattern.pl",
355
                    data: ajaxData,
354
                    data: ajaxData,
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-2 / +1 lines)
Lines 304-310 function testPredictionPattern() { Link Here
304
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
304
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
305
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
305
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
306
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
306
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
307
        'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale',
307
        'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale', 'from',
308
        'sfdescription', 'unitsperissue', 'issuesperunit', 'unit'
308
        'sfdescription', 'unitsperissue', 'issuesperunit', 'unit'
309
    ];
309
    ];
310
    for(i in ajaxParams) {
310
    for(i in ajaxParams) {
Lines 313-319 function testPredictionPattern() { Link Here
313
        if(value.length > 0)
313
        if(value.length > 0)
314
            ajaxData[param] = value;
314
            ajaxData[param] = value;
315
    }
315
    }
316
317
    $.ajax({
316
    $.ajax({
318
        url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
317
        url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
319
        data: ajaxData,
318
        data: ajaxData,
(-)a/serials/showpredictionpattern.pl (-4 / +5 lines)
Lines 52-57 my $frequencyid = $input->param('frequency'); Link Here
52
my $firstacquidate = $input->param('firstacquidate');
52
my $firstacquidate = $input->param('firstacquidate');
53
my $nextacquidate = $input->param('nextacquidate');
53
my $nextacquidate = $input->param('nextacquidate');
54
my $enddate = $input->param('to');
54
my $enddate = $input->param('to');
55
my $startdate = $input->param('from');
55
my $subtype = $input->param('subtype');
56
my $subtype = $input->param('subtype');
56
my $sublength = $input->param('sublength');
57
my $sublength = $input->param('sublength');
57
my $custompattern = $input->param('custompattern');
58
my $custompattern = $input->param('custompattern');
Lines 93-98 my %pattern = ( Link Here
93
94
94
$firstacquidate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
95
$firstacquidate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
95
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
96
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
97
$startdate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
98
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
96
99
97
$enddate = eval { output_pref( { str => $enddate, dateonly => 1, dateformat => 'iso' } ); };
100
$enddate = eval { output_pref( { str => $enddate, dateonly => 1, dateformat => 'iso' } ); };
98
101
Lines 154-167 while( $i < 1000 ) { Link Here
154
        $line{'publicationdate'} = $date;
157
        $line{'publicationdate'} = $date;
155
        $line{'dow'} = Day_of_Week(split /-/, $date);
158
        $line{'dow'} = Day_of_Week(split /-/, $date);
156
    }
159
    }
157
158
    # Check if we don't have exceed end date
160
    # Check if we don't have exceed end date
159
    if($sublength){
161
    if($sublength){
160
        if($subtype eq "issues" && $i >= $sublength){
162
        if($subtype eq "issues" && $i >= $sublength){
161
            last;
163
            last;
162
        } elsif($subtype eq "weeks" && $date && Delta_Days( split(/-/, $date), Add_Delta_Days( split(/-/, $firstacquidate), 7*$sublength - 1 ) ) < 0) {
164
        } elsif($subtype eq "weeks" && $date && Delta_Days( split(/-/, $date), Add_Delta_Days( split(/-/, $startdate), 7*$sublength - 1 ) ) < 0) {
163
            last;
165
            last;
164
        } elsif($subtype eq "months" && $date && (Delta_Days( split(/-/, $date), Add_Delta_YM( split(/-/, $firstacquidate), 0, $sublength) ) - 1) < 0 ) {
166
        } elsif($subtype eq "months" && $date && (Delta_Days( split(/-/, $date), Add_Delta_YM( split(/-/, $startdate), 0, $sublength) ) - 1) < 0 ) {
165
            last;
167
            last;
166
        }
168
        }
167
    }
169
    }
168
- 

Return to bug 15148