diff --git a/.DS_Store b/.DS_Store index a6aaa87d..8e9c863a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store index caeca3b7..13864498 100644 Binary files a/osinaweb/.DS_Store and b/osinaweb/.DS_Store differ diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index fb1d5610..b9e2da78 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/.DS_Store b/osinaweb/osinacore/.DS_Store index 5f204903..fd9444fd 100644 Binary files a/osinaweb/osinacore/.DS_Store and b/osinaweb/osinacore/.DS_Store differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index 1b3ea565..bb844e2b 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html index e029783d..5eff031d 100644 --- a/osinaweb/osinacore/templates/details_templates/project-details.html +++ b/osinaweb/osinacore/templates/details_templates/project-details.html @@ -107,7 +107,7 @@

Member(s):

- {% for member in project.members.all %} + {% for member in members %}
@@ -124,7 +124,9 @@

-

Working Hours: 0hr 0min 0sec

+ {% if request.user.is_superuser %} +

Working Hours: {{member.total_time_worked_hours}}hr {{member.total_time_worked_minutes}}min {{member.total_time_worked_seconds}}sec

+ {% endif %}
{% endfor %}
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 993deeed..2dc8fdf5 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -619,10 +619,30 @@ def projectdetails(request, project_id): project_notes = Note.objects.filter(project=project).order_by('-id') + + + members = project.members.all() + + for member in members: + tasks = project.task_set.filter(assigned_to=member) + total_time_seconds = 0 + for task in tasks: + total_time_hours, total_time_minutes, total_time_seconds_task = task.total_task_time() + total_time_seconds += (total_time_hours * 3600) + (total_time_minutes * 60) + total_time_seconds_task + + total_time_hours = total_time_seconds // 3600 + total_time_minutes = (total_time_seconds % 3600) // 60 + total_time_seconds = total_time_seconds % 60 + + member.total_time_worked_hours = total_time_hours + member.total_time_worked_minutes = total_time_minutes + member.total_time_worked_seconds = total_time_seconds + context = { 'project': project, 'epics': epics, 'project_notes' : project_notes, + 'members': members, } return render(request, 'details_templates/project-details.html', context)