Attachment #72905 for bug #15219

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




    moremember:
      issues-table:
        -
          columnname: group_order
          cannot_be_toggled: 1
          cannot_be_modified: 1
          is_hidden: 1

          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: export
          cannot_be_toggled: 1
          cannot_be_modified: 1
      relatives-issues-table:
        -
          columnname: due_date
        -
          columnname: title
        -
          columnname: item_type
        -
          columnname: location
        -
          columnname: checkout_on
        -
          columnname: checkout_from
        -
          columnname: callno
        -
          columnname: charge
        -
          columnname: fine
        -
          columnname: price
        -
          columnname: patron

    holdshistory:
      holdshistory-table:

    circulation:
      issues-table:
        -
          columnname: group_order
          cannot_be_toggled: 1
          cannot_be_modified: 1
          is_hidden: 1

          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: export
          cannot_be_toggled: 1
          cannot_be_modified: 1
      relatives-issues-table:
        -
          columnname: due_date
        -
          columnname: title
        -
          columnname: item_type
        -
          columnname: location
        -
          columnname: checkout_on
        -
          columnname: checkout_from
        -
          columnname: callno
        -
          columnname: charge
        -
          columnname: fine
        -
          columnname: price
        -
          columnname: patron

    returns:
      checkedintable:

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_15219.sql (+2 lines)
	1	INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type)
	2	VALUES ('ServerSideCheckoutsTables','0',NULL,'If enabled, use the "server-side processing" feature for checkouts tables. Can improve performance when there is a big number of checkouts to display.','YesNo');

Lines 488-493 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
488	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),	488	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),
489	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),	489	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
490	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),	490	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),
		491	('ServerSideCheckoutsTables','0',NULL,'If enabled, use the "server-side processing" feature for checkouts tables. Can improve performance when there is a big number of checkouts per patron.','YesNo'),
491	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),	492	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),
492	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),	493	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),
493	('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),	494	('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),





                      }

            oTable.fnSetColumnVis(properties.iGroupingColumnIndex, !properties.bHideGroupingColumn, false);
            if (properties.bCustomColumnOrdering) {
                oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex, !properties.bHideGroupingOrderByColumn, false);
            }
            if (properties.iGroupingColumnIndex2 != -1) {
                oTable.fnSetColumnVis(properties.iGroupingColumnIndex2, !properties.bHideGroupingColumn2, false);
            }
            if (properties.bCustomColumnOrdering2) {
                oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex2, !properties.bHideGroupingOrderByColumn2, false);
            }
            oTable.fnSettings().aoDrawCallback.push({
                "fn": _fnDrawCallBackWithGrouping,


        });
    };
})(jQuery);

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
1	<tfoot>	1	<tfoot>
2	<tr>	2	<tr>
3	<td colspan="11" style="text-align: right; font-weight:bold;">Totals:</td>	3	<td colspan="10" style="text-align: right; font-weight:bold;">Totals:</td>
4	<td id="totaldue" style="text-align: right;">[% totaldue %]</td>	4	<td id="totaldue" style="text-align: right;">[% totaldue %]</td>
5	<td id="totalfine" style="text-align: right;">[% finetotal %]</td>	5	<td id="totalfine" style="text-align: right;">[% finetotal %]</td>
6	<td id="totalprice" style="text-align: right;">[% totalprice %]</td>	6	<td id="totalprice" style="text-align: right;">[% totalprice %]</td>

Lines 13-19 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 lines)
13	<th scope="col"> </th>	13	<th scope="col"> </th>
14	<th scope="col"> </th>	14	<th scope="col"> </th>
15	<th scope="col">Due date</th>	15	<th scope="col">Due date</th>
16	<th scope="col">Due date</th>
17	<th scope="col">Title</th>	16	<th scope="col">Title</th>
18	<th scope="col">Item type</th>	17	<th scope="col">Item type</th>
19	<th scope="col">Location</th>	18	<th scope="col">Location</th>




[% USE Koha %]

<script>
  [% IF Koha.Preference('ServerSideCheckoutsTables') %]
    var ServerSideCheckoutsTables = true;
  [% ELSE %]
    var ServerSideCheckoutsTables = false;
  [% END %]
  var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
  var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride'))? 1 : 0 %];

  var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");

  var borrowernumber = "[% borrowernumber %]";
  var relatives_borrowernumbers = new Array();
  [% FOREACH b IN relatives_borrowernumbers %]
    relatives_borrowernumbers.push("[% b %]");
  [% END %]

  var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %];
  var relatives_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'relatives-issues-table', 'json' ) %];
</script>

<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script>

Lines 40-46 function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc (-1 / +1 lines)
40	table.dataTable($.extend(true, {}, dataTablesDefaults, dt_parameters));	40	table.dataTable($.extend(true, {}, dataTablesDefaults, dt_parameters));
41		41
42	$(hidden_ids).each(function(index, value) {	42	$(hidden_ids).each(function(index, value) {
43	table.fnSetColumnVis( value, false );	43	table.fnSetColumnVis( value, false, false );
44	});	44	});
45		45
46	if ( add_filters ) {	46	if ( add_filters ) {

Lines 43-47 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
43	var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");	43	var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
44	var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");	44	var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
45	var CURRENT = _(" (current) ");	45	var CURRENT = _(" (current) ");
		46	var GROUP_TODAYS_CHECKOUTS = _("Group today's checkouts");
46	//]]>	47	//]]>
47	</script>	48	</script>

Lines 52-57 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
52	asc: earliest to latest	52	asc: earliest to latest
53	desc: latest to earliest	53	desc: latest to earliest
54	- due date.	54	- due date.
		55	-
		56	- pref: ServerSideCheckoutsTables
		57	choices:
		58	yes: Enable
		59	no: Do not enable
		60	- server-side processing on checkouts tables. It can improve performance when there is a big number of checkouts to display.
55	-	61	-
56	- pref: SpecifyDueDate	62	- pref: SpecifyDueDate
57	choices:	63	choices:




        <table id="relatives-issues-table">
            <thead>
                <tr>
                    <th scope="col">Due date (unformatted, hidden)</th>
                    <th scope="col">Due date</th>
                    <th scope="col">Title</th>
                    <th scope="col">Item type</th>

    [% INCLUDE 'timepicker.inc' %]
    <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>
    [% INCLUDE 'checkouts.js.inc' %]
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript">
        /* Set some variable needed in circulation.js */
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
        var interface = "[% interface %]";
        var theme = "[% theme %]";
        var borrowernumber = "[% patron.borrowernumber %]";
        var branchcode = "[% branch %]";
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
        var script = "circulation";
        var relatives_borrowernumbers = new Array();
        [% FOREACH b IN relatives_borrowernumbers %]
            relatives_borrowernumbers.push("[% b %]");
        [% END %]

        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");

        var destination = "[% destination %]";
        var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]";

        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]

        [% IF borrowernumber and patron %]
            if($.cookie("holdfor") != [% patron.borrowernumber %]){
                $.removeCookie("holdfor", { path: '/' });




        <table id="relatives-issues-table" style="width: 100% !Important;">
            <thead>
                <tr>
                    <th scope="col">Due date hidden not formatted</th>
                    <th scope="col">Due date</th>
                    <th scope="col">Title</th>
                    <th scope="col">Item type</th>

    [% INCLUDE 'timepicker.inc' %]
    <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>
    [% INCLUDE 'checkouts.js.inc' %]
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script>
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script>

        /* Set some variable needed in circulation.js */
        var interface = "[% interface %]";
        var theme = "[% theme %]";
        var borrowernumber = "[% patron.borrowernumber %]";
        var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
        var script = "moremember";
        var relatives_borrowernumbers = new Array();
        [% FOREACH b IN relatives_borrowernumbers %]
            relatives_borrowernumbers.push("[% b %]");
        [% END %]

        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");

        columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]

        $(document).ready(function() {
            if ( $('#clubs-tab').length ) {
                $('#clubs-tab-link').on('click', function() {




(function($) {

var ymd = $.datepicker.formatDate('yy-mm-dd', new Date());

function enableGrouping(datatable) {
    datatable.rowGrouping({
        iGroupingColumnIndex: 1,
        iGroupingOrderByColumnIndex: 0,
        sGroupingColumnSortDirection: "desc"
    });
}

function disableGrouping(datatable) {
    var oSettings = datatable.fnSettings();
    for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
        if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
            oSettings.aoDrawCallback.splice(f, 1);
            oSettings.aaSortingFixed = null;
            datatable.fnDraw();
            break;
        }
    }
}

var mRenders = {
    groupOrder: function (oData, sType, oObj) {
        if ( oObj.issued_today ) {
            return "1";
        } else {
            return "0";
        }
    },
    groupName: function (oData, sType, oObj) {
        if (oObj.issued_today) {
            return "<strong>" + TODAYS_CHECKOUTS + "</strong>";
        } else {
            return "<strong>" + PREVIOUS_CHECKOUTS + "</strong>";
        }
    },
    dateDueFormatted: function (oData, sType, oObj) {
        var due = oObj.date_due_formatted;

        if ( oObj.date_due_overdue ) {
            due = "<span class='overdue'>" + due + "</span>";
        }

        due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";

        if ( oObj.lost ) {
            due += "<span class='lost'>" + oObj.lost + "</span>";
        }

        if ( oObj.damaged ) {
            due += "<span class='dmg'>" + oObj.damaged + "</span>";
        }

        return due;
    },
    title: function (oData, sType, oObj) {
        var title = "<span id='title_" + oObj.itemnumber + "' class='strong'><a href='/cgi-bin/koha/catalogue/detail.pl?biblionumber="
              + oObj.biblionumber
              + "'>"
              + oObj.title;

        $.each(oObj.subtitle, function( index, value ) {
                  title += " " + value.subfield;
        });

        if ( oObj.enumchron ) {
            title += " (" + oObj.enumchron + ")";
        }

        title += "</a></span>";

        if ( oObj.author ) {
            title += " " + BY.replace( "_AUTHOR_",  " " + oObj.author );
        }

        if ( oObj.itemnotes ) {
            var span_class = "text-muted";
            if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                span_class = "circ-hlt";
            }
            title += " - <span class='" + span_class + " item-note-public'>" + oObj.itemnotes + "</span>";
        }

        if ( oObj.itemnotes_nonpublic ) {
            var span_class = "text-danger";
            if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                span_class = "circ-hlt";
            }
            title += " - <span class='" + span_class + " item-note-nonpublic'>" + oObj.itemnotes_nonpublic + "</span>";
        }

        var onsite_checkout = '';
        if ( oObj.onsite_checkout == 1 ) {
            onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";
        }

        title += " "
              + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
              + oObj.biblionumber
              + "&itemnumber="
              + oObj.itemnumber
              + "#"
              + oObj.itemnumber
              + "'>"
              + oObj.barcode
              + "</a>"
              + onsite_checkout

        return title;
    },
    itemtype: function (oData, sType, oObj) {
        return oObj.itemtype_description;
    },
    issuedate: function (oData, sType, oObj) {
        return oObj.issuedate_formatted;
    },
    branch: function (oData, sType, oObj) {
        return oObj.branchname;
    },
    charge: function (oData, sType, oObj) {
        if (!oObj.charge) oObj.charge = 0;
        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
    },
    fine: function (oData, sType, oObj) {
        if (!oObj.fine) oObj.fine = 0;
        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2)  + '<span>';
    },
    price: function (oData, sType, oObj) {
        if (!oObj.price) oObj.price = 0;
        return parseFloat(oObj.price).toFixed(2);
    },
    renew: function (oData, sType, oObj) {
        var content = "";
        var span_style = "";
        var span_class = "";

        content += "<span>";
        content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>";

        if ( oObj.can_renew ) {
            // Do nothing
        } else if ( oObj.can_renew_error == "on_reserve" ) {
            content += "<span class='renewals-disabled-no-override'>"
                    + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "too_many" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "restriction" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_RESTRICTION
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "overdue" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_OVERDUE
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "too_soon" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "auto_too_soon" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_AUTO_TOO_SOON
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "auto_too_late" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_AUTO_TOO_LATE
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "auto_account_expired" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "auto_renew" ) {
            content += "<span class='renewals-disabled'>"
                    + NOT_RENEWABLE_AUTO_RENEW
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
            // Don't display something if it's an onsite checkout
        } else {
            content += "<span class='renewals-disabled'>"
                    + oObj.can_renew_error
                    + "</span>";

            span_style = "display: none";
            span_class = "renewals-allowed";
        }

        var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" );
        var can_renew = ( oObj.renewals_remaining > 0  && !oObj.can_renew_error );
        if ( can_renew || can_force_renew ) {
            content += "<span class='" + span_class + "' style='" + span_style + "'>"
                    +  "<input type='checkbox' ";
            if ( oObj.date_due_overdue && can_renew ) {
                content += "checked='checked' ";
            }
            content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
                    +  "</span>";

            content += "<span class='renewals'>("
                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
                    + ")</span>";
        }

        content += "</span>";

        return content;
    },
    checkin: function (oData, sType, oObj) {
        if (oObj.can_renew_error == "on_reserve") {
            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
        } else {
            return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
        }
    },
    export: function (oData, sType, oObj) {
        var s = "<input type='checkbox' name='itemnumbers' value='" + oObj.itemnumber + "' style='visibility:hidden;' />";

        s += "<input type='checkbox' class='export' id='export_" + oObj.biblionumber + "' name='biblionumbers' value='" + oObj.biblionumber + "' />";
        return s;
    },
    patron: function (oData, sType, oObj) {
        return "<a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=" + oObj.borrowernumber + "'>"
             + oObj.borrower.firstname + " " + oObj.borrower.surname + " (" + oObj.borrower.cardnumber + ")</a>"
    }
};

$(document).ready(function() {
    $.ajaxSetup ({ cache: false });


        return false;
    });

    var ymd = $.datepicker.formatDate('yy-mm-dd', new Date());

    $('#issues-table').hide();
    $('#issues-table-actions').hide();
    $('#issues-table-load-immediately').change(function(){

                "sProcessing": MSG_DT_LOADING_RECORDS,
            },
            "bAutoWidth": false,
            "bProcessing": true,
            "bServerSide": ServerSideCheckoutsTables,
            "sAjaxSource": "/cgi-bin/koha/svc/checkouts",
            "fnServerParams": function (aoData) {
                aoData.push({ "name": "borrowernumber", "value": borrowernumber });
            },
            "bPaginate": true,
            "sPaginationType": "four_button",
            "dom": 'B<"clearfix"><"top pager"ilp>rt',
            "aaSorting": [],
            "aoColumns": [
                {
                    "mData": "issued_today",
                    "mRender": mRenders.groupOrder
                    }
                },
                {
                    "mData": function (oObj) {
                        if (oObj.issued_today) {
                            return "<strong>" + TODAYS_CHECKOUTS + "</strong>";
                        } else {
                            return "<strong>" + PREVIOUS_CHECKOUTS + "</strong>";

                    }
                },
                {
                    "mData": "date_due",
                    "mRender": mRenders.dateDueFormatted
                },
                {
                    "mData": "title",
                    "mRender": mRenders.title
                        var due = oObj.date_due_formatted;

                        if ( oObj.date_due_overdue ) {
                            due = "<span class='overdue'>" + due + "</span>";
                        }

                        due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";

                        if ( oObj.lost ) {
                            due += "<span class='lost'>" + oObj.lost + "</span>";
                        }

                        if ( oObj.damaged ) {
                            due += "<span class='dmg'>" + oObj.damaged + "</span>";
                        }

                        var patron_note = " <span class='patron_note_" + oObj.itemnumber + "'></span>";
                        due +="<br>" + patron_note;

                        return due;
                    }
                },
                {
                    "mData": "itemtype",
                    "mRender": mRenders.itemtype
                              + oObj.biblionumber
                              + "'>"
                              + oObj.title;

                        $.each(oObj.subtitle, function( index, value ) {
                                  title += " " + value.subfield;
                        });

                        if ( oObj.enumchron ) {
                            title += " (" + oObj.enumchron + ")";
                        }

                        title += "</a></span>";

                        if ( oObj.author ) {
                            title += " " + BY.replace( "_AUTHOR_",  " " + oObj.author );
                        }

                        if ( oObj.itemnotes ) {
                            var span_class = "text-muted";
                            if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                                span_class = "circ-hlt";
                            }
                            title += " - <span class='" + span_class + " item-note-public'>" + oObj.itemnotes + "</span>";
                        }

                        if ( oObj.itemnotes_nonpublic ) {
                            var span_class = "text-danger";
                            if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                                span_class = "circ-hlt";
                            }
                            title += " - <span class='" + span_class + " item-note-nonpublic'>" + oObj.itemnotes_nonpublic + "</span>";
                        }

                        var onsite_checkout = '';
                        if ( oObj.onsite_checkout == 1 ) {
                            onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";
                        }

                        title += " "
                              + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
                              + oObj.biblionumber
                              + "&itemnumber="
                              + oObj.itemnumber
                              + "#"
                              + oObj.itemnumber
                              + "'>"
                              + oObj.barcode
                              + "</a>"
                              + onsite_checkout

                        return title;
                    },
                    "sType": "anti-the"
                },
                { "mData": "location" },
                { "mData": "homebranch" },
                { "mDataProp": "homebranch" },
                { "mDataProp": "issuedate_formatted" },
                { "mDataProp": "branchname" },
                { "mDataProp": "itemcallnumber" },
                {
                    "mData": "issuedate",
                    "mRender": mRenders.issuedate
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
                    }
                },
                {
                    "mData": "branchcode",
                    "mRender": mRenders.branch
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2)  + '<span>';
                    }
                },
                { "mData": "itemcallnumber" },
                {
                    "mData": "charge",
                    "mRender": mRenders.charge,
                    "bSortable": ServerSideCheckoutsTables ? false : true
                },
                {
                    "mData": "fine",
                    "mRender": mRenders.fine,
                    "bSortable": ServerSideCheckoutsTables ? false : true
                },
                {
                    "mData": "replacementprice",
                    "mRender": mRenders.price,
                    "bSortable": ServerSideCheckoutsTables ? false : true
                },
                {
                    "bSortable": false,
                    "bVisible": AllowCirculate ? true : false,
                    "mRender": mRenders.renew,
                    "bSortable": false
                        var span_style = "";
                        var span_class = "";

                        content += "<span>";
                        content += "<span style='padding: 0 1em;'>" + oObj.renewals_count + "</span>";

                        if ( oObj.can_renew ) {
                            // Do nothing
                        } else if ( oObj.can_renew_error == "on_reserve" ) {
                            content += "<span class='renewals-disabled-no-override'>"
                                    + "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "too_many" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "restriction" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_RESTRICTION
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "overdue" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_OVERDUE
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "too_soon" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "auto_too_soon" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_AUTO_TOO_SOON
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "auto_too_late" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_AUTO_TOO_LATE
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "auto_too_much_oweing" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_AUTO_TOO_MUCH_OWEING
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "auto_account_expired" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_AUTO_ACCOUNT_EXPIRED
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "auto_renew" ) {
                            content += "<span class='renewals-disabled'>"
                                    + NOT_RENEWABLE_AUTO_RENEW
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
                            // Don't display something if it's an onsite checkout
                        } else {
                            content += "<span class='renewals-disabled'>"
                                    + oObj.can_renew_error
                                    + "</span>";

                            span_style = "display: none";
                            span_class = "renewals-allowed";
                        }

                        var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" );
                        var can_renew = ( oObj.renewals_remaining > 0  && !oObj.can_renew_error );
                        if ( can_renew || can_force_renew ) {
                            content += "<span class='" + span_class + "' style='" + span_style + "'>"
                                    +  "<input type='checkbox' ";
                            if ( oObj.date_due_overdue && can_renew ) {
                                content += "checked='checked' ";
                            }
                            content += "class='renew' id='renew_" + oObj.itemnumber + "' name='renew' value='" + oObj.itemnumber +"'/>"
                                    +  "</span>";

                            content += "<span class='renewals'>("
                                    + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed )
                                    + ")</span>";
                        }

                        content += "</span>";

                        return content;
                    }
                },
                {
                    "bSortable": false,
                    "bVisible": AllowCirculate ? true : false,
                    "mRender": mRenders.checkin,
                    "bSortable": false
                            return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
                        } else {
                            return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";
                        }
                    }
                },
                {
                    "bVisible": exports_enabled == 1 ? true : false,
                    "bSortable": false,
                    "mRender": mRenders.export
                        var s = "<input type='checkbox' name='itemnumbers' value='" + oObj.itemnumber + "' style='visibility:hidden;' />";

                        s += "<input type='checkbox' class='export' id='export_" + oObj.biblionumber + "' name='biblionumbers' value='" + oObj.biblionumber + "' />";
                        return s;
                    }
                }
            ],
            "fnFooterCallback": function ( nRow, aaData, iStart, iEnd, aiDisplay ) {

                $("#totaldue").html(total_charge.toFixed(2));
                $("#totalfine").html(total_fine.toFixed(2));
                $("#totalprice").html(total_price.toFixed(2));
            },
            "bPaginate": false,
            "bProcessing": true,
            "bServerSide": false,
            "sAjaxSource": '/cgi-bin/koha/svc/checkouts',
            "fnServerData": function ( sSource, aoData, fnCallback ) {
                aoData.push( { "name": "borrowernumber", "value": borrowernumber } );

                $.getJSON( sSource, aoData, function (json) {
                    fnCallback(json)
                } );
            },
            "fnInitComplete": function(oSettings) {
                // Disable rowGrouping plugin after first use
                // so any sorting on the table doesn't use it
                var oSettings = issuesTable.fnSettings();

                for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
                    if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
                        oSettings.aoDrawCallback.splice(f, 1);
                        break;
                    }
                }

                oSettings.aaSortingFixed = null;
            },
        }, columns_settings).rowGrouping(
            {
                iGroupingColumnIndex: 1,
                iGroupingOrderByColumnIndex: 0,
                sGroupingColumnSortDirection: "asc"
            }
        }, columns_settings);

        enableGrouping(issuesTable);

        var groupingSwitch = $('<input type="checkbox">')
          .attr('id', 'issues-table-row-grouping-switch')
          .attr('checked', 'checked')
          .css('vertical-align', 'middle')
          .change(function() {
              if ($(this).is(':checked')) {
                  enableGrouping(issuesTable);
              } else {
                  disableGrouping(issuesTable);
              }
          });
        $('<div></div>')
          .css('float', 'left')
          .css('padding', '0.3em 0.5em')
          .css('line-height', '1.9em')
          .append(groupingSwitch)
          .append('&nbsp;')
          .append('<label for="issues-table-row-grouping-switch">' + GROUP_TODAYS_CHECKOUTS + '</label>')
          .appendTo('#issues-table_wrapper .top.pager');

        if ( $("#issues-table").length ) {
            $("#issues-table_processing").position({

    var relativesIssuesTable;
    $("#relatives-issues-tab").click( function() {
        if ( ! relativesIssuesTable ) {
            relativesIssuesTable = KohaTable("#relatives-issues-table", {
                "bAutoWidth": false,
                "sDom": 'C<"top pager"ilp>rt',
                "aaSorting": [[4, "desc"]],
                "bProcessing": true,
                "bServerSide": ServerSideCheckoutsTables,
                "sAjaxSource": "/cgi-bin/koha/svc/checkouts",
                "fnServerParams": function (aoData) {
                    for (i in relatives_borrowernumbers) {
                        var borrowernumber = relatives_borrowernumbers[i];
                        aoData.push({ "name": "borrowernumber", "value": borrowernumber });
                    }
                },
                "bPaginate": true,
                "sPaginationType": "four_button",
                "aoColumns": [
                    {
                        "mData": "date_due",
                        "mRender": mRenders.dateDueFormatted
                    },
                    {
                        "mData": "title",
                        "mRender": mRenders.title,
                            var today = new Date();
                            var due = new Date( oObj.date_due );
                            if ( today > due ) {
                                return "<span class='overdue'>" + oObj.date_due_formatted + "</span>";
                            } else {
                                return oObj.date_due_formatted;
                            }
                        }
                    },
                    { "mData": "itemtype" },
                    { "mData": "location" },
                    {
                        "mData": "issuedate",
                        "mRender": mRenders.issuedate
                                  + oObj.biblionumber
                                  + "'>"
                                  + oObj.title;

                            $.each(oObj.subtitle, function( index, value ) {
                                      title += " " + value.subfield;
                            });

                            if ( oObj.enumchron ) {
                                title += " (" + oObj.enumchron + ")";
                            }

                            title += "</a></span>";

                            if ( oObj.author ) {
                                title += " " + BY.replace( "_AUTHOR_", " " + oObj.author );
                            }

                            if ( oObj.itemnotes ) {
                                var span_class = "";
                                if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                                    span_class = "circ-hlt";
                                }
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
                            }

                            if ( oObj.itemnotes_nonpublic ) {
                                var span_class = "";
                                if ( $.datepicker.formatDate('yy-mm-dd', new Date(oObj.issuedate) ) == ymd ) {
                                    span_class = "circ-hlt";
                                }
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes_nonpublic + "</span>"
                            }

                            var onsite_checkout = '';
                            if ( oObj.onsite_checkout == 1 ) {
                                onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";
                            }

                            title += " "
                                  + "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
                                  + oObj.biblionumber
                                  + "&itemnumber="
                                  + oObj.itemnumber
                                  + "#"
                                  + oObj.itemnumber
                                  + "'>"
                                  + oObj.barcode
                                  + "</a>"
                                  + onsite_checkout;

                            return title;
                        },
                        "sType": "anti-the"
                    },
                    { "mData": "branchname" },
                    { "mData": "itemcallnumber" },
                    { "mDataProp": "issuedate_formatted" },
                    { "mDataProp": "branchname" },
                    { "mDataProp": "itemcallnumber" },
                    {
                        "mData": "charge",
                        "mRender": mRenders.charge,
                        "bSortable": ServerSideCheckoutsTables ? false : true
                        }
                    },
                    {
                        "mData": "fine",
                        "mRender": mRenders.fine,
                        "bSortable": ServerSideCheckoutsTables ? false : true
                        }
                    },
                    {
                        "mData": "replacementprice",
                        "mRender": mRenders.price,
                        "bSortable": ServerSideCheckoutsTables ? false : true
                        }
                    },
                    {
                        "mData": "borrowernumber",
                        "mRender": mRenders.patron,
                        "bSortable": ServerSideCheckoutsTables ? false : true
                    }
                ]
            }, relatives_columns_settings);
                "bPaginate": false,
                "bProcessing": true,
                "bServerSide": false,
                "sAjaxSource": '/cgi-bin/koha/svc/checkouts',
                "fnServerData": function ( sSource, aoData, fnCallback ) {
                    $.each(relatives_borrowernumbers, function( index, value ) {
                        aoData.push( { "name": "borrowernumber", "value": value } );
                    });

                    $.getJSON( sSource, aoData, function (json) {
                        fnCallback(json)
                    } );
                },
            });
        }
    });


            }
        } ).prop('checked', false);
    }
});

})(jQuery);




use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
use C4::Overdues qw(GetFine);
use C4::Context;
use C4::Utils::DataTables;

use Koha::AuthorisedValues;
use Koha::DateUtils;

    exit 0;
}

my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;

my @borrowernumber   = $input->multi_param('borrowernumber');
my $offset = $input->param('iDisplayStart');
my $count = $input->param('iDisplayLength');

my %params = dt_get_params($input);
my $orderby = dt_build_orderby(\%params);

my $todaysIssuesDefaultSortOrder =
  C4::Context->preference('todaysIssuesDefaultSortOrder');
my $previousIssuesDefaultSortOrder =
  C4::Context->preference('previousIssuesDefaultSortOrder');

# Default sort when user hasn't clicked on a column header yet.
# When row grouping is enabled, DataTables ask to sort on issued_today column,
# so we need to treat this case the same as the "no sorting" case
if (!$orderby || $orderby =~ m/ORDER BY issued_today desc\s*$/) {
    $orderby = qq{
        ORDER BY
        issued_today DESC,
        CASE WHEN issued_today = 0 THEN date_due END $previousIssuesDefaultSortOrder,
        CASE WHEN issued_today != 0 THEN date_due END $todaysIssuesDefaultSortOrder
    };
}

my @parameters;
my $sql = '
    SELECT SQL_CALC_FOUND_ROWS
        issuedate,
        date_due,
        date_due < now() as date_due_overdue,

        location,
        items.enumchron,

        DATEDIFF( issuedate, CURRENT_DATE() ) = 0 AS issued_today
    FROM issues
        LEFT JOIN items USING ( itemnumber )
        LEFT JOIN biblio USING ( biblionumber )

        LEFT JOIN borrowers USING ( borrowernumber )
        LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
        LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
    WHERE
';

my $borrowernumber_sql = 'borrowernumber';
if ( @borrowernumber == 1 ) {
    $borrowernumber_sql .= ' = ?';
} else {
    $borrowernumber_sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
    $sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
}
$sql .= $borrowernumber_sql;
push( @parameters, @borrowernumber );

$sql .= " $orderby";

if ($count && $count > 0) {
    $sql .= " LIMIT ?,?";
    push @parameters, $offset, $count;
}

my $dbh = C4::Context->dbh();
my $sth = $dbh->prepare($sql);
$sth->execute(@parameters);
my ($iTotalDisplayRecords) = $dbh->selectrow_array('SELECT FOUND_ROWS()');

my $item_level_itypes = C4::Context->preference('item-level_itypes');

my @checkouts;
my @checkouts_previous;
while ( my $c = $sth->fetchrow_hashref() ) {
    my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
    my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );

            firstname  => $c->{firstname},
            cardnumber => $c->{cardnumber},
        },
        issued_today => $c->{issued_today} ? JSON::true : JSON::false,
    };

    push @checkouts, $checkout;
        push( @checkouts_previous, $checkout );
    }
    else {
        push( @checkouts_today, $checkout );
    }
}

binmode STDOUT, ":encoding(UTF-8)";
print $input->header( -type => 'application/json', -charset => 'UTF-8' );

my $sEcho = $input->param('sEcho');
my ($iTotalRecords) = $dbh->selectrow_array(
    "SELECT COUNT(*) FROM issues WHERE $borrowernumber_sql", undef,
    @borrowernumber);
@checkouts_previous = sort { $a->{date_due} cmp $b->{date_due} } @checkouts_previous;
@checkouts_previous = reverse(@checkouts_previous)
  if ( C4::Context->preference('previousIssuesDefaultSortOrder') eq 'desc' );

my @checkouts = ( @checkouts_today, @checkouts_previous );

my $i = 1;
map { $_->{sort_order} = $i++ } @checkouts;


my $response = {
    iTotalRecords => $iTotalRecords,
    iTotalDisplayRecords => $iTotalDisplayRecords,
    sEcho => $sEcho,
    aaData => \@checkouts,
};

print to_json($response);
- 

Return to bug 15219

Lines 209-215 modules: Link Here

(-)a/admin/columns_settings.yml (-12 / +48 lines)
209	moremember:	209	moremember:
210	issues-table:	210	issues-table:
211	-	211	-
212	columnname: sort_order	212	columnname: group_order
213	cannot_be_toggled: 1	213	cannot_be_toggled: 1
214	cannot_be_modified: 1	214	cannot_be_modified: 1
215	is_hidden: 1	215	is_hidden: 1
Lines 218-228 modules: Link Here
218	cannot_be_toggled: 1	218	cannot_be_toggled: 1
219	cannot_be_modified: 1	219	cannot_be_modified: 1
220	is_hidden: 1	220	is_hidden: 1
221	-
222	columnname: due_date_unformatted
223	cannot_be_toggled: 1
224	cannot_be_modified: 1
225	is_hidden: 1
226	-	221	-
227	columnname: due_date	222	columnname: due_date
228	-	223	-
Lines 255-260 modules: Link Here
255	columnname: export	250	columnname: export
256	cannot_be_toggled: 1	251	cannot_be_toggled: 1
257	cannot_be_modified: 1	252	cannot_be_modified: 1
		253	relatives-issues-table:
		254	-
		255	columnname: due_date
		256	-
		257	columnname: title
		258	-
		259	columnname: item_type
		260	-
		261	columnname: location
		262	-
		263	columnname: checkout_on
		264	-
		265	columnname: checkout_from
		266	-
		267	columnname: callno
		268	-
		269	columnname: charge
		270	-
		271	columnname: fine
		272	-
		273	columnname: price
		274	-
		275	columnname: patron
258		276
259	holdshistory:	277	holdshistory:
260	holdshistory-table:	278	holdshistory-table:
Lines 321-327 modules: Link Here
321	circulation:	339	circulation:
322	issues-table:	340	issues-table:
323	-	341	-
324	columnname: sort_order	342	columnname: group_order
325	cannot_be_toggled: 1	343	cannot_be_toggled: 1
326	cannot_be_modified: 1	344	cannot_be_modified: 1
327	is_hidden: 1	345	is_hidden: 1
Lines 330-340 modules: Link Here
330	cannot_be_toggled: 1	348	cannot_be_toggled: 1
331	cannot_be_modified: 1	349	cannot_be_modified: 1
332	is_hidden: 1	350	is_hidden: 1
333	-
334	columnname: due_date_unformatted
335	cannot_be_toggled: 1
336	cannot_be_modified: 1
337	is_hidden: 1
338	-	351	-
339	columnname: due_date	352	columnname: due_date
340	-	353	-
Lines 367-372 modules: Link Here
367	columnname: export	380	columnname: export
368	cannot_be_toggled: 1	381	cannot_be_toggled: 1
369	cannot_be_modified: 1	382	cannot_be_modified: 1
		383	relatives-issues-table:
		384	-
		385	columnname: due_date
		386	-
		387	columnname: title
		388	-
		389	columnname: item_type
		390	-
		391	columnname: location
		392	-
		393	columnname: checkout_on
		394	-
		395	columnname: checkout_from
		396	-
		397	columnname: callno
		398	-
		399	columnname: charge
		400	-
		401	columnname: fine
		402	-
		403	columnname: price
		404	-
		405	columnname: patron
370		406
371	returns:	407	returns:
372	checkedintable:	408	checkedintable:

Lines 608-622 Link Here

(-)a/koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.rowGrouping.js (-5 / +5 lines)
608		608
609	}	609	}
610		610
611	oTable.fnSetColumnVis(properties.iGroupingColumnIndex, !properties.bHideGroupingColumn);	611	oTable.fnSetColumnVis(properties.iGroupingColumnIndex, !properties.bHideGroupingColumn, false);
612	if (properties.bCustomColumnOrdering) {	612	if (properties.bCustomColumnOrdering) {
613	oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex, !properties.bHideGroupingOrderByColumn);	613	oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex, !properties.bHideGroupingOrderByColumn, false);
614	}	614	}
615	if (properties.iGroupingColumnIndex2 != -1) {	615	if (properties.iGroupingColumnIndex2 != -1) {
616	oTable.fnSetColumnVis(properties.iGroupingColumnIndex2, !properties.bHideGroupingColumn2);	616	oTable.fnSetColumnVis(properties.iGroupingColumnIndex2, !properties.bHideGroupingColumn2, false);
617	}	617	}
618	if (properties.bCustomColumnOrdering2) {	618	if (properties.bCustomColumnOrdering2) {
619	oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex2, !properties.bHideGroupingOrderByColumn2);	619	oTable.fnSetColumnVis(properties.iGroupingOrderByColumnIndex2, !properties.bHideGroupingOrderByColumn2, false);
620	}	620	}
621	oTable.fnSettings().aoDrawCallback.push({	621	oTable.fnSettings().aoDrawCallback.push({
622	"fn": _fnDrawCallBackWithGrouping,	622	"fn": _fnDrawCallBackWithGrouping,
Lines 687-690 Link Here
687		687
688	});	688	});
689	};	689	};
690	})(jQuery);	690	})(jQuery);

Lines 847-853 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-12 / +1 lines)
847	<table id="relatives-issues-table">	847	<table id="relatives-issues-table">
848	<thead>	848	<thead>
849	<tr>	849	<tr>
850	<th scope="col">Due date (unformatted, hidden)</th>
851	<th scope="col">Due date</th>	850	<th scope="col">Due date</th>
852	<th scope="col">Title</th>	851	<th scope="col">Title</th>
853	<th scope="col">Item type</th>	852	<th scope="col">Item type</th>
Lines 981-1004 No patron matched <span class="ex">[% message \| html %]</span> Link Here
981	[% INCLUDE 'timepicker.inc' %]	980	[% INCLUDE 'timepicker.inc' %]
982	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>	981	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>
983	<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>	982	<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>
984	<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script>	983	[% INCLUDE 'checkouts.js.inc' %]
985	<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>	984	<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>
986	<script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script>	985	<script type="text/javascript" src="[% interface %]/[% theme %]/js/circ-patron-search-results_[% KOHA_VERSION %].js"></script>
987	<script type="text/javascript">	986	<script type="text/javascript">
988	/* Set some variable needed in circulation.js */	987	/* Set some variable needed in circulation.js */
989	var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
990	var interface = "[% interface %]";	988	var interface = "[% interface %]";
991	var theme = "[% theme %]";	989	var theme = "[% theme %]";
992	var borrowernumber = "[% patron.borrowernumber %]";
993	var branchcode = "[% branch %]";	990	var branchcode = "[% branch %]";
994	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";	991	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
995	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
996	var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
997	var script = "circulation";	992	var script = "circulation";
998	var relatives_borrowernumbers = new Array();
999	[% FOREACH b IN relatives_borrowernumbers %]
1000	relatives_borrowernumbers.push("[% b %]");
1001	[% END %]
1002		993
1003	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	994	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1004	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	995	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
Lines 1012-1019 No patron matched <span class="ex">[% message \| html %]</span> Link Here
1012	var destination = "[% destination %]";	1003	var destination = "[% destination %]";
1013	var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]";	1004	var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers %]";
1014		1005
1015	columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %]
1016
1017	[% IF borrowernumber and patron %]	1006	[% IF borrowernumber and patron %]
1018	if($.cookie("holdfor") != [% patron.borrowernumber %]){	1007	if($.cookie("holdfor") != [% patron.borrowernumber %]){
1019	$.removeCookie("holdfor", { path: '/' });	1008	$.removeCookie("holdfor", { path: '/' });

Lines 440-446 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-11 / +1 lines)
440	<table id="relatives-issues-table" style="width: 100% !Important;">	440	<table id="relatives-issues-table" style="width: 100% !Important;">
441	<thead>	441	<thead>
442	<tr>	442	<tr>
443	<th scope="col">Due date hidden not formatted</th>
444	<th scope="col">Due date</th>	443	<th scope="col">Due date</th>
445	<th scope="col">Title</th>	444	<th scope="col">Title</th>
446	<th scope="col">Item type</th>	445	<th scope="col">Item type</th>
Lines 551-557 Link Here
551	[% INCLUDE 'timepicker.inc' %]	550	[% INCLUDE 'timepicker.inc' %]
552	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>	551	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.rowGrouping_[% KOHA_VERSION %].js"></script>
553	<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>	552	<script type="text/javascript" src="[% interface %]/[% theme %]/js/pages/circulation_[% KOHA_VERSION %].js"></script>
554	<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script>	553	[% INCLUDE 'checkouts.js.inc' %]
555	<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>	554	<script type="text/javascript" src="[% interface %]/[% theme %]/js/holds_[% KOHA_VERSION %].js"></script>
556	<script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script>	555	<script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script>
557	<script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script>	556	<script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script>
Lines 559-580 Link Here
559	/* Set some variable needed in circulation.js */	558	/* Set some variable needed in circulation.js */
560	var interface = "[% interface %]";	559	var interface = "[% interface %]";
561	var theme = "[% theme %]";	560	var theme = "[% theme %]";
562	var borrowernumber = "[% patron.borrowernumber %]";
563	var branchcode = "[% Branches.GetLoggedInBranchcode() %]";	561	var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
564	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";	562	var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
565	var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
566	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 %];
567	var script = "moremember";	563	var script = "moremember";
568	var relatives_borrowernumbers = new Array();
569	[% FOREACH b IN relatives_borrowernumbers %]
570	relatives_borrowernumbers.push("[% b %]");
571	[% END %]
572		564
573	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	565	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
574	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	566	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
575		567
576	columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
577
578	$(document).ready(function() {	568	$(document).ready(function() {
579	if ( $('#clubs-tab').length ) {	569	if ( $('#clubs-tab').length ) {
580	$('#clubs-tab-link').on('click', function() {	570	$('#clubs-tab-link').on('click', function() {

Lines 27-32 use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue ); Link Here

(-)a/svc/checkouts (-52 / +54 lines)
27	use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);	27	use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
28	use C4::Overdues qw(GetFine);	28	use C4::Overdues qw(GetFine);
29	use C4::Context;	29	use C4::Context;
		30	use C4::Utils::DataTables;
30		31
31	use Koha::AuthorisedValues;	32	use Koha::AuthorisedValues;
32	use Koha::DateUtils;	33	use Koha::DateUtils;
Lines 45-70 unless (haspermission($userid, { circulate => 'circulate_remaining_permissions' Link Here
45	exit 0;	46	exit 0;
46	}	47	}
47		48
48	my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;
49
50	my @borrowernumber = $input->multi_param('borrowernumber');	49	my @borrowernumber = $input->multi_param('borrowernumber');
51	my $offset = $input->param('iDisplayStart');	50	my $offset = $input->param('iDisplayStart');
52	my $results_per_page = $input->param('iDisplayLength') \|\| -1;	51	my $count = $input->param('iDisplayLength');
53		52
54	my $sorting_column = $input->param('iSortCol_0') \|\| q{};	53	my %params = dt_get_params($input);
55	$sorting_column = ( $sorting_column && $sort_columns[$sorting_column] ) ? $sort_columns[$sorting_column] : 'issuedate';	54	my $orderby = dt_build_orderby(\%params);
56		55
57	my $sorting_direction = $input->param('sSortDir_0') \|\| q{};	56	my $todaysIssuesDefaultSortOrder =
58	$sorting_direction = $sorting_direction eq 'asc' ? 'asc' : 'desc';	57	C4::Context->preference('todaysIssuesDefaultSortOrder');
59		58	my $previousIssuesDefaultSortOrder =
60	$results_per_page = undef if ( $results_per_page == -1 );	59	C4::Context->preference('previousIssuesDefaultSortOrder');
61		60
62	binmode STDOUT, ":encoding(UTF-8)";	61	# Default sort when user hasn't clicked on a column header yet.
63	print $input->header( -type => 'text/plain', -charset => 'UTF-8' );	62	# When row grouping is enabled, DataTables ask to sort on issued_today column,
		63	# so we need to treat this case the same as the "no sorting" case
		64	if (!$orderby \|\| $orderby =~ m/ORDER BY issued_today desc\s*$/) {
		65	$orderby = qq{
		66	ORDER BY
		67	issued_today DESC,
		68	CASE WHEN issued_today = 0 THEN date_due END $previousIssuesDefaultSortOrder,
		69	CASE WHEN issued_today != 0 THEN date_due END $todaysIssuesDefaultSortOrder
		70	};
		71	}
64		72
65	my @parameters;	73	my @parameters;
66	my $sql = '	74	my $sql = '
67	SELECT	75	SELECT SQL_CALC_FOUND_ROWS
68	issuedate,	76	issuedate,
69	date_due,	77	date_due,
70	date_due < now() as date_due_overdue,	78	date_due < now() as date_due_overdue,
Lines 100-106 my $sql = ' Link Here
100	location,	108	location,
101	items.enumchron,	109	items.enumchron,
102		110
103	DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today	111	DATEDIFF( issuedate, CURRENT_DATE() ) = 0 AS issued_today
104	FROM issues	112	FROM issues
105	LEFT JOIN items USING ( itemnumber )	113	LEFT JOIN items USING ( itemnumber )
106	LEFT JOIN biblio USING ( biblionumber )	114	LEFT JOIN biblio USING ( biblionumber )
Lines 108-134 my $sql = ' Link Here
108	LEFT JOIN borrowers USING ( borrowernumber )	116	LEFT JOIN borrowers USING ( borrowernumber )
109	LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )	117	LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
110	LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )	118	LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
111	WHERE borrowernumber	119	WHERE
112	';	120	';
113		121
		122	my $borrowernumber_sql = 'borrowernumber';
114	if ( @borrowernumber == 1 ) {	123	if ( @borrowernumber == 1 ) {
115	$sql .= '= ?';	124	$borrowernumber_sql .= ' = ?';
116	}	125	} else {
117	else {	126	$borrowernumber_sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
118	$sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
119	}	127	}
		128	$sql .= $borrowernumber_sql;
120	push( @parameters, @borrowernumber );	129	push( @parameters, @borrowernumber );
121		130
122	$sql .= " ORDER BY $sorting_column $sorting_direction ";	131	$sql .= " $orderby";
		132
		133	if ($count && $count > 0) {
		134	$sql .= " LIMIT ?,?";
		135	push @parameters, $offset, $count;
		136	}
123		137
124	my $dbh = C4::Context->dbh();	138	my $dbh = C4::Context->dbh();
125	my $sth = $dbh->prepare($sql);	139	my $sth = $dbh->prepare($sql);
126	$sth->execute(@parameters);	140	$sth->execute(@parameters);
		141	my ($iTotalDisplayRecords) = $dbh->selectrow_array('SELECT FOUND_ROWS()');
127		142
128	my $item_level_itypes = C4::Context->preference('item-level_itypes');	143	my $item_level_itypes = C4::Context->preference('item-level_itypes');
129		144
130	my @checkouts_today;	145	my @checkouts;
131	my @checkouts_previous;
132	while ( my $c = $sth->fetchrow_hashref() ) {	146	while ( my $c = $sth->fetchrow_hashref() ) {
133	my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );	147	my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
134	my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );	148	my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
Lines 219-254 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
219	firstname => $c->{firstname},	233	firstname => $c->{firstname},
220	cardnumber => $c->{cardnumber},	234	cardnumber => $c->{cardnumber},
221	},	235	},
222	issued_today => !$c->{not_issued_today},	236	issued_today => $c->{issued_today} ? JSON::true : JSON::false,
223	};	237	};
224		238
225	if ( $c->{not_issued_today} ) {	239	push @checkouts, $checkout;
226	push( @checkouts_previous, $checkout );
227	}
228	else {
229	push( @checkouts_today, $checkout );
230	}
231	}	240	}
232		241
		242	binmode STDOUT, ":encoding(UTF-8)";
		243	print $input->header( -type => 'application/json', -charset => 'UTF-8' );
233		244
234	@checkouts_today = sort { $a->{timestamp} cmp $b->{timestamp} } @checkouts_today;	245	my $sEcho = $input->param('sEcho');
235	@checkouts_today = reverse(@checkouts_today)	246	my ($iTotalRecords) = $dbh->selectrow_array(
236	unless ( C4::Context->preference('todaysIssuesDefaultSortOrder') eq 'desc' );	247	"SELECT COUNT(*) FROM issues WHERE $borrowernumber_sql", undef,
237		248	@borrowernumber);
238	@checkouts_previous = sort { $a->{date_due} cmp $b->{date_due} } @checkouts_previous;
239	@checkouts_previous = reverse(@checkouts_previous)
240	if ( C4::Context->preference('previousIssuesDefaultSortOrder') eq 'desc' );
241
242	my @checkouts = ( @checkouts_today, @checkouts_previous );
243
244	my $i = 1;
245	map { $_->{sort_order} = $i++ } @checkouts;
246
247		249
248	my $data;	250	my $response = {
249	$data->{'iTotalRecords'} = scalar @checkouts;	251	iTotalRecords => $iTotalRecords,
250	$data->{'iTotalDisplayRecords'} = scalar @checkouts;	252	iTotalDisplayRecords => $iTotalDisplayRecords,
251	$data->{'sEcho'} = $input->param('sEcho') \|\| undef;	253	sEcho => $sEcho,
252	$data->{'aaData'} = \@checkouts;	254	aaData => \@checkouts,
		255	};
253		256
254	print to_json($data);	257	print to_json($response);
255	-

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts.js.inc (+24 lines)
	1	[% USE Koha %]
	2
	3	<script>
	4	[% IF Koha.Preference('ServerSideCheckoutsTables') %]
	5	var ServerSideCheckoutsTables = true;
	6	[% ELSE %]
	7	var ServerSideCheckoutsTables = false;
	8	[% END %]
	9	var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %];
	10	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride'))? 1 : 0 %];
	11
	12	var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
	13
	14	var borrowernumber = "[% borrowernumber %]";
	15	var relatives_borrowernumbers = new Array();
	16	[% FOREACH b IN relatives_borrowernumbers %]
	17	relatives_borrowernumbers.push("[% b %]");
	18	[% END %]
	19
	20	var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) %];
	21	var relatives_columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'relatives-issues-table', 'json' ) %];
	22	</script>
	23
	24	<script type="text/javascript" src="[% interface %]/[% theme %]/js/checkouts_[% KOHA_VERSION %].js"></script>