diff --git a/lib/shift73k.ex b/lib/shift73k.ex index 500bfb21..571fdbad 100644 --- a/lib/shift73k.ex +++ b/lib/shift73k.ex @@ -6,4 +6,13 @@ defmodule Shift73k do Contexts are also responsible for managing your data, regardless if it comes from the database, an external API or others. """ + + @app_vars Application.get_env(:shift73k, :app_global_vars, time_zone: "America/New_York") + @app_time_zone @app_vars[:time_zone] + + @weekdays [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday] + + def app_time_zone, do: @app_time_zone + + def weekdays, do: @weekdays end diff --git a/lib/shift73k/accounts/user.ex b/lib/shift73k/accounts/user.ex index c8f62ae8..f0f5f036 100644 --- a/lib/shift73k/accounts/user.ex +++ b/lib/shift73k/accounts/user.ex @@ -1,7 +1,7 @@ defmodule Shift73k.Accounts.User do use Ecto.Schema import Ecto.Changeset - import Shift73k.Util.Dt, only: [weekdays: 0] + import Shift73k, only: [weekdays: 0] alias Shift73k.Shifts.Templates.ShiftTemplate alias Shift73k.Shifts.Shift diff --git a/lib/shift73k/util/dt.ex b/lib/shift73k/util/dt.ex deleted file mode 100644 index 8838b47c..00000000 --- a/lib/shift73k/util/dt.ex +++ /dev/null @@ -1,10 +0,0 @@ -defmodule Shift73k.Util.Dt do - @app_vars Application.get_env(:shift73k, :app_global_vars, time_zone: "America/New_York") - @app_time_zone @app_vars[:time_zone] - - @weekdays [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday] - - def app_time_zone, do: @app_time_zone - - def weekdays, do: @weekdays -end diff --git a/lib/shift73k_web/live/shift_import_live/index.html.leex b/lib/shift73k_web/live/shift_import_live/index.html.leex index 6989981e..2fb79247 100644 --- a/lib/shift73k_web/live/shift_import_live/index.html.leex +++ b/lib/shift73k_web/live/shift_import_live/index.html.leex @@ -35,7 +35,7 @@
<%= icon_div @socket, "bi-map", [class: "icon is-left text-muted fs-5"] %> <%= text_input iimf, :time_zone, - value: Shift73k.Util.Dt.app_time_zone(), + value: Shift73k.app_time_zone(), class: @tz_valid && "form-control" || "form-control is-invalid", phx_debounce: 250, aria_describedby: "ics-import-tz-error", diff --git a/lib/shift73k_web/live/user/settings/week_start.ex b/lib/shift73k_web/live/user/settings/week_start.ex index 756aa7ea..4cf9215d 100644 --- a/lib/shift73k_web/live/user/settings/week_start.ex +++ b/lib/shift73k_web/live/user/settings/week_start.ex @@ -1,6 +1,6 @@ defmodule Shift73kWeb.UserLive.Settings.WeekStart do use Shift73kWeb, :live_component - import Shift73k.Util.Dt, only: [weekdays: 0] + import Shift73k, only: [weekdays: 0] alias Shift73k.Accounts diff --git a/lib/shift73k_web/live/user_management/index.ex b/lib/shift73k_web/live/user_management/index.ex index ae7f8037..5c6025b7 100644 --- a/lib/shift73k_web/live/user_management/index.ex +++ b/lib/shift73k_web/live/user_management/index.ex @@ -2,7 +2,6 @@ defmodule Shift73kWeb.UserManagementLive.Index do use Shift73kWeb, :live_view import Ecto.Query - import Shift73k.Util.Dt import Shift73kWeb.Pagination alias Shift73k.Repo @@ -199,7 +198,7 @@ defmodule Shift73kWeb.UserManagementLive.Index do def dt_out(ndt) do ndt - |> DateTime.from_naive!(app_time_zone()) + |> DateTime.from_naive!(Shift73k.app_time_zone()) |> Calendar.strftime("%Y %b %-d, %-I:%M %p") end end diff --git a/priv/repo/seeds.exs b/priv/repo/seeds.exs index 5da42a10..a2062be5 100644 --- a/priv/repo/seeds.exs +++ b/priv/repo/seeds.exs @@ -56,7 +56,7 @@ extra_mock_users = ~s([ ]) # for random week_start_at values -[head | tail] = Shift73k.Util.Dt.weekdays() +[head | tail] = Shift73k.weekdays() week_starts = [head | Enum.drop(tail, 4)] mock_users =