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

(-)a/C4/HoldsQueue.pm (-1 lines)
Lines 135-141 sub GetHoldsQueueItems { Link Here
135
    $sth->execute(@bind_params);
135
    $sth->execute(@bind_params);
136
    my $items = [];
136
    my $items = [];
137
    while ( my $row = $sth->fetchrow_hashref ){
137
    while ( my $row = $sth->fetchrow_hashref ){
138
        $row->{reservedate} = format_date($row->{reservedate});
139
        my $record = GetMarcBiblio($row->{biblionumber});
138
        my $record = GetMarcBiblio($row->{biblionumber});
140
        if ($record){
139
        if ($record){
141
            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
140
            $row->{subtitle} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
(-)a/circ/waitingreserves.pl (-1 / +1 lines)
Lines 105-111 foreach my $num (@getreserves) { Link Here
105
    $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
105
    $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
106
    my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'});
106
    my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'});
107
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
107
    my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} );  # using the fixed up itype/itemtype
108
    $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} );
108
    $getreserv{'waitingdate'} = $num->{'waitingdate'};
109
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
109
    my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'});
110
    ( $waiting_year, $waiting_month, $waiting_day ) =
110
    ( $waiting_year, $waiting_month, $waiting_day ) =
111
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
111
      Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-5 / +3 lines)
Lines 14-22 Link Here
14
[% INCLUDE 'doc-head-close.inc' %]
14
[% INCLUDE 'doc-head-close.inc' %]
15
[% INCLUDE 'calendar.inc' %]
15
[% INCLUDE 'calendar.inc' %]
16
[% IF ( UseTablesortForCirc ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
16
[% IF ( UseTablesortForCirc ) %]<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
17
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
17
[% INCLUDE 'datatables.inc' %][% END %]
18
[% INCLUDE 'datatables-strings.inc' %]
19
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>[% END %]
20
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
18
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
21
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
19
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
22
[% INCLUDE 'timepicker.inc' %]
20
[% INCLUDE 'timepicker.inc' %]
Lines 47-53 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
47
                { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false }
45
                { "aTargets": [ -1, -2[% IF ( exports_enabled ) %], -3[% END %] ], "bSortable": false, "bSearchable": false }
48
            ],
46
            ],
49
            "aoColumns": [
47
            "aoColumns": [
50
                { "sType": "title-string" },{ "sType": "html" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %]
48
                { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,null,null[% IF ( exports_enabled ) %],null[% END %]
51
            ],
49
            ],
52
            "bPaginate": false
50
            "bPaginate": false
53
        }));
51
        }));
Lines 56-62 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
56
            "sDom": 't',
54
            "sDom": 't',
57
            "aaSorting": [],
55
            "aaSorting": [],
58
            "aoColumns": [
56
            "aoColumns": [
59
                { "sType": "title-string" },{ "sType": "html" },null,{ "sType": "title-string" },null,null,null,null,{ "sType": "html" }
57
                { "sType": "title-string" },{ "sType": "anti-the" },null,{ "sType": "title-string" },null,null,null,null,{ "sType": "html" }
60
            ],
58
            ],
61
            "bPaginate": false
59
            "bPaginate": false
62
        }));
60
        }));
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-4 / +3 lines)
Lines 3-11 Link Here
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'calendar.inc' %]
4
[% INCLUDE 'calendar.inc' %]
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
6
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
[% INCLUDE 'datatables.inc' %]
7
[% INCLUDE 'datatables-strings.inc' %]
8
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
9
<script type="text/javascript">
7
<script type="text/javascript">
10
//<![CDATA[
8
//<![CDATA[
11
     $(document).ready(function() {
9
     $(document).ready(function() {
Lines 19-25 Link Here
19
        $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
17
        $("#holdst").dataTable($.extend(true, {}, dataTablesDefaults, {
20
            "aaSorting": [ [0,'desc'], [3,'asc'] ],
18
            "aaSorting": [ [0,'desc'], [3,'asc'] ],
21
            "aoColumnDefs": [
19
            "aoColumnDefs": [
22
                { "aTargets": [ 8 ], "sType": "natural" }
20
                { "aTargets": [ 8 ], "sType": "natural" },
21
                { "aTargets": [ 3 ], "sType": "anti-the" }
23
            ],
22
            ],
24
            "aoColumns": [
23
            "aoColumns": [
25
                null,
24
                null,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-4 / +2 lines)
Lines 2-11 Link Here
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Circulation &rsaquo; Transfers to your library</title>
3
<title>Koha &rsaquo; Circulation &rsaquo; Transfers to your library</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
6
<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
[% INCLUDE 'datatables.inc' %]
7
[% INCLUDE 'datatables-strings.inc' %]
8
<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
9
<script type="text/javascript">
7
<script type="text/javascript">
10
//<![CDATA[
8
//<![CDATA[
11
[% IF (dateformat == 'metric') %]
9
[% IF (dateformat == 'metric') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-11 / +9 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
1
[% USE ItemTypes %]
2
[% USE ItemTypes %]
2
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 8-27 Link Here
8
<body id="circ_view_holdsqueue" class="circ">
9
<body id="circ_view_holdsqueue" class="circ">
9
[% INCLUDE 'header.inc' %]
10
[% INCLUDE 'header.inc' %]
10
[% INCLUDE 'cat-search.inc' %]
11
[% INCLUDE 'cat-search.inc' %]
11
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
12
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
12
<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
13
[% INCLUDE 'datatables.inc' %]
13
[% INCLUDE 'datatables-strings.inc' %]
14
<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
15
<script type="text/javascript">//<![CDATA[
14
<script type="text/javascript">//<![CDATA[
16
$(document).ready(function() {
15
$(document).ready(function() {
17
    $("#holdst").dataTable({
16
    $("#holdst").dataTable({
18
        "aaSorting": [[ 3, "asc" ]],
17
        "aaSorting": [[ 3, "asc" ]],
19
        "bPaginate": false,
18
        "aoColumns": [
20
        "bLengthChange": false,
19
            { "sType": "anti-the" },null,null,null,null,null,null,null,null,{ "sType": "title-string" },null
21
        "bFilter": false,
20
        ],
22
        "bSort": true,
21
        "sDom": 't',
23
        "bInfo": false,
22
        "bPaginate": false
24
        "bAutoWidth": false
25
    });
23
    });
26
});
24
});
27
//]]>
25
//]]>
Lines 91-97 $(document).ready(function() { Link Here
91
            </td>
89
            </td>
92
			<td class="hq-patron"><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% itemsloo.cardnumber %]#reserves">[% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])</a></p> <p>[% itemsloo.phone %]</p></td>
90
			<td class="hq-patron"><p><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% itemsloo.cardnumber %]#reserves">[% itemsloo.surname %], [% itemsloo.firstname %] ([% itemsloo.cardnumber %])</a></p> <p>[% itemsloo.phone %]</p></td>
93
            <td class="hq-sendto">[% itemsloo.pickbranch %]</td>
91
            <td class="hq-sendto">[% itemsloo.pickbranch %]</td>
94
            <td class="hq-date">[% itemsloo.reservedate %]</td>
92
            <td class="hq-date"><span title="[% itemsloo.reservedate %]">[% itemsloo.reservedate | $KohaDates %]</span></td>
95
            <td class="hq-notes">[% itemsloo.notes %]</td>
93
            <td class="hq-notes">[% itemsloo.notes %]</td>
96
        </tr>
94
        </tr>
97
    [% END %]</tbody>
95
    [% END %]</tbody>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-6 / +7 lines)
Lines 1-10 Link Here
1
[% USE KohaDates %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Circulation &rsaquo; Holds awaiting pickup</title>
3
<title>Koha &rsaquo; Circulation &rsaquo; Holds awaiting pickup</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
4
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/en/css/datatables.css" />
5
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.dataTables.min.js"></script>
6
[% INCLUDE 'datatables.inc' %]
6
[% INCLUDE 'datatables-strings.inc' %]
7
<script type="text/javascript" src="[% interface %]/[% theme %]/en/js/datatables.js"></script>
8
<script type="text/javascript">
7
<script type="text/javascript">
9
//<![CDATA[
8
//<![CDATA[
10
[% IF (dateformat == 'metric') %]
9
[% IF (dateformat == 'metric') %]
Lines 17-22 dt_add_type_uk_date(); Link Here
17
            "aoColumnDefs": [
16
            "aoColumnDefs": [
18
                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
17
                { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
19
            ],
18
            ],
19
            "aoColumns": [
20
                { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null,null
21
            ],
20
            "sPaginationType": "four_button"
22
            "sPaginationType": "four_button"
21
        }));
23
        }));
22
      });
24
      });
Lines 149-155 dt_add_type_uk_date(); Link Here
149
               </tr></thead>
151
               </tr></thead>
150
               <tbody>[% FOREACH overloo IN overloop %]
152
               <tbody>[% FOREACH overloo IN overloop %]
151
                    <tr>
153
                    <tr>
152
                        <td><p>[% overloo.waitingdate %]</p></td>
154
                        <td><p><span title="[% overloo.waitingdate %]">[% overloo.waitingdate | $KohaDates %]</span></p></td>
153
                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %]
155
                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %]
154
                        </a>
156
                        </a>
155
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
157
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
156
- 

Return to bug 11711