Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
roomlist
Commits
f488cf45
Commit
f488cf45
authored
Nov 09, 2015
by
Daniel W Bond
Browse files
support for showing gender on profile page
parent
d6dc6ee5
Changes
4
Hide whitespace changes
Inline
Side-by-side
roomlist/accounts/forms.py
View file @
f488cf45
...
...
@@ -63,6 +63,8 @@ class StudentUpdateForm(forms.Form):
gender
=
MultiSelectFormField
(
choices
=
Student
.
GENDER_CHOICES
,
label
=
'Gender Identity (please choose all that apply)'
,
required
=
False
)
show_gender
=
forms
.
BooleanField
(
label
=
'Show your gender on your profile?'
,
required
=
False
)
room
=
SelectRoomField
(
queryset
=
Room
.
objects
.
all
(),
label
=
''
,
required
=
False
)
...
...
@@ -82,10 +84,13 @@ class StudentUpdateForm(forms.Form):
class
WelcomeNameForm
(
forms
.
Form
):
first_name
=
forms
.
CharField
(
label
=
'First Name'
)
last_name
=
forms
.
CharField
(
label
=
'Last Name'
)
first_name
=
forms
.
CharField
(
label
=
'First Name'
,
required
=
False
)
last_name
=
forms
.
CharField
(
label
=
'Last Name'
,
required
=
False
)
gender
=
MultiSelectFormField
(
choices
=
Student
.
GENDER_CHOICES
,
label
=
'Gender Identity (please choose all that apply)'
)
label
=
'Gender Identity (please choose all that apply)'
,
required
=
False
)
show_gender
=
forms
.
BooleanField
(
label
=
'Show your gender on your profile?'
,
required
=
False
)
class
WelcomePrivacyForm
(
forms
.
ModelForm
):
...
...
roomlist/accounts/models.py
View file @
f488cf45
...
...
@@ -122,6 +122,7 @@ class Student(TimeStampedModel):
# selectmultiple in forms
gender
=
MultiSelectField
(
max_length
=
25
,
choices
=
GENDER_CHOICES
,
blank
=
True
)
show_gender
=
models
.
BooleanField
(
default
=
False
)
privacy
=
models
.
CharField
(
max_length
=
100
,
choices
=
PRIVACY_CHOICES
,
default
=
FLOOR
)
...
...
roomlist/accounts/templates/detailStudent.html
View file @
f488cf45
...
...
@@ -69,6 +69,23 @@
<tr>
<td><h4><strong>
Email
</strong>
: {{ student.user.email }}
</h4></td>
</tr>
{% if student.show_gender %}
<tr>
<td><h4><strong>
Gender
</strong>
:
{% for gender in student.gender %}
{% if gender == 'female' %}
<i
class=
"fa fa-venus"
></i>
{% elif gender == 'male' %}
<i
class=
"fa fa-mars"
></i>
{% elif gender == 'trans' %}
<i
class=
"fa fa-transgender"
></i>
{% elif gender == 'other' %}
<i
class=
"fa fa-transgender-alt"
></i>
{% endif %}
{% endfor %}
</h4></td>
</tr>
{% endif %}
</tbody>
</table>
</div>
...
...
roomlist/accounts/views.py
View file @
f488cf45
...
...
@@ -215,6 +215,7 @@ class UpdateStudent(LoginRequiredMixin, FormValidMessageMixin, FormView):
form
=
StudentUpdateForm
(
initial
=
{
'first_name'
:
me
.
user
.
first_name
,
'last_name'
:
me
.
user
.
last_name
,
'gender'
:
me
.
gender
,
'show_gender'
:
me
.
show_gender
,
'room'
:
pk_or_none
(
me
,
me
.
room
),
'privacy'
:
me
.
privacy
,
'major'
:
pk_or_none
(
me
,
me
.
major
),
...
...
@@ -264,6 +265,7 @@ class UpdateStudent(LoginRequiredMixin, FormValidMessageMixin, FormView):
me
.
user
.
first_name
=
form
.
data
[
'first_name'
]
me
.
user
.
last_name
=
form
.
data
[
'last_name'
]
me
.
gender
=
form
.
data
.
getlist
(
'gender'
)
me
.
show_gender
=
form
.
data
.
get
(
'show_gender'
,
False
)
me
.
privacy
=
form
.
data
[
'privacy'
]
me
.
graduating_year
=
form
.
data
[
'graduating_year'
]
...
...
@@ -300,7 +302,8 @@ class WelcomeName(LoginRequiredMixin, FormView):
form
=
WelcomeNameForm
(
initial
=
{
'first_name'
:
me
.
user
.
first_name
,
'last_name'
:
me
.
user
.
last_name
,
'gender'
:
me
.
gender
,
})
'gender'
:
me
.
gender
,
'show_gender'
:
me
.
show_gender
,
})
context
[
'my_form'
]
=
form
return
context
...
...
@@ -316,6 +319,7 @@ class WelcomeName(LoginRequiredMixin, FormView):
me
.
user
.
last_name
=
form
.
data
[
'last_name'
]
me
.
gender
=
form
.
data
.
getlist
(
'gender'
)
me
.
show_gender
=
form
.
data
.
get
(
'show_gender'
,
False
)
me
.
completedName
=
True
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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