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
eb6765ec
Verified
Commit
eb6765ec
authored
Apr 12, 2017
by
Sébastiaan Versteeg
Browse files
Make sure boards 'end' on profile page and sort multiple memberships of same committee by date.
parent
ae728405
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/views.py
View file @
eb6765ec
...
...
@@ -100,23 +100,26 @@ def profile(request, pk=None):
memberships
=
member
.
committeemembership_set
.
all
()
achievements
=
{}
for
membership
in
memberships
:
period
=
{
'since'
:
membership
.
since
,
'until'
:
membership
.
until
,
'chair'
:
membership
.
chair
}
if
(
membership
.
until
is
None
and
hasattr
(
membership
.
committee
,
'board'
)):
period
[
'until'
]
=
membership
.
committee
.
board
.
until
name
=
membership
.
committee
.
name
if
achievements
.
get
(
name
):
achievements
[
name
][
'periods'
].
append
({
'since'
:
membership
.
since
,
'until'
:
membership
.
until
,
'chair'
:
membership
.
chair
})
achievements
[
name
][
'periods'
].
append
(
period
)
if
achievements
[
name
][
'earliest'
]
>
membership
.
since
:
achievements
[
name
][
'earliest'
]
=
membership
.
since
achievements
[
name
][
'periods'
].
sort
(
key
=
lambda
x
:
x
[
'since'
])
else
:
achievements
[
name
]
=
{
'name'
:
name
,
'periods'
:
[{
'since'
:
membership
.
since
,
'until'
:
membership
.
until
,
'chair'
:
membership
.
chair
}],
'periods'
:
[
period
],
'earliest'
:
membership
.
since
,
}
mentor_years
=
member
.
mentorship_set
.
all
()
...
...
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