[chronojump-server] Removing -1 as a default value for load, speed and percentMaxSpeed. Removing duplicated ) in task de
- From: Marcos Venteo Garcia <mventeo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Removing -1 as a default value for load, speed and percentMaxSpeed. Removing duplicated ) in task de
- Date: Mon, 10 Jul 2017 20:56:56 +0000 (UTC)
commit e3295e973f993cc3f074d900e5e91e61b5af6a68
Author: Marcos Venteo <mventeo gmail com>
Date: Mon Jul 10 22:56:46 2017 +0200
Removing -1 as a default value for load, speed and percentMaxSpeed.
Removing duplicated ) in task description
chronojumpserver/js/players.js | 7 ++++++-
chronojumpserver/templates/player_list.html | 6 +++---
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/chronojumpserver/js/players.js b/chronojumpserver/js/players.js
index 4450b77..4da8579 100755
--- a/chronojumpserver/js/players.js
+++ b/chronojumpserver/js/players.js
@@ -37,10 +37,15 @@ function addModifyDeleteTask(action) {
var stationId = $('#stationSelect').val();
var exerciseId = $('#exerciseSelect').val();
var sets = $('#numSets').val();
+ if (sets == '') sets=-1;
var reps = $('#numReps').val();
+ if (reps == '') reps=-1;
var load = $('#taskLoad').val();
+ if (load == '') load=-1;
var speed = $('#taskSpeed').val();
+ if (speed == '') speed=-1;
var percentMaxSpeed = $('#taskpercentMaxSpeed').val();
+ if (percentMaxSpeed == '') percentMaxSpeed = -1;
var laterality = $('#taskLaterality').val();
// Set the method
@@ -162,7 +167,7 @@ $(document).ready(function() {
_desc += "pes: " + task.load + " kg ";
}
if (task.speed >0) {
- _desc += "vel: " + task.speed + " m/s)";
+ _desc += "vel: " + task.speed + " m/s";
}
_desc += ")";
}
diff --git a/chronojumpserver/templates/player_list.html b/chronojumpserver/templates/player_list.html
index 12c6b99..0ae0998 100755
--- a/chronojumpserver/templates/player_list.html
+++ b/chronojumpserver/templates/player_list.html
@@ -64,15 +64,15 @@
<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" value="-1" ></input>
+ <input id="taskLoad" name="taskLoad"
type="number" class="form-control" ></input>
</div>
<label for="taskSpeed" class="col-sm-2
control-label">Velocitat:</label>
<div class="col-sm-2">
- <input id="taskSpeed"
name="taskSpeed" type="number" class="form-control" min="-1" step="0.1" value="-1"></input>
+ <input id="taskSpeed"
name="taskSpeed" type="number" class="form-control" min="-1" step="0.1" ></input>
</div>
<label for="taskpercentMax" class="col-sm-2
control-label">Vel. Max:</label>
<div class="col-sm-2">
- <input id="taskpercentMaxSpeed"
name="taskpercentMaxSpeed" type="number" class="form-control" value="-1"></input>
+ <input id="taskpercentMaxSpeed"
name="taskpercentMaxSpeed" type="number" class="form-control" ></input>
</div>
</div>
<div class="form-group taskParameter">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]