From 9437504a05bbcbf29fa4be0a08811f13940bfa5f Mon Sep 17 00:00:00 2001 From: emielvdveen Date: Thu, 7 Dec 2023 00:17:01 +0100 Subject: [PATCH] Improved document task by adding close button --- core/assets/static/images/icons/netflix.svg | 19 +++++++++ .../static/images/icons/netflix_square.svg | 19 +++++++++ core/frameworks/concept/tool_model.ex | 2 +- .../gettext/en/LC_MESSAGES/eyra-assignment.po | 4 ++ .../gettext/en/LC_MESSAGES/eyra-campaign.po | 4 -- .../gettext/en/LC_MESSAGES/eyra-dashboard.po | 8 ---- .../priv/gettext/en/LC_MESSAGES/eyra-enums.po | 4 ++ core/priv/gettext/en/LC_MESSAGES/eyra-link.po | 12 ------ .../en/LC_MESSAGES/eyra-marketplace.po | 8 ---- core/priv/gettext/en/LC_MESSAGES/eyra-ui.po | 36 ++-------------- .../gettext/en/LC_MESSAGES/link-dashboard.po | 8 ---- core/priv/gettext/en/LC_MESSAGES/link-ui.po | 20 --------- core/priv/gettext/eyra-assignment.pot | 4 ++ core/priv/gettext/eyra-campaign.pot | 4 -- core/priv/gettext/eyra-dashboard.pot | 8 ---- core/priv/gettext/eyra-enums.pot | 4 ++ core/priv/gettext/eyra-link.pot | 12 ------ core/priv/gettext/eyra-marketplace.pot | 8 ---- core/priv/gettext/eyra-ui.pot | 36 ++-------------- core/priv/gettext/link-dashboard.pot | 8 ---- core/priv/gettext/link-ui.pot | 20 --------- .../gettext/nl/LC_MESSAGES/eyra-assignment.po | 4 ++ .../gettext/nl/LC_MESSAGES/eyra-campaign.po | 4 -- .../gettext/nl/LC_MESSAGES/eyra-dashboard.po | 8 ---- .../priv/gettext/nl/LC_MESSAGES/eyra-enums.po | 4 ++ core/priv/gettext/nl/LC_MESSAGES/eyra-link.po | 12 ------ .../nl/LC_MESSAGES/eyra-marketplace.po | 8 ---- core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po | 36 ++-------------- .../gettext/nl/LC_MESSAGES/link-dashboard.po | 8 ---- core/priv/gettext/nl/LC_MESSAGES/link-ui.po | 20 --------- core/systems/assignment/connection_view.ex | 7 ++++ core/systems/assignment/crew_page.ex | 1 + core/systems/assignment/crew_work_view.ex | 20 +++++++-- core/systems/assignment/start_view.ex | 4 -- core/systems/benchmark/tool_model.ex | 2 +- core/systems/document/pdf_view.ex | 42 +++++++++++++++---- core/systems/document/tool_model.ex | 7 +++- core/systems/feldspar/app_page.ex | 35 +++++++++++----- core/systems/feldspar/app_view.ex | 12 ++++-- core/systems/feldspar/tool_model.ex | 4 +- core/systems/lab/tool_model.ex | 2 +- core/systems/project/tool_ref_view.ex | 11 +++-- core/systems/workflow/platforms.ex | 11 ++--- core/systems/workflow/work_list_view.ex | 4 +- 44 files changed, 192 insertions(+), 322 deletions(-) create mode 100644 core/assets/static/images/icons/netflix.svg create mode 100644 core/assets/static/images/icons/netflix_square.svg diff --git a/core/assets/static/images/icons/netflix.svg b/core/assets/static/images/icons/netflix.svg new file mode 100644 index 000000000..b4c8a734b --- /dev/null +++ b/core/assets/static/images/icons/netflix.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/core/assets/static/images/icons/netflix_square.svg b/core/assets/static/images/icons/netflix_square.svg new file mode 100644 index 000000000..fb55e385d --- /dev/null +++ b/core/assets/static/images/icons/netflix_square.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/core/frameworks/concept/tool_model.ex b/core/frameworks/concept/tool_model.ex index e5bdb55cb..f0f5073bd 100644 --- a/core/frameworks/concept/tool_model.ex +++ b/core/frameworks/concept/tool_model.ex @@ -17,7 +17,7 @@ defprotocol Frameworks.Concept.ToolModel do @spec form(t) :: atom() def form(_t) - @spec launcher(t) :: %{url: binary()} | %{function: (map() -> any()), props: map()} + @spec launcher(t) :: %{url: binary()} | %{module: atom(), params: map()} | nil def launcher(_t) @spec task_labels(t) :: map() diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-assignment.po b/core/priv/gettext/en/LC_MESSAGES/eyra-assignment.po index 6f29b94ff..0ca48b49c 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-assignment.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-assignment.po @@ -217,3 +217,7 @@ msgstr "Use the fields below to customize the header of your data donation parti #, elixir-autogen, elixir-format, fuzzy msgid "settings.branding.title" msgstr "Branding" + +#, elixir-autogen, elixir-format +msgid "work.list.title" +msgstr "Tasks" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-campaign.po b/core/priv/gettext/en/LC_MESSAGES/eyra-campaign.po index 02ade5791..09564f94d 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-campaign.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-campaign.po @@ -10,10 +10,6 @@ msgid "" msgstr "" "Language: en\n" -#, elixir-autogen, elixir-format -msgid "campaign.all.title" -msgstr "Available studies" - #, elixir-autogen, elixir-format msgid "campaign.subject.title" msgstr "Contributions" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-dashboard.po b/core/priv/gettext/en/LC_MESSAGES/eyra-dashboard.po index 86327b7be..83dcdfca6 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-dashboard.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-dashboard.po @@ -17,11 +17,3 @@ msgstr "New study" #, elixir-autogen, elixir-format msgid "recent-items.title" msgstr "Recent items" - -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "Start working with Next and this console will provide an overview of your activities. It is the place to be, to quickly pick up where you left off during your last visit." - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "Not active yet?" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-enums.po b/core/priv/gettext/en/LC_MESSAGES/eyra-enums.po index ac2f0b183..874145fc9 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-enums.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-enums.po @@ -373,3 +373,7 @@ msgstr "LISS" #, elixir-autogen, elixir-format, fuzzy msgid "templates.benchmark" msgstr "Benchmark" + +#, elixir-autogen, elixir-format, fuzzy +msgid "platforms.netflix" +msgstr "Netflix" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-link.po b/core/priv/gettext/en/LC_MESSAGES/eyra-link.po index 50221fbc8..2e484227b 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-link.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-link.po @@ -14,10 +14,6 @@ msgstr "" msgid "welcome.title" msgstr "Panl" -#, elixir-autogen, elixir-format -msgid "console-button" -msgstr "Go to console" - #, elixir-autogen, elixir-format msgid "link.message" msgstr "Panl is a marketplace for research. Researchers can set up campaigns to recruit participants for research studies. Participants can apply to participate in these studies. Currently Panl is only available for student participation in research studies of the VU Amsterdam School of Business and Economics (SBE). In 2022 Panl will be released to a broader audience." @@ -69,11 +65,3 @@ msgstr "For and by researchers" #, elixir-autogen, elixir-format msgid "welcome.subtitle" msgstr "For research" - -#, elixir-autogen, elixir-format -msgid "marketplace.button" -msgstr "Go to marketplace" - -#, elixir-autogen, elixir-format -msgid "link.message.interested" -msgstr "Interested? Send an email to " diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-marketplace.po b/core/priv/gettext/en/LC_MESSAGES/eyra-marketplace.po index d0e1c2253..103676a02 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-marketplace.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-marketplace.po @@ -10,14 +10,6 @@ msgid "" msgstr "" "Language: en\n" -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "There are currently no research studies available to participate in. As soon as one becomes available, it will be added here and you will be notified by email (make sure to check your spam or junk mail folder, just in case)." - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "Looking for a study?" - #, elixir-autogen, elixir-format msgid "assignment.status.complete.label" msgstr "Closed" diff --git a/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po b/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po index 67f0d60b4..f3312438f 100644 --- a/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po +++ b/core/priv/gettext/en/LC_MESSAGES/eyra-ui.po @@ -22,10 +22,6 @@ msgstr "Saved" msgid "menu.item.console" msgstr "My console" -#, elixir-autogen, elixir-format -msgid "menu.item.marketplace" -msgstr "Marketplace" - #, elixir-autogen, elixir-format msgid "menu.item.profile" msgstr "My profile" @@ -54,10 +50,6 @@ msgstr "To-do" msgid "dashboard.title" msgstr "My console" -#, elixir-autogen, elixir-format -msgid "marketplace.title" -msgstr "Marketplace" - #, elixir-autogen, elixir-format msgid "todo.title" msgstr "To-do" @@ -86,22 +78,6 @@ msgstr "Update profile" msgid "tabbar.item.student.forward" msgstr "Select study program" -#, elixir-autogen, elixir-format -msgid "onboarding.forward" -msgstr "Continue" - -#, elixir-autogen, elixir-format -msgid "menu.item.debug" -msgstr "Debug" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome" -msgstr "Welcome" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome.forward" -msgstr "Welcome" - #, elixir-autogen, elixir-format msgid "menu.item.helpdesk" msgstr "Helpdesk" @@ -158,10 +134,6 @@ msgstr "Sign in to view this page" msgid "start.page.console" msgstr "Go to console" -#, elixir-autogen, elixir-format -msgid "start.page.marketplace" -msgstr "Go to marketplace" - #, elixir-autogen, elixir-format msgid "duplicate.button" msgstr "Duplicate" @@ -194,10 +166,6 @@ msgstr "Send notification" msgid "menu.item.admin" msgstr "Admin" -#, elixir-autogen, elixir-format, fuzzy -msgid "menu.item.funding" -msgstr "Funding" - #, elixir-autogen, elixir-format, fuzzy msgid "share.dialog.title" msgstr "Shared with" @@ -257,3 +225,7 @@ msgstr "Copy" #, elixir-autogen, elixir-format, fuzzy msgid "submit.button" msgstr "Save" + +#, elixir-autogen, elixir-format, fuzzy +msgid "close.button" +msgstr "Close" diff --git a/core/priv/gettext/en/LC_MESSAGES/link-dashboard.po b/core/priv/gettext/en/LC_MESSAGES/link-dashboard.po index b747543c3..776db81d4 100644 --- a/core/priv/gettext/en/LC_MESSAGES/link-dashboard.po +++ b/core/priv/gettext/en/LC_MESSAGES/link-dashboard.po @@ -14,14 +14,6 @@ msgstr "" msgid "quick_summary.%{open_spot_count}.%{target_subject_count}" msgstr "%{open_spot_count} out of %{target_subject_count} spots available" -#, elixir-autogen, elixir-format -msgid "recent-items.title" -msgstr "Recent items" - -#, elixir-autogen, elixir-format -msgid "title" -msgstr "My console" - #, elixir-autogen, elixir-format, ex-autogen msgid "book.accounts.title" msgstr "Rewards" diff --git a/core/priv/gettext/en/LC_MESSAGES/link-ui.po b/core/priv/gettext/en/LC_MESSAGES/link-ui.po index 3d1f326d3..45e08c14e 100644 --- a/core/priv/gettext/en/LC_MESSAGES/link-ui.po +++ b/core/priv/gettext/en/LC_MESSAGES/link-ui.po @@ -10,22 +10,6 @@ msgid "" msgstr "" "Language: en\n" -#, elixir-autogen, elixir-format -msgid "menu.item.recruitment" -msgstr "Recruitment" - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.description" -msgstr "Walk through the next steps to be able to participate in research studies." - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.title" -msgstr "Welcome %{member}" - -#, elixir-autogen, elixir-format -msgid "debug.title" -msgstr "Debug" - #, elixir-autogen, elixir-format msgid "delete.confirm.campaign" msgstr "campaign" @@ -53,7 +37,3 @@ msgstr "Publish" #, elixir-autogen, elixir-format, ex-autogen, fuzzy msgid "complete.button" msgstr "Finish up" - -#, elixir-autogen, elixir-format, ex-autogen, fuzzy -msgid "menu.item.pools" -msgstr "Pools" diff --git a/core/priv/gettext/eyra-assignment.pot b/core/priv/gettext/eyra-assignment.pot index cb976c122..e38d2f101 100644 --- a/core/priv/gettext/eyra-assignment.pot +++ b/core/priv/gettext/eyra-assignment.pot @@ -217,3 +217,7 @@ msgstr "" #, elixir-autogen, elixir-format msgid "settings.branding.title" msgstr "" + +#, elixir-autogen, elixir-format +msgid "work.list.title" +msgstr "" diff --git a/core/priv/gettext/eyra-campaign.pot b/core/priv/gettext/eyra-campaign.pot index dc522ad46..84074bef2 100644 --- a/core/priv/gettext/eyra-campaign.pot +++ b/core/priv/gettext/eyra-campaign.pot @@ -10,10 +10,6 @@ msgid "" msgstr "" -#, elixir-autogen, elixir-format -msgid "campaign.all.title" -msgstr "" - #, elixir-autogen, elixir-format msgid "campaign.subject.title" msgstr "" diff --git a/core/priv/gettext/eyra-dashboard.pot b/core/priv/gettext/eyra-dashboard.pot index 30ba9f887..d5e43bfd1 100644 --- a/core/priv/gettext/eyra-dashboard.pot +++ b/core/priv/gettext/eyra-dashboard.pot @@ -17,11 +17,3 @@ msgstr "" #, elixir-autogen, elixir-format msgid "recent-items.title" msgstr "" - -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "" diff --git a/core/priv/gettext/eyra-enums.pot b/core/priv/gettext/eyra-enums.pot index 6306733c6..2af2d058b 100644 --- a/core/priv/gettext/eyra-enums.pot +++ b/core/priv/gettext/eyra-enums.pot @@ -373,3 +373,7 @@ msgstr "" #, elixir-autogen, elixir-format msgid "templates.benchmark" msgstr "" + +#, elixir-autogen, elixir-format +msgid "platforms.netflix" +msgstr "" diff --git a/core/priv/gettext/eyra-link.pot b/core/priv/gettext/eyra-link.pot index 20468d08f..f8296040b 100644 --- a/core/priv/gettext/eyra-link.pot +++ b/core/priv/gettext/eyra-link.pot @@ -14,10 +14,6 @@ msgstr "" msgid "welcome.title" msgstr "" -#, elixir-autogen, elixir-format -msgid "console-button" -msgstr "" - #, elixir-autogen, elixir-format msgid "link.message" msgstr "" @@ -69,11 +65,3 @@ msgstr "" #, elixir-autogen, elixir-format msgid "welcome.subtitle" msgstr "" - -#, elixir-autogen, elixir-format -msgid "marketplace.button" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "link.message.interested" -msgstr "" diff --git a/core/priv/gettext/eyra-marketplace.pot b/core/priv/gettext/eyra-marketplace.pot index 0bc8967a2..325a45bfb 100644 --- a/core/priv/gettext/eyra-marketplace.pot +++ b/core/priv/gettext/eyra-marketplace.pot @@ -10,14 +10,6 @@ msgid "" msgstr "" -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "" - #, elixir-autogen, elixir-format msgid "assignment.status.complete.label" msgstr "" diff --git a/core/priv/gettext/eyra-ui.pot b/core/priv/gettext/eyra-ui.pot index 1223c014d..23ed756c7 100644 --- a/core/priv/gettext/eyra-ui.pot +++ b/core/priv/gettext/eyra-ui.pot @@ -22,10 +22,6 @@ msgstr "" msgid "menu.item.console" msgstr "" -#, elixir-autogen, elixir-format -msgid "menu.item.marketplace" -msgstr "" - #, elixir-autogen, elixir-format msgid "menu.item.profile" msgstr "" @@ -54,10 +50,6 @@ msgstr "" msgid "dashboard.title" msgstr "" -#, elixir-autogen, elixir-format -msgid "marketplace.title" -msgstr "" - #, elixir-autogen, elixir-format msgid "todo.title" msgstr "" @@ -86,22 +78,6 @@ msgstr "" msgid "tabbar.item.student.forward" msgstr "" -#, elixir-autogen, elixir-format -msgid "onboarding.forward" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "menu.item.debug" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome.forward" -msgstr "" - #, elixir-autogen, elixir-format msgid "menu.item.helpdesk" msgstr "" @@ -158,10 +134,6 @@ msgstr "" msgid "start.page.console" msgstr "" -#, elixir-autogen, elixir-format -msgid "start.page.marketplace" -msgstr "" - #, elixir-autogen, elixir-format msgid "duplicate.button" msgstr "" @@ -194,10 +166,6 @@ msgstr "" msgid "menu.item.admin" msgstr "" -#, elixir-autogen, elixir-format -msgid "menu.item.funding" -msgstr "" - #, elixir-autogen, elixir-format msgid "share.dialog.title" msgstr "" @@ -257,3 +225,7 @@ msgstr "" #, elixir-autogen, elixir-format msgid "submit.button" msgstr "" + +#, elixir-autogen, elixir-format +msgid "close.button" +msgstr "" diff --git a/core/priv/gettext/link-dashboard.pot b/core/priv/gettext/link-dashboard.pot index 6886607e3..5c7d4a76f 100644 --- a/core/priv/gettext/link-dashboard.pot +++ b/core/priv/gettext/link-dashboard.pot @@ -14,14 +14,6 @@ msgstr "" msgid "quick_summary.%{open_spot_count}.%{target_subject_count}" msgstr "" -#, elixir-autogen, elixir-format -msgid "recent-items.title" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "title" -msgstr "" - #, elixir-autogen, elixir-format, ex-autogen msgid "book.accounts.title" msgstr "" diff --git a/core/priv/gettext/link-ui.pot b/core/priv/gettext/link-ui.pot index 8216b2912..30a165871 100644 --- a/core/priv/gettext/link-ui.pot +++ b/core/priv/gettext/link-ui.pot @@ -10,22 +10,6 @@ msgid "" msgstr "" -#, elixir-autogen, elixir-format -msgid "menu.item.recruitment" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.description" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.title" -msgstr "" - -#, elixir-autogen, elixir-format -msgid "debug.title" -msgstr "" - #, elixir-autogen, elixir-format msgid "delete.confirm.campaign" msgstr "" @@ -53,7 +37,3 @@ msgstr "" #, elixir-autogen, elixir-format, ex-autogen msgid "complete.button" msgstr "" - -#, elixir-autogen, elixir-format, ex-autogen -msgid "menu.item.pools" -msgstr "" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po index 52abca90e..0f7c0c8e6 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-assignment.po @@ -217,3 +217,7 @@ msgstr "Gebruik de velden hieronder om de omslag van jouw data donatie workflow #, elixir-autogen, elixir-format, fuzzy msgid "settings.branding.title" msgstr "Branding" + +#, elixir-autogen, elixir-format +msgid "work.list.title" +msgstr "Taken" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-campaign.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-campaign.po index d7874b4dc..e9134be22 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-campaign.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-campaign.po @@ -10,10 +10,6 @@ msgid "" msgstr "" "Language: nl\n" -#, elixir-autogen, elixir-format -msgid "campaign.all.title" -msgstr "Beschikbare studies" - #, elixir-autogen, elixir-format msgid "campaign.subject.title" msgstr "Bijdragen" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-dashboard.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-dashboard.po index fd22e546a..5c8a35526 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-dashboard.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-dashboard.po @@ -17,11 +17,3 @@ msgstr "Nieuwe studie" #, elixir-autogen, elixir-format msgid "recent-items.title" msgstr "Recente items" - -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "Zodra je aan de slag gaat met Next, vind je op deze plek een overzicht van je activiteiten. Bezoek je console om snel weer verder te gaan waar je bij je vorige bezoek was gestopt." - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "Nog niet actief?" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-enums.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-enums.po index d853b70e3..725a72663 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-enums.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-enums.po @@ -373,3 +373,7 @@ msgstr "LISS" #, elixir-autogen, elixir-format, fuzzy msgid "templates.benchmark" msgstr "Benchmark" + +#, elixir-autogen, elixir-format, fuzzy +msgid "platforms.netflix" +msgstr "Netflix" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po index a0500777a..a8f1ed2e3 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-link.po @@ -14,10 +14,6 @@ msgstr "" msgid "welcome.title" msgstr "Panl" -#, elixir-autogen, elixir-format -msgid "console-button" -msgstr "Naar het console" - #, elixir-autogen, elixir-format msgid "link.message" msgstr "Panl is een marktplaats voor onderzoek. Onderzoekers kunnen hier campagnes opzetten voor het werven van deelnemers aan onderzoeksstudies. Deelnemers kunnen zich opgeven om mee te doen aan deze studies. Op dit moment wordt Panl alleen gebruikt voor student deelname aan onderzoeksstudies van de VU Amsterdam School of Business and Economics (SBE). In 2022 wordt Panl breder beschikbaar gesteld." @@ -69,11 +65,3 @@ msgstr "Voor en door onderzoekers" #, elixir-autogen, elixir-format msgid "welcome.subtitle" msgstr "Voor onderzoek" - -#, elixir-autogen, elixir-format -msgid "marketplace.button" -msgstr "Naar de marktplaats" - -#, elixir-autogen, elixir-format -msgid "link.message.interested" -msgstr "Meer weten? Stuur een e-mail naar " diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-marketplace.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-marketplace.po index 3012b5c24..cb9c327cb 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-marketplace.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-marketplace.po @@ -10,14 +10,6 @@ msgid "" msgstr "" "Language: nl\n" -#, elixir-autogen, elixir-format -msgid "empty.description" -msgstr "Op dit moment zijn er geen onderzoeksstudies beschikbaar. Zodra er een studie beschikbaar komt, wordt deze hier toegevoegd en word je op de hoogte gesteld via e-mail (vergeet niet je spam of junk mail map te checken, voor het geval dat)." - -#, elixir-autogen, elixir-format -msgid "empty.title" -msgstr "Op zoek naar een studie?" - #, elixir-autogen, elixir-format msgid "assignment.status.complete.label" msgstr "Gesloten" diff --git a/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po b/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po index 2928996d8..52e57509b 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po +++ b/core/priv/gettext/nl/LC_MESSAGES/eyra-ui.po @@ -22,10 +22,6 @@ msgstr "Opgeslagen" msgid "menu.item.console" msgstr "Mijn console" -#, elixir-autogen, elixir-format -msgid "menu.item.marketplace" -msgstr "Marktplaats" - #, elixir-autogen, elixir-format msgid "menu.item.profile" msgstr "Mijn profiel" @@ -54,10 +50,6 @@ msgstr "To-do" msgid "dashboard.title" msgstr "Mijn console" -#, elixir-autogen, elixir-format -msgid "marketplace.title" -msgstr "Marktplaats" - #, elixir-autogen, elixir-format msgid "todo.title" msgstr "To-do" @@ -86,22 +78,6 @@ msgstr "Pas profiel aan" msgid "tabbar.item.student.forward" msgstr "Selecteer opleiding" -#, elixir-autogen, elixir-format -msgid "onboarding.forward" -msgstr "Verder" - -#, elixir-autogen, elixir-format -msgid "menu.item.debug" -msgstr "Debug" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome" -msgstr "Toelichting" - -#, elixir-autogen, elixir-format -msgid "tabbar.item.welcome.forward" -msgstr "Welkom" - #, elixir-autogen, elixir-format msgid "menu.item.helpdesk" msgstr "Helpdesk" @@ -158,10 +134,6 @@ msgstr "Log in om deze pagina te bekijken" msgid "start.page.console" msgstr "Ga naar console" -#, elixir-autogen, elixir-format -msgid "start.page.marketplace" -msgstr "Ga naar marktplaats" - #, elixir-autogen, elixir-format msgid "duplicate.button" msgstr "Dupliceren" @@ -194,10 +166,6 @@ msgstr "Stuur notificatie" msgid "menu.item.admin" msgstr "Admin" -#, elixir-autogen, elixir-format, fuzzy -msgid "menu.item.funding" -msgstr "Financiën" - #, elixir-autogen, elixir-format, fuzzy msgid "share.dialog.title" msgstr "Gedeeld met" @@ -257,3 +225,7 @@ msgstr "Kopieer" #, elixir-autogen, elixir-format, fuzzy msgid "submit.button" msgstr "Opslaan" + +#, elixir-autogen, elixir-format, fuzzy +msgid "close.button" +msgstr "Sluiten" diff --git a/core/priv/gettext/nl/LC_MESSAGES/link-dashboard.po b/core/priv/gettext/nl/LC_MESSAGES/link-dashboard.po index 892250b2a..21d433ed7 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/link-dashboard.po +++ b/core/priv/gettext/nl/LC_MESSAGES/link-dashboard.po @@ -14,14 +14,6 @@ msgstr "" msgid "quick_summary.%{open_spot_count}.%{target_subject_count}" msgstr "%{open_spot_count} van %{target_subject_count} plaatsen beschikbaar" -#, elixir-autogen, elixir-format -msgid "recent-items.title" -msgstr "Recente items" - -#, elixir-autogen, elixir-format -msgid "title" -msgstr "Mijn console" - #, elixir-autogen, elixir-format, ex-autogen msgid "book.accounts.title" msgstr "Beloningen" diff --git a/core/priv/gettext/nl/LC_MESSAGES/link-ui.po b/core/priv/gettext/nl/LC_MESSAGES/link-ui.po index ea88f13eb..85368d331 100644 --- a/core/priv/gettext/nl/LC_MESSAGES/link-ui.po +++ b/core/priv/gettext/nl/LC_MESSAGES/link-ui.po @@ -10,22 +10,6 @@ msgid "" msgstr "" "Language: nl\n" -#, elixir-autogen, elixir-format -msgid "menu.item.recruitment" -msgstr "Werving" - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.description" -msgstr "Doorloop de volgende stappen om mee te kunnen doen aan onderzoeksstudies." - -#, elixir-autogen, elixir-format -msgid "onboarding.welcome.title" -msgstr "Welkom %{member}" - -#, elixir-autogen, elixir-format -msgid "debug.title" -msgstr "Debug" - #, elixir-autogen, elixir-format msgid "delete.confirm.campaign" msgstr "campagne" @@ -53,7 +37,3 @@ msgstr "Publiceren" #, elixir-autogen, elixir-format, ex-autogen, fuzzy msgid "complete.button" msgstr "Afronden" - -#, elixir-autogen, elixir-format, ex-autogen, fuzzy -msgid "menu.item.pools" -msgstr "Pools" diff --git a/core/systems/assignment/connection_view.ex b/core/systems/assignment/connection_view.ex index 3e4891994..1f27da136 100644 --- a/core/systems/assignment/connection_view.ex +++ b/core/systems/assignment/connection_view.ex @@ -96,6 +96,13 @@ defmodule Systems.Assignment.ConnectionView do {:noreply, socket |> send_event(:parent, "edit")} end + @impl true + def handle_event("change", _payload, socket) do + # TODO + Logger.error("Ghost event?!!") + {:noreply, socket} + end + @impl true def render(assigns) do ~H""" diff --git a/core/systems/assignment/crew_page.ex b/core/systems/assignment/crew_page.ex index ee8ce8ee5..5c8d413cd 100644 --- a/core/systems/assignment/crew_page.ex +++ b/core/systems/assignment/crew_page.ex @@ -119,6 +119,7 @@ defmodule Systems.Assignment.CrewPage do if storage_info = Storage.Private.storage_info(assignment) do Storage.Public.store(storage_info, panel_info, data, meta_data) + socket else message = "Please setup connection to a data storage" Logger.error(message) diff --git a/core/systems/assignment/crew_work_view.ex b/core/systems/assignment/crew_work_view.ex index 3c6205c87..1784d69ec 100644 --- a/core/systems/assignment/crew_work_view.ex +++ b/core/systems/assignment/crew_work_view.ex @@ -2,6 +2,8 @@ defmodule Systems.Assignment.CrewWorkView do use CoreWeb, :live_component_fabric use Fabric.LiveComponent + import Frameworks.Pixel.Line + alias Systems.{ Assignment, Crew, @@ -116,7 +118,7 @@ defmodule Systems.Assignment.CrewWorkView do Crew.Public.activate_task(task) - {:noreply, socket} + {:noreply, socket |> hide_child(:tool_ref_view)} end @impl true @@ -162,7 +164,7 @@ defmodule Systems.Assignment.CrewWorkView do }) do if code == 0 do Crew.Public.activate_task(task) - socket + socket |> hide_child(:tool_ref_view) else Frameworks.Pixel.Flash.put_info(socket, "Application stopped") end @@ -194,8 +196,18 @@ defmodule Systems.Assignment.CrewWorkView do <.child name={:tool_ref_view} fabric={@fabric} /> <% else %> <%= if exists?(@fabric, :work_list_view) do %> -
- <.child name={:work_list_view} fabric={@fabric} /> +
+
+ <%= dgettext("eyra-assignment", "work.list.title") %> +
+
+ <.line /> +
+
+
+ <.child name={:work_list_view} fabric={@fabric} /> +
+
diff --git a/core/systems/assignment/start_view.ex b/core/systems/assignment/start_view.ex index 56036cbb1..698086495 100644 --- a/core/systems/assignment/start_view.ex +++ b/core/systems/assignment/start_view.ex @@ -50,10 +50,6 @@ defmodule Systems.Assignment.StartView do |> start_action(item) end - defp start_action(%{function: _, props: _}, _) do - %{type: :send, event: "start"} - end - defp start_action(%{url: url}, _) do %{type: :http_get, to: url, target: "_blank"} end diff --git a/core/systems/benchmark/tool_model.ex b/core/systems/benchmark/tool_model.ex index ed65b60ee..a199cc69c 100644 --- a/core/systems/benchmark/tool_model.ex +++ b/core/systems/benchmark/tool_model.ex @@ -78,7 +78,7 @@ defmodule Systems.Benchmark.ToolModel do def open_label(_), do: dgettext("eyra-benchmark", "open.cta.title") def ready?(tool), do: Benchmark.ToolModel.ready?(tool) def form(_), do: Benchmark.Form - def launcher(_), do: %{function: fn _ -> nil end, props: %{}} + def launcher(_), do: nil def task_labels(_) do %{ diff --git a/core/systems/document/pdf_view.ex b/core/systems/document/pdf_view.ex index 3371aa514..f792e4834 100644 --- a/core/systems/document/pdf_view.ex +++ b/core/systems/document/pdf_view.ex @@ -1,19 +1,45 @@ defmodule Systems.Document.PDFView do - use CoreWeb, :html + use CoreWeb, :live_component_fabric + use Fabric.LiveComponent import Frameworks.Pixel.Line - attr(:title, :string, required: true) - attr(:url, :string, required: true) + @impl true + def update(%{title: title, url: url}, socket) do + { + :ok, + socket + |> assign(title: title, url: url) + |> compose_element(:close_button) + } + end - def pdf_view(assigns) do - send(self(), {:complete_task, %{}}) + @impl true + def compose(:close_button, %{myself: myself}) do + %{ + action: %{type: :send, event: "close", target: myself}, + face: %{type: :primary, label: dgettext("eyra-ui", "close.button")} + } + end + @impl true + def handle_event("close", _payload, socket) do + {:noreply, socket |> send_event(:parent, "complete_task")} + end + + @impl true + def render(assigns) do ~H""" -
- <%= @title %> - <.line /> +
+
+ <%= @title %> +
+
+ +
+
+ <.line />