From 854660bb5dad12bae1713f50a31735219fa85e71 Mon Sep 17 00:00:00 2001
From: Danni Friedland <BlueHotDog@users.noreply.github.com>
Date: Thu, 19 Aug 2021 11:05:19 +0300
Subject: [PATCH 1/8] updating phoenix_html

---
 lib/kaffy/resource_form.ex | 8 ++++----
 mix.exs                    | 2 +-
 test/kaffy_test.exs        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/kaffy/resource_form.ex b/lib/kaffy/resource_form.ex
index ab701943..b6ea8317 100644
--- a/lib/kaffy/resource_form.ex
+++ b/lib/kaffy/resource_form.ex
@@ -73,10 +73,10 @@ defmodule Kaffy.ResourceForm do
     end
   end
 
-  def form_field(changeset, form, {field, options}, opts) do
-    type = Kaffy.ResourceSchema.field_type(changeset.data.__struct__, field)
-    build_html_input(changeset.data, form, {field, options}, type, opts)
-  end
+  # def form_field(changeset, form, {field, options}, opts) do
+  #   type = Kaffy.ResourceSchema.field_type(changeset.data.__struct__, field)
+  #   build_html_input(changeset.data, form, {field, options}, type, opts)
+  # end
 
   defp build_html_input(schema, form, {field, options}, type, opts, readonly \\ false) do
     data = schema
diff --git a/mix.exs b/mix.exs
index 47cb3fff..4914715f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -31,7 +31,7 @@ defmodule Kaffy.MixProject do
   defp deps do
     [
       {:phoenix, "~> 1.4"},
-      {:phoenix_html, "~> 2.11"},
+      {:phoenix_html, "~> 2.13 or ~> 3.0"},
       {:mock, "~> 0.3.0", only: :test},
       {:ecto, "~> 3.0"},
       {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}
diff --git a/test/kaffy_test.exs b/test/kaffy_test.exs
index 143a0dec..cca2b7e6 100644
--- a/test/kaffy_test.exs
+++ b/test/kaffy_test.exs
@@ -2,7 +2,7 @@ defmodule KaffyTest do
   use ExUnit.Case
   doctest Kaffy
   alias KaffyTest.Schemas.{Person, Pet}
-  alias KaffyTest.Admin.PersonAdmin
+  # alias KaffyTest.Admin.PersonAdmin
 
   test "greets the world" do
     assert Kaffy.hello() == :world
@@ -82,7 +82,7 @@ defmodule KaffyTest do
   end
 
   describe "Kaffy.ResourceAdmin" do
-    alias Kaffy.ResourceAdmin
+    # alias Kaffy.ResourceAdmin
 
     # [Qizot] I don't know if this test should be valid anymore if associations are allowed
     # test "index/1 should return a keyword list of fields and their values" do

From fcc177201c91305dd6e3e6ab42df3f9d6d43a22d Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Fri, 17 Sep 2021 18:02:29 +0100
Subject: [PATCH 2/8] Quick hack for multi select filters

---
 lib/kaffy/resource_query.ex                             | 6 +++++-
 lib/kaffy/resource_schema.ex                            | 8 ++++++--
 lib/kaffy_web/templates/resource/_list_table.html.eex   | 2 +-
 lib/kaffy_web/templates/resource/_table_header.html.eex | 9 ++++++---
 lib/kaffy_web/templates/resource/index.html.eex         | 2 +-
 lib/kaffy_web/templates/resource/pick_resource.html.eex | 2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/kaffy/resource_query.ex b/lib/kaffy/resource_query.ex
index 4f13b924..ca75d674 100644
--- a/lib/kaffy/resource_query.ex
+++ b/lib/kaffy/resource_query.ex
@@ -152,6 +152,9 @@ defmodule Kaffy.ResourceQuery do
   defp build_filtered_fields_query(query, []), do: query
 
   defp build_filtered_fields_query(query, [filter | rest]) do
+    IO.puts("build_filtered_fields_query --------------------------------------")
+    IO.puts("query: #{inspect(query)}, filter: #{inspect(filter)}, rest: #{inspect(rest)}")
+
     query =
       case filter.value == "" do
         true ->
@@ -159,7 +162,8 @@ defmodule Kaffy.ResourceQuery do
 
         false ->
           field_name = String.to_existing_atom(filter.name)
-          from(s in query, where: field(s, ^field_name) == ^filter.value)
+          filter_values = String.split(filter.value, ",")
+          from(s in query, where: field(s, ^field_name) in ^filter_values)
       end
 
     build_filtered_fields_query(query, rest)
diff --git a/lib/kaffy/resource_schema.ex b/lib/kaffy/resource_schema.ex
index 28669cf6..8dc60b50 100644
--- a/lib/kaffy/resource_schema.ex
+++ b/lib/kaffy/resource_schema.ex
@@ -130,13 +130,17 @@ defmodule Kaffy.ResourceSchema do
       Enum.map(admin_fields, fn f -> kaffy_field_filters(resource[:schema], f) end)
 
     Enum.any?(fields_with_filters, fn
-      {_, filters} -> filters
+      {_, _, filters} -> filters
       _ -> false
     end)
   end
 
   def kaffy_field_filters(_schema, {field, options}) do
-    {field, Map.get(options || %{}, :filters, false)}
+    {
+      field,
+      Map.get(options || %{}, :filter_multiple, false),
+      Map.get(options || %{}, :filters, false)
+    }
   end
 
   def kaffy_field_filters(_, _), do: false
diff --git a/lib/kaffy_web/templates/resource/_list_table.html.eex b/lib/kaffy_web/templates/resource/_list_table.html.eex
index ce4aca4e..36e69fca 100644
--- a/lib/kaffy_web/templates/resource/_list_table.html.eex
+++ b/lib/kaffy_web/templates/resource/_list_table.html.eex
@@ -8,7 +8,7 @@
     <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
         <tr>
             <%= for {field, index} <- Enum.with_index(@fields) do %>
-                <% {field, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+                <% {field, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
                 <%= if filters do %>
                     <th class="bg-light">
                          <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= Kaffy.ResourceSchema.kaffy_field_name(@my_resource[:schema], field) %>">
diff --git a/lib/kaffy_web/templates/resource/_table_header.html.eex b/lib/kaffy_web/templates/resource/_table_header.html.eex
index 720c2c68..355cbbed 100644
--- a/lib/kaffy_web/templates/resource/_table_header.html.eex
+++ b/lib/kaffy_web/templates/resource/_table_header.html.eex
@@ -23,13 +23,16 @@
     <tr>
         <th class="bg-light"></th>
         <%= for {field, index} <- Enum.with_index(@fields) do %>
-            <% {field, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+            <% {field, multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
             <%= if filters do %>
                 <th class="bg-light">
-                    <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= field %>">
+                    <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= field %>" <%= if multiple do %> multiple<% end %>>
                         <option value="">All</option>
                         <%= for {human, machine} <- filters do %>
-                            <option value="<%= machine %>"<%= if Map.get(@params, to_string(field)) == to_string(machine) do %> selected<% end %>><%= human %></option>
+                             <% params = Map.get(@params, to_string(field)) || "" %>
+                             <% params = String.split(params, ",") %>
+
+                            <option value="<%= machine %>"<%= if Enum.member?(params, to_string(machine)) do %> selected<% end %>><%= human %></option>
                         <% end %>
                     </select>
                 </th>
diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex
index 1f11cbcf..d38f4669 100644
--- a/lib/kaffy_web/templates/resource/index.html.eex
+++ b/lib/kaffy_web/templates/resource/index.html.eex
@@ -79,7 +79,7 @@
 <form id="kaffy-filters-form" method="get" style="display:none;">
   <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
     <%= for field <- @fields do %>
-        <% {field, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+        <% {field, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
         <%= if filters do %>
             <input id="custom-filter-<%= field %>" type="hidden" name="<%= field %>" value="<%= Map.get(@params, to_string(field), "") %>" />
         <% end %>
diff --git a/lib/kaffy_web/templates/resource/pick_resource.html.eex b/lib/kaffy_web/templates/resource/pick_resource.html.eex
index f5f13a01..4a832eca 100644
--- a/lib/kaffy_web/templates/resource/pick_resource.html.eex
+++ b/lib/kaffy_web/templates/resource/pick_resource.html.eex
@@ -28,7 +28,7 @@
 <form id="kaffy-filters-form" method="get" style="display:none;">
   <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
     <%= for field <- @fields do %>
-        <% {field, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+        <% {field, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
         <%= if filters do %>
             <input id="custom-filter-<%= field %>" type="hidden" name="<%= field %>" value="<%= Map.get(@params, to_string(field), "") %>" />
         <% end %>

From 75240994e4aebe0f721e2a20672007e0d553b4be Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Thu, 14 Oct 2021 16:37:12 +0100
Subject: [PATCH 3/8] Test watcher

---
 mix.exs  | 3 ++-
 mix.lock | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index 4914715f..4418bd98 100644
--- a/mix.exs
+++ b/mix.exs
@@ -34,7 +34,8 @@ defmodule Kaffy.MixProject do
       {:phoenix_html, "~> 2.13 or ~> 3.0"},
       {:mock, "~> 0.3.0", only: :test},
       {:ecto, "~> 3.0"},
-      {:ex_doc, ">= 0.0.0", only: :dev, runtime: false}
+      {:ex_doc, ">= 0.0.0", only: :dev, runtime: false},
+      {:mix_test_watch, "~> 1.0", only: :dev, runtime: false}
     ]
   end
 
diff --git a/mix.lock b/mix.lock
index 1ac7aed1..c3894b8e 100644
--- a/mix.lock
+++ b/mix.lock
@@ -5,11 +5,13 @@
   "ecto": {:hex, :ecto, "3.4.3", "3a14c2500c3964165245a4f24a463e080762f7ccd0c632c763ea589f75ca205f", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9b6f18dea95f2004d0369f6a8346513ca3f706614f4ede219a5f3fe5db5dd962"},
   "eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm", "b14f1dc204321429479c569cfbe8fb287541184ed040956c8862cb7a677b8406"},
   "ex_doc": {:hex, :ex_doc, "0.21.3", "857ec876b35a587c5d9148a2512e952e24c24345552259464b98bfbb883c7b42", [:mix], [{:earmark, "~> 1.4", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "0db1ee8d1547ab4877c5b5dffc6604ef9454e189928d5ba8967d4a58a801f161"},
+  "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"},
   "makeup": {:hex, :makeup, "1.0.1", "82f332e461dc6c79dbd82fbe2a9c10d48ed07146f0a478286e590c83c52010b5", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "49736fe5b66a08d8575bf5321d716bac5da20c8e6b97714fec2bcd6febcfa1f8"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "d4b316c7222a85bbaa2fd7c6e90e37e953257ad196dc229505137c5e505e9eff"},
   "meck": {:hex, :meck, "0.8.13", "ffedb39f99b0b99703b8601c6f17c7f76313ee12de6b646e671e3188401f7866", [:rebar3], [], "hexpm", "d34f013c156db51ad57cc556891b9720e6a1c1df5fe2e15af999c84d6cebeb1a"},
   "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm", "6cbe761d6a0ca5a31a0931bf4c63204bceb64538e664a8ecf784a9a6f3b875f1"},
+  "mix_test_watch": {:hex, :mix_test_watch, "1.1.0", "330bb91c8ed271fe408c42d07e0773340a7938d8a0d281d57a14243eae9dc8c3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "52b6b1c476cbb70fd899ca5394506482f12e5f6b0d6acff9df95c7f1e0812ec3"},
   "mock": {:hex, :mock, "0.3.6", "e810a91fabc7adf63ab5fdbec5d9d3b492413b8cda5131a2a8aa34b4185eb9b4", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "bcf1d0a6826fb5aee01bae3d74474669a3fa8b2df274d094af54a25266a1ebd2"},
   "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm", "589b5af56f4afca65217a1f3eb3fee7e79b09c40c742fddc1c312b3ac0b3399f"},
   "phoenix": {:hex, :phoenix, "1.4.17", "1b1bd4cff7cfc87c94deaa7d60dd8c22e04368ab95499483c50640ef3bd838d8", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.8.1 or ~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a8e5d7a3d76d452bb5fb86e8b7bd115f737e4f8efe202a463d4aeb4a5809611"},

From a2f40694debc2c8e3fc3044e997c3052ef6bd8b7 Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Fri, 15 Oct 2021 15:01:58 +0100
Subject: [PATCH 4/8] Date filtering via Kaffy config

Example:

```
      last_panel_date: %{
        name: "Last Panel [<= date]",
        value: fn u ->
          Utils.datetime_format(u.last_panel_date)
        end,
        filters: [],
        filter_type: :date,
        filter_operator: :ltoe
      }
```
---
 lib/kaffy/resource_query.ex                   | 72 ++++++++++++++++---
 lib/kaffy/resource_schema.ex                  |  9 ++-
 .../templates/resource/_list_table.html.eex   |  2 +-
 .../templates/resource/_table_header.html.eex | 31 +++++---
 .../templates/resource/index.html.eex         |  2 +-
 5 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/lib/kaffy/resource_query.ex b/lib/kaffy/resource_query.ex
index ca75d674..d09e8507 100644
--- a/lib/kaffy/resource_query.ex
+++ b/lib/kaffy/resource_query.ex
@@ -16,7 +16,7 @@ defmodule Kaffy.ResourceQuery do
 
     {all, paged} =
       build_query(
-        schema,
+        resource,
         search_fields,
         filtered_fields,
         search,
@@ -103,7 +103,7 @@ defmodule Kaffy.ResourceQuery do
   end
 
   defp build_query(
-         schema,
+         resource,
          search_fields,
          filtered_fields,
          search,
@@ -111,7 +111,7 @@ defmodule Kaffy.ResourceQuery do
          ordering,
          current_offset
        ) do
-    query = from(s in schema)
+    query = from(s in resource[:schema])
 
     query =
       cond do
@@ -141,7 +141,7 @@ defmodule Kaffy.ResourceQuery do
           end)
       end
 
-    query = build_filtered_fields_query(query, filtered_fields)
+    query = build_filtered_fields_query(resource, query, filtered_fields)
 
     limited_query =
       from(s in query, limit: ^per_page, offset: ^current_offset, order_by: ^ordering)
@@ -149,11 +149,14 @@ defmodule Kaffy.ResourceQuery do
     {query, limited_query}
   end
 
-  defp build_filtered_fields_query(query, []), do: query
+  defp build_filtered_fields_query(_resource, query, []), do: query
 
-  defp build_filtered_fields_query(query, [filter | rest]) do
-    IO.puts("build_filtered_fields_query --------------------------------------")
-    IO.puts("query: #{inspect(query)}, filter: #{inspect(filter)}, rest: #{inspect(rest)}")
+  defp build_filtered_fields_query(resource, query, [filter | rest]) do
+    IO.puts("MSP build_filtered_fields_query ---------------------------------")
+
+    IO.puts(
+      "resource: #{inspect(resource)}, query: #{inspect(query)}, filter: #{inspect(filter)}, rest: #{inspect(rest)}"
+    )
 
     query =
       case filter.value == "" do
@@ -162,10 +165,57 @@ defmodule Kaffy.ResourceQuery do
 
         false ->
           field_name = String.to_existing_atom(filter.name)
-          filter_values = String.split(filter.value, ",")
-          from(s in query, where: field(s, ^field_name) in ^filter_values)
+
+          {type, operator} = get_field_type_and_operator(resource, field_name)
+
+          case type do
+            :date ->
+              case operator do
+                :ltoe ->
+                  from(
+                    s in query,
+                    where: field(s, ^field_name) <= ^filter.value
+                  )
+
+                :gtoe ->
+                  from(
+                    s in query,
+                    where: field(s, ^field_name) >= ^filter.value
+                  )
+
+                _ ->
+                  from(
+                    s in query,
+                    where: field(s, ^field_name) == ^filter.value
+                  )
+              end
+
+            _ ->
+              filter_values = String.split(filter.value, ",")
+
+              from(
+                s in query,
+                where: field(s, ^field_name) in ^filter_values
+              )
+          end
       end
 
-    build_filtered_fields_query(query, rest)
+    build_filtered_fields_query(resource, query, rest)
+  end
+
+  defp get_field_type_and_operator(resource, field_name) do
+    IO.puts("MSP get_field_type_and_operator ---------------------------------")
+    schema = resource[:schema]
+    admin_fields = Kaffy.ResourceAdmin.index(resource)
+    field_options = admin_fields |> Map.new() |> Map.get(field_name)
+
+    IO.puts("field_options: #{inspect(field_options)}")
+
+    {_field, type, operator, _multiple, _filters} =
+      Kaffy.ResourceSchema.kaffy_field_filters(schema, {field_name, field_options})
+
+    IO.puts("field_name: #{field_name}, type: #{type}, operator: #{operator}")
+
+    {type, operator}
   end
 end
diff --git a/lib/kaffy/resource_schema.ex b/lib/kaffy/resource_schema.ex
index 8dc60b50..cb76d404 100644
--- a/lib/kaffy/resource_schema.ex
+++ b/lib/kaffy/resource_schema.ex
@@ -130,14 +130,19 @@ defmodule Kaffy.ResourceSchema do
       Enum.map(admin_fields, fn f -> kaffy_field_filters(resource[:schema], f) end)
 
     Enum.any?(fields_with_filters, fn
-      {_, _, filters} -> filters
-      _ -> false
+      {_, _, _, _, filters} ->
+        filters
+
+      _ ->
+        false
     end)
   end
 
   def kaffy_field_filters(_schema, {field, options}) do
     {
       field,
+      Map.get(options || %{}, :filter_type, :select),
+      Map.get(options || %{}, :filter_operator, :equals),
       Map.get(options || %{}, :filter_multiple, false),
       Map.get(options || %{}, :filters, false)
     }
diff --git a/lib/kaffy_web/templates/resource/_list_table.html.eex b/lib/kaffy_web/templates/resource/_list_table.html.eex
index 36e69fca..c25e038b 100644
--- a/lib/kaffy_web/templates/resource/_list_table.html.eex
+++ b/lib/kaffy_web/templates/resource/_list_table.html.eex
@@ -8,7 +8,7 @@
     <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
         <tr>
             <%= for {field, index} <- Enum.with_index(@fields) do %>
-                <% {field, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+                <% {field, _type, _operator, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
                 <%= if filters do %>
                     <th class="bg-light">
                          <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= Kaffy.ResourceSchema.kaffy_field_name(@my_resource[:schema], field) %>">
diff --git a/lib/kaffy_web/templates/resource/_table_header.html.eex b/lib/kaffy_web/templates/resource/_table_header.html.eex
index 355cbbed..a889acc5 100644
--- a/lib/kaffy_web/templates/resource/_table_header.html.eex
+++ b/lib/kaffy_web/templates/resource/_table_header.html.eex
@@ -23,18 +23,31 @@
     <tr>
         <th class="bg-light"></th>
         <%= for {field, index} <- Enum.with_index(@fields) do %>
-            <% {field, multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+            <% {field, type, _operator, multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
             <%= if filters do %>
                 <th class="bg-light">
-                    <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= field %>" <%= if multiple do %> multiple<% end %>>
-                        <option value="">All</option>
-                        <%= for {human, machine} <- filters do %>
-                             <% params = Map.get(@params, to_string(field)) || "" %>
-                             <% params = String.split(params, ",") %>
+                    <%= if type == :select do %>
+                        <select class="kaffy-filter custom-select" id="kaffy-field-<%= index %>" data-field-name="<%= field %>" <%= if multiple do %> multiple<% end %>>
+                            <option value="">All</option>
+                            <%= for {human, machine} <- filters do %>
+                                <% params = Map.get(@params, to_string(field)) || "" %>
+                                <% params = String.split(params, ",") %>
 
-                            <option value="<%= machine %>"<%= if Enum.member?(params, to_string(machine)) do %> selected<% end %>><%= human %></option>
-                        <% end %>
-                    </select>
+                                <option value="<%= machine %>"<%= if Enum.member?(params, to_string(machine)) do %> selected<% end %>><%= human %></option>
+                            <% end %>
+                        </select>
+                    <% end %>
+
+                    <%= if type == :date do %>
+                        <div class="input-group mb-2 flatpickr flatpickr-wrap-date">
+                            <div class="input-group-prepend">
+                            <div class="input-group-text" data-clear="">❌</div>
+                        </div>
+                        <div class="input-group-prepend">
+                            <div class="input-group-text" data-toggle="">🗓️</div>
+                        </div>
+                        <input class="kaffy-filter form-control flatpickr-input" id="kaffy-field-<%= index %>" data-field-name="<%= field %>" value="<%= Map.get(@params, to_string(field)) %>" data-input="" placeholder="Select Date..." type="text" readonly="readonly"></div>
+                    <% end %>
                 </th>
             <% else %>
                 <th class="bg-light"></th>
diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex
index d38f4669..d7b88293 100644
--- a/lib/kaffy_web/templates/resource/index.html.eex
+++ b/lib/kaffy_web/templates/resource/index.html.eex
@@ -79,7 +79,7 @@
 <form id="kaffy-filters-form" method="get" style="display:none;">
   <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
     <%= for field <- @fields do %>
-        <% {field, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
+        <% {field, _type, _op, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
         <%= if filters do %>
             <input id="custom-filter-<%= field %>" type="hidden" name="<%= field %>" value="<%= Map.get(@params, to_string(field), "") %>" />
         <% end %>

From e29864c2407796c2b29daeada98f924ee4002c6c Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Thu, 21 Oct 2021 22:03:08 +0100
Subject: [PATCH 5/8] Map Search

This feature is company specific with some hard coded values so can't be integrated upstream as-is.
---
 lib/kaffy/resource_query.ex                   |  38 +++++-
 lib/kaffy_web/templates/layout/app.html.eex   |   1 +
 .../templates/resource/_table.html.eex        |   2 +-
 .../templates/resource/index.html.eex         |  59 +++++++++-
 priv/static/assets/css/kaffy.css              |   7 ++
 priv/static/assets/js/map.js                  | 111 ++++++++++++++++++
 6 files changed, 215 insertions(+), 3 deletions(-)
 create mode 100644 priv/static/assets/js/map.js

diff --git a/lib/kaffy/resource_query.ex b/lib/kaffy/resource_query.ex
index d09e8507..38c871ab 100644
--- a/lib/kaffy/resource_query.ex
+++ b/lib/kaffy/resource_query.ex
@@ -9,6 +9,7 @@ defmodule Kaffy.ResourceQuery do
     search = Map.get(params, "search", "") |> String.trim()
     search_fields = Kaffy.ResourceAdmin.search_fields(resource)
     filtered_fields = get_filter_fields(params, resource)
+    hardcoded_filtered_fields = get_hardcoded_filter_fields(params, resource)
     ordering = get_ordering(resource, params)
 
     current_offset = (page - 1) * per_page
@@ -19,6 +20,7 @@ defmodule Kaffy.ResourceQuery do
         resource,
         search_fields,
         filtered_fields,
+        hardcoded_filtered_fields,
         search,
         per_page,
         ordering,
@@ -102,10 +104,23 @@ defmodule Kaffy.ResourceQuery do
     end)
   end
 
+  defp get_hardcoded_filter_fields(params, _resource) do
+    schema_fields = [
+      "map_marker_1_lat",
+      "map_marker_1_lon",
+      "map_marker_2_lat",
+      "map_marker_2_lon"
+    ]
+
+    filtered_fields = Enum.filter(params, fn {k, v} -> k in schema_fields and v != "" end)
+    Enum.into(filtered_fields, %{})
+  end
+
   defp build_query(
          resource,
          search_fields,
          filtered_fields,
+         hardcoded_filtered_fields,
          search,
          per_page,
          ordering,
@@ -143,6 +158,8 @@ defmodule Kaffy.ResourceQuery do
 
     query = build_filtered_fields_query(resource, query, filtered_fields)
 
+    query = build_hardcoded_filtered_fields_query(resource, query, hardcoded_filtered_fields)
+
     limited_query =
       from(s in query, limit: ^per_page, offset: ^current_offset, order_by: ^ordering)
 
@@ -164,7 +181,7 @@ defmodule Kaffy.ResourceQuery do
           query
 
         false ->
-          field_name = String.to_existing_atom(filter.name)
+          field_name = String.to_atom(filter.name)
 
           {type, operator} = get_field_type_and_operator(resource, field_name)
 
@@ -203,6 +220,25 @@ defmodule Kaffy.ResourceQuery do
     build_filtered_fields_query(resource, query, rest)
   end
 
+  defp build_hardcoded_filtered_fields_query(resource, query, filters) do
+    if Enum.count(filters) > 0 do
+      map_marker_1_lat = Map.get(filters, "map_marker_1_lat")
+      map_marker_1_lon = Map.get(filters, "map_marker_1_lon")
+      map_marker_2_lat = Map.get(filters, "map_marker_2_lat")
+      map_marker_2_lon = Map.get(filters, "map_marker_2_lon")
+
+      from(
+        s in query,
+        where: field(s, :home_lat) >= ^map_marker_2_lat,
+        where: field(s, :home_lat) <= ^map_marker_1_lat,
+        where: field(s, :home_long) >= ^map_marker_1_lon,
+        where: field(s, :home_long) <= ^map_marker_2_lon
+      )
+    else
+      query
+    end
+  end
+
   defp get_field_type_and_operator(resource, field_name) do
     IO.puts("MSP get_field_type_and_operator ---------------------------------")
     schema = resource[:schema]
diff --git a/lib/kaffy_web/templates/layout/app.html.eex b/lib/kaffy_web/templates/layout/app.html.eex
index 1aa5308c..fa5e59eb 100644
--- a/lib/kaffy_web/templates/layout/app.html.eex
+++ b/lib/kaffy_web/templates/layout/app.html.eex
@@ -163,6 +163,7 @@
     <script src="/kaffy/assets/js/select-all-checkbox.js?v=20"></script>
     <script src="/kaffy/assets/js/phoenix_html.js"></script>
     <script src="/kaffy/assets/js/dashboard.js?v=20"></script>
+    <script src="/kaffy/assets/js/map.js"></script>
     <%= for js <- Kaffy.Utils.extensions(@conn).javascripts do %>
       <%= js %>
     <% end %>
diff --git a/lib/kaffy_web/templates/resource/_table.html.eex b/lib/kaffy_web/templates/resource/_table.html.eex
index 2abcc2f8..ea4d5e89 100644
--- a/lib/kaffy_web/templates/resource/_table.html.eex
+++ b/lib/kaffy_web/templates/resource/_table.html.eex
@@ -1,4 +1,4 @@
-<table class="table table-striped">
+<table class="table table-striped mt-4">
     <thead>
         <%= render KaffyWeb.ResourceView, "_table_header.html", my_resource: @my_resource, fields: @fields, params: @params %>
     </thead>
diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex
index d7b88293..6b0b14d3 100644
--- a/lib/kaffy_web/templates/resource/index.html.eex
+++ b/lib/kaffy_web/templates/resource/index.html.eex
@@ -52,11 +52,41 @@
         </div>
       </div>
 
+      <%= if @my_resource[:schema] == InformedOpinions.Accounts.User do %>
+        <div class="row align-items-center">
+          <div class="col-9">
+            <div class="row">
+              <div class="col-3">
+                <button type="button" class="btn btn-secondary form-control" data-bs-toggle="modal" data-bs-target="#modalMap">
+                    Open Map
+                </button>
+              </div>
+              <label class="col-form-label">M1:</label>
+              <div class="col">
+                <input class="form-control-plaintext" data-field-name="map_marker_1_lat" value="<%= Map.get(@params, "map_marker_1_lat", "") %>" data-input="" type="text" readonly />
+              </div>
+              <div class="col">
+                <input class="form-control-plaintext" data-field-name="map_marker_1_lon" value="<%= Map.get(@params, "map_marker_1_lon", "") %>" data-input="" type="text" readonly />
+              </div>
+              <label class="col-form-label">M2:</label>
+              <div class="col">
+                <input class="form-control-plaintext" data-field-name="map_marker_2_lat" value="<%= Map.get(@params, "map_marker_2_lat", "") %>" data-input="" type="text" readonly />
+              </div>
+              <div class="col">
+                <input class="form-control-plaintext" data-field-name="map_marker_2_lon" value="<%= Map.get(@params, "map_marker_2_lon", "") %>" data-input="" type="text" readonly />
+              </div>
+            </div>
+          </div>
+          <div class="col">
+          </div>
+        </div>
+      <% end %>
+
       <%= render KaffyWeb.ResourceView, "_table.html", conn: @conn, fields: @fields, context: @context, resource: @resource, my_resource: @my_resource, entries: @entries, params: @params %>
     </div>
 
     <div class="index-pagination">
-    <% params = Map.to_list(@params) |> Enum.map(fn {k, v} -> {String.to_existing_atom(k), v} end) %>
+    <% params = Map.to_list(@params) |> Enum.map(fn {k, v} -> {String.to_atom(k), v} end) %>
       <nav aria-label="index-list-navigation">
         <ul class="pagination">
           <li class="page-item <%= @prev_class %>">
@@ -86,6 +116,10 @@
     <% end %>
   <% end %>
   <% [{order_way, order_field}] = Kaffy.ResourceQuery.get_ordering(@my_resource, @params) %>
+  <input id="custom-filter-map_marker_1_lat" type="hidden" name="map_marker_1_lat" value="<%= Map.get(@params, "map_marker_1_lat", "") %>" />
+  <input id="custom-filter-map_marker_1_lon" type="hidden" name="map_marker_1_lon" value="<%= Map.get(@params, "map_marker_1_lon", "") %>" />
+  <input id="custom-filter-map_marker_2_lat" type="hidden" name="map_marker_2_lat" value="<%= Map.get(@params, "map_marker_2_lat", "") %>" />
+  <input id="custom-filter-map_marker_2_lon" type="hidden" name="map_marker_2_lon" value="<%= Map.get(@params, "map_marker_2_lon", "") %>" />
   <input id="kaffy-filter-search" type="hidden" name="search" value="<%= Map.get(@params, "search", "") %>" />
   <input id="kaffy-filter-page" type="hidden" name="page" value="<%= Map.get(@params, "page", "1") %>" />
   <input id="kaffy-filter-limit" type="hidden" name="limit" value="<%= Map.get(@params, "limit", "100") %>" />
@@ -126,3 +160,26 @@
     <% end %>
   </form>
 <% end %>
+
+
+<div class="modal fade" id="modalMap" tabindex="-1" role="dialog" aria-labelledby="modalMapTitle" aria-hidden="true">
+  <div class="modal-dialog modal-fullscreen">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title h4" id="modalMapLabel">Map Search</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <div id="map_choose">
+            <h1>Drag the markers to move the rectangle.</h1>
+            <p>Marker 1 lat::lon <span id="top-corner"></span></p>
+            <p>Marker 2 lat::lon <span id="bot-corner"></span></p>
+            <div id="map" style="width:1700px;height:670px;"></div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/priv/static/assets/css/kaffy.css b/priv/static/assets/css/kaffy.css
index 825e06ed..552c01d5 100644
--- a/priv/static/assets/css/kaffy.css
+++ b/priv/static/assets/css/kaffy.css
@@ -226,4 +226,11 @@ a.kaffy-order-field {
     color: #9c9c9c;
     font-size: .75rem;
     font-style: italic;
+}
+
+.modal-fullscreen {
+    width: 100vw;
+    max-width: none;
+    height: 100%;
+    margin: 0;
 }
\ No newline at end of file
diff --git a/priv/static/assets/js/map.js b/priv/static/assets/js/map.js
new file mode 100644
index 00000000..a009bf11
--- /dev/null
+++ b/priv/static/assets/js/map.js
@@ -0,0 +1,111 @@
+$(document).ready(function() {
+  const Map = {
+    loaded: false
+    , startLat: 51.5358025
+    , startLng: 0.0198837000000367
+    , init: function() {
+      if (!Map.loaded) {
+        mapKey = $("meta[name='gmap-api-key']").attr('content');
+
+        if (mapKey) {
+          var script = document.createElement('script');
+          script.src = `https://maps.googleapis.com/maps/api/js?key=${mapKey}&callback=mapLoadedCallback`;
+          script.async = true;
+
+          document.head.appendChild(script);
+        } else {
+          alert("Please set a meta tag in your markup containing your Google Maps API key: meta[name='gmap-api-key']")
+        }
+      }
+    }
+    , loadedCallback: function() {
+      console.log('Map.loadedCallback !!! ----------------------------------------------');
+      Map.loaded = true;
+
+      let map;
+      let marker1;
+      let marker2;
+
+      let topLat = $('*[data-field-name="map_marker_1_lat"]').val() || Map.startLat + 0.2;
+      let topLon = $('*[data-field-name="map_marker_1_lon"]').val() || Map.startLng;
+      let btmLat = $('*[data-field-name="map_marker_2_lat"]').val() || Map.startLat;
+      let btmLon = $('*[data-field-name="map_marker_2_lon"]').val() || Map.startLng + 0.3;
+
+      map = new google.maps.Map(document.getElementById("map"), {
+        center: { lat: Map.startLat, lng: Map.startLng },
+        zoom: 8,
+      });
+
+      // Plot two markers to represent the Rectangle's bounds.
+      marker1 = new google.maps.Marker({
+        map: map,
+        position: new google.maps.LatLng(topLat, topLon),
+        draggable: true,
+        title: 'Drag me! MK1'
+      });
+      marker2 = new google.maps.Marker({
+        map: map,
+        position: new google.maps.LatLng(btmLat, btmLon),
+        draggable: true,
+        title: 'Drag me! MK2'
+      });
+
+      // Allow user to drag each marker to resize the size of the Rectangle.
+      google.maps.event.addListener(marker1, 'drag',
+        function() {
+          Map.redraw(marker1, marker2)
+        });
+      google.maps.event.addListener(marker2, 'drag',
+        function() {
+          Map.redraw(marker1, marker2)
+        });
+
+      // Create a new Rectangle overlay and place it on the map.  Size
+      // will be determined by the LatLngBounds based on the two Marker
+      // positions.
+      rectangle = new google.maps.Rectangle({
+        map: map
+      });
+
+      Map.redraw(marker1, marker2);
+    }
+    , redraw: function(marker1, marker2) {
+      var latLngBounds = new google.maps.LatLngBounds(
+        marker1.getPosition(),
+        marker2.getPosition()
+      );
+
+      rectangle.setBounds(latLngBounds);
+
+      $('#top-corner').html(marker1.getPosition().lat() + "::" + marker1.getPosition().lng());
+      $('#bot-corner').html(marker2.getPosition().lat() + "::" + marker2.getPosition().lng());
+
+      Map.populateBounds(marker1, marker2);
+    }
+    , populateBounds: function(marker1, marker2) {
+      $('*[data-field-name="map_marker_1_lat"]').val(marker1.getPosition().lat());
+      $('*[data-field-name="map_marker_1_lon"]').val(marker1.getPosition().lng());
+      $('*[data-field-name="map_marker_2_lat"]').val(marker2.getPosition().lat());
+      $('*[data-field-name="map_marker_2_lon"]').val(marker2.getPosition().lng());
+
+      var filterForm = $("#kaffy-filters-form");
+      filterForm.children("input#custom-filter-map_marker_1_lat").val(marker1.getPosition().lat());
+      filterForm.children("input#custom-filter-map_marker_1_lon").val(marker1.getPosition().lng());
+      filterForm.children("input#custom-filter-map_marker_2_lat").val(marker2.getPosition().lat());
+      filterForm.children("input#custom-filter-map_marker_2_lon").val(marker2.getPosition().lng());
+      // filterForm.submit();
+    }
+  }
+
+  var modalMap = document.getElementById('modalMap');
+  if (modalMap) {
+    modalMap.addEventListener('show.bs.modal', function(event) {
+      console.log('show.bs.modal ----------------------------------------------');
+
+      Map.init();
+
+      // Attach your callback function to the `window` object
+      window.mapLoadedCallback = function() { Map.loadedCallback(); };
+    });
+  }
+});

From 3e3fe08c71e768b7cc1f8fbc51f3b24d4ecfd25b Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Fri, 25 Feb 2022 19:37:00 +0000
Subject: [PATCH 6/8] Age range

---
 lib/kaffy/resource_query.ex                   |  77 ++++++++++---
 .../templates/resource/index.html.eex         | 106 +++++++++++++-----
 priv/static/assets/js/misc.js                 |  22 +++-
 3 files changed, 156 insertions(+), 49 deletions(-)

diff --git a/lib/kaffy/resource_query.ex b/lib/kaffy/resource_query.ex
index 38c871ab..d13ef572 100644
--- a/lib/kaffy/resource_query.ex
+++ b/lib/kaffy/resource_query.ex
@@ -109,7 +109,9 @@ defmodule Kaffy.ResourceQuery do
       "map_marker_1_lat",
       "map_marker_1_lon",
       "map_marker_2_lat",
-      "map_marker_2_lon"
+      "map_marker_2_lon",
+      "user_min_age",
+      "user_max_age"
     ]
 
     filtered_fields = Enum.filter(params, fn {k, v} -> k in schema_fields and v != "" end)
@@ -220,20 +222,67 @@ defmodule Kaffy.ResourceQuery do
     build_filtered_fields_query(resource, query, rest)
   end
 
-  defp build_hardcoded_filtered_fields_query(resource, query, filters) do
+  defp build_hardcoded_filtered_fields_query(_resource, query, filters) do
+    IO.puts("MSP build_hardcoded_filtered_fields_query ---------------------------------")
+    IO.puts("query: #{inspect(query)}, filters: #{inspect(filters)}")
+
     if Enum.count(filters) > 0 do
-      map_marker_1_lat = Map.get(filters, "map_marker_1_lat")
-      map_marker_1_lon = Map.get(filters, "map_marker_1_lon")
-      map_marker_2_lat = Map.get(filters, "map_marker_2_lat")
-      map_marker_2_lon = Map.get(filters, "map_marker_2_lon")
-
-      from(
-        s in query,
-        where: field(s, :home_lat) >= ^map_marker_2_lat,
-        where: field(s, :home_lat) <= ^map_marker_1_lat,
-        where: field(s, :home_long) >= ^map_marker_1_lon,
-        where: field(s, :home_long) <= ^map_marker_2_lon
-      )
+      query =
+        if Map.has_key?(filters, "map_marker_1_lat") &&
+             Map.has_key?(filters, "map_marker_1_lon") &&
+             Map.has_key?(filters, "map_marker_2_lat") &&
+             Map.has_key?(filters, "map_marker_2_lon") do
+          map_marker_1_lat = Map.get(filters, "map_marker_1_lat")
+          map_marker_1_lon = Map.get(filters, "map_marker_1_lon")
+          map_marker_2_lat = Map.get(filters, "map_marker_2_lat")
+          map_marker_2_lon = Map.get(filters, "map_marker_2_lon")
+
+          from(
+            s in query,
+            where: field(s, :home_lat) >= ^map_marker_2_lat,
+            where: field(s, :home_lat) <= ^map_marker_1_lat,
+            where: field(s, :home_long) >= ^map_marker_1_lon,
+            where: field(s, :home_long) <= ^map_marker_2_lon
+          )
+        else
+          query
+        end
+
+      query =
+        if Map.has_key?(filters, "user_min_age") &&
+             Map.has_key?(filters, "user_max_age") do
+          user_min_age = Map.get(filters, "user_min_age", 0)
+          user_max_age = Map.get(filters, "user_max_age", 200)
+
+          today = DateTime.utc_now()
+          one_year_in_seconds = 365 * 24 * 60 * 60
+
+          min_age =
+            DateTime.add(
+              today,
+              String.to_integer(user_min_age) *
+                one_year_in_seconds * -1,
+              :second
+            )
+
+          max_age =
+            DateTime.add(
+              today,
+              String.to_integer(user_max_age) *
+                one_year_in_seconds * -1,
+              :second
+            )
+
+          from(
+            s in query,
+            where: field(s, :dob) <= ^min_age,
+            where: field(s, :dob) >= ^max_age
+          )
+        else
+          query
+        end
+
+      query
     else
       query
     end
diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex
index 6b0b14d3..cdb51be3 100644
--- a/lib/kaffy_web/templates/resource/index.html.eex
+++ b/lib/kaffy_web/templates/resource/index.html.eex
@@ -20,7 +20,79 @@
 
     <div class="card-body table-responsive w-100">
       <div class="card-description">
-        <div class="row">
+
+
+        <%= if @my_resource[:schema] == InformedOpinions.Accounts.User do %>
+          <div class="row align-items-center">
+            <div class="col-12">
+              <h3 class="mb-4">Custom filters </h3>
+              <p class="mt-2">Step 1: locate your users
+            </div>
+            <div class="col-9">
+              <div class="row">
+                <div class="col-3">
+                  <button type="button" class="btn btn-secondary form-control" data-bs-toggle="modal" data-bs-target="#modalMap">
+                      Open Map
+                  </button>
+                </div>
+                <label class="col-form-label">M1:</label>
+                <div class="col">
+                  <input class="form-control-plaintext" data-field-name="map_marker_1_lat" value="<%= Map.get(@params, "map_marker_1_lat", "") %>" data-input="" type="text" readonly />
+                </div>
+                <div class="col">
+                  <input class="form-control-plaintext" data-field-name="map_marker_1_lon" value="<%= Map.get(@params, "map_marker_1_lon", "") %>" data-input="" type="text" readonly />
+                </div>
+                <label class="col-form-label">M2:</label>
+                <div class="col">
+                  <input class="form-control-plaintext" data-field-name="map_marker_2_lat" value="<%= Map.get(@params, "map_marker_2_lat", "") %>" data-input="" type="text" readonly />
+                </div>
+                <div class="col">
+                  <input class="form-control-plaintext" data-field-name="map_marker_2_lon" value="<%= Map.get(@params, "map_marker_2_lon", "") %>" data-input="" type="text" readonly />
+                </div>
+              </div>
+            </div>
+            <div class="col">
+            </div>
+          </div>
+
+          <div class="row align-items-center mt-4">
+            <div class="col-12">
+              <p class="mt-5">Step 2: filter by age
+            </div>
+
+            <div class="col-9">
+              <div class="row">
+                <div class="col-3">
+                </div>
+                <label class="col-form-label">Min Age</label>
+                <div class="col">
+                  <input id="user_min_age" class="form-control" data-field-name="user_min_age" value="<%= Map.get(@params, "user_min_age", "") %>" data-input="" type="number" />
+                </div>
+                <label class="col-form-label">Max Age</label>
+                <div class="col">
+                  <input id="user_max_age" class="form-control" data-field-name="user_max_age" value="<%= Map.get(@params, "user_max_age", "") %>" data-input="" type="number" />
+                </div>
+              </div>
+            </div>
+            <div class="col-12">
+              <p class="mt-5">Step 3: submit to execute the custom filters then continue with Kaffy filters below!
+            </div>
+
+            <div class="col-3">
+              <button id="hardcodedFiltersSubmit" type="button" class="btn btn-primary form-control" >
+                  Submit!
+              </button>
+            </div>
+          </div>
+        <% end %>
+
+        <div class="row mt-5">
+          <div class="col-12">
+            <h3 >Kaffy filters</h3>
+          </div>
+        </div>
+
+        <div class="row mt-2">
 
           <div class="col-auto mr-auto">
             <input id="kaffy-search-field" type="text" name="search" value="<%= Map.get(@params, "search", "") %>" class="form-control bg-transparent" placeholder="Search <%= Kaffy.ResourceAdmin.plural_name(@my_resource) %>...">
@@ -52,36 +124,6 @@
         </div>
       </div>
 
-      <%= if @my_resource[:schema] == InformedOpinions.Accounts.User do %>
-        <div class="row align-items-center">
-          <div class="col-9">
-            <div class="row">
-              <div class="col-3">
-                <button type="button" class="btn btn-secondary form-control" data-bs-toggle="modal" data-bs-target="#modalMap">
-                    Open Map
-                </button>
-              </div>
-              <label class="col-form-label">M1:</label>
-              <div class="col">
-                <input class="form-control-plaintext" data-field-name="map_marker_1_lat" value="<%= Map.get(@params, "map_marker_1_lat", "") %>" data-input="" type="text" readonly />
-              </div>
-              <div class="col">
-                <input class="form-control-plaintext" data-field-name="map_marker_1_lon" value="<%= Map.get(@params, "map_marker_1_lon", "") %>" data-input="" type="text" readonly />
-              </div>
-              <label class="col-form-label">M2:</label>
-              <div class="col">
-                <input class="form-control-plaintext" data-field-name="map_marker_2_lat" value="<%= Map.get(@params, "map_marker_2_lat", "") %>" data-input="" type="text" readonly />
-              </div>
-              <div class="col">
-                <input class="form-control-plaintext" data-field-name="map_marker_2_lon" value="<%= Map.get(@params, "map_marker_2_lon", "") %>" data-input="" type="text" readonly />
-              </div>
-            </div>
-          </div>
-          <div class="col">
-          </div>
-        </div>
-      <% end %>
-
       <%= render KaffyWeb.ResourceView, "_table.html", conn: @conn, fields: @fields, context: @context, resource: @resource, my_resource: @my_resource, entries: @entries, params: @params %>
     </div>
 
@@ -120,6 +162,8 @@
   <input id="custom-filter-map_marker_1_lon" type="hidden" name="map_marker_1_lon" value="<%= Map.get(@params, "map_marker_1_lon", "") %>" />
   <input id="custom-filter-map_marker_2_lat" type="hidden" name="map_marker_2_lat" value="<%= Map.get(@params, "map_marker_2_lat", "") %>" />
   <input id="custom-filter-map_marker_2_lon" type="hidden" name="map_marker_2_lon" value="<%= Map.get(@params, "map_marker_2_lon", "") %>" />
+  <input id="custom-filter-user_min_age" type="hidden" name="user_min_age" value="<%= Map.get(@params, "user_min_age", "") %>" />
+  <input id="custom-filter-user_max_age" type="hidden" name="user_max_age" value="<%= Map.get(@params, "user_max_age", "") %>" />
   <input id="kaffy-filter-search" type="hidden" name="search" value="<%= Map.get(@params, "search", "") %>" />
   <input id="kaffy-filter-page" type="hidden" name="page" value="<%= Map.get(@params, "page", "1") %>" />
   <input id="kaffy-filter-limit" type="hidden" name="limit" value="<%= Map.get(@params, "limit", "100") %>" />
diff --git a/priv/static/assets/js/misc.js b/priv/static/assets/js/misc.js
index 7acdcf3b..b254ed0b 100644
--- a/priv/static/assets/js/misc.js
+++ b/priv/static/assets/js/misc.js
@@ -8,9 +8,9 @@ var infoColor = getComputedStyle(document.body).getPropertyValue('--info');
 var darkColor = getComputedStyle(document.body).getPropertyValue('--dark');
 var lightColor = getComputedStyle(document.body).getPropertyValue('--light');
 
-(function ($) {
+(function($) {
   'use strict';
-  $(function () {
+  $(function() {
     var body = $('body');
     var contentWrapper = $('.content-wrapper');
     var scroller = $('.container-scroller');
@@ -19,7 +19,7 @@ var lightColor = getComputedStyle(document.body).getPropertyValue('--light');
 
     //Close other submenu in sidebar on opening any
 
-    sidebar.on('show.bs.collapse', '.collapse', function () {
+    sidebar.on('show.bs.collapse', '.collapse', function() {
       sidebar.find('.collapse.show').collapse('hide');
     });
 
@@ -35,7 +35,7 @@ var lightColor = getComputedStyle(document.body).getPropertyValue('--light');
       }
     }
 
-    $('[data-toggle="minimize"]').on("click", function () {
+    $('[data-toggle="minimize"]').on("click", function() {
       if ((body.hasClass('sidebar-toggle-display')) || (body.hasClass('sidebar-absolute'))) {
         body.toggleClass('sidebar-hidden');
       } else {
@@ -100,6 +100,20 @@ var lightColor = getComputedStyle(document.body).getPropertyValue('--light');
       enableTime: true,
       dateFormat: "Z"
     });
+
+    $("#user_min_age").change(function() {
+      var filterForm = $("#kaffy-filters-form");
+      filterForm.children("input#custom-filter-user_min_age").val($(this).val());
+    });
+
+    $("#user_max_age").change(function() {
+      var filterForm = $("#kaffy-filters-form");
+      filterForm.children("input#custom-filter-user_max_age").val($(this).val());
+    });
+
+    $('#hardcodedFiltersSubmit').on("click", function() {
+      $("#kaffy-filters-form").submit();
+    });
   });
 
 

From 992520973fb29a607e56b8fc909a6fec30564978 Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Wed, 3 Jul 2024 16:35:42 +0100
Subject: [PATCH 7/8] Make the record limit visible

---
 lib/kaffy_web/templates/resource/index.html.eex | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex
index cdb51be3..6ea38184 100644
--- a/lib/kaffy_web/templates/resource/index.html.eex
+++ b/lib/kaffy_web/templates/resource/index.html.eex
@@ -148,7 +148,7 @@
   </div>
 </div>
 
-<form id="kaffy-filters-form" method="get" style="display:none;">
+<form id="kaffy-filters-form" method="get" style="">
   <%= if Kaffy.ResourceSchema.has_field_filters?(@my_resource) do %>
     <%= for field <- @fields do %>
         <% {field, _type, _op, _multiple, filters} = Kaffy.ResourceSchema.kaffy_field_filters(@my_resource[:schema], field) %>
@@ -166,7 +166,14 @@
   <input id="custom-filter-user_max_age" type="hidden" name="user_max_age" value="<%= Map.get(@params, "user_max_age", "") %>" />
   <input id="kaffy-filter-search" type="hidden" name="search" value="<%= Map.get(@params, "search", "") %>" />
   <input id="kaffy-filter-page" type="hidden" name="page" value="<%= Map.get(@params, "page", "1") %>" />
-  <input id="kaffy-filter-limit" type="hidden" name="limit" value="<%= Map.get(@params, "limit", "100") %>" />
+
+
+  <label class="col-form-label">Records Per Page</label>
+  <div class="row">
+    <div class="col-1">
+      <input id="kaffy-filter-limit" class="form-control" type="number" name="limit" value="<%= Map.get(@params, "limit", "100") %>" />
+    </div>
+  </div>
   <input id="kaffy-order-field" type="hidden" name="<%= to_string(:_of) %>" value="<%= Map.get(@params, "_of", order_field) %>" />
   <input id="kaffy-order-way" type="hidden" name="<%= to_string(:_ow) %>" value="<%= Map.get(@params, "_ow", order_way) %>" />
 </form>

From 7061af58fa822cef701b8eb6a7b28813452e7e72 Mon Sep 17 00:00:00 2001
From: msp <matt@cenatus.org>
Date: Wed, 3 Jul 2024 16:36:50 +0100
Subject: [PATCH 8/8] Custom redirect after user action

---
 lib/kaffy_web/controllers/resource_controller.ex | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/kaffy_web/controllers/resource_controller.ex b/lib/kaffy_web/controllers/resource_controller.ex
index 2d84c5f3..bf0de071 100644
--- a/lib/kaffy_web/controllers/resource_controller.ex
+++ b/lib/kaffy_web/controllers/resource_controller.ex
@@ -360,6 +360,10 @@ defmodule KaffyWeb.ResourceController do
         put_flash(conn, :success, "Action performed successfully")
         |> redirect(to: Kaffy.Utils.router().kaffy_resource_path(conn, :index, context, resource))
 
+      {:ok, redirect_url} ->
+        put_flash(conn, :success, "Action performed successfully, redirecting back")
+        |> redirect(external: redirect_url)
+
       {:error, error_msg} ->
         put_flash(conn, :error, error_msg)
         |> redirect(to: Kaffy.Utils.router().kaffy_resource_path(conn, :index, context, resource))