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

(-)a/C4/Serials.pm (+2 lines)
Lines 2056-2064 sub GetLateOrMissingIssues { Link Here
2056
    while ( my $line = $sth->fetchrow_hashref ) {
2056
    while ( my $line = $sth->fetchrow_hashref ) {
2057
2057
2058
        if ($line->{planneddate} && $line->{planneddate} !~/^0+\-/) {
2058
        if ($line->{planneddate} && $line->{planneddate} !~/^0+\-/) {
2059
            $line->{planneddateISO} = $line->{planneddate};
2059
            $line->{planneddate} = format_date( $line->{planneddate} );
2060
            $line->{planneddate} = format_date( $line->{planneddate} );
2060
        }
2061
        }
2061
        if ($line->{claimdate} && $line->{claimdate} !~/^0+\-/) {
2062
        if ($line->{claimdate} && $line->{claimdate} !~/^0+\-/) {
2063
            $line->{claimdateISO} = $line->{claimdate};
2062
            $line->{claimdate}   = format_date( $line->{claimdate} );
2064
            $line->{claimdate}   = format_date( $line->{claimdate} );
2063
        }
2065
        }
2064
        $line->{"status".$line->{status}}   = 1;
2066
        $line->{"status".$line->{status}}   = 1;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-10 / +24 lines)
Lines 4-23 Link Here
4
    <title>Koha &rsaquo; Serials &rsaquo; Claims</title>
4
    <title>Koha &rsaquo; Serials &rsaquo; Claims</title>
5
    [% INCLUDE 'doc-head-close.inc' %]
5
    [% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'calendar.inc' %]
6
[% INCLUDE 'calendar.inc' %]
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
7
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
8
<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
8
[% INCLUDE 'datatables.inc' %]
9
[% INCLUDE 'datatables-strings.inc' %]
10
<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
11
<script type="text/javascript">
9
<script type="text/javascript">
12
//<![CDATA[
10
//<![CDATA[
13
    [% IF (dateformat == 'metric') %]dt_add_type_uk_date();[% END %]
14
	 $(document).ready(function() {
11
	 $(document).ready(function() {
15
        [% UNLESS ( preview ) %]
12
        [% UNLESS ( preview ) %]
16
         var sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, {
13
         var sTable = $("#claimst").dataTable($.extend(true, {}, dataTablesDefaults, {
17
            "sDom": 't',
14
            "sDom": 't',
18
            "aoColumnDefs": [
15
            [% IF ( letter ) %]
19
                { "aTargets": [ 0,1 ], "bSortable": false, "bSearchable": false }
16
                "aoColumnDefs": [
20
            ],
17
                    { "aTargets": [ 0,1 ], "bSortable": false, "bSearchable": false }
18
                ],
19
            [% ELSE %]
20
                "aoColumnDefs": [
21
                    { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false }
22
                ],
23
            [% END %]
24
            "aoColumns": [
25
                [% IF ( letter ) %]null,[% END %]null,null,{ "sType": "anti-the" },null,null,{ "sType": "title-string" },{ "sType": "title-string" }
26
        ],
21
            "bPaginate": false
27
            "bPaginate": false
22
        }));
28
        }));
23
        [% END %]
29
        [% END %]
Lines 300-309 Link Here
300
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
306
                            [% IF ( missingissue.status7 ) %]<span class="status-claimed">Claimed</span>[% END %]
301
                        </td>
307
                        </td>
302
                        <td class="planneddate">
308
                        <td class="planneddate">
303
                        [% missingissue.planneddate %]
309
                            [% IF ( missingissue.planneddate ) %]
310
                                <span title="[% missingissue.planneddateISO %]">[% missingissue.planneddate %]</span>
311
                            [% ELSE %]
312
                                <span title="0000-00-00"></span>
313
                            [% END %]
304
                        </td>
314
                        </td>
305
                        <td>
315
                        <td>
306
                        [% missingissue.claimdate %]
316
                            [% IF ( missingissue.claimdate ) %]
317
                                <span title="[% missingissue.claimdateISO %]">[% missingissue.claimdate %]</span>
318
                            [% ELSE %]
319
                                <span title="0000-00-00"></span>
320
                            [% END %]
307
                        </td>
321
                        </td>
308
                    </tr>
322
                    </tr>
309
                [% END %]</tbody>
323
                [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-4 / +2 lines)
Lines 2-12 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
4
<title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
6
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
7
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
8
[% INCLUDE 'datatables-strings.inc' %]
7
[% INCLUDE 'datatables.inc' %]
9
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
10
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
8
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
11
9
12
<script type="text/javascript">
10
<script type="text/javascript">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-9 / +22 lines)
Lines 3-14 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
<title>Koha &rsaquo; Serials [% biblionumber %]</title>
5
<title>Koha &rsaquo; Serials [% biblionumber %]</title>
6
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
7
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'calendar.inc' %]
7
[% INCLUDE 'calendar.inc' %]
9
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
8
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
10
[% INCLUDE 'datatables-strings.inc' %]
9
[% INCLUDE 'datatables.inc' %]
11
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
12
<script type="text/javascript">
10
<script type="text/javascript">
13
//<![CDATA[
11
//<![CDATA[
14
 $(document).ready(function() {
12
 $(document).ready(function() {
Lines 16-24 Link Here
16
        dt_add_type_uk_date();
14
        dt_add_type_uk_date();
17
    [% END %]
15
    [% END %]
18
    var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
16
    var osrlt = $("#osrlt").dataTable($.extend(true, {}, dataTablesDefaults, {
19
17
        [% IF ( routing && CAN_user_serials_routing ) %]
20
        "aoColumnDefs": [
18
            "aoColumnDefs": [
21
            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
19
                { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
20
            ],
21
        [% ELSE %]
22
            "aoColumnDefs": [
23
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
24
            ],
25
        [% END %]
26
        "aoColumns": [
27
            null,{ "sType": "anti-the" },null,null,null,{ "sType": "title-string" },
28
            [% IF ( routing && CAN_user_serials_routing ) %],null[% END %],null,null
22
        ],
29
        ],
23
        "sPaginationType": "four_button"
30
        "sPaginationType": "four_button"
24
    } ) );
31
    } ) );
Lines 27-32 Link Here
27
        "aoColumnDefs": [
34
        "aoColumnDefs": [
28
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
35
            { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
29
        ],
36
        ],
37
        "aoColumns": [
38
            null,{ "sType": "anti-the" },null,null,null,null,null,null
39
        ],
30
        "sPaginationType": "four_button"
40
        "sPaginationType": "four_button"
31
    } ) );
41
    } ) );
32
42
Lines 190-196 Link Here
190
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
200
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
191
                        </td>
201
                        </td>
192
                        <td>
202
                        <td>
193
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
203
                            [% IF ( subscription.enddate ) %]
204
                                <span title="[% subscription.enddate %]">[% subscription.enddate | $KohaDates %]</span>
205
                            [% ELSE %]
206
                                <span title="0000-00-00"></span>
207
                            [% END %]
194
                        </td>
208
                        </td>
195
                        [% IF ( routing && CAN_user_serials_routing ) %]
209
                        [% IF ( routing && CAN_user_serials_routing ) %]
196
                        <td>
210
                        <td>
197
- 

Return to bug 11719