Merge remote-tracking branch 'origin/master'

handlers/statistics/total_statistics_handler.py

@@ -66,7 +66,7 @@ def get(self, *args, **kwargs):
         a, b, c, d = [], [], [], []
 
         for el in daily_statistics:
-            a.append((el.words_used // el.games, el.date.strftime("%Y-%m-%d")))
+            a.append((el.words_used, el.date.strftime("%Y-%m-%d")))
             b.append((el.games, el.date.strftime("%Y-%m-%d")))
             c.append((el.players_participated, el.date.strftime("%Y-%m-%d")))
             d.append((round(el.total_game_duration / el.games / 60.0, 2), el.date.strftime("%Y-%m-%d")))

templates/logs_administration.html

@@ -13,11 +13,9 @@
     <div class="form-group"><label class="col-sm-2 control-label">{{ a }} + {{ b }} = </label><div class="col-md-2"><input type="text" class="form-control" name="code" placeholder="Введите ответ"></div></div>
     <input type="hidden" name="ans" value="{{ a+b }}">
     <div class="form-group"><select required name="action">
-        <option value="1">{{ names[0] }}</option>
-        <option value="2">{{ names[1] }}</option>
-        <option value="3">{{ names[2] }}</option>
-        <option value="4">{{ names[3] }}</option>
-        <option value="5">{{ names[4] }}</option>
+    {% for el in names %}
+        <option value="{{ loop.index }}">{{ el }}</option>
+    {% endfor %}
     </select></div>
     <button type="submit" class="btn btn-danger">Выполнить действие</button>
 </form>