Skip to content

fix: schedule day always at event start #527

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.

Sign up for GitHub

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
joaodiaslobo merged 2 commits into from
Feb 12, 2025
Merged

fix: schedule day always at event start #527

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb5ba2f
fix: schedule day always at event start
ruioliveira02 Feb 12, 2025
19e7d15
fix: ci
ruioliveira02 Feb 12, 2025
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
34 changes: 32 additions & 2 deletions lib/safira_web/live/landing/components/schedule.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ defmodule SafiraWeb.Landing.Components.Schedule do
<div class="mb-20 2xl:mb-0">
<div class="sticky top-12">
<.schedule_day
date={fetch_current_date_from_params(assigns.params) || assigns.event_start_date}
date={
get_day(
fetch_current_date_from_params(assigns.params),
assigns.event_start_date,
assigns.event_end_date
)
}
url={@url}
params={@params}
filters={fetch_filters_from_params(assigns.params)}
Expand All @@ -34,7 +40,13 @@ defmodule SafiraWeb.Landing.Components.Schedule do
<.filters
:if={@has_filters?}
url={@url}
current_day={fetch_current_date_from_params(assigns.params) || assigns.event_start_date}
current_day={
get_day(
fetch_current_date_from_params(assigns.params),
assigns.event_start_date,
assigns.event_end_date
)
}
filters={fetch_filters_from_params(assigns.params)}
/>
</div>
Expand Down Expand Up @@ -405,6 +417,24 @@ defmodule SafiraWeb.Landing.Components.Schedule do
end
end

defp get_day(params_date, start_date, end_date) do
now = Date.utc_today()

cond do
not is_nil(params_date) ->
params_date

Date.compare(now, start_date) == :lt ->
start_date

Date.compare(now, end_date) == :gt ->
end_date

true ->
now
end
end

defp fetch_filters_from_params(params) do
Map.get(params, "filters", [])
end
Expand Down
Loading