Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for 2025 application #83

Merged
merged 1 commit into from
Sep 15, 2024
Merged

Fixes for 2025 application #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/haj/applications.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ defmodule Haj.Applications do
är du välkommen att kontakta Direqtionen på <a href="mailto:[email protected]">[email protected]</a>.
<br/><br/>
Hälsningar,<br/><br/>
Chefsgruppen för METAspexet 2024
Chefsgruppen för METAspexet #{spex.year.year}
"""
end

Expand Down
3 changes: 1 addition & 2 deletions lib/haj/spex.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ defmodule Haj.Spex do
alias Haj.Repo

alias Haj.Spex.Show
alias Haj.Spex.GroupMembership

@doc """
Returns the list of shows.
Expand Down Expand Up @@ -198,8 +199,6 @@ defmodule Haj.Spex do
Group.changeset(group, attrs)
end

alias Haj.Spex.GroupMembership

def member_of_spex?(show, user) do
query =
from gm in GroupMembership,
Expand Down
2 changes: 1 addition & 1 deletion lib/haj_web/live/apply_live/complete.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ defmodule HajWeb.ApplyLive.Complete do
required
class="mr-2 rounded border-zinc-300 text-zinc-900 focus:ring-zinc-900"
/>
Jag godkänner att de här uppgiferna lagras av METAspexet i syfte för rekrytering enligt GDPR och kommer tas bort efter rekryteringen är färdig, senast 1a Januari 2024.
Jag godkänner att de här uppgiferna lagras av METAspexet i syfte för rekrytering enligt GDPR och kommer tas bort efter rekryteringen är färdig, senast 1a Januari 2025.
</div>

<div class="col-span-6 border-t pt-4 text-right">
Expand Down
3 changes: 1 addition & 2 deletions lib/haj_web/live/apply_live/groups.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ defmodule HajWeb.ApplyLive.Groups do
groups =
Spex.get_show_groups_for_show(current_spex.id)
|> Enum.filter(fn %{application_open: o} -> o end)
# Temp manus fix, should be removed
|> Enum.sort_by(fn %{group: %{name: n}} -> n == "Manus" end, :desc)


socket =
if pre_filled? do
Expand Down
6 changes: 5 additions & 1 deletion lib/haj_web/live/group_live/admin.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
Redigera <span class="text-burgandy-600"><%= @page_title %></span>
</h1>
<.simple_form for={@form} phx-submit="save" class="flex flex-col pb-2">
<.input field={@form[:application_description]} label="Beskrivning av gruppen" type="textarea" />
<.input
field={@form[:application_description]}
label="Beskrivning av gruppen på ansökningssidan"
type="textarea"
/>
<.input
field={@form[:application_extra_question]}
label="Extra fråga i ansökan. Om du lämnar detta blankt kommer ingen extra fråga visas."
Expand Down
Loading