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

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-13 / +33 lines)
Lines 354-403 $(document).ready(function() { Link Here
354
354
355
                        return title;
355
                        return title;
356
                    },
356
                    },
357
                    "sType": "anti-the"
357
                    "sType": "anti-the",
358
                    "aDataSort": [1, 3]
358
                },
359
                },
359
                {
360
                {
360
                    "mDataProp": function ( oObj ) {
361
                    "mDataProp": function ( oObj ) {
361
                        return oObj.recordtype_description.escapeHtml();
362
                        return oObj.recordtype_description.escapeHtml();
362
                    }
363
                    },
364
                    "aDataSort": [1, 4]
363
                },
365
                },
364
                {
366
                {
365
                    "mDataProp": function ( oObj ) {
367
                    "mDataProp": function ( oObj ) {
366
                        return oObj.itemtype_description.escapeHtml();
368
                        return oObj.itemtype_description.escapeHtml();
367
                    }
369
                    },
370
                    "aDataSort": [1, 5]
368
                },
371
                },
369
                {
372
                {
370
                    "mDataProp": function ( oObj ) {
373
                    "mDataProp": function ( oObj ) {
371
                        return ( oObj.collection ? oObj.collection.escapeHtml() : '' );
374
                        return ( oObj.collection ? oObj.collection.escapeHtml() : '' );
372
                    }
375
                    },
376
                    "aDataSort": [1,6]
373
                },
377
                },
374
                {
378
                {
375
                    "mDataProp": function ( oObj ) {
379
                    "mDataProp": function ( oObj ) {
376
                        return ( oObj.location ? oObj.location.escapeHtml() : '' );
380
                        return ( oObj.location ? oObj.location.escapeHtml() : '' );
377
                    }
381
                    },
382
                    "aDataSort": [1,7]
378
                },
383
                },
379
                {
384
                {
380
                    "mDataProp": function ( oObj ) {
385
                    "mDataProp": function ( oObj ) {
381
                        return (oObj.homebranch ? oObj.homebranch.escapeHtml() : '' );
386
                        return (oObj.homebranch ? oObj.homebranch.escapeHtml() : '' );
382
                    }
387
                    },
388
                    "aDataSort": [1,8]
383
                },
389
                },
384
                {
390
                {
385
                    "mDataProp": "issuedate",
391
                    "mDataProp": "issuedate",
386
                    "bVisible": false,
392
                    "bVisible": false,
387
                },
393
                },
388
                {
394
                {
389
                    "iDataSort": 10, // Sort on hidden unformatted issuedate column
395
                    "aDataSort": [1,10], // Sort on hidden unformatted issuedate column
390
                    "mDataProp": "issuedate_formatted",
396
                    "mDataProp": "issuedate_formatted",
391
                },
397
                },
392
                {
398
                {
393
                    "mDataProp": function ( oObj ) {
399
                    "mDataProp": function ( oObj ) {
394
                        return (oObj.branchname ? oObj.branchname.escapeHtml() : '' );
400
                        return (oObj.branchname ? oObj.branchname.escapeHtml() : '' );
395
                    }
401
                    },
402
                    "aDataSort": [1,11]
396
                },
403
                },
397
                {
404
                {
398
                    "mDataProp": function ( oObj ) {
405
                    "mDataProp": function ( oObj ) {
399
                        return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
406
                        return ( oObj.itemcallnumber ? oObj.itemcallnumber.escapeHtml() : '' );
400
                    }
407
                    },
408
                    "aDataSort": [1,12]
401
                },
409
                },
402
                {
410
                {
403
                    "mDataProp": function ( oObj ) {
411
                    "mDataProp": function ( oObj ) {
Lines 408-426 $(document).ready(function() { Link Here
408
                    "mDataProp": function ( oObj ) {
416
                    "mDataProp": function ( oObj ) {
409
                        if ( ! oObj.charge ) oObj.charge = 0;
417
                        if ( ! oObj.charge ) oObj.charge = 0;
410
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
418
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
411
                    }
419
                    },
420
                    "aDataSort": [1,13]
412
                },
421
                },
413
                {
422
                {
414
                    "mDataProp": function ( oObj ) {
423
                    "mDataProp": function ( oObj ) {
415
                        if ( ! oObj.fine ) oObj.fine = 0;
424
                        if ( ! oObj.fine ) oObj.fine = 0;
416
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2)  + '<span>';
425
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2)  + '<span>';
417
                    }
426
                    },
427
                    "aDataSort": [1,14]
418
                },
428
                },
419
                {
429
                {
420
                    "mDataProp": function ( oObj ) {
430
                    "mDataProp": function ( oObj ) {
421
                        if ( ! oObj.price ) oObj.price = 0;
431
                        if ( ! oObj.price ) oObj.price = 0;
422
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.price).toFixed(2) + '<span>';
432
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.price).toFixed(2) + '<span>';
423
                    }
433
                    },
434
                    "aDataSort": [1,15]
424
                },
435
                },
425
                {
436
                {
426
                    "bSortable": false,
437
                    "bSortable": false,
Lines 650-655 $(document).ready(function() { Link Here
650
                collision: "none"
661
                collision: "none"
651
            });
662
            });
652
        }
663
        }
664
665
        // Disable rowGroup when sorting on due date
666
        $("#issues-table").on( 'order.dt', function(){
667
            var order = issuesTable.api().order();
668
            if ( order[0][0] === 3 ) {
669
                issuesTable.api().rowGroup().disable();
670
            } else {
671
                issuesTable.api().rowGroup().enable();
672
            }
673
        });
653
    }
674
    }
654
675
655
    // Don't load relatives' issues table unless it is clicked on
676
    // Don't load relatives' issues table unless it is clicked on
656
- 

Return to bug 24533