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/lib/kaffy/resource_query.ex b/lib/kaffy/resource_query.ex index 4f13b924..d13ef572 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 @@ -16,9 +17,10 @@ defmodule Kaffy.ResourceQuery do {all, paged} = build_query( - schema, + resource, search_fields, filtered_fields, + hardcoded_filtered_fields, search, per_page, ordering, @@ -102,16 +104,31 @@ 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", + "user_min_age", + "user_max_age" + ] + + filtered_fields = Enum.filter(params, fn {k, v} -> k in schema_fields and v != "" end) + Enum.into(filtered_fields, %{}) + end + defp build_query( - schema, + resource, search_fields, filtered_fields, + hardcoded_filtered_fields, search, per_page, ordering, current_offset ) do - query = from(s in schema) + query = from(s in resource[:schema]) query = cond do @@ -141,7 +158,9 @@ defmodule Kaffy.ResourceQuery do end) end - query = build_filtered_fields_query(query, filtered_fields) + 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) @@ -149,19 +168,139 @@ 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(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)}" + ) - defp build_filtered_fields_query(query, [filter | rest]) do query = case filter.value == "" do true -> query false -> - field_name = String.to_existing_atom(filter.name) - from(s in query, where: field(s, ^field_name) == ^filter.value) + field_name = String.to_atom(filter.name) + + {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 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 + 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 + 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 28669cf6..cb76d404 100644 --- a/lib/kaffy/resource_schema.ex +++ b/lib/kaffy/resource_schema.ex @@ -130,13 +130,22 @@ 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 || %{}, :filters, false)} + { + field, + Map.get(options || %{}, :filter_type, :select), + Map.get(options || %{}, :filter_operator, :equals), + Map.get(options || %{}, :filter_multiple, false), + Map.get(options || %{}, :filters, false) + } end def kaffy_field_filters(_, _), do: false 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)) 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 @@ + <%= for js <- Kaffy.Utils.extensions(@conn).javascripts do %> <%= js %> <% end %> diff --git a/lib/kaffy_web/templates/resource/_list_table.html.eex b/lib/kaffy_web/templates/resource/_list_table.html.eex index ce4aca4e..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 %> <%= for {field, index} <- Enum.with_index(@fields) do %> - <% {field, 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 %> - - <%= for {human, machine} <- filters do %> - - <% end %> - + <%= if type == :select do %> + + <% end %> + + <%= if type == :date do %> +
+
+
❌
+
+
+
🗓️
+
+
+ <% end %> <% else %> diff --git a/lib/kaffy_web/templates/resource/index.html.eex b/lib/kaffy_web/templates/resource/index.html.eex index 1f11cbcf..6ea38184 100644 --- a/lib/kaffy_web/templates/resource/index.html.eex +++ b/lib/kaffy_web/templates/resource/index.html.eex @@ -20,7 +20,79 @@
-
+ + + <%= if @my_resource[:schema] == InformedOpinions.Accounts.User do %> +
+
+

Custom filters

+

Step 1: locate your users +

+
+
+
+ +
+ +
+ " data-input="" type="text" readonly /> +
+
+ " data-input="" type="text" readonly /> +
+ +
+ " data-input="" type="text" readonly /> +
+
+ " data-input="" type="text" readonly /> +
+
+
+
+
+
+ +
+
+

Step 2: filter by age +

+ +
+
+
+
+ +
+ " data-input="" type="number" /> +
+ +
+ " data-input="" type="number" /> +
+
+
+
+

Step 3: submit to execute the custom filters then continue with Kaffy filters below! +

+ +
+ +
+
+ <% end %> + +
+
+

Kaffy filters

+
+
+ +
" class="form-control bg-transparent" placeholder="Search <%= Kaffy.ResourceAdmin.plural_name(@my_resource) %>..."> @@ -56,7 +128,7 @@
- <% 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) %>
- @@ -126,3 +211,26 @@ <% end %> <% 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 @@