From b9de9b892fc47b35c482ca88a8553ffb58373651 Mon Sep 17 00:00:00 2001 From: Annabell UENF Date: Tue, 30 Jan 2024 14:50:35 -0300 Subject: [PATCH 1/2] atualizando a landing - em construcao --- config/dev.exs | 2 +- lib/pescarte_web/design_system.ex | 13 +- .../design_system/authenticated_navbar.ex | 4 +- .../live/pesquisa/relatorio_live/index.ex | 36 +++-- .../templates/error_html/404.html.heex | 2 +- .../templates/landing_html/show.html.heex | 138 ++++++++++-------- mix.exs | 1 + 7 files changed, 112 insertions(+), 84 deletions(-) diff --git a/config/dev.exs b/config/dev.exs index 6e622a3b..078a68ec 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -26,7 +26,7 @@ config :pescarte, PescarteWeb.Endpoint, http: [ip: {0, 0, 0, 0}, port: 4000], check_origin: false, code_reloader: true, - debug_errors: true, + debug_errors: false, reloadable_compilers: [:elixir], watchers: [ esbuild: {Esbuild, :install_and_run, [:default, ~w(--sourcemap=inline --watch)]}, diff --git a/lib/pescarte_web/design_system.ex b/lib/pescarte_web/design_system.ex index f203aff4..9844964d 100644 --- a/lib/pescarte_web/design_system.ex +++ b/lib/pescarte_web/design_system.ex @@ -10,6 +10,7 @@ defmodule PescarteWeb.DesignSystem do import Phoenix.HTML.Tag, only: [content_tag: 3] + alias PescarteWeb.DesignSystem alias PescarteWeb.DesignSystem.SearchInput @text_sizes ~w(h1 h2 h3 h4 h5 base lg md sm giant) @@ -423,15 +424,21 @@ defmodule PescarteWeb.DesignSystem do diff --git a/lib/pescarte_web/design_system/authenticated_navbar.ex b/lib/pescarte_web/design_system/authenticated_navbar.ex index ee6e26d0..3c74193e 100644 --- a/lib/pescarte_web/design_system/authenticated_navbar.ex +++ b/lib/pescarte_web/design_system/authenticated_navbar.ex @@ -44,13 +44,13 @@ defmodule PescarteWeb.DesignSystem.AuthenticatedNavbar do
  • - + <.text :if={@open} size="base" color="text-black-60">Agenda
  • - + <.text :if={@open} size="base" color="text-black-60">Mensagens diff --git a/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex b/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex index bd0444cf..466f97f5 100644 --- a/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex +++ b/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex @@ -18,33 +18,31 @@ defmodule PescarteWeb.Pesquisa.RelatorioLive.Index do end @impl true - def handle_event("report-type", %{"type" => type}, socket) do + def handle_event("mensal_report", _, socket) do pesquisador_id = socket.assigns.current_researcher.id_publico - {:noreply, - socket - |> assign(:type, type) - |> assign(:pesquisador_id, pesquisador_id) - |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} - end - - # ================= Vamos trabalhar o dropdown do "Preencher Relatório" 09-14/10/2023 - @impl true - def handle_event("mensal_report", _, socket) do - {:noreply, redirect(socket, to: ~p"/app/pesquisa/pesquisadores")} - # ~p"/app/pesquisa/relatorios" + socket + |> assign(:type, "mensal") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end def handle_event("trimestral_report", _, socket) do - {:noreply, redirect(socket, to: ~p"/app/pesquisa/pesquisadores")} - end - - def handle_event("bienal_report", _, socket) do - {:noreply, redirect(socket, to: ~p"/app/pesquisa/pesquisadores")} + pesquisador_id = socket.assigns.current_researcher.id_publico + {:noreply, + socket + |> assign(:type, "trimestral") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end def handle_event("anual_report", _, socket) do - {:noreply, redirect(socket, to: ~p"/app/pesquisa/pesquisadores")} + pesquisador_id = socket.assigns.current_researcher.id_publico + {:noreply, + socket + |> assign(:type, "anual") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end defp apply_action(socket, :edit, %{"id" => id}) do diff --git a/lib/pescarte_web/templates/error_html/404.html.heex b/lib/pescarte_web/templates/error_html/404.html.heex index b50be5a2..534757e4 100644 --- a/lib/pescarte_web/templates/error_html/404.html.heex +++ b/lib/pescarte_web/templates/error_html/404.html.heex @@ -36,7 +36,7 @@
    <.text size="giant" color="text-blue-100" class="uppercase">oops! - <.text size="h2" color="text-blue-100">Página não
    encontrada + <.text size="h2" color="text-blue-100">Página em
    construção     erro404
    diff --git a/lib/pescarte_web/templates/landing_html/show.html.heex b/lib/pescarte_web/templates/landing_html/show.html.heex index 0b587470..4b17d706 100644 --- a/lib/pescarte_web/templates/landing_html/show.html.heex +++ b/lib/pescarte_web/templates/landing_html/show.html.heex @@ -3,45 +3,53 @@
    - + <.text size="h3" color="text-white-100">Fotos + <.text size="base" color="text-white-100"> + Mídias do Projeto + + <.button style="primary"> + Saiba mais + - <.text size="base" color="text-white-100"> - Mídias do Projeto - - <.button style="primary"> - Saiba mais -
    - <.text size="h3" color="text-white-100">Relatórios Públicos - <.text size="base" color="text-white-100"> - Relatórios... - - <.button style="primary"> - Saiba mais - + + <.text size="h3" color="text-white-100">Relatórios Públicos + <.text size="base" color="text-white-100"> + Relatórios... + + <.button style="primary"> + Saiba mais + +
    - <.text size="h3" color="text-white-100">Livros - <.text size="base" color="text-white-100"> - Livros... - - <.button style="primary"> - Saiba mais - + + <.text size="h3" color="text-white-100">Livros/Boletins + <.text size="base" color="text-white-100"> + Livros...em construção + + + + <.button style="primary"> + Saiba mais (Boletins) + +
    - <.text size="h3" color="text-white-100">Projetos para Editais - <.text size="base" color="text-white-100"> - Projetos... - - <.button style="primary"> - Saiba mais - + + <.text size="h3" color="text-white-100">Projetos para Editais + <.text size="base" color="text-white-100"> + Projetos... + + <.button style="primary"> + Saiba mais + +
    @@ -54,13 +62,15 @@
    - <.text size="h3" color="text-white-100">Aplicativo CENSO - <.text size="base" color="text-white-100"> - e-Quest 2.0... - - <.button style="primary"> - Saiba mais - + + <.text size="h3" color="text-white-100">Aplicativo CENSO + <.text size="base" color="text-white-100"> + e-Quest 2.0... + + <.button style="primary"> + Saiba mais + +
    @@ -87,9 +97,11 @@ participativa e na implementação de projetos de geração de trabalho e renda. - <.button style="primary" click="hello"> - <.text size="base" color="text-white-100">Ver mais - + + <.button style="primary" click="hello"> + <.text size="base" color="text-white-100">Ver mais + +
    @@ -103,15 +115,19 @@
    <.text size="h4" color="text-blue-100"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Doação do terreno em Cabo Frio. <.text size="sm" color="text-black-60"> - Proin nec ligula ultricies, finibus mi ac, pretium lectus. Nunc venenatis egestas finibus. + e a mudança do marco regulatório do defeso do camarão na Laguna de Araruama.. - <.button style="primary"> - <.text size="base" color="text-white-100">Ler mais - + + <.button style="primary"> + + <.text size="base" color="text-white-100">Ler mais + + +
    @@ -121,15 +137,17 @@
    <.text size="h4" color="text-blue-100"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Diário de Bordo: falas de pessoas pescadoras que falam sobre a importância do PEA Pescarte <.text size="sm" color="text-black-60"> Proin nec ligula ultricies, finibus mi ac, pretium lectus. Nunc venenatis egestas finibus. - <.button style="primary"> - <.text size="base" color="text-white-100">Ler mais - + + <.button style="primary"> + <.text size="base" color="text-white-100">Ler mais + +
    @@ -139,15 +157,17 @@
    <.text size="h4" color="text-blue-100"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. + O Censo Pescarte continua nas ruas, <.text size="sm" color="text-black-60"> - Proin nec ligula ultricies, finibus mi ac, pretium lectus. Nunc venenatis egestas finibus. + buscando encontrar e ouvir as pessoas pescadoras de nossa área de atuação. - <.button style="primary"> - <.text size="base" color="text-white-100">Ler mais - + + <.button style="primary"> + <.text size="base" color="text-white-100">Ler mais + +
    @@ -155,17 +175,19 @@
    - + <.text size="h4" color="text-blue-100"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Seguro Defeso. <.text size="sm" color="text-black-60"> - Proin nec ligula ultricies, finibus mi ac, pretium lectus. Nunc venenatis egestas finibus. + Pescador, tire suas dúvidas aqui. - <.button style="primary"> - <.text size="base" color="text-white-100">Ler mais - + + <.button style="primary"> + <.text size="base" color="text-white-100">Ler mais + +
    diff --git a/mix.exs b/mix.exs index fd2a20bf..66735225 100644 --- a/mix.exs +++ b/mix.exs @@ -54,6 +54,7 @@ defmodule Pescarte.MixProject do {:floki, ">= 0.30.0"}, {:lucide_icons, "~> 1.0"}, {:phoenix_storybook, "~> 0.5"}, + {:hackney, "~> 1.20"}, {:absinthe, "~> 1.5"}, {:absinthe_plug, "~> 1.5"}, {:absinthe_phoenix, "~> 2.0.0"}, From 823fe3c6866a92776ada50db460a1323185cceda Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Thu, 1 Feb 2024 18:17:16 -0300 Subject: [PATCH 2/2] fix: relatorios --- .gitignore | 3 +- config/dev.exs | 2 +- .../models/relatorio_pesquisa.ex | 4 +-- .../live/pesquisa/relatorio_live/index.ex | 30 +++++++++++-------- .../pesquisa/relatorio_live/index.html.heex | 14 +++++---- .../templates/landing_html/show.html.heex | 7 +++-- mix.exs | 2 +- 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index a462fa7c..bf698444 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,8 @@ erl_crash.dump /.direnv/ /.nix-*/ /.postgres/ -/.elixir-tools/ +.elixir-tools/ +.lexical/ result # Temporary images diff --git a/config/dev.exs b/config/dev.exs index 078a68ec..6e622a3b 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -26,7 +26,7 @@ config :pescarte, PescarteWeb.Endpoint, http: [ip: {0, 0, 0, 0}, port: 4000], check_origin: false, code_reloader: true, - debug_errors: false, + debug_errors: true, reloadable_compilers: [:elixir], watchers: [ esbuild: {Esbuild, :install_and_run, [:default, ~w(--sourcemap=inline --watch)]}, diff --git a/lib/pescarte/modulo_pesquisa/models/relatorio_pesquisa.ex b/lib/pescarte/modulo_pesquisa/models/relatorio_pesquisa.ex index c1867883..6e1fec56 100644 --- a/lib/pescarte/modulo_pesquisa/models/relatorio_pesquisa.ex +++ b/lib/pescarte/modulo_pesquisa/models/relatorio_pesquisa.ex @@ -72,8 +72,8 @@ defmodule Pescarte.ModuloPesquisa.Models.RelatorioPesquisa do limit_date = case report_type do nil -> changeset - :mensal -> Date.from_iso8601!("#{today.year}-#{today.month}-15") - _ -> Date.from_iso8601!("#{today.year}-#{today.month}-10") + :mensal -> Date.new!(today.year, today.month, 15) + _ -> Date.new!(today.year, today.month, 10) end put_change(changeset, :data_limite, limit_date) diff --git a/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex b/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex index 466f97f5..d9cb485b 100644 --- a/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex +++ b/lib/pescarte_web/live/pesquisa/relatorio_live/index.ex @@ -3,6 +3,7 @@ defmodule PescarteWeb.Pesquisa.RelatorioLive.Index do alias Pescarte.ModuloPesquisa.Models.RelatorioPesquisa alias Pescarte.ModuloPesquisa.Repository + alias PescarteWeb.Pesquisa.RelatorioLive.FormComponent @impl true def mount(_params, _session, socket) do @@ -20,29 +21,32 @@ defmodule PescarteWeb.Pesquisa.RelatorioLive.Index do @impl true def handle_event("mensal_report", _, socket) do pesquisador_id = socket.assigns.current_researcher.id_publico + {:noreply, - socket - |> assign(:type, "mensal") - |> assign(:pesquisador_id, pesquisador_id) - |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} + socket + |> assign(:type, "mensal") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end def handle_event("trimestral_report", _, socket) do pesquisador_id = socket.assigns.current_researcher.id_publico + {:noreply, - socket - |> assign(:type, "trimestral") - |> assign(:pesquisador_id, pesquisador_id) - |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} + socket + |> assign(:type, "trimestral") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end def handle_event("anual_report", _, socket) do pesquisador_id = socket.assigns.current_researcher.id_publico + {:noreply, - socket - |> assign(:type, "anual") - |> assign(:pesquisador_id, pesquisador_id) - |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} + socket + |> assign(:type, "anual") + |> assign(:pesquisador_id, pesquisador_id) + |> push_patch(to: ~p"/app/pesquisa/relatorios/new")} end defp apply_action(socket, :edit, %{"id" => id}) do @@ -64,7 +68,7 @@ defmodule PescarteWeb.Pesquisa.RelatorioLive.Index do end @impl true - def handle_info({PescarteWeb.Pesquisa.RelatorioLive.FormComponent, {:saved, relatorio}}, socket) do + def handle_info({FormComponent, {:saved, relatorio}}, socket) do {:noreply, stream_insert(socket, :relatorios, relatorio)} end end diff --git a/lib/pescarte_web/live/pesquisa/relatorio_live/index.html.heex b/lib/pescarte_web/live/pesquisa/relatorio_live/index.html.heex index c1496464..e6c21ea9 100644 --- a/lib/pescarte_web/live/pesquisa/relatorio_live/index.html.heex +++ b/lib/pescarte_web/live/pesquisa/relatorio_live/index.html.heex @@ -27,13 +27,15 @@ <:column :let={_} label=" ">
    <.checkbox name="check" id="usuario" />
    - <:column :let={relatorio} label="Data"><%= relatorio.data %> - <:column :let={relatorio} label="Tipo" class="linhas"><%= relatorio.tipo %> - <:column :let={relatorio} label="Mês/Ano"> - <%= relatorio.mes <> " / " <> relatorio.ano %> + <:column :let={{_, relatorio}} label="Data"> + <%= "#{relatorio.data_inicio} - #{relatorio.data_fim}" %> - <:column :let={relatorio} label="Nome"><%= relatorio.name %> - <:column :let={relatorio} label="Status"><%= relatorio.status %> + <:column :let={{_, relatorio}} label="Tipo" class="linhas"><%= relatorio.tipo %> + <:column :let={{_, relatorio}} label="Mês/Ano"> + <%= "#{relatorio.data_fim.month}/#{relatorio.data_fim.year}" %> + + <:column :let={{_, relatorio}} label="Nome"><%= relatorio.pesquisador_id %> + <:column :let={{_, relatorio}} label="Status"><%= relatorio.status %> <:column :let={_} label="Baixar">
    diff --git a/lib/pescarte_web/templates/landing_html/show.html.heex b/lib/pescarte_web/templates/landing_html/show.html.heex index 4b17d706..abe605fa 100644 --- a/lib/pescarte_web/templates/landing_html/show.html.heex +++ b/lib/pescarte_web/templates/landing_html/show.html.heex @@ -33,7 +33,10 @@ Livros...em construção     - + <.button style="primary"> Saiba mais (Boletins) @@ -124,7 +127,7 @@ <.button style="primary"> - <.text size="base" color="text-white-100">Ler mais + <.text size="base" color="text-white-100">Ler mais diff --git a/mix.exs b/mix.exs index 66735225..6e4b7cbb 100644 --- a/mix.exs +++ b/mix.exs @@ -72,7 +72,7 @@ defmodule Pescarte.MixProject do [ dev: ["setup", "phx.server"], setup: ["deps.get", "ecto.setup", "seed"], - "ecto.setup": ["ecto.create", "ecto.migrate"], + "ecto.setup": ["ecto.create", "ecto.migrate", "seed"], test: ["ecto.create --quiet", "ecto.migrate --quiet", "test"], "assets.build": [ "esbuild default",