diff --git a/osinaweb/osinacore/templates/projects-dashboard.html b/osinaweb/osinacore/templates/projects-dashboard.html index 9b45d0ae..2712e3bf 100644 --- a/osinaweb/osinacore/templates/projects-dashboard.html +++ b/osinaweb/osinacore/templates/projects-dashboard.html @@ -6,41 +6,14 @@ -
+

Projects Dashboard

@@ -91,27 +64,27 @@
-
-
- +
+ +
- - - - - - - + + + + + + + {% for point in points %} - - - - + + + + -
ProjectTaskPointStatusAssigned ToTime SpentLast ActivityProjectTaskPointStatusAssigned ToTime SpentLast Activity
{{ point.task.project.name }}{{ point.task.name }}{{ point.text|truncatechars:30 }} + {{ point.task.project.name }}{{ point.task.name }}{{ point.text|truncatechars:30 }} {{ point.task.assigned_to.user.first_name }} {{ point.task.assigned_to.user.last_name }} {% with point.total_activity_time as time %} {{ time.0 }}h {{ time.1 }}m {% endwith %} + {% with point.pointactivity_set.last as last_activity %} {% if last_activity %} - {{ last_activity.end_time|date:"m/d H:i" }} + {{ last_activity.end_time|date:"j F H:i" }} {% else %} - {% endif %} @@ -143,7 +116,9 @@ {% endfor %}
-
+ +
+
{% if points.has_previous %} @@ -168,9 +143,6 @@ {% endif %}
- -
-