[chronojump-server] Some minor changes Airport mode url is now /home instead of /airport Some fields are show or hide ba

[Marcos Venteo Garcia <mventeo src gnome org>]

commit f041e1987fafcbab9dc9015b34029f159867ec2a
Author: Marcos Venteo <mventeo gmail com>
Date:   Sun Jul 9 21:42:34 2017 +0200

    Some minor changes
    Airport mode url is now /home instead of /airport
    Some fields are show or hide based on Station Type
    lossBySpeed has changed to Float

 chronojumpserver/js/airport.js              |    3 +--
 chronojumpserver/js/players.js              |   25 ++++++++++++++++++++++---
 chronojumpserver/models.py                  |    2 +-
 chronojumpserver/templates/player_list.html |   10 +++++-----
 chronojumpserver/views.py                   |    2 +-
 5 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/chronojumpserver/js/airport.js b/chronojumpserver/js/airport.js
index 5745e52..78f684c 100644
--- a/chronojumpserver/js/airport.js
+++ b/chronojumpserver/js/airport.js
@@ -22,7 +22,6 @@ $(document).ready(function() {
 
     var num = $("table#airportTable tr:first-child > td").length;
     var width = (100 / num) + "%";
-    console.log(width);
     //$("td").css("width", width);​
     $('td').css('width', width);
 
@@ -46,7 +45,7 @@ $(document).ready(function() {
 
     setInterval(function() {
        /* Set the interval for refresh */
-       window.location.href = "/airport";
+       window.location.href = "/home";
     }, 15000);
 
 });
diff --git a/chronojumpserver/js/players.js b/chronojumpserver/js/players.js
index 3453bcd..edec713 100755
--- a/chronojumpserver/js/players.js
+++ b/chronojumpserver/js/players.js
@@ -152,9 +152,9 @@ $(document).ready(function() {
                                 var _desc = task.station + ":";
                                 _desc += task.exercise + " ";
                                 if (task.sets > 1) {
-                                    _desc += task.sets + "x" + task.nreps;
+                                    _desc += task.sets + "x" + task.nreps + ' repeticions';
                                 } else {
-                                    _desc += task.nreps;
+                                    _desc += task.nreps + ' repeticions';
                                 }
                                 if (task.speed > 0){
                                     _desc += " (vel: " + task.speed + " m/s)";
@@ -285,6 +285,7 @@ $(document).ready(function() {
         $('#playerId').val(player.id);
         $('#taskId').val($(this).attr('data-task-id'));
         $('#stationSelect').val(stationId);
+        showHideParameters();
         refreshExercises(exerciseId);
         $('#numSets').val(taskSets);
         $('#numReps').val(taskReps);
@@ -306,9 +307,27 @@ $(document).ready(function() {
        refreshed. */
     $('#stationSelect').on('change', function() {
         //Ajax call to retrieve all the exercises. Call the function below.
-        refreshExercises(null)
+
+        // Hide Show parameters based on station type
+        showHideParameters();
+        // Show the exercises of this station
+        refreshExercises(null);
+
     });
 
+    /* Show or Hide Parameters based on Station Type */
+    function showHideParameters() {
+      var optSelected = $('#stationSelect').find(':selected').attr('data-station-type');
+      // Show or hide some of the elememts of the task depending of station type
+      if (optSelected != 'S') {
+        $('.taskParameter').show();
+        $('label[for="numReps"]').removeClass('col-sm-offset-6').addClass('col-sm-offset-4');
+      } else {
+        $('.taskParameter').hide();
+        $('label[for="numReps"]').removeClass('col-sm-offset-4').addClass('col-sm-offset-6');
+      }
+    }
+
     /* Refresh the exercises based on the value selected in station */
     function refreshExercises(exerciseId) {
         var stationId = $('#stationSelect').val();
diff --git a/chronojumpserver/models.py b/chronojumpserver/models.py
index 147b461..ebb1c5a 100755
--- a/chronojumpserver/models.py
+++ b/chronojumpserver/models.py
@@ -302,7 +302,7 @@ class ResultEncoder(Base):
     laterality = Column('laterality', String(2))
     resistance = Column('resistance', Float)
     repetitions = Column('repetitions', Integer)
-    lossBySpeed = Column('lossBySpeed', Integer)
+    lossBySpeed = Column('lossBySpeed', Float)
     numBySpeed = Column('numBySpeed', Integer)
     rangeBySpeed = Column('rangeBySpeed', Float)
     vmeanBySpeed = Column('vmeanBySpeed', Float)
diff --git a/chronojumpserver/templates/player_list.html b/chronojumpserver/templates/player_list.html
index bbe20db..0aa2de7 100755
--- a/chronojumpserver/templates/player_list.html
+++ b/chronojumpserver/templates/player_list.html
@@ -34,7 +34,7 @@
                                                <div class="form-group">
                                                        <select name="station" class="form-control" 
id="stationSelect">
                                                                        {% for station in stations %}
-                                                                               <option 
value={{station.id}}>{{station.name}}</option>
+                                                                               <option 
data-station-type="{{station.type}}" value={{station.id}}>{{station.name}}</option>
                                                                        {% endfor %}
                                                                </select>
                                                </div>
@@ -52,16 +52,16 @@
 
                                                <form class="form-horizontal" style="margin-top: 10px">
                                                        <div class="form-group">
-                                                               <label for="numSets" class="col-sm-2 
control-label"># Series:</label>
+                                                               <label for="numSets" class="col-sm-2 
control-label taskParameter"># Series:</label>
                                                                <div class="col-sm-2">
-                                                                       <input id="numSets" name="numSets" 
type="number" class="form-control" value="1" min="1"></input>
+                                                                       <input id="numSets" name="numSets" 
type="number" class="form-control taskParameter" value="1" min="1"></input>
                                                                </div>
                                                                <label for="numReps" class="col-sm-offset-4 
col-sm-2 control-label"># Repeticions:</label>
                                                                <div class="col-sm-2">
                                                                        <input id="numReps" name="numReps" 
type="number" class="form-control" value="1" min="1"></input>
                                                                </div>
                                                        </div>
-                                                       <div class="form-group">
+                                                       <div class="form-group taskParameter">
                                                                <label for="taskLoad" class="col-sm-2 
control-label">Carrega:</label>
                                                                <div class="col-sm-2">
                                                                        <input id="taskLoad" name="taskLoad" 
type="number" class="form-control" ></input>
@@ -75,7 +75,7 @@
                                                                        <input id="taskpercentMaxSpeed" 
name="taskpercentMaxSpeed" type="number" class="form-control" ></input>
                                                                </div>
                                                        </div>
-                                                       <div class="form-group">
+                                                       <div class="form-group taskParameter">
                                                                <label for="recipient-name" class="col-sm-2 
control-label">Lateralitat:</label>
                                                                <div class="col-sm-10">
                                                                        <select class="form-control" 
id="taskLaterality" name="taskLaterality">
diff --git a/chronojumpserver/views.py b/chronojumpserver/views.py
index 12448f5..ca108f9 100755
--- a/chronojumpserver/views.py
+++ b/chronojumpserver/views.py
@@ -16,7 +16,7 @@ def index():
     """Chronojump Server Home page."""
     return render_template('index.html')
 
-@app.route('/airport')
+@app.route('/home')
 def airport():
     """Airport mode."""