GNOME.org
 

[chronojump-server] Removed delete exercise option and minor changes

commit a3cf5e7410a20a704f3016e8f46a1b66d59513a5
Author: Max Ros i Morejon <mros33 gmail com>
Date:   Fri Jun 28 13:48:38 2019 +0200

    Removed delete exercise option and minor changes

 .../chronojump_networks/organizations/api/views.py |  9 ----
 .../chronojump_networks/templates/layout.html      |  6 +--
 .../organizations/groups/group_players_list.html   |  8 ++--
 .../organizations/groups/groups_list.html          |  6 +--
 .../templates/organizations/gyms/gym_detail.html   | 52 +---------------------
 .../organizations/players/players_list.html        | 34 +++++++-------
 6 files changed, 30 insertions(+), 85 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/api/views.py 
b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
index 8565b83..5da3ffc 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/api/views.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
@@ -144,15 +144,6 @@ class StationExercisesListView(ListCreateAPIView):
         o.organization_id = int(self.kwargs['organization_id'])
         o.save()
         return JsonResponse({}, status=200, safe=False)
-    
-    def delete(self, request, *args, **kwargs):
-        print("delete exercise")        
-        data = dict(request.data)
-        o = Exercise.objects.get(id=int(data['id'][0]))
-        o.delete()
-        print("Removed exercise")
-        return JsonResponse({}, status=204, safe=False)
-
 
 class PlayerListView(ListCreateAPIView):
     """Players of the organization"""
diff --git a/chronojumpserver-django/chronojump_networks/templates/layout.html 
b/chronojumpserver-django/chronojump_networks/templates/layout.html
index 701a753..90750e7 100644
--- a/chronojumpserver-django/chronojump_networks/templates/layout.html
+++ b/chronojumpserver-django/chronojump_networks/templates/layout.html
@@ -25,15 +25,15 @@
       <!--<li class="nav-item">
         <a class="nav-link disabled" href="#">{% trans 'Sprints' %}</a>
       </li>-->
-      {% if request.user.groups_by_coach %}
+      {% if request.user.groups_involved %}
       <li class="nav-item dropdown active">
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownGroups" data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">
           {% trans 'Groups' %}
         </a>
         <div class="dropdown-menu" aria-labelledby="navbarDropdownGroups">
           <h6 class="dropdown-header">{% trans 'My groups' %}</h6>
-          {% for group in request.user.groups_by_coach.all %}
-          <a class="dropdown-item" href="{% url 'organizations:group_players_list' 
organization_id=user.organization.id group_id=group.group.id %}">{{ group.group.name}}</a>
+          {% for group in request.user.groups_involved.all %}
+          <a class="dropdown-item" href="{% url 'organizations:group_players_list' 
organization_id=user.organization.id group_id=group.id %}">{{ group.name}}</a>
           {% endfor %}
 <!--          <div class="dropdown-divider"></div>
           <a class="dropdown-item" href="#">{% trans 'Create a group' %}</a>-->
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 ee08c8e..30585bf 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
@@ -47,7 +47,7 @@
   <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title" id="addPlayersModalTitle">{% trans 'Add players to group ' 
%}{{group.name}}</h5>
+        <h5 class="modal-title" id="addPlayersModalTitle">{% trans 'Assign players to group ' 
%}{{group.name}}</h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
@@ -58,7 +58,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{% trans 'Close' 
%}</button>
-        <button type="button" class="btn btn-outline-primary disabled addPlayerButton">{% trans 'Add 
players' %}</button>
+        <button type="button" class="btn btn-outline-primary disabled addPlayerButton">{% trans 'Assign 
players' %}</button>
       </div>
     </div>
   </div>
@@ -183,7 +183,7 @@
       buttons: [
         {% if user.id == group.responsible.id %}
                { /* Add Player button */
-          text: "{% trans 'Add players' %}",
+          text: "{% trans 'Assign players' %}",
           className: "btn btn-primary",
                  action: function( e, dt, node, config ) {
             $('#addPlayerModal').modal('show');
@@ -390,7 +390,7 @@
         $('#btnAddModifyTask').text("{% trans 'Add task' %}");
         $('#taskModalForm').modal('show');
       });
-
+    
     }
 
     /* Datatable for add players */
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html 
b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
index e8e3d0f..d40c5c7 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/groups/groups_list.html
@@ -72,7 +72,7 @@
             type: "html",
             orderable:false,
             render: function(value, type, row) {
-                {% if user.is_staff %}
+                {% if user.is_staff or user.id == user.organization.responsible.id %}
                 return '<input class="selectGroupCheckbox" type="checkbox" data-group-id="' + row.id + '"/>';
                 {% else %}
                 return '<input class="selectGroupCheckbox" type="checkbox" data-group-id="' + row.id + '" 
style=" visibility: hidden"/>';
@@ -99,7 +99,7 @@
           "data": "gym.name",
           title: "{% trans 'Gym' %}"
         },
-        {% if user.is_staff %}
+        {% if user.is_staff or user.id == user.organization.responsible.id %}
             {
             "type": "html",
             orderable: false,
@@ -119,7 +119,7 @@
       ],
       "dom": "<'row'<'col-sm-6'B><'col-sm-6'f>>rtip",
       buttons: [
-        {% if user.is_staff %}
+        {% if user.is_staff or user.id == user.organization.responsible.id %}
        { /* Create Group button */
           text: "{% trans 'Create group' %}",
           className: "btn btn-primary",
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html 
b/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html
index b92763f..b3201c8 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html
@@ -114,25 +114,6 @@
                 html += 'data-exercise-station="' + row.id + '"';
                 html += 'data-exercise-name="' + exercise.name + '">';
                 html += '<i class="material-icons">mode_edit</i></a>';
-                html += '&nbsp;';
-                
-                /*html += '<button type="button" id="modifyExerciseBtn" class="modifyExerciseBtn btn 
btn-outline-info btn-sm" ';
-                html += 'data-exercise-id="' + row.id + '" ';
-                html += 'data-exercise-name="' + exercise.name + '" ';
-                html += 'data-toggle="tooltip" data-placement="right" ';
-                html += 'title="{% trans "Edit exercise" %}">';
-                html += '<i class="material-icons" 
style="margin-top:3px;font-size:16px;">edit</i></button>';*/
-                //REMOVE BUTTON
-                html += '<a class="task-link exercise-delete-link" data-toogle="tooltip" 
data-placement="right" title="' + "{% trans 'Delete this task' %}" +'"';
-                html += 'data-exercise-id="' + exercise.id + '">';
-                html += '<i class="material-icons">delete_sweep</i></a>';
-                
-                /*html += '<button type="button" id="deleteExerciseBtn" class="deleteExerciseBtn btn 
btn-outline-danger btn-sm" ';
-                html += 'data-exercise-id="' + row.id + '" ';
-                html += 'data-exercise-name="' + exercise.name + '" ';
-                html += 'data-toggle="tooltip" data-placement="right" ';
-                html += 'title="{% trans "Delete exercise" %}">';
-                html += '<i class="material-icons" 
style="margin-top:3px;font-size:16px;">delete</i></button>';*/
               });
               html += '</td></tr></tbody></table>';
 
@@ -171,7 +152,6 @@
       },
       "dom": "<'row'<'col-sm-6'B><'col-sm-6'f>>rtip",
       buttons: [
-        {% if user.id == gym.responsible.id %}
         {
             text: "{% trans 'Add new exercise' %}",
             className: "btn btn-primary",
@@ -183,7 +163,6 @@
                 $('#exerciseModalForm').modal('show');
             }
         }
-        {% endif %}
       
       ],
       initComplete: function() {
@@ -217,10 +196,6 @@
         var exercise_massp = $(this).attr('data-exercise-massp');
         var exercise_station = $(this).attr('data-exercise-station');
         var exercise_name = $(this).attr('data-exercise-name');
-        console.log(exercise_id);
-        console.log(exercise_massp);
-        console.log(exercise_station);
-        console.log(exercise_name);
         
         $('#massp').val(exercise_massp);
         $('#name').val(exercise_name);
@@ -234,33 +209,8 @@
         $('#exerciseModalForm').modal('show');
            
       });
-      
-      $('.exercise-delete-link').on('click', function() {
-        console.log("elimina");
-        var exercise_id = $(this).attr('data-exercise-id');
-        console.log(exercise_id);
-        
-        $.ajax({
-            'url': "{% url 'api_organizations:station_exercises' organization_id=user.organization.id %}",
-            'method': 'DELETE',
-            'data': {
-                'id': exercise_id,
-            },
-            success: function(data) {
-                alert("{% trans 'The exercise has been deleted' %}");
-                table_station.ajax.reload(enableStationsTableFunctionality, false);
-            },
-            error: function(request, status, error) { 
-                //var parts = request.responseText.split('\n');
-                //alert(parts[1]); 
-                alert(request.responseText);
-            }
-
-        });
-      });
-      
     }
-    
+          
     function newExerciseInitialOperations() {
       // Load station from assigned gym to group
       $('#massp').val('0');
diff --git a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html 
b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
index febbea5..495003a 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/players/players_list.html
@@ -109,24 +109,27 @@
           "data": "weight",
           title: "{% trans 'Weight' %}"
         },
-        {
-          "type": "html",
-          orderable: false,
-          render: function(value, type, row) {
-            var html = "";
-            // Edit Player Button
-            html += '<button type="button" class="editPlayerBtn btn btn-outline-info btn-sm" ';
-            html += 'data-player-id="' + row.id + '" ';
-            html += 'data-player-name="' + row.name + '" ';
-            html += 'data-toggle="tooltip" data-placement="right" ';
-            html += 'title="' + "{% trans 'Edit player ' %}" + row.name + '">';
-            html += '<i class="material-icons" style="margin-top:3px;font-size:16px;">edit</i></button>';
-            return html;
-          }
-        }
+        {% if user.groups_responsible %}
+            {
+            "type": "html",
+            orderable: false,
+            render: function(value, type, row) {
+                var html = "";
+                // Edit Player Button
+                html += '<button type="button" class="editPlayerBtn btn btn-outline-info btn-sm" ';
+                html += 'data-player-id="' + row.id + '" ';
+                html += 'data-player-name="' + row.name + '" ';
+                html += 'data-toggle="tooltip" data-placement="right" ';
+                html += 'title="' + "{% trans 'Edit player ' %}" + row.name + '">';
+                html += '<i class="material-icons" style="margin-top:3px;font-size:16px;">edit</i></button>';
+                return html;
+            }
+            }
+        {% endif %}
       ],
       "dom": "<'row'<'col-sm-6'B><'col-sm-6'f>>rtip",
       buttons: [
+        {% if user.groups_responsible %}
        { /* Create Player button */
           text: "{% trans 'Create player' %}",
           className: "btn btn-primary",
@@ -153,6 +156,7 @@
             removePlayersFromGroup(player_ids);
           }
         }
+        {% endif %}
       ],
       initComplete: function() {
         // Enable the remove player selection the first time data is loaded
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]