[chronojump-server] Added coach column to player tasks table



commit aa9292cb07ab6504b95de2ee5c6ae6ccdbf1e0f1
Author: Max Ros i Morejon <mros33 gmail com>
Date:   Fri Jul 12 13:14:30 2019 +0200

    Added coach column to player tasks table

 .../chronojump_networks/tasks/api/serializers.py   |  3 ++-
 .../organizations/groups/group_players_list.html   | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/tasks/api/serializers.py 
b/chronojumpserver-django/chronojump_networks/tasks/api/serializers.py
index d1e6234..24fd9b9 100644
--- a/chronojumpserver-django/chronojump_networks/tasks/api/serializers.py
+++ b/chronojumpserver-django/chronojump_networks/tasks/api/serializers.py
@@ -6,10 +6,11 @@ class PlayerTaskSerializer(serializers.ModelSerializer):
     exercise = serializers.StringRelatedField()
     gym = serializers.StringRelatedField()
     station = serializers.StringRelatedField()
+    coach = serializers.StringRelatedField()
 
     class Meta:
         model = Task
-        fields = [ 'id', 'ts', 'sets', 'nreps', 'load', 'speed', 'gym', 'station', 'exercise', 'done']
+        fields = [ 'id', 'ts', 'sets', 'nreps', 'load', 'speed', 'gym', 'station', 'exercise', 'done', 
'coach']
 
 
 class TaskSerializer(serializers.ModelSerializer):
diff --git 
a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html 
b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
index 9c6e9e4..a235146 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/group_players_list.html
@@ -109,7 +109,6 @@
       ],
       {% endif %}
       "columns": [
-        {% if user.id == group.responsible.id %}
         {
                        type: "html",
                        orderable:false,
@@ -117,7 +116,6 @@
                                return '<input class="selectPlayerCheckbox" type="checkbox" data-player-id="' 
+ row.id + '"/>';
                        }
                },
-        {% endif %}
         {
                        type: "html",
                        title: "",
@@ -259,7 +257,7 @@
           html += "<th>{% trans 'Station' %}</th><th>{% trans 'Exercise' %}</th>";
           html += "<th>{% trans 'Sets' %}</th><th>{% trans 'Repeats' %}</th>";
           html += "<th>{% trans 'Load' %}</th></th><th>{% trans 'Speed' %}";
-          html +="</th><th></th>"
+          html +="</th><th>{% trans 'Coach' %}</th><th></th>"
                        $.each(d.player_tasks, function(index, task) {
                        if(task.done==0) {
             console.log(task);
@@ -270,16 +268,17 @@
                                html += '<td>' + task.exercise + '</td>';
                                html += '<td class="text-center">' + task.sets + '</td>';
                                html += '<td class="text-center">' + task.nreps + '</td>';
-            if (task.load >= 0) {
-                                 html += '<td class="text-center">' + task.load + '</td>';
-            } else {
-              html += '<td class="text-center no-value">-</td>';
-            }
-            if (task.speed >= 0) {
-                                 html += '<td class="text-center">' + task.speed + '</td>';
-            } else {
-              html += '<td class="text-center no-value">-</td>';
-            }
+                    if (task.load >= 0) {
+                            html += '<td class="text-center">' + task.load + '</td>';
+                    } else {
+                    html += '<td class="text-center no-value">-</td>';
+                    }
+                    if (task.speed >= 0) {
+                            html += '<td class="text-center">' + task.speed + '</td>';
+                    } else {
+                    html += '<td class="text-center no-value">-</td>';
+                    }
+                    html += '<td class="text-center">' + task.coach + '</td>';
 
                                html += '<td>';
             /*html += '<a class="task-link task-modify-link" data-toogle="tooltip" data-placement="right" 
title="' + "{% trans 'Modify this task' %}" +'"';


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]