add total_steps

prof/grading.py

@@ -17,16 +17,18 @@ class Game(db.Model):
     player = db.Column(db.String(25))
     level = db.Column(db.Integer)
     score = db.Column(db.Integer)
+    total_steps = db.Column(db.Integer)
 
-    def __init__(self, player, level, score):
+    def __init__(self, player, level, score, total_steps):
         self.player = player
         self.level = level
         self.score = score
+        self.total_steps = total_steps
 
 class GameSchema(ma.Schema):
     class Meta:
         # Fields to expose
-        fields = ('id', 'timestamp', 'player', 'level', 'score')
+        fields = ('id', 'timestamp', 'player', 'level', 'score', 'total_steps')
 
 
 game_schema = GameSchema()
@@ -39,9 +41,10 @@ def add_game():
     player = request.json['player']
     level = request.json['level']
     score = request.json['score']
+    total_steps= request.json.get('total_steps', -1)
 
     print(player, score)
-    new_game = Game(player, level, score)
+    new_game = Game(player, level, score, total_steps)
 
     db.session.add(new_game)
     db.session.commit()
@@ -57,11 +60,10 @@ def send_static(path):
 def get_game():
     page = request.args.get('page', 1, type=int)
 
-    q = db.session.query(Game.id, Game.timestamp, Game.player, Game.level, func.max(Game.score).label('score')).group_by(Game.player).order_by(Game.score.desc(), Game.timestamp)
-    print(q.statement)
+    q = db.session.query(Game.id, Game.timestamp, Game.player, Game.level, func.max(Game.score).label('score'), Game.total_steps).group_by(Game.player).order_by(Game.score.desc(), Game.timestamp.desc())
+#    print(q.statement)
 
     all_games = q.paginate(page, 20, False)
-#    all_games = db.session.query(Game).order_by(Game.score.desc()).paginate(page, 20, False)
     result = games_schema.dump(all_games.items)
     return jsonify(result)
 

prof/static/table.html

@@ -40,7 +40,7 @@
 
 		<div class="container" id="scores">
 			<table>
-<thead><tr><th>Level</th><th>Player</th><th>Score</th><th>Timestamp</th></tr>
+<thead><tr><th>Level</th><th>Player</th><th>Score</th><th>Timestamp</th><th>Steps</th></tr>
 </thead>
 			</table>
 		</div>