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

(-)a/C4/Serials.pm (-4 / +71 lines)
Lines 93-99 sub GetSuppliersWithLateIssues { Link Here
93
    FROM            subscription
93
    FROM            subscription
94
    LEFT JOIN       serial ON serial.subscriptionid=subscription.subscriptionid
94
    LEFT JOIN       serial ON serial.subscriptionid=subscription.subscriptionid
95
    LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
95
    LEFT JOIN aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
96
    WHERE id > 0 AND ((planneddate < now() AND serial.status=1) OR serial.STATUS = 3 OR serial.STATUS = 4) ORDER BY name|;
96
    WHERE id > 0
97
        AND (
98
            (planneddate < now() AND serial.status=1)
99
            OR serial.STATUS = 3 OR serial.STATUS = 4
100
        )
101
        AND subscription.closed = 0
102
    ORDER BY name|;
97
    return $dbh->selectall_arrayref($query, { Slice => {} });
103
    return $dbh->selectall_arrayref($query, { Slice => {} });
98
}
104
}
99
105
Lines 122-127 sub GetLateIssues { Link Here
122
            LEFT JOIN  aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
128
            LEFT JOIN  aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
123
            WHERE      ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)
129
            WHERE      ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)
124
            AND        subscription.aqbooksellerid=?
130
            AND        subscription.aqbooksellerid=?
131
            AND        subscription.closed = 0
125
            ORDER BY   title
132
            ORDER BY   title
126
        |;
133
        |;
127
        $sth = $dbh->prepare($query);
134
        $sth = $dbh->prepare($query);
Lines 134-139 sub GetLateIssues { Link Here
134
            LEFT JOIN  biblio ON biblio.biblionumber = subscription.biblionumber
141
            LEFT JOIN  biblio ON biblio.biblionumber = subscription.biblionumber
135
            LEFT JOIN  aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
142
            LEFT JOIN  aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
136
            WHERE      ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)
143
            WHERE      ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)
144
            AND        subscription.closed = 0
137
            ORDER BY   title
145
            ORDER BY   title
138
        |;
146
        |;
139
        $sth = $dbh->prepare($query);
147
        $sth = $dbh->prepare($query);
Lines 662-669 sub SearchSubscriptions { Link Here
662
        push @where_args, $args->{biblionumber};
670
        push @where_args, $args->{biblionumber};
663
    }
671
    }
664
    if( $args->{title} ){
672
    if( $args->{title} ){
665
        push @where_strs, "biblio.title LIKE ?";
673
        my @words = split / /, $args->{title};
666
        push @where_args, "%$args->{title}%";
674
        my (@strs, @args);
675
        foreach my $word (@words) {
676
            push @strs, "biblio.title LIKE ?";
677
            push @args, "%$word%";
678
        }
679
        if (@strs) {
680
            push @where_strs, '(' . join (' AND ', @strs) . ')';
681
            push @where_args, @args;
682
        }
667
    }
683
    }
668
    if( $args->{issn} ){
684
    if( $args->{issn} ){
669
        push @where_strs, "biblioitems.issn LIKE ?";
685
        push @where_strs, "biblioitems.issn LIKE ?";
Lines 685-691 sub SearchSubscriptions { Link Here
685
        push @where_strs, "subscription.branchcode = ?";
701
        push @where_strs, "subscription.branchcode = ?";
686
        push @where_args, "$args->{branch}";
702
        push @where_args, "$args->{branch}";
687
    }
703
    }
688
704
    if( defined $args->{closed} ){
705
        push @where_strs, "subscription.closed = ?";
706
        push @where_args, "$args->{closed}";
707
    }
689
    if(@where_strs){
708
    if(@where_strs){
690
        $query .= " WHERE " . join(" AND ", @where_strs);
709
        $query .= " WHERE " . join(" AND ", @where_strs);
691
    }
710
    }
Lines 2465-2470 sub is_barcode_in_use { Link Here
2465
    return @{$occurences};
2484
    return @{$occurences};
2466
}
2485
}
2467
2486
2487
=head2 CloseSubscription
2488
Close a subscription given a subscriptionid
2489
=cut
2490
sub CloseSubscription {
2491
    my ( $subscriptionid ) = @_;
2492
    return unless $subscriptionid;
2493
    my $dbh = C4::Context->dbh;
2494
    my $sth = $dbh->prepare( qq{
2495
        UPDATE subscription
2496
        SET closed = 1
2497
        WHERE subscriptionid = ?
2498
    } );
2499
    $sth->execute( $subscriptionid );
2500
2501
    # Set status = missing when status = stopped
2502
    $sth = $dbh->prepare( qq{
2503
        UPDATE serial
2504
        SET status = 8
2505
        WHERE subscriptionid = ?
2506
        AND status = 1
2507
    } );
2508
    $sth->execute( $subscriptionid );
2509
}
2510
2511
=head2 ReopenSubscription
2512
Reopen a subscription given a subscriptionid
2513
=cut
2514
sub ReopenSubscription {
2515
    my ( $subscriptionid ) = @_;
2516
    return unless $subscriptionid;
2517
    my $dbh = C4::Context->dbh;
2518
    my $sth = $dbh->prepare( qq{
2519
        UPDATE subscription
2520
        SET closed = 0
2521
        WHERE subscriptionid = ?
2522
    } );
2523
    $sth->execute( $subscriptionid );
2524
2525
    # Set status = expected when status = stopped
2526
    $sth = $dbh->prepare( qq{
2527
        UPDATE serial
2528
        SET status = 1
2529
        WHERE subscriptionid = ?
2530
        AND status = 8
2531
    } );
2532
    $sth->execute( $subscriptionid );
2533
}
2534
2468
1;
2535
1;
2469
__END__
2536
__END__
2470
2537
(-)a/catalogue/detail.pl (+2 lines)
Lines 155-160 foreach my $subscription (@subscriptions) { Link Here
155
    $cell{branchcode}        = $subscription->{branchcode};
155
    $cell{branchcode}        = $subscription->{branchcode};
156
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
156
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
157
    $cell{hasalert}          = $subscription->{hasalert};
157
    $cell{hasalert}          = $subscription->{hasalert};
158
    $cell{callnumber}        = $subscription->{callnumber};
159
    $cell{closed}            = $subscription->{closed};
158
    #get the three latest serials.
160
    #get the three latest serials.
159
	$serials_to_display = $subscription->{staffdisplaycount};
161
	$serials_to_display = $subscription->{staffdisplaycount};
160
	$serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
162
	$serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 1920-1925 CREATE TABLE `subscription` ( Link Here
1920
  `opacdisplaycount` VARCHAR(10) NULL,
1920
  `opacdisplaycount` VARCHAR(10) NULL,
1921
  `graceperiod` int(11) NOT NULL default '0',
1921
  `graceperiod` int(11) NOT NULL default '0',
1922
  `enddate` date default NULL,
1922
  `enddate` date default NULL,
1923
  `closed ` INT(1) NOT NULL DEFAULT 0,
1923
  PRIMARY KEY  (`subscriptionid`)
1924
  PRIMARY KEY  (`subscriptionid`)
1924
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1925
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
1925
1926
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +10 lines)
Lines 6012-6018 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6012
    SetVersion ($DBversion);
6012
    SetVersion ($DBversion);
6013
}
6013
}
6014
6014
6015
6016
$DBversion = "3.09.00.062";
6015
$DBversion = "3.09.00.062";
6017
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6016
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6018
   $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'");
6017
   $dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'");
Lines 6083-6088 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
6083
    SetVersion($DBversion);
6082
    SetVersion($DBversion);
6084
}
6083
}
6085
6084
6085
$DBversion = "3.11.00.XXX";
6086
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
6087
    $dbh->do(qq{
6088
        ALTER TABLE subscription ADD COLUMN closed INT(1) NOT NULL DEFAULT 0 AFTER enddate;
6089
    });
6090
6091
    print "Upgrade to $DBversion done (Bug 8782: Add field subscription.closed)\n";
6092
    SetVersion($DBversion);
6093
}
6094
6086
=head1 FUNCTIONS
6095
=head1 FUNCTIONS
6087
6096
6088
=head2 TableExists($table)
6097
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc (+2 lines)
Lines 1-6 Link Here
1
[% IF ( subscriptionid ) %]
1
[% IF ( subscriptionid ) %]
2
<ul>
2
<ul>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
3
<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid %]">Serial collection</a></li>
4
  [% UNLESS closed %]
4
    [% IF ( routing && CAN_user_serials_routing ) %]
5
    [% IF ( routing && CAN_user_serials_routing ) %]
5
        [% IF ( hasRouting ) %]
6
        [% IF ( hasRouting ) %]
6
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
7
             <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]">Edit routing list</a></li>
Lines 8-13 Link Here
8
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
9
            <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=new">Create routing list</a></li>
9
        [% END %]
10
        [% END %]
10
    [% END %]
11
    [% END %]
12
  [% END %]
11
</ul>
13
</ul>
12
[% END %]
14
[% END %]
13
15
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc (-26 / +51 lines)
Lines 1-6 Link Here
1
<div id="toolbar"><script type="text/javascript">
1
<div id="toolbar"><script type="text/javascript">
2
	//<![CDATA[
2
	//<![CDATA[
3
3
4
    function confirm_close() {
5
        var is_confirmed = confirm(_("Are you sure you want to close this subscription?"));
6
        if (is_confirmed) {
7
            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=close";
8
        }
9
    }
10
    function confirm_reopen() {
11
        var is_confirmed = confirm(_("Are you sure you want to reopen this subscription?"));
12
        if (is_confirmed) {
13
            window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=reopen";
14
        }
15
    }
4
	// prepare DOM for YUI Toolbar
16
	// prepare DOM for YUI Toolbar
5
17
6
	 $(document).ready(function() {
18
	 $(document).ready(function() {
Lines 50-55 onclick: {fn:function(){popup([% subscriptionid %])}} Link Here
50
		[% END %]
62
		[% END %]
51
	    new YAHOO.widget.Button("renew");
63
	    new YAHOO.widget.Button("renew");
52
	    new YAHOO.widget.Button("receive");
64
	    new YAHOO.widget.Button("receive");
65
        new YAHOO.widget.Button("close");
66
        new YAHOO.widget.Button("reopen");
53
		[% END %]
67
		[% END %]
54
	}
68
	}
55
69
Lines 57-94 onclick: {fn:function(){popup([% subscriptionid %])}} Link Here
57
	</script>
71
	</script>
58
<ul class="toolbar">
72
<ul class="toolbar">
59
    [% IF ( CAN_user_serials_create_subscription ) %]
73
    [% IF ( CAN_user_serials_create_subscription ) %]
60
	[% IF ( biblionumber_for_new_subscription ) %]
74
        [% IF ( biblionumber_for_new_subscription ) %]
61
        <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]">New subscription</a></li>
75
            <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]">New subscription</a></li>
62
	[% ELSE %]
76
        [% ELSE %]
63
        <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New subscription</a></li>
77
            <li><a id="newsubscription" href="/cgi-bin/koha/serials/subscription-add.pl">New subscription</a></li>
64
	[% END %]
78
        [% END %]
65
    [% END %]
79
    [% END %]
66
80
67
    [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
81
    [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
68
	[% IF ( subscriptionid ) %]
82
        [% IF ( subscriptionid ) %]
69
83
70
	    [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
84
            [% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
71
		[% UNLESS ( cannotedit ) %]
85
                [% UNLESS ( cannotedit ) %]
72
		    <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit</a></li>
86
                    <li id="editmenuc"><a id="edit" href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&amp;subscriptionid=[% subscriptionid %]">Edit</a></li>
73
		[% END %]
87
                [% END %]
74
	    [% END %]
88
            [% END %]
75
89
76
	    [% IF ( CAN_user_serials_create_subscription ) %]
90
            [% IF ( CAN_user_serials_create_subscription ) %]
77
		<li><a id="duplicate" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Duplicate </a></li>
91
                <li><a id="duplicate" href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&amp;subscriptionid=[% subscriptionid %]">Duplicate </a></li>
78
	    [% END %]
92
            [% END %]
79
93
80
	    [% UNLESS ( cannotedit ) %]
94
            [% UNLESS ( cannotedit ) %]
81
		[% IF ( CAN_user_serials_renew_subscription ) %]
95
                [% UNLESS closed %]
82
		    <li id="renewc"><a id="renew" href="#" onclick="popup([% subscriptionid %])">Renew </a></li>
96
                    [% IF ( CAN_user_serials_renew_subscription ) %]
83
		[% END %]
97
                        <li id="renewc"><a id="renew" href="#" onclick="popup([% subscriptionid %])">Renew </a></li>
84
		[% IF ( CAN_user_serials_receive_serials ) %]
98
                    [% END %]
85
		    <li><a id="receive" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3">Receive</a></li>
99
                [% END %]
86
		[% END %]
100
                [% IF ( CAN_user_serials_receive_serials ) %]
87
		[% IF ( CAN_user_serials_delete_subscription ) %]
101
                    [% UNLESS closed %]
88
		    <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
102
                        <li><a id="receive" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid %]&amp;serstatus=1,3">Receive</a></li>
89
		[% END %]
103
                    [% END %]
90
	    [% END %]
104
                [% END %]
91
	[% END %]
105
                [% IF CAN_user_serials_edit_subscription %]
106
                    [% IF closed %]
107
                        <li><a id="reopen" href="javascript:confirm_reopen();">Reopen</a></li>
108
                    [% ELSE %]
109
                        <li><a id="close" href="javascript:confirm_close();">Close</a></li>
110
                    [% END %]
111
                [% END %]
112
                [% IF ( CAN_user_serials_delete_subscription ) %]
113
                    <li><a id="delete" href="javascript:confirm_deletion()">Delete</a></li>
114
                [% END %]
115
            [% END %]
116
        [% END %]
92
    [% END %]
117
    [% END %]
93
</ul>
118
</ul>
94
</div>
119
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-14 / +12 lines)
Lines 470-475 function verify_images() { Link Here
470
    [% FOREACH subscription IN subscriptions %]
470
    [% FOREACH subscription IN subscriptions %]
471
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
471
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
472
	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
472
	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
473
            [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
474
            [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %] </p>[% END %]
473
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
475
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
474
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
476
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
475
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote %])</p>[% END %]
477
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote %])</p>[% END %]
Lines 486-505 function verify_images() { Link Here
486
                <tr>
488
                <tr>
487
                    <td>[% latestserial.serialseq %]</td>
489
                    <td>[% latestserial.serialseq %]</td>
488
                    <td>[% latestserial.planneddate %]</td>
490
                    <td>[% latestserial.planneddate %]</td>
489
                    <td>[% IF ( latestserial.status1 ) %]Expected
491
                    <td>
490
                        [% ELSE %]
492
                      [% IF ( latestserial.status1 ) %]Expected[% END %]
491
                            [% IF ( latestserial.status2 ) %]Arrived
493
                      [% IF ( latestserial.status2 ) %]Arrived[% END %]
492
                            [% ELSE %]
494
                      [% IF ( latestserial.status3 ) %]Late[% END %]
493
                                [% IF ( latestserial.status3 ) %]Late
495
                      [% IF ( latestserial.status4 ) %]Missing[% END %]
494
                                [% ELSE %]
496
                      [% IF ( latestserial.status5 ) %]Not issued[% END %]
495
                                    [% IF ( latestserial.status4 ) %]Missing
497
                      [% IF ( latestserial.status6 ) %]Delete[% END %]
496
                                    [% ELSE %]
498
                      [% IF ( latestserial.status7 ) %]Claimed[% END %]
497
                                        [% IF ( latestserial.status5 ) %]Not issued
499
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
498
                                        [% END %]
500
                    </td>
499
                                    [% END %]
500
                                [% END %]
501
                            [% END %]
502
                        [% END %]</td>
503
                    <td>[% latestserial.notes %]</td>
501
                    <td>[% latestserial.notes %]</td>
504
                </tr>
502
                </tr>
505
            [% END %]
503
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (+8 lines)
Lines 38-43 Link Here
38
                <th>Call number</th>
38
                <th>Call number</th>
39
                <th>Subscription begin</th>
39
                <th>Subscription begin</th>
40
                <th>Subscription end</th>
40
                <th>Subscription end</th>
41
                <th>Expired? / Closed?</th>
41
			</tr>
42
			</tr>
42
		</thead>
43
		</thead>
43
		<tbody>
44
		<tbody>
Lines 50-55 Link Here
50
					<td>[% data.callnumber %]</td>
51
					<td>[% data.callnumber %]</td>
51
					<td>[% data.startdate %]</td>
52
					<td>[% data.startdate %]</td>
52
					<td>[% data.enddate %]</td>
53
					<td>[% data.enddate %]</td>
54
                    <td>
55
                        [% IF data.closed %]
56
                            Closed
57
                        [% ELSIF data.expired %]
58
                            Expired
59
                        [% END %]
60
                    </td>
53
				</tr>
61
				</tr>
54
				[% END %]
62
				[% END %]
55
			</tr>
63
			</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (+2 lines)
Lines 208-213 Link Here
208
		<option>Late</option>
208
		<option>Late</option>
209
		<option>Missing</option>
209
		<option>Missing</option>
210
		<option>Claimed</option>
210
		<option>Claimed</option>
211
        <option>Stopped</option>
211
	    </select>
212
	    </select>
212
	</li>
213
	</li>
213
	
214
	
Lines 284-289 Link Here
284
                            [% IF ( missingissue.status3 ) %]Late[% END %]
285
                            [% IF ( missingissue.status3 ) %]Late[% END %]
285
                            [% IF ( missingissue.status4 ) %]Missing[% END %]
286
                            [% IF ( missingissue.status4 ) %]Missing[% END %]
286
                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
287
                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
288
                            [% IF ( missingissue.status8 ) %]Stopped[% END %]
287
                        </td>
289
                        </td>
288
                        <td class="planneddate">
290
                        <td class="planneddate">
289
                        [% missingissue.planneddate %]
291
                        [% missingissue.planneddate %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tt (-6 / +8 lines)
Lines 68-79 function active(numlayer) Link Here
68
					[% serial.serialseq %]
68
					[% serial.serialseq %]
69
				</td>
69
				</td>
70
				<td>
70
				<td>
71
					[% IF ( serial.status1 ) %]Arrived[% END %]
71
                    [% IF ( serial.status1 ) %]Expected[% END %]
72
					[% IF ( serial.status2 ) %]Expected[% END %]
72
                    [% IF ( serial.status2 ) %]Arrived[% END %]
73
					[% IF ( serial.status3 ) %]Late[% END %]
73
                    [% IF ( serial.status3 ) %]Late[% END %]
74
					[% IF ( serial.status4 ) %]Missing[% END %]
74
                    [% IF ( serial.status4 ) %]Missing[% END %]
75
                    [% IF ( serial.status5 ) %]Not available[% END %]
75
                    [% IF ( serial.status5 ) %]Not issued[% END %]
76
					[% IF ( serial.status7 ) %]Claimed[% END %]
76
                    [% IF ( serial.status6 ) %]Delete[% END %]
77
                    [% IF ( serial.status7 ) %]Claimed[% END %]
78
                    [% IF ( serial.status8 ) %]Stopped[% END %]
77
				</td>
79
				</td>
78
			</tr>
80
			</tr>
79
			[% END %]
81
			[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-12 / +32 lines)
Lines 151-172 $(document).ready(function() { Link Here
151
                [% END %]</td>
151
                [% END %]</td>
152
            <td> [% subscription.branchcode %]</td>
152
            <td> [% subscription.branchcode %]</td>
153
            <td> [% subscription.callnumber %]</td>
153
            <td> [% subscription.callnumber %]</td>
154
        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
154
        <td> [% subscription.notes %]
155
        [% END %]
155
            [% UNLESS subscription.closed %]
156
                [% IF ( subscription.subscriptionexpired ) %]
157
                    <br /><span class="problem"> Subscription expired</span>
158
                [% END %]
159
            [% ELSE %]
160
                <br /> Subscription closed
161
            [% END %]
156
        </td>
162
        </td>
157
        [% IF ( routing && CAN_user_serials_routing ) %]
163
        [% IF ( routing && CAN_user_serials_routing ) %]
158
        <td>
164
        <td>
159
            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
165
            [% UNLESS subscription.closed %]
166
                <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
167
            [% END %]
160
        </td>
168
        </td>
161
        [% END %]
169
        [% END %]
162
        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
170
        [% UNLESS subscription.closed %]
163
        [% ELSE %]
171
            [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
164
        [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
172
            [% ELSE %]
173
                [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
174
                [% ELSE %]
175
                    <td> &nbsp;</td>
176
                [% END %]
177
            [% END %]
165
        [% ELSE %]
178
        [% ELSE %]
166
        <td> &nbsp;</td>
179
            <td> &nbsp;</td>
167
        [% END %]
168
        [% END %]
180
        [% END %]
169
170
      </tr>
181
      </tr>
171
[% END %]
182
[% END %]
172
[% IF ( subscr ) %]
183
[% IF ( subscr ) %]
Lines 194-201 $(document).ready(function() { Link Here
194
    [% IF ( CAN_user_serials_receive_serials ) %]
205
    [% IF ( CAN_user_serials_receive_serials ) %]
195
        <p>
206
        <p>
196
            <input type="submit" value="Edit serials" />&nbsp;
207
            <input type="submit" value="Edit serials" />&nbsp;
197
            <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
208
            [% UNLESS subscription.closed %]
198
            [% IF ( subscriptions.size == 1 and !serialsadditems ) %]&nbsp;<input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %]
209
                <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
210
                [% IF ( subscriptions.size == 1 and !serialsadditems ) %]&nbsp;<input type="button" value="Multi receiving" onclick="javascript:generateReceive([% subscriptionidlist %])" />[% END %]
211
            [% END %]
199
        </p>
212
        </p>
200
    [% END %]
213
    [% END %]
201
214
Lines 234-240 $(document).ready(function() { Link Here
234
                    [% serial.serialseq %]
247
                    [% serial.serialseq %]
235
                </td>
248
                </td>
236
                <td>
249
                <td>
237
                    [% IF ( serial.status1 ) %]Expected[% END %][% IF ( serial.status2 ) %]Arrived[% END %][% IF ( serial.status3 ) %]Late[% END %][% IF ( serial.status4 ) %]Missing[% END %][% IF ( serial.status5 ) %]Not Available[% END %][% IF ( serial.status7 ) %]Claimed[% END %]
250
                    [% IF ( latestserial.status1 ) %]Expected[% END %]
251
                    [% IF ( latestserial.status2 ) %]Arrived[% END %]
252
                    [% IF ( latestserial.status3 ) %]Late[% END %]
253
                    [% IF ( latestserial.status4 ) %]Missing[% END %]
254
                    [% IF ( latestserial.status5 ) %]Not issued[% END %]
255
                    [% IF ( latestserial.status6 ) %]Delete[% END %]
256
                    [% IF ( latestserial.status7 ) %]Claimed[% END %]
257
                    [% IF ( latestserial.status8 ) %]Stopped[% END %]
238
                </td>
258
                </td>
239
                <td>
259
                <td>
240
                    [% serial.notes %]
260
                    [% serial.notes %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-54 / +62 lines)
Lines 168-174 $(document).ready(function() { Link Here
168
        </td>
168
        </td>
169
        <td>
169
        <td>
170
            [% IF ( serialslis.editdisable ) %]
170
            [% IF ( serialslis.editdisable ) %]
171
              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="1">
171
              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="[% serialslis.serstatus %]">
172
              <select name="status" size="1"  disabled="disabled">
172
              <select name="status" size="1"  disabled="disabled">
173
            [% ELSE %]
173
            [% ELSE %]
174
              [% IF ( serialslis.serialsadditems ) %]
174
              [% IF ( serialslis.serialsadditems ) %]
Lines 177-215 $(document).ready(function() { Link Here
177
              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else {changeDate(this, '[% serialslis.planneddate %]')}" >
177
              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else {changeDate(this, '[% serialslis.planneddate %]')}" >
178
               [% END %] 
178
               [% END %] 
179
            [% END %]
179
            [% END %]
180
  [% IF ( serialslis.status1 ) %]
180
            [% IF ( serialslis.status1 ) %]
181
                    <option value="1" selected="selected">Expected</option>
181
              <option value="1" selected="selected">Expected</option>
182
  [% END %]
182
            [% END %]
183
  [% IF ( serialslis.status2 ) %]
183
            [% IF ( serialslis.status2 ) %]
184
                    <option value="2" selected="selected">Arrived</option>
184
              <option value="2" selected="selected">Arrived</option>
185
  [% ELSE %]
185
            [% ELSE %]
186
                    <option value="2">Arrived</option>
186
              <option value="2">Arrived</option>
187
  [% END %]
187
            [% END %]
188
  [% IF ( serialslis.status3 ) %]
188
            [% IF ( serialslis.status3 ) %]
189
                    <option value="3" selected="selected">Late</option>
189
              <option value="3" selected="selected">Late</option>
190
  [% ELSE %]
190
            [% ELSE %]
191
                    <option value="3">Late</option>
191
              <option value="3">Late</option>
192
  [% END %]
192
            [% END %]
193
  [% IF ( serialslis.status4 ) %]
193
            [% IF ( serialslis.status4 ) %]
194
                    <option value="4" selected="selected">Missing</option>
194
              <option value="4" selected="selected">Missing</option>
195
  [% ELSE %]
195
            [% ELSE %]
196
                    <option value="4">Missing</option>
196
              <option value="4">Missing</option>
197
  [% END %]
197
            [% END %]
198
  [% IF ( serialslis.status7 ) %]
198
            [% IF ( serialslis.status7 ) %]
199
                    <option value="7" selected="selected">Claimed</option>
199
              <option value="7" selected="selected">Claimed</option>
200
  [% ELSE %]
200
            [% ELSE %]
201
                    <option value="7">Claimed</option>
201
              <option value="7">Claimed</option>
202
  [% END %]
202
            [% END %]
203
  [% IF ( serialslis.status5 ) %]
203
            [% IF ( serialslis.status5 ) %]
204
                    <option value="5" selected="selected">Not available</option>
204
              <option value="5" selected="selected">Not available</option>
205
  [% ELSE %]
205
            [% ELSE %]
206
                    <option value="5">Not available</option>
206
              <option value="5">Not available</option>
207
  [% END %]
207
            [% END %]
208
  [% IF ( serialslis.status6 ) %]
208
            [% IF ( serialslis.status6 ) %]
209
                    <option value="6" selected="selected">Delete</option>
209
              <option value="6" selected="selected">Delete</option>
210
  [% ELSE %]
210
            [% ELSE %]
211
                    <option value="6">Delete</option>
211
              <option value="6">Delete</option>
212
  [% END %]
212
            [% END %]
213
            [% IF serialslis.status8 %]
214
              <option value="8" selected="selected">Stopped</option>
215
            [% END %]
213
            </select>
216
            </select>
214
217
215
        </td>
218
        </td>
Lines 284-322 $(document).ready(function() { Link Here
284
            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]','[% newserialloo.serialid %]'); changeDate2('[% newserialloo.arriveddate %]')} else if (this.value==7){changeDate('[% newserialloo.arriveddate %]')} else { HideItems('items'+'[% newserialloo.subscriptionid %]'+[% newserialloo.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate2('[% serialslis.planneddate %]')}" >
287
            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]','[% newserialloo.serialid %]'); changeDate2('[% newserialloo.arriveddate %]')} else if (this.value==7){changeDate('[% newserialloo.arriveddate %]')} else { HideItems('items'+'[% newserialloo.subscriptionid %]'+[% newserialloo.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate2('[% serialslis.planneddate %]')}" >
285
288
286
                    <option value="">----</option>
289
                    <option value="">----</option>
287
  [% IF ( newserialloo.status1 ) %]
290
                  [% IF ( newserialloo.status1 ) %]
288
                    <option value="1" selected="selected">Expected</option>
291
                    <option value="1" selected="selected">Expected</option>
289
  [% END %]
292
                  [% END %]
290
  [% IF ( newserialloo.status2 ) %]
293
                  [% IF ( newserialloo.status2 ) %]
291
                    <option value="2" selected="selected">Arrived</option>
294
                    <option value="2" selected="selected">Arrived</option>
292
  [% ELSE %]
295
                  [% ELSE %]
293
                    <option value="2">Arrived</option>
296
                    <option value="2">Arrived</option>
294
  [% END %]
297
                  [% END %]
295
  [% IF ( newserialloo.status3 ) %]
298
                  [% IF ( newserialloo.status3 ) %]
296
                    <option value="3" selected="selected">Late</option>
299
                    <option value="3" selected="selected">Late</option>
297
  [% ELSE %]
300
                  [% ELSE %]
298
                    <option value="3">Late</option>
301
                    <option value="3">Late</option>
299
  [% END %]
302
                  [% END %]
300
  [% IF ( newserialloo.status4 ) %]
303
                  [% IF ( newserialloo.status4 ) %]
301
                    <option value="4" selected="selected">Missing</option>
304
                    <option value="4" selected="selected">Missing</option>
302
  [% ELSE %]
305
                  [% ELSE %]
303
                    <option value="4">Missing</option>
306
                    <option value="4">Missing</option>
304
  [% END %]
307
                  [% END %]
305
  [% IF ( newserialloo.status7 ) %]
308
                  [% IF ( newserialloo.status7 ) %]
306
                    <option value="7" selected="selected">Claimed</option>
309
                    <option value="7" selected="selected">Claimed</option>
307
  [% ELSE %]
310
                  [% ELSE %]
308
                    <option value="7">Claimed</option>
311
                    <option value="7">Claimed</option>
309
  [% END %]
312
                  [% END %]
310
  [% IF ( newserialloo.status5 ) %]
313
                  [% IF ( newserialloo.status5 ) %]
311
                    <option value="5" selected="selected">Not available</option>
314
                    <option value="5" selected="selected">Not available</option>
312
  [% ELSE %]
315
                  [% ELSE %]
313
                    <option value="5">Not available</option>
316
                    <option value="5">Not available</option>
314
  [% END %]
317
                  [% END %]
315
  [% IF ( newserialloo.status6 ) %]
318
                  [% IF ( newserialloo.status6 ) %]
316
                    <option value="6" selected="selected">Delete</option>
319
                    <option value="6" selected="selected">Delete</option>
317
  [% ELSE %]
320
                  [% ELSE %]
318
                    <option value="6">Delete</option>
321
                    <option value="6">Delete</option>
319
  [% END %]
322
                  [% END %]
323
                  [% IF newserialloo.status8 %]
324
                    <option value="8" selected="selected">Stopped</option>
325
                  [% END %]
320
            </select>
326
            </select>
321
327
322
        </td>
328
        </td>
Lines 384-390 $(document).ready(function() { Link Here
384
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
390
        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
385
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
391
        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
386
        [% IF ( subscription.abouttoexpire ) %]
392
        [% IF ( subscription.abouttoexpire ) %]
393
          [% UNLESS subscription.closed %]
387
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
394
            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
395
          [% END %]
388
        [% END %]
396
        [% END %]
389
    [% END %]
397
    [% END %]
390
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show biblio</a></li></ul>
398
    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show biblio</a></li></ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tt (+3 lines)
Lines 137-142 function barcode_check(){ Link Here
137
					[% ELSE %]
137
					[% ELSE %]
138
						<option value="6">Delete</option>
138
						<option value="6">Delete</option>
139
					[% END %]
139
					[% END %]
140
                    [% IF serialslis.status8 %]
141
                        <option value="8" selected="selected">Stopped</option>
142
                    [% END %]
140
				</select>
143
				</select>
141
			[% IF ( serialslis.serialadditems ) %]
144
			[% IF ( serialslis.serialadditems ) %]
142
				<br /><br />
145
				<br /><br />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-82 / +167 lines)
Lines 9-22 Link Here
9
<script type="text/javascript">
9
<script type="text/javascript">
10
//<![CDATA[
10
//<![CDATA[
11
 $(document).ready(function() {
11
 $(document).ready(function() {
12
    var srlt = $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
12
    var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
13
        "aoColumnDefs": [
13
        "aoColumnDefs": [
14
            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
14
            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
15
        ],
15
        ],
16
        "sPaginationType": "four_button"
16
        "sPaginationType": "four_button"
17
    } ) );
17
    } ) );
18
18
19
    srlt.fnAddFilters("filter", 750);
19
    var csrlt = $("#csrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
20
        "aoColumnDefs": [
21
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
22
        ],
23
        "sPaginationType": "four_button"
24
    } ) );
25
26
    osrlt.fnAddFilters("filter", 750);
27
    csrlt.fnAddFilters("filter", 750);
28
29
    $('#serialstabs').tabs();
30
20
 });
31
 });
21
 //]]>
32
 //]]>
22
</script>
33
</script>
Lines 33-41 Link Here
33
      <div class="yui-b">
44
      <div class="yui-b">
34
      [% INCLUDE 'serials-toolbar.inc' %]
45
      [% INCLUDE 'serials-toolbar.inc' %]
35
46
36
      <h2>Serials subscriptions</h2>
47
      <h2>Serials subscriptions ([% total %] found)</h2>
37
      [% UNLESS ( done_searched ) %]
48
      [% UNLESS ( done_searched ) %]
38
      <div id="advsearch">
49
      <div id="advsearch" style="padding-bottom:3em;">
39
        <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
50
        <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">
40
          <fieldset class="rows">
51
          <fieldset class="rows">
41
          <legend>Search subscriptions</legend>
52
          <legend>Search subscriptions</legend>
Lines 85-170 Link Here
85
      </div>
96
      </div>
86
      [% END %]
97
      [% END %]
87
      [% IF ( done_searched ) %]
98
      [% IF ( done_searched ) %]
88
        [% IF ( subscriptions ) %]
99
        [% IF ( total ) %]
89
          <table id="srlt">
100
          <div id="serialstabs" class="toptabs" style="clear:both;">
90
            <thead>
101
            <ul class="ui-tabs-nav">
91
              <tr>
102
              <li><a href="#opened">Opened ([% openedsubscriptions.size || 0 %])</a></li>
92
                  <th>ISSN</th>
103
              <li><a href="#closed">Closed ([% closedsubscriptions.size || 0 %])</a></li>
93
                  <th>Title</th>
104
            </ul>
94
                  <th> Notes </th>
105
            <div id="opened">
95
                  <th>Library</th>
106
              [% IF openedsubscriptions %]
96
                  <th>Call number</th>
107
                <table id="osrlt">
97
                  <th>Expiration date</th>
108
                  <thead>
98
                  [% IF ( routing && CAN_user_serials_routing ) %]
109
                    <tr>
99
                    <th>Routing list</th>
110
                        <th>ISSN</th>
100
                  [% END %]
111
                        <th>Title</th>
101
                  <th>&nbsp;</th>
112
                        <th> Notes </th>
102
                  <th>&nbsp;</th>
113
                        <th>Library</th>
103
              </tr>
114
                        <th>Call number</th>
104
            </thead>
115
                        <th>Expiration date</th>
105
            <tfoot>
116
                        [% IF ( routing && CAN_user_serials_routing ) %]
106
              <tr>
117
                          <th>Routing list</th>
107
                <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
118
                        [% END %]
108
                <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
119
                        <th>&nbsp;</th>
109
                <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
120
                        <th>&nbsp;</th>
110
                <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
121
                    </tr>
111
                <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
122
                  </thead>
112
                <td><input type="text" class="filter" data-column_num="5" placeholder="Search expiration date" /></td>
123
                  <tfoot>
113
                [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
124
                    <tr>
114
                <td></td>
125
                      <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
115
                <td></td>
126
                      <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
116
              </tr>
127
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
117
            </tfoot>
128
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
118
            <tbody>
129
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
119
              [% FOREACH subscription IN subscriptions %]
130
                      <td><input type="text" class="filter" data-column_num="5" placeholder="Search expiration date" /></td>
120
                <tr>
131
                      [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
121
                  <td>
132
                      <td></td>
122
                  [% IF ( subscription.issn ) %][% subscription.issn %]
133
                      <td></td>
123
                  [% END %]
134
                    </tr>
124
                  </td>
135
                  </tfoot>
125
                  <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
136
                  <tbody>
126
                  </td>
137
                    [% FOREACH subscription IN openedsubscriptions %]
127
                  <td>[% IF ( subscription.notes ) %][% subscription.notes %][% END %]
138
                      <tr>
128
                  [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
139
                        <td>
129
                  </td>
140
                        [% IF ( subscription.issn ) %][% subscription.issn %]
130
                  <td>
141
                        [% END %]
131
                    [% IF ( subscription.branchname ) %][% subscription.branchname %][% END %]
142
                        </td>
132
                  </td>
143
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
133
                  <td>
144
                        </td>
134
                    [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
145
                        <td>[% IF ( subscription.notes ) %][% subscription.notes %][% END %]
135
                  </td>
146
                        [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
136
                  <td>
147
                        </td>
137
                    [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
148
                        <td>
138
                  </td>
149
                          [% IF ( subscription.branchname ) %][% subscription.branchname %][% END %]
139
                  [% IF ( routing && CAN_user_serials_routing ) %]
150
                        </td>
140
                  <td>
151
                        <td>
141
                    [% IF ( subscription.cannotedit ) %]
152
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
142
                      &nbsp;
153
                        </td>
143
                    [% ELSE %]
154
                        <td>
144
                      [% IF ( subscription.routingedit ) %]
155
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
145
                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
156
                        </td>
146
                        ([% subscription.routingedit %])
157
                        [% IF ( routing && CAN_user_serials_routing ) %]
147
                      [% ELSE %]
158
                        <td>
148
                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
159
                          [% IF ( subscription.cannotedit ) %]
149
                      [% END %]
160
                            &nbsp;
161
                          [% ELSE %]
162
                            [% IF ( subscription.routingedit ) %]
163
                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
164
                              ([% subscription.routingedit %])
165
                            [% ELSE %]
166
                              <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
167
                            [% END %]
168
                          [% END %]
169
                        </td>
170
                        [% END %]
171
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
172
                        </td>
173
                        <td>
174
                        [% IF ( subscription.cannotedit ) %]
175
                          &nbsp;
176
                        [% ELSE %]
177
                          [% IF ( CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>[% END %]
178
                        [% END %]
179
                        </td>
180
                      </tr>
181
                    [% END %]
182
                  </tbody>
183
                </table>
184
              [% ELSE %]
185
                There is no opened subscription for your search.
186
              [% END %]
187
            </div>
188
            <div id="closed">
189
              [% IF closedsubscriptions %]
190
                <table id="csrlt">
191
                  <thead>
192
                    <tr>
193
                        <th>ISSN</th>
194
                        <th>Title</th>
195
                        <th> Notes </th>
196
                        <th>Library</th>
197
                        <th>Call number</th>
198
                        <th>&nbsp;</th>
199
                        <th>&nbsp;</th>
200
                    </tr>
201
                  </thead>
202
                  <tfoot>
203
                    <tr>
204
                      <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
205
                      <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
206
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
207
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
208
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
209
                      <td></td>
210
                      <td></td>
211
                    </tr>
212
                  </tfoot>
213
                  <tbody>
214
                    [% FOREACH subscription IN closedsubscriptions %]
215
                      <tr>
216
                        <td>
217
                          [% IF ( subscription.issn ) %]
218
                            [% subscription.issn %]
219
                          [% END %]
220
                        </td>
221
                        <td>
222
                          <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
223
                        </td>
224
                        <td>
225
                          [% IF ( subscription.notes ) %][% subscription.notes %][% END %]
226
                          [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
227
                        </td>
228
                        <td>
229
                          [% IF ( subscription.branchname ) %][% subscription.branchname %][% END %]
230
                        </td>
231
                        <td>
232
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
233
                        </td>
234
                        <td>
235
                          [% UNLESS subscription.cannotedit %]
236
                            <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" onclick="return confirm(_('Are you sure you want to reopen this subscription?'));">Reopen</a>
237
                          [% ELSE %]
238
                            Cannot edit
239
                          [% END %]
240
                        </td>
241
                        <td>
242
                          <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
243
                        </td>
244
                      </tr>
150
                    [% END %]
245
                    [% END %]
151
                  </td>
246
                  </tbody>
152
                  [% END %]
247
                </table>
153
                  <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
248
              [% ELSE %]
154
                  </td>
249
                There is no closed subscription for your search.
155
                  <td>
156
                  [% IF ( subscription.cannotedit ) %]
157
                    &nbsp;
158
                  [% ELSE %]
159
                    [% IF ( CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>[% END %]
160
                  [% END %]
161
                  </td>
162
                </tr>
163
              [% END %]
250
              [% END %]
164
            </tbody>
251
            </div>
165
          </table>
252
          </div>
166
        [% ELSE %]
167
          There is no subscription for your search.
168
        [% END %]
253
        [% END %]
169
      [% END %]
254
      [% END %]
170
    </div>
255
    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-23 / +19 lines)
Lines 55-62 $(document).ready(function() { Link Here
55
	<div class="yui-b">
55
	<div class="yui-b">
56
	[% INCLUDE 'serials-toolbar.inc' %]
56
	[% INCLUDE 'serials-toolbar.inc' %]
57
57
58
    <h1>Subscription for [% bibliotitle %] </h1>
58
    <h1>Subscription for [% bibliotitle%] [% IF closed %](closed)[% END %]</h1>
59
    [% IF ( abouttoexpire ) %]<div class="dialog message">Subscription will expire [% enddate %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>[% END %]
59
    [% IF ( abouttoexpire ) %]
60
      [% UNLESS closed %]
61
        <div class="dialog message">Subscription will expire [% enddate %]. <a href="#" id="renewsub">Renew this subscription</a>.</div>
62
      [% END %]
63
    [% END %]
60
    [% IF ( NEEDSCONFIRMATION ) %]
64
    [% IF ( NEEDSCONFIRMATION ) %]
61
    <div id="circ_needsconfirmation" class="dialog alert">
65
    <div id="circ_needsconfirmation" class="dialog alert">
62
			<h3>Please Confirm Subscription deletion</h3>
66
			<h3>Please Confirm Subscription deletion</h3>
Lines 374-400 $(document).ready(function() { Link Here
374
                    [% serialslis.publisheddate %]
378
                    [% serialslis.publisheddate %]
375
                </td>
379
                </td>
376
                <td>
380
                <td>
377
                        [% IF ( serialslis.status1 ) %]
381
                    [% IF ( serialslis.status1 ) %]Expected[% END %]
378
                            Expected
382
                    [% IF ( serialslis.status2 ) %]Arrived[% END %]
379
                        [% END %]
383
                    [% IF ( serialslis.status3 ) %]Late[% END %]
380
                        [% IF ( serialslis.status2 ) %]
384
                    [% IF ( serialslis.status4 ) %]Missing[% END %]
381
                            Arrived
385
                    [% IF ( serialslis.status5 ) %]Not issued[% END %]
382
                        [% END %]
386
                    [% IF ( serialslis.status6 ) %]Delete[% END %]
383
                        [% IF ( serialslis.status3 ) %]
387
                    [% IF ( serialslis.status7 ) %]
384
                            Late
388
                      Claimed
385
                        [% END %]
389
                      [% IF ( serialslis.claimdate ) %]
386
                        [% IF ( serialslis.status4 ) %]
390
                        [% serialslis.claimdate %]
387
                            Missing
391
                      [% END %]
388
                        [% END %]
392
                    [% END %]
389
                        [% IF ( serialslis.status5 ) %]
393
                    [% IF ( serialslis.status8 ) %]Stopped[% END %]
390
                            Not available
391
                        [% END %]
392
                        [% IF ( serialslis.status7 ) %]
393
                            Claimed
394
                             [% IF ( serialslis.claimdate ) %]
395
                             [% serialslis.claimdate %]
396
                             [% END %]
397
                        [% END %]
398
                </td>
394
                </td>
399
            </tr>
395
            </tr>
400
        [% END %]
396
        [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+2 lines)
Lines 988-993 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
988
    [% FOREACH subscription IN subscriptions %]
988
    [% FOREACH subscription IN subscriptions %]
989
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
989
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
990
    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
990
    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
991
    [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
992
    <span style="display:none;"> [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %]</p>[% END %]</span>
991
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
993
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
992
    <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
994
    <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
993
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
995
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tt (-6 / +9 lines)
Lines 200-211 function showlayer(numlayer){ Link Here
200
		    </td>
200
		    </td>
201
		    <td>    [% serial.serialseq %]
201
		    <td>    [% serial.serialseq %]
202
		    </td>
202
		    </td>
203
		    <td>    [% IF ( serial.status1 ) %]Waiting[% END %]
203
		    <td>
204
			[% IF ( serial.status2 ) %]Arrived[% END %]
204
              [% IF ( serial.status1 ) %]Expected[% END %]
205
			[% IF ( serial.status3 ) %]Late[% END %]
205
              [% IF ( serial.status2 ) %]Arrived[% END %]
206
			[% IF ( serial.status4 ) %]Missing[% END %]
206
              [% IF ( serial.status3 ) %]Late[% END %]
207
            [% IF ( serial.status5 ) %]Not available[% END %]
207
              [% IF ( serial.status4 ) %]Missing[% END %]
208
			[% IF ( serial.status7 ) %]Claimed[% END %]
208
              [% IF ( serial.status5 ) %]Not available[% END %]
209
              [% IF ( serial.status6 ) %]Delete[% END %]
210
              [% IF ( serial.status7 ) %]Claimed[% END %]
211
              [% IF ( serial.status8 ) %]Stopped[% END %]
209
		    </td>
212
		    </td>
210
		    <td class="subscriptionidfilterclass">    [% serial.subscriptionid %]
213
		    <td class="subscriptionidfilterclass">    [% serial.subscriptionid %]
211
		    </td>
214
		    </td>
(-)a/misc/cronjobs/serialsUpdate.pl (+1 lines)
Lines 60-65 my $sth = $dbh->prepare(" Link Here
60
     WHERE serial.status = 1 
60
     WHERE serial.status = 1 
61
       AND periodicity <> 32
61
       AND periodicity <> 32
62
       AND DATE_ADD(planneddate, INTERVAL CAST(graceperiod AS SIGNED) DAY) < NOW()
62
       AND DATE_ADD(planneddate, INTERVAL CAST(graceperiod AS SIGNED) DAY) < NOW()
63
       AND subscription.closed = 0
63
     ");
64
     ");
64
$sth->execute();
65
$sth->execute();
65
66
(-)a/opac/opac-detail.pl (+2 lines)
Lines 471-476 foreach my $subscription (@subscriptions) { Link Here
471
    $cell{branchcode}        = $subscription->{branchcode};
471
    $cell{branchcode}        = $subscription->{branchcode};
472
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
472
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
473
    $cell{hasalert}          = $subscription->{hasalert};
473
    $cell{hasalert}          = $subscription->{hasalert};
474
    $cell{callnumber}        = $subscription->{callnumber};
475
    $cell{closed}            = $subscription->{closed};
474
    #get the three latest serials.
476
    #get the three latest serials.
475
    $serials_to_display = $subscription->{opacdisplaycount};
477
    $serials_to_display = $subscription->{opacdisplaycount};
476
    $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display;
478
    $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display;
(-)a/reports/serials_stats.pl (-2 / +12 lines)
Lines 96-104 if($do_it){ Link Here
96
    while(my $row = $sth->fetchrow_hashref){
96
    while(my $row = $sth->fetchrow_hashref){
97
        $row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
97
        $row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
98
        $row->{'startdate'} = format_date($row->{'startdate'});
98
        $row->{'startdate'} = format_date($row->{'startdate'});
99
        push @datas, $row if ($expired || (not $expired && not HasSubscriptionExpired($row->{subscriptionid})) );
99
        $row->{expired} = HasSubscriptionExpired($row->{subscriptionid});
100
        push @datas, $row if (
101
            $expired
102
            or (
103
                not $expired
104
                and (
105
                    not $row->{expired}
106
                    and not $row->{closed}
107
                )
108
            )
109
        );
100
    }
110
    }
101
    
111
102
    if($output eq 'screen'){
112
    if($output eq 'screen'){
103
        $template->param(datas => \@datas,
113
        $template->param(datas => \@datas,
104
                         do_it => 1);
114
                         do_it => 1);
(-)a/serials/checkexpiration.pl (+1 lines)
Lines 79-84 if ($date) { Link Here
79
79
80
        $subscription->{expirationdate} = $expirationdate;
80
        $subscription->{expirationdate} = $expirationdate;
81
        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
81
        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
82
        next if $subscription->{closed};
82
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
83
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
83
			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
84
			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
84
            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
85
            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
(-)a/serials/serials-collection.pl (+3 lines)
Lines 101-108 my $subscriptioncount; Link Here
101
my ($location, $callnumber);
101
my ($location, $callnumber);
102
if (@subscriptionid){
102
if (@subscriptionid){
103
   my @subscriptioninformation=();
103
   my @subscriptioninformation=();
104
   my $closed = 0;
104
   foreach my $subscriptionid (@subscriptionid){
105
   foreach my $subscriptionid (@subscriptionid){
105
    my $subs= GetSubscription($subscriptionid);
106
    my $subs= GetSubscription($subscriptionid);
107
    $closed = 1 if $subs->{closed};
106
    $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
108
    $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
107
    $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
109
    $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
108
    $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
110
    $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
Lines 127-132 if (@subscriptionid){ Link Here
127
    my $tmpsubscription= GetFullSubscription($subscriptionid);
129
    my $tmpsubscription= GetFullSubscription($subscriptionid);
128
    @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
130
    @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
129
  }
131
  }
132
  $template->param(closed => $closed);
130
  $subscriptions=PrepareSerialsData(\@subscriptioninformation);
133
  $subscriptions=PrepareSerialsData(\@subscriptioninformation);
131
  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
134
  $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
132
} else {
135
} else {
(-)a/serials/serials-edit.pl (+1 lines)
Lines 151-156 foreach my $serialid (@serialids) { Link Here
151
            )
151
            )
152
            || $serinfo->{'cannotedit'}
152
            || $serinfo->{'cannotedit'}
153
        );
153
        );
154
        $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
154
        push @serialdatalist, $serinfo;
155
        push @serialdatalist, $serinfo;
155
        $processedserialid{$serialid} = 1;
156
        $processedserialid{$serialid} = 1;
156
    }
157
    }
(-)a/serials/serials-search.pl (-1 / +24 lines)
Lines 46-51 my $biblionumber = $query->param('biblionumber') || ''; Link Here
46
my $branch        = $query->param('branch_filter') || '';
46
my $branch        = $query->param('branch_filter') || '';
47
my $routing       = $query->param('routing') || C4::Context->preference("RoutingSerials");
47
my $routing       = $query->param('routing') || C4::Context->preference("RoutingSerials");
48
my $searched      = $query->param('searched') || 0;
48
my $searched      = $query->param('searched') || 0;
49
my @subscriptionids = $query ->param('subscriptionid');
50
my $op            = $query->param('op');
49
51
50
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
52
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
51
    {
53
    {
Lines 58-63 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
58
    }
60
    }
59
);
61
);
60
62
63
if ( $op and $op eq "close" ) {
64
    for my $subscriptionid ( @subscriptionids ) {
65
        C4::Serials::CloseSubscription( $subscriptionid );
66
    }
67
} elsif ( $op and $op eq "reopen" ) {
68
    for my $subscriptionid ( @subscriptionids ) {
69
        C4::Serials::ReopenSubscription( $subscriptionid );
70
    }
71
}
72
61
my @subscriptions;
73
my @subscriptions;
62
if ($searched){
74
if ($searched){
63
    @subscriptions = SearchSubscriptions(
75
    @subscriptions = SearchSubscriptions(
Lines 81-86 if ($routing) { Link Here
81
    }
93
    }
82
}
94
}
83
95
96
my (@openedsubscriptions, @closedsubscriptions);
97
for my $sub ( @subscriptions ) {
98
    unless ( $sub->{closed} ) {
99
        push @openedsubscriptions, $sub;
100
    } else {
101
        push @closedsubscriptions, $sub;
102
    }
103
}
104
84
my $branches = GetBranches();
105
my $branches = GetBranches();
85
my @branches_loop;
106
my @branches_loop;
86
foreach (sort keys %$branches){
107
foreach (sort keys %$branches){
Lines 94-100 foreach (sort keys %$branches){ Link Here
94
}
115
}
95
116
96
$template->param(
117
$template->param(
97
    subscriptions => \@subscriptions,
118
    openedsubscriptions => \@openedsubscriptions,
119
    closedsubscriptions => \@closedsubscriptions,
120
    total         => @openedsubscriptions + @closedsubscriptions,
98
    title_filter  => $title,
121
    title_filter  => $title,
99
    ISSN_filter   => $ISSN,
122
    ISSN_filter   => $ISSN,
100
    EAN_filter    => $EAN,
123
    EAN_filter    => $EAN,
(-)a/serials/subscription-detail.pl (-1 / +7 lines)
Lines 34-39 my $issueconfirmed = $query->param('issueconfirmed'); Link Here
34
my $dbh = C4::Context->dbh;
34
my $dbh = C4::Context->dbh;
35
my ($template, $loggedinuser, $cookie, $hemisphere);
35
my ($template, $loggedinuser, $cookie, $hemisphere);
36
my $subscriptionid = $query->param('subscriptionid');
36
my $subscriptionid = $query->param('subscriptionid');
37
38
if ( $op and $op eq "close" ) {
39
    C4::Serials::CloseSubscription( $subscriptionid );
40
} elsif ( $op and $op eq "reopen" ) {
41
    C4::Serials::ReopenSubscription( $subscriptionid );
42
}
43
37
my $subs = GetSubscription($subscriptionid);
44
my $subs = GetSubscription($subscriptionid);
38
45
39
$subs->{enddate} = GetExpirationDate($subscriptionid);
46
$subs->{enddate} = GetExpirationDate($subscriptionid);
40
- 

Return to bug 8782