Skip to content
This repository has been archived by the owner on Jul 3, 2020. It is now read-only.

Commit

Permalink
Implemented result reset
Browse files Browse the repository at this point in the history
  • Loading branch information
evgfilim1 committed Aug 26, 2018
1 parent 0926016 commit 5ac4413
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 6 deletions.
10 changes: 8 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def result(user_id=None):
db.session.commit()
return redirect(url_for('result'))
if g.user.end_time is None:
flash('Тест ещё не был завершён!')
# flash('Тест ещё не был завершён!')
if user_id is not None:
return redirect(back('admin'))
return redirect(url_for('pre_solve'))
Expand Down Expand Up @@ -174,14 +174,20 @@ def manage_users():
@admin_required
def reset(user_id):
u = User.query.get(user_id)
full = request.args.get('full', False)
if not u:
flash(f'Пользователь с id={user_id} не найден')
return redirect(back('admin'))
u.points = None
u.start_time = None
u.end_time = None
if full:
UserAnswer.query.filter(UserAnswer.user_id == u.id).delete()
db.session.commit()
flash('Результаты сброшены!', 'success')
if full:
flash('Результаты сброшены!', 'success')
else:
flash('Таймер сброшен!', 'success')
return redirect(back('admin'))


Expand Down
19 changes: 15 additions & 4 deletions templates/admin.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,21 @@ <h2>Решили</h2>
<div class="d-inline">
<div class="d-inline badge badge-primary badge-pill">{{ user.points }}</div>
<object>
<a class="btn btn-sm btn-danger destructive-confirm"
href="{{ url_for('reset', user_id=user.id) }}">
Сбросить результат
</a>
<div class="dropdown d-inline">
<button class="btn btn-outline-danger btn-sm dropdown-toggle" type="button"
id="manage-u{{ user.id }}" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Управление
</button>
<div class="dropdown-menu" aria-labelledby="manage-u{{ user.id }}">
<a class="dropdown-item" href="{{ url_for('reset', user_id=user.id) }}">
Сбросить таймер
</a>
<a class="dropdown-item" href="{{ url_for('reset', user_id=user.id, full=1) }}">
Сбросить результат
</a>
</div>
</div>
</object>
</div>
</a>
Expand Down

0 comments on commit 5ac4413

Please sign in to comment.