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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-3 / +20 lines)
Lines 335-340 Link Here
335
        <div id="acquisition_details">
335
        <div id="acquisition_details">
336
            <h2>Acquisition details</h2>
336
            <h2>Acquisition details</h2>
337
            <table id="orders">
337
            <table id="orders">
338
                <caption>
339
                  <span class="actions">
340
                  <a href="#" id="hide_received_orders">Hide already received orders</a>
341
                  | <a href="#" id="show_all_orders">Show all orders</a></span>
342
                </caption>
343
338
                <thead>
344
                <thead>
339
                    <tr>
345
                    <tr>
340
                        <th>Invoice</th>
346
                        <th>Invoice</th>
Lines 367-374 Link Here
367
                            [% order.basket.basketname | html %] ([% order.basketno | html %])
373
                            [% order.basket.basketname | html %] ([% order.basketno | html %])
368
                        [% END %]</td>
374
                        [% END %]</td>
369
                        <td>[% order.ordernumber | html %]</td>
375
                        <td>[% order.ordernumber | html %]</td>
370
                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates %]</span></td>
376
                        <td><span title="[% order.basket.creationdate | uri %]">[% order.basket.creationdate | $KohaDates%]</span></td>
371
                        <td><span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span></td>
377
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
372
                        <td>
378
                        <td>
373
                          [% SWITCH order.orderstatus %]
379
                          [% SWITCH order.orderstatus %]
374
                            [% CASE 'new' %]New
380
                            [% CASE 'new' %]New
Lines 425-431 Link Here
425
                return false;
431
                return false;
426
            })
432
            })
427
433
428
            $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
434
            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
429
                'bPaginate': false,
435
                'bPaginate': false,
430
                'bAutoWidth': false,
436
                'bAutoWidth': false,
431
                "aaSorting": [[ 4, "desc" ]],
437
                "aaSorting": [[ 4, "desc" ]],
Lines 434-439 Link Here
434
                ]
440
                ]
435
            }));
441
            }));
436
442
443
            $("#hide_received_orders").click(function(e){
444
                e.preventDefault();
445
                table.fnFilter( '.', 4, true ); // Not empty "Receive date" columns
446
            });
447
            $("#show_all_orders").click(function(e){
448
                e.preventDefault();
449
                table.fnFilter( '', 4 ); // Not filter, display all columns
450
            });
451
            $("#show_all_orders").click();
452
453
437
        });
454
        });
438
    </script>
455
    </script>
439
[% END %]
456
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/datatables.js (-2 / +5 lines)
Lines 371-377 jQuery.extend( jQuery.fn.dataTableExt.oSort, { Link Here
371
 */
371
 */
372
jQuery.extend( jQuery.fn.dataTableExt.oSort, {
372
jQuery.extend( jQuery.fn.dataTableExt.oSort, {
373
    "title-string-pre": function ( a ) {
373
    "title-string-pre": function ( a ) {
374
        return a.match(/title="(.*?)"/)[1].toLowerCase();
374
        var m = a.match(/title="(.*?)"/);
375
        if ( null !== m && m.length ) {
376
            return m[1].toLowerCase();
377
        }
378
        return "";
375
    },
379
    },
376
380
377
    "title-string-asc": function ( a, b ) {
381
    "title-string-asc": function ( a, b ) {
378
- 

Return to bug 20726