When navigating the 2017 calendar by weeks, (first day of week Sunday, not using ISO weeks) I noticed that when using going from 2017-W02 (2017-01-08), the previous week is 2016-W01, not 2017-W01.

The issue is that the year blindly uses the ISO year. So what could be week 52 or 53 of the previous year in ISO, is actually week 1 of the next year.

CommentFileSizeAuthor
#20 date-n2868485-20.patch8.17 KBDamienMcKenna
#17 2868485-date-week-year-17.patch8.32 KBsilverham
#15 2868485-date-week-year-15.patch8.25 KBJorrit
#13 interdiff.txt4.21 KBJorrit
#13 2868485-date-week-year-13.patch5.6 KBJorrit
#6 interdiff_3-6.txt481 bytesNina Lisitsinskaya
#6 2868485-6.patch5.13 KBNina Lisitsinskaya
#5 screenshot-2018-05-30_20:20:43.png21.73 KBNina Lisitsinskaya
#3 wrong_year_non_iso-2868485-3.patch5.14 KBAnonymous (not verified)
#2 wrong_year_non_iso-2868485-2.patch5.14 KBAnonymous (not verified)
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Anonymous’s picture

Anonymous (not verified) CreditAttribution: Anonymous at Cheeky Monkey Media commented

rsmylski created an issue. See original summary.

Anonymous’s picture

Anonymous (not verified) CreditAttribution: Anonymous at Cheeky Monkey Media commented
Status: Active » Needs review
FileSize
wrong_year_non_iso-2868485-2.patch5.14 KB

I've created a patch to have a function calculate the year, using some of the logic used to calculate the weeks, and updated accordingly.

Anonymous’s picture

Anonymous (not verified) CreditAttribution: Anonymous at Cheeky Monkey Media commented
FileSize
wrong_year_non_iso-2868485-3.patch5.14 KB

Fixed using incorrect int_val() instead of intval()

jastraat’s picture

jastraat CreditAttribution: jastraat at Technivant commented

This fixed the issue for me with 7.x-2.10

Nina Lisitsinskaya’s picture

Nina Lisitsinskaya CreditAttribution: Nina Lisitsinskaya commented
FileSize
screenshot-2018-05-30_20:20:43.png21.73 KB

Hello. I have very similar problems with the weeks calendar. This patch seems to solve most of the problems, but not all of them.
For example, on the week 52 of 2018 I see the next link leading to the week 53 of 2019.
I'm using Drupal 7.59, version 7.x-3.5 of the Calendar module, and the latest 7.x-2.x-dev version of the Date module. This is my time settings:
Time settings

Nina Lisitsinskaya’s picture

Nina Lisitsinskaya CreditAttribution: Nina Lisitsinskaya commented
FileSize
2868485-6.patch5.13 KB
interdiff_3-6.txt481 bytes

Probably there was a mistake in the patch. With this correction, everything seems to working ok.

pasi.valkeila’s picture

pasi.valkeila CreditAttribution: pasi.valkeila commented

#6 fixed the issue for me as well for year 2018->2019 and 2020->2021. Thank you Nina! Still problem exists for me at 2020-W53. Next week -button skips one week straight to 2021-W02. Same settings for me that are in #5 except timezone: Europe/Helsinki and country: Finland

jastraat’s picture

jastraat CreditAttribution: jastraat at Technivant commented

I'm not sure this patch is necessary in 7.x-2.11-beta1.

Chris Matthews’s picture

Chris Matthews CreditAttribution: Chris Matthews as a volunteer commented

Re: #8

I'm not sure this patch is necessary in 7.x-2.11-beta1.

@jastraat, have you tested 7.x-2.11-beta2 to see if this issue exists?

jastraat’s picture

jastraat CreditAttribution: jastraat at Technivant commented

Unfortunately I just tested with 7.x-2.11-beta2 using the 2017-W02 scenario, and this is still an issue.

jastraat’s picture

jastraat CreditAttribution: jastraat at Technivant commented

The patch from #6 still applies (with fuzz) and fixes the issue.

Jorrit’s picture

Jorrit CreditAttribution: Jorrit at nCode for DOM Digital Online Media GmbH commented

Works for me. There is room for small improvements by calculating the argument to date_week() and date_week_year() just once, for instance calculate date_format($now, 'Y-m-d') just once in date_views_argument_handler_simple::get_default_argument.

Jorrit’s picture

Jorrit CreditAttribution: Jorrit at nCode for DOM Digital Online Media GmbH commented
FileSize
2868485-date-week-year-13.patch5.6 KB
interdiff.txt4.21 KB

Here is a patch that performs the above optimization.

DamienMcKenna’s picture

DamienMcKenna
Location NH, USA
CreditAttribution: DamienMcKenna at Mediacurrent commented
Status: Needs review » Needs work
Issue tags: +Needs tests

This is great work, but I think we should include some tests to make sure it works as intended.

Jorrit’s picture

Jorrit CreditAttribution: Jorrit at nCode for DOM Digital Online Media GmbH commented
Status: Needs work » Needs review
FileSize
2868485-date-week-year-15.patch8.25 KB

I've added some tests.

Jorrit’s picture

Jorrit CreditAttribution: Jorrit at nCode for DOM Digital Online Media GmbH commented

Are these tests sufficient, DamienMcKenna ?

silverham’s picture

silverham CreditAttribution: silverham at EY Digital commented
FileSize
2868485-date-week-year-17.patch8.32 KB

I getting same issue now when using the calendar module (version 7.x-3.6) on D7.

"week=2021-W03" => click previous week button turns incorrectly into "week=2020-W02" (skipping a year).

I've rerolled the patch for date module 7.x-2.x-dev / 7.x-2.11-rc1.

DamienMcKenna’s picture

DamienMcKenna
Location NH, USA
CreditAttribution: DamienMcKenna at Mediacurrent commented
Parent issue: » #2867810: Plan for Date 7.x-2.11 release

I wonder - should the DateObject class be extended to include this new week_year attribute?

DamienMcKenna’s picture

DamienMcKenna
Location NH, USA
CreditAttribution: DamienMcKenna at Mediacurrent commented
Parent issue: #2867810: Plan for Date 7.x-2.11 release »
DamienMcKenna’s picture

DamienMcKenna
Location NH, USA
CreditAttribution: DamienMcKenna at Mediacurrent commented
FileSize
date-n2868485-20.patch8.17 KB

Rerolled.