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

deactivates the pupil signup for selected chapters #98

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

deactivates the pupil signup for selected chapters #98

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
288ba09
deactivates the pupil signup for selected chapters
kleinicke Mar 24, 2023
f880486
adds partner organizations to map and list
kleinicke Mar 24, 2023
8b82776
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 24, 2023
244d6f2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 24, 2023
68711e9
refactor src/routes/+layout.ts
janosh Mar 24, 2023
c538710
Merge branch 'main' into feature/external_orgs
kleinicke Jun 7, 2023
8caa1ed
uses single select status instead of boolean values
kleinicke Jun 7, 2023
29af134
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 7, 2023
2731f79
adds minor visualization improvements using the new chapter status
kleinicke Jun 9, 2023
81a66e0
Merge branch 'main' into feature/deactivate_pupils
kleinicke Jun 9, 2023
4e398d3
Merge branch 'feature/external_orgs' into feature/deactivate_pupils
kleinicke Jun 9, 2023
ba0fed0
Merge branch 'main' into feature/deactivate_pupils
kleinicke Jun 9, 2023
7e383c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 9, 2023
5c4f712
added option for signups at chapter view. These are used for visualiz…
kleinicke Jun 9, 2023
ae997a3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 9, 2023
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
1 change: 1 addition & 0 deletions src/lib/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const chapters_query = `{
}
baseId
acceptsSignups
deactivatePupils
token
}
}
Expand Down
1 change: 1 addition & 0 deletions src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export type Chapter = {
}
baseId: string
acceptsSignups: boolean
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is maybe not the most future-proof interface for managing signup state of chapters.

How about we use acceptsSignups: Record<'students' | 'pupils', boolean> = {students: true, pupils: false} ?

deactivatePupils: boolean
token: string
}

Expand Down
1 change: 1 addition & 0 deletions src/routes/signup-pupil/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import raw_form from '../../signup-form/de/pupil.yml'
export const load: PageServerLoad = async () => {
let chapters = await fetch_chapters()
chapters = chapters.filter((chap) => chap.acceptsSignups)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a particular reason why you don't combine these filters?

let chapters = await fetch_chapters()
chapters = chapters.filter((chap) => chap.acceptsSignups && !chap.deactivatePupils)

chapters = chapters.filter((chap) => !chap.deactivatePupils)

const form = parse_form_data({ ...raw_form, ...messages })

Expand Down
50 changes: 49 additions & 1 deletion src/routes/standorte/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<BasePage {page}>
<!-- Buttons at the end of the chapter pages to contact the dfferent chapter manager by mail
showSignupButtons should be set false when chapter is still in setup -->
{#if page?.yaml?.showSignupButtons !== false}
{#if page?.yaml?.showSignupButtons !== false && page?.yaml?.allowPupils !== false}
<h2 style="text-align: center; margin-top: 2em;">{$microcopy?.location?.register}</h2>
<section>
<span>
Expand Down Expand Up @@ -61,6 +61,54 @@
>
</span>
</section>
{:else if page?.yaml?.allowPupils == false}
<h2 style="text-align: center; margin-top: 2em;">{$microcopy?.location?.register}</h2>
<section>
<span>
{$microcopy?.location?.joinStudent}
<a href="/signup-student?chapter={page.title}" class="btn blue">
<Icon inline icon="fa-solid:graduation-cap" {style} />{$microcopy?.location
?.registerStudent}
</a>
<a href={$microcopy?.location?.linkStudentInfo} class="btn blue stroke">
<Icon
inline
icon="bi:info-circle-fill"
style={style + `margin-right: 6pt;`}
/>{$microcopy?.location?.infoStudentButton}
</a>
</span>
<span>
{$microcopy?.location?.joinPupil}
<a class="btn green">
<Icon inline icon="fa-solid:child" {style} />{$microcopy?.location
?.declinePupil}
</a>
<a href={$microcopy?.location?.linkPupilInfo} class="btn green stroke">
<Icon
inline
icon="bi:info-circle-fill"
style={style + `margin-right: 6pt;`}
/>{$microcopy?.location?.infoPupilButton}</a
>
</span>
<span>
{$microcopy?.location?.locationManagement}
<a
href="mailto:info.{slug}{$microcopy?.location?.mailTo} {page.title}"
class="btn orange"
>
<Icon inline icon="ic:email" {style} />{$microcopy?.location?.writeMailButton}
</a>
<a href={$microcopy?.location?.linkLeadingInfo} class="btn orange stroke">
<Icon
inline
icon="bi:info-circle-fill"
style={style + `margin-right: 6pt;`}
/>{$microcopy?.location?.infoLeadingButton}</a
>
</span>
</section>
{/if}

<svelte:fragment slot="afterBody">
Expand Down