Write here your custom consent terms and conditions..
"
diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-project.po b/core/priv/gettext/en/LC_MESSAGES/eyra-project.po
index c90bf1fd1..33c4142d9 100644
--- a/core/priv/gettext/en/LC_MESSAGES/eyra-project.po
+++ b/core/priv/gettext/en/LC_MESSAGES/eyra-project.po
@@ -39,14 +39,6 @@ msgstr "Monitor"
msgid "tabbar.item.monitor.forward"
msgstr "Go to Monitor"
-#, elixir-autogen, elixir-format
-msgid "tabbar.item.privacy"
-msgstr "Privacy"
-
-#, elixir-autogen, elixir-format
-msgid "tabbar.item.privacy.forward"
-msgstr "Go to Privacy"
-
#, elixir-autogen, elixir-format
msgid "add.first.button"
msgstr "Start your first project"
@@ -182,3 +174,11 @@ msgstr "Support"
#, elixir-autogen, elixir-format, fuzzy
msgid "tabbar.item.support.forward"
msgstr "Go to Support"
+
+#, elixir-autogen, elixir-format, fuzzy
+msgid "tabbar.item.gdpr"
+msgstr "Consent"
+
+#, elixir-autogen, elixir-format, fuzzy
+msgid "tabbar.item.gdpr.forward"
+msgstr "Go to Consent"
diff --git a/core/priv/gettext/eyra-alliance.pot b/core/priv/gettext/eyra-alliance.pot
index 721c0e5e9..c012b8c41 100644
--- a/core/priv/gettext/eyra-alliance.pot
+++ b/core/priv/gettext/eyra-alliance.pot
@@ -201,15 +201,3 @@ msgstr ""
#, elixir-autogen, elixir-format, ex-autogen
msgid "participated.label"
msgstr ""
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.button"
-msgstr ""
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.text"
-msgstr ""
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.title"
-msgstr ""
diff --git a/core/priv/gettext/eyra-assignment.pot b/core/priv/gettext/eyra-assignment.pot
index ad180794a..4e34ae8f7 100644
--- a/core/priv/gettext/eyra-assignment.pot
+++ b/core/priv/gettext/eyra-assignment.pot
@@ -58,46 +58,30 @@ msgstr ""
msgid "close.button"
msgstr ""
-#, elixir-autogen, elixir-format
-msgid "config.nrofsubjects.label"
-msgstr ""
-
#, elixir-autogen, elixir-format
msgid "content.title"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "devices.label"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-msgid "devices.title"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-msgid "duration.label"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-msgid "language.title"
+msgid "open.button"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "languages.label"
+msgid "preview.button"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "open.button"
+msgid "publish.button"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "preview.button"
+msgid "retract.button"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "publish.button"
+msgid "onboarding.consent.continue.button"
msgstr ""
#, elixir-autogen, elixir-format
-msgid "retract.button"
+msgid "onboarding.consent.title"
msgstr ""
diff --git a/core/priv/gettext/eyra-consent.pot b/core/priv/gettext/eyra-consent.pot
new file mode 100644
index 000000000..191c27999
--- /dev/null
+++ b/core/priv/gettext/eyra-consent.pot
@@ -0,0 +1,20 @@
+## This file is a PO Template file.
+##
+## "msgid"s here are often extracted from source code.
+## Add new messages manually only if they're dynamic
+## messages that can't be statically extracted.
+##
+## Run "mix gettext.extract" to bring this file up to
+## date. Leave "msgstr"s empty as changing them here has no
+## effect: edit them in PO (.po) files instead.
+#
+msgid ""
+msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "consent-out-of-sync-error"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "default.consent.text"
+msgstr ""
diff --git a/core/priv/gettext/eyra-project.pot b/core/priv/gettext/eyra-project.pot
index 524fa319b..5e68a8ae9 100644
--- a/core/priv/gettext/eyra-project.pot
+++ b/core/priv/gettext/eyra-project.pot
@@ -39,14 +39,6 @@ msgstr ""
msgid "tabbar.item.monitor.forward"
msgstr ""
-#, elixir-autogen, elixir-format
-msgid "tabbar.item.privacy"
-msgstr ""
-
-#, elixir-autogen, elixir-format
-msgid "tabbar.item.privacy.forward"
-msgstr ""
-
#, elixir-autogen, elixir-format
msgid "add.first.button"
msgstr ""
@@ -182,3 +174,11 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "tabbar.item.support.forward"
msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "tabbar.item.gdpr"
+msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "tabbar.item.gdpr.forward"
+msgstr ""
diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-alliance.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-alliance.po
index 1e78b16c8..98528df05 100644
--- a/core/priv/gettext/nl/LC_MESSAGES/eyra-alliance.po
+++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-alliance.po
@@ -201,15 +201,3 @@ msgstr "De auteur van deze studie heeft jouw bijdrage beoordeeld en wil je het v
#, elixir-autogen, elixir-format, ex-autogen, fuzzy
msgid "participated.label"
msgstr "Deelgenomen"
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.button"
-msgstr "Controleer"
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.text"
-msgstr "Test of jouw vragenlijst goed opgezet is en controleer of je terugkomt op het scherm \"Round trip bevestigd\"."
-
-#, elixir-autogen, elixir-format, ex-autogen
-msgid "test.roundtrip.title"
-msgstr "Is je vragenlijst goed opgezet?"
diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po
index 0fddc3e12..6e5e08577 100644
--- a/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po
+++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po
@@ -58,34 +58,10 @@ msgstr "%{target} credits vereist"
msgid "close.button"
msgstr "Afronden"
-#, elixir-autogen, elixir-format
-msgid "config.nrofsubjects.label"
-msgstr "Hoeveel deelnemers heb je nodig?"
-
#, elixir-autogen, elixir-format, fuzzy
msgid "content.title"
msgstr "Jouw Panl ID"
-#, elixir-autogen, elixir-format
-msgid "devices.label"
-msgstr "Welke apparaten mogen deelnemers gebruiken?"
-
-#, elixir-autogen, elixir-format
-msgid "devices.title"
-msgstr "Apparaten"
-
-#, elixir-autogen, elixir-format
-msgid "duration.label"
-msgstr "Hoeveel minuten schat je in dat deelnemers nodig hebben?"
-
-#, elixir-autogen, elixir-format
-msgid "language.title"
-msgstr "Taal"
-
-#, elixir-autogen, elixir-format
-msgid "languages.label"
-msgstr "In welke taal is de opdracht geschreven?"
-
#, elixir-autogen, elixir-format
msgid "open.button"
msgstr "Open"
@@ -101,3 +77,11 @@ msgstr "Publiceren"
#, elixir-autogen, elixir-format, fuzzy
msgid "retract.button"
msgstr "Intrekken"
+
+#, elixir-autogen, elixir-format
+msgid "onboarding.consent.continue.button"
+msgstr "Continue"
+
+#, elixir-autogen, elixir-format, fuzzy
+msgid "onboarding.consent.title"
+msgstr "Consent"
diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-consent.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-consent.po
new file mode 100644
index 000000000..1c43d4e89
--- /dev/null
+++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-consent.po
@@ -0,0 +1,20 @@
+## "msgid"s in this file come from POT (.pot) files.
+###
+### Do not add, change, or remove "msgid"s manually here as
+### they're tied to the ones in the corresponding POT file
+### (with the same domain).
+###
+### Use "mix gettext.extract --merge" or "mix gettext.merge"
+### to merge POT files into PO files.
+msgid ""
+msgstr ""
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, elixir-autogen, elixir-format
+msgid "consent-out-of-sync-error"
+msgstr "Iemand heeft de consent tekst is aangepast. Ververs de pagina om verder te gaan."
+
+#, elixir-autogen, elixir-format
+msgid "default.consent.text"
+msgstr "
- <%= if @work_list && @show_left_column do %>
-
- <.work_list {@work_list} />
-
-
-
- <% end %>
-
- <%= if @tool_ref_view do %>
- <.tool_ref_view {@tool_ref_view}/>
- <% else %>
- <%= if @start_view do %>
- <.start_view {@start_view} />
- <% end %>
+ <%= if view = List.first(@onboarding) do %>
+ <.live_component {view} />
+ <% else %>
+
+ <%= if @work_list && @show_left_column do %>
+
+ <.work_list {@work_list} />
+
+
+
<% end %>
+
+ <%= if @tool_ref_view do %>
+ <.tool_ref_view {@tool_ref_view}/>
+ <% else %>
+ <%= if @start_view do %>
+ <.start_view {@start_view} />
+ <% end %>
+ <% end %>
+
-
+ <% end %>
"""
end
diff --git a/core/systems/assignment/crew_page_builder.ex b/core/systems/assignment/crew_page_builder.ex
index 8f7387f1c..b7aff0b4f 100644
--- a/core/systems/assignment/crew_page_builder.ex
+++ b/core/systems/assignment/crew_page_builder.ex
@@ -2,35 +2,72 @@ defmodule Systems.Assignment.CrewPageBuilder do
alias Systems.{
Assignment,
Crew,
- Workflow
+ Workflow,
+ Consent
}
- def view_model(
- %{crew: crew, status: status} = assignment,
- %{current_user: user} = _assigns
- ) do
- member = Crew.Public.get_member(crew, user)
+ def view_model(assignment, assigns) do
+ %{
+ onboarding: onboarding(assignment, assigns),
+ items: items(assignment, assigns)
+ }
+ end
+
+ defp onboarding(%{status: status} = assignment, assigns) do
+ if is_tester?(assignment, assigns) or status == :online do
+ onboarding(assignment, assigns, current_onboarding(assigns))
+ else
+ []
+ end
+ end
- items =
- if status == :online or Core.Authorization.user_has_role?(user, crew, :tester) do
- items(assignment, member)
- else
- # offline mode
- []
- end
+ defp onboarding(assignment, assigns, nil), do: full_onboarding(assignment, assigns)
+
+ defp onboarding(assignment, assigns, current_onboarding) do
+ full_onboarding(assignment, assigns)
+ |> Enum.filter(fn %{id: id} ->
+ Enum.find(current_onboarding, &(&1.id == id)) != nil
+ end)
+ end
+
+ defp full_onboarding(assignment, assigns) do
+ [consent_view(assignment, assigns)]
+ end
+
+ defp current_onboarding(%{onboarding: onboarding}), do: onboarding
+ defp current_onboarding(_), do: nil
+
+ defp consent_view(%{consent_agreement: consent_agreement}, %{current_user: user}) do
+ revision = Consent.Public.latest_revision(consent_agreement)
%{
- items: items
+ id: :onboarding_consent_view,
+ module: Assignment.OnboardingConsentView,
+ revision: revision,
+ user: user
}
end
- defp items(%{workflow: workflow} = assignment, member) do
+ defp items(%{status: status, crew: crew} = assignment, %{current_user: user} = assigns) do
+ if is_tester?(assignment, assigns) or status == :online do
+ member = Crew.Public.get_member(crew, user)
+ items(assignment, member)
+ else
+ []
+ end
+ end
+
+ defp items(%{workflow: workflow} = assignment, %{} = member) do
ordered_items = Workflow.Model.ordered_items(workflow)
Enum.map(ordered_items, &{&1, get_or_create_task(&1, assignment, member)})
end
defp items(_assignment, nil), do: []
+ defp is_tester?(%{crew: crew}, %{current_user: user}) do
+ Core.Authorization.user_has_role?(user, crew, :tester)
+ end
+
defp get_or_create_task(item, %{crew: crew} = assignment, member) do
identifier = Assignment.Private.task_identifier(assignment, item, member)
diff --git a/core/systems/assignment/gdpr_form.ex b/core/systems/assignment/gdpr_form.ex
new file mode 100644
index 000000000..890a4f40f
--- /dev/null
+++ b/core/systems/assignment/gdpr_form.ex
@@ -0,0 +1,45 @@
+defmodule Systems.Assignment.GdprForm do
+ use CoreWeb, :live_component
+
+ alias Systems.{
+ Consent
+ }
+
+ @impl true
+ def update(%{id: id, entity: entity}, socket) do
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ entity: entity
+ )
+ |> update_consent_agreement()
+ }
+ end
+
+ defp update_consent_agreement(%{assigns: %{entity: entity}} = socket) do
+ revision = Consent.Public.latest_unlocked_revision_safe(entity)
+
+ consent_revision_form = %{
+ id: :consent_revision,
+ module: Consent.RevisionForm,
+ entity: revision
+ }
+
+ assign(socket, consent_revision_form: consent_revision_form)
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+
+
+ Consent
+ <.live_component {@consent_revision_form} />
+
+
+ """
+ end
+end
diff --git a/core/systems/assignment/model.ex b/core/systems/assignment/model.ex
index cb72b8ee5..f5c588313 100644
--- a/core/systems/assignment/model.ex
+++ b/core/systems/assignment/model.ex
@@ -10,13 +10,15 @@ defmodule Systems.Assignment.Model do
alias Systems.{
Assignment,
Workflow,
- Budget
+ Budget,
+ Consent
}
schema "assignments" do
field(:special, Ecto.Atom)
field(:status, Ecto.Enum, values: Assignment.Status.values(), default: :concept)
+ belongs_to(:consent_agreement, Consent.AgreementModel)
belongs_to(:info, Assignment.InfoModel)
belongs_to(:workflow, Workflow.Model)
belongs_to(:crew, Systems.Crew.Model)
@@ -63,7 +65,7 @@ defmodule Systems.Assignment.Model do
def flatten(assignment) do
assignment
- |> Map.take([:id, :info, :workflow, :crew, :budget, :excluded, :director])
+ |> Map.take([:id, :consent_agreement, :info, :workflow, :crew, :budget, :excluded, :director])
|> Map.put(:tool, tool(assignment))
end
@@ -77,6 +79,7 @@ defmodule Systems.Assignment.Model do
def preload_graph(:down) do
[
:excluded,
+ consent_agreement: [:revisions],
info: [],
crew: [:tasks, :members, :auth_node],
workflow: Workflow.Model.preload_graph(:down),
diff --git a/core/systems/assignment/onboarding_consent_view.ex b/core/systems/assignment/onboarding_consent_view.ex
new file mode 100644
index 000000000..f4dbaeb00
--- /dev/null
+++ b/core/systems/assignment/onboarding_consent_view.ex
@@ -0,0 +1,58 @@
+defmodule Systems.Assignment.OnboardingConsentView do
+ use CoreWeb.LiveForm
+
+ alias Systems.{
+ Consent
+ }
+
+ @impl true
+ def update(%{consent_clickwrap_view: :continue}, %{assigns: %{id: id}} = socket) do
+ send(self(), {:onboarding_continue, id})
+
+ {
+ :ok,
+ socket
+ }
+ end
+
+ @impl true
+ def update(%{id: id, revision: revision, user: user}, socket) do
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ revision: revision,
+ user: user
+ )
+ |> update_clickwrap_view()
+ }
+ end
+
+ defp update_clickwrap_view(
+ %{assigns: %{revision: revision, user: user, myself: myself}} = socket
+ ) do
+ clickwrap_view = %{
+ id: :consent_clickwrap_view,
+ module: Consent.ClickWrapView,
+ revision: revision,
+ user: user,
+ target: myself
+ }
+
+ assign(socket, clickwrap_view: clickwrap_view)
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+
+
+ <%= dgettext("eyra-assignment", "onboarding.consent.title") %>
+ <.live_component {@clickwrap_view} />
+
+
+ """
+ end
+end
diff --git a/core/systems/consent/_public.ex b/core/systems/consent/_public.ex
new file mode 100644
index 000000000..3a16c0ce1
--- /dev/null
+++ b/core/systems/consent/_public.ex
@@ -0,0 +1,159 @@
+defmodule Systems.Consent.Public do
+ import CoreWeb.Gettext
+ import Ecto.Query
+
+ alias Ecto.Multi
+ alias Core.Repo
+ alias Frameworks.Signal
+
+ alias Systems.{
+ Consent
+ }
+
+ def create_agreement(auth_node) do
+ prepare_agreement(auth_node)
+ |> Repo.insert()
+ end
+
+ def prepare_agreement(auth_node) do
+ %Consent.AgreementModel{}
+ |> Consent.AgreementModel.changeset()
+ |> Ecto.Changeset.put_assoc(:auth_node, auth_node)
+ end
+
+ def create_revision(source, agreement) do
+ prepare_revision(source, agreement)
+ |> Repo.insert()
+ end
+
+ def prepare_revision(source, agreement) when is_binary(source) do
+ %Consent.RevisionModel{}
+ |> Consent.RevisionModel.changeset(%{source: source})
+ |> Ecto.Changeset.put_assoc(:agreement, agreement)
+ end
+
+ def create_signature(revision, user) do
+ prepare_signature(revision, user)
+ |> Repo.insert()
+ end
+
+ def prepare_signature(revision, user) do
+ %Consent.SignatureModel{}
+ |> Consent.SignatureModel.changeset()
+ |> Ecto.Changeset.put_assoc(:revision, revision)
+ |> Ecto.Changeset.put_assoc(:user, user)
+ end
+
+ def get_agreement!(id, preload \\ []) do
+ Repo.get!(Consent.AgreementModel, id) |> Repo.preload(preload)
+ end
+
+ def get_revision!(id, preload \\ []) do
+ Repo.get!(Consent.RevisionModel, id) |> Repo.preload(preload)
+ end
+
+ def has_signature(revision, user) do
+ get_signature(revision, user) != nil
+ end
+
+ def get_signature(%Consent.RevisionModel{id: revision_id}, %Core.Accounts.User{id: user_id}) do
+ from(s in Consent.SignatureModel,
+ where: s.user_id == ^user_id,
+ where: s.revision_id == ^revision_id
+ )
+ |> Repo.all()
+ |> List.first()
+ end
+
+ def list_agreements(preload \\ []) do
+ from(a in Consent.AgreementModel,
+ order_by: {:desc, :inserted_at},
+ preload: ^preload,
+ limit: 1
+ )
+ |> Repo.all()
+ end
+
+ def latest_unlocked_revision_safe(agreement, preload \\ []) do
+ if revision = latest_unlocked_revision(agreement, preload) do
+ revision
+ else
+ source =
+ if revision = latest_revision(agreement, preload) do
+ revision.source
+ else
+ dgettext("eyra-consent", "default.consent.text")
+ end
+
+ create_revision(source, agreement)
+ end
+
+ query_unlocked_revisions(agreement, preload)
+ |> Repo.all()
+ |> List.first()
+ end
+
+ def latest_unlocked_revision(agreement, preload \\ []) do
+ query_unlocked_revisions(agreement, preload)
+ |> Repo.all()
+ |> List.first()
+ end
+
+ def query_unlocked_revisions(agreement, preload \\ []) do
+ from(revision in query_revisions(agreement, preload),
+ where:
+ revision.id not in subquery(
+ from(signature in Consent.SignatureModel,
+ select: signature.revision_id
+ )
+ )
+ )
+ end
+
+ def latest_revision(agreement, preload \\ []) do
+ query_revisions(agreement, preload)
+ |> Repo.all()
+ |> List.first()
+ end
+
+ def query_revisions(agreement, preload \\ [])
+
+ def query_revisions(%Consent.AgreementModel{id: agreement_id}, preload) do
+ query_revisions(agreement_id, preload)
+ end
+
+ def query_revisions(agreement_id, preload) when is_integer(agreement_id) do
+ from(revision in Consent.RevisionModel,
+ where: revision.agreement_id == ^agreement_id,
+ order_by: {:desc, :id},
+ preload: ^preload
+ )
+ end
+
+ def update_revision(
+ %Ecto.Changeset{data: %Consent.RevisionModel{id: id, updated_at: updated_at}} = changeset
+ ) do
+ Multi.new()
+ |> Multi.run(:validate_timestamp, fn _, _ ->
+ %{updated_at: stored_updated_at} = Consent.Public.get_revision!(id)
+
+ if stored_updated_at == updated_at do
+ {:ok, :valid}
+ else
+ {:error, "Revision out of sync"}
+ end
+ end)
+ |> Multi.update(:consent_revision, changeset)
+ |> Signal.Public.multi_dispatch({:consent_revision, :updated})
+ |> Repo.transaction()
+ end
+end
+
+defimpl Core.Persister, for: Systems.Consent.RevisionModel do
+ def save(_revision, changeset) do
+ case Systems.Consent.Public.update_revision(changeset) do
+ {:ok, %{consent_revision: revision}} -> {:ok, revision}
+ _ -> {:error, changeset}
+ end
+ end
+end
diff --git a/core/systems/consent/_switch.ex b/core/systems/consent/_switch.ex
new file mode 100644
index 000000000..43c6822ad
--- /dev/null
+++ b/core/systems/consent/_switch.ex
@@ -0,0 +1,25 @@
+defmodule Systems.Consent.Switch do
+ use Frameworks.Signal.Handler
+
+ alias Frameworks.{
+ Signal
+ }
+
+ alias Systems.{
+ Consent
+ }
+
+ @impl true
+ def intercept(
+ {:consent_revision, _} = signal,
+ %{consent_revision: %{agreement_id: agreement_id}} = message
+ ) do
+ consent_agreement =
+ Consent.Public.get_agreement!(agreement_id, Consent.AgreementModel.preload_graph(:down))
+
+ dispatch!(
+ {:consent_agreement, signal},
+ Map.merge(message, %{consent_agreement: consent_agreement})
+ )
+ end
+end
diff --git a/core/systems/consent/agreement_model.ex b/core/systems/consent/agreement_model.ex
new file mode 100644
index 000000000..2401c9882
--- /dev/null
+++ b/core/systems/consent/agreement_model.ex
@@ -0,0 +1,34 @@
+defmodule Systems.Consent.AgreementModel do
+ use Ecto.Schema
+ use Frameworks.Utility.Schema
+
+ import Ecto.Changeset
+
+ alias Systems.{
+ Consent
+ }
+
+ schema "consent_agreements" do
+ belongs_to(:auth_node, Core.Authorization.Node)
+ has_many(:revisions, Consent.RevisionModel, foreign_key: :agreement_id)
+ timestamps()
+ end
+
+ @fields ~w()a
+ @required_fields ~w()a
+
+ def preload_graph(:down), do: preload_graph([:auth_node])
+ def preload_graph(:up), do: preload_graph([])
+ def preload_graph(:revisions), do: [revisions: Consent.RevisionModel.preload_graph(:down)]
+ def preload_graph(:auth_node), do: [auth_node: []]
+
+ def changeset(agreement, attrs \\ %{}) do
+ agreement
+ |> cast(attrs, @fields)
+ end
+
+ def validate(changeset) do
+ changeset
+ |> validate_required(@required_fields)
+ end
+end
diff --git a/core/systems/consent/clickwrap_view.ex b/core/systems/consent/clickwrap_view.ex
new file mode 100644
index 000000000..73000ffef
--- /dev/null
+++ b/core/systems/consent/clickwrap_view.ex
@@ -0,0 +1,107 @@
+defmodule Systems.Consent.ClickWrapView do
+ # Clickwrap agreements are a type of electronic signature that involves a user
+ # clicking a simple button to accept the agreement.
+
+ use CoreWeb.LiveForm
+
+ alias Systems.{
+ Consent
+ }
+
+ @impl true
+ def update(%{id: id, revision: revision, user: user, target: target}, socket) do
+ signature = Consent.Public.get_signature(revision, user)
+ selected? = signature != nil
+
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ revision: revision,
+ user: user,
+ target: target,
+ signature: signature,
+ selected?: selected?
+ )
+ |> update_form()
+ |> update_continue_button()
+ }
+ end
+
+ defp update_form(%{assigns: %{selected?: selected?}} = socket) do
+ form = to_form(%{"signature_check" => selected?})
+ assign(socket, form: form)
+ end
+
+ defp update_continue_button(%{assigns: %{selected?: selected?, myself: myself}} = socket) do
+ continue_button = %{
+ action: %{type: :send, event: "continue", target: myself},
+ face: %{
+ type: :primary,
+ label: dgettext("eyra-assignment", "onboarding.consent.continue.button")
+ },
+ enabled?: selected?
+ }
+
+ assign(socket, continue_button: continue_button)
+ end
+
+ @impl true
+ def handle_event(
+ "toggle",
+ %{"checkbox" => _checkbox},
+ %{assigns: %{selected?: selected?}} = socket
+ ) do
+ {
+ :noreply,
+ socket
+ |> assign(selected?: not selected?)
+ |> update_form()
+ |> update_continue_button()
+ }
+ end
+
+ @impl true
+ def handle_event("continue", _payload, socket) do
+ {
+ :noreply,
+ socket |> handle_continue()
+ }
+ end
+
+ def handle_continue(%{assigns: %{signature: nil, revision: revision, user: user}} = socket) do
+ {:ok, signature} = Consent.Public.create_signature(revision, user)
+
+ socket
+ |> assign(signature: signature)
+ |> handle_continue()
+ end
+
+ def handle_continue(%{assigns: %{id: id, signature: %{id: _}, target: target}} = socket) do
+ send_update(target, %{id => :continue})
+ socket
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+
+ <%= raw @revision.source %>
+
+ <.spacing value="M" />
+ <.form id={@id} :let={form} for={@form} phx-target={@myself} >
+ <.checkbox
+ form={form}
+ field={:signature_check}
+ label_text="I have read and agree with the above terms."
+ />
+
+ <.wrap>
+
+
+
+ """
+ end
+end
diff --git a/core/systems/consent/revision_form.ex b/core/systems/consent/revision_form.ex
new file mode 100644
index 000000000..35b28f3c4
--- /dev/null
+++ b/core/systems/consent/revision_form.ex
@@ -0,0 +1,66 @@
+defmodule Systems.Consent.RevisionForm do
+ use CoreWeb.LiveForm
+
+ alias Systems.{
+ Consent
+ }
+
+ @impl true
+ def update(%{id: id, entity: %{source: source} = entity}, socket) do
+ form = to_form(%{"source" => source})
+
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ entity: entity,
+ form: form
+ )
+ }
+ end
+
+ @impl true
+ def handle_event(
+ "save",
+ %{"source_input" => source},
+ %{assigns: %{entity: %{source: old_source} = entity}} = socket
+ ) do
+ {
+ :noreply,
+ if old_source == source do
+ socket
+ else
+ save(socket, entity, %{source: source})
+ end
+ }
+ end
+
+ # Saving
+
+ def save(socket, entity, attrs) do
+ changeset = Consent.RevisionModel.changeset(entity, attrs)
+
+ case Core.Persister.save(entity, changeset) do
+ {:ok, entity} ->
+ socket
+ |> assign(entity: entity)
+ |> flash_persister_saved()
+
+ {:error, _} ->
+ socket
+ |> flash_persister_error(dgettext("eyra-consent", "consent-out-of-sync-error"))
+ end
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+ <.form id="agreement_form" :let={form} for={@form} phx-change="save" phx-target={@myself} >
+ <.wysiwyg_area form={form} field={:source} />
+
+
+ """
+ end
+end
diff --git a/core/systems/consent/revision_model.ex b/core/systems/consent/revision_model.ex
new file mode 100644
index 000000000..0a7fead57
--- /dev/null
+++ b/core/systems/consent/revision_model.ex
@@ -0,0 +1,36 @@
+defmodule Systems.Consent.RevisionModel do
+ use Ecto.Schema
+ use Frameworks.Utility.Schema
+
+ import Ecto.Changeset
+
+ alias Systems.{
+ Consent
+ }
+
+ schema "consent_revisions" do
+ field(:source, :string)
+ belongs_to(:agreement, Consent.AgreementModel)
+ has_many(:signatures, Consent.SignatureModel, foreign_key: :revision_id)
+ timestamps()
+ end
+
+ @fields ~w(source)a
+ @required_fields ~w()a
+
+ def preload_graph(:up), do: preload_graph([:agreement])
+ def preload_graph(:down), do: preload_graph([:signatures])
+
+ def preload_graph(:agreement), do: [agreement: Consent.AgreementModel.preload_graph(:up)]
+ def preload_graph(:signatures), do: [signatures: Consent.SignatureModel.preload_graph(:down)]
+
+ def changeset(revision, attrs) do
+ revision
+ |> cast(attrs, @fields)
+ end
+
+ def validate(changeset) do
+ changeset
+ |> validate_required(@required_fields)
+ end
+end
diff --git a/core/systems/consent/signature_model.ex b/core/systems/consent/signature_model.ex
new file mode 100644
index 000000000..f3b1f6042
--- /dev/null
+++ b/core/systems/consent/signature_model.ex
@@ -0,0 +1,35 @@
+defmodule Systems.Consent.SignatureModel do
+ use Ecto.Schema
+ use Frameworks.Utility.Schema
+
+ import Ecto.Changeset
+
+ alias Systems.{
+ Consent
+ }
+
+ schema "consent_signatures" do
+ belongs_to(:revision, Consent.RevisionModel)
+ belongs_to(:user, Core.Accounts.User)
+ timestamps()
+ end
+
+ @fields ~w()a
+ @required_fields ~w()a
+
+ def preload_graph(:up), do: preload_graph([:revision])
+ def preload_graph(:down), do: preload_graph([:user])
+
+ def preload_graph(:revision), do: [revision: Consent.RevisionModel.preload_graph(:up)]
+ def preload_graph(:user), do: [user: []]
+
+ def changeset(signature, attrs \\ %{}) do
+ signature
+ |> cast(attrs, @fields)
+ end
+
+ def validate(changeset) do
+ changeset
+ |> validate_required(@required_fields)
+ end
+end
diff --git a/core/test/systems/consent/_public_test.exs b/core/test/systems/consent/_public_test.exs
new file mode 100644
index 000000000..2426f3e92
--- /dev/null
+++ b/core/test/systems/consent/_public_test.exs
@@ -0,0 +1,197 @@
+defmodule Systems.Consent.PublicTest do
+ use Core.DataCase
+ alias Core.Authorization
+ alias Ecto.Multi
+
+ alias Systems.Consent
+
+ test "list/0 returns all created agreements" do
+ {:ok, %{id: id}} =
+ Authorization.prepare_node()
+ |> Consent.Public.create_agreement()
+
+ assert [%Systems.Consent.AgreementModel{id: ^id}] = Consent.Public.list_agreements()
+ end
+
+ test "list/0 returns all created agreements with revisions" do
+ {:ok, _} =
+ Multi.new()
+ |> Multi.insert(:agreement, Consent.Public.prepare_agreement(Authorization.prepare_node()))
+ |> Multi.insert(:revision1, fn %{agreement: agreement} ->
+ Consent.Public.prepare_revision("revision1", agreement)
+ end)
+ |> Multi.insert(:revision2, fn %{agreement: agreement} ->
+ Consent.Public.prepare_revision("revision2", agreement)
+ end)
+ |> Repo.transaction()
+
+ assert [
+ %Systems.Consent.AgreementModel{
+ revisions: [
+ %Systems.Consent.RevisionModel{
+ source: "revision1"
+ },
+ %Systems.Consent.RevisionModel{
+ source: "revision2"
+ }
+ ]
+ }
+ ] = Consent.Public.list_agreements([:revisions])
+ end
+
+ test "list/0 returns all created agreements with revisions and signatures" do
+ %{id: user_a_id} = user_a = Factories.insert!(:member)
+ %{id: user_b_id} = user_b = Factories.insert!(:member)
+ %{id: user_c_id} = user_c = Factories.insert!(:member)
+
+ {:ok, _} =
+ Multi.new()
+ |> Multi.insert(:agreement, Consent.Public.prepare_agreement(Authorization.prepare_node()))
+ |> Multi.insert(:revision1, fn %{agreement: agreement} ->
+ Consent.Public.prepare_revision("revision1", agreement)
+ end)
+ |> Multi.insert(:signatureA1, fn %{revision1: revision1} ->
+ Consent.Public.prepare_signature(revision1, user_a)
+ end)
+ |> Multi.insert(:signatureB1, fn %{revision1: revision1} ->
+ Consent.Public.prepare_signature(revision1, user_b)
+ end)
+ |> Multi.insert(:revision2, fn %{agreement: agreement} ->
+ Consent.Public.prepare_revision("revision2", agreement)
+ end)
+ |> Multi.insert(:signatureA2, fn %{revision2: revision2} ->
+ Consent.Public.prepare_signature(revision2, user_a)
+ end)
+ |> Multi.insert(:signatureB2, fn %{revision2: revision2} ->
+ Consent.Public.prepare_signature(revision2, user_b)
+ end)
+ |> Multi.insert(:signatureC2, fn %{revision2: revision2} ->
+ Consent.Public.prepare_signature(revision2, user_c)
+ end)
+ |> Repo.transaction()
+
+ assert [
+ %Systems.Consent.AgreementModel{
+ revisions: [
+ %Systems.Consent.RevisionModel{
+ source: "revision1",
+ signatures: [
+ %Systems.Consent.SignatureModel{user_id: ^user_a_id},
+ %Systems.Consent.SignatureModel{user_id: ^user_b_id}
+ ]
+ },
+ %Systems.Consent.RevisionModel{
+ source: "revision2",
+ signatures: [
+ %Systems.Consent.SignatureModel{user_id: ^user_a_id},
+ %Systems.Consent.SignatureModel{user_id: ^user_b_id},
+ %Systems.Consent.SignatureModel{user_id: ^user_c_id}
+ ]
+ }
+ ]
+ }
+ ] = Consent.Public.list_agreements(revisions: [:signatures])
+ end
+
+ test "latest_revision/2 returns nil" do
+ agreement = Factories.insert!(:consent_agreement)
+ assert Consent.Public.latest_revision(agreement) == nil
+ end
+
+ test "latest_revision/2 returns latest revision " do
+ %{id: id} = agreement = Factories.insert!(:consent_agreement)
+ %{id: _revision_1_id} = Factories.insert!(:consent_revision, %{agreement: agreement})
+ %{id: revision_2_id} = Factories.insert!(:consent_revision, %{agreement: agreement})
+
+ assert %Systems.Consent.RevisionModel{
+ id: ^revision_2_id,
+ source: nil,
+ agreement: %Systems.Consent.AgreementModel{id: ^id}
+ } = Consent.Public.latest_revision(agreement, [:agreement])
+ end
+
+ test "latest_unlocked_revision/2 returns nil" do
+ user = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision_1 = Factories.insert!(:consent_revision, %{agreement: agreement})
+ _signature = Factories.insert!(:consent_signature, %{revision: revision_1, user: user})
+
+ assert Consent.Public.latest_unlocked_revision(agreement, [:agreement]) == nil
+ end
+
+ test "latest_unlocked_revision_safe/2 returns new revision in empty agreement" do
+ agreement = Factories.insert!(:consent_agreement)
+
+ assert %Systems.Consent.RevisionModel{
+ source: "
Beschrijf hier de consent voorwaarden
",
+ signatures: []
+ } = Consent.Public.latest_unlocked_revision_safe(agreement, [:signatures])
+ end
+
+ test "latest_unlocked_revision_safe/2 returns latest revision" do
+ agreement = Factories.insert!(:consent_agreement)
+ _revision = Factories.insert!(:consent_revision, %{agreement: agreement, source: "source"})
+
+ assert %Systems.Consent.RevisionModel{
+ source: "source",
+ signatures: []
+ } = Consent.Public.latest_unlocked_revision_safe(agreement, [:signatures])
+ end
+
+ test "latest_unlocked_revision_safe/2 returns new revision on top of locked revision" do
+ user = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision_1 = Factories.insert!(:consent_revision, %{agreement: agreement, source: "source"})
+ _signature = Factories.insert!(:consent_signature, %{revision: revision_1, user: user})
+
+ assert %Systems.Consent.RevisionModel{
+ id: revision_2_id,
+ source: "source",
+ signatures: []
+ } = Consent.Public.latest_unlocked_revision_safe(agreement, [:signatures])
+
+ assert revision_1.id != revision_2_id
+ end
+
+ test "create_signature/2 succeeds" do
+ user = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision = Factories.insert!(:consent_revision, %{agreement: agreement})
+
+ assert {:ok, _} = Consent.Public.create_signature(revision, user)
+ end
+
+ test "create_signature/2 fails when signature already exists" do
+ user = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision = Factories.insert!(:consent_revision, %{agreement: agreement})
+ _signature = Factories.insert!(:consent_signature, %{revision: revision, user: user})
+
+ assert_raise Ecto.ConstraintError, fn -> Consent.Public.create_signature(revision, user) end
+ end
+
+ test "has_signature/2 true" do
+ user = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision = Factories.insert!(:consent_revision, %{agreement: agreement})
+ _signature = Factories.insert!(:consent_signature, %{revision: revision, user: user})
+
+ assert Consent.Public.has_signature(revision, user)
+ end
+
+ test "has_signature/2 false" do
+ user_a = Factories.insert!(:member)
+ user_b = Factories.insert!(:member)
+
+ agreement = Factories.insert!(:consent_agreement)
+ revision = Factories.insert!(:consent_revision, %{agreement: agreement})
+ _signature = Factories.insert!(:consent_signature, %{revision: revision, user: user_a})
+
+ assert not Consent.Public.has_signature(revision, user_b)
+ end
+end