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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc (-2 / +3 lines)
Lines 42-50 Link Here
42
         */
42
         */
43
        window.$date = function(value, options) {
43
        window.$date = function(value, options) {
44
            if(!value) return '';
44
            if(!value) return '';
45
            var tz = (options&&options.tz)||def_tz;
45
            let tz = (options&&options.tz)||def_tz;
46
            let no_tz_adjust = (options&&options.no_tz_adjust)||false;
46
            var m = dayjs(value);
47
            var m = dayjs(value);
47
            if ( ! value.match(/^\d{4}-\d{2}-\d{2}$/ ) ) {
48
            if ( !no_tz_adjust && ! value.match(/^\d{4}-\d{2}-\d{2}$/ ) ) {
48
                m = m.tz(tz);
49
                m = m.tz(tz);
49
            }
50
            }
50
51
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 2385-2391 Link Here
2385
                                }
2385
                                }
2386
                            }
2386
                            }
2387
                            nodes += ': ';
2387
                            nodes += ': ';
2388
                            nodes += _("due %s").format($date(row.checkout.due_date)); [%# FIXME Missing due date formatting here, $date do not have as_due_date option %]
2388
                            nodes += _("due %s").format($date(row.checkout.due_date, { as_due_date: true }));
2389
                            nodes += "</span>"
2389
                            nodes += "</span>"
2390
                        } else if ( row.transfer ) {
2390
                        } else if ( row.transfer ) {
2391
                            if ( row.transfer.datesent ) {
2391
                            if ( row.transfer.datesent ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1036-1041 Link Here
1036
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
1036
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
1037
    [% PROCESS 'modal-claims.inc' %]
1037
    [% PROCESS 'modal-claims.inc' %]
1038
    [% PROCESS 'modal-claims-js' %]
1038
    [% PROCESS 'modal-claims-js' %]
1039
    [% INCLUDE 'js-date-format.inc' %]
1039
1040
1040
    <script>
1041
    <script>
1041
        /* Set some variable needed in circulation.js */
1042
        /* Set some variable needed in circulation.js */
(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-8 / +9 lines)
Lines 299-308 $(document).ready(function() { Link Here
299
                {
299
                {
300
                    "iDataSort": 2, // Sort on hidden unformatted date due column
300
                    "iDataSort": 2, // Sort on hidden unformatted date due column
301
                    "mDataProp": function( oObj ) {
301
                    "mDataProp": function( oObj ) {
302
                        var due = oObj.date_due_formatted;
302
                        let date_due_formatted = $datetime(oObj.date_due, { as_due_date: true, no_tz_adjust: true });
303
                        if ( oObj.date_due_overdue ) {
303
                        var due = oObj.date_due_overdue
304
                            due = "<span class='overdue'>" + due + "</span>";
304
                            ? "<span class='overdue'>" + date_due_formatted + "</span>"
305
                        }
305
                            : date_due_formatted;
306
306
307
                        due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";
307
                        due = "<span id='date_due_" + oObj.itemnumber + "' class='date_due'>" + due + "</span>";
308
308
Lines 417-423 $(document).ready(function() { Link Here
417
                },
417
                },
418
                {
418
                {
419
                    "iDataSort": 10, // Sort on hidden unformatted issuedate column
419
                    "iDataSort": 10, // Sort on hidden unformatted issuedate column
420
                    "mDataProp": "issuedate_formatted",
420
                    "mDataProp": "issuedate",
421
                },
421
                },
422
                {
422
                {
423
                    "mDataProp": function ( oObj ) {
423
                    "mDataProp": function ( oObj ) {
Lines 720-729 $(document).ready(function() { Link Here
720
                        "mDataProp": function( oObj ) {
720
                        "mDataProp": function( oObj ) {
721
                            var today = new Date();
721
                            var today = new Date();
722
                            var due = new Date( oObj.date_due );
722
                            var due = new Date( oObj.date_due );
723
                            let date_due_formatted = $datetime(oObj.date_due, { as_due_date: true, no_tz_adjust: true });
723
                            if ( today > due ) {
724
                            if ( today > due ) {
724
                                return "<span class='overdue'>" + oObj.date_due_formatted + "</span>";
725
                                return "<span class='overdue'>" + date_due_formatted + "</span>";
725
                            } else {
726
                            } else {
726
                                return oObj.date_due_formatted;
727
                                return date_due_formatted;
727
                            }
728
                            }
728
                        }
729
                        }
729
                    },
730
                    },
Lines 813-819 $(document).ready(function() { Link Here
813
                    },
814
                    },
814
                    {
815
                    {
815
                        "iDataSort": 7, // Sort on hidden unformatted issuedate column
816
                        "iDataSort": 7, // Sort on hidden unformatted issuedate column
816
                        "mDataProp": "issuedate_formatted",
817
                        "mDataProp": "issuedate",
817
                    },
818
                    },
818
                    {
819
                    {
819
                        "mDataProp": function ( oObj ) {
820
                        "mDataProp": function ( oObj ) {
(-)a/svc/checkouts (-13 lines)
Lines 288-305 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
288
        return_claim_created_on_formatted => $c->{return_claim_created_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_created_on} ) }) : undef,
288
        return_claim_created_on_formatted => $c->{return_claim_created_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_created_on} ) }) : undef,
289
        return_claim_updated_on_formatted => $c->{return_claim_updated_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_updated_on} ) }) : undef,
289
        return_claim_updated_on_formatted => $c->{return_claim_updated_on} ? output_pref({ dt => dt_from_string( $c->{return_claim_updated_on} ) }) : undef,
290
290
291
        issuedate_formatted => output_pref(
292
            {
293
                dt          => dt_from_string( $c->{issuedate} ),
294
                as_due_date => 1
295
            }
296
        ),
297
        date_due_formatted => output_pref(
298
            {
299
                dt          => dt_from_string( $c->{date_due} ),
300
                as_due_date => 1
301
            }
302
        ),
303
        lost    => $lost,
291
        lost    => $lost,
304
        claims_returned => $claims_returned,
292
        claims_returned => $claims_returned,
305
        damaged => $damaged,
293
        damaged => $damaged,
306
- 

Return to bug 33804