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

(-)a/admin/columns_settings.yml (+47 lines)
Lines 142-144 modules: Link Here
142
          columnname: location
142
          columnname: location
143
        -
143
        -
144
          columnname: notes
144
          columnname: notes
145
146
  circ:
147
    circulation:
148
      issues-table:
149
        -
150
          columnname: un
151
          cannot_be_toggled: 1
152
          cannot_be_modified: 1
153
          is_hidden: 1
154
        -
155
          columnname: deux
156
          cannot_be_toggled: 1
157
          cannot_be_modified: 1
158
          is_hidden: 1
159
        -
160
          columnname: due_date_unformatted
161
          cannot_be_toggled: 1
162
          cannot_be_modified: 1
163
          is_hidden: 1
164
        -
165
          columnname: due_date
166
        -
167
          columnname: title
168
        -
169
          columnname: item_type
170
        -
171
          columnname: checkout_on
172
        -
173
          columnname: checkout_from
174
        -
175
          columnname: callno
176
        -
177
          columnname: charge
178
        -
179
          columnname: price
180
        -
181
          columnname: renew
182
          cannot_be_toggled: 1
183
          cannot_be_modified: 1
184
        -
185
          columnname: checkin
186
          cannot_be_toggled: 1
187
          cannot_be_modified: 1
188
        -
189
          columnname: export
190
          cannot_be_toggled: 1
191
          cannot_be_modified: 1
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-3 / +3 lines)
Lines 1-9 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>[% finetotal %]</td>
5
        <td id="totalfine">[% finetotal %]</td>
6
        <td>[% totalprice %]</td>
6
        <td id="totalprice">[% totalprice %]</td>
7
                <td colspan="3"><div class="date-select">
7
                <td colspan="3"><div class="date-select">
8
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
8
            <p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
9
</p>
9
</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-7 / +6 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 386-395 $(document).ready(function() { Link Here
386
                    total_fine += aaData[i]['fine'] * 1;
386
                    total_fine += aaData[i]['fine'] * 1;
387
                    total_price  += aaData[i]['price'] * 1;
387
                    total_price  += aaData[i]['price'] * 1;
388
                }
388
                }
389
                var nCells = nRow.getElementsByTagName('td');
389
                $("#totaldue").html(total_charge.toFixed(2));
390
                nCells[1].innerHTML = total_charge.toFixed(2);
390
                $("#totalfine").html(total_fine.toFixed(2));
391
                nCells[2].innerHTML = total_fine.toFixed(2);
391
                $("#totalprice").html(total_price.toFixed(2));
392
                nCells[3].innerHTML = total_price.toFixed(2);
393
            },
392
            },
394
            "bPaginate": false,
393
            "bPaginate": false,
395
            "bProcessing": true,
394
            "bProcessing": true,
Lines 416-422 $(document).ready(function() { Link Here
416
415
417
                oSettings.aaSortingFixed = null;
416
                oSettings.aaSortingFixed = null;
418
            },
417
            },
419
        }).rowGrouping(
418
        }, columns_settings).rowGrouping(
420
            {
419
            {
421
                iGroupingColumnIndex: 1,
420
                iGroupingColumnIndex: 1,
422
                iGroupingOrderByColumnIndex: 0,
421
                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 ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
52
[% UNLESS ( borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
48
53
49
- 

Return to bug 13492