Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
4c6cbebc
Commit
4c6cbebc
authored
Sep 13, 2017
by
Bram in 't Zandt
Browse files
Force start and end date to be within comittee start and end date
parent
9d45b2aa
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/activemembers/locale/nl/LC_MESSAGES/django.mo
View file @
4c6cbebc
No preview for this file type
website/activemembers/locale/nl/LC_MESSAGES/django.po
View file @
4c6cbebc
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-0
7-05
19:
09
+0200\n"
"PO-Revision-Date: 2017-0
8
-1
7
1
1:41
+0200\n"
"POT-Creation-Date: 2017-0
9-13
19:
42
+0200\n"
"PO-Revision-Date: 2017-0
9
-1
3
1
9:50
+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -54,101 +54,109 @@ msgstr "contact mailinglijst"
msgid "Wiki namespace"
msgstr "Wiki namespace"
#: models.py:12
1
models.py:12
4
#: models.py:12
3
models.py:12
6
msgid "Please use either the mailing list or email address option."
msgstr "Selecteer een mailinglijst óf vul een e-mailadres in."
#: models.py:13
5
#: models.py:13
7
msgid "committee"
msgstr "commissie"
#: models.py:13
6
templates/activemembers/committee_index.html:7
#: models.py:13
8
templates/activemembers/committee_index.html:7
msgid "committees"
msgstr "commissies"
#: models.py:15
7
#: models.py:15
9
msgid "Is this a board"
msgstr "Is dit een bestuur"
#: models.py:16
4
#: models.py:16
6
msgid "Access the board wiki"
msgstr ""
#: models.py:19
0
models.py:19
1
#: models.py:19
2
models.py:19
3
msgid "A board already exists for those years"
msgstr "Er bestaat al een bestuur voor die jaren"
#: models.py:2
09
models.py:3
42
#: models.py:2
11
models.py:3
50
msgid "Member"
msgstr "Lid"
#: models.py:21
5
#: models.py:21
7
msgid "Committee"
msgstr "Commissie"
#: models.py:21
9
#: models.py:2
2
1
msgid "Committee member since"
msgstr "Commissielid sinds"
#: models.py:22
0
#: models.py:22
2
msgid "The date this member joined the committee in this role"
msgstr "De datum waarop deze persoon lid werd deze commissie in deze rol"
#: models.py:22
5
#: models.py:22
7
msgid "Committee member until"
msgstr "Commissielid tot"
#: models.py:22
6
#: models.py:22
8
msgid "A member of this committee until this time (can't be in the future)."
msgstr ""
"De datum waarop deze persoon de commissie verliet (kan niet in de toekomst "
"liggen)"
#: models.py:23
3
#: models.py:23
5
msgid "Chair of the committee"
msgstr "Voorzitter van de commissie"
#: models.py:23
4
#: models.py:23
6
msgid "There can only be one chair at a time!"
msgstr "Er kan maar één voorzitter tegelijkertijd zijn!"
#: models.py:24
0
#: models.py:24
2
msgid "role"
msgstr "rol"
#: models.py:24
1
#: models.py:24
3
msgid "The role of this member"
msgstr "De rol van dit lid binnen de commissie"
#: models.py:26
7
#: models.py:26
9
msgid "End date can't be before start date"
msgstr "De einddatum kan niet voor de startdatum liggen"
#: models.py:27
0
#: models.py:27
2
msgid "End date can't be in the future"
msgstr "De einddatum kan niet in de toekomst liggen"
#: models.py:274
#: models.py:276
msgid "Start date can't be before committee start date"
msgstr "De begindatum kan niet voor de begindatum van de commissie liggen"
#: models.py:279
msgid "Start date can't be after committee end date"
msgstr "De begindatum kan niet na de einddatum van de commissie liggen"
#: models.py:284
msgid "End date cannot be set for boards"
msgstr "Voor besturen kan geen einddatum worden opgegeven"
#: models.py:
298
#: models.py:
307
msgid "There already is a chair for this time period"
msgstr "Er is al een voorzitter voor deze periode"
#: models.py:3
1
4
#: models.py:3
2
4
msgid "This member is already in the committee for this period"
msgstr "Deze persoon is al lid van deze commissie in de aangegeven periode"
#: models.py:3
3
4
#: models.py:34
2
msgid "committee membership"
msgstr "commissielidmaatschap"
#: models.py:33
5
#: models.py:3
4
3
msgid "committee memberships"
msgstr "commissielidmaatschappen"
#: models.py:3
47
#: models.py:3
55
#, python-brace-format
msgid "{name} mentor in {year}"
msgstr "{name} mentor in {year}"
...
...
website/activemembers/models.py
View file @
4c6cbebc
...
...
@@ -270,6 +270,17 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
if
self
.
until
and
self
.
until
>
timezone
.
now
().
date
():
raise
ValidationError
(
{
'until'
:
_
(
"End date can't be in the future"
)})
if
(
self
.
since
and
self
.
committee
.
since
and
self
.
since
<
self
.
committee
.
since
):
raise
ValidationError
(
{
'since'
:
_
(
"Start date can't be before committee start date"
)}
)
if
(
self
.
since
and
self
.
committee
.
until
and
self
.
since
>
self
.
committee
.
until
):
raise
ValidationError
(
{
'since'
:
_
(
"Start date can't be after committee end date"
)})
try
:
if
self
.
until
and
self
.
committee
.
board
:
raise
ValidationError
(
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment