[chronojump-server] Show load in task description in Player list page Last task values are shown when a new task is crea
- From: Marcos Venteo Garcia <mventeo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Show load in task description in Player list page Last task values are shown when a new task is crea
- Date: Mon, 10 Jul 2017 19:15:21 +0000 (UTC)
commit 223085cd938ad83fcce9c443794f7f75ce160133
Author: Marcos Venteo <mventeo gmail com>
Date: Mon Jul 10 21:15:09 2017 +0200
Show load in task description in Player list page
Last task values are shown when a new task is created
chronojumpserver/js/players.js | 18 +++++++++++++-----
chronojumpserver/templates/player_list.html | 6 +++---
2 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/chronojumpserver/js/players.js b/chronojumpserver/js/players.js
index edec713..4450b77 100755
--- a/chronojumpserver/js/players.js
+++ b/chronojumpserver/js/players.js
@@ -156,8 +156,15 @@ $(document).ready(function() {
} else {
_desc += task.nreps + ' repeticions';
}
- if (task.speed > 0){
- _desc += " (vel: " + task.speed + " m/s)";
+ if (task.speed > 0 || task.load > 0){
+ _desc += " (";
+ if (task.load > 0) {
+ _desc += "pes: " + task.load + " kg ";
+ }
+ if (task.speed >0) {
+ _desc += "vel: " + task.speed + " m/s)";
+ }
+ _desc += ")";
}
}
html += "<li><a class='task-link' "
@@ -228,16 +235,17 @@ $(document).ready(function() {
$('#taskModalForm').modal();
$('#playerId').val(player.id);
$('#taskId').val('-1');
- // Modal is empty
- $("#stationSelect").val($("#stationSelect option:first").val());
refreshExercises(null);
+ // Modal is empty
+ /*$("#stationSelect").val($("#stationSelect option:first").val());
+
$('#numSets').val(-1);
$('#numReps').val(-1);
$('#taskLoad').val(-1);
$('#taskSpeed').val(-1);
$('#taskpercentMaxSpeed').val(-1);
$('#taskLaterality').val($("#taskLaterality option:first").val());
- $('#taskComment').val('');
+ $('#taskComment').val('');*/
$('#taskParamSelector').removeClass('active');
$('#taskFreeSelector').removeClass('active');
$('#paramTask').removeClass('active');
diff --git a/chronojumpserver/templates/player_list.html b/chronojumpserver/templates/player_list.html
index 0aa2de7..12c6b99 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" ></input>
+ <input id="taskLoad" name="taskLoad"
type="number" class="form-control" value="-1" ></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"></input>
+ <input id="taskSpeed"
name="taskSpeed" type="number" class="form-control" min="-1" step="0.1" value="-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" ></input>
+ <input id="taskpercentMaxSpeed"
name="taskpercentMaxSpeed" type="number" class="form-control" value="-1"></input>
</div>
</div>
<div class="form-group taskParameter">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]