[chronojump-server] Disabling main controls when macro tasks are created. Changing groupPlayer for groupPerson and Group
- From: Marcos Venteo Garcia <mventeo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump-server] Disabling main controls when macro tasks are created. Changing groupPlayer for groupPerson and Group
- Date: Wed, 21 Feb 2018 21:43:44 +0000 (UTC)
commit 49d3c37302df242b3d50af1feb134648e71c72d5
Author: Marcos Venteo <mventeo gmail com>
Date: Wed Feb 21 22:42:29 2018 +0100
Disabling main controls when macro tasks are created. Changing groupPlayer for groupPerson and Group by
Group_
chronojumpserver/models.py | 9 ++++---
chronojumpserver/templates/player_list.html | 32 ++++++++++++++++-----------
2 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/chronojumpserver/models.py b/chronojumpserver/models.py
index 99ebc78..c328011 100755
--- a/chronojumpserver/models.py
+++ b/chronojumpserver/models.py
@@ -40,7 +40,7 @@ class Gym(HelperMixin, Base):
class Group(HelperMixin, Base):
- __tablename__ = 'group'
+ __tablename__ = 'group_'
org_id = Column(Integer, nullable=False)
gym_id = Column(Integer, nullable=False)
@@ -63,11 +63,11 @@ class GroupCoach(HelperMixin, Base):
coach_id = Column(Integer, nullable=False)
-class groupPlayer(HelperMixin, Base):
- __tablename__ = 'groupPlayer'
+class groupPerson(HelperMixin, Base):
+ __tablename__ = 'groupPerson'
group_id = Column(Integer, nullable=False)
- player_id = Column(Integer, nullable=False)
+ person_id = Column(Integer, nullable=False)
class Person(HelperMixin, Base):
@@ -83,6 +83,7 @@ class Person(HelperMixin, Base):
height = Column(Float, nullable=False)
rfid = Column(String(23), nullable=False, unique=True)
imageName = Column(String(50))
+ org_id = Column(Integer, nullable = False)
results = relationship("ResultEncoder",
order_by="desc(ResultEncoder.dt)",
primaryjoin="ResultEncoder.personId==Person.id",
diff --git a/chronojumpserver/templates/player_list.html b/chronojumpserver/templates/player_list.html
index 3f1a25c..763077a 100755
--- a/chronojumpserver/templates/player_list.html
+++ b/chronojumpserver/templates/player_list.html
@@ -119,23 +119,23 @@
<!-- Disabled panel -->
<form class="form-horizontal" style="margin-top: 10px">
<div class="form-group">
- <label for="numTasks" class="col-sm-2
control-label taskParameter"># Tasques:</label>
+ <label for="numTasks" class="col-sm-2
control-label taskParameter macroTask"># Tasques:</label>
<div class="col-sm-2">
- <input id="numTasks" name="numTaks"
type="number" class="form-control taskParameter" value="1" min="1"></input>
+ <input id="numTasks" name="numTaks"
type="number" class="form-control taskParameter macroTaskControl" value="1" min="1"></input>
</div>
</div>
<div class="form-group">
<label for="numSets2" class="col-sm-2
control-label taskParameter"># Series:</label>
<div class="col-sm-2">
- <input id="numSets2" name="numSets2"
type="number" class="form-control taskParameter" value="1" min="1"></input>
+ <input id="numSets2" name="numSets2"
type="number" class="form-control taskParameter macroTaskControl" value="1" min="1"></input>
</div>
<label for="numReps2" class="col-sm-2
control-label"># Repeticions:</label>
<div class="col-sm-2">
- <input id="numReps2" name="numReps2"
type="number" class="form-control" value="1" min="1"></input>
+ <input id="numReps2" name="numReps2"
type="number" class="form-control macroTaskControl" value="1" min="1"></input>
</div>
<label for="taskLoad2" class="col-sm-2
control-label">Carrega (Kg):</label>
<div class="col-sm-2">
- <input id="taskLoad2"
name="taskLoad2" type="number" class="form-control" ></input>
+ <input id="taskLoad2"
name="taskLoad2" type="number" class="form-control macroTaskControl" ></input>
</div>
</div>
<div class="form-group taskParameter">
@@ -146,28 +146,28 @@
</div>
<label for="taskpercentMaxSpeed2"
class="col-sm-2 control-label" style="padding-top:0;margin-top: -5px;">Max Vm<br>registrada (%):</label>
<div class="col-sm-2">
- <input id="taskpercentMaxSpeed2"
name="taskpercentMaxSpeed2" type="number" class="form-control" disabled max="100" min="0"></input>
+ <input id="taskpercentMaxSpeed2"
name="taskpercentMaxSpeed2" type="number" class="form-control macroTaskControl" disabled max="100"
min="0"></input>
</div>
<label for="taskSpeed2" class="col-sm-2
control-label">Velocitat (m/s):</label>
<div class="col-sm-2">
- <input id="taskSpeed2"
name="taskSpeed2" type="number" class="form-control" min="-1" step="0.1" disabled></input>
+ <input id="taskSpeed2"
name="taskSpeed2" type="number" class="form-control macroTaskControl" min="-1" step="0.1" disabled></input>
</div>
</div>
<div class="form-group taskParameter">
<label for="taskLossByPower2" class="col-sm-2
control-label" style="padding-top:0;margin-top: -5px;">Perdua per potencia:</label>
<div class="col-sm-2">
- <input id="taskLossByPower2"
name="taskLossByPower2" type="number" class="form-control"></input>
+ <input id="taskLossByPower2"
name="taskLossByPower2" type="number" class="form-control macroTaskControl"></input>
</div>
<label for="taskLossBySpeed2" class="col-sm-2
control-label" style="padding-top:0;margin-top: -5px;">Perdua per velocitat:</label>
<div class="col-sm-2">
- <input id="taskLossBySpeed2"
name="taskLossBySpeed2" type="number" class="form-control"></input>
+ <input id="taskLossBySpeed2"
name="taskLossBySpeed2" type="number" class="form-control macroTaskControl"></input>
</div>
</div>
<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="taskLaterality2" name="taskLaterality2">
+ <select class="form-control
macroTaskControl" id="taskLaterality2" name="taskLaterality2">
<option value="RL">RL -
ambdúes extremitats</option>
<option value="R,L">R,L -
Primer amb la dreta, després amb l'esquerra</option>
<option value="R">R - Només
extremitat dreta</option>
@@ -265,6 +265,10 @@ $('#btnCreateTasks').click(function(e) {
for (i = 0; i < numTasks; i++) {
createTaskInTable(i);
}
+
+ // Set macroTasksControl to read readonly
+ $('.macroTaskControl').prop("readonly", true);
+
$('#btnCreateTasks').addClass('hidden');
$('#btnAddMacroTask').removeClass('hidden');
@@ -281,6 +285,8 @@ $('#btnCreateTasks').click(function(e) {
/* Remove all macro task to start again */
$('#btnResetMacroTask').click(function(e) {
removeMacroTasksTable();
+ // Set macroTasksControl to read readonly
+ $('.macroTaskControl').prop("readonly", false);
});
function removeMacroTasksTable() {
@@ -311,11 +317,11 @@ function createTaskInTable(numTask) {
html += "<td><input class='macroLoad form-control' type='number' value='" + load + "'
idx='"+numTask+"'/></td>";
console.log(percentMaxSpeed);
if (percentMaxSpeed == '') {
- html += "<td><input class='macroPercentMaxSpeed form-control' disabled type='number'
idx='"+numTask+"'/></td>";
+ html += "<td><input class='macroPercentMaxSpeed form-control' disabled type='number'
idx='"+numTask+"' step='0.1' /></td>";
} else {
- html += "<td><input class='macroPercentMaxSpeed form-control' type='number' idx='"+numTask+"'
value='"+ percentMaxSpeed + "' /></td>";
+ html += "<td><input class='macroPercentMaxSpeed form-control' type='number' idx='"+numTask+"'
value='"+ percentMaxSpeed + "' step='0.1' /></td>";
}
- html += "<td><input class='macroSpeed form-control' type='number' value='" + speed + "'
idx='"+numTask+"'/></td>";
+ html += "<td><input class='macroSpeed form-control' type='number' value='" + speed + "'
idx='"+numTask+"' step='0.1'/></td>";
html += "<td><input class='macroLossByPower form-control' type='number' value='" + lossByPower + "'
idx='"+numTask+"'/></td>";
html += "<td><input class='macroLossBySpeed form-control' type='number' value='" + lossBySpeed + "'
idx='"+numTask+"'/></td>";
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
