Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Paweljong
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Teckids
Projekt Hack-n-Fun
AlekSIS-App-Paweljong
Commits
a752dcd9
Verified
Commit
a752dcd9
authored
3 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
Update help texts
parent
2bc76ba7
No related branches found
No related tags found
1 merge request
!1
Reformat and cleanup
Pipeline
#56056
failed
3 years ago
Stage: prepare
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/paweljong/forms.py
+34
-33
34 additions, 33 deletions
aleksis/apps/paweljong/forms.py
with
34 additions
and
33 deletions
aleksis/apps/paweljong/forms.py
+
34
−
33
View file @
a752dcd9
...
@@ -174,9 +174,9 @@ class EditVoucherForm(forms.ModelForm):
...
@@ -174,9 +174,9 @@ class EditVoucherForm(forms.ModelForm):
),
),
}
}
help_texts
=
{
help_texts
=
{
"
event
"
:
_
(
"
Event the voucher is valid for
.
"
),
"
event
"
:
_
(
"
Event the voucher is valid for
"
),
"
person
"
:
_
(
"
Person the voucher is valid for
.
"
),
"
person
"
:
_
(
"
Person the voucher is valid for
"
),
"
discount
"
:
_
(
"
Voucher discount
.
"
),
"
discount
"
:
_
(
"
Voucher discount
"
),
}
}
...
@@ -186,18 +186,18 @@ class GenerateListForm(forms.Form):
...
@@ -186,18 +186,18 @@ class GenerateListForm(forms.Form):
group
=
forms
.
ModelChoiceField
(
group
=
forms
.
ModelChoiceField
(
label
=
_
(
"
Group
"
),
label
=
_
(
"
Group
"
),
queryset
=
Group
.
objects
.
all
(),
queryset
=
Group
.
objects
.
all
(),
help_text
=
_
(
"
Select group to generate list
.
"
),
help_text
=
_
(
"
Select group to generate list
"
),
)
)
template
=
forms
.
ChoiceField
(
template
=
forms
.
ChoiceField
(
label
=
_
(
"
Template
"
),
label
=
_
(
"
Template
"
),
choices
=
TEMPLATE_CHOICES
,
choices
=
TEMPLATE_CHOICES
,
help_text
=
_
(
"
Select template to generate list
.
"
),
help_text
=
_
(
"
Select template to generate list
"
),
)
)
landscape
=
forms
.
BooleanField
(
landscape
=
forms
.
BooleanField
(
label
=
_
(
"
Landscape
"
),
label
=
_
(
"
Landscape
"
),
help_text
=
_
(
"
Select if output should be in landscape
.
"
),
help_text
=
_
(
"
Select if output should be in landscape
"
),
required
=
False
,
required
=
False
,
)
)
...
@@ -219,7 +219,7 @@ class RegisterEventGuardians(ExtensibleForm):
...
@@ -219,7 +219,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
)
guardian_first_name
=
forms
.
CharField
(
guardian_first_name
=
forms
.
CharField
(
label
=
_
(
"
Guardians first name
"
),
label
=
_
(
"
Guardian
'
s first name
"
),
help_text
=
_
(
help_text
=
_
(
"
Please enter the first name of the legal guardian who will fill in the registration
"
"
Please enter the first name of the legal guardian who will fill in the registration
"
"
with you and who can be reached during the event in an emergency.
"
"
with you and who can be reached during the event in an emergency.
"
...
@@ -227,7 +227,7 @@ class RegisterEventGuardians(ExtensibleForm):
...
@@ -227,7 +227,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
)
guardian_last_name
=
forms
.
CharField
(
guardian_last_name
=
forms
.
CharField
(
label
=
_
(
"
Guardians last name
"
),
label
=
_
(
"
Guardian
'
s last name
"
),
help_text
=
_
(
help_text
=
_
(
"
Please enter the last name of the legal guardian who will fill in the registration
"
"
Please enter the last name of the legal guardian who will fill in the registration
"
"
with you and who can be reached during the event in an emergency.
"
"
with you and who can be reached during the event in an emergency.
"
...
@@ -235,7 +235,7 @@ class RegisterEventGuardians(ExtensibleForm):
...
@@ -235,7 +235,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
)
guardian_mobile_number
=
PhoneNumberField
(
guardian_mobile_number
=
PhoneNumberField
(
label
=
_
(
"
Guardians mobile number
"
),
label
=
_
(
"
Guardian
'
s mobile number
"
),
help_text
=
_
(
help_text
=
_
(
"
We need the mobile phone number for emergencies if we
"
"
We need the mobile phone number for emergencies if we
"
"
urgently need to reach your parents during the event.
"
"
urgently need to reach your parents during the event.
"
...
@@ -243,7 +243,7 @@ class RegisterEventGuardians(ExtensibleForm):
...
@@ -243,7 +243,7 @@ class RegisterEventGuardians(ExtensibleForm):
)
)
guardian_email
=
forms
.
EmailField
(
guardian_email
=
forms
.
EmailField
(
label
=
_
(
"
Guardians email address
"
),
label
=
_
(
"
Guardian
'
s email address
"
),
)
)
...
@@ -317,9 +317,7 @@ class RegisterEventContactDetails(ExtensibleForm):
...
@@ -317,9 +317,7 @@ class RegisterEventContactDetails(ExtensibleForm):
label
=
_
(
"
Sex
"
),
label
=
_
(
"
Sex
"
),
help_text
=
_
(
help_text
=
_
(
"
For various reasons, e.g. because we have to keep gender segregation during the night
"
"
For various reasons, e.g. because we have to keep gender segregation during the night
"
"
for legal reasons, we need to know if you are a boy or a girl.
"
"
for legal reasons, we need to know if you are a boy or a girl.
"
"
With some names this is not always immediately recognizable, so we ask you to
"
"
indicate it here.
"
),
),
choices
=
Person
.
SEX_CHOICES
,
choices
=
Person
.
SEX_CHOICES
,
initial
=
None
,
initial
=
None
,
...
@@ -327,21 +325,24 @@ class RegisterEventContactDetails(ExtensibleForm):
...
@@ -327,21 +325,24 @@ class RegisterEventContactDetails(ExtensibleForm):
email
=
forms
.
EmailField
(
email
=
forms
.
EmailField
(
label
=
_
(
"
Email address
"
),
label
=
_
(
"
Email address
"
),
help_text
=
_
(
"
Please use your perosnal e-mail address here, which you will check
"
"
personally. Important information will always be sent to your parents
"
"
as well. Do not use an e-mail address owned by your parents here.
"
),
)
)
school
=
forms
.
CharField
(
school
=
forms
.
CharField
(
label
=
_
(
"
School
"
),
label
=
_
(
"
School
"
),
help_text
=
_
(
"
Please enter the name of your school
as exactly as it should be written
.
"
),
help_text
=
_
(
"
Please enter the name of your school.
"
),
)
)
school_place
=
forms
.
CharField
(
school_place
=
forms
.
CharField
(
label
=
_
(
"
School place
"
),
label
=
_
(
"
School place
"
),
help_text
=
_
(
"
Enter the place (city) where your school is located
(without a district)
.
"
),
help_text
=
_
(
"
Enter the place (city) where your school is located.
"
),
)
)
school_class
=
forms
.
CharField
(
school_class
=
forms
.
CharField
(
label
=
_
(
"
School class
"
),
label
=
_
(
"
School class
"
),
help_text
=
_
(
"
Please enter the class you are
going to
(e.g. 8a).
"
),
help_text
=
_
(
"
Please enter the class you are
in
(e.g. 8a).
"
),
)
)
...
@@ -361,6 +362,12 @@ class RegisterEventAdditional(ExtensibleForm):
...
@@ -361,6 +362,12 @@ class RegisterEventAdditional(ExtensibleForm):
class
Meta
:
class
Meta
:
model
=
EventRegistration
model
=
EventRegistration
fields
=
[
"
medical_information
"
,
"
comment
"
]
fields
=
[
"
medical_information
"
,
"
comment
"
]
help_texts
=
{
"
medical_informaiton
"
:
_
(
"
If there are any medically important things we need to
"
"
consider, e.g. when making food or to make sure you take
"
"
prescribed medication, please enter it here.
"
),
"
comment
"
:
_
(
"
You can write down any remarks you want to tell us here.
"
),
}
def
__init__
(
self
,
event
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
event
,
*
args
,
**
kwargs
):
super
().
__init__
(
*
args
,
**
kwargs
)
super
().
__init__
(
*
args
,
**
kwargs
)
...
@@ -396,26 +403,20 @@ class RegisterEventFinancial(ExtensibleForm):
...
@@ -396,26 +403,20 @@ class RegisterEventFinancial(ExtensibleForm):
model
=
EventRegistration
model
=
EventRegistration
fields
=
[
"
voucher_code
"
,
"
iban
"
,
"
donation
"
,
"
accept_sepa
"
]
fields
=
[
"
voucher_code
"
,
"
iban
"
,
"
donation
"
,
"
accept_sepa
"
]
help_texts
=
{
help_texts
=
{
"
voucher
"
:
_
(
"
donation
"
:
_
(
"
If you have a voucher for the event, enter the code here.
"
"
It will be charged automatically.
"
),
"
donation
"
:
(
"
Our association would like to offer all children and young
"
"
Our association would like to offer all children and young
"
"
people the opportunity to participate in our events.
Often
,
"
"
people the opportunity to participate in our events.
Sometimes
,
"
"
however,
the
famil
y fee
cannot
be paid
. We therefore have a
"
"
however, famil
ies
cannot
afford the full fee
. We therefore have a
"
"
budget from which we can promote participation after we have
"
"
budget from which we can promote participation after we have
"
"
carefully examined the necessity and eligibility. We rely on
"
"
carefully examined the necessity and eligibility. We rely on
"
"
donations for this budget. If you would like to donate a voluntary
"
"
donations for this budget. If you would like to donate a voluntary
"
"
additional amount for this budget, please indicate this here. We do
"
"
additional amount for this budget, please indicate this here.
"
"
not permanently save whether and if so in what amount donations are
"
"
made and also not within the association, e.g. passed on to leisure supervisors.
"
),
),
"
accept_sepa
"
:
_
(
"
accept_sepa
"
:
_
(
"
Parents: I authorize the creditor
e.V., Rochusstr. 2-4
, 531
23
Bonn with
"
"
Parents: I authorize the creditor
Teckids e.V., Kennedyallee 18
, 531
75
Bonn with
"
"
creditor ID DE70
FZT
00001497650, to collect the participant fee from my account
"
"
creditor ID DE70
ZZZ
00001497650, to collect the participant fee from my account
"
"
once using the SEPA core direct debit. At the same time, I instruct my bank to
"
"
once using the SEPA core direct debit. At the same time, I instruct my bank to
"
"
redeem the SEPA core direct debit withdrawn from my account by e.V.
"
"
redeem the SEPA core direct debit withdrawn from my account by
Teckids
e.V.
"
),
),
"
iban
"
:
_
(
"
iban
"
:
_
(
"
If your parents want to pay by SEPA direct debit,
"
"
If your parents want to pay by SEPA direct debit,
"
...
@@ -438,10 +439,10 @@ class RegisterEventConsent(ExtensibleForm):
...
@@ -438,10 +439,10 @@ class RegisterEventConsent(ExtensibleForm):
fields
=
[
"
accept_terms
"
,
"
accept_data
"
,
"
accept_general_terms
"
]
fields
=
[
"
accept_terms
"
,
"
accept_data
"
,
"
accept_general_terms
"
]
help_texts
=
{
help_texts
=
{
"
accept_terms
"
:
_
(
"
accept_terms
"
:
_
(
"
Parents: My child filled out the registration form t
ogether with me, but myself,
"
"
Parents: My child filled out the registration form t
hemselves, and in my presence.
"
"
and
I agree
to
the participation, the terms of use and the terms and conditions.
"
"
I agree
with
the participation, the terms of use and the terms and conditions.
"
"
I am aware that the registration is binding and that withdrawal is only possible
"
"
I am aware that the registration is binding and that withdrawal is only possible
"
"
in exceptional cases with a
valid
reason. In addition, I agree to pay the
"
"
in exceptional cases with a
n important
reason. In addition, I agree to pay the
"
"
participation fee in advance and agree to the reimbursement guidelines
"
"
participation fee in advance and agree to the reimbursement guidelines
"
"
mentioned above.
"
"
mentioned above.
"
),
),
...
@@ -451,7 +452,7 @@ class RegisterEventConsent(ExtensibleForm):
...
@@ -451,7 +452,7 @@ class RegisterEventConsent(ExtensibleForm):
"
age of 16, my parents also agree to this and I can prove this on request
"
"
age of 16, my parents also agree to this and I can prove this on request
"
"
(e.g. by making contact with my parents).
"
"
(e.g. by making contact with my parents).
"
),
),
"
accept_general_terms
"
:
_
(
"
I agree with the
AGB
and have read them.
"
),
"
accept_general_terms
"
:
_
(
"
I agree with the
terms and conditions
and have read them.
"
),
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment