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

(-)a/C4/Serials.pm (-6 / +6 lines)
Lines 1385-1391 sub ModSubscription { Link Here
1385
    $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, $status,
1385
    $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, $status,
1386
    $biblionumber, $callnumber, $notes, $letter, $manualhistory,
1386
    $biblionumber, $callnumber, $notes, $letter, $manualhistory,
1387
    $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1387
    $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1388
    $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq, $seriallifespan
1388
    $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq, $serial_lifespan
1389
    ) = @_;
1389
    ) = @_;
1390
1390
1391
    my $dbh   = C4::Context->dbh;
1391
    my $dbh   = C4::Context->dbh;
Lines 1399-1405 sub ModSubscription { Link Here
1399
            internalnotes=?, serialsadditems=?, staffdisplaycount=?,
1399
            internalnotes=?, serialsadditems=?, staffdisplaycount=?,
1400
            opacdisplaycount=?, graceperiod=?, location = ?, enddate=?,
1400
            opacdisplaycount=?, graceperiod=?, location = ?, enddate=?,
1401
            skip_serialseq=?,
1401
            skip_serialseq=?,
1402
            seriallifespan=?
1402
            serial_lifespan=?
1403
        WHERE subscriptionid = ?";
1403
        WHERE subscriptionid = ?";
1404
1404
1405
    my $sth = $dbh->prepare($query);
1405
    my $sth = $dbh->prepare($query);
Lines 1413-1419 sub ModSubscription { Link Here
1413
        $letter,          ($manualhistory ? $manualhistory : 0),
1413
        $letter,          ($manualhistory ? $manualhistory : 0),
1414
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1414
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1415
        $graceperiod,     $location,       $enddate,        $skip_serialseq,
1415
        $graceperiod,     $location,       $enddate,        $skip_serialseq,
1416
        $seriallifespan, $subscriptionid
1416
        $serial_lifespan, $subscriptionid
1417
    );
1417
    );
1418
    my $rows = $sth->rows;
1418
    my $rows = $sth->rows;
1419
1419
Lines 1445-1451 sub NewSubscription { Link Here
1445
    $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity,
1445
    $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity,
1446
    $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes,
1446
    $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes,
1447
    $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
1447
    $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,
1448
    $location, $enddate, $skip_serialseq, $seriallifespan
1448
    $location, $enddate, $skip_serialseq, $serial_lifespan
1449
    ) = @_;
1449
    ) = @_;
1450
    my $dbh = C4::Context->dbh;
1450
    my $dbh = C4::Context->dbh;
1451
1451
Lines 1459-1465 sub NewSubscription { Link Here
1459
            irregularity, numberpattern, locale, callnumber,
1459
            irregularity, numberpattern, locale, callnumber,
1460
            manualhistory, internalnotes, serialsadditems, staffdisplaycount,
1460
            manualhistory, internalnotes, serialsadditems, staffdisplaycount,
1461
            opacdisplaycount, graceperiod, location, enddate, skip_serialseq,
1461
            opacdisplaycount, graceperiod, location, enddate, skip_serialseq,
1462
            seriallifespan)
1462
            serial_lifespan)
1463
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1463
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1464
        |;
1464
        |;
1465
    my $sth = $dbh->prepare($query);
1465
    my $sth = $dbh->prepare($query);
Lines 1471-1477 sub NewSubscription { Link Here
1471
        $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber,
1471
        $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber,
1472
        $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
1472
        $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
1473
        $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq,
1473
        $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq,
1474
        $seriallifespan
1474
        $serial_lifespan
1475
    );
1475
    );
1476
1476
1477
    my $subscriptionid = $dbh->{'mysql_insertid'};
1477
    my $subscriptionid = $dbh->{'mysql_insertid'};
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 2099-2105 CREATE TABLE `subscription` ( Link Here
2099
  `enddate` date default NULL,
2099
  `enddate` date default NULL,
2100
  `closed` INT(1) NOT NULL DEFAULT 0,
2100
  `closed` INT(1) NOT NULL DEFAULT 0,
2101
  `reneweddate` date default NULL,
2101
  `reneweddate` date default NULL,
2102
  `seriallifespan` TINYINT(1) DEFAULT -1,
2102
  `serial_lifespan` TINYINT(1) DEFAULT -1,
2103
  PRIMARY KEY  (`subscriptionid`),
2103
  PRIMARY KEY  (`subscriptionid`),
2104
  CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE,
2104
  CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE,
2105
  CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE
2105
  CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +2 lines)
Lines 8605-8612 if ( CheckVersion($DBversion) ) { Link Here
8605
8605
8606
$DBversion = 'XXX';
8606
$DBversion = 'XXX';
8607
if ( CheckVersion($DBversion) ) {
8607
if ( CheckVersion($DBversion) ) {
8608
   $dbh->do("ALTER TABLE subscription ADD `seriallifespan` TINYINT(1) DEFAULT -1");
8608
   $dbh->do("ALTER TABLE subscription ADD `serial_lifespan` TINYINT(1) DEFAULT -1");
8609
   print "Upgrade to $DBversion done (Add seriallifespan to subscription)\n";
8609
   print "Upgrade to $DBversion done (Add serial_lifespan to subscription)\n";
8610
   SetVersion ($DBversion);
8610
   SetVersion ($DBversion);
8611
}
8611
}
8612
8612
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-13 / +13 lines)
Lines 508-566 $(document).ready(function() { Link Here
508
            [% END %]
508
            [% END %]
509
        </li>
509
        </li>
510
        <li>
510
        <li>
511
            <label for="seriallifespan">Serial lifespan:</label>
511
            <label for="serial_lifespan">Serial lifespan:</label>
512
            <select name="seriallifespan" id="seriallifespan">
512
            <select name="serial_lifespan" id="serial_lifespan">
513
            [% IF ( seriallifespan == -1 ) %]
513
            [% IF ( serial_lifespan == -1 ) %]
514
                <option value="-1" selected="selected">Permanent</option>
514
                <option value="-1" selected="selected">Permanent</option>
515
            [% ELSE %]
515
            [% ELSE %]
516
                <option value="-1">Permanent</option>
516
                <option value="-1">Permanent</option>
517
            [% END %]
517
            [% END %]
518
            [% IF ( seriallifespan == 1 ) %]
518
            [% IF ( serial_lifespan == 1 ) %]
519
                <option value="1" selected="selected">1 year</option>
519
                <option value="1" selected="selected">1 year</option>
520
            [% ELSE %]
520
            [% ELSE %]
521
                <option value="1">1 year</option>
521
                <option value="1">1 year</option>
522
            [% END %]
522
            [% END %]
523
            [% IF ( seriallifespan == 2 ) %]
523
            [% IF ( serial_lifespan == 2 ) %]
524
                <option value="2" selected="selected">2 years</option>
524
                <option value="2" selected="selected">2 years</option>
525
            [% ELSE %]
525
            [% ELSE %]
526
                <option value="2">2 years</option>
526
                <option value="2">2 years</option>
527
            [% END %]
527
            [% END %]
528
            [% IF ( seriallifespan == 3 ) %]
528
            [% IF ( serial_lifespan == 3 ) %]
529
                <option value="3" selected="selected">3 years</option>
529
                <option value="3" selected="selected">3 years</option>
530
            [% ELSE %]
530
            [% ELSE %]
531
                <option value="3">3 years</option>
531
                <option value="3">3 years</option>
532
            [% END %]
532
            [% END %]
533
            [% IF ( seriallifespan == 4 ) %]
533
            [% IF ( serial_lifespan == 4 ) %]
534
                <option value="4" selected="selected">4 years</option>
534
                <option value="4" selected="selected">4 years</option>
535
            [% ELSE %]
535
            [% ELSE %]
536
                <option value="4">4 years</option>
536
                <option value="4">4 years</option>
537
            [% END %]
537
            [% END %]
538
            [% IF ( seriallifespan == 5 ) %]
538
            [% IF ( serial_lifespan == 5 ) %]
539
                <option value="5" selected="selected">5 years</option>
539
                <option value="5" selected="selected">5 years</option>
540
            [% ELSE %]
540
            [% ELSE %]
541
                <option value="5">5 years</option>
541
                <option value="5">5 years</option>
542
            [% END %]
542
            [% END %]
543
            [% IF ( seriallifespan == 6 ) %]
543
            [% IF ( serial_lifespan == 6 ) %]
544
                <option value="6" selected="selected">6 years</option>
544
                <option value="6" selected="selected">6 years</option>
545
            [% ELSE %]
545
            [% ELSE %]
546
                <option value="6">6 years</option>
546
                <option value="6">6 years</option>
547
            [% END %]
547
            [% END %]
548
            [% IF ( seriallifespan == 7 ) %]
548
            [% IF ( serial_lifespan == 7 ) %]
549
                <option value="7" selected="selected">7 years</option>
549
                <option value="7" selected="selected">7 years</option>
550
            [% ELSE %]
550
            [% ELSE %]
551
                <option value="7">7 years</option>
551
                <option value="7">7 years</option>
552
            [% END %]
552
            [% END %]
553
            [% IF ( seriallifespan == 8 ) %]
553
            [% IF ( serial_lifespan == 8 ) %]
554
                <option value="8" selected="selected">8 years</option>
554
                <option value="8" selected="selected">8 years</option>
555
            [% ELSE %]
555
            [% ELSE %]
556
                <option value="8">8 years</option>
556
                <option value="8">8 years</option>
557
            [% END %]
557
            [% END %]
558
            [% IF ( seriallifespan == 9 ) %]
558
            [% IF ( serial_lifespan == 9 ) %]
559
                <option value="9" selected="selected">9 years</option>
559
                <option value="9" selected="selected">9 years</option>
560
            [% ELSE %]
560
            [% ELSE %]
561
                <option value="9">9 years</option>
561
                <option value="9">9 years</option>
562
            [% END %]
562
            [% END %]
563
            [% IF ( seriallifespan == 10 ) %]
563
            [% IF ( serial_lifespan == 10 ) %]
564
                <option value="10" selected="selected">10 years</option>
564
                <option value="10" selected="selected">10 years</option>
565
            [% ELSE %]
565
            [% ELSE %]
566
                <option value="10">10 years</option>
566
                <option value="10">10 years</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-22 / +22 lines)
Lines 181-207 $(document).ready(function() { Link Here
181
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
181
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
182
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
182
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
183
                <li><span class="label">Serial lifespan:</span>
183
                <li><span class="label">Serial lifespan:</span>
184
                [% IF seriallifespan == -1 %]
184
                [% IF serial_lifespan == -1 %]
185
                    <span>Permanent</span>
185
                    <span>Permanent</span>
186
                [% ELSIF ( seriallifespan == 1 ) %]
186
                [% ELSIF ( serial_lifespan == 1 ) %]
187
                    <span>1 year</span>
187
                    <span>1 year</span>
188
                [% ELSIF ( seriallifespan == 2 ) %]
188
                [% ELSIF ( serial_lifespan == 2 ) %]
189
                    <span>2 years</span>
189
                    <span>2 years</span>
190
                [% ELSIF ( seriallifespan == 3 ) %]
190
                [% ELSIF ( serial_lifespan == 3 ) %]
191
                    <span>3 years</span>
191
                    <span>3 years</span>
192
                [% ELSIF ( seriallifespan == 4 ) %]
192
                [% ELSIF ( serial_lifespan == 4 ) %]
193
                    <span>4 years</span>
193
                    <span>4 years</span>
194
                [% ELSIF ( seriallifespan == 5 ) %]
194
                [% ELSIF ( serial_lifespan == 5 ) %]
195
                    <span>5 years</span>
195
                    <span>5 years</span>
196
                [% ELSIF ( seriallifespan == 6 ) %]
196
                [% ELSIF ( serial_lifespan == 6 ) %]
197
                    <span>6 years</span>
197
                    <span>6 years</span>
198
                [% ELSIF ( seriallifespan == 7 ) %]
198
                [% ELSIF ( serial_lifespan == 7 ) %]
199
                    <span>7 years</span>
199
                    <span>7 years</span>
200
                [% ELSIF ( seriallifespan == 8 ) %]
200
                [% ELSIF ( serial_lifespan == 8 ) %]
201
                    <span>8 years</span>
201
                    <span>8 years</span>
202
                [% ELSIF ( seriallifespan == 9 ) %]
202
                [% ELSIF ( serial_lifespan == 9 ) %]
203
                    <span>9 years</span>
203
                    <span>9 years</span>
204
                [% ELSIF ( seriallifespan == 10 ) %]
204
                [% ELSIF ( serial_lifespan == 10 ) %]
205
                    <span>10 years</span>
205
                    <span>10 years</span>
206
                [% END %]
206
                [% END %]
207
            </li>
207
            </li>
Lines 274-300 $(document).ready(function() { Link Here
274
        <h2>Serial issues</h2>
274
        <h2>Serial issues</h2>
275
        <p>
275
        <p>
276
            <label>Serial lifespan :</label>
276
            <label>Serial lifespan :</label>
277
            [% IF seriallifespan == -1 %]
277
            [% IF serial_lifespan == -1 %]
278
                <span>Permanent</span>
278
                <span>Permanent</span>
279
            [% ELSIF ( seriallifespan == 1 ) %]
279
            [% ELSIF ( serial_lifespan == 1 ) %]
280
                <span>1 year</span>
280
                <span>1 year</span>
281
            [% ELSIF ( seriallifespan == 2 ) %]
281
            [% ELSIF ( serial_lifespan == 2 ) %]
282
                <span>2 years</span>
282
                <span>2 years</span>
283
            [% ELSIF ( seriallifespan == 3 ) %]
283
            [% ELSIF ( serial_lifespan == 3 ) %]
284
                <span>3 years</span>
284
                <span>3 years</span>
285
            [% ELSIF ( seriallifespan == 4 ) %]
285
            [% ELSIF ( serial_lifespan == 4 ) %]
286
                <span>4 years</span>
286
                <span>4 years</span>
287
            [% ELSIF ( seriallifespan == 5 ) %]
287
            [% ELSIF ( serial_lifespan == 5 ) %]
288
                <span>5 years</span>
288
                <span>5 years</span>
289
            [% ELSIF ( seriallifespan == 6 ) %]
289
            [% ELSIF ( serial_lifespan == 6 ) %]
290
                <span>6 years</span>
290
                <span>6 years</span>
291
            [% ELSIF ( seriallifespan == 7 ) %]
291
            [% ELSIF ( serial_lifespan == 7 ) %]
292
                <span>7 years</span>
292
                <span>7 years</span>
293
            [% ELSIF ( seriallifespan == 8 ) %]
293
            [% ELSIF ( serial_lifespan == 8 ) %]
294
                <span>8 years</span>
294
                <span>8 years</span>
295
            [% ELSIF ( seriallifespan == 9 ) %]
295
            [% ELSIF ( serial_lifespan == 9 ) %]
296
                <span>9 years</span>
296
                <span>9 years</span>
297
            [% ELSIF ( seriallifespan == 10 ) %]
297
            [% ELSIF ( serial_lifespan == 10 ) %]
298
                <span>10 years</span>
298
                <span>10 years</span>
299
            [% END %]
299
            [% END %]
300
        </p>
300
        </p>
(-)a/serials/subscription-add.pl (-6 / +5 lines)
Lines 108-114 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { Link Here
108
                    history => ($op eq 'modify'),
108
                    history => ($op eq 'modify'),
109
                    "periodicity".$subs->{'periodicity'} => 1,
109
                    "periodicity".$subs->{'periodicity'} => 1,
110
                    "numberpattern".$subs->{'numberpattern'} => 1,
110
                    "numberpattern".$subs->{'numberpattern'} => 1,
111
                    "seriallifespan" => $subs->{'seriallifespan'},
111
                    "serial_lifespan" => $subs->{'serial_lifespan'},
112
                    firstacquiyear => substr($firstissuedate,0,4),
112
                    firstacquiyear => substr($firstissuedate,0,4),
113
                    );
113
                    );
114
114
Lines 322-331 sub redirect_add_subscription { Link Here
322
    my $opacdisplaycount  = $query->param('opacdisplaycount');
322
    my $opacdisplaycount  = $query->param('opacdisplaycount');
323
    my $location          = $query->param('location');
323
    my $location          = $query->param('location');
324
    my $skip_serialseq    = $query->param('skip_serialseq');
324
    my $skip_serialseq    = $query->param('skip_serialseq');
325
    my $serial_lifespan    = $query->param('serial_lifespan');
325
    my $startdate = format_date_in_iso( $query->param('startdate') );
326
    my $startdate = format_date_in_iso( $query->param('startdate') );
326
    my $enddate = format_date_in_iso( $query->param('enddate') );
327
    my $enddate = format_date_in_iso( $query->param('enddate') );
327
    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));
328
    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));
328
    my $seriallifespan = $query->param('seriallifespan');
329
    if(!defined $enddate || $enddate eq '') {
329
    if(!defined $enddate || $enddate eq '') {
330
        if($subtype eq "issues") {
330
        if($subtype eq "issues") {
331
            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength);
331
            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength);
Lines 342-350 sub redirect_add_subscription { Link Here
342
        join(";",@irregularity), $numberpattern, $locale, $callnumber,
342
        join(";",@irregularity), $numberpattern, $locale, $callnumber,
343
        $manualhistory, $internalnotes, $serialsadditems,
343
        $manualhistory, $internalnotes, $serialsadditems,
344
        $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
344
        $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate,
345
        $skip_serialseq, $seriallifespan
345
        $skip_serialseq, $serial_lifespan
346
    );
346
    );
347
    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
348
347
349
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
348
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
350
    return;
349
    return;
Lines 392-397 sub redirect_mod_subscription { Link Here
392
    my $graceperiod     = $query->param('graceperiod') || 0;
391
    my $graceperiod     = $query->param('graceperiod') || 0;
393
    my $location = $query->param('location');
392
    my $location = $query->param('location');
394
    my $skip_serialseq    = $query->param('skip_serialseq');
393
    my $skip_serialseq    = $query->param('skip_serialseq');
394
    my $serial_lifespan    = $query->param('serial_lifespan');
395
395
396
    # Guess end date
396
    # Guess end date
397
    if(!defined $enddate || $enddate eq '') {
397
    if(!defined $enddate || $enddate eq '') {
Lines 418-427 sub redirect_mod_subscription { Link Here
418
        $status, $biblionumber, $callnumber, $notes, $letter,
418
        $status, $biblionumber, $callnumber, $notes, $letter,
419
        $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
419
        $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount,
420
        $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
420
        $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid,
421
        $skip_serialseq, $seiallifespan
421
        $skip_serialseq, $serial_lifespan
422
    );
422
    );
423
423
424
        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
425
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
424
    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
426
    return;
425
    return;
427
}
426
}
(-)a/serials/subscription-detail.pl (-2 / +1 lines)
Lines 157-163 $template->param( Link Here
157
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
157
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
158
    basketno => $order->{basketno},
158
    basketno => $order->{basketno},
159
    %$tmpl_infos,
159
    %$tmpl_infos,
160
    seriallifespan => $subs->{'seriallifespan'},
160
    serial_lifespan => $subs->{'serial_lifespan'},
161
);
161
);
162
162
163
output_html_with_http_headers $query, $cookie, $template->output;
163
output_html_with_http_headers $query, $cookie, $template->output;
164
- 

Return to bug 8587