Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

fix(#1701): Events page displays year for events scheduled to start or end at a future year #2500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add Methods To Check If Event Starts And Ends This Year
  • Loading branch information
alvindera97 committed Apr 8, 2022
commit 1502c108dbb36a1fc94c9fac7eae4185f9f21da5
18 changes: 18 additions & 0 deletions 18 events/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,24 @@ def next_time(self):
except IndexError:
return None

def is_scheduled_to_start_this_year(self) -> bool:
current_year: int = datetime.datetime.now().year
try:
if self.next_time.dt_start.year == current_year:
return True
except Exception:
pass
return False

def is_scheduled_to_end_this_year(self) -> bool:
current_year: int = datetime.datetime.now().year
try:
if self.next_time.dt_end.year == current_year:
return True
except Exception:
pass
return False

@property
def previous_time(self):
now = timezone.now()
Expand Down
23 changes: 22 additions & 1 deletion 23 events/tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def test_recurring_event(self):
self.assertEqual(self.event.next_time.dt_start, recurring_time_dtstart)
self.assertTrue(rt.valid_dt_end())


rt.begin = now - datetime.timedelta(days=5)
rt.finish = now - datetime.timedelta(days=3)
rt.save()
Expand Down Expand Up @@ -186,3 +185,25 @@ def test_event_previous_event(self):
# 'Event.previous_event' can return None if there is no
# OccurringRule or RecurringRule found.
self.assertIsNone(self.event.previous_event)

def test_scheduled_to_start_this_year_method(self):
now = seconds_resolution(timezone.now())

occurring_time_dtstart = now + datetime.timedelta(days=3)
JacobCoffee marked this conversation as resolved.
Show resolved Hide resolved
alvindera97 marked this conversation as resolved.
Show resolved Hide resolved
OccurringRule.objects.create(
event=self.event,
dt_start=occurring_time_dtstart,
dt_end=occurring_time_dtstart
)
self.assertTrue(self.event.is_scheduled_to_start_this_year())

def test_scheduled_to_end_this_year_method(self):
now = seconds_resolution(timezone.now())

occurring_time_dtstart = now + datetime.timedelta(days=3)
JacobCoffee marked this conversation as resolved.
Show resolved Hide resolved
alvindera97 marked this conversation as resolved.
Show resolved Hide resolved
OccurringRule.objects.create(
event=self.event,
dt_start=occurring_time_dtstart,
dt_end=occurring_time_dtstart
)
self.assertTrue(self.event.is_scheduled_to_end_this_year())
Morty Proxy This is a proxified and sanitized view of the page, visit original site.