[chronojump-server] Changing task description for the players Removing some annoying debug alerts in Station/Exercice pa



commit 042dac60dcab4efae939d330e6f5d48743e643aa
Author: Marcos Venteo García <mventeo gmail com>
Date:   Wed Jul 5 22:21:02 2017 +0200

    Changing task description for the players
    Removing some annoying debug alerts in Station/Exercice page

 chronojumpserver/js/players.js  |   13 ++++++++-----
 chronojumpserver/js/stations.js |    4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/chronojumpserver/js/players.js b/chronojumpserver/js/players.js
index 2ace0dd..3453bcd 100755
--- a/chronojumpserver/js/players.js
+++ b/chronojumpserver/js/players.js
@@ -148,14 +148,17 @@ $(document).ready(function() {
                                 var _desc = task.description;
                             } else {
                                 // Compose the description based on values
+
+                                var _desc = task.station + ":";
+                                _desc += task.exercise + " ";
                                 if (task.sets > 1) {
-                                    var _desc = task.sets + "x" + task.nreps + " repeticions ";
+                                    _desc += task.sets + "x" + task.nreps;
                                 } else {
-                                    var _desc = task.nreps + " repeticions ";
+                                    _desc += task.nreps;
+                                }
+                                if (task.speed > 0){
+                                    _desc += " (vel: " + task.speed + " m/s)";
                                 }
-
-                                _desc += "de " + task.exercise;
-                                _desc += " a l'estació " + task.station;
                             }
                             html += "<li><a class='task-link' "
                             html += "data-task-id='" + task.id + "' "
diff --git a/chronojumpserver/js/stations.js b/chronojumpserver/js/stations.js
index 97fa7a9..0251588 100644
--- a/chronojumpserver/js/stations.js
+++ b/chronojumpserver/js/stations.js
@@ -53,7 +53,7 @@ $('#btnAddModifyStation').on('click', function() {
       var table = $('#stations').DataTable();
       var stationId = data.stationId;
       var stationsCount = table.data().count();
-      alert(stationsCount);
+      //alert(stationsCount);
       table.ajax.reload(function(){
           // Select the station just created
           table.$('tr.selected').removeClass('selected');
@@ -164,7 +164,7 @@ $('#btnDeleteExercise').on('click', function() {
 function loadExercises(station_id) {
     var stationTable = $('#stations').DataTable();
     var station = stationTable.row('.selected').data();
-    alert(station.id);
+
     $('#selectedStationName').text(station.name);
     $('#selectedStationId').val(station.id);
     var table = $('#exercises').DataTable({


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