diff --git a/lib/shift73k_web/live/shift_live/index.ex b/lib/shift73k_web/live/shift_live/index.ex
index 59c7777e..7a03e55b 100644
--- a/lib/shift73k_web/live/shift_live/index.ex
+++ b/lib/shift73k_web/live/shift_live/index.ex
@@ -1,17 +1,44 @@
defmodule Shift73kWeb.ShiftLive.Index do
use Shift73kWeb, :live_view
+ use Timex
alias Shift73k.Shifts
alias Shift73k.Shifts.Shift
+ alias Shift73kWeb.Roles
@impl true
- def mount(_params, _session, socket) do
- {:ok, assign(socket, :shifts, list_shifts())}
+ def mount(_params, session, socket) do
+ socket
+ |> assign_defaults(session)
+ |> live_okreply()
+
+ # {:ok, assign(socket, :shifts, list_shifts())}
end
@impl true
def handle_params(params, _url, socket) do
- {:noreply, apply_action(socket, socket.assigns.live_action, params)}
+ current_user = socket.assigns.current_user
+ live_action = socket.assigns.live_action
+ shift = shift_from_params(params)
+
+ if Roles.can?(current_user, shift, live_action) do
+ socket
+ # |> assign_shift_templates()
+ # |> assign_modal_close_handlers()
+ |> init_today(Timex.today())
+ |> assign_date_range()
+ |> assign_known_shifts()
+ |> assign(:delete_shift, nil)
+ |> apply_action(socket.assigns.live_action, params)
+ |> live_noreply()
+ else
+ socket
+ |> put_flash(:error, "Unauthorised")
+ |> redirect(to: "/")
+ |> live_noreply()
+ end
+
+ # {:noreply, apply_action(socket, socket.assigns.live_action, params)}
end
defp apply_action(socket, :edit, %{"id" => id}) do
@@ -32,15 +59,57 @@ defmodule Shift73kWeb.ShiftLive.Index do
|> assign(:shift, nil)
end
+ defp shift_from_params(params)
+
+ defp shift_from_params(%{"id" => id}),
+ do: Shifts.get_shift!(id)
+
+ defp shift_from_params(_params), do: %Shift{}
+
+ defp init_today(socket, today) do
+ assign(socket, current_date: today, cursor_date: today)
+ end
+
+ defp assign_date_range(%{assigns: %{cursor_date: cursor_date}} = socket) do
+ assign(socket, date_range: date_range(cursor_date))
+ end
+
+ defp date_range(cursor_date) do
+ cursor_date
+ |> Timex.beginning_of_month()
+ |> Date.range(Timex.end_of_month(cursor_date))
+ end
+
+ defp assign_known_shifts(socket) do
+ user = socket.assigns.current_user
+ shifts = Shifts.list_shifts_by_user_in_date_range(user.id, socket.assigns.date_range)
+ assign(socket, :shifts, shifts)
+ end
+
@impl true
def handle_event("delete", %{"id" => id}, socket) do
shift = Shifts.get_shift!(id)
{:ok, _} = Shifts.delete_shift(shift)
- {:noreply, assign(socket, :shifts, list_shifts())}
+ {:noreply, assign_known_shifts(socket)}
end
- defp list_shifts do
- Shifts.list_shifts()
+ @impl true
+ def handle_event("month-nav", %{"month" => direction}, socket) do
+ new_cursor =
+ cond do
+ direction == "now" ->
+ Timex.today()
+
+ true ->
+ months = (direction == "prev" && -1) || 1
+ Timex.shift(socket.assigns.cursor_date, months: months)
+ end
+
+ socket
+ |> assign(:cursor_date, new_cursor)
+ |> assign_date_range()
+ |> assign_known_shifts()
+ |> live_noreply()
end
end
diff --git a/lib/shift73k_web/live/shift_live/index.html.leex b/lib/shift73k_web/live/shift_live/index.html.leex
index de61437e..6e427687 100644
--- a/lib/shift73k_web/live/shift_live/index.html.leex
+++ b/lib/shift73k_web/live/shift_live/index.html.leex
@@ -1,5 +1,3 @@
-
Listing Shifts
-
<%= if @live_action in [:new, :edit] do %>
<%= live_modal @socket, Shift73kWeb.ShiftLive.FormComponent,
id: @shift.id || :new,
@@ -9,41 +7,87 @@
return_to: Routes.shift_index_path(@socket, :index) %>
<% end %>
-
-
-
- Subject
- Location
- Description
- Time zone
- Date
- Time zone
- Time start
- Time end
-
-
-
- <%= for shift <- @shifts do %>
-
- <%= shift.subject %>
- <%= shift.location %>
- <%= shift.description %>
- <%= shift.time_zone %>
- <%= shift.date %>
- <%= shift.time_zone %>
- <%= shift.time_start %>
- <%= shift.time_end %>
+
+
+
+
+ <%= icon_div @socket, "bi-calendar2-date", [class: "icon baseline"] %>
+ My Shifts
+
+
+<%# month navigation %>
+
+
+ <%= Timex.format!(@cursor_date, "{Mfull} {YYYY}") %>
+
+
+ >
+ <%= icon_div @socket, "bi-asterisk", [class: "icon baseline"] %>
+ Today
+
+
+ <%= icon_div @socket, "bi-chevron-left", [class: "icon baseline"] %>
+ Prev
+
+
+ Next
+ <%= icon_div @socket, "bi-chevron-right", [class: "icon baseline", style: "margin-left:0.125rem;"] %>
+
+
+
+
+
+
+<%= for day <- Enum.to_list(@date_range) do %>
+ <% Date.day_of_week(day, @current_user.week_start_at) |> IO.inspect(label: "day in date_range") %>
+ <%= if Date.day_of_week(day, @current_user.week_start_at) == 1 do %>
+
+ <% end %>
+
+ <%= Timex.format!(day, "{WDfull}, {Mshort} {D}") %>
+
+ <% day_shifts = Enum.filter(@shifts, fn s -> s.date == day end) %>
+ <%= if !Enum.empty?(day_shifts) do %>
+
+ <%= for shift <- day_shifts do %>
+
+
+
+ <%= format_shift_time(shift.time_start) |> String.trim_trailing("m") %>
+ —
+ <%= format_shift_time(shift.time_end) |> String.trim_trailing("m") %>
+
+
<%= shift.time_zone %>
+
+
+
+ <%= shift.subject %>
+ <%= if shift.location do %>
+ (<%= shift.location %>)
+ <% end %>
+
+
<%= shift.description %>
+
+ <%= live_redirect "Show", to: Routes.shift_show_path(@socket, :show, shift) %>
+ <%= live_patch "Edit", to: Routes.shift_index_path(@socket, :edit, shift) %>
+ <%= link "Delete", to: "#", phx_click: "delete", phx_value_id: shift.id, data: [confirm: "Are you sure?"] %>
+
+
+
+
+ <% else %>
+ No shift scheduled
-
- <%= live_redirect "Show", to: Routes.shift_show_path(@socket, :show, shift) %>
- <%= live_patch "Edit", to: Routes.shift_index_path(@socket, :edit, shift) %>
- <%= link "Delete", to: "#", phx_click: "delete", phx_value_id: shift.id, data: [confirm: "Are you sure?"] %>
-
-
- <% end %>
-
-
<%= live_patch "New Shift", to: Routes.shift_index_path(@socket, :new) %>
+
+
+