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 342-348 Link Here
342
                    'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
342
                    'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
343
                    'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
343
                    'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
344
                    'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
344
                    'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
345
                    'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale'
345
                    'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale', 'from'
346
                ];
346
                ];
347
                for(i in ajaxParams) {
347
                for(i in ajaxParams) {
348
                    var param = ajaxParams[i];
348
                    var param = ajaxParams[i];
Lines 350-356 Link Here
350
                    if(value.length > 0)
350
                    if(value.length > 0)
351
                        ajaxData[param] = value;
351
                        ajaxData[param] = value;
352
                }
352
                }
353
354
                $.ajax({
353
                $.ajax({
355
                    url: "/cgi-bin/koha/serials/showpredictionpattern.pl",
354
                    url: "/cgi-bin/koha/serials/showpredictionpattern.pl",
356
                    data: ajaxData,
355
                    data: ajaxData,
(-)a/koha-tmpl/intranet-tmpl/prog/js/subscription-add.js (-3 / +2 lines)
Lines 275-281 function testPredictionPattern() { Link Here
275
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
275
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
276
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
276
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
277
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
277
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
278
        'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale'
278
        'whenmorethan1', 'whenmorethan2', 'whenmorethan3', 'locale', 'from'
279
    ];
279
    ];
280
    for(i in ajaxParams) {
280
    for(i in ajaxParams) {
281
        var param = ajaxParams[i];
281
        var param = ajaxParams[i];
Lines 283-289 function testPredictionPattern() { Link Here
283
        if(value.length > 0)
283
        if(value.length > 0)
284
            ajaxData[param] = value;
284
            ajaxData[param] = value;
285
    }
285
    }
286
287
    $.ajax({
286
    $.ajax({
288
        url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
287
        url:"/cgi-bin/koha/serials/showpredictionpattern.pl",
289
        data: ajaxData,
288
        data: ajaxData,
Lines 496-499 $(document).ready(function() { Link Here
496
        e.preventDefault();
495
        e.preventDefault();
497
        testPredictionPattern();
496
        testPredictionPattern();
498
    });
497
    });
499
});
498
});
(-)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('enddate');
54
my $enddate = $input->param('enddate');
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 79-84 my %pattern = ( Link Here
79
80
80
$firstacquidate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
81
$firstacquidate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
81
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
82
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
83
$startdate = eval { output_pref( { str => $firstacquidate, dateonly => 1, dateformat => 'iso' } ); }
84
    or output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
82
85
83
$enddate = eval { output_pref( { str => $enddate, dateonly => 1, dateformat => 'iso' } ); };
86
$enddate = eval { output_pref( { str => $enddate, dateonly => 1, dateformat => 'iso' } ); };
84
87
Lines 141-154 while( $i < 1000 ) { Link Here
141
        $line{'publicationdate'} = $date;
144
        $line{'publicationdate'} = $date;
142
        $line{'dow'} = Day_of_Week(split /-/, $date);
145
        $line{'dow'} = Day_of_Week(split /-/, $date);
143
    }
146
    }
144
145
    # Check if we don't have exceed end date
147
    # Check if we don't have exceed end date
146
    if($sublength){
148
    if($sublength){
147
        if($subtype eq "issues" && $i >= $sublength){
149
        if($subtype eq "issues" && $i >= $sublength){
148
            last;
150
            last;
149
        } elsif($subtype eq "weeks" && $date && Delta_Days( split(/-/, $date), Add_Delta_Days( split(/-/, $firstacquidate), 7*$sublength - 1 ) ) < 0) {
151
        } elsif($subtype eq "weeks" && $date && Delta_Days( split(/-/, $date), Add_Delta_Days( split(/-/, $startdate), 7*$sublength - 1 ) ) < 0) {
150
            last;
152
            last;
151
        } elsif($subtype eq "months" && $date && (Delta_Days( split(/-/, $date), Add_Delta_YM( split(/-/, $firstacquidate), 0, $sublength) ) - 1) < 0 ) {
153
        } elsif($subtype eq "months" && $date && (Delta_Days( split(/-/, $date), Add_Delta_YM( split(/-/, $startdate), 0, $sublength) ) - 1) < 0 ) {
152
            last;
154
            last;
153
        }
155
        }
154
    }
156
    }
155
- 

Return to bug 15148