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

(-)a/admin/columns_settings.yml (+46 lines)
Lines 21-23 modules: Link Here
21
          columnname: active
21
          columnname: active
22
        -
22
        -
23
          columnname: actions
23
          columnname: actions
24
  circ:
25
    circulation:
26
      issues-table:
27
        -
28
          columnname: un
29
          cannot_be_toggled: 1
30
          cannot_be_modified: 1
31
          is_hidden: 1
32
        -
33
          columnname: deux
34
          cannot_be_toggled: 1
35
          cannot_be_modified: 1
36
          is_hidden: 1
37
        -
38
          columnname: due_date_unformatted
39
          cannot_be_toggled: 1
40
          cannot_be_modified: 1
41
          is_hidden: 1
42
        -
43
          columnname: due_date
44
        -
45
          columnname: title
46
        -
47
          columnname: item_type
48
        -
49
          columnname: checkout_on
50
        -
51
          columnname: checkout_from
52
        -
53
          columnname: callno
54
        -
55
          columnname: charge
56
        -
57
          columnname: price
58
        -
59
          columnname: renew
60
          cannot_be_toggled: 1
61
          cannot_be_modified: 1
62
        -
63
          columnname: checkin
64
          cannot_be_toggled: 1
65
          cannot_be_modified: 1
66
        -
67
          columnname: export
68
          cannot_be_toggled: 1
69
          cannot_be_modified: 1
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-2 / +2 lines)
Lines 1-8 Link Here
1
<tfoot>
1
<tfoot>
2
	<tr>
2
	<tr>
3
        <td colspan="9" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="9" style="text-align: right; font-weight:bold;">Totals:</td>
4
		<td>[% totaldue %]</td>
4
        <td id="totaldue">[% totaldue %]</td>
5
		<td>[% totalprice %]</td>
5
        <td id="totalprice">[% totalprice %]</td>
6
                <td colspan="3"><div class="date-select">
6
                <td colspan="3"><div class="date-select">
7
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
7
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
8
</p>
8
</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-6 / +5 lines)
Lines 164-176 $(document).ready(function() { Link Here
164
        $('#issues-table').show();
164
        $('#issues-table').show();
165
        $('#issues-table-actions').show();
165
        $('#issues-table-actions').show();
166
166
167
        issuesTable = $("#issues-table").dataTable({
167
        issuesTable = KohaTable("#issues-table", {
168
            "oLanguage": {
168
            "oLanguage": {
169
                "sEmptyTable" : MSG_DT_LOADING_RECORDS,
169
                "sEmptyTable" : MSG_DT_LOADING_RECORDS,
170
                "sProcessing": MSG_DT_LOADING_RECORDS,
170
                "sProcessing": MSG_DT_LOADING_RECORDS,
171
            },
171
            },
172
            "bAutoWidth": false,
172
            "bAutoWidth": false,
173
            "sDom": "rt",
173
            "sDom": 'C<"clearfix">rt',
174
            "aoColumns": [
174
            "aoColumns": [
175
                {
175
                {
176
                    "mDataProp": function( oObj ) {
176
                    "mDataProp": function( oObj ) {
Lines 381-389 $(document).ready(function() { Link Here
381
                    total_charge += aaData[i]['charge'] * 1;
381
                    total_charge += aaData[i]['charge'] * 1;
382
                    total_price  += aaData[i]['price'] * 1;
382
                    total_price  += aaData[i]['price'] * 1;
383
                }
383
                }
384
                var nCells = nRow.getElementsByTagName('td');
384
                $("#totaldue").html(total_charge.toFixed(2));
385
                nCells[1].innerHTML = total_charge.toFixed(2);
385
                $("#totalprice").html(total_price.toFixed(2));
386
                nCells[2].innerHTML = total_price.toFixed(2);
387
            },
386
            },
388
            "bPaginate": false,
387
            "bPaginate": false,
389
            "bProcessing": true,
388
            "bProcessing": true,
Lines 410-416 $(document).ready(function() { Link Here
410
409
411
                oSettings.aaSortingFixed = null;
410
                oSettings.aaSortingFixed = null;
412
            },
411
            },
413
        }).rowGrouping(
412
        }, columns_settings).rowGrouping(
414
            {
413
            {
415
                iGroupingColumnIndex: 1,
414
                iGroupingColumnIndex: 1,
416
                iGroupingOrderByColumnIndex: 0,
415
                iGroupingOrderByColumnIndex: 0,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +5 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE ColumnsSettings %]
4
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
5
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
5
   [% SET exports_enabled = 1 %]
6
   [% SET exports_enabled = 1 %]
6
[% END %]
7
[% END %]
Lines 18-23 Link Here
18
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
19
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
19
[% INCLUDE 'strings.inc' %]
20
[% INCLUDE 'strings.inc' %]
20
[% INCLUDE 'datatables.inc' %]
21
[% INCLUDE 'datatables.inc' %]
22
[% INCLUDE 'columns_settings.inc' %]
21
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
23
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
22
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
24
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
23
[% INCLUDE 'timepicker.inc' %]
25
[% INCLUDE 'timepicker.inc' %]
Lines 43-48 var relatives_borrowernumbers = new Array(); Link Here
43
45
44
var MSG_ADD_MESSAGE = _("Add a new message");
46
var MSG_ADD_MESSAGE = _("Add a new message");
45
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
47
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
48
49
columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
50
46
[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
51
[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
47
[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
52
[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
48
53
49
- 

Return to bug 13492