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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +2 lines)
Lines 10-15 Link Here
10
[% USE AuthorisedValues %]
10
[% USE AuthorisedValues %]
11
[% SET footerjs = 1 %]
11
[% SET footerjs = 1 %]
12
[% INCLUDE 'doc-head-open.inc' %]
12
[% INCLUDE 'doc-head-open.inc' %]
13
<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/rowgroup/1.1.0/css/rowGroup.dataTables.min.css">
13
[% SET destination = "circ" %]
14
[% SET destination = "circ" %]
14
<title>
15
<title>
15
    Koha &rsaquo; Circulation
16
    Koha &rsaquo; Circulation
Lines 984-990 Link Here
984
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
985
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
985
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
986
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
986
    [% INCLUDE 'timepicker.inc' %]
987
    [% INCLUDE 'timepicker.inc' %]
987
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
988
    <script src="https://cdn.datatables.net/rowgroup/1.1.0/js/dataTables.rowGroup.min.js"></script>
988
    [% Asset.js("js/pages/circulation.js") | $raw %]
989
    [% Asset.js("js/pages/circulation.js") | $raw %]
989
    [% Asset.js("js/checkouts.js") | $raw %]
990
    [% Asset.js("js/checkouts.js") | $raw %]
990
    [% Asset.js("js/holds.js") | $raw %]
991
    [% Asset.js("js/holds.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +2 lines)
Lines 8-13 Link Here
8
[% USE Price %]
8
[% USE Price %]
9
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/rowgroup/1.1.0/css/rowGroup.dataTables.min.css">
11
<title>Koha &rsaquo; Patrons &rsaquo;
12
<title>Koha &rsaquo; Patrons &rsaquo;
12
    [% UNLESS blocking_error %]
13
    [% UNLESS blocking_error %]
13
        Patron details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
14
        Patron details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
Lines 823-835 Link Here
823
824
824
[% MACRO jsinclude BLOCK %]
825
[% MACRO jsinclude BLOCK %]
825
    [% INCLUDE 'datatables.inc' %]
826
    [% INCLUDE 'datatables.inc' %]
827
    <script src="https://cdn.datatables.net/rowgroup/1.1.0/js/dataTables.rowGroup.min.js"></script>
826
    [% INCLUDE 'columns_settings.inc' %]
828
    [% INCLUDE 'columns_settings.inc' %]
827
    [% INCLUDE 'strings.inc' %]
829
    [% INCLUDE 'strings.inc' %]
828
    [% INCLUDE 'calendar.inc' %]
830
    [% INCLUDE 'calendar.inc' %]
829
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
831
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
830
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
832
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
831
    [% INCLUDE 'timepicker.inc' %]
833
    [% INCLUDE 'timepicker.inc' %]
832
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
833
    [% Asset.js("js/pages/circulation.js") | $raw %]
834
    [% Asset.js("js/pages/circulation.js") | $raw %]
834
    [% Asset.js("js/checkouts.js") | $raw %]
835
    [% Asset.js("js/checkouts.js") | $raw %]
835
    [% Asset.js("js/holds.js") | $raw %]
836
    [% Asset.js("js/holds.js") | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-18 / +12 lines)
Lines 573-591 $(document).ready(function() { Link Here
573
                    fnCallback(json)
573
                    fnCallback(json)
574
                } );
574
                } );
575
            },
575
            },
576
            "rowGroup":{
577
                "dataSrc": "issued_today",
578
                "startRender": function ( rows, group ) {
579
                    if ( group ) {
580
                        return $('<tr/>').append("<td colspan='100%'><strong>" + TODAYS_CHECKOUTS + "</strong></td>");
581
                    } else {
582
                        return $('<tr/>').append("<td colspan='100%'><strong>" + PREVIOUS_CHECKOUTS + "</strong></td>");
583
                    }
584
                }
585
            },
576
            "fnInitComplete": function(oSettings, json) {
586
            "fnInitComplete": function(oSettings, json) {
577
                // Disable rowGrouping plugin after first use
587
                // Disable rowGrouping plugin after first use
578
                // so any sorting on the table doesn't use it
588
                // so any sorting on the table doesn't use it
579
                var oSettings = issuesTable.fnSettings();
589
                //var oSettings = issuesTable.fnSettings();
580
581
                for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
582
                    if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
583
                        oSettings.aoDrawCallback.splice(f, 1);
584
                        break;
585
                    }
586
                }
587
588
                oSettings.aaSortingFixed = null;
589
590
590
                // Build a summary of checkouts grouped by itemtype
591
                // Build a summary of checkouts grouped by itemtype
591
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
592
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
Lines 605-617 $(document).ready(function() { Link Here
605
                    .append(ul)
606
                    .append(ul)
606
                    .insertBefore(oSettings.nTableWrapper)
607
                    .insertBefore(oSettings.nTableWrapper)
607
            },
608
            },
608
        }, columns_settings_issues_table).rowGrouping(
609
        }, columns_settings_issues_table);
609
            {
610
                iGroupingColumnIndex: 1,
611
                iGroupingOrderByColumnIndex: 0,
612
                sGroupingColumnSortDirection: "asc"
613
            }
614
        );
615
610
616
        if ( $("#issues-table").length ) {
611
        if ( $("#issues-table").length ) {
617
            $("#issues-table_processing").position({
612
            $("#issues-table_processing").position({
618
- 

Return to bug 23493