GNOME.org
 

[chronojump-server] Added the links in Index and Top Bar to show Sprints and Stations and Exercises First concept for St

commit b67fadff3c756e209392418f222f29cd1a29a1fb
Author: Marcos Venteo García <mventeo gmail com>
Date:   Sun Jun 25 21:01:59 2017 +0200

    Added the links in Index and Top Bar to show Sprints and Stations and Exercises
    First concept for Stations and Exercise.

 chronojumpserver/api.py                     |   23 ++++++++++++++++-------
 chronojumpserver/js/players.js              |   10 +++++-----
 chronojumpserver/models.py                  |    8 ++++----
 chronojumpserver/static/style.css           |    7 +++++++
 chronojumpserver/templates/index.html       |    4 ++--
 chronojumpserver/templates/layout.html      |    4 ++--
 chronojumpserver/templates/player_list.html |   11 +++++++----
 chronojumpserver/views.py                   |   11 +++++++++++
 8 files changed, 54 insertions(+), 24 deletions(-)
---
diff --git a/chronojumpserver/api.py b/chronojumpserver/api.py
index 7ce1b55..539f4f0 100755
--- a/chronojumpserver/api.py
+++ b/chronojumpserver/api.py
@@ -5,7 +5,7 @@
 """
 from chronojumpserver import app
 from chronojumpserver.database import db_session
-from chronojumpserver.models import Person, ResultEncoder, Station, Task
+from chronojumpserver.models import Person, ResultEncoder, Station, Task, ResultSprint
 from flask import jsonify, request
 from time import sleep
 import os
@@ -17,6 +17,11 @@ def get_all_results():
     results = [result.serialize for result in ResultEncoder.query.all()]
     return jsonify(data=results)
 
+@app.route('/api/v1/sprints')
+def get_all_sprints():
+    results = [result.serialize for result in ResultSprint.query.all()]
+    return jsonify(data=results)
+
 
 @app.route('/api/v1/players')
 def get_all_players():
@@ -28,7 +33,7 @@ def get_all_players():
         for task in player.active_tasks:
             _player['tasks'].append({'id': task.id,
                                      'description': task.comment,
-                                     'type': task.taskType,
+                                     'type': task.type,
                                      'stationId': task.stationId,
                                      'station': task.station.name,
                                      'exerciseId': task.exerciseId,
@@ -46,11 +51,14 @@ def get_all_players():
 @app.route('/api/v1/exercises')
 def get_exercises_by_station():
     stationId = request.args.get('station_id')
+    print "STATION ID IS %s" % stationId
     station = Station.query.filter(Station.id == stationId).first()
     exercises = []
     for exercise in station.exercises:
-        exercises.append({'id': exercise.id, 'name': exercise.name})
-    return jsonify(exercises=exercises)
+        exercises.append({'id': exercise.id, 'name': exercise.name,
+                          'percentBodyMassDisplaced': exercise.percentBodyMassDisplaced})
+        print exercise.percentBodyMassDisplaced
+    return jsonify(data=exercises)
 
 
 @app.route('/api/v1/rfid/register')
@@ -102,7 +110,7 @@ def add_modify_delete_task():
         personId = request.form['playerId']
         stationId = request.form['stationId']
         exerciseId = request.form['exerciseId']
-        taskType = request.form['taskType']
+        taskType = request.form['type']
         taskId = request.form.get('taskId', None)
         description = request.form.get('description', '')
         # task_id = request.form['taskId']
@@ -112,6 +120,7 @@ def add_modify_delete_task():
         speed = request.form.get('speed', -1)
         percentMaxSpeed = request.form.get('percentMaxSpeed', -1)
         laterality = request.form.get('laterality', -1)
+        print taskType
         if taskType == 'F':
             load = -1
             speed = -1
@@ -122,7 +131,7 @@ def add_modify_delete_task():
         # Create the Task
         if int(taskId) == -1:
             """ New task."""
-            t = Task(taskType=taskType,  personId=personId, stationId=stationId,
+            t = Task(type=taskType,  personId=personId, stationId=stationId,
                      exerciseId=exerciseId, sets=sets, nreps=nreps, load=load,
                      speed=speed, percentMaxSpeed=percentMaxSpeed,
                      laterality=laterality, comment=description)
@@ -131,7 +140,7 @@ def add_modify_delete_task():
         else:
             # Get the task with the id."""
             db_session.query(Task).filter_by(id=taskId).update({
-                'taskType': taskType,
+                'type': taskType,
                 'stationId':stationId,
                 'exerciseId':exerciseId,
                 'sets':sets,
diff --git a/chronojumpserver/js/players.js b/chronojumpserver/js/players.js
index 9f05db9..5464361 100755
--- a/chronojumpserver/js/players.js
+++ b/chronojumpserver/js/players.js
@@ -66,7 +66,7 @@ function addModifyDeleteTask(action) {
         // For both Add or Modify we'll use PUT method
         method = 'PUT';
     }
-    $('#myModal').modal('hide');
+    $('#taskModalForm').modal('hide');
     $.ajax({
         url: '/api/v1/tasks',
         method: method,
@@ -74,7 +74,7 @@ function addModifyDeleteTask(action) {
             playerId: playerId,
             description: description,
             taskId: taskId,
-            taskType: taskType,
+            type: taskType,
             stationId: stationId,
             exerciseId: exerciseId,
             sets: sets,
@@ -232,7 +232,7 @@ $(document).ready(function() {
         var player = table.row($(this).parents('tr')).data();
 
         $('#modal-title').text('Afegir nova tasca per ' + player.name);
-        $('#myModal').modal();
+        $('#taskModalForm').modal();
         $('#playerId').val(player.id);
         $('#taskId').val('-1');
         // Modal is empty
@@ -305,7 +305,7 @@ $(document).ready(function() {
         $('#btnDeleteTask').removeClass('hidden').addClass('show');
         $('#btnUpdateTask').removeClass('hidden').addClass('show');
         $('#btnAddTask').removeClass('show').addClass('hidden');
-        $('#myModal').modal();
+        $('#taskModalForm').modal();
 
     })
 
@@ -336,7 +336,7 @@ $(document).ready(function() {
 
                 // Add all the exercises of the station
                 var count = 0;
-                $.each(data.exercises, function(i, item) {
+                $.each(data.data, function(i, item) {
                     count ++;
                     $('#exerciseSelect').append($('<option>', {
                         value: item.id,
diff --git a/chronojumpserver/models.py b/chronojumpserver/models.py
index 8dcf05b..f609ff3 100755
--- a/chronojumpserver/models.py
+++ b/chronojumpserver/models.py
@@ -180,7 +180,7 @@ class Task(Base):
     """
     __tablename__ = "task"
     id = Column(Integer, primary_key=True)
-    taskType = Column(String(1)) # F - Free, P - Parametrized
+    type = Column(String(1)) # F - Free, P - Parametrized
     ts = Column(DateTime, default=datetime.now)
     personId = Column('personId', ForeignKey('person.id'))
     person = relationship(Person, primaryjoin=personId == Person.id)
@@ -197,7 +197,7 @@ class Task(Base):
     comment = Column(String(150))
     done = Column(Boolean)
 
-    def __init__(self, taskType=None, ts=None, stationId=None, personId=None,
+    def __init__(self, type=None, ts=None, stationId=None, personId=None,
                  exerciseId=None, nreps=-1, sets=-1, load=-1, speed=-1,
                  percentMaxSpeed=-1,laterality=None, comment="", done=False):
         """Initialize a Task object."""
@@ -208,7 +208,7 @@ class Task(Base):
                 'L' only left
         """
 
-        self.taskType = taskType
+        self.type = type
         self.ts = ts if ts is not None else datetime.now()
         self.personId = personId
         self.stationId = stationId
@@ -229,7 +229,7 @@ class Task(Base):
     def serialize(self):
         return {
             'id':          self.id,
-            'taskType':    self.taskType,
+            'taskType':    self.type,
             'ts':          self.ts,
             'personId':    self.personId,
             'personName':  self.person.name,
diff --git a/chronojumpserver/static/style.css b/chronojumpserver/static/style.css
index 8861d3b..240ad24 100755
--- a/chronojumpserver/static/style.css
+++ b/chronojumpserver/static/style.css
@@ -63,3 +63,10 @@ body.home {
 #players td {
     vertical-align: middle;
 }
+
+#btnAddStation, #btnAddExercise {
+    position: relative;
+    top: -24px;
+    right: -10px;
+    float: right;
+}
diff --git a/chronojumpserver/templates/index.html b/chronojumpserver/templates/index.html
index 0ee0db9..b202a75 100755
--- a/chronojumpserver/templates/index.html
+++ b/chronojumpserver/templates/index.html
@@ -29,9 +29,9 @@
     </div>
     <div class="col-md-6">
         <a class="btn btn-primary btn-lg btn-block" href="{{ url_for('show_results')}}">Resultats</a>
+        <a class="btn btn-primary btn-lg btn-block" href="{{ url_for('show_sprints')}}">Sprints</a>
         <a class="btn btn-primary btn-lg btn-block" href="{{ url_for('show_players')}}">Llistat jugadors</a>
-        <a class="btn btn-primary btn-lg btn-block" href="{{ url_for('add_player')}}">Afegir jugador</a>
-        <a class="btn btn-primary btn-lg btn-block" href="rfid_lost">RFID perduda</a>
+        <a class="btn btn-primary btn-lg btn-block" href="{{ 
url_for('show_stations')}}">Estacions/Exercisis</a>
     </div>
 </div>
 {% endblock %}
diff --git a/chronojumpserver/templates/layout.html b/chronojumpserver/templates/layout.html
index 335c7ff..b045799 100755
--- a/chronojumpserver/templates/layout.html
+++ b/chronojumpserver/templates/layout.html
@@ -31,9 +31,9 @@
               <ul class="nav navbar-nav navbar-right">
                   <li><a href="/">Inici</a></li>
                   <li><a href="{{ url_for('show_results')}}">Resultats</a></li>
+                  <li><a href="{{ url_for('show_sprints')}}">Sprints</a></li>
                   <li><a href="{{ url_for('show_players')}}">Llistat Jugadors</a></li>
-                  <li><a href="{{ url_for('add_player')}}">Afegir Jugador</a></li>
-                  <li><a href="#">RFID Perduda</a></li>
+                  <li><a href="{{ url_for('show_stations')}}">Estacions/Exercisis</a></li>
                   </li>
               </ul>
           </div>
diff --git a/chronojumpserver/templates/player_list.html b/chronojumpserver/templates/player_list.html
index e427c28..2271190 100755
--- a/chronojumpserver/templates/player_list.html
+++ b/chronojumpserver/templates/player_list.html
@@ -1,5 +1,7 @@
-{% extends 'layout.html' %} {% block head %} {{ super() }}
-<link href="{{ url_for('assets', filename='DataTables/media/css/dataTables.bootstrap.min.css') }}" 
rel="stylesheet" /> {% endblock %} {% block content %}
+{% extends 'layout.html' %}
+{% block head %} {{ super() }}
+<link href="{{ url_for('assets', filename='DataTables/media/css/dataTables.bootstrap.min.css') }}" 
rel="stylesheet" />
+{% endblock %} {% block content %}
 
 <div class="clearfix">
        <h2 class="pull-left">Llistat de Jugadors <a class="btn btn-primary " href="{{ 
url_for('add_player')}}">Afegir Jugador</a></h2>
@@ -10,7 +12,7 @@
        <table id="players" class="table table-hovered" cellspacing="0" width="100%">
        </table>
 </div>
-<div id="myModal" class="modal fade" tabindex="-1" role="dialog">
+<div id="taskModalForm" class="modal fade" tabindex="-1" role="dialog">
        <div class="modal-dialog modal-lg" role="document">
                <div class="modal-content">
                        <div class="modal-header">
@@ -113,7 +115,8 @@
        <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-{% endblock %} {% block script %} {{ super() }}
+{% endblock %}
+{% block script %} {{ super() }}
 <script src="{{ url_for('assets', filename='DataTables/media/js/jquery.dataTables.min.js') }}"></script>
 <script src="{{ url_for('assets', filename='DataTables/media/js/dataTables.bootstrap.min.js') }}"></script>
 <script src="{{ url_for('js', filename='players.js') }}"></script>
diff --git a/chronojumpserver/views.py b/chronojumpserver/views.py
index 1bcf401..9fe3247 100755
--- a/chronojumpserver/views.py
+++ b/chronojumpserver/views.py
@@ -22,6 +22,11 @@ def show_results():
     """Show results view."""
     return render_template('results.html')
 
+@app.route('/sprints')
+def show_sprints():
+    """Show sprints view."""
+    return render_template('sprints.html')
+
 
 @app.route('/player_list')
 def show_players():
@@ -29,6 +34,12 @@ def show_players():
     return render_template('player_list.html', stations=Station.query.all())
 
 
+@app.route('/stations')
+def show_stations():
+    """Show Stations and Exercises."""
+    return render_template('station_list.html', stations=Station.query.all())
+
+
 @app.route('/player/<player_id>', methods=['GET', 'POST'])
 def player_detail(player_id):
     """Show players detail."""
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]