Skip to content

Commit

Permalink
Added team list
Browse files Browse the repository at this point in the history
  • Loading branch information
rootart committed Jul 31, 2011
1 parent 6265741 commit f16505c
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 1 deletion.
9 changes: 9 additions & 0 deletions presence/apps/people/models.py
Expand Up @@ -10,6 +10,7 @@
import datetime

from workflow.models import StateLog
from vote.models import UserVote


class Profile(models.Model):
Expand Down Expand Up @@ -60,6 +61,14 @@ def location(self):
def project(self):
return self.state_log.project

@property
def get_mood(self):
try:
mood = UserVote.objects.get_votes(self.user, 0)[0]
except IndexError:
mood = None
return mood


def create_profile(sender, **kwargs):
"""Create profile for newely created user"""
Expand Down
17 changes: 17 additions & 0 deletions presence/apps/people/templates/people/team.html
@@ -0,0 +1,17 @@
{% extends "base.html" %}
{% load i18n people_tags %}

{% block content %}
<div class="team-list">
{% for user in users %}
<div class="member">
<img src="{% gravatar user.email 100 %}" alt="{{ user.get_full_name }}">
<span>{{ user.get_full_name|default:user.username }}</span>
<span>{% trans "Currently: " %}{{ user.get_profile.state }}</span>
{% if user.get_profile.get_mood %}
<span>Mood: {{ user.get_profile.get_mood }}</span>
{% endif %}
</div>
{% endfor %}
</div>
{% endblock content %}
3 changes: 2 additions & 1 deletion presence/apps/people/urls.py
Expand Up @@ -4,5 +4,6 @@
'people.views',
url(r'^invite/$', 'invite_user', name='invite-user'),
url(r'^edit/$', 'profile_edit', name='profile-edit'),
url(r'^(?P<id>\d+)/$', 'profile_details', name='profile-details')
url(r'^(?P<id>\d+)/$', 'profile_details', name='profile-details'),
url(r'^team/$', 'team_list', name='team-list')
)
13 changes: 13 additions & 0 deletions presence/apps/people/views.py
Expand Up @@ -74,3 +74,16 @@ def profile_details(request, id):
}
return render_to_response('people/profile-details.html', data,
RequestContext(request))


@login_required
def team_list(request):
users = User.objects.filter(is_active=True)

data = {
'users': users
}

return render_to_response('people/team.html', data,
RequestContext(request))

0 comments on commit f16505c

Please sign in to comment.