diff --git a/fullstack/lib/fullstack_web/live/public/public_transactions.ex b/fullstack/lib/fullstack_web/live/public/public_transactions.ex index 431ddfd..d5f70c1 100644 --- a/fullstack/lib/fullstack_web/live/public/public_transactions.ex +++ b/fullstack/lib/fullstack_web/live/public/public_transactions.ex @@ -1,6 +1,7 @@ defmodule FullstackWeb.Public.TransactionsLive.PublicTransactions do use FullstackWeb, :live_view + alias Fullstack.Devices alias Fullstack.Financial alias Contex.{BarChart, Plot, Dataset, Sparkline} alias Contex @@ -27,6 +28,7 @@ defmodule FullstackWeb.Public.TransactionsLive.PublicTransactions do socket = socket |> assign(:info, Financial.build_transactions_analytics(params)) + |> assign(:devices, Devices.list_devices()) |> assign(:form, to_form(params)) |> make_test_data() |> assign( @@ -96,8 +98,8 @@ defmodule FullstackWeb.Public.TransactionsLive.PublicTransactions do defp make_red_plot(data) do Sparkline.new(data) |> Sparkline.colours("#fad48e", "#ff9838") - |> Map.update!(:height, fn _ -> 100 end) - |> Map.update!(:width, fn _ -> 200 end) + |> Map.update!(:height, fn _ -> 60 end) + |> Map.update!(:width, fn _ -> 150 end) |> Sparkline.draw() end diff --git a/fullstack/lib/fullstack_web/live/public/public_transactions.html.heex b/fullstack/lib/fullstack_web/live/public/public_transactions.html.heex index bd5dc1f..6a2e508 100644 --- a/fullstack/lib/fullstack_web/live/public/public_transactions.html.heex +++ b/fullstack/lib/fullstack_web/live/public/public_transactions.html.heex @@ -7,8 +7,35 @@
<%= make_plot(@info.daily_data, @bar_options, @selected_bar) %>
-
- <%= make_red_plot(@test_data) %> +
+
+
+
+
+
Total Transactions
+
+ <%= @info.transactions_count %> +
+
+
+
Total Sales
+ +
+ $ <%= @info.total_amount %> +
+
+
+
+
+
+ <.table id="devices" rows={@devices}> + <:col :let={device} label="Identifier"><%= device.id %> + <:col :let={device} label="AVG speed">1 Mb + <:col :let={device} label=""> + <%= make_red_plot(@test_data) %> + + +

@@ -32,9 +59,7 @@ <%= customer %> -

-
-

+

LAST CUSTOMERS

-
-   <%= inspect(@info.transactions_count) %>
-   <%= inspect(@info.total_amount) %>
+  
+
+   <%= inspect(@info.daily_data, pretty: true) %>
+      
   
+