Bug 13492: Add the column configuration for the checkouts table - circulation.pl
Test plan: 1/ Verify that you can show/hide columns on the checkouts table (circulation.pl). 2/ Play with the column configuration admin page (admin/columns_settings.pl), and confirm the behavior is correct (depends on what you have selected). Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
parent
c953aee870
commit
8c324dd2a0
|
|
@ -142,3 +142,50 @@ modules:
|
|||
columnname: location
|
||||
-
|
||||
columnname: notes
|
||||
|
||||
circ:
|
||||
circulation:
|
||||
issues-table:
|
||||
-
|
||||
columnname: un
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
is_hidden: 1
|
||||
-
|
||||
columnname: deux
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
is_hidden: 1
|
||||
-
|
||||
columnname: due_date_unformatted
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
is_hidden: 1
|
||||
-
|
||||
columnname: due_date
|
||||
-
|
||||
columnname: title
|
||||
-
|
||||
columnname: item_type
|
||||
-
|
||||
columnname: checkout_on
|
||||
-
|
||||
columnname: checkout_from
|
||||
-
|
||||
columnname: callno
|
||||
-
|
||||
columnname: charge
|
||||
-
|
||||
columnname: price
|
||||
-
|
||||
columnname: renew
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
-
|
||||
columnname: checkin
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
-
|
||||
columnname: export
|
||||
cannot_be_toggled: 1
|
||||
cannot_be_modified: 1
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="9" style="text-align: right; font-weight:bold;">Totals:</td>
|
||||
<td>[% totaldue %]</td>
|
||||
<td>[% finetotal %]</td>
|
||||
<td>[% totalprice %]</td>
|
||||
<td id="totaldue">[% totaldue %]</td>
|
||||
<td id="totalfine">[% finetotal %]</td>
|
||||
<td id="totalprice">[% totalprice %]</td>
|
||||
<td colspan="3"><div class="date-select">
|
||||
<p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
|
||||
</p>
|
||||
|
|
|
|||
|
|
@ -164,13 +164,13 @@ $(document).ready(function() {
|
|||
$('#issues-table').show();
|
||||
$('#issues-table-actions').show();
|
||||
|
||||
issuesTable = $("#issues-table").dataTable({
|
||||
issuesTable = KohaTable("#issues-table", {
|
||||
"oLanguage": {
|
||||
"sEmptyTable" : MSG_DT_LOADING_RECORDS,
|
||||
"sProcessing": MSG_DT_LOADING_RECORDS,
|
||||
},
|
||||
"bAutoWidth": false,
|
||||
"sDom": "rt",
|
||||
"sDom": 'C<"clearfix">rt',
|
||||
"aoColumns": [
|
||||
{
|
||||
"mDataProp": function( oObj ) {
|
||||
|
|
@ -386,10 +386,9 @@ $(document).ready(function() {
|
|||
total_fine += aaData[i]['fine'] * 1;
|
||||
total_price += aaData[i]['price'] * 1;
|
||||
}
|
||||
var nCells = nRow.getElementsByTagName('td');
|
||||
nCells[1].innerHTML = total_charge.toFixed(2);
|
||||
nCells[2].innerHTML = total_fine.toFixed(2);
|
||||
nCells[3].innerHTML = total_price.toFixed(2);
|
||||
$("#totaldue").html(total_charge.toFixed(2));
|
||||
$("#totalfine").html(total_fine.toFixed(2));
|
||||
$("#totalprice").html(total_price.toFixed(2));
|
||||
},
|
||||
"bPaginate": false,
|
||||
"bProcessing": true,
|
||||
|
|
@ -416,7 +415,7 @@ $(document).ready(function() {
|
|||
|
||||
oSettings.aaSortingFixed = null;
|
||||
},
|
||||
}).rowGrouping(
|
||||
}, columns_settings).rowGrouping(
|
||||
{
|
||||
iGroupingColumnIndex: 1,
|
||||
iGroupingOrderByColumnIndex: 0,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[% USE Koha %]
|
||||
[% USE Branches %]
|
||||
[% USE KohaDates %]
|
||||
[% USE ColumnsSettings %]
|
||||
[% IF Koha.Preference('ExportRemoveFields') OR Koha.Preference('ExportWithCsvProfile') %]
|
||||
[% SET exports_enabled = 1 %]
|
||||
[% END %]
|
||||
|
|
@ -18,6 +19,7 @@
|
|||
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
||||
[% INCLUDE 'strings.inc' %]
|
||||
[% INCLUDE 'datatables.inc' %]
|
||||
[% INCLUDE 'columns_settings.inc' %]
|
||||
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
|
||||
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery-ui-timepicker-addon.min.js"></script>
|
||||
[% INCLUDE 'timepicker.inc' %]
|
||||
|
|
@ -43,6 +45,9 @@ var relatives_borrowernumbers = new Array();
|
|||
|
||||
var MSG_ADD_MESSAGE = _("Add a new message");
|
||||
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
|
||||
|
||||
columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
|
||||
|
||||
[% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
|
||||
[% UNLESS ( borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue