diff --git a/users/templates/partials/contractor_profile_tabs.html b/users/templates/partials/contractor_profile_tabs.html index e2a294d..9bd2e53 100644 --- a/users/templates/partials/contractor_profile_tabs.html +++ b/users/templates/partials/contractor_profile_tabs.html @@ -21,8 +21,7 @@ в процессе обсуждения
-{#
0
#} -
{{ contractor|get_project_message_count }}
+
{% get_open_projects_grouped request.user %}
diff --git a/users/templatetags/user_tags.py b/users/templatetags/user_tags.py index 3a843a1..48753b3 100644 --- a/users/templatetags/user_tags.py +++ b/users/templatetags/user_tags.py @@ -123,3 +123,19 @@ def get_project_message_count(user): message_count += user.team.answers.filter(project__state='active', rejected=False).aggregate(c=Count('messages'))['c'] return message_count + + +@register.simple_tag +def get_open_projects_grouped(contractor): + private_open_projects = tuple( + a.project for a in contractor.contractor_answers.filter(project__state='active', rejected=False)) + + try: + team_open_projects = tuple( + a.project for a in contractor.team.answers.filter(project__state='active', rejected=False)) + except: + team_open_projects = () + + open_project_projects = len(private_open_projects) + len(team_open_projects) + + return open_project_projects