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
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
13
[% SET destination = "circ" %]
14
[% SET destination = "circ" %]
14
<title>
15
<title>
15
    Koha &rsaquo; Circulation
16
    Koha &rsaquo; Circulation
Lines 1014-1020 Link Here
1014
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
1015
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
1015
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
1016
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
1016
    [% INCLUDE 'timepicker.inc' %]
1017
    [% INCLUDE 'timepicker.inc' %]
1017
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
1018
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
1018
    <script>
1019
    <script>
1019
        /* Set some variable needed in circulation.js */
1020
        /* Set some variable needed in circulation.js */
1020
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
1021
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
(-)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
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
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 845-857 Link Here
845
846
846
[% MACRO jsinclude BLOCK %]
847
[% MACRO jsinclude BLOCK %]
847
    [% INCLUDE 'datatables.inc' %]
848
    [% INCLUDE 'datatables.inc' %]
849
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
848
    [% INCLUDE 'columns_settings.inc' %]
850
    [% INCLUDE 'columns_settings.inc' %]
849
    [% INCLUDE 'strings.inc' %]
851
    [% INCLUDE 'strings.inc' %]
850
    [% INCLUDE 'calendar.inc' %]
852
    [% INCLUDE 'calendar.inc' %]
851
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
853
    [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
852
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
854
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
853
    [% INCLUDE 'timepicker.inc' %]
855
    [% INCLUDE 'timepicker.inc' %]
854
    [% Asset.js("lib/jquery/plugins/jquery.dataTables.rowGrouping.js") | $raw %]
855
    <script>
856
    <script>
856
        /* Set some variable needed in circulation.js */
857
        /* Set some variable needed in circulation.js */
857
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
858
        var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-18 / +12 lines)
Lines 596-614 $(document).ready(function() { Link Here
596
                    fnCallback(json)
596
                    fnCallback(json)
597
                } );
597
                } );
598
            },
598
            },
599
            "rowGroup":{
600
                "dataSrc": "issued_today",
601
                "startRender": function ( rows, group ) {
602
                    if ( group ) {
603
                        return $('<tr/>').append("<td colspan='100%'><strong>" + TODAYS_CHECKOUTS + "</strong></td>");
604
                    } else {
605
                        return $('<tr/>').append("<td colspan='100%'><strong>" + PREVIOUS_CHECKOUTS + "</strong></td>");
606
                    }
607
                }
608
            },
599
            "fnInitComplete": function(oSettings, json) {
609
            "fnInitComplete": function(oSettings, json) {
600
                // Disable rowGrouping plugin after first use
610
                // Disable rowGrouping plugin after first use
601
                // so any sorting on the table doesn't use it
611
                // so any sorting on the table doesn't use it
602
                var oSettings = issuesTable.fnSettings();
612
                //var oSettings = issuesTable.fnSettings();
603
604
                for (f = 0; f < oSettings.aoDrawCallback.length; f++) {
605
                    if (oSettings.aoDrawCallback[f].sName == 'fnRowGrouping') {
606
                        oSettings.aoDrawCallback.splice(f, 1);
607
                        break;
608
                    }
609
                }
610
611
                oSettings.aaSortingFixed = null;
612
613
613
                // Build a summary of checkouts grouped by itemtype
614
                // Build a summary of checkouts grouped by itemtype
614
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
615
                var checkoutsByItype = json.aaData.reduce(function (obj, row) {
Lines 628-640 $(document).ready(function() { Link Here
628
                    .append(ul)
629
                    .append(ul)
629
                    .insertBefore(oSettings.nTableWrapper)
630
                    .insertBefore(oSettings.nTableWrapper)
630
            },
631
            },
631
        }, columns_settings_issues_table).rowGrouping(
632
        }, columns_settings_issues_table);
632
            {
633
                iGroupingColumnIndex: 1,
634
                iGroupingOrderByColumnIndex: 0,
635
                sGroupingColumnSortDirection: "asc"
636
            }
637
        );
638
633
639
        if ( $("#issues-table").length ) {
634
        if ( $("#issues-table").length ) {
640
            $("#issues-table_processing").position({
635
            $("#issues-table_processing").position({
641
- 

Return to bug 23493