bugfix: wrong field name for text area

peapescarte · Nov 10, 2023 · 9f157c1 · 9f157c1
1 parent b423733
commit 9f157c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/apps/modulo_pesquisa/lib/modulo_pesquisa/models/relatorio_pesquisa.ex b/apps/modulo_pesquisa/lib/modulo_pesquisa/models/relatorio_pesquisa.ex
@@ -50,6 +50,12 @@ defmodule ModuloPesquisa.Models.RelatorioPesquisa do
   end
 
   @spec changeset(RelatorioPesquisa.t(), map) :: changeset
+  def changeset(%RelatorioPesquisa{status: :entregue} = relatorio, attrs) do
+    relatorio
+    |> cast(attrs, @required_fields ++ @optional_fields)
+    |> add_error(:status, "O relatório já foi entregue")
+  end
+
   def changeset(%RelatorioPesquisa{} = relatorio, attrs) do
     relatorio
     |> cast(attrs, @required_fields ++ @optional_fields)

diff --git a/apps/plataforma_digital/lib/plataforma_digital/design_system.ex b/apps/plataforma_digital/lib/plataforma_digital/design_system.ex
@@ -380,7 +380,7 @@ defmodule PlataformaDigital.DesignSystem do
   attr(:name, :string, required: true)
   attr(:content, :list, default: [])
   attr(:placeholder, :string, default: "Faça uma pesquisa...")
-  attr(:field, Phoenix.HTML.FormFieldcontent)
+  attr(:field, Phoenix.HTML.FormField)
   attr(:size, :string, values: ~w(base large), default: "base")
 
   def search_input(%{field: %Phoenix.HTML.FormField{}} = assigns) do
@@ -403,7 +403,7 @@ defmodule PlataformaDigital.DesignSystem do
   defp input(%{field: %Phoenix.HTML.FormField{} = field} = assigns) do
     assigns
     |> assign(field: nil, id: assigns.id || field.id)
-    |> assign_new(:name, fn -> field.name end)
+    |> assign(:name, field.name)
     |> assign_new(:value, fn -> field.value end)
   end
 

diff --git a/apps/plataforma_digital/lib/plataforma_digital/live/pesquisa/relatorio/form_component.ex b/apps/plataforma_digital/lib/plataforma_digital/live/pesquisa/relatorio/form_component.ex
@@ -121,28 +121,17 @@ defmodule PlataformaDigital.Pesquisa.Relatorio.FormComponent do
 
   defp get_data_limite(%{tipo_relatorio: tipo_relatorio, today: today}) do
     case tipo_relatorio do
-      "mensal" ->
-        Date.from_iso8601!("#{today.year}-#{today.month}-15")
-
-      "trimestral" ->
-        Date.from_iso8601!("#{today.year}-#{today.month}-10")
-
-      "anual" ->
-        Date.utc_today()
+      "mensal" -> Date.from_iso8601!("#{today.year}-#{today.month}-15")
+      "trimestral" -> Date.from_iso8601!("#{today.year}-#{today.month}-10")
+      "anual" -> Date.utc_today()
     end
   end
 
   defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
 
   defp report_field(assigns) do
     ~H"""
-    <.text_area
-      id={@field.id}
-      name={@field.name}
-      value={@field.value}
-      disabled={@disabled}
-      class="report-field"
-    >
+    <.text_area field={@field} disabled={@disabled} class="report-field">
       <:label>
         <.text size="h3" color="text-blue-100">
           <%= @label %>