Attachment #78555 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 497-502 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
497	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),	497	('SelfCheckTimeout','120','','Define the number of seconds before the Web-based Self Checkout times out a patron','Integer'),
498	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),	498	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
499	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),	499	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),
		500	('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'),
500	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),	501	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),
501	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),	502	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),
502	('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),	503	('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 \| html %]</td>	4	<td id="totaldue" style="text-align: right;">[% totaldue \| html %]</td>
5	<td id="totalfine" style="text-align: right;">[% finetotal \| html %]</td>	5	<td id="totalfine" style="text-align: right;">[% finetotal \| html %]</td>
6	<td id="totalprice" style="text-align: right;">[% totalprice \| html %]</td>	6	<td id="totalprice" style="text-align: right;">[% totalprice \| html %]</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">Collection</th>	18	<th scope="col">Collection</th>




[% USE Asset %]
[% USE Koha %]
[% USE raw %]

<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 | $raw %]";
  var relatives_borrowernumbers = new Array();
  [% FOREACH b IN relatives_borrowernumbers %]
    relatives_borrowernumbers.push("[% b | $raw %]");
  [% END %]

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

[% Asset.js('js/checkouts.js') | $raw %]

Lines 71-77 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)
71	table.dataTable($.extend(true, {}, dataTablesDefaults, dt_parameters));	71	table.dataTable($.extend(true, {}, dataTablesDefaults, dt_parameters));
72		72
73	$(hidden_ids).each(function(index, value) {	73	$(hidden_ids).each(function(index, value) {
74	table.fnSetColumnVis( value, false );	74	table.fnSetColumnVis( value, false, false );
75	});	75	});
76		76
77	if ( add_filters ) {	77	if ( add_filters ) {

Lines 46-50 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
46	var CURRENT = _(" (current) ");	46	var CURRENT = _(" (current) ");
47	var MSG_NO_ITEMTYPE = _("No itemtype");	47	var MSG_NO_ITEMTYPE = _("No itemtype");
48	var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");	48	var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
		49	var GROUP_TODAYS_CHECKOUTS = _("Group today's checkouts");
49	//]]>	50	//]]>
50	</script>	51	</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' %]
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% INCLUDE 'checkouts.js.inc' %]
    [% Asset.js("js/holds.js") | $raw %]
    [% Asset.js("js/circ-patron-search-results.js") | $raw %]
    <script type="text/javascript">
        /* Set some variable needed in circulation.js */
        var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
        var interface = "[% interface | html %]";
        var theme = "[% theme | html %]";
        var borrowernumber = "[% patron.borrowernumber | html %]";
        var branchcode = "[% branch | html %]";
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') | html %]";
        var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 | html %];
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 | html %];
        var script = "circulation";
        var relatives_borrowernumbers = new Array();
        [% FOREACH b IN relatives_borrowernumbers %]
            relatives_borrowernumbers.push("[% b | html %]");
        [% 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( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]

        [% IF borrowernumber and patron %]
            if($.cookie("holdfor") != [% patron.borrowernumber | html %]){
                $.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' %]
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
    [% Asset.js("js/pages/circulation.js") | $raw %]
    [% INCLUDE 'checkouts.js.inc' %]
    [% Asset.js("js/holds.js") | $raw %]
    [% INCLUDE 'str/members-menu.inc' %]
    [% Asset.js("js/members-menu.js") | $raw %]

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

        $(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.escapeHtml() + "</span>";
        }

        if ( oObj.damaged ) {
            due += "<span class='dmg'>" + oObj.damaged.escapeHtml() + "</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.escapeHtml();

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

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

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

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

        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.escapeHtml() + "</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.escapeHtml() + "</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.escapeHtml()
              + "</a>"
              + onsite_checkout

        return title;
    },
    itemtype: function (oData, sType, oObj) {
        return oObj.itemtype_description.escapeHtml();
    },
    collection: function (oData, sType, oObj) {
        return oObj.collection.escapeHtml();
    },
    location: function (oData, sType, oObj) {
        return oObj.location.escapeHtml();
    },
    homebranch: function (oData, sType, oObj) {
        return oObj.homebranch.escapeHtml();
    },
    issuedate: function (oData, sType, oObj) {
        return oObj.issuedate_formatted;
    },
    branch: function (oData, sType, oObj) {
        return oObj.branchname.escapeHtml();
    },
    itemcallnumber: function (oData, sType, oObj) {
        return oObj.itemcallnumber.escapeHtml();
    },
    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.escapeHtml()
             + " "
             + oObj.borrower.surname.escapeHtml()
             + " (" + oObj.borrower.cardnumber.escapeHtml() + ")</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 });
            },
            "fnInitComplete": function(oSettings, json) {
                // Build a summary of checkouts grouped by itemtype
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
                    obj[row.itemtype_description] = (obj[row.itemtype_description] || 0) + 1;
                    return obj;
                }, {});
                var ul = $('<ul>');
                Object.keys(checkoutsByItype).sort().forEach(function (itype) {
                    var li = $('<li>')
                        .append($('<strong>').html(itype || MSG_NO_ITEMTYPE))
                        .append(': ' + checkoutsByItype[itype]);
                    ul.append(li);
                })
                $('<details>')
                    .addClass('checkouts-by-itemtype')
                    .append($('<summary>').html(MSG_CHECKOUTS_BY_ITEMTYPE))
                    .append(ul)
                    .insertBefore(oSettings.nTableWrapper)
            },
            "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.escapeHtml() + "</span>";
                        }

                        if ( oObj.damaged ) {
                            due += "<span class='dmg'>" + oObj.damaged.escapeHtml() + "</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.escapeHtml();

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

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

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

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

                        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.escapeHtml() + "</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.escapeHtml() + "</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.escapeHtml()
                              + "</a>"
                              + onsite_checkout

                        return title;
                    },
                    "sType": "anti-the"
                },
                {
                    "mData": "ccode",
                    "mRender": mRenders.collection
                    }
                },
                {
                    "mData": "location",
                    "mRender": mRenders.location
                    }
                },
                {
                    "mData": "homebranch",
                    "mRender": mRenders.homebranch
                    }
                },
                {
                    "mData": "issuedate",
                    "mRender": mRenders.issuedate
                    }
                },
                { "mDataProp": "issuedate_formatted" },
                {
                    "mData": "branchcode",
                    "mRender": mRenders.branch
                    }
                },
                {
                    "mData": "itemcallnumber",
                    "mRender": mRender.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, json) {
                // 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;

                // Build a summary of checkouts grouped by itemtype
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
                    obj[row.itemtype_description] = (obj[row.itemtype_description] || 0) + 1;
                    return obj;
                }, {});
                var ul = $('<ul>');
                Object.keys(checkoutsByItype).sort().forEach(function (itype) {
                    var li = $('<li>')
                        .append($('<strong>').html(itype || MSG_NO_ITEMTYPE))
                        .append(': ' + checkoutsByItype[itype]);
                    ul.append(li);
                })
                $('<details>')
                    .addClass('checkouts-by-itemtype')
                    .append($('<summary>').html(MSG_CHECKOUTS_BY_ITEMTYPE))
                    .append(ul)
                    .insertBefore(oSettings.nTableWrapper)
            },
        }, 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",
                        "mRender": mRenders.itemtype
                                  + oObj.biblionumber
                                  + "'>"
                                  + oObj.title.escapeHtml();

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

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

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

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

                            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.escapeHtml() + "</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.escapeHtml() + "</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.escapeHtml()
                                  + "</a>"
                                  + onsite_checkout;

                            return title;
                        },
                        "sType": "anti-the"
                    },
                    {
                        "mData": "ccode",
                        "mRender": mRenders.collection
                        }
                    },
                    {
                        "mData": "location",
                        "mRender": mRenders.location
                        }
                    },
                    {
                        "mData": "issuedate",
                        "mRender": mRenders.issuedate
                        }
                    },
                    { "mDataProp": "issuedate_formatted" },
                    {
                        "mData": "branchcode",
                        "mRender": mRenders.branch
                        }
                    },
                    {
                        "mData": "itemcallnumber",
                        "mRender": mRenders.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 231-237 modules: Link Here

(-)a/admin/columns_settings.yml (-12 / +48 lines)
231	moremember:	231	moremember:
232	issues-table:	232	issues-table:
233	-	233	-
234	columnname: sort_order	234	columnname: group_order
235	cannot_be_toggled: 1	235	cannot_be_toggled: 1
236	cannot_be_modified: 1	236	cannot_be_modified: 1
237	is_hidden: 1	237	is_hidden: 1
Lines 240-250 modules: Link Here
240	cannot_be_toggled: 1	240	cannot_be_toggled: 1
241	cannot_be_modified: 1	241	cannot_be_modified: 1
242	is_hidden: 1	242	is_hidden: 1
243	-
244	columnname: due_date_unformatted
245	cannot_be_toggled: 1
246	cannot_be_modified: 1
247	is_hidden: 1
248	-	243	-
249	columnname: due_date	244	columnname: due_date
250	-	245	-
Lines 279-284 modules: Link Here
279	columnname: export	274	columnname: export
280	cannot_be_toggled: 1	275	cannot_be_toggled: 1
281	cannot_be_modified: 1	276	cannot_be_modified: 1
		277	relatives-issues-table:
		278	-
		279	columnname: due_date
		280	-
		281	columnname: title
		282	-
		283	columnname: item_type
		284	-
		285	columnname: location
		286	-
		287	columnname: checkout_on
		288	-
		289	columnname: checkout_from
		290	-
		291	columnname: callno
		292	-
		293	columnname: charge
		294	-
		295	columnname: fine
		296	-
		297	columnname: price
		298	-
		299	columnname: patron
282		300
283	holdshistory:	301	holdshistory:
284	holdshistory-table:	302	holdshistory-table:
Lines 388-394 modules: Link Here
388	circulation:	406	circulation:
389	issues-table:	407	issues-table:
390	-	408	-
391	columnname: sort_order	409	columnname: group_order
392	cannot_be_toggled: 1	410	cannot_be_toggled: 1
393	cannot_be_modified: 1	411	cannot_be_modified: 1
394	is_hidden: 1	412	is_hidden: 1
Lines 397-407 modules: Link Here
397	cannot_be_toggled: 1	415	cannot_be_toggled: 1
398	cannot_be_modified: 1	416	cannot_be_modified: 1
399	is_hidden: 1	417	is_hidden: 1
400	-
401	columnname: due_date_unformatted
402	cannot_be_toggled: 1
403	cannot_be_modified: 1
404	is_hidden: 1
405	-	418	-
406	columnname: due_date	419	columnname: due_date
407	-	420	-
Lines 436-441 modules: Link Here
436	columnname: export	449	columnname: export
437	cannot_be_toggled: 1	450	cannot_be_toggled: 1
438	cannot_be_modified: 1	451	cannot_be_modified: 1
		452	relatives-issues-table:
		453	-
		454	columnname: due_date
		455	-
		456	columnname: title
		457	-
		458	columnname: item_type
		459	-
		460	columnname: location
		461	-
		462	columnname: checkout_on
		463	-
		464	columnname: checkout_from
		465	-
		466	columnname: callno
		467	-
		468	columnname: charge
		469	-
		470	columnname: fine
		471	-
		472	columnname: price
		473	-
		474	columnname: patron
439		475
440	returns:	476	returns:
441	checkedintable:	477	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 848-854 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)
848	<table id="relatives-issues-table">	848	<table id="relatives-issues-table">
849	<thead>	849	<thead>
850	<tr>	850	<tr>
851	<th scope="col">Due date (unformatted, hidden)</th>
852	<th scope="col">Due date</th>	851	<th scope="col">Due date</th>
853	<th scope="col">Title</th>	852	<th scope="col">Title</th>
854	<th scope="col">Item type</th>	853	<th scope="col">Item type</th>
Lines 983-1012 No patron matched <span class="ex">[% message \| html %]</span> Link Here
983	[% INCLUDE 'timepicker.inc' %]	982	[% INCLUDE 'timepicker.inc' %]
984	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]	983	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]
985	[% Asset.js("js/pages/circulation.js") \| $raw %]	984	[% Asset.js("js/pages/circulation.js") \| $raw %]
986	[% Asset.js("js/checkouts.js") \| $raw %]	985	[% INCLUDE 'checkouts.js.inc' %]
987	[% Asset.js("js/holds.js") \| $raw %]	986	[% Asset.js("js/holds.js") \| $raw %]
988	[% Asset.js("js/circ-patron-search-results.js") \| $raw %]	987	[% Asset.js("js/circ-patron-search-results.js") \| $raw %]
989	<script type="text/javascript">	988	<script type="text/javascript">
990	/* Set some variable needed in circulation.js */	989	/* Set some variable needed in circulation.js */
991	var MSG_DT_LOADING_RECORDS = _("Loading... you may continue scanning.");
992	var interface = "[% interface \| html %]";	990	var interface = "[% interface \| html %]";
993	var theme = "[% theme \| html %]";	991	var theme = "[% theme \| html %]";
994	var borrowernumber = "[% patron.borrowernumber \| html %]";
995	var branchcode = "[% branch \| html %]";	992	var branchcode = "[% branch \| html %]";
996	var exports_enabled = "[% Koha.Preference('ExportCircHistory') \| html %]";	993	var exports_enabled = "[% Koha.Preference('ExportCircHistory') \| html %]";
997	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 \| html %];
998	var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 \| html %];
999	var script = "circulation";	994	var script = "circulation";
1000	var relatives_borrowernumbers = new Array();
1001	[% FOREACH b IN relatives_borrowernumbers %]
1002	relatives_borrowernumbers.push("[% b \| html %]");
1003	[% END %]
1004		995
1005	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	996	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1006	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	997	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
1007		998
1008	columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) \| $raw %]
1009
1010	[% IF borrowernumber and patron %]	999	[% IF borrowernumber and patron %]
1011	if($.cookie("holdfor") != [% patron.borrowernumber \| html %]){	1000	if($.cookie("holdfor") != [% patron.borrowernumber \| html %]){
1012	$.removeCookie("holdfor", { path: '/' });	1001	$.removeCookie("holdfor", { path: '/' });

Lines 687-693 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-11 / +1 lines)
687	<table id="relatives-issues-table" style="width: 100% !Important;">	687	<table id="relatives-issues-table" style="width: 100% !Important;">
688	<thead>	688	<thead>
689	<tr>	689	<tr>
690	<th scope="col">Due date hidden not formatted</th>
691	<th scope="col">Due date</th>	690	<th scope="col">Due date</th>
692	<th scope="col">Title</th>	691	<th scope="col">Title</th>
693	<th scope="col">Item type</th>	692	<th scope="col">Item type</th>
Lines 801-807 Link Here
801	[% INCLUDE 'timepicker.inc' %]	800	[% INCLUDE 'timepicker.inc' %]
802	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]	801	[% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") \| $raw %]
803	[% Asset.js("js/pages/circulation.js") \| $raw %]	802	[% Asset.js("js/pages/circulation.js") \| $raw %]
804	[% Asset.js("js/checkouts.js") \| $raw %]	803	[% INCLUDE 'checkouts.js.inc' %]
805	[% Asset.js("js/holds.js") \| $raw %]	804	[% Asset.js("js/holds.js") \| $raw %]
806	[% INCLUDE 'str/members-menu.inc' %]	805	[% INCLUDE 'str/members-menu.inc' %]
807	[% Asset.js("js/members-menu.js") \| $raw %]	806	[% Asset.js("js/members-menu.js") \| $raw %]
Lines 810-831 Link Here
810	/* Set some variable needed in circulation.js */	809	/* Set some variable needed in circulation.js */
811	var interface = "[% interface \| html %]";	810	var interface = "[% interface \| html %]";
812	var theme = "[% theme \| html %]";	811	var theme = "[% theme \| html %]";
813	var borrowernumber = "[% patron.borrowernumber \| html %]";
814	var branchcode = "[% Branches.GetLoggedInBranchcode() \| html %]";	812	var branchcode = "[% Branches.GetLoggedInBranchcode() \| html %]";
815	var exports_enabled = "[% Koha.Preference('ExportCircHistory') \| html %]";	813	var exports_enabled = "[% Koha.Preference('ExportCircHistory') \| html %]";
816	var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 \| html %]
817	var AllowRenewalLimitOverride = [% (CAN_user_circulate_override_renewals && Koha.Preference('AllowRenewalLimitOverride') )? 1: 0 \| html %];
818	var script = "moremember";	814	var script = "moremember";
819	var relatives_borrowernumbers = new Array();
820	[% FOREACH b IN relatives_borrowernumbers %]
821	relatives_borrowernumbers.push("[% b \| html %]");
822	[% END %]
823		815
824	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	816	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
825	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");	817	var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
826		818
827	columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) \| $raw %]
828
829	$(document).ready(function() {	819	$(document).ready(function() {
830	if ( $('#clubs-tab').length ) {	820	if ( $('#clubs-tab').length ) {
831	$('#clubs-tab-link').on('click', function() {	821	$('#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 102-108 my $sql = ' Link Here
102	location,	110	location,
103	items.enumchron,	111	items.enumchron,
104		112
105	DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today	113	DATEDIFF( issuedate, CURRENT_DATE() ) = 0 AS issued_today
106	FROM issues	114	FROM issues
107	LEFT JOIN items USING ( itemnumber )	115	LEFT JOIN items USING ( itemnumber )
108	LEFT JOIN biblio USING ( biblionumber )	116	LEFT JOIN biblio USING ( biblionumber )
Lines 110-136 my $sql = ' Link Here
110	LEFT JOIN borrowers USING ( borrowernumber )	118	LEFT JOIN borrowers USING ( borrowernumber )
111	LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )	119	LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
112	LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )	120	LEFT JOIN branches branches2 ON ( items.homebranch = branches2.branchcode )
113	WHERE borrowernumber	121	WHERE
114	';	122	';
115		123
		124	my $borrowernumber_sql = 'borrowernumber';
116	if ( @borrowernumber == 1 ) {	125	if ( @borrowernumber == 1 ) {
117	$sql .= '= ?';	126	$borrowernumber_sql .= ' = ?';
118	}	127	} else {
119	else {	128	$borrowernumber_sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
120	$sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
121	}	129	}
		130	$sql .= $borrowernumber_sql;
122	push( @parameters, @borrowernumber );	131	push( @parameters, @borrowernumber );
123		132
124	$sql .= " ORDER BY $sorting_column $sorting_direction ";	133	$sql .= " $orderby";
		134
		135	if ($count && $count > 0) {
		136	$sql .= " LIMIT ?,?";
		137	push @parameters, $offset, $count;
		138	}
125		139
126	my $dbh = C4::Context->dbh();	140	my $dbh = C4::Context->dbh();
127	my $sth = $dbh->prepare($sql);	141	my $sth = $dbh->prepare($sql);
128	$sth->execute(@parameters);	142	$sth->execute(@parameters);
		143	my ($iTotalDisplayRecords) = $dbh->selectrow_array('SELECT FOUND_ROWS()');
129		144
130	my $item_level_itypes = C4::Context->preference('item-level_itypes');	145	my $item_level_itypes = C4::Context->preference('item-level_itypes');
131		146
132	my @checkouts_today;	147	my @checkouts;
133	my @checkouts_previous;
134	while ( my $c = $sth->fetchrow_hashref() ) {	148	while ( my $c = $sth->fetchrow_hashref() ) {
135	my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );	149	my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
136	my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );	150	my $fine = GetFine( $c->{itemnumber}, $c->{borrowernumber} );
Lines 227-262 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
227	firstname => $c->{firstname},	241	firstname => $c->{firstname},
228	cardnumber => $c->{cardnumber},	242	cardnumber => $c->{cardnumber},
229	},	243	},
230	issued_today => !$c->{not_issued_today},	244	issued_today => $c->{issued_today} ? JSON::true : JSON::false,
231	};	245	};
232		246
233	if ( $c->{not_issued_today} ) {	247	push @checkouts, $checkout;
234	push( @checkouts_previous, $checkout );
235	}
236	else {
237	push( @checkouts_today, $checkout );
238	}
239	}	248	}
240		249
		250	binmode STDOUT, ":encoding(UTF-8)";
		251	print $input->header( -type => 'application/json', -charset => 'UTF-8' );
241		252
242	@checkouts_today = sort { $a->{timestamp} cmp $b->{timestamp} } @checkouts_today;	253	my $sEcho = $input->param('sEcho');
243	@checkouts_today = reverse(@checkouts_today)	254	my ($iTotalRecords) = $dbh->selectrow_array(
244	unless ( C4::Context->preference('todaysIssuesDefaultSortOrder') eq 'desc' );	255	"SELECT COUNT(*) FROM issues WHERE $borrowernumber_sql", undef,
245		256	@borrowernumber);
246	@checkouts_previous = sort { $a->{date_due} cmp $b->{date_due} } @checkouts_previous;
247	@checkouts_previous = reverse(@checkouts_previous)
248	if ( C4::Context->preference('previousIssuesDefaultSortOrder') eq 'desc' );
249
250	my @checkouts = ( @checkouts_today, @checkouts_previous );
251
252	my $i = 1;
253	map { $_->{sort_order} = $i++ } @checkouts;
254
255		257
256	my $data;	258	my $response = {
257	$data->{'iTotalRecords'} = scalar @checkouts;	259	iTotalRecords => $iTotalRecords,
258	$data->{'iTotalDisplayRecords'} = scalar @checkouts;	260	iTotalDisplayRecords => $iTotalDisplayRecords,
259	$data->{'sEcho'} = $input->param('sEcho') \|\| undef;	261	sEcho => $sEcho,
260	$data->{'aaData'} = \@checkouts;	262	aaData => \@checkouts,
		263	};
261		264
262	print to_json($data);	265	print to_json($response);
263	-

Line 0 Link Here

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