Attachment 164551 Details for Bug 6796 – Bug 6796: day_of_week representation fix

[patch] Bug 6796: day_of_week representation fix

Bug-6796-dayofweek-representation-fix.patch (text/plain), 1.71 KB, created by Martin Renvoize (ashimema) on 2024-04-09 09:58:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-04-09 09:58:09 UTC

Size: 1.71 KB

patch

obsolete

>From 32f9909ae580674a2bcaa7053f14565f75b16668 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 12 Feb 2024 15:48:06 +0000
>Subject: [PATCH] Bug 6796: day_of_week representation fix
>
>The code here was flawed, DateTime returns a 1-7 indexed array with the
>first day being Monday, Koha expects an 0-6 indexed array with the first
>day being Sunday.
>
>Sponsored-by: PTFS Europe
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Circulation.pm | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index f4bf52c8dd4..8fa89866e6e 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -3893,11 +3893,20 @@ sub CalcDateDue {
>     # starter vars so don't do calculations directly to $datedue
>     my $potential_datedue  = $datedue->clone;
>     my $library_close      = $datedue->clone;
>-    my $dayofweek          = $datedue->day_of_week - 1;
>+    my $dayofweek          = $datedue->day_of_week;
>+
>+    # Representation fix
>+    # DateTime object dow (1-7) where Monday is 1
>+    # Arrays are 0-based where 0 = Sunday, not 7.
>+    if ( $dayofweek == 7 ) {
>+        $dayofweek = 0;
>+    }
>+
>     my $tomorrow_dayofweek = $dayofweek + 1;
>+    if ( $tomorrow_dayofweek == 7 ) {
>+        $tomorrow_dayofweek = 0;
>+    }
> 
>-    # If it's Sunday and tomorrow would be == 7, make tomorrow 0 (Days are stored as 0-6)
>-    if ( $tomorrow_dayofweek > 6 ) { $tomorrow_dayofweek = 0; }
>     my $todayhours    = Koha::Library::Hours->find( { library_id => $branch, day => $dayofweek } );
>     my @close         = undef;
>     my $tomorrowhours = Koha::Library::Hours->find( { library_id => $branch, day => $tomorrow_dayofweek } )
>-- 
>2.44.0

Actions: View | Diff | Splinter Review

Attachments on bug 6796: 124669 | 124670 | 124671 | 124672 | 134323 | 134324 | 134325 | 134326 | 134327 | 145669 | 145670 | 145671 | 145672 | 145673 | 146988 | 146989 | 146990 | 146991 | 146992 | 150442 | 150443 | 150444 | 150445 | 150446 | 150447 | 150448 | 150477 | 150478 | 153252 | 153253 | 153254 | 153255 | 153256 | 153257 | 153258 | 153259 | 153260 | 153261 | 153271 | 153272 | 153273 | 153274 | 153275 | 153276 | 153277 | 153278 | 153279 | 153280 | 156772 | 156773 | 156774 | 156775 | 156776 | 156777 | 156778 | 156779 | 156780 | 161970 | 161971 | 161972 | 161973 | 161974 | 161975 | 161976 | 161977 | 161978 | 161979 | 161980 | 161986 | 161987 | 161988 | 161989 | 162043 | 162044 | 162045 | 162046 | 162047 | 162048 | 162049 | 162050 | 162051 | 162052 | 162053 | 162054 | 162055 | 162056 | 162090 | 162091 | 162092 | 162093 | 162094 | 162095 | 162096 | 162097 | 162098 | 162099 | 162100 | 162101 | 162102 | 162103 | 162104 | 164511 | 164512 | 164513 | 164514 | 164515 | 164516 | 164517 | 164518 | 164538 | 164539 | 164540 | 164541 | 164542 | 164543 | 164544 | 164545 | 164546 | 164547 | 164548 | 164549 | 164550 | 164551 | 164552