Skip to content
Snippets Groups Projects

Změna reprezentace rozbitých submitů

Merged Martin Mareš requested to merge mj/broken into devel
All threads resolved!
2 files
+ 17
7
Compare changes
  • Side-by-side
  • Inline

Files

+ 7
4
@@ -849,7 +849,7 @@ def org_submit_list(contest_id: int, user_id: int, task_id: int, site_id: Option
else:
prefix = 'Opravené řešení'
if paper.broken:
if paper.is_broken():
flash(prefix + ' není korektní PDF, ale přesto jsme ho přijali a pokusíme se ho zpracovat. ' +
'Zkontrolujte prosím, že se na vašem počítači zobrazuje správně.',
'warning')
@@ -881,6 +881,7 @@ def org_submit_list(contest_id: int, user_id: int, task_id: int, site_id: Option
points_history=points_history,
for_site=(site_id is not None),
paper_link=lambda p: mo.web.util.org_paper_link(sc.contest, sc.site, sc.user, p),
orig_paper_link=lambda p: mo.web.util.org_paper_link(sc.contest, sc.site, sc.user, p, orig=True),
form=form,
set_final_form=set_final_form,
)
@@ -892,8 +893,10 @@ class SubmitEditForm(FlaskForm):
submit = wtforms.SubmitField("Uložit")
@app.route('/org/contest/c/<int:contest_id>/paper/<int:paper_id>/<filename>')
@app.route('/org/contest/c/<int:contest_id>/site/<int:site_id>/paper/<int:paper_id>/<filename>')
@app.route('/org/contest/c/<int:contest_id>/paper/<int:paper_id>/<filename>', endpoint='org_submit_paper')
@app.route('/org/contest/c/<int:contest_id>/site/<int:site_id>/paper/<int:paper_id>/<filename>', endpoint='org_submit_paper')
@app.route('/org/contest/c/<int:contest_id>/paper/orig/<int:paper_id>/<filename>', endpoint='org_submit_paper_orig')
@app.route('/org/contest/c/<int:contest_id>/site/<int:site_id>/paper/orig/<int:paper_id>/<filename>', endpoint='org_submit_paper_orig')
def org_submit_paper(contest_id: int, paper_id: int, filename: str, site_id: Optional[int] = None):
paper = (db.get_session().query(db.Paper)
.options(joinedload(db.Paper.task)) # pro task_paper_filename()
@@ -906,7 +909,7 @@ def org_submit_paper(contest_id: int, paper_id: int, filename: str, site_id: Opt
get_solution_context(contest_id, paper.for_user, paper.for_task, site_id)
return mo.web.util.send_task_paper(paper)
return mo.web.util.send_task_paper(paper, (request.endpoint == 'org_submit_paper_orig'))
def get_solutions_query(
Loading