From 83579891b9bd5b6bac42d6d433948f54a9aeaaef Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 19 Feb 2024 17:00:44 -0600 Subject: [PATCH] Add course --- dmoj/urls.py | 25 +- judge/admin/__init__.py | 3 +- judge/admin/course.py | 52 ++ judge/markdown.py | 13 +- judge/migrations/0180_course.py | 78 +++ judge/models/__init__.py | 2 +- judge/models/course.py | 136 ++-- judge/views/course.py | 261 ++++++- judge/views/organization.py | 39 +- judge/views/user.py | 2 +- judge/views/volunteer.py | 21 +- locale/vi/LC_MESSAGES/django.po | 644 ++++++++++-------- resources/common.js | 4 +- resources/course.scss | 133 ++++ resources/pagedown_widget.scss | 1 + resources/style.scss | 3 +- templates/course/base.html | 17 +- templates/course/course.html | 39 ++ templates/course/edit_lesson.html | 58 ++ templates/course/grades.html | 127 ++++ templates/course/left_sidebar.html | 10 + templates/course/lesson.html | 39 ++ templates/course/list.html | 46 +- templates/organization/home-js.html | 5 - templates/organization/home.html | 9 +- templates/organization/org-right-sidebar.html | 9 + templates/three-column-content.html | 16 +- 27 files changed, 1308 insertions(+), 484 deletions(-) create mode 100644 judge/admin/course.py create mode 100644 judge/migrations/0180_course.py create mode 100644 resources/course.scss create mode 100644 templates/course/course.html create mode 100644 templates/course/edit_lesson.html create mode 100644 templates/course/grades.html create mode 100644 templates/course/left_sidebar.html create mode 100644 templates/course/lesson.html diff --git a/dmoj/urls.py b/dmoj/urls.py index bece26c..5330504 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -559,7 +559,30 @@ urlpatterns = [ r"^contests/summary/(?P\w+)/", paged_list_view(contests.ContestsSummaryView, "contests_summary"), ), - url(r"^course/", paged_list_view(course.CourseList, "course_list")), + url(r"^courses/", paged_list_view(course.CourseList, "course_list")), + url( + r"^course/(?P[\w-]*)", + include( + [ + url(r"^$", course.CourseDetail.as_view(), name="course_detail"), + url( + r"^/lesson/(?P\d+)$", + course.CourseLessonDetail.as_view(), + name="course_lesson_detail", + ), + url( + r"^/edit_lessons$", + course.EditCourseLessonsView.as_view(), + name="edit_course_lessons", + ), + url( + r"^/grades$", + course.CourseStudentResults.as_view(), + name="course_grades", + ), + ] + ), + ), url( r"^contests/(?P\d+)/(?P\d+)/$", contests.ContestCalendar.as_view(), diff --git a/judge/admin/__init__.py b/judge/admin/__init__.py index 05032d6..afeae86 100644 --- a/judge/admin/__init__.py +++ b/judge/admin/__init__.py @@ -23,6 +23,7 @@ from judge.admin.submission import SubmissionAdmin from judge.admin.taxon import ProblemGroupAdmin, ProblemTypeAdmin from judge.admin.ticket import TicketAdmin from judge.admin.volunteer import VolunteerProblemVoteAdmin +from judge.admin.course import CourseAdmin from judge.models import ( BlogPost, Comment, @@ -72,7 +73,7 @@ admin.site.register(Profile, ProfileAdmin) admin.site.register(Submission, SubmissionAdmin) admin.site.register(Ticket, TicketAdmin) admin.site.register(VolunteerProblemVote, VolunteerProblemVoteAdmin) -admin.site.register(Course) +admin.site.register(Course, CourseAdmin) admin.site.unregister(User) admin.site.register(User, UserAdmin) admin.site.register(ContestsSummary, ContestsSummaryAdmin) diff --git a/judge/admin/course.py b/judge/admin/course.py new file mode 100644 index 0000000..ac8c0fd --- /dev/null +++ b/judge/admin/course.py @@ -0,0 +1,52 @@ +from django.contrib import admin +from django.utils.html import format_html +from django.urls import reverse, reverse_lazy +from django.utils.translation import gettext, gettext_lazy as _, ungettext +from django.forms import ModelForm + +from judge.models import Course, CourseRole +from judge.widgets import AdminSelect2MultipleWidget +from judge.widgets import ( + AdminHeavySelect2MultipleWidget, + AdminHeavySelect2Widget, + HeavyPreviewAdminPageDownWidget, + AdminSelect2Widget, +) + + +class CourseRoleInlineForm(ModelForm): + class Meta: + widgets = { + "user": AdminHeavySelect2Widget( + data_view="profile_select2", attrs={"style": "width: 100%"} + ), + "role": AdminSelect2Widget, + } + + +class CourseRoleInline(admin.TabularInline): + model = CourseRole + extra = 1 + form = CourseRoleInlineForm + + +class CourseForm(ModelForm): + class Meta: + widgets = { + "organizations": AdminHeavySelect2MultipleWidget( + data_view="organization_select2" + ), + "about": HeavyPreviewAdminPageDownWidget( + preview=reverse_lazy("blog_preview") + ), + } + + +class CourseAdmin(admin.ModelAdmin): + prepopulated_fields = {"slug": ("name",)} + inlines = [ + CourseRoleInline, + ] + list_display = ("name", "is_public", "is_open") + search_fields = ("name",) + form = CourseForm diff --git a/judge/markdown.py b/judge/markdown.py index 5260f85..96e3539 100644 --- a/judge/markdown.py +++ b/judge/markdown.py @@ -77,7 +77,18 @@ ALLOWED_TAGS = list(bleach.sanitizer.ALLOWED_TAGS) + [ "summary", ] -ALLOWED_ATTRS = ["src", "width", "height", "href", "class", "open"] +ALLOWED_ATTRS = [ + "src", + "width", + "height", + "href", + "class", + "open", + "title", + "frameborder", + "allow", + "allowfullscreen", +] def markdown(value, lazy_load=False): diff --git a/judge/migrations/0180_course.py b/judge/migrations/0180_course.py new file mode 100644 index 0000000..439d32e --- /dev/null +++ b/judge/migrations/0180_course.py @@ -0,0 +1,78 @@ +# Generated by Django 3.2.18 on 2024-02-15 02:12 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0179_submission_result_lang_index"), + ] + + operations = [ + migrations.CreateModel( + name="CourseLesson", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("title", models.TextField(verbose_name="course title")), + ("content", models.TextField(verbose_name="course content")), + ("order", models.IntegerField(default=0, verbose_name="order")), + ("points", models.IntegerField(verbose_name="points")), + ], + ), + migrations.RemoveField( + model_name="courseresource", + name="course", + ), + migrations.RemoveField( + model_name="course", + name="ending_time", + ), + migrations.AlterField( + model_name="courserole", + name="course", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="judge.course", + verbose_name="course", + ), + ), + migrations.DeleteModel( + name="CourseAssignment", + ), + migrations.DeleteModel( + name="CourseResource", + ), + migrations.AddField( + model_name="courselesson", + name="course", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="judge.course", + verbose_name="course", + ), + ), + migrations.AddField( + model_name="courselesson", + name="problems", + field=models.ManyToManyField(to="judge.Problem"), + ), + migrations.AlterUniqueTogether( + name="courserole", + unique_together={("course", "user")}, + ), + migrations.AlterField( + model_name="courselesson", + name="problems", + field=models.ManyToManyField(blank=True, to="judge.Problem"), + ), + ] diff --git a/judge/models/__init__.py b/judge/models/__init__.py index bf2360a..89b5d2e 100644 --- a/judge/models/__init__.py +++ b/judge/models/__init__.py @@ -59,7 +59,7 @@ from judge.models.ticket import Ticket, TicketMessage from judge.models.volunteer import VolunteerProblemVote from judge.models.pagevote import PageVote, PageVoteVoter from judge.models.bookmark import BookMark, MakeBookMark -from judge.models.course import Course +from judge.models.course import Course, CourseRole, CourseLesson from judge.models.notification import Notification, NotificationProfile from judge.models.test_formatter import TestFormatterModel diff --git a/judge/models/course.py b/judge/models/course.py index e4a155a..caee007 100644 --- a/judge/models/course.py +++ b/judge/models/course.py @@ -1,18 +1,20 @@ from django.core.validators import RegexValidator from django.db import models from django.utils.translation import gettext, gettext_lazy as _ +from django.urls import reverse +from django.db.models import Q -from judge.models import Contest +from judge.models import BlogPost, Problem from judge.models.profile import Organization, Profile -__all__ = [ - "Course", - "CourseRole", - "CourseResource", - "CourseAssignment", -] -course_directory_file = "" +class RoleInCourse(models.TextChoices): + STUDENT = "ST", _("Student") + ASSISTANT = "AS", _("Assistant") + TEACHER = "TE", _("Teacher") + + +EDITABLE_ROLES = (RoleInCourse.TEACHER, RoleInCourse.ASSISTANT) class Course(models.Model): @@ -20,10 +22,7 @@ class Course(models.Model): max_length=128, verbose_name=_("course name"), ) - about = models.TextField(verbose_name=_("organization description")) - ending_time = models.DateTimeField( - verbose_name=_("ending time"), - ) + about = models.TextField(verbose_name=_("course description")) is_public = models.BooleanField( verbose_name=_("publicly visible"), default=False, @@ -57,35 +56,50 @@ class Course(models.Model): def __str__(self): return self.name - @classmethod - def is_editable_by(course, profile): - if profile.is_superuser: - return True - userquery = CourseRole.objects.filter(course=course, user=profile) - if userquery.exists(): - if userquery[0].role == "AS" or userquery[0].role == "TE": - return True - return False + def get_absolute_url(self): + return reverse("course_detail", args=(self.slug,)) @classmethod - def is_accessible_by(cls, course, profile): - userqueryset = CourseRole.objects.filter(course=course, user=profile) - if userqueryset.exists(): - return True - else: + def is_editable_by(cls, course, profile): + try: + course_role = CourseRole.objects.get(course=course, user=profile) + return course_role.role in EDITABLE_ROLES + except CourseRole.DoesNotExist: return False @classmethod - def get_students(cls, course): - return CourseRole.objects.filter(course=course, role="ST").values("user") + def is_accessible_by(cls, course, profile): + if not profile: + return False + try: + course_role = CourseRole.objects.get(course=course, user=profile) + if course_role.course.is_public: + return True + return course_role.role in EDITABLE_ROLES + except CourseRole.DoesNotExist: + return False @classmethod - def get_assistants(cls, course): - return CourseRole.objects.filter(course=course, role="AS").values("user") + def get_accessible_courses(cls, profile): + return Course.objects.filter( + Q(is_public=True) | Q(courserole__role__in=EDITABLE_ROLES), + courserole__user=profile, + ).distinct() - @classmethod - def get_teachers(cls, course): - return CourseRole.objects.filter(course=course, role="TE").values("user") + def _get_users_by_role(self, role): + course_roles = CourseRole.objects.filter(course=self, role=role).select_related( + "user" + ) + return [course_role.user for course_role in course_roles] + + def get_students(self): + return self._get_users_by_role(RoleInCourse.STUDENT) + + def get_assistants(self): + return self._get_users_by_role(RoleInCourse.ASSISTANT) + + def get_teachers(self): + return self._get_users_by_role(RoleInCourse.TEACHER) @classmethod def add_student(cls, course, profiles): @@ -104,7 +118,7 @@ class Course(models.Model): class CourseRole(models.Model): - course = models.OneToOneField( + course = models.ForeignKey( Course, verbose_name=_("course"), on_delete=models.CASCADE, @@ -114,14 +128,9 @@ class CourseRole(models.Model): Profile, verbose_name=_("user"), on_delete=models.CASCADE, - related_name=_("user_of_course"), + related_name="course_roles", ) - class RoleInCourse(models.TextChoices): - STUDENT = "ST", _("Student") - ASSISTANT = "AS", _("Assistant") - TEACHER = "TE", _("Teacher") - role = models.CharField( max_length=2, choices=RoleInCourse.choices, @@ -140,44 +149,19 @@ class CourseRole(models.Model): couresrole.role = role couresrole.save() + class Meta: + unique_together = ("course", "user") -class CourseResource(models.Model): - course = models.OneToOneField( + +class CourseLesson(models.Model): + course = models.ForeignKey( Course, verbose_name=_("course"), - on_delete=models.CASCADE, - db_index=True, - ) - files = models.FileField( - verbose_name=_("course files"), - null=True, - blank=True, - upload_to=course_directory_file, - ) - description = models.CharField( - verbose_name=_("description"), - blank=True, - max_length=150, - ) - order = models.IntegerField(null=True, default=None) - is_public = models.BooleanField( - verbose_name=_("publicly visible"), - default=False, - ) - - -class CourseAssignment(models.Model): - course = models.OneToOneField( - Course, - verbose_name=_("course"), - on_delete=models.CASCADE, - db_index=True, - ) - contest = models.OneToOneField( - Contest, - verbose_name=_("contest"), + related_name="lessons", on_delete=models.CASCADE, ) - points = models.FloatField( - verbose_name=_("points"), - ) + title = models.TextField(verbose_name=_("course title")) + content = models.TextField(verbose_name=_("course content")) + problems = models.ManyToManyField(Problem, verbose_name=_("problem"), blank=True) + order = models.IntegerField(verbose_name=_("order"), default=0) + points = models.IntegerField(verbose_name=_("points")) diff --git a/judge/views/course.py b/judge/views/course.py index d8582af..fb31aa7 100644 --- a/judge/views/course.py +++ b/judge/views/course.py @@ -1,24 +1,68 @@ +from django.utils.html import mark_safe from django.db import models -from judge.models.course import Course -from django.views.generic import ListView +from django.views.generic import ListView, DetailView, View +from django.utils.translation import gettext, gettext_lazy as _ +from django.http import Http404 +from django import forms +from django.forms import inlineformset_factory +from django.views.generic.edit import FormView +from django.shortcuts import get_object_or_404 +from django.urls import reverse_lazy +from django.db.models import Max, F +from django.core.exceptions import ObjectDoesNotExist -__all__ = [ - "CourseList", - "CourseDetail", - "CourseResource", - "CourseResourceDetail", - "CourseStudentResults", - "CourseEdit", - "CourseResourceDetailEdit", - "CourseResourceEdit", -] - -course_directory_file = "" +from judge.models import Course, CourseLesson, Submission, Profile, CourseRole +from judge.models.course import RoleInCourse +from judge.widgets import HeavyPreviewPageDownWidget, HeavySelect2MultipleWidget +from judge.utils.problems import ( + user_attempted_ids, + user_completed_ids, +) -class CourseListMixin(object): - def get_queryset(self): - return Course.objects.filter(is_open="true").values() +def max_case_points_per_problem(profile, problems): + # return a dict {problem_id: {case_points, case_total}} + q = ( + Submission.objects.filter(user=profile, problem__in=problems) + .values("problem") + .annotate(case_points=Max("case_points"), case_total=F("case_total")) + .order_by("problem") + ) + res = {} + for problem in q: + res[problem["problem"]] = problem + return res + + +def calculate_lessons_progress(profile, lessons): + res = {} + total_achieved_points = 0 + total_points = 0 + for lesson in lessons: + problems = list(lesson.problems.all()) + if not problems: + res[lesson.id] = {"achieved_points": 0, "percentage": 0} + total_points += lesson.points + continue + problem_points = max_case_points_per_problem(profile, problems) + num_problems = len(problems) + percentage = 0 + for val in problem_points.values(): + score = val["case_points"] / val["case_total"] + percentage += score / num_problems + res[lesson.id] = { + "achieved_points": percentage * lesson.points, + "percentage": percentage * 100, + } + total_achieved_points += percentage * lesson.points + total_points += lesson.points + + res["total"] = { + "achieved_points": total_achieved_points, + "total_points": total_points, + "percentage": total_achieved_points / total_points * 100, + } + return res class CourseList(ListView): @@ -28,12 +72,179 @@ class CourseList(ListView): def get_context_data(self, **kwargs): context = super(CourseList, self).get_context_data(**kwargs) - available, enrolling = [], [] - for course in Course.objects.filter(is_public=True).filter(is_open=True): - if Course.is_accessible_by(course, self.request.profile): - enrolling.append(course) - else: - available.append(course) - context["available"] = available - context["enrolling"] = enrolling + context["courses"] = Course.get_accessible_courses(self.request.profile) + context["title"] = _("Courses") + context["page_type"] = "list" + return context + + +class CourseDetailMixin(object): + def dispatch(self, request, *args, **kwargs): + self.course = get_object_or_404(Course, slug=self.kwargs["slug"]) + if not Course.is_accessible_by(self.course, self.request.profile): + raise Http404() + self.is_editable = Course.is_editable_by(self.course, self.request.profile) + return super(CourseDetailMixin, self).dispatch(request, *args, **kwargs) + + def get_context_data(self, **kwargs): + context = super(CourseDetailMixin, self).get_context_data(**kwargs) + context["course"] = self.course + context["is_editable"] = self.is_editable + return context + + +class CourseEditableMixin(CourseDetailMixin): + def dispatch(self, request, *args, **kwargs): + res = super(CourseEditableMixin, self).dispatch(request, *args, **kwargs) + if not self.is_editable: + raise Http404() + return res + + +class CourseDetail(CourseDetailMixin, DetailView): + model = Course + template_name = "course/course.html" + + def get_object(self): + return self.course + + def get_context_data(self, **kwargs): + context = super(CourseDetail, self).get_context_data(**kwargs) + lessons = self.course.lessons.prefetch_related("problems").all() + context["title"] = self.course.name + context["page_type"] = "home" + context["lessons"] = lessons + context["lesson_progress"] = calculate_lessons_progress( + self.request.profile, lessons + ) + return context + + +class CourseLessonDetail(CourseDetailMixin, DetailView): + model = CourseLesson + template_name = "course/lesson.html" + + def get_object(self): + try: + self.lesson = CourseLesson.objects.get( + course=self.course, id=self.kwargs["id"] + ) + return self.lesson + except ObjectDoesNotExist: + raise Http404() + + def get_profile(self): + username = self.request.GET.get("user") + if not username: + return self.request.profile + + is_editable = Course.is_editable_by(self.course, self.request.profile) + if not is_editable: + raise Http404() + + try: + profile = Profile.objects.get(user__username=username) + is_student = profile.course_roles.filter( + role=RoleInCourse.STUDENT, course=self.course + ).exists() + if not is_student: + raise Http404() + return profile + except ObjectDoesNotExist: + raise Http404() + + def get_context_data(self, **kwargs): + context = super(CourseLessonDetail, self).get_context_data(**kwargs) + profile = self.get_profile() + context["title"] = self.lesson.title + context["lesson"] = self.lesson + context["completed_problem_ids"] = user_completed_ids(profile) + context["attempted_problems"] = user_attempted_ids(profile) + context["problem_points"] = max_case_points_per_problem( + profile, self.lesson.problems.all() + ) + return context + + +class CourseLessonForm(forms.ModelForm): + class Meta: + model = CourseLesson + fields = ["order", "title", "points", "content", "problems"] + widgets = { + "title": forms.TextInput(), + "content": HeavyPreviewPageDownWidget(preview=reverse_lazy("blog_preview")), + "problems": HeavySelect2MultipleWidget(data_view="problem_select2"), + } + + +CourseLessonFormSet = inlineformset_factory( + Course, CourseLesson, form=CourseLessonForm, extra=1, can_delete=True +) + + +class EditCourseLessonsView(CourseEditableMixin, FormView): + template_name = "course/edit_lesson.html" + form_class = CourseLessonFormSet + + def get_context_data(self, **kwargs): + context = super(EditCourseLessonsView, self).get_context_data(**kwargs) + if self.request.method == "POST": + context["formset"] = self.form_class( + self.request.POST, self.request.FILES, instance=self.course + ) + else: + context["formset"] = self.form_class( + instance=self.course, queryset=self.course.lessons.order_by("order") + ) + context["title"] = _("Edit lessons for %(course_name)s") % { + "course_name": self.course.name + } + context["content_title"] = mark_safe( + _("Edit lessons for %(course_name)s") + % { + "course_name": self.course.name, + "url": self.course.get_absolute_url(), + } + ) + context["page_type"] = "edit_lesson" + + return context + + def post(self, request, *args, **kwargs): + formset = self.form_class(request.POST, instance=self.course) + if formset.is_valid(): + formset.save() + return self.form_valid(formset) + else: + return self.form_invalid(formset) + + def get_success_url(self): + return self.request.path + + +class CourseStudentResults(CourseEditableMixin, DetailView): + model = Course + template_name = "course/grades.html" + + def get_object(self): + return self.course + + def get_grades(self): + students = self.course.get_students() + students.sort(key=lambda u: u.username.lower()) + lessons = self.course.lessons.prefetch_related("problems").all() + grades = {s: calculate_lessons_progress(s, lessons) for s in students} + return grades + + def get_context_data(self, **kwargs): + context = super(CourseStudentResults, self).get_context_data(**kwargs) + context["title"] = mark_safe( + _("Grades in %(course_name)s") + % { + "course_name": self.course.name, + "url": self.course.get_absolute_url(), + } + ) + context["page_type"] = "grades" + context["grades"] = self.get_grades() return context diff --git a/judge/views/organization.py b/judge/views/organization.py index eff02d4..037329d 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -131,6 +131,13 @@ class OrganizationMixin(OrganizationBase): context["can_edit"] = self.can_edit_organization(self.organization) context["organization"] = self.organization context["logo_override_image"] = self.organization.logo_override_image + context["organization_subdomain"] = ( + ("http" if settings.DMOJ_SSL == 0 else "https") + + "://" + + self.organization.slug + + "." + + get_current_site(self.request).domain + ) if "organizations" in context: context.pop("organizations") return context @@ -274,14 +281,6 @@ class OrganizationHome(OrganizationHomeView, FeedView): def get_context_data(self, **kwargs): context = super(OrganizationHome, self).get_context_data(**kwargs) context["title"] = self.organization.name - http = "http" if settings.DMOJ_SSL == 0 else "https" - context["organization_subdomain"] = ( - http - + "://" - + self.organization.slug - + "." - + get_current_site(self.request).domain - ) now = timezone.now() visible_contests = ( @@ -737,7 +736,7 @@ class AddOrganizationMember( def form_valid(self, form): new_users = form.cleaned_data["new_users"] self.object.members.add(*new_users) - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): revisions.set_comment(_("Added members from site")) revisions.set_user(self.request.user) return super(AddOrganizationMember, self).form_valid(form) @@ -804,7 +803,7 @@ class EditOrganization( return form def form_valid(self, form): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): revisions.set_comment(_("Edited from site")) revisions.set_user(self.request.user) return super(EditOrganization, self).form_valid(form) @@ -836,7 +835,7 @@ class AddOrganization(LoginRequiredMixin, TitleMixin, CreateView): % settings.DMOJ_USER_MAX_ORGANIZATION_ADD, status=400, ) - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): revisions.set_comment(_("Added from site")) revisions.set_user(self.request.user) res = super(AddOrganization, self).form_valid(form) @@ -861,7 +860,7 @@ class AddOrganizationContest( return kwargs def form_valid(self, form): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): revisions.set_comment(_("Added from site")) revisions.set_user(self.request.user) @@ -954,7 +953,7 @@ class EditOrganizationContest( return self.contest def form_valid(self, form): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): revisions.set_comment(_("Edited from site")) revisions.set_user(self.request.user) res = super(EditOrganizationContest, self).form_valid(form) @@ -1015,7 +1014,7 @@ class AddOrganizationBlog( return _("Add blog for %s") % self.organization.name def form_valid(self, form): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): res = super(AddOrganizationBlog, self).form_valid(form) self.object.is_organization_private = True self.object.authors.add(self.request.profile) @@ -1038,6 +1037,11 @@ class AddOrganizationBlog( ) return res + def get_success_url(self): + return reverse( + "organization_home", args=[self.organization.id, self.organization.slug] + ) + class EditOrganizationBlog( LoginRequiredMixin, @@ -1115,13 +1119,18 @@ class EditOrganizationBlog( make_notification(posible_users, action, html, self.request.profile) def form_valid(self, form): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): res = super(EditOrganizationBlog, self).form_valid(form) revisions.set_comment(_("Edited from site")) revisions.set_user(self.request.user) self.create_notification("Edit blog") return res + def get_success_url(self): + return reverse( + "organization_home", args=[self.organization.id, self.organization.slug] + ) + class PendingBlogs( LoginRequiredMixin, diff --git a/judge/views/user.py b/judge/views/user.py index aa0eff4..356a8a7 100644 --- a/judge/views/user.py +++ b/judge/views/user.py @@ -409,7 +409,7 @@ def edit_profile(request): request.POST, request.FILES, instance=profile, user=request.user ) if form_user.is_valid() and form.is_valid(): - with transaction.atomic(), revisions.create_revision(): + with revisions.create_revision(): form_user.save() form.save() revisions.set_user(request.user) diff --git a/judge/views/volunteer.py b/judge/views/volunteer.py index 64c58f9..acd3469 100644 --- a/judge/views/volunteer.py +++ b/judge/views/volunteer.py @@ -19,15 +19,14 @@ def vote_problem(request): except Exception as e: return HttpResponseBadRequest() - with transaction.atomic(): - vote, _ = VolunteerProblemVote.objects.get_or_create( - voter=request.profile, - problem=problem, - defaults={"knowledge_points": 0, "thinking_points": 0}, - ) - vote.knowledge_points = knowledge_points - vote.thinking_points = thinking_points - vote.feedback = feedback - vote.types.set(types) - vote.save() + vote, _ = VolunteerProblemVote.objects.get_or_create( + voter=request.profile, + problem=problem, + defaults={"knowledge_points": 0, "thinking_points": 0}, + ) + vote.knowledge_points = knowledge_points + vote.thinking_points = thinking_points + vote.feedback = feedback + vote.types.set(types) + vote.save() return JsonResponse({}) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 66127cf..ad5d37a 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: lqdoj2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-31 11:20+0700\n" +"POT-Creation-Date: 2024-02-19 15:28+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -24,7 +24,7 @@ msgstr "xem lần cuối" #: chat_box/models.py:58 chat_box/models.py:83 chat_box/models.py:99 #: judge/admin/interface.py:150 judge/models/contest.py:647 -#: judge/models/contest.py:853 judge/models/course.py:115 +#: judge/models/contest.py:853 judge/models/course.py:127 #: judge/models/profile.py:430 judge/models/profile.py:504 msgid "user" msgstr "người dùng" @@ -49,12 +49,12 @@ msgstr "Gần đây" #: chat_box/views.py:445 templates/base.html:192 #: templates/comments/content-list.html:77 #: templates/contest/contest-list-tabs.html:4 -#: templates/contest/ranking-table.html:47 +#: templates/contest/ranking-table.html:47 templates/course/left_sidebar.html:8 #: templates/internal/problem/problem.html:63 #: templates/organization/org-left-sidebar.html:12 #: templates/problem/left-sidebar.html:6 #: templates/problem/problem-list-tabs.html:6 -#: templates/submission/info-base.html:12 templates/submission/list.html:398 +#: templates/submission/info-base.html:12 templates/submission/list.html:394 #: templates/submission/submission-list-tabs.html:15 msgid "Admin" msgstr "Admin" @@ -67,27 +67,28 @@ msgstr "Tiếng Việt" msgid "English" msgstr "" -#: dmoj/urls.py:106 +#: dmoj/urls.py:107 msgid "Activation key invalid" msgstr "Mã kích hoạt không hợp lệ" -#: dmoj/urls.py:111 +#: dmoj/urls.py:112 msgid "Register" msgstr "Đăng ký" -#: dmoj/urls.py:118 +#: dmoj/urls.py:119 msgid "Registration Completed" msgstr "Đăng ký hoàn thành" -#: dmoj/urls.py:126 +#: dmoj/urls.py:127 msgid "Registration not allowed" msgstr "Đăng ký không thành công" -#: dmoj/urls.py:134 +#: dmoj/urls.py:135 msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:220 templates/base.html:114 +#: dmoj/urls.py:221 templates/base.html:114 +#: templates/course/left_sidebar.html:2 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -204,7 +205,7 @@ msgstr "ảo" msgid "link path" msgstr "đường dẫn" -#: judge/admin/interface.py:94 +#: judge/admin/interface.py:94 templates/course/lesson.html:10 msgid "Content" msgstr "Nội dung" @@ -260,7 +261,7 @@ msgstr "Giới hạn" #: judge/admin/problem.py:219 judge/admin/submission.py:351 #: templates/base.html:158 templates/stats/tab.html:4 -#: templates/submission/list.html:350 +#: templates/submission/list.html:346 msgid "Language" msgstr "Ngôn ngữ" @@ -268,7 +269,7 @@ msgstr "Ngôn ngữ" msgid "History" msgstr "Lịch sử" -#: judge/admin/problem.py:273 templates/problem/list-base.html:93 +#: judge/admin/problem.py:273 templates/problem/list-base.html:95 msgid "Authors" msgstr "Các tác giả" @@ -325,7 +326,7 @@ msgstr "múi giờ" #: templates/notification/list.html:9 #: templates/organization/requests/log.html:9 #: templates/organization/requests/pending.html:19 -#: templates/ticket/list.html:263 +#: templates/ticket/list.html:265 msgid "User" msgstr "Thành viên" @@ -510,7 +511,7 @@ msgstr "IOI mới" msgid "Ultimate" msgstr "" -#: judge/custom_translations.py:7 +#: judge/custom_translations.py:8 #, python-format msgid "" "This password is too short. It must contain at least %(min_length)d " @@ -520,94 +521,94 @@ msgid_plural "" "characters." msgstr[0] "Mật khẩu phải chứa ít nhất %(min_length)d ký tự." -#: judge/custom_translations.py:12 +#: judge/custom_translations.py:13 #, python-format msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "Mật khẩu phải chứa ít nhất %(min_length)d ký tự." -#: judge/custom_translations.py:16 +#: judge/custom_translations.py:17 msgid "The two password fields didn’t match." msgstr "Mật khẩu xác nhận không khớp." -#: judge/custom_translations.py:17 +#: judge/custom_translations.py:18 msgid "Your password can’t be entirely numeric." msgstr "Mật khẩu không được toàn chữ số." -#: judge/custom_translations.py:19 +#: judge/custom_translations.py:20 msgid "Bug Report" msgstr "Báo cáo lỗi" -#: judge/forms.py:113 +#: judge/forms.py:112 msgid "File size exceeds the maximum allowed limit of 5MB." msgstr "File tải lên không được quá 5MB." -#: judge/forms.py:144 +#: judge/forms.py:143 msgid "Any judge" msgstr "" -#: judge/forms.py:344 +#: judge/forms.py:345 msgid "Enter usernames separating by space" msgstr "Nhập các tên đăng nhập, cách nhau bởi dấu cách" -#: judge/forms.py:345 judge/views/stats.py:166 templates/stats/site.html:27 +#: judge/forms.py:346 judge/views/stats.py:166 templates/stats/site.html:27 msgid "New users" msgstr "Thành viên mới" -#: judge/forms.py:362 +#: judge/forms.py:363 #, python-brace-format msgid "These usernames don't exist: {usernames}" msgstr "Các tên đăng nhập này không tồn tại: {usernames}" -#: judge/forms.py:422 +#: judge/forms.py:423 msgid "Username/Email" msgstr "Tên đăng nhập / Email" -#: judge/forms.py:424 judge/views/email.py:22 +#: judge/forms.py:425 judge/views/email.py:22 #: templates/registration/registration_form.html:46 #: templates/registration/registration_form.html:60 #: templates/user/edit-profile.html:101 templates/user/import/table_csv.html:5 msgid "Password" msgstr "Mật khẩu" -#: judge/forms.py:450 +#: judge/forms.py:451 msgid "Two Factor Authentication tokens must be 6 decimal digits." msgstr "Two Factor Authentication phải chứa 6 chữ số." -#: judge/forms.py:463 templates/registration/totp_auth.html:32 +#: judge/forms.py:464 templates/registration/totp_auth.html:32 msgid "Invalid Two Factor Authentication token." msgstr "Token Two Factor Authentication không hợp lệ." -#: judge/forms.py:470 judge/models/problem.py:132 +#: judge/forms.py:471 judge/models/problem.py:132 msgid "Problem code must be ^[a-z0-9]+$" msgstr "Mã bài phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:477 +#: judge/forms.py:478 msgid "Problem with code already exists." msgstr "Mã bài đã tồn tại." -#: judge/forms.py:484 judge/models/contest.py:95 +#: judge/forms.py:485 judge/models/contest.py:95 msgid "Contest id must be ^[a-z0-9]+$" msgstr "Mã kỳ thi phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:491 templates/contest/clone.html:47 +#: judge/forms.py:492 templates/contest/clone.html:47 #: templates/problem/search-form.html:39 msgid "Group" msgstr "Nhóm" -#: judge/forms.py:499 +#: judge/forms.py:500 msgid "Contest with key already exists." msgstr "Mã kỳ thi đã tồn tại." -#: judge/forms.py:507 +#: judge/forms.py:508 msgid "Group doesn't exist." msgstr "Nhóm không tồn tại." -#: judge/forms.py:509 +#: judge/forms.py:510 msgid "You don't have permission in this group." msgstr "Bạn không có quyền trong nhóm này." -#: judge/forms.py:559 +#: judge/forms.py:560 msgid "This problem is duplicated." msgstr "Bài này bị lặp" @@ -622,11 +623,6 @@ msgstr "g:i a j b, Y" msgid "{time}" msgstr "{time}" -#: judge/jinja2/datetime.py:26 templates/blog/content.html:12 -#, python-brace-format -msgid "on {time}" -msgstr "vào {time}" - #: judge/middleware.py:135 msgid "No permission" msgstr "Không có quyền truy cập" @@ -807,8 +803,7 @@ msgid "These users will be able to view the contest, but not edit it." msgstr "" "Những người dùng này có thể thấy kỳ thi nhưng không có quyền chỉnh sửa." -#: judge/models/contest.py:125 judge/models/course.py:158 -#: judge/models/runtime.py:211 +#: judge/models/contest.py:125 judge/models/runtime.py:211 msgid "description" msgstr "mô tả" @@ -849,8 +844,8 @@ msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, " "hãy nhập 02:00:00" -#: judge/models/contest.py:148 judge/models/course.py:28 -#: judge/models/course.py:164 judge/models/problem.py:224 +#: judge/models/contest.py:148 judge/models/course.py:26 +#: judge/models/problem.py:224 msgid "publicly visible" msgstr "công khai" @@ -961,7 +956,7 @@ msgstr "" msgid "private to organizations" msgstr "riêng tư với các tổ chức" -#: judge/models/contest.py:238 judge/models/course.py:34 +#: judge/models/contest.py:238 judge/models/course.py:32 #: judge/models/interface.py:92 judge/models/problem.py:280 #: judge/models/profile.py:149 msgid "organizations" @@ -1085,7 +1080,7 @@ msgstr "Cách hiển thị thứ tự bài tập" #: judge/models/contest.py:631 judge/models/contest.py:778 #: judge/models/contest.py:856 judge/models/contest.py:886 -#: judge/models/course.py:178 judge/models/submission.py:116 +#: judge/models/submission.py:116 msgid "contest" msgstr "kỳ thi" @@ -1176,7 +1171,7 @@ msgid "problem" msgstr "bài tập" #: judge/models/contest.py:782 judge/models/contest.py:839 -#: judge/models/course.py:182 judge/models/problem.py:208 +#: judge/models/course.py:165 judge/models/problem.py:208 msgid "points" msgstr "điểm" @@ -1188,7 +1183,8 @@ msgstr "thành phần" msgid "is pretested" msgstr "dùng pretest" -#: judge/models/contest.py:785 judge/models/interface.py:47 +#: judge/models/contest.py:785 judge/models/course.py:164 +#: judge/models/interface.py:47 msgid "order" msgstr "thứ tự" @@ -1298,89 +1294,68 @@ msgid "clarification timestamp" msgstr "" #: judge/models/contest.py:926 -#, fuzzy -#| msgid "contest summary" msgid "contests summary" msgstr "tổng kết kỳ thi" #: judge/models/contest.py:927 -#, fuzzy -#| msgid "contest summary" msgid "contests summaries" msgstr "tổng kết kỳ thi" -#: judge/models/course.py:21 -#, fuzzy -#| msgid "username" +#: judge/models/course.py:11 templates/course/grades.html:88 +msgid "Student" +msgstr "Học sinh" + +#: judge/models/course.py:12 +msgid "Assistant" +msgstr "Trợ giảng" + +#: judge/models/course.py:13 +msgid "Teacher" +msgstr "Giáo viên" + +#: judge/models/course.py:22 msgid "course name" -msgstr "tên đăng nhập" +msgstr "tên khóa học" -#: judge/models/course.py:23 judge/models/profile.py:58 -msgid "organization description" -msgstr "mô tả tổ chức" +#: judge/models/course.py:24 +msgid "course description" +msgstr "Mô tả khóa học" -#: judge/models/course.py:25 -#, fuzzy -#| msgid "end time" -msgid "ending time" -msgstr "thời gian kết thúc" - -#: judge/models/course.py:35 -#, fuzzy -#| msgid "If private, only these organizations may see the contest" +#: judge/models/course.py:33 msgid "If private, only these organizations may see the course" -msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được kỳ thi" +msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được khóa học" -#: judge/models/course.py:39 +#: judge/models/course.py:37 msgid "course slug" -msgstr "" +msgstr "url khóa học" -#: judge/models/course.py:40 -#, fuzzy -#| msgid "Organization name shown in URL" +#: judge/models/course.py:38 msgid "Course name shown in URL" msgstr "Tên được hiển thị trong đường dẫn" -#: judge/models/course.py:43 judge/models/profile.py:50 +#: judge/models/course.py:41 judge/models/profile.py:50 msgid "Only alphanumeric and hyphens" -msgstr "" +msgstr "Chỉ chứa chữ cái và dấu gạch ngang (-)" -#: judge/models/course.py:47 -#, fuzzy -#| msgid "Registration" +#: judge/models/course.py:45 msgid "public registration" -msgstr "Đăng ký" +msgstr "Cho phép đăng ký" -#: judge/models/course.py:51 +#: judge/models/course.py:49 msgid "course image" -msgstr "" +msgstr "hình ảnh khóa học" -#: judge/models/course.py:109 judge/models/course.py:147 -#: judge/models/course.py:172 +#: judge/models/course.py:121 judge/models/course.py:157 msgid "course" -msgstr "" +msgstr "khóa học" -#: judge/models/course.py:117 -msgid "user_of_course" -msgstr "" +#: judge/models/course.py:161 +msgid "course title" +msgstr "tiêu đề khóa học" -#: judge/models/course.py:121 -msgid "Student" -msgstr "" - -#: judge/models/course.py:122 -msgid "Assistant" -msgstr "" - -#: judge/models/course.py:123 -msgid "Teacher" -msgstr "" - -#: judge/models/course.py:152 -#, fuzzy -#| msgid "user profiles" -msgid "course files" -msgstr "thông tin người dùng" +#: judge/models/course.py:162 +msgid "course content" +msgstr "nội dung khóa học" #: judge/models/interface.py:28 msgid "configuration item" @@ -2012,6 +1987,10 @@ msgstr "Tên được hiển thị trong đường dẫn" msgid "Displayed beside user name during contests" msgstr "Hiển thị bên cạnh tên người dùng trong kỳ thi" +#: judge/models/profile.py:58 +msgid "organization description" +msgstr "mô tả tổ chức" + #: judge/models/profile.py:61 msgid "registrant" msgstr "người tạo" @@ -2769,8 +2748,9 @@ msgctxt "hours and minutes" msgid "%h:%m" msgstr "%h:%m" -#: judge/views/about.py:10 templates/organization/home.html:47 -#: templates/organization/org-right-sidebar.html:72 +#: judge/views/about.py:10 templates/course/course.html:5 +#: templates/organization/home.html:40 +#: templates/organization/org-right-sidebar.html:81 #: templates/user/user-about.html:72 templates/user/user-tabs.html:4 #: templates/user/users-table.html:22 msgid "About" @@ -2805,8 +2785,8 @@ msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote." msgid "You already voted." msgstr "Bạn đã vote." -#: judge/views/comment.py:242 judge/views/organization.py:808 -#: judge/views/organization.py:958 judge/views/organization.py:1120 +#: judge/views/comment.py:242 judge/views/organization.py:807 +#: judge/views/organization.py:957 judge/views/organization.py:1124 msgid "Edited from site" msgstr "Chỉnh sửa từ web" @@ -2815,7 +2795,7 @@ msgid "Editing comment" msgstr "Chỉnh sửa bình luận" #: judge/views/contests.py:122 judge/views/contests.py:388 -#: judge/views/contests.py:393 judge/views/contests.py:688 +#: judge/views/contests.py:393 judge/views/contests.py:690 msgid "No such contest" msgstr "Không có contest nào như vậy" @@ -2824,7 +2804,7 @@ msgstr "Không có contest nào như vậy" msgid "Could not find a contest with the key \"%s\"." msgstr "Không tìm thấy kỳ thi với mã \"%s\"." -#: judge/views/contests.py:142 judge/views/contests.py:1446 +#: judge/views/contests.py:142 judge/views/contests.py:1448 #: judge/views/stats.py:178 templates/contest/list.html:244 #: templates/contest/list.html:289 templates/contest/list.html:334 #: templates/contest/list.html:376 @@ -2842,117 +2822,135 @@ msgstr "Không tìm thấy kỳ thi nào như vậy." msgid "Access to contest \"%s\" denied" msgstr "Truy cập tới kỳ thi \"%s\" bị từ chối" -#: judge/views/contests.py:470 +#: judge/views/contests.py:472 msgid "Clone Contest" msgstr "Nhân bản kỳ thi" -#: judge/views/contests.py:562 +#: judge/views/contests.py:564 msgid "Contest not ongoing" msgstr "Kỳ thi đang không diễn ra" -#: judge/views/contests.py:563 +#: judge/views/contests.py:565 #, python-format msgid "\"%s\" is not currently ongoing." msgstr "\"%s\" kỳ thi đang không diễn ra." -#: judge/views/contests.py:570 +#: judge/views/contests.py:572 msgid "Already in contest" msgstr "Đã ở trong kỳ thi" -#: judge/views/contests.py:571 +#: judge/views/contests.py:573 #, python-format msgid "You are already in a contest: \"%s\"." msgstr "Bạn đã ở trong kỳ thi: \"%s\"." -#: judge/views/contests.py:581 +#: judge/views/contests.py:583 msgid "Banned from joining" msgstr "Bị cấm tham gia" -#: judge/views/contests.py:583 +#: judge/views/contests.py:585 msgid "" "You have been declared persona non grata for this contest. You are " "permanently barred from joining this contest." msgstr "Bạn không được phép tham gia kỳ thi này." -#: judge/views/contests.py:672 +#: judge/views/contests.py:674 #, python-format msgid "Enter access code for \"%s\"" msgstr "Nhập mật khẩu truy cập cho \"%s\"" -#: judge/views/contests.py:689 +#: judge/views/contests.py:691 #, python-format msgid "You are not in contest \"%s\"." msgstr "Bạn không ở trong kỳ thi \"%s\"." -#: judge/views/contests.py:712 +#: judge/views/contests.py:714 msgid "ContestCalendar requires integer year and month" msgstr "Lịch thi yêu cầu giá trị cho năm và tháng là số nguyên" -#: judge/views/contests.py:770 +#: judge/views/contests.py:772 #, python-format msgid "Contests in %(month)s" msgstr "Các kỳ thi trong %(month)s" -#: judge/views/contests.py:771 +#: judge/views/contests.py:773 msgid "F Y" msgstr "F Y" -#: judge/views/contests.py:831 +#: judge/views/contests.py:833 #, python-format msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1127 +#: judge/views/contests.py:1129 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1138 +#: judge/views/contests.py:1140 msgid "???" msgstr "???" -#: judge/views/contests.py:1165 +#: judge/views/contests.py:1167 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1166 +#: judge/views/contests.py:1168 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1180 +#: judge/views/contests.py:1182 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1199 templates/contest/contest-tabs.html:21 +#: judge/views/contests.py:1201 templates/contest/contest-tabs.html:21 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1248 +#: judge/views/contests.py:1250 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1284 +#: judge/views/contests.py:1286 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1307 +#: judge/views/contests.py:1309 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1322 judge/views/ticket.py:67 +#: judge/views/contests.py:1324 judge/views/ticket.py:67 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1365 +#: judge/views/contests.py:1367 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" +#: judge/views/course.py:86 templates/course/list.html:8 +msgid "Courses" +msgstr "Khóa học" + +#: judge/views/course.py:211 +#, python-format +msgid "Edit lessons for %(course_name)s" +msgstr "Chỉnh sửa bài học cho %(course_name)s" + +#: judge/views/course.py:212 +#, python-format +msgid "Edit lessons for %(course_name)s" +msgstr "Chỉnh sửa bài học cho %(course_name)s" + +#: judge/views/course.py:252 +msgid "Grades in %(course_name)s" +msgstr "Điểm trong %(course_name)s" + #: judge/views/email.py:21 msgid "New Email" msgstr "Email mới" @@ -3042,98 +3040,98 @@ msgstr "" msgid "Notifications (%d unseen)" msgstr "Thông báo (%d chưa xem)" -#: judge/views/organization.py:149 judge/views/organization.py:156 +#: judge/views/organization.py:156 judge/views/organization.py:163 msgid "No such organization" msgstr "Không có tổ chức như vậy" -#: judge/views/organization.py:150 +#: judge/views/organization.py:157 #, python-format msgid "Could not find an organization with the key \"%s\"." msgstr "Không tìm thấy tổ chức với mã \"%s\"." -#: judge/views/organization.py:157 +#: judge/views/organization.py:164 msgid "Could not find such organization." msgstr "" -#: judge/views/organization.py:181 +#: judge/views/organization.py:188 msgid "Can't edit organization" msgstr "Không thể chỉnh sửa tổ chức" -#: judge/views/organization.py:182 +#: judge/views/organization.py:189 msgid "You are not allowed to edit this organization." msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:194 judge/views/organization.py:338 +#: judge/views/organization.py:201 judge/views/organization.py:337 msgid "Can't access organization" msgstr "Không thể truy cập nhóm" -#: judge/views/organization.py:195 judge/views/organization.py:339 +#: judge/views/organization.py:202 judge/views/organization.py:338 msgid "You are not allowed to access this organization." msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:231 judge/views/stats.py:184 +#: judge/views/organization.py:238 judge/views/stats.py:184 #: templates/contest/list.html:93 templates/problem/list-base.html:91 #: templates/stats/site.html:33 templates/user/user-left-sidebar.html:4 #: templates/user/user-list-tabs.html:6 msgid "Groups" msgstr "Nhóm" -#: judge/views/organization.py:345 +#: judge/views/organization.py:344 #, python-format msgid "%s Members" msgstr "%s Thành viên" -#: judge/views/organization.py:467 +#: judge/views/organization.py:466 #, python-brace-format msgid "All submissions in {0}" msgstr "Bài nộp trong {0}" -#: judge/views/organization.py:497 judge/views/organization.py:503 -#: judge/views/organization.py:510 +#: judge/views/organization.py:496 judge/views/organization.py:502 +#: judge/views/organization.py:509 msgid "Joining group" msgstr "Tham gia nhóm" -#: judge/views/organization.py:498 +#: judge/views/organization.py:497 msgid "You are already in the group." msgstr "Bạn đã ở trong nhóm." -#: judge/views/organization.py:503 +#: judge/views/organization.py:502 msgid "This group is not open." msgstr "Nhóm này là nhóm kín." -#: judge/views/organization.py:511 +#: judge/views/organization.py:510 #, python-brace-format msgid "You may not be part of more than {count} public groups." msgstr "Bạn không thể tham gia nhiều hơn {count} nhóm công khai." -#: judge/views/organization.py:526 +#: judge/views/organization.py:525 msgid "Leaving group" msgstr "Rời nhóm" -#: judge/views/organization.py:527 +#: judge/views/organization.py:526 #, python-format msgid "You are not in \"%s\"." msgstr "Bạn không ở trong \"%s\"." -#: judge/views/organization.py:552 +#: judge/views/organization.py:551 #, python-format msgid "Request to join %s" msgstr "Đăng ký tham gia %s" -#: judge/views/organization.py:582 +#: judge/views/organization.py:581 msgid "Join request detail" msgstr "Chi tiết đơn đăng ký" -#: judge/views/organization.py:624 +#: judge/views/organization.py:623 msgid "Manage join requests" msgstr "Quản lý đơn đăng ký" -#: judge/views/organization.py:628 +#: judge/views/organization.py:627 #, python-format msgid "Managing join requests for %s" msgstr "Quản lý đơn đăng ký cho %s" -#: judge/views/organization.py:668 +#: judge/views/organization.py:667 #, python-format msgid "" "Your organization can only receive %d more members. You cannot approve %d " @@ -3142,81 +3140,81 @@ msgstr "" "Tổ chức chỉ có thể chứa %d thành viên. Bạn không thể chấp thuận nhiều hơn %d " "người." -#: judge/views/organization.py:686 +#: judge/views/organization.py:685 #, python-format msgid "Approved %d user." msgid_plural "Approved %d users." msgstr[0] "Đã chấp thuận %d người." -#: judge/views/organization.py:689 +#: judge/views/organization.py:688 #, python-format msgid "Rejected %d user." msgid_plural "Rejected %d users." msgstr[0] "Đã từ chối %d người." -#: judge/views/organization.py:729 +#: judge/views/organization.py:728 #, python-format msgid "Add member for %s" msgstr "Thêm thành viên cho %s" -#: judge/views/organization.py:741 +#: judge/views/organization.py:740 #, fuzzy #| msgid "Edited from site" msgid "Added members from site" msgstr "Chỉnh sửa từ web" -#: judge/views/organization.py:761 judge/views/organization.py:769 +#: judge/views/organization.py:760 judge/views/organization.py:768 msgid "Can't kick user" msgstr "Không thể đuổi" -#: judge/views/organization.py:762 +#: judge/views/organization.py:761 msgid "The user you are trying to kick does not exist!" msgstr "" -#: judge/views/organization.py:770 +#: judge/views/organization.py:769 #, python-format msgid "The user you are trying to kick is not in organization: %s." msgstr "" -#: judge/views/organization.py:791 judge/views/organization.py:947 +#: judge/views/organization.py:790 judge/views/organization.py:946 #, python-format msgid "Edit %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:819 templates/organization/list.html:45 +#: judge/views/organization.py:818 templates/organization/list.html:45 msgid "Create group" msgstr "Tạo nhóm" -#: judge/views/organization.py:834 +#: judge/views/organization.py:833 msgid "Exceeded limit" msgstr "" -#: judge/views/organization.py:835 +#: judge/views/organization.py:834 #, python-format msgid "You created too many groups. You can only create at most %d groups" msgstr "" -#: judge/views/organization.py:840 judge/views/organization.py:865 -#: judge/views/organization.py:1026 +#: judge/views/organization.py:839 judge/views/organization.py:864 +#: judge/views/organization.py:1025 msgid "Added from site" msgstr "Thêm từ web" -#: judge/views/organization.py:856 +#: judge/views/organization.py:855 #: templates/organization/org-right-sidebar.html:52 msgid "Add contest" msgstr "Thêm kỳ thi" -#: judge/views/organization.py:899 judge/views/organization.py:1071 +#: judge/views/organization.py:898 judge/views/organization.py:1075 msgid "Permission denied" msgstr "Truy cập bị từ chối" -#: judge/views/organization.py:900 +#: judge/views/organization.py:899 #, fuzzy #| msgid "You are not allowed to edit this organization." msgid "You are not allowed to edit this contest" msgstr "Bạn không được phép chỉnh sửa tổ chức này." -#: judge/views/organization.py:951 templates/blog/blog.html:31 +#: judge/views/organization.py:950 templates/blog/blog.html:31 #: templates/comments/content-list.html:58 #: templates/comments/content-list.html:71 #: templates/contest/contest-tabs.html:37 templates/contest/list.html:128 @@ -3227,21 +3225,21 @@ msgstr "Bạn không được phép chỉnh sửa tổ chức này." msgid "Edit" msgstr "Chỉnh sửa" -#: judge/views/organization.py:1015 +#: judge/views/organization.py:1014 #, python-format msgid "Add blog for %s" msgstr "Thêm bài đăng cho %s" -#: judge/views/organization.py:1072 +#: judge/views/organization.py:1076 msgid "Not allowed to edit this blog" msgstr "Bạn không được phép chỉnh sửa bài đăng này." -#: judge/views/organization.py:1104 +#: judge/views/organization.py:1108 #, python-format msgid "Edit blog %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:1146 +#: judge/views/organization.py:1155 #, python-format msgid "Pending blogs in %s" msgstr "Bài đang đợi duyệt trong %s" @@ -3265,41 +3263,42 @@ msgstr "Hướng dẫn cho {0}" msgid "Editorial for {0}" msgstr "Hướng dẫn cho {0}" -#: judge/views/problem.py:461 templates/contest/contest.html:116 +#: judge/views/problem.py:459 templates/contest/contest.html:116 +#: templates/course/lesson.html:14 #: templates/organization/org-left-sidebar.html:4 #: templates/user/user-about.html:28 templates/user/user-bookmarks.html:35 #: templates/user/user-tabs.html:5 templates/user/users-table.html:19 msgid "Problems" msgstr "Bài tập" -#: judge/views/problem.py:834 +#: judge/views/problem.py:826 msgid "Problem feed" msgstr "Bài tập" -#: judge/views/problem.py:1035 +#: judge/views/problem.py:1027 msgid "Banned from submitting" msgstr "Bị cấm nộp bài" -#: judge/views/problem.py:1037 +#: judge/views/problem.py:1029 msgid "" "You have been declared persona non grata for this problem. You are " "permanently barred from submitting this problem." msgstr "Bạn đã bị cấm nộp bài này." -#: judge/views/problem.py:1060 +#: judge/views/problem.py:1052 msgid "Too many submissions" msgstr "Quá nhiều lần nộp" -#: judge/views/problem.py:1062 +#: judge/views/problem.py:1054 msgid "You have exceeded the submission limit for this problem." msgstr "Bạn đã vượt quá số lần nộp cho bài này." -#: judge/views/problem.py:1141 judge/views/problem.py:1146 +#: judge/views/problem.py:1133 judge/views/problem.py:1138 #, python-format msgid "Submit to %(problem)s" msgstr "Nộp bài cho %(problem)s" -#: judge/views/problem.py:1172 +#: judge/views/problem.py:1164 msgid "Clone Problem" msgstr "Nhân bản bài tập" @@ -3371,7 +3370,8 @@ msgstr "Các bài nộp tốt nhất cho %s" msgid "Best solutions for {0}" msgstr "Các bài nộp tốt nhất cho {0}" -#: judge/views/register.py:30 templates/registration/registration_form.html:34 +#: judge/views/register.py:30 templates/course/grades.html:81 +#: templates/registration/registration_form.html:34 #: templates/user/base-users-table.html:5 #: templates/user/import/table_csv.html:4 msgid "Username" @@ -3437,7 +3437,7 @@ msgstr "Tin nhắn mới" msgid "Site statistics" msgstr "Thống kê" -#: judge/views/status.py:26 templates/submission/list.html:341 +#: judge/views/status.py:26 templates/submission/list.html:337 msgid "Status" msgstr "Kết quả chấm" @@ -3451,7 +3451,7 @@ msgid "Submission of %(problem)s by %(user)s" msgstr "Bài nộp của %(user)s cho bài %(problem)s" #: judge/views/submission.py:278 judge/views/submission.py:279 -#: templates/problem/problem.html:186 +#: templates/problem/problem.html:188 msgid "All submissions" msgstr "Tất cả bài nộp" @@ -3809,7 +3809,7 @@ msgid "You have no ticket" msgstr "Bạn không có báo cáo" #: templates/blog/list.html:72 templates/problem/list.html:150 -#: templates/problem/problem.html:388 +#: templates/problem/problem.html:390 msgid "Clarifications" msgstr "Thông báo" @@ -3818,25 +3818,25 @@ msgid "Add" msgstr "Thêm mới" #: templates/blog/list.html:97 templates/problem/list.html:172 -#: templates/problem/problem.html:399 +#: templates/problem/problem.html:401 msgid "No clarifications have been made at this time." msgstr "Không có thông báo nào." -#: templates/chat/chat.html:5 templates/chat/chat_js.html:561 +#: templates/chat/chat.html:5 templates/chat/chat_js.html:563 msgid "Chat Box" msgstr "Chat Box" -#: templates/chat/chat.html:72 templates/chat/chat_js.html:523 +#: templates/chat/chat.html:69 templates/chat/chat_js.html:523 #: templates/user/base-users-js.html:10 #: templates/user/base-users-two-col.html:19 msgid "Search by handle..." msgstr "Tìm kiếm theo tên..." -#: templates/chat/chat.html:91 +#: templates/chat/chat.html:88 msgid "Enter your message" msgstr "Nhập tin nhắn" -#: templates/chat/chat.html:92 +#: templates/chat/chat.html:89 msgid "Emoji" msgstr "" @@ -3896,7 +3896,7 @@ msgstr "Đăng nhập để vote" msgid "edit %(edits)s" msgstr "chỉnh sửa %(edits)s" -#: templates/comments/content-list.html:43 templates/comments/media-js.html:97 +#: templates/comments/content-list.html:43 templates/comments/media-js.html:68 msgid "edited" msgstr "đã chỉnh sửa" @@ -3957,16 +3957,16 @@ msgstr "Không có bình luận nào." msgid "Comments are disabled on this page." msgstr "Bình luận bị tắt trong trang này." -#: templates/comments/media-js.html:40 +#: templates/comments/media-js.html:13 msgid "Replying to comment" msgstr "Trả lời bình luận" -#: templates/comments/media-js.html:92 +#: templates/comments/media-js.html:63 #, python-brace-format msgid "edit {edits}" msgstr "chỉnh sửa {edits}" -#: templates/comments/media-js.html:95 +#: templates/comments/media-js.html:66 msgid "original" msgstr "original" @@ -4114,7 +4114,7 @@ msgstr "Lịch" msgid "Info" msgstr "Thông tin" -#: templates/contest/contest-tabs.html:13 templates/submission/list.html:366 +#: templates/contest/contest-tabs.html:13 templates/submission/list.html:362 msgid "Statistics" msgstr "Thống kê" @@ -4226,7 +4226,7 @@ msgstr "Kéo dài %(duration)s" msgid "Spectate" msgstr "Theo dõi" -#: templates/contest/list.html:202 templates/organization/home.html:30 +#: templates/contest/list.html:202 templates/organization/home.html:23 msgid "Join" msgstr "Tham gia" @@ -4234,7 +4234,8 @@ msgstr "Tham gia" msgid "Search contests..." msgstr "Tìm kiếm kỳ thi..." -#: templates/contest/list.html:222 templates/internal/problem/problem.html:34 +#: templates/contest/list.html:222 templates/course/grades.html:84 +#: templates/internal/problem/problem.html:34 msgid "Search" msgstr "Tìm kiếm" @@ -4358,27 +4359,27 @@ msgstr "Bạn có chắc muốn khôi phục kết quả này?" msgid "View user participation" msgstr "Xem các lần tham gia" -#: templates/contest/ranking.html:138 +#: templates/contest/ranking.html:140 msgid "Show schools" msgstr "Hiển thị trường" -#: templates/contest/ranking.html:142 +#: templates/contest/ranking.html:144 msgid "Show full name" msgstr "Hiển thị họ tên" -#: templates/contest/ranking.html:145 +#: templates/contest/ranking.html:147 msgid "Show friends only" msgstr "Chỉ hiển thị bạn bè" -#: templates/contest/ranking.html:148 +#: templates/contest/ranking.html:150 msgid "Total score only" msgstr "Chỉ hiển thị tổng điểm" -#: templates/contest/ranking.html:150 +#: templates/contest/ranking.html:152 msgid "Show virtual participation" msgstr "Hiển thị tham gia ảo" -#: templates/contest/ranking.html:154 +#: templates/contest/ranking.html:156 msgid "Download as CSV" msgstr "Tải file CSV" @@ -4414,6 +4415,48 @@ msgstr "Còn" msgid "Upcoming contests" msgstr "Kỳ thi sắp diễn ra" +#: templates/course/course.html:9 +msgid "Lessons" +msgstr "Bài học" + +#: templates/course/course.html:34 +msgid "Total achieved points" +msgstr "Tổng điểm" + +#: templates/course/edit_lesson.html:28 +msgid "Add new" +msgstr "Thêm mới" + +#: templates/course/edit_lesson.html:36 +#: templates/organization/contest/edit.html:40 +#: templates/organization/form.html:6 +msgid "Please fix below errors" +msgstr "Vui lòng sửa các lỗi bên dưới" + +#: templates/course/grades.html:79 +msgid "Sort by" +msgstr "Sắp xếp theo" + +#: templates/course/grades.html:82 templates/user/user-problems.html:99 +msgid "Score" +msgstr "Điểm" + +#: templates/course/grades.html:99 templates/submission/user-ajax.html:33 +msgid "Total" +msgstr "Tổng điểm" + +#: templates/course/left_sidebar.html:4 +msgid "Edit lessons" +msgstr "Chỉnh sửa bài học" + +#: templates/course/left_sidebar.html:5 +msgid "Grades" +msgstr "Điểm" + +#: templates/course/list.html:23 +msgid "Teachers" +msgstr "Giáo viên" + #: templates/email_change/email_change.html:15 msgid "Verify Email" msgstr "Xác thực Email" @@ -4447,7 +4490,7 @@ msgid "Upload file" msgstr "Tải file lên" #: templates/fine_uploader/script.html:23 -#: templates/markdown_editor/markdown_editor.html:129 +#: templates/markdown_editor/markdown_editor.html:124 msgid "Cancel" msgstr "Hủy" @@ -4512,23 +4555,23 @@ msgstr "Gợi ý" msgid "Source:" msgstr "Nguồn:" -#: templates/markdown_editor/markdown_editor.html:109 templates/pagedown.html:9 +#: templates/markdown_editor/markdown_editor.html:104 templates/pagedown.html:9 msgid "Update Preview" msgstr "Cập nhật xem trước" -#: templates/markdown_editor/markdown_editor.html:113 +#: templates/markdown_editor/markdown_editor.html:108 msgid "Insert Image" msgstr "Chèn hình ảnh" -#: templates/markdown_editor/markdown_editor.html:116 +#: templates/markdown_editor/markdown_editor.html:111 msgid "From the web" msgstr "Từ web" -#: templates/markdown_editor/markdown_editor.html:122 +#: templates/markdown_editor/markdown_editor.html:117 msgid "From your computer" msgstr "Từ máy tính của bạn" -#: templates/markdown_editor/markdown_editor.html:128 +#: templates/markdown_editor/markdown_editor.html:123 #: templates/organization/blog/edit.html:36 #: templates/organization/contest/add.html:36 #: templates/organization/contest/edit.html:86 @@ -4557,11 +4600,6 @@ msgstr "Tác giả" msgid "Post time" msgstr "Thời gian đăng" -#: templates/organization/contest/edit.html:40 -#: templates/organization/form.html:6 -msgid "Please fix below errors" -msgstr "Vui lòng sửa các lỗi bên dưới" - #: templates/organization/contest/edit.html:60 msgid "If you run out of rows, click Save" msgstr "Ấn nút lưu lại nếu cần thêm hàng" @@ -4578,11 +4616,7 @@ msgstr "Bạn phải tham gia lại để được hiển thị trong bảng x msgid "You will have to request membership in order to join again." msgstr "Bạn phải đăng ký thành viên để được tham gia lại." -#: templates/organization/home.html:19 -msgid "Subdomain" -msgstr "Site riêng cho nhóm" - -#: templates/organization/home.html:34 +#: templates/organization/home.html:27 msgid "Request membership" msgstr "Đăng ký thành viên" @@ -4631,6 +4665,10 @@ msgid "Pending blogs" msgstr "Bài đăng đang chờ" #: templates/organization/org-right-sidebar.html:60 +msgid "Subdomain" +msgstr "Site riêng cho nhóm" + +#: templates/organization/org-right-sidebar.html:69 msgid "Leave group" msgstr "Rời nhóm" @@ -4719,7 +4757,7 @@ msgstr "Xem YAML" msgid "Autofill testcases" msgstr "Tự động điền test" -#: templates/problem/data.html:506 templates/problem/problem.html:247 +#: templates/problem/data.html:506 templates/problem/problem.html:249 msgid "Problem type" msgid_plural "Problem types" msgstr[0] "Dạng bài" @@ -4799,8 +4837,8 @@ msgstr "Xem mã nguồn" msgid "Volunteer form" msgstr "Phiếu tình nguyện" -#: templates/problem/feed/problems.html:53 templates/problem/problem.html:146 -#: templates/problem/problem.html:161 templates/problem/problem.html:171 +#: templates/problem/feed/problems.html:53 templates/problem/problem.html:148 +#: templates/problem/problem.html:163 templates/problem/problem.html:173 msgid "Submit" msgstr "Nộp bài" @@ -4833,15 +4871,15 @@ msgstr "Gợi ý" msgid "Filter by type..." msgstr "Lọc theo dạng..." -#: templates/problem/list-base.html:152 templates/problem/list-base.html:178 +#: templates/problem/list-base.html:160 templates/problem/list-base.html:186 msgid "Add types..." msgstr "Thêm dạng" -#: templates/problem/list-base.html:194 +#: templates/problem/list-base.html:202 msgid "Fail to vote!" msgstr "Hệ thống lỗi!" -#: templates/problem/list-base.html:197 +#: templates/problem/list-base.html:205 msgid "Successful vote! Thank you!" msgstr "Đã gửi thành công! Cảm ơn bạn!" @@ -4898,7 +4936,7 @@ msgid "" msgstr "Bạn chuẩn bị {action} vài bài nộp. Tiếp tục?" #: templates/problem/manage_submission.html:141 -#: templates/submission/list.html:337 +#: templates/submission/list.html:333 msgid "Filter submissions" msgstr "Lọc bài nộp" @@ -4951,116 +4989,116 @@ msgstr "Bạn có chắc muốn tính điểm lại %(count)d bài nộp?" msgid "Rescore all submissions" msgstr "Tính điểm lại các bài nộp" -#: templates/problem/problem.html:135 +#: templates/problem/problem.html:137 msgid "View as PDF" msgstr "Xem PDF" -#: templates/problem/problem.html:153 +#: templates/problem/problem.html:155 #, python-format msgid "%(counter)s submission left" msgid_plural "%(counter)s submissions left" msgstr[0] "Còn %(counter)s lần nộp" -#: templates/problem/problem.html:166 +#: templates/problem/problem.html:168 msgid "0 submissions left" msgstr "Còn 0 lần nộp" -#: templates/problem/problem.html:183 +#: templates/problem/problem.html:185 msgid "My submissions" msgstr "Bài nộp của tôi" -#: templates/problem/problem.html:187 +#: templates/problem/problem.html:189 msgid "Best submissions" msgstr "Các bài nộp tốt nhất" -#: templates/problem/problem.html:191 +#: templates/problem/problem.html:193 msgid "Read editorial" msgstr "Xem hướng dẫn" -#: templates/problem/problem.html:196 +#: templates/problem/problem.html:198 msgid "Manage tickets" msgstr "Xử lý báo cáo" -#: templates/problem/problem.html:200 +#: templates/problem/problem.html:202 msgid "Edit problem" msgstr "Chỉnh sửa bài" -#: templates/problem/problem.html:202 +#: templates/problem/problem.html:204 msgid "Edit test data" msgstr "Chỉnh sửa test" -#: templates/problem/problem.html:207 +#: templates/problem/problem.html:209 msgid "My tickets" msgstr "Báo cáo của tôi" -#: templates/problem/problem.html:215 +#: templates/problem/problem.html:217 msgid "Manage submissions" msgstr "Quản lý bài nộp" -#: templates/problem/problem.html:221 +#: templates/problem/problem.html:223 msgid "Clone problem" msgstr "Nhân bản bài" -#: templates/problem/problem.html:232 +#: templates/problem/problem.html:234 msgid "Author:" msgid_plural "Authors:" msgstr[0] "Tác giả:" -#: templates/problem/problem.html:260 +#: templates/problem/problem.html:262 msgid "Allowed languages" msgstr "Ngôn ngữ cho phép" -#: templates/problem/problem.html:268 +#: templates/problem/problem.html:270 #, python-format msgid "No %(lang)s judge online" msgstr "Không có máy chấm cho %(lang)s" -#: templates/problem/problem.html:280 +#: templates/problem/problem.html:282 #: templates/status/judge-status-table.html:2 msgid "Judge" msgid_plural "Judges" msgstr[0] "Máy chấm" -#: templates/problem/problem.html:298 +#: templates/problem/problem.html:300 msgid "none available" msgstr "Bài này chưa có máy chấm" -#: templates/problem/problem.html:310 +#: templates/problem/problem.html:312 #, python-format msgid "This problem has %(length)s clarification(s)" msgstr "Bài này có %(length)s thông báo" -#: templates/problem/problem.html:318 +#: templates/problem/problem.html:320 msgid "Points:" msgstr "Điểm:" -#: templates/problem/problem.html:329 +#: templates/problem/problem.html:331 msgid "Time limit:" msgstr "Thời gian:" -#: templates/problem/problem.html:334 +#: templates/problem/problem.html:336 msgid "Memory limit:" msgstr "Bộ nhớ:" -#: templates/problem/problem.html:339 templates/problem/raw.html:67 +#: templates/problem/problem.html:341 templates/problem/raw.html:67 #: templates/submission/status-testcases.html:155 msgid "Input:" msgstr "Input:" -#: templates/problem/problem.html:341 templates/problem/raw.html:67 +#: templates/problem/problem.html:343 templates/problem/raw.html:67 msgid "stdin" msgstr "bàn phím" -#: templates/problem/problem.html:346 templates/problem/raw.html:70 +#: templates/problem/problem.html:348 templates/problem/raw.html:70 #: templates/submission/status-testcases.html:159 msgid "Output:" msgstr "Output:" -#: templates/problem/problem.html:347 templates/problem/raw.html:70 +#: templates/problem/problem.html:349 templates/problem/raw.html:70 msgid "stdout" msgstr "màn hình" -#: templates/problem/problem.html:374 +#: templates/problem/problem.html:376 msgid "Request clarification" msgstr "Yêu cầu làm rõ đề" @@ -5105,7 +5143,7 @@ msgid "Show editorial" msgstr "Hiển thị hướng dẫn" #: templates/problem/search-form.html:75 templates/problem/search-form.html:77 -#: templates/submission/list.html:384 +#: templates/submission/list.html:380 #: templates/submission/submission-list-tabs.html:4 msgid "All" msgstr "Tất cả" @@ -5114,8 +5152,8 @@ msgstr "Tất cả" msgid "Point range" msgstr "Mốc điểm" -#: templates/problem/search-form.html:93 templates/submission/list.html:359 -#: templates/ticket/list.html:248 +#: templates/problem/search-form.html:93 templates/submission/list.html:355 +#: templates/ticket/list.html:250 msgid "Go" msgstr "Lọc" @@ -5427,7 +5465,7 @@ msgstr "N/A" msgid "There are no judges available at this time." msgstr "Không có máy chấm nào hoạt động." -#: templates/status/language-list.html:33 templates/ticket/list.html:261 +#: templates/status/language-list.html:33 templates/ticket/list.html:263 #: templates/user/import/table_csv.html:3 msgid "ID" msgstr "ID" @@ -5470,44 +5508,48 @@ msgstr "Lọc theo kết quả..." msgid "Filter by language..." msgstr "Lọc theo ngôn ngữ..." -#: templates/submission/list.html:313 +#: templates/submission/list.html:309 msgid "You were disconnected. Refresh to show latest updates." msgstr "Bạn bị ngắt kết nối. Hãy làm mới để xem cập nhật mới nhất." -#: templates/submission/list.html:372 +#: templates/submission/list.html:368 msgid "Total:" msgstr "Tổng:" -#: templates/submission/list.html:386 +#: templates/submission/list.html:382 #: templates/submission/submission-list-tabs.html:6 msgid "Mine" msgstr "Tôi" -#: templates/submission/list.html:389 +#: templates/submission/list.html:385 #: templates/submission/submission-list-tabs.html:9 msgid "Best" msgstr "Tốt nhất" -#: templates/submission/list.html:392 +#: templates/submission/list.html:388 #, fuzzy, python-format #| msgid "user" msgid "%(user)s" msgstr "người dùng" -#: templates/submission/list.html:395 templates/user/user-left-sidebar.html:3 +#: templates/submission/list.html:391 templates/user/user-left-sidebar.html:3 #: templates/user/user-list-tabs.html:5 msgid "Friends" msgstr "Bạn bè" -#: templates/submission/row.html:65 +#: templates/submission/row.html:57 +msgid "d/m/Y" +msgstr "" + +#: templates/submission/row.html:84 msgid "view" msgstr "xem" -#: templates/submission/row.html:69 +#: templates/submission/row.html:88 msgid "rejudge" msgstr "chấm lại" -#: templates/submission/row.html:74 +#: templates/submission/row.html:93 msgid "admin" msgstr "admin" @@ -5617,10 +5659,6 @@ msgstr "Các bài nộp của" msgid "Subtask" msgstr "Subtask" -#: templates/submission/user-ajax.html:33 -msgid "Total" -msgstr "Tổng điểm" - #: templates/submission/user-ajax.html:51 msgid "g:i a d/m/Y" msgstr "" @@ -5650,37 +5688,37 @@ msgstr "test chính thức" #: templates/test_formatter/download_test_formatter.html:69 #: templates/test_formatter/download_test_formatter.html:76 -#: templates/test_formatter/edit_test_formatter.html:131 +#: templates/test_formatter/edit_test_formatter.html:128 msgid "Download" msgstr "Tải xuống" -#: templates/test_formatter/edit_test_formatter.html:102 +#: templates/test_formatter/edit_test_formatter.html:99 msgid "Before" msgstr "Trước" -#: templates/test_formatter/edit_test_formatter.html:103 -#: templates/test_formatter/edit_test_formatter.html:111 +#: templates/test_formatter/edit_test_formatter.html:100 +#: templates/test_formatter/edit_test_formatter.html:108 msgid "Input format" msgstr "Định dạng đầu vào" -#: templates/test_formatter/edit_test_formatter.html:105 -#: templates/test_formatter/edit_test_formatter.html:113 +#: templates/test_formatter/edit_test_formatter.html:102 +#: templates/test_formatter/edit_test_formatter.html:110 msgid "Output format" msgstr "Định dạng đầu ra" -#: templates/test_formatter/edit_test_formatter.html:110 +#: templates/test_formatter/edit_test_formatter.html:107 msgid "After" msgstr "Sau" -#: templates/test_formatter/edit_test_formatter.html:119 +#: templates/test_formatter/edit_test_formatter.html:116 msgid "Preview" msgstr "Xem trước" -#: templates/test_formatter/edit_test_formatter.html:126 +#: templates/test_formatter/edit_test_formatter.html:123 msgid "File name" msgstr "Tên file" -#: templates/test_formatter/edit_test_formatter.html:130 +#: templates/test_formatter/edit_test_formatter.html:127 msgid "Convert" msgstr "Chuyển đổi" @@ -5700,27 +5738,27 @@ msgstr "Mở lại: " msgid "Closed: " msgstr "Đóng: " -#: templates/ticket/list.html:221 +#: templates/ticket/list.html:223 msgid "Use desktop notification" msgstr "Sử dụng thông báo từ desktop" -#: templates/ticket/list.html:227 +#: templates/ticket/list.html:229 msgid "Show my tickets only" msgstr "Chỉ hiển thị các báo cáo dành cho tôi" -#: templates/ticket/list.html:231 +#: templates/ticket/list.html:233 msgid "Filing user" msgstr "Người báo cáo" -#: templates/ticket/list.html:240 +#: templates/ticket/list.html:242 msgid "Assignee" msgstr "Người định uỷ thác" -#: templates/ticket/list.html:262 +#: templates/ticket/list.html:264 msgid "Title" msgstr "Tiêu đề" -#: templates/ticket/list.html:264 templates/ticket/ticket.html:193 +#: templates/ticket/list.html:266 templates/ticket/ticket.html:193 msgid "Assignees" msgstr "Người được ủy thác" @@ -5842,7 +5880,7 @@ msgstr "" msgid "Organizations" msgstr "Tổ chức" -#: templates/user/pp-row.html:22 +#: templates/user/pp-row.html:21 #, python-format msgid "" "\n" @@ -5850,12 +5888,12 @@ msgid "" " " msgstr "" -#: templates/user/pp-row.html:27 +#: templates/user/pp-row.html:26 #, python-format msgid "%(pp).1fpp" msgstr "%(pp).1fpp" -#: templates/user/pp-row.html:29 +#: templates/user/pp-row.html:28 #, python-format msgid "%(pp).0fpp" msgstr "%(pp).0fpp" @@ -5939,15 +5977,15 @@ msgstr "Nhiều" msgid "Rating History" msgstr "Các lần thi" -#: templates/user/user-about.html:242 +#: templates/user/user-about.html:238 msgid "past year" msgstr "năm ngoái" -#: templates/user/user-about.html:259 +#: templates/user/user-about.html:255 msgid "total submission(s)" msgstr "bài nộp" -#: templates/user/user-about.html:263 +#: templates/user/user-about.html:259 msgid "submissions in the last year" msgstr "bài nộp trong năm qua" @@ -6008,10 +6046,6 @@ msgstr "Ẩn các bài đã giải" msgid "%(points).1f points" msgstr "%(points).1f điểm" -#: templates/user/user-problems.html:99 -msgid "Score" -msgstr "Điểm" - #: templates/user/user-problems.html:110 #, python-format msgid "%(points)s / %(total)s" @@ -6033,6 +6067,14 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "on {time}" +#~ msgstr "vào {time}" + +#, fuzzy +#~| msgid "end time" +#~ msgid "ending time" +#~ msgstr "thời gian kết thúc" + #~ msgid "In current contest" #~ msgstr "Trong kỳ thi hiện tại" diff --git a/resources/common.js b/resources/common.js index d0e441e..fd5c50a 100644 --- a/resources/common.js +++ b/resources/common.js @@ -472,7 +472,9 @@ $(function() { let key = `oj-content-${window.location.href}`; let $contentClone = $('#content').clone(); $contentClone.find('.select2').remove(); - $contentClone.find('.select2-hidden-accessible').removeClass('select2-hidden-accessible'); + $contentClone.find('.select2-hidden-accessible').removeClass('select2-hidden-accessible'); + $contentClone.find('.noUi-base').remove(); + $contentClone.find('.wmd-button-row').remove(); sessionStorage.setItem(key, JSON.stringify({ "html": $contentClone.html(), "page": window.page, diff --git a/resources/course.scss b/resources/course.scss new file mode 100644 index 0000000..5f061ab --- /dev/null +++ b/resources/course.scss @@ -0,0 +1,133 @@ +@import "vars"; + +.course-content-title { + font-weight: bold; +} + +.course-list { + width: 100%; + margin: 0 auto; + list-style: none; + padding: 0; + + .course-item { + display: flex; + align-items: center; + border: 1px solid #ddd; + padding: 20px; + margin-bottom: 10px; + border-radius: 8px; + background-color: #fff; + box-shadow: 0 4px 6px rgba(0,0,0,0.1); + transition: transform 0.2s ease-in-out; + } + .course-item:hover { + transform: translateY(-2px); + box-shadow: 0 6px 12px rgba(0,0,0,0.15); + } + .course-image { + flex: 0 0 auto; + width: 50px; + height: 50px; + margin-right: 20px; + border-radius: 5px; + overflow: hidden; + } + .course-image img { + width: 100%; + height: 100%; + object-fit: cover; + border-radius: 5px; + } + .course-content { + flex: 1; + } + .course-name { + font-size: 1.5em; + margin-bottom: 5px; + } +} + +.lesson-list { + list-style: none; + padding: 0; + + li:hover { + box-shadow: 0 6px 12px rgba(0,0,0,0.15); + background: #ffffe0; + } + + li { + background: #fff; + border: 1px solid #ddd; + margin-bottom: 20px; + padding-top: 10px; + border-radius: 5px; + box-shadow: 0 2px 4px #ccc; + } + .lesson-title { + font-size: 1.5em; + margin-left: 1em; + margin-right: 1em; + color: initial; + display: flex; + gap: 1em; + + .lesson-points { + margin-left: auto; + font-size: 0.9em; + align-self: flex-end; + color: #636363; + } + } + .progress-container { + background: #e0e0e0; + border-radius: 3px; + height: 10px; + width: 100%; + margin-top: 10px; + } + .progress-bar { + background: $theme_color; + height: 10px; + border-radius: 3px; + line-height: 10px; + color: white; + text-align: right; + font-size: smaller; + } +} + +.course-problem-list { + list-style-type: none; + padding: 0; + font-size: 15px; + + i { + font-size: large; + } + + li { + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid #eee; + padding: 10px; + border-radius: 5px; + } + .problem-name { + margin-left: 10px; + } + + li:hover { + background: #e0e0e0; + } + .score { + font-weight: bold; + margin-left: auto; + } + a { + text-decoration: none; + color: inherit; + } +} \ No newline at end of file diff --git a/resources/pagedown_widget.scss b/resources/pagedown_widget.scss index a61d800..071a71e 100644 --- a/resources/pagedown_widget.scss +++ b/resources/pagedown_widget.scss @@ -17,6 +17,7 @@ background: #fff; border: 1px solid DarkGray; font-family: $monospace-fonts; + font-size: 15px; } .wmd-preview { diff --git a/resources/style.scss b/resources/style.scss index 93690d4..dc93ab2 100644 --- a/resources/style.scss +++ b/resources/style.scss @@ -15,4 +15,5 @@ @import "organization"; @import "ticket"; @import "pagedown_widget"; -@import "dmmd-preview"; \ No newline at end of file +@import "dmmd-preview"; +@import "course"; \ No newline at end of file diff --git a/templates/course/base.html b/templates/course/base.html index cdcf0d4..d31b330 100644 --- a/templates/course/base.html +++ b/templates/course/base.html @@ -1,12 +1,5 @@ - - - - - - - Courses - - - - - \ No newline at end of file +{% extends "two-column-content.html" %} + +{% block left_sidebar %} + {% include "course/left_sidebar.html" %} +{% endblock %} \ No newline at end of file diff --git a/templates/course/course.html b/templates/course/course.html new file mode 100644 index 0000000..9b65f4d --- /dev/null +++ b/templates/course/course.html @@ -0,0 +1,39 @@ +{% extends "course/base.html" %} + +{% block middle_content %} +

{{title}}

+

{{_("About")}}

+
+ {{ course.about|markdown|reference|str|safe }} +
+

{{_("Lessons")}}

+ +

+ {% set total_progress = lesson_progress['total'] %} + {% set achieved_points = total_progress['achieved_points'] %} + {% set total_points = total_progress['total_points'] %} + {% set percentage = total_progress['percentage'] %} + + {{_("Total achieved points")}}: + + {{ achieved_points | floatformat(2) }} / {{ total_points }} ({{percentage|floatformat(1)}}%) + +

+{% endblock %} \ No newline at end of file diff --git a/templates/course/edit_lesson.html b/templates/course/edit_lesson.html new file mode 100644 index 0000000..257fbe1 --- /dev/null +++ b/templates/course/edit_lesson.html @@ -0,0 +1,58 @@ +{% extends "course/base.html" %} + +{% block two_col_media %} + {{ form.media.css }} + +{% endblock %} + +{% block two_col_js %} + {{ form.media.js }} +{% endblock %} + +{% block middle_content %} +
+ {% csrf_token %} + {{ formset.management_form }} + {% for form in formset %} +

+ {% if form.title.value() %} + {{form.order.value()}}. {{form.title.value()}} + {% else %} + + {{_("Add new")}} + {% endif %} +

+
+ {{form.id}} + {% if form.errors %} +
+ x + {{_("Please fix below errors")}} +
+ {% endif %} + {% for field in form %} + {% if not field.is_hidden %} +
+ {{ field.errors }} + +
+ {{ field }} +
+ {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
+ {% endif %} + {% endfor %} +
+
+ {% endfor %} + +
+{% endblock %} \ No newline at end of file diff --git a/templates/course/grades.html b/templates/course/grades.html new file mode 100644 index 0000000..0962785 --- /dev/null +++ b/templates/course/grades.html @@ -0,0 +1,127 @@ +{% extends "course/base.html" %} + +{% block two_col_media %} + +{% endblock %} + +{% block two_col_js %} + +{% endblock %} + +{% block middle_content %} +

{{title}}

+ {% set lessons = course.lessons.all() %} + {{_("Sort by")}}: + + + + + + + {% if grades|length > 0 %} + {% for lesson in lessons %} + + {% endfor %} + {% endif %} + + + + + {% for student, grade in grades.items() %} + + + {% for lesson in lessons %} + + {% endfor %} + + + {% endfor %} + +
{{_('Student')}} + + {{ lesson.title }} +
{{lesson.points}}
+ + 		{{_('Total')}}
+
+ {{link_user(student)}} +
+
+ {{student.first_name}} +
+ 		+ + {{ grade[lesson.id]['percentage'] | floatformat(0) }}% + + + {{ grade['total']['percentage'] | floatformat(0) }}% +
+{% endblock %} \ No newline at end of file diff --git a/templates/course/left_sidebar.html b/templates/course/left_sidebar.html new file mode 100644 index 0000000..a8e6375 --- /dev/null +++ b/templates/course/left_sidebar.html @@ -0,0 +1,10 @@ +
+ {{ make_tab_item('home', 'fa fa-home', course.get_absolute_url(), _('Home')) }} + {% if is_editable %} + {{ make_tab_item('edit_lesson', 'fa fa-edit', url('edit_course_lessons', course.slug), _('Edit lessons')) }} + {{ make_tab_item('grades', 'fa fa-check-square-o', url('course_grades', course.slug), _('Grades')) }} + {% endif %} + {% if perms.judge.change_course %} + {{ make_tab_item('admin', 'fa fa-edit', url('admin:judge_course_change', course.id), _('Admin')) }} + {% endif %} +
\ No newline at end of file diff --git a/templates/course/lesson.html b/templates/course/lesson.html new file mode 100644 index 0000000..537d562 --- /dev/null +++ b/templates/course/lesson.html @@ -0,0 +1,39 @@ +{% extends "course/base.html" %} + +{% block two_col_media %} + +{% endblock %} + +{% block middle_content %} +

{{title}}

+

{{_("Content")}}

+
+ {{ lesson.content|markdown|reference|str|safe }} +
+

{{_("Problems")}}

+ +{% endblock %} \ No newline at end of file diff --git a/templates/course/list.html b/templates/course/list.html index 4ea88a5..2d43db2 100644 --- a/templates/course/list.html +++ b/templates/course/list.html @@ -1,19 +1,29 @@ - - - - - - - Document - - -

Enrolling

- {% for course in enrolling %} -

{{ course }}

+{% extends "two-column-content.html" %} + +{% block two_col_media %} +{% endblock %} + +{% block left_sidebar %} +
+ {{ make_tab_item('list', 'fa fa-list', url('course_list'), _('Courses')) }} +
+{% endblock %} + +{% block middle_content %} +
+ {% for course in courses %} +
+
+ +
+
+ {{course.name}} + {% set teachers = course.get_teachers() %} + {% if teachers %} +
{{_('Teachers')}}: {{link_users(teachers)}}
+ {% endif %} +
+
{% endfor %} -

Available

- {% for course in available %} -

{{ course }}

- {% endfor %} - - \ No newline at end of file +
+{% endblock %} \ No newline at end of file diff --git a/templates/organization/home-js.html b/templates/organization/home-js.html index d9fa078..ad5dd46 100644 --- a/templates/organization/home-js.html +++ b/templates/organization/home-js.html @@ -14,10 +14,5 @@ $(this).parent().submit(); } }); - - $('#control-panel a').on('click', function(e) { - e.preventDefault(); - navigateTo($(this)); - }) }); \ No newline at end of file diff --git a/templates/organization/home.html b/templates/organization/home.html index 87be1e0..1723a95 100644 --- a/templates/organization/home.html +++ b/templates/organization/home.html @@ -10,16 +10,9 @@ {% block middle_title %}
-

+

{{title}}

- {% if is_member %} - - {% endif %} {% if request.user.is_authenticated %} diff --git a/templates/organization/org-right-sidebar.html b/templates/organization/org-right-sidebar.html index f19c9d7..8df64d7 100644 --- a/templates/organization/org-right-sidebar.html +++ b/templates/organization/org-right-sidebar.html @@ -53,6 +53,15 @@
{% endif %} + {% if is_member %} +
  • + +
    • + {% endif %} {% if is_member and not is_admin %}
  • diff --git a/templates/three-column-content.html b/templates/three-column-content.html index 1f6d5db..2842b1f 100644 --- a/templates/three-column-content.html +++ b/templates/three-column-content.html @@ -96,12 +96,16 @@ } function registerNavigation() { - const links = ['.pagination a', '.tabs li a']; - for (link of links) { - $(link).on('click', function (e) { - e.preventDefault(); - navigateTo($(this)); - }) + const links = ['.pagination a', '.tabs li a', '#control-panel a']; + for (let linkSelector of links) { + $(linkSelector).each(function() { + if ($(this).attr('target') !== '_blank') { + $(this).on('click', function(e) { + e.preventDefault(); + navigateTo($(this)); + }); + } + }); } }