[chronojump-server] Commented update exercise and task for asynchronous select and implemented delete exercise instead
- From: Max Ros i Morejon <maxros src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Commented update exercise and task for asynchronous select and implemented delete exercise instead
- Date: Fri, 12 Jul 2019 09:30:54 +0000 (UTC)
commit d11a33bd468e67664328f807f4b606178eae9851
Author: Max Ros i Morejon <mros33 gmail com>
Date: Fri Jul 12 11:30:38 2019 +0200
Commented update exercise and task for asynchronous select and implemented delete exercise instead
.../chronojump_networks/organizations/api/views.py | 9 +++++
.../organizations/groups/group_players_list.html | 47 +++++++++-------------
.../templates/organizations/gyms/gym_detail.html | 31 ++++++++++++--
3 files changed, 55 insertions(+), 32 deletions(-)
---
diff --git a/chronojumpserver-django/chronojump_networks/organizations/api/views.py
b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
index c5909f1..3243709 100644
--- a/chronojumpserver-django/chronojump_networks/organizations/api/views.py
+++ b/chronojumpserver-django/chronojump_networks/organizations/api/views.py
@@ -144,6 +144,15 @@ 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)
+ exercise_id = data['exercise_id'][0]
+ o = Exercise.objects.get(id=int(exercise_id))
+ o.delete()
+ print("Removed exercise %d" % (int(exercise_id)))
+ return JsonResponse({}, status=204, safe=False)
class PlayerListView(ListCreateAPIView):
"""Players of the organization"""
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 371d4ba..9c6e9e4 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
@@ -282,11 +282,11 @@
}
html += '<td>';
- html += '<a class="task-link task-modify-link" data-toogle="tooltip" data-placement="right"
title="' + "{% trans 'Modify this task' %}" +'"';
+ /*html += '<a class="task-link task-modify-link" data-toogle="tooltip" data-placement="right"
title="' + "{% trans 'Modify this task' %}" +'"';
html += 'data-task-id="' + task.id + '"'
html += 'data-task-type="' + task.type + '">'
html += '<i class="material-icons">mode_edit</i></a>';
- html += ' ';
+ html += ' ';*/
/*html += '<a class="task-link task-duplicate-link" data-toogle="tooltip" data-placement="right"
title="' + "{% trans 'Duplicate this task' %}" +'"';
html += 'data-task-id="' + task.id + '"'
html += 'data-task-type="' + task.type + '">'
@@ -338,8 +338,7 @@
}
- $('.task-modify-link').on('click', function() {
- console.log("1. Click a modify");
+ /*$('.task-modify-link').on('click', function() {
var task_id = $(this).attr('data-task-id');
var task_type = $(this).attr('data-task-type');
console.log(task_id);
@@ -348,28 +347,21 @@
// Marcos: Trick to use a javascript variable in DRY url handled by Django
var task_url = "{% url 'api_tasks:task_detail' task_id=0 %}".replace("0", task_id)
- console.log(task_url);
$.ajax({
url: task_url,
success: function(task) {
- console.log("2. Success");
deserializeTask(task);
- console.log("12. Ha tornat");
$('#btnAddModifyTask').text("{% trans 'Update task' %}");
$('#taskPercentMaxSpeed').prop("disabled", true);
$('#taskPercentMaxSpeed').val('');
$('#taskMaxSpeed').val('');
- $('#gymSelect').val(task.gym);
- $('#stationSelect').val(task.station);
- $('#exerciseSelect').val(task.exercise);
- console.log("exercise nou =" + $('#exerciseSelect').val());
$('#taskModalForm').modal('show');
}
})
- });
+ });*/
$('.task-delete-link').on('click', function() {
@@ -571,6 +563,7 @@
$('#gymSelect').on('change', function() {
//Ajax call to retrieve all the stations. Call the function below.
+ console.log("gym changed");
var gym_id = $('#gymSelect').val();
// Show the stations of this gym
loadGymStations(gym_id);
@@ -578,7 +571,6 @@
/* Load stations from the gym into selectStation control */
function loadGymStations(gym_id) {
- console.log("4. LoadGym");
$('#stationSelect').find('option').remove().end();
$.ajax({
@@ -601,7 +593,6 @@
// Load exercises from first station loaded
var station_id = $('#stationSelect option:first').val();
$('#stationSelect').val(station_id);
- console.log("5. Crida exercise");
loadStationExercises(station_id);
} else {
// Disable task creation
@@ -612,26 +603,29 @@
$('#stationSelect').on('change', function() {
//Ajax call to retrieve all the exercises from a station
+ console.log("station changed");
var station_id = $('#stationSelect').val();
// Show the exercises of this station
loadStationExercises(station_id);
});
$('#exerciseSelect').on('change', function() {
+ console.log("exercise changed");
get_maximum_mean_velocity();
});
$('#taskLoad').change(function() {
+ console.log("task load");
get_maximum_mean_velocity()
});
$('#taskLaterality').change(function() {
+ console.log("task laterality");
get_maximum_mean_velocity();
});
/* Load stations from the gym into selectStation control */
function loadStationExercises(station_id) {
- console.log("6. Exercise");
$('#exerciseSelect').find('option').remove().end();
$.ajax({
@@ -653,8 +647,6 @@
$('#exerciseSelect').removeAttr('disabled');
// Load exercises from first station loaded
$('#exerciseSelect').val($('#exerciseSelect option:first').val());
- console.log("exercise = " + $('#exerciseSelect').val());
- console.log("7. MaxVel");
get_maximum_mean_velocity();
} else {
// Disable task creation
@@ -670,7 +662,6 @@
/* Get max velocity when user selects station, exercice and resistance */
function get_maximum_mean_velocity() {
- console.log("8. Comença maxVel");
var resistance = $('#taskLoad').val();
var stationId = $('#stationSelect').val();
var personId = $('#personId').val();
@@ -793,13 +784,9 @@
}
// Dump values from task into Modal Form
- function deserializeTask(task) {
- console.log("3. deserializeTask");
+ /*function deserializeTask(task) {
console.log(task);
loadGymStations(task.gym);
- console.log("9. Torna del stations");
- loadStationExercises(task.station);
- console.log("10. Torna del exercises");
$('#personId').val(task.person);
$('#numSets').val(task.sets);
$('#numReps').val(task.nreps);
@@ -812,8 +799,11 @@
$('#lossByPower').val(task.lossByPower);
$('#taskId').val(task.id);
$('#coachId').val(task.coach);
- console.log("11. Acaba el deserializeTask");
- }
+ $('#gymSelect').val(task.gym);
+ $('#stationSelect').val(task.station);
+ $('#exerciseSelect').val(task.exercise);
+ console.log("ja està");
+ }*/
function validateTask(task) {
return task;
@@ -834,11 +824,10 @@
});
}
- function updateTask(task) {
- /* TODO: Add validation */
+ /*function updateTask(task) {
console.log("botó addmodifytask 0");
$.ajax({
- 'url': "{% url 'api_tasks:task_detail' task_id=0 %}".replace("0", task.id),
+ 'url': " url 'api_tasks:task_detail' task_id=0 ".replace("0", task.id),
'method': 'PUT',
'data': task,
success: function(data) {
@@ -848,7 +837,7 @@
}
})
- }
+ }*/
// Enable tooltips
$(function () {
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 b3201c8..5fb2d0f 100644
--- a/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html
+++ b/chronojumpserver-django/chronojump_networks/templates/organizations/gyms/gym_detail.html
@@ -108,14 +108,19 @@
$.each(value, function(index, exercise) {
html += '<tr><td>'+ exercise.name + '</td><td class="text-right">' +
exercise.percentBodyMassDisplaced +'</td><td>';
//EDIT BUTTON
- html += '<a class="task-link exercise-modify-link" data-toogle="tooltip"
data-placement="right" title="' + "{% trans 'Modify this exercise' %}" +'"';
+ /*html += '<a class="task-link exercise-modify-link" data-toogle="tooltip"
data-placement="right" title="' + "{% trans 'Modify this exercise' %}" +'"';
html += 'data-exercise-id="' + exercise.id + '"';
html += 'data-exercise-massp="' + exercise.percentBodyMassDisplaced + '"';
html += 'data-exercise-station="' + row.id + '"';
html += 'data-exercise-name="' + exercise.name + '">';
html += '<i class="material-icons">mode_edit</i></a>';
+ html += ' ';*/
+ html += '<a class="task-link exercise-delete-link" data-toogle="tooltip"
data-placement="right" title="' + "{% trans 'Delete this exercise' %}" +'"';
+ html += 'data-exercise-id="' + exercise.id + '">';
+ html += '<i class="material-icons">delete_sweep</i></a>';
+ html += '</td></tr>';
});
- html += '</td></tr></tbody></table>';
+ html += '</tbody></table>';
} else {
html = '<h6 class="font-weight-bold font-italic">{% trans "Station has not exercises" %}</h6>';
@@ -190,7 +195,7 @@
}
});
- $('.exercise-modify-link').on('click', function() {
+ /*$('.exercise-modify-link').on('click', function() {
console.log("modifica");
var exercise_id = $(this).attr('data-exercise-id');
var exercise_massp = $(this).attr('data-exercise-massp');
@@ -209,6 +214,26 @@
$('#exerciseModalForm').modal('show');
});
+ }*/
+
+ $('.exercise-delete-link').on('click', function() {
+ //TODO: Ask for confirmation
+ console.log("Clicant esborrar botó");
+ var exercise_id = $(this).attr('data-exercise-id');
+ var exercise_url = "{% url 'api_organizations:station_exercises'
organization_id=user.organization.id %}";
+
+ $.ajax({
+ url: exercise_url,
+ method: 'DELETE',
+ data: {
+ 'exercise_id': exercise_id
+ },
+ success: function(exercise) {
+ alert("{% trans 'The exercise has been deleted' %}");
+ table_station.ajax.reload(enableStationsTableFunctionality, false);
+ }
+ });
+ });
}
function newExerciseInitialOperations() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
