{% for person in persons %}
{{ person }}
{% if permission %}
-
+
{% endif %}
{% empty %}
diff --git a/judge/templates/judge/submission_detail.html b/judge/templates/judge/submission_detail.html
index 6b8f485..224eb0b 100644
--- a/judge/templates/judge/submission_detail.html
+++ b/judge/templates/judge/submission_detail.html
@@ -90,7 +90,7 @@
{% if problem.contest.enable_poster_score %}
| Poster Score |
- {{ ta_score }} |
+ {{ poster_score }} |
{% endif %}
{% if problem.contest.enable_linter_score %}
diff --git a/judge/urls.py b/judge/urls.py
index 9fae9b4..038db27 100644
--- a/judge/urls.py
+++ b/judge/urls.py
@@ -3,22 +3,36 @@
from django.contrib.auth.views import LoginView, LogoutView
from . import views
+from . import apps
-app_name = 'judge'
+app_name = apps.JudgeConfig.name
handler404 = views.handler404
handler500 = views.handler500
urlpatterns = [
+ # General-purpose paths
path('', views.index, name='index'),
path('login/', LoginView.as_view(), name='login'),
path('logout/', LogoutView.as_view(), name='logout'),
path('auth/', include('social_django.urls', namespace='social')),
+
+ # Contest-specific paths
path('contest/new/', views.new_contest, name='new_contest'),
path('contest/
/', views.contest_detail, name='contest_detail'),
path('contest//scores/', views.contest_scores_csv, name='contest_scores_csv'),
path('contest//delete/', views.delete_contest, name='delete_contest'),
path('contest//problem/new/',
views.new_problem, name='new_problem'),
+ path('contest//poster/new/',
+ views.add_poster, name='contest_add_poster'),
+ path('contest//participant/new/',
+ views.add_participant, name='contest_add_participant'),
+ path('contest//posters/',
+ views.get_posters, name='get_posters'),
+ path('contest//participants/',
+ views.get_participants, name='get_participants'),
+
+ # Problem-specific paths
path('problem//', views.problem_detail, name='problem_detail'),
path('problem//delete/', views.delete_problem, name='delete_problem'),
path('problem//starting-code/',
@@ -29,18 +43,12 @@
views.problem_test_script, name='problem_test_script'),
path('problem/default-scripts//',
views.problem_default_script, name='problem_default_script'),
- path('contest//poster/new/',
- views.add_poster, name='contest_add_poster'),
- path('contest//participant/new/',
- views.add_participant, name='contest_add_participant'),
- path('contest//posters/',
- views.get_posters, name='get_posters'),
- path('contest//participants/',
- views.get_participants, name='get_participants'),
path('problem//edit/',
views.edit_problem, name='edit_problem'),
path('problem//submissions/',
views.problem_submissions, name='problem_submissions'),
+
+ # Submission-specific paths
path('submission//',
views.submission_detail, name='submission_detail'),
path('submission//download/',
diff --git a/judge/views.py b/judge/views.py
index c0a7361..d4bc179 100644
--- a/judge/views.py
+++ b/judge/views.py
@@ -616,13 +616,13 @@ def submission_detail(request, submission_id: str):
if not status:
form.add_error(None, err)
else:
- form = AddPosterScoreForm(initial={'score': submission.ta_score})
+ form = AddPosterScoreForm(initial={'score': submission.poster_score})
context['form'] = form
status, msg = handler.get_submission_status_mini(submission_id)
if status:
context['test_results'] = msg[0]
context['judge_score'] = msg[1][0]
- context['ta_score'] = msg[1][1]
+ context['poster_score'] = msg[1][1]
context['linter_score'] = msg[1][2]
context['final_score'] = msg[1][3]
context['timestamp'] = msg[1][4]
diff --git a/manage.py b/manage.py
index 0b3bb55..2c37aff 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@
def main():
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pdpjudge.settings')
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'autojudge.settings')
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
diff --git a/submission_watcher_saver.py b/submission_watcher_saver.py
index d815c6e..381eb54 100644
--- a/submission_watcher_saver.py
+++ b/submission_watcher_saver.py
@@ -6,7 +6,7 @@
from subprocess import call
from typing import List, Any
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pdpjudge.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "autojudge.settings")
django.setup()
from judge import models, handler # noqa: E402
@@ -15,7 +15,7 @@
TMP_DIRECTORY = 'tmp'
MONITOR_DIRECTORY = os.path.join(CONTENT_DIRECTORY, TMP_DIRECTORY)
DOCKER_VERSION = '1'
-DOCKER_IMAGE_NAME = 'pdp_docker_{}'.format(DOCKER_VERSION)
+DOCKER_IMAGE_NAME = 'autojudge_docker_{}'.format(DOCKER_VERSION)
LS: List[Any] = []
REFRESH_LS_TRIGGER = 10
@@ -78,7 +78,7 @@ def saver(sub_id):
quiet=True)
checker.check_all()
s.linter_score = _compute_lint_score(checker.report)
- current_final_score = s.judge_score + s.ta_score + s.linter_score
+ current_final_score = s.judge_score + s.poster_score + s.linter_score
penalty_multiplier = 1.0
# If the submission crosses soft deadline