From 4e7b8daada74af2eca2269ef977f5e1d1dc1d60f Mon Sep 17 00:00:00 2001 From: zhaospei Date: Mon, 6 Feb 2023 23:25:50 +0700 Subject: [PATCH 001/478] fix show-more display --- resources/blog.scss | 3 ++- templates/blog/content.html | 2 +- templates/comments/feed.html | 1 + templates/problem/feed.html | 2 +- templates/three-column-content.html | 8 ++++---- templates/ticket/feed.html | 1 + 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resources/blog.scss b/resources/blog.scss index b422b82..5091076 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -162,6 +162,7 @@ overflow-wrap: anywhere; padding-bottom: 1em; clear: both; + position: relative; } .problem-feed-name { @@ -234,7 +235,7 @@ padding: 0px 12px; margin-top: 5px; position: absolute; - inset: 50% 0px 52px; + inset: 50% 0px 0px; background: linear-gradient(transparent, white); display: flex; -webkit-box-pack: end; diff --git a/templates/blog/content.html b/templates/blog/content.html index 7f77438..2b20b2a 100644 --- a/templates/blog/content.html +++ b/templates/blog/content.html @@ -42,8 +42,8 @@ {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }} {% endcache %} +
{{_("...More")}}
-
{{_("...More")}}
{% set pagevote = post.pagevote %} {% set bookmark = post.bookmark %} diff --git a/templates/comments/feed.html b/templates/comments/feed.html index c5fb439..05a35ed 100644 --- a/templates/comments/feed.html +++ b/templates/comments/feed.html @@ -14,5 +14,6 @@ {% endwith %}
{{ comment.body|markdown(lazy_load=True)|reference|str|safe }} +
\ No newline at end of file diff --git a/templates/problem/feed.html b/templates/problem/feed.html index b64dfe7..d28868f 100644 --- a/templates/problem/feed.html +++ b/templates/problem/feed.html @@ -132,8 +132,8 @@ {% endif %} +
{{_("...More")}}
-
{{_("...More")}}
{% set pagevote = problem.pagevote %} {% set bookmark = problem.bookmark %} diff --git a/templates/three-column-content.html b/templates/three-column-content.html index 4a7a84c..fa72d48 100644 --- a/templates/three-column-content.html +++ b/templates/three-column-content.html @@ -33,13 +33,13 @@ + {% endblock %} {% macro make_tab_item(name, fa, url, text) %} -
- - {{ text }} -
+
+ + {{ text }} +
{% endmacro %} {% block body %} -{% block before_posts %}{% endblock %} -
- {% block left_sidebar %}{% endblock %} -
- {% block three_col_media %}{% endblock %} - {% block three_col_js %}{% endblock %} -
- {% block middle_title %}{% endblock %} - {% block middle_content %}{% endblock %} + {% block before_posts %}{% endblock %} +
+ {% block left_sidebar %}{% endblock %} +
+ {% block three_col_media %}{% endblock %} + {% block three_col_js %}{% endblock %} +
+ {% block middle_title %}{% endblock %} + {% block middle_content %}{% endblock %} +
+ {% block right_sidebar %}{% endblock %}
- {% block right_sidebar %}{% endblock %}
-
-{% block after_posts %}{% endblock %} + {% block after_posts %}{% endblock %} {% endblock %} {% block bodyend %} -{{ super() }} -{% if REQUIRE_JAX %} -{% include "mathjax-load.html" %} -{% endif %} -{% include "comments/math.html" %} + {{ super() }} + {% if REQUIRE_JAX %} + {% include "mathjax-load.html" %} + {% endif %} + {% include "comments/math.html" %} {% endblock %} \ No newline at end of file diff --git a/templates/two-column-content.html b/templates/two-column-content.html index cebf64b..82899a7 100644 --- a/templates/two-column-content.html +++ b/templates/two-column-content.html @@ -1,3 +1,4 @@ +{% set is_two_column = true %} {% extends "three-column-content.html" %} {% block three_col_js %} From 8e6bcd90afc7aff5e822b36f09d80fbc85318009 Mon Sep 17 00:00:00 2001 From: zhaospei Date: Wed, 8 Feb 2023 17:22:43 +0700 Subject: [PATCH 007/478] fix superuser contest search --- judge/views/contests.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/judge/views/contests.py b/judge/views/contests.py index 9fb4273..f944e11 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -153,12 +153,13 @@ class ContestList( if "orgs" in self.request.GET and self.request.profile: try: self.org_query = list(map(int, request.GET.getlist("orgs"))) - self.org_query = [ - i - for i in self.org_query - if i - in self.request.profile.organizations.values_list("id", flat=True) - ] + if not self.request.user.is_superuser: + self.org_query = [ + i + for i in self.org_query + if i + in self.request.profile.organizations.values_list("id", flat=True) + ] except ValueError: pass @@ -228,7 +229,10 @@ class ContestList( context["contest_query"] = self.contest_query context["org_query"] = self.org_query if self.request.profile: - context["organizations"] = self.request.profile.organizations.all() + if self.request.user.is_superuser: + context["organizations"] = Organization.objects.all() + else: + context["organizations"] = self.request.profile.organizations.all() context["page_type"] = "list" context.update(self.get_sort_context()) context.update(self.get_sort_paginate_context()) From e2067d4d18823aac1f7db9c89aabebea9e4f0002 Mon Sep 17 00:00:00 2001 From: zhaospei Date: Thu, 9 Feb 2023 02:12:23 +0700 Subject: [PATCH 008/478] add hide organization contests list --- judge/views/contests.py | 6 ++++++ templates/contest/list.html | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/judge/views/contests.py b/judge/views/contests.py index f944e11..414a650 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -149,6 +149,9 @@ class ContestList( def get(self, request, *args, **kwargs): self.contest_query = None self.org_query = [] + self.show_orgs = 0 + if request.GET.get("show_orgs"): + self.show_orgs = 1 if "orgs" in self.request.GET and self.request.profile: try: @@ -182,6 +185,8 @@ class ContestList( ) if not self.org_query and self.request.organization: self.org_query = [self.request.organization.id] + if self.show_orgs: + queryset = queryset.filter(organizations=None) if self.org_query: queryset = queryset.filter(organizations__in=self.org_query) @@ -228,6 +233,7 @@ class ContestList( context["first_page_href"] = "." context["contest_query"] = self.contest_query context["org_query"] = self.org_query + context["show_orgs"] = int(self.show_orgs) if self.request.profile: if self.request.user.is_superuser: context["organizations"] = Organization.objects.all() diff --git a/templates/contest/list.html b/templates/contest/list.html index 94ec439..7d406d4 100644 --- a/templates/contest/list.html +++ b/templates/contest/list.html @@ -18,6 +18,10 @@ padding-bottom: 1em; } + #show-btn { + margin-top: 0.5em; + } + {% if page_obj and page_obj.number > 1%} #ongoing-table { display: none; @@ -71,6 +75,10 @@ \ No newline at end of file diff --git a/templates/feed/has_next.html b/templates/feed/has_next.html new file mode 100644 index 0000000..18415b5 --- /dev/null +++ b/templates/feed/has_next.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/notification/list.html b/templates/notification/list.html index 175c696..cd50e32 100644 --- a/templates/notification/list.html +++ b/templates/notification/list.html @@ -29,7 +29,7 @@ {% if notification.comment %} - {{ page_titles[notification.comment.page] }} + {{ notification.comment.page_title }} {% else %} {% autoescape off %} {{notification.html_link}} diff --git a/templates/organization/home.html b/templates/organization/home.html index bebfc73..80ad6dc 100644 --- a/templates/organization/home.html +++ b/templates/organization/home.html @@ -4,6 +4,7 @@ {% block org_js %} {% include "actionbar/media-js.html" %} + {% include "feed/feed_js.html" %} {% endblock %} {% block middle_title %} @@ -40,12 +41,7 @@ {% block middle_content %} {% block before_posts %}{% endblock %} {% if is_member or can_edit %} - {% for post in posts %} - {% include "blog/content.html" %} - {% endfor %} - {% if posts.paginator.num_pages > 1 %} -
{% include "list-pages.html" %}
- {% endif %} + {% include "blog/content.html" %} {% else %}

{{ _('About') }}

diff --git a/templates/problem/feed.html b/templates/problem/feed.html index c349664..c263fc3 100644 --- a/templates/problem/feed.html +++ b/templates/problem/feed.html @@ -2,6 +2,9 @@ {% block left_sidebar %} {% include "problem/left-sidebar.html" %} {% endblock %} +{% block problem_list_js %} + {% include "feed/feed_js.html" %} +{% endblock %} {% block middle_content %}
@@ -24,127 +27,5 @@
  • {{_('View your votes')}}
    • {% endif %} - {% for problem in problems %} -
    -

    - - {{ problem.i18n_name }} - - {% if problem.id in completed_problem_ids %} - - {% elif problem.id in attempted_problems %} - - {% else %} - - {% endif %} -

    - {% with authors=problem.authors.all() %} - {% if authors %} -
    - - {{ link_users(authors) }} -
    - {% endif %} - {% endwith %} - {% if show_types %} -
    - - {% for type in problem.types_list %} - {{ type }}{% if not loop.last %}, {% endif %} - {% endfor %}, *{{problem.points | int}} -
    - {% endif %} -
    -
    - {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %} - {{ problem.description|markdown(lazy_load=True)|reference|str|safe }} - {% endcache %} - {% if problem.pdf_description %} - - {% endif %} -
    - {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %} -
    - {{ _('View source') }} - -
    -
    -

    {{_('Volunteer form')}}

    -
    -
    - - - - {% endif %} -
    {{_("...More")}}
    -
    -
    - {% set pagevote = problem.pagevote %} - {% set bookmark = problem.bookmark %} - {% set hide_actionbar_comment = True %} - {% set include_hr = False %} - {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %} - {% include "actionbar/list.html" %} -
    -
    - {% endfor %} - {% if page_obj.num_pages > 1 %} -
    {% include "list-pages.html" %}
    - {% endif %} + {% include "problem/feed/problems.html" %} {% endblock %} \ No newline at end of file diff --git a/templates/problem/feed/problems.html b/templates/problem/feed/problems.html new file mode 100644 index 0000000..63f365d --- /dev/null +++ b/templates/problem/feed/problems.html @@ -0,0 +1,121 @@ +{% for problem in problems %} +
    +

    + + {{ problem.i18n_name }} + + {% if problem.id in completed_problem_ids %} + + {% elif problem.id in attempted_problems %} + + {% else %} + + {% endif %} +

    + {% with authors=problem.authors.all() %} + {% if authors %} +
    + + {{ link_users(authors) }} +
    + {% endif %} + {% endwith %} + {% if show_types %} +
    + + {% for type in problem.types_list %} + {{ type }}{% if not loop.last %}, {% endif %} + {% endfor %}, *{{problem.points | int}} +
    + {% endif %} +
    +
    + {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %} + {{ problem.description|markdown(lazy_load=True)|reference|str|safe }} + {% endcache %} + {% if problem.pdf_description %} + + {% endif %} +
    + {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %} +
    + {{ _('View source') }} + +
    +
    +

    {{_('Volunteer form')}}

    +
    +
    + + + + {% endif %} +
    {{_("...More")}}
    +
    +
    + {% set pagevote = problem.pagevote %} + {% set bookmark = problem.bookmark %} + {% set hide_actionbar_comment = True %} + {% set include_hr = False %} + {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %} + {% include "actionbar/list.html" %} +
    +
    +{% endfor %} +{% include "feed/has_next.html" %} \ No newline at end of file diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html index 02ec944..0ca5139 100644 --- a/templates/problem/list-base.html +++ b/templates/problem/list-base.html @@ -55,6 +55,7 @@ {% block three_col_js %} {% include "actionbar/media-js.html" %} + {% block problem_list_js %}{% endblock %} - {{ form.media.js }} {% compress js %} From a7c555c8537decdcba5ae9cd72cf6c2620729ee3 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 26 Apr 2023 03:38:34 -0500 Subject: [PATCH 092/478] Fix feed scroll on mobile --- judge/views/feed.py | 1 + resources/base.scss | 10 +++++++ templates/feed/feed_js.html | 54 +++++++++++++++++++++++------------- templates/feed/has_next.html | 5 +++- 4 files changed, 49 insertions(+), 21 deletions(-) diff --git a/judge/views/feed.py b/judge/views/feed.py index 89bb882..cd809d5 100644 --- a/judge/views/feed.py +++ b/judge/views/feed.py @@ -27,6 +27,7 @@ class FeedView(InfinitePaginationMixin, ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + context["has_next_page"] = context["page_obj"].has_next() try: context["feed_content_url"] = reverse(self.url_name) except Exception as e: diff --git a/resources/base.scss b/resources/base.scss index 62e204a..48ac6af 100644 --- a/resources/base.scss +++ b/resources/base.scss @@ -853,6 +853,13 @@ select { color: #808080; } +.view-next-page { + margin-left: auto; + margin-right: auto; + margin-top: 1em; + margin-bottom: 1em; +} + @media (max-width: 799px) { #user-links, .anon { padding-right: 0.5em; @@ -877,4 +884,7 @@ select { padding: 2em; border-radius: 1em; } + .view-next-page { + display: none; + } } \ No newline at end of file diff --git a/templates/feed/feed_js.html b/templates/feed/feed_js.html index 80d878d..d5ca182 100644 --- a/templates/feed/feed_js.html +++ b/templates/feed/feed_js.html @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/templates/feed/has_next.html b/templates/feed/has_next.html index 18415b5..9cc45c9 100644 --- a/templates/feed/has_next.html +++ b/templates/feed/has_next.html @@ -1 +1,4 @@ - \ No newline at end of file + +{% if has_next_page %} + +{% endif %} \ No newline at end of file From bfedef666ed6372760b115599f4b63a19c3a4495 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 26 Apr 2023 03:41:45 -0500 Subject: [PATCH 093/478] Add trans --- locale/vi/LC_MESSAGES/django.po | 107 ++++++++++++++++---------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index f6038f7..4a182fc 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: 2023-04-03 23:54+0700\n" +"POT-Creation-Date: 2023-04-26 15:39+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -467,63 +467,63 @@ msgstr "" msgid "New IOI" msgstr "IOI mới" -#: judge/forms.py:105 judge/views/organization.py:514 +#: judge/forms.py:107 judge/views/organization.py:514 #: judge/views/register.py:62 #, 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/forms.py:147 +#: judge/forms.py:149 msgid "Any judge" msgstr "" -#: judge/forms.py:346 +#: judge/forms.py:355 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:347 judge/views/stats.py:166 templates/stats/site.html:27 +#: judge/forms.py:356 judge/views/stats.py:166 templates/stats/site.html:27 msgid "New users" msgstr "Thành viên mới" -#: judge/forms.py:364 +#: judge/forms.py:373 #, 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:423 judge/views/register.py:30 +#: judge/forms.py:432 judge/views/register.py:30 #: templates/registration/registration_form.html:34 #: templates/user/base-users-table.html:5 #: templates/user/import/table_csv.html:4 msgid "Username" msgstr "Tên đăng nhập" -#: judge/forms.py:424 templates/registration/registration_form.html:46 +#: judge/forms.py:433 templates/registration/registration_form.html:46 #: templates/registration/registration_form.html:60 #: templates/user/import/table_csv.html:5 msgid "Password" msgstr "Mật khẩu" -#: judge/forms.py:450 +#: judge/forms.py:459 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:472 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:133 +#: judge/forms.py:479 judge/models/problem.py:133 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:486 msgid "Problem with code already exists." msgstr "Mã bài đã tồn tại." -#: judge/forms.py:484 judge/models/contest.py:91 +#: judge/forms.py:493 judge/models/contest.py:91 msgid "Contest id must be ^[a-z0-9]+$" msgstr "Mã kỳ thi phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:490 +#: judge/forms.py:499 msgid "Contest with key already exists." msgstr "Mã kỳ thi đã tồn tại." @@ -533,6 +533,7 @@ msgid "N j, Y, g:i a" msgstr "g:i a j b, Y" #: judge/jinja2/datetime.py:26 templates/chat/message.html:13 +#: templates/comments/list.html:76 #, python-brace-format msgid "{time}" msgstr "{time}" @@ -2659,24 +2660,24 @@ msgstr "Báo cáo" msgid "Comment feed" msgstr "Bình luận" -#: judge/views/comment.py:40 judge/views/pagevote.py:31 +#: judge/views/comment.py:42 judge/views/pagevote.py:31 msgid "Messing around, are we?" msgstr "Messing around, are we?" -#: judge/views/comment.py:56 judge/views/pagevote.py:47 +#: judge/views/comment.py:58 judge/views/pagevote.py:47 msgid "You must solve at least one problem before you can vote." msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote." -#: judge/views/comment.py:87 +#: judge/views/comment.py:89 msgid "You already voted." msgstr "Bạn đã vote." -#: judge/views/comment.py:158 judge/views/organization.py:811 +#: judge/views/comment.py:165 judge/views/organization.py:811 #: judge/views/organization.py:957 judge/views/organization.py:1122 msgid "Edited from site" msgstr "Chỉnh sửa từ web" -#: judge/views/comment.py:179 +#: judge/views/comment.py:186 msgid "Editing comment" msgstr "Chỉnh sửa bình luận" @@ -2765,53 +2766,53 @@ msgstr "F Y" msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1084 +#: judge/views/contests.py:1085 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1095 +#: judge/views/contests.py:1096 msgid "???" msgstr "???" -#: judge/views/contests.py:1122 +#: judge/views/contests.py:1123 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1123 +#: judge/views/contests.py:1124 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1137 +#: judge/views/contests.py:1138 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1156 templates/contest/contest-tabs.html:19 +#: judge/views/contests.py:1157 templates/contest/contest-tabs.html:19 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1205 +#: judge/views/contests.py:1206 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1241 +#: judge/views/contests.py:1242 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1264 +#: judge/views/contests.py:1265 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1279 judge/views/ticket.py:72 +#: judge/views/contests.py:1280 judge/views/ticket.py:72 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1322 +#: judge/views/contests.py:1323 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" @@ -3871,11 +3872,6 @@ msgstr "Đăng!" msgid "Please login to vote" msgstr "Đăng nhập để vote" -#: templates/comments/list.html:76 -#, python-brace-format -msgid "commented on {time}" -msgstr "bình luận vào {time}" - #: templates/comments/list.html:85 #, python-format msgid "edit %(edits)s" @@ -4099,7 +4095,7 @@ msgstr "Nhân bản" msgid "Leave contest" msgstr "Rời kỳ thi" -#: templates/contest/contest.html:42 templates/contest/list.html:399 +#: templates/contest/contest.html:42 templates/contest/list.html:401 msgid "Virtual join" msgstr "Tham gia ảo" @@ -4124,7 +4120,7 @@ msgid "AC Rate" msgstr "Tỷ lệ AC" #: templates/contest/contest.html:103 templates/contest/list.html:242 -#: templates/contest/list.html:291 templates/contest/list.html:376 +#: templates/contest/list.html:291 templates/contest/list.html:378 #: templates/problem/list.html:24 msgid "Users" msgstr "Người nộp" @@ -4193,7 +4189,7 @@ msgid "Active Contests" msgstr "Kỳ thi bạn đang tham gia" #: templates/contest/list.html:241 templates/contest/list.html:290 -#: templates/contest/list.html:333 templates/contest/list.html:373 +#: templates/contest/list.html:333 templates/contest/list.html:375 msgid "Contest" msgstr "Kỳ thi" @@ -4219,7 +4215,7 @@ msgstr "Kỳ thi sắp tới" msgid "There are no scheduled contests at this time." msgstr "Không có kỳ thi nào được lên lịch hiện tại." -#: templates/contest/list.html:363 +#: templates/contest/list.html:364 msgid "Past Contests" msgstr "Kỳ thi trong quá khứ" @@ -4357,9 +4353,13 @@ msgstr "Còn" msgid "Upcoming contests" msgstr "Kỳ thi sắp diễn ra" +#: templates/feed/has_next.html:3 +msgid "View more" +msgstr "Xem thêm" + #: templates/fine_uploader/script.html:4 msgid "Drop files here to upload" -msgstr "" +msgstr "Kéo file vào đây để tải lên" #: templates/fine_uploader/script.html:7 msgid "Upload file" @@ -4367,15 +4367,15 @@ msgstr "Tải file lên" #: templates/fine_uploader/script.html:23 msgid "Cancel" -msgstr "" +msgstr "Hủy" #: templates/fine_uploader/script.html:24 msgid "Retry" -msgstr "" +msgstr "Thử lại" #: templates/fine_uploader/script.html:26 msgid "Pause" -msgstr "" +msgstr "Dừng" #: templates/fine_uploader/script.html:27 msgid "Continue" @@ -4383,13 +4383,11 @@ msgstr "Tiếp tục" #: templates/internal/left-sidebar.html:3 msgid "Average speed" -msgstr "" +msgstr "Tốc độ trung bình" #: templates/internal/left-sidebar.html:4 -#, fuzzy -#| msgid "View requests" msgid "Slow requests" -msgstr "Đơn đăng ký" +msgstr "Requests chậm" #: templates/internal/problem.html:36 msgid "Code" @@ -5030,11 +5028,11 @@ msgstr "Lọc" msgid "Random" msgstr "Ngẫu nhiên" -#: templates/problem/submit.html:124 +#: templates/problem/submit.html:123 msgid "Your source code must contain at most 65536 characters." msgstr "Code phải chứa không quá 65536 ký tự." -#: templates/problem/submit.html:185 +#: templates/problem/submit.html:170 #, python-format msgid "" "Warning! Your default language, %(default_language)s, is " @@ -5043,7 +5041,7 @@ msgstr "" "Cẩn thận! Ngôn ngữ ưa thích của bạn, %(default_language)s, " "không được sử dụng trong bài này." -#: templates/problem/submit.html:196 +#: templates/problem/submit.html:181 #, fuzzy, python-format #| msgid "" #| "\n" @@ -5066,15 +5064,15 @@ msgstr[0] "" " Bạn còn %(left)s lần nộp\n" " " -#: templates/problem/submit.html:205 +#: templates/problem/submit.html:190 msgid "You have 0 submissions left" msgstr "Bạn đã hết lần nộp" -#: templates/problem/submit.html:239 +#: templates/problem/submit.html:224 msgid "No judge is available for this problem." msgstr "Không có máy chấm có thể chấm bài này." -#: templates/problem/submit.html:245 +#: templates/problem/submit.html:230 msgid "Submit!" msgstr "Nộp bài!" @@ -5866,6 +5864,9 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "commented on {time}" +#~ msgstr "bình luận vào {time}" + #~ msgid "Associated page" #~ msgstr "Trang liên kết" From 998182f65ec8abd3fdda6e1bbfb77dd69f30d189 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 26 Apr 2023 03:50:47 -0500 Subject: [PATCH 094/478] Fix bug --- judge/views/organization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index 00f196b..e615f3d 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -304,7 +304,7 @@ class OrganizationHome(OrganizationHomeView, FeedView): return context -class OrganizationUsers(QueryStringSortMixin, OrganizationMixin, FeedView): +class OrganizationUsers(QueryStringSortMixin, OrganizationMixin, ListView): template_name = "organization/users.html" all_sorts = frozenset(("points", "problem_count", "rating", "performance_points")) default_desc = all_sorts From d4db6bc0bede7c0f1fe094a0fe460878df592a50 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 26 Apr 2023 04:02:26 -0500 Subject: [PATCH 095/478] Add pagination to org users --- judge/views/organization.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index e615f3d..05524b8 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -304,15 +304,18 @@ class OrganizationHome(OrganizationHomeView, FeedView): return context -class OrganizationUsers(QueryStringSortMixin, OrganizationMixin, ListView): +class OrganizationUsers( + DiggPaginatorMixin, QueryStringSortMixin, OrganizationMixin, ListView +): template_name = "organization/users.html" all_sorts = frozenset(("points", "problem_count", "rating", "performance_points")) default_desc = all_sorts default_sort = "-performance_points" + paginate_by = 100 context_object_name = "users" def get_queryset(self): - return ranker( + return ( self.organization.members.filter(is_unlisted=False) .order_by(self.order, "id") .select_related("user") @@ -347,6 +350,9 @@ class OrganizationUsers(QueryStringSortMixin, OrganizationMixin, ListView): "organization_user_kick", args=[self.organization.id, self.organization.slug], ) + context["users"] = ranker( + context["users"], rank=self.paginate_by * (context["page_obj"].number - 1) + ) context["first_page_href"] = "." context["page_type"] = "users" From 7565d6ff0105a8f55a6f92332c5fe3ade2cbd081 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 28 Apr 2023 11:42:03 -0500 Subject: [PATCH 096/478] Fix edit button in editorial page --- judge/views/problem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/judge/views/problem.py b/judge/views/problem.py index cd461ea..3022f8f 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -194,7 +194,7 @@ class ProblemSolution( PageVoteDetailView, BookMarkDetailView, ): - context_object_name = "problem" + context_object_name = "solution" template_name = "problem/editorial.html" def get_title(self): @@ -220,7 +220,7 @@ class ProblemSolution( ) and not self.request.user.has_perm("judge.see_private_solution"): raise Http404() - context["solution"] = solution + context["problem"] = self.problem context["has_solved_problem"] = self.problem.id in self.get_completed_problems() return context From 30fb38f52ed5121dbd3f94de077f793afb9a82a8 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 28 Apr 2023 20:53:54 -0500 Subject: [PATCH 097/478] Show error in output instead of exception --- judge/utils/problem_data.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/judge/utils/problem_data.py b/judge/utils/problem_data.py index 782e4af..8be05ae 100644 --- a/judge/utils/problem_data.py +++ b/judge/utils/problem_data.py @@ -335,7 +335,9 @@ def get_problem_case(problem, files): if next_char: s += next_char else: - raise Exception("File %s is not able to decode in utf-8" % file) + s = f"File {file} is not able to decode in utf-8" + s = s.encode("utf-8") + break qs = get_visible_content(s) cache.set(cache_key, qs, 86400) result[file] = qs From 167fa1ad6686eda9c033965b8b2746ff170bdefa Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 6 May 2023 23:12:09 -0500 Subject: [PATCH 098/478] Remove unused cache --- judge/bridge/judge_handler.py | 7 ------- judge/views/problem.py | 1 - 2 files changed, 8 deletions(-) diff --git a/judge/bridge/judge_handler.py b/judge/bridge/judge_handler.py index e36c9f8..1efd45a 100644 --- a/judge/bridge/judge_handler.py +++ b/judge/bridge/judge_handler.py @@ -570,13 +570,6 @@ class JudgeHandler(ZlibPacketHandler): event.post("contest_%d" % participation.contest_id, {"type": "update"}) self._post_update_submission(submission.id, "grading-end", done=True) - # Clean up submission source file (if any) - # source_file = cache.get(f"submission_source_file:{submission.id}") - # if source_file: - # filepath = os.path.join(settings.DMOJ_SUBMISSION_ROOT, source_file) - # if os.path.exists(filepath): - # os.remove(filepath) - def on_compile_error(self, packet): logger.info( "%s: Submission failed to compile: %s", self.name, packet["submission-id"] diff --git a/judge/views/problem.py b/judge/views/problem.py index 3022f8f..7fec6fb 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -1118,7 +1118,6 @@ def problem_submit(request, problem, submission=None): # Save a query model.source = source - cache.set(f"submission_source_file:{model.id}", form.source_file_name, 3600) model.judge(rejudge=False, judge_id=form.cleaned_data["judge"]) return HttpResponseRedirect( From ad974530d5d88682c9e89c587cdbdefacf451e6d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sun, 7 May 2023 21:37:22 -0500 Subject: [PATCH 099/478] Fix contest submission bug when modifying from admin page --- judge/admin/submission.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/judge/admin/submission.py b/judge/admin/submission.py index f621783..2a6067a 100644 --- a/judge/admin/submission.py +++ b/judge/admin/submission.py @@ -206,6 +206,11 @@ class SubmissionAdmin(admin.ModelAdmin): "problem__code", ) + def save_model(self, request, obj, form, change): + super().save_model(request, obj, form, change) + if "case_points" in form.changed_data or "case_total" in form.changed_data: + obj.update_contest() + def judge(self, request, queryset): if not request.user.has_perm( "judge.rejudge_submission" From 966e8c9db5a3cfc5c8aa49d47d9805a23cdf295e Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 15 May 2023 00:01:53 -0500 Subject: [PATCH 100/478] Fix subdomain download files --- judge/middleware.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/judge/middleware.py b/judge/middleware.py index 1c7f18a..c08b2b9 100644 --- a/judge/middleware.py +++ b/judge/middleware.py @@ -17,6 +17,7 @@ from judge.utils.views import generic_message USED_DOMAINS = ["www"] +URL_NAMES_BYPASS_SUBDOMAIN = ["submission_source_file"] class ShortCircuitMiddleware: @@ -117,7 +118,10 @@ class SubdomainMiddleware(object): subdomain = subdomain[:-1] - if subdomain in USED_DOMAINS: + if ( + subdomain in USED_DOMAINS + or resolve(request.path).url_name in URL_NAMES_BYPASS_SUBDOMAIN + ): return self.get_response(request) try: From d80ec962a501c1de694033bac74f1ba260e96a95 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 20 May 2023 10:06:00 +0900 Subject: [PATCH 101/478] Try slowing down rejudge enqueue --- judge/tasks/submission.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/judge/tasks/submission.py b/judge/tasks/submission.py index aa474f8..1c39b1c 100644 --- a/judge/tasks/submission.py +++ b/judge/tasks/submission.py @@ -1,6 +1,7 @@ from celery import shared_task from django.core.cache import cache from django.utils.translation import gettext as _ +from time import sleep from judge.models import Problem, Profile, Submission from judge.utils.celery import Progress @@ -34,6 +35,7 @@ def rejudge_problem_filter( for submission in queryset.iterator(): submission.judge(rejudge=True, batch_rejudge=True) rejudged += 1 + sleep(0.1) if rejudged % 10 == 0: p.done = rejudged return rejudged From 1056a470b048cb36aff6bd7b9ea1f3ebc1d909c5 Mon Sep 17 00:00:00 2001 From: "Dung T.Bui" Date: Mon, 22 May 2023 20:52:18 +0700 Subject: [PATCH 102/478] Change comment style (#70) --- dmoj/urls.py | 2 + judge/comments.py | 85 ++- judge/models/comment.py | 12 +- judge/views/comment.py | 84 ++- locale/vi/LC_MESSAGES/django.po | 527 +++++++++--------- locale/vi/LC_MESSAGES/dmoj-user.po | 9 +- make_style.sh | 0 manage.py | 0 resources/bootstrap/bootstrap.min.css | 0 resources/comments.scss | 22 + .../placeholders/not_available-generic.png | Bin .../placeholders/waiting-generic.png | Bin resources/fontawesome/fontawesome.css | 0 resources/icons/android-chrome-512x512.png | Bin resources/icons/logo.png | Bin templates/actionbar/list.html | 2 +- templates/comments/content-list.html | 139 +++++ templates/comments/list.html | 33 +- templates/comments/media-js.html | 71 +++ 19 files changed, 680 insertions(+), 306 deletions(-) mode change 100755 => 100644 make_style.sh mode change 100755 => 100644 manage.py mode change 100755 => 100644 resources/bootstrap/bootstrap.min.css mode change 100755 => 100644 resources/fine-uploader/placeholders/not_available-generic.png mode change 100755 => 100644 resources/fine-uploader/placeholders/waiting-generic.png mode change 100755 => 100644 resources/fontawesome/fontawesome.css mode change 100755 => 100644 resources/icons/android-chrome-512x512.png mode change 100755 => 100644 resources/icons/logo.png create mode 100644 templates/comments/content-list.html diff --git a/dmoj/urls.py b/dmoj/urls.py index 4900d7c..54a7f12 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -468,6 +468,8 @@ urlpatterns = [ url(r"^comments/upvote/$", comment.upvote_comment, name="comment_upvote"), url(r"^comments/downvote/$", comment.downvote_comment, name="comment_downvote"), url(r"^comments/hide/$", comment.comment_hide, name="comment_hide"), + url(r"^comments/get_replies/$", comment.get_replies, name="comment_get_replies"), + url(r"^comments/show_more/$", comment.get_show_more, name="comment_show_more"), url( r"^comments/(?P\d+)/", include( diff --git a/judge/comments.py b/judge/comments.py index 08d1cb7..2a2f515 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -11,6 +11,7 @@ from django.http import ( HttpResponseForbidden, HttpResponseNotFound, HttpResponseRedirect, + Http404, ) from django.urls import reverse_lazy from django.utils.decorators import method_decorator @@ -151,40 +152,92 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): return self.render_to_response(context) def get(self, request, *args, **kwargs): + pre_query = None + if "comment-id" in request.GET: + comment_id = int(request.GET["comment-id"]) + try: + comment_obj = Comment.objects.get(pk=comment_id) + except Comment.DoesNotExist: + raise Http404 + pre_query = comment_obj + while comment_obj is not None: + pre_query = comment_obj + comment_obj = comment_obj.parent self.object = self.get_object() return self.render_to_response( self.get_context_data( object=self.object, + pre_query=pre_query, comment_form=CommentForm(request, initial={"parent": None}), ) ) - def get_context_data(self, **kwargs): + def get_context_data(self, pre_query=None, **kwargs): context = super(CommentedDetailView, self).get_context_data(**kwargs) queryset = self.object.comments - context["has_comments"] = queryset.exists() - context["comment_lock"] = self.is_comment_locked() - queryset = ( - queryset.select_related("author__user") - .filter(hidden=False) - .defer("author__about") - .annotate(revisions=Count("versions")) - ) - + queryset = queryset.filter(parent=None, hidden=False) + queryset_all = None + comment_count = len(queryset) + context["comment_remove"] = -1 + if (pre_query != None): + comment_remove = pre_query.id + queryset_all = pre_query.get_descendants(include_self=True) + queryset_all = ( + queryset_all.select_related("author__user") + .filter(hidden=False) + .defer("author__about") + .annotate(revisions=Count("versions", distinct=True)) + ) + context["comment_remove"] = comment_remove + else: + queryset = ( + queryset.select_related("author__user") + .defer("author__about") + .filter(hidden=False) + .annotate( + count_replies=Count("replies", distinct=True), + revisions=Count("versions", distinct=True), + )[:10] + ) + if self.request.user.is_authenticated: profile = self.request.profile - queryset = queryset.annotate( - my_vote=FilteredRelation( - "votes", condition=Q(votes__voter_id=profile.id) - ), - ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + if (pre_query != None): + queryset_all = queryset_all.annotate( + my_vote=FilteredRelation( + "votes", condition=Q(votes__voter_id=profile.id) + ), + ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + else: + queryset = queryset.annotate( + my_vote=FilteredRelation( + "votes", condition=Q(votes__voter_id=profile.id) + ), + ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + context["is_new_user"] = ( not self.request.user.is_staff and not profile.submission_set.filter( points=F("problem__points") ).exists() ) + + context["has_comments"] = queryset.exists() + context["comment_lock"] = self.is_comment_locked() context["comment_list"] = queryset - context["comment_count"] = len(queryset) + context["comment_all_list"] = queryset_all + context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD + if queryset.exists(): + context["comment_root_id"] = queryset[0].id + else: + context["comment_root_id"] = 0 + context["comment_parrent_none"] = 1 + if (pre_query != None): + context["offset"] = 1 + else: + context["offset"] = 10 + + context["limit"] = 10 + context["comment_count"] = comment_count return context diff --git a/judge/models/comment.py b/judge/models/comment.py index fc9af4c..335d567 100644 --- a/judge/models/comment.py +++ b/judge/models/comment.py @@ -56,6 +56,7 @@ class Comment(MPTTModel): related_name="replies", on_delete=CASCADE, ) + versions = VersionRelation() class Meta: @@ -111,6 +112,15 @@ class Comment(MPTTModel): if len(output) >= n: return output return output + + @cached_property + def get_replies(self): + query = Comment.filter(parent=self) + return len(query) + + @cached_property + def get_revisions(self): + return self.versions.count() @cached_property def page_title(self): @@ -141,7 +151,7 @@ class Comment(MPTTModel): ) def get_absolute_url(self): - return "%s#comment-%d" % (self.link, self.id) + return "%s?comment-id=%d#comment-%d" % (self.link, self.id, self.id) class CommentVote(models.Model): diff --git a/judge/views/comment.py b/judge/views/comment.py index 19085fb..abacb52 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -1,8 +1,13 @@ +from django.conf import settings + from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin +from django.contrib.auth.context_processors import PermWrapper from django.core.exceptions import PermissionDenied from django.db import IntegrityError, transaction -from django.db.models import F +from django.db.models import Q, F, Count, FilteredRelation +from django.db.models.functions import Coalesce +from django.db.models.expressions import F, Value from django.forms.models import ModelForm from django.http import ( Http404, @@ -15,11 +20,12 @@ from django.utils.translation import gettext as _ from django.views.decorators.http import require_POST from django.views.generic import DetailView, UpdateView from django.urls import reverse_lazy +from django.template import loader from reversion import revisions from reversion.models import Version from judge.dblock import LockModel -from judge.models import Comment, CommentVote, Notification +from judge.models import Comment, CommentVote, Notification, BlogPost from judge.utils.views import TitleMixin from judge.widgets import MathJaxPagedownWidget, HeavyPreviewPageDownWidget from judge.comments import add_mention_notifications, del_mention_notifications @@ -36,6 +42,11 @@ __all__ = [ @login_required + +# def get_more_reply(request, id): +# queryset = Comment.get_pk(id) + + def vote_comment(request, delta): if abs(delta) != 1: return HttpResponseBadRequest( @@ -99,10 +110,77 @@ def vote_comment(request, delta): def upvote_comment(request): return vote_comment(request, 1) - def downvote_comment(request): return vote_comment(request, -1) +def get_comments(request, limit=10): + try: + comment_id = int(request.GET["id"]) + parrent_none = int(request.GET["parrent_none"]) + except ValueError: + return HttpResponseBadRequest() + else: + if comment_id and not Comment.objects.filter(id=comment_id).exists(): + raise Http404() + offset = 0 + if "offset" in request.GET: + offset = int(request.GET["offset"]) + comment_remove = -1 + if "comment_remove" in request.GET: + comment_remove = int(request.GET["comment_remove"]) + comment_root_id = 0 + if (comment_id): + comment_obj = Comment.objects.get(pk=comment_id) + comment_root_id = comment_obj.id + else: + comment_obj = None + queryset = comment_obj.linked_object.comments + if parrent_none: + queryset = queryset.filter(parent=None, hidden=False) + if (comment_remove != -1): + queryset.get(pk=comment_remove).delete() + else: + queryset = queryset.filter(parent=comment_obj, hidden=False) + comment_count = len(queryset) + queryset = ( + queryset.select_related("author__user") + .defer("author__about") + .annotate( + count_replies=Count("replies", distinct=True), + revisions=Count("versions", distinct=True), + )[offset:offset+limit] + ) + if request.user.is_authenticated: + profile = request.profile + queryset = queryset.annotate( + my_vote=FilteredRelation( + "votes", condition=Q(votes__voter_id=profile.id) + ), + ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + + comment_html = loader.render_to_string( + "comments/content-list.html", + { + "request": request, + "comment_root_id": comment_root_id, + "comment_list": queryset, + "vote_hide_threshold" : settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD, + "perms": PermWrapper(request.user), + "offset": offset + min(len(queryset), limit), + "limit": limit, + "comment_count": comment_count, + "comment_parrent_none": parrent_none, + "comment_remove": comment_remove, + } + ) + + return HttpResponse(comment_html) + +def get_show_more(request): + return get_comments(request) + +def get_replies(request): + return get_comments(request) class CommentMixin(object): model = Comment diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 4a182fc..268b457 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: 2023-04-26 15:39+0700\n" +"POT-Creation-Date: 2023-05-16 16:17+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -25,7 +25,7 @@ msgstr "" msgid "user" msgstr "người dùng" -#: chat_box/models.py:32 judge/models/comment.py:44 judge/models/comment.py:179 +#: chat_box/models.py:32 judge/models/comment.py:44 judge/models/comment.py:189 msgid "posted time" msgstr "thời gian đăng" @@ -41,19 +41,19 @@ msgstr "xem lần cuối" msgid "LQDOJ Chat" msgstr "" -#: dmoj/settings.py:363 +#: dmoj/settings.py:365 msgid "Vietnamese" msgstr "Tiếng Việt" -#: dmoj/settings.py:364 +#: dmoj/settings.py:366 msgid "English" msgstr "" -#: dmoj/urls.py:135 +#: dmoj/urls.py:136 msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:212 templates/base.html:209 +#: dmoj/urls.py:214 templates/base.html:209 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -140,7 +140,7 @@ msgstr[0] "%d kỳ thi đã được đánh dấu ẩn." msgid "Mark contests as hidden" msgstr "Ẩn các kỳ thi" -#: judge/admin/contest.py:377 judge/admin/submission.py:243 +#: judge/admin/contest.py:377 judge/admin/submission.py:248 #, python-format msgid "%d submission was successfully scheduled for rejudging." msgid_plural "%d submissions were successfully scheduled for rejudging." @@ -221,7 +221,7 @@ msgstr "Điểm" msgid "Limits" msgstr "Giới hạn" -#: judge/admin/problem.py:217 judge/admin/submission.py:353 +#: judge/admin/problem.py:217 judge/admin/submission.py:358 #: templates/base.html:245 templates/stats/tab.html:4 #: templates/submission/list.html:347 msgid "Language" @@ -255,12 +255,12 @@ msgstr[0] "%d bài tập đã được đánh dấu riêng tư." msgid "Mark problems as private" msgstr "Đánh dấu các bài tập là riêng tư" -#: judge/admin/problem.py:432 judge/admin/submission.py:316 +#: judge/admin/problem.py:432 judge/admin/submission.py:321 #: templates/problem/list.html:18 templates/problem/list.html:37 msgid "Problem code" msgstr "Mã bài" -#: judge/admin/problem.py:444 judge/admin/submission.py:322 +#: judge/admin/problem.py:444 judge/admin/submission.py:327 msgid "Problem name" msgstr "Tên bài" @@ -284,7 +284,7 @@ msgstr "" msgid "timezone" msgstr "múi giờ" -#: judge/admin/profile.py:125 judge/admin/submission.py:329 +#: judge/admin/profile.py:125 judge/admin/submission.py:334 #: templates/notification/list.html:12 #: templates/organization/requests/log.html:9 #: templates/organization/requests/pending.html:19 @@ -338,7 +338,7 @@ msgid "Capabilities" msgstr "Khả năng" #: judge/admin/submission.py:31 judge/admin/submission.py:53 -#: judge/admin/submission.py:340 +#: judge/admin/submission.py:345 msgid "None" msgstr "None" @@ -360,29 +360,29 @@ msgctxt "contest problem" msgid "%(problem)s in %(contest)s" msgstr "%(problem)s trong %(contest)s" -#: judge/admin/submission.py:215 judge/admin/submission.py:256 +#: judge/admin/submission.py:220 judge/admin/submission.py:261 msgid "You do not have the permission to rejudge submissions." msgstr "Bạn không có quyền chấm lại bài." -#: judge/admin/submission.py:227 +#: judge/admin/submission.py:232 msgid "You do not have the permission to rejudge THAT many submissions." msgstr "Bạn không có quyền chấm lại nhiều bài nộp như vậy." -#: judge/admin/submission.py:250 +#: judge/admin/submission.py:255 msgid "Rejudge the selected submissions" msgstr "Chấm lại các bài nộp đã chọn" -#: judge/admin/submission.py:304 judge/views/problem_manage.py:226 +#: judge/admin/submission.py:309 judge/views/problem_manage.py:226 #, python-format msgid "%d submission were successfully rescored." msgid_plural "%d submissions were successfully rescored." msgstr[0] "%d bài nộp đã được tính điểm lại." -#: judge/admin/submission.py:311 +#: judge/admin/submission.py:316 msgid "Rescore the selected submissions" msgstr "Tính điểm lại cái bài nộp" -#: judge/admin/submission.py:334 templates/notification/list.html:15 +#: judge/admin/submission.py:339 templates/notification/list.html:15 #: templates/organization/requests/log.html:10 #: templates/organization/requests/pending.html:20 #: templates/problem/list.html:154 @@ -391,17 +391,17 @@ msgstr "Tính điểm lại cái bài nộp" msgid "Time" msgstr "Thời gian" -#: judge/admin/submission.py:342 +#: judge/admin/submission.py:347 #, python-format msgid "%d KB" msgstr "%d KB" -#: judge/admin/submission.py:344 +#: judge/admin/submission.py:349 #, python-format msgid "%.2f MB" msgstr "" -#: judge/admin/submission.py:347 templates/submission/status-testcases.html:151 +#: judge/admin/submission.py:352 templates/submission/status-testcases.html:151 msgid "Memory" msgstr "Bộ nhớ" @@ -426,20 +426,20 @@ msgstr "Dạng" msgid "Online Judge" msgstr "" -#: judge/comments.py:60 +#: judge/comments.py:61 msgid "Comment body" msgstr "Nội dung bình luận" -#: judge/comments.py:66 judge/views/ticket.py:78 +#: judge/comments.py:67 judge/views/ticket.py:78 msgid "Your part is silent, little toad." msgstr "Bạn không được phép bình luận." -#: judge/comments.py:75 templates/comments/list.html:17 +#: judge/comments.py:76 templates/comments/list.html:17 msgid "" "You need to have solved at least one problem before your voice can be heard." msgstr "Bạn phải giải ít nhất một bài trước khi được phép bình luận." -#: judge/comments.py:124 +#: judge/comments.py:125 msgid "Posted comment" msgstr "Bình luận đã đăng" @@ -467,7 +467,7 @@ msgstr "" msgid "New IOI" msgstr "IOI mới" -#: judge/forms.py:107 judge/views/organization.py:514 +#: judge/forms.py:107 judge/views/organization.py:520 #: judge/views/register.py:62 #, python-brace-format msgid "You may not be part of more than {count} public groups." @@ -533,7 +533,7 @@ msgid "N j, Y, g:i a" msgstr "g:i a j b, Y" #: judge/jinja2/datetime.py:26 templates/chat/message.html:13 -#: templates/comments/list.html:76 +#: templates/comments/content-list.html:35 templates/comments/list.html:77 #, python-brace-format msgid "{time}" msgstr "{time}" @@ -543,19 +543,19 @@ msgstr "{time}" msgid "on {time}" msgstr "vào {time}" -#: judge/middleware.py:131 +#: judge/middleware.py:135 msgid "No permission" msgstr "Không có quyền truy cập" -#: judge/middleware.py:132 +#: judge/middleware.py:136 msgid "You need to join this group first" msgstr "Bạn phải là thành viên của nhóm." -#: judge/middleware.py:142 judge/middleware.py:143 +#: judge/middleware.py:146 judge/middleware.py:147 msgid "No such group" msgstr "Nhóm không tồn tại" -#: judge/models/bookmark.py:14 judge/models/comment.py:161 +#: judge/models/bookmark.py:14 judge/models/comment.py:171 #: judge/models/pagevote.py:13 msgid "associated page" msgstr "trang tương ứng" @@ -621,56 +621,49 @@ msgstr "ẩn bình luận" msgid "parent" msgstr "" -#: judge/models/comment.py:62 judge/models/comment.py:181 +#: judge/models/comment.py:63 judge/models/comment.py:191 msgid "comment" msgstr "bình luận" -#: judge/models/comment.py:63 +#: judge/models/comment.py:64 msgid "comments" msgstr "" -#: judge/models/comment.py:122 +#: judge/models/comment.py:132 #, fuzzy #| msgid "Editorial for {0}" msgid "Editorial for " msgstr "Hướng dẫn cho {0}" -#: judge/models/comment.py:154 +#: judge/models/comment.py:164 msgid "comment vote" msgstr "" -#: judge/models/comment.py:155 +#: judge/models/comment.py:165 msgid "comment votes" msgstr "" -#: judge/models/comment.py:166 +#: judge/models/comment.py:176 msgid "Override comment lock" msgstr "" -#: judge/models/comment.py:175 -#: src/dmoj-wpadmin/test_project/apps/books/admin.py:24 -#: src/dmoj-wpadmin/test_project/apps/books/models.py:30 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:30 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:30 +#: judge/models/comment.py:185 msgid "owner" msgstr "" -#: judge/models/comment.py:183 judge/models/message.py:28 +#: judge/models/comment.py:193 judge/models/message.py:28 msgid "read" msgstr "" -#: judge/models/comment.py:184 -#: src/dmoj-wpadmin/test_project/apps/books/models.py:28 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:28 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:28 +#: judge/models/comment.py:194 msgid "category" msgstr "" -#: judge/models/comment.py:187 +#: judge/models/comment.py:197 msgid "html link to comments, used for non-comments" msgstr "" -#: judge/models/comment.py:193 +#: judge/models/comment.py:203 msgid "who trigger, used for non-comment" msgstr "" @@ -739,13 +732,6 @@ msgstr "" #: judge/models/contest.py:118 judge/models/course.py:158 #: judge/models/runtime.py:211 -#: src/dmoj-wpadmin/test_project/apps/books/admin.py:20 -#: src/dmoj-wpadmin/test_project/apps/books/models.py:13 -#: src/dmoj-wpadmin/test_project/apps/books/models.py:27 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:13 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:27 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:13 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:27 msgid "description" msgstr "mô tả" @@ -2660,24 +2646,24 @@ msgstr "Báo cáo" msgid "Comment feed" msgstr "Bình luận" -#: judge/views/comment.py:42 judge/views/pagevote.py:31 +#: judge/views/comment.py:53 judge/views/pagevote.py:31 msgid "Messing around, are we?" msgstr "Messing around, are we?" -#: judge/views/comment.py:58 judge/views/pagevote.py:47 +#: judge/views/comment.py:69 judge/views/pagevote.py:47 msgid "You must solve at least one problem before you can vote." msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote." -#: judge/views/comment.py:89 +#: judge/views/comment.py:100 msgid "You already voted." msgstr "Bạn đã vote." -#: judge/views/comment.py:165 judge/views/organization.py:811 -#: judge/views/organization.py:957 judge/views/organization.py:1122 +#: judge/views/comment.py:243 judge/views/organization.py:817 +#: judge/views/organization.py:963 judge/views/organization.py:1128 msgid "Edited from site" msgstr "Chỉnh sửa từ web" -#: judge/views/comment.py:186 +#: judge/views/comment.py:264 msgid "Editing comment" msgstr "Chỉnh sửa bình luận" @@ -2879,13 +2865,13 @@ msgstr "Không thể chỉnh sửa tổ chức" 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:193 judge/views/organization.py:337 +#: judge/views/organization.py:193 judge/views/organization.py:340 #, fuzzy #| msgid "Can't edit organization" msgid "Can't access organization" msgstr "Không thể chỉnh sửa tổ chức" -#: judge/views/organization.py:194 judge/views/organization.py:338 +#: judge/views/organization.py:194 judge/views/organization.py:341 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." @@ -2896,57 +2882,57 @@ msgstr "Bạn không được phép chỉnh sửa tổ chức này." msgid "Groups" msgstr "Nhóm" -#: judge/views/organization.py:344 +#: judge/views/organization.py:347 #, python-format msgid "%s Members" msgstr "%s Thành viên" -#: judge/views/organization.py:470 +#: judge/views/organization.py:476 #, python-brace-format msgid "All submissions in {0}" msgstr "Bài nộp trong {0}" -#: judge/views/organization.py:500 judge/views/organization.py:506 -#: judge/views/organization.py:513 +#: judge/views/organization.py:506 judge/views/organization.py:512 +#: judge/views/organization.py:519 msgid "Joining group" msgstr "Tham gia nhóm" -#: judge/views/organization.py:501 +#: judge/views/organization.py:507 msgid "You are already in the group." msgstr "Bạn đã ở trong nhóm." -#: judge/views/organization.py:506 +#: judge/views/organization.py:512 msgid "This group is not open." msgstr "Nhóm này là nhóm kín." -#: judge/views/organization.py:529 +#: judge/views/organization.py:535 msgid "Leaving group" msgstr "Rời nhóm" -#: judge/views/organization.py:530 +#: judge/views/organization.py:536 #, python-format msgid "You are not in \"%s\"." msgstr "Bạn không ở trong \"%s\"." -#: judge/views/organization.py:555 +#: judge/views/organization.py:561 #, python-format msgid "Request to join %s" msgstr "Đăng ký tham gia %s" -#: judge/views/organization.py:585 +#: judge/views/organization.py:591 msgid "Join request detail" msgstr "Chi tiết đơn đăng ký" -#: judge/views/organization.py:627 +#: judge/views/organization.py:633 msgid "Manage join requests" msgstr "Quản lý đơn đăng ký" -#: judge/views/organization.py:631 +#: judge/views/organization.py:637 #, python-format msgid "Managing join requests for %s" msgstr "Quản lý đơn đăng ký cho %s" -#: judge/views/organization.py:671 +#: judge/views/organization.py:677 #, python-format msgid "" "Your organization can only receive %d more members. You cannot approve %d " @@ -2955,96 +2941,96 @@ 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:689 +#: judge/views/organization.py:695 #, python-format msgid "Approved %d user." msgid_plural "Approved %d users." msgstr[0] "Đã chấp thuận %d người." -#: judge/views/organization.py:692 +#: judge/views/organization.py:698 #, python-format msgid "Rejected %d user." msgid_plural "Rejected %d users." msgstr[0] "Đã từ chối %d người." -#: judge/views/organization.py:732 +#: judge/views/organization.py:738 #, python-format msgid "Add member for %s" msgstr "Thêm thành viên cho %s" -#: judge/views/organization.py:744 +#: judge/views/organization.py:750 #, fuzzy #| msgid "Edited from site" msgid "Added members from site" msgstr "Chỉnh sửa từ web" -#: judge/views/organization.py:764 judge/views/organization.py:772 +#: judge/views/organization.py:770 judge/views/organization.py:778 msgid "Can't kick user" msgstr "Không thể đuổi" -#: judge/views/organization.py:765 +#: judge/views/organization.py:771 msgid "The user you are trying to kick does not exist!" msgstr "" -#: judge/views/organization.py:773 +#: judge/views/organization.py:779 #, python-format msgid "The user you are trying to kick is not in organization: %s." msgstr "" -#: judge/views/organization.py:794 judge/views/organization.py:946 +#: judge/views/organization.py:800 judge/views/organization.py:952 #, fuzzy, python-format #| msgid "Editing %s" msgid "Edit %s" msgstr "Đang chỉnh sửa %s" -#: judge/views/organization.py:822 templates/organization/list.html:45 +#: judge/views/organization.py:828 templates/organization/list.html:45 msgid "Create group" msgstr "Tạo nhóm" -#: judge/views/organization.py:837 +#: judge/views/organization.py:843 msgid "Exceeded limit" msgstr "" -#: judge/views/organization.py:838 +#: judge/views/organization.py:844 #, python-format msgid "You created too many groups. You can only create at most %d groups" msgstr "" -#: judge/views/organization.py:843 judge/views/organization.py:868 -#: judge/views/organization.py:1012 +#: judge/views/organization.py:849 judge/views/organization.py:874 +#: judge/views/organization.py:1018 msgid "Added from site" msgstr "Thêm từ web" -#: judge/views/organization.py:859 +#: judge/views/organization.py:865 #: templates/organization/org-right-sidebar.html:55 msgid "Add contest" msgstr "Thêm kỳ thi" -#: judge/views/organization.py:902 judge/views/organization.py:1064 +#: judge/views/organization.py:908 judge/views/organization.py:1070 msgid "Permission denied" msgstr "Truy cập bị từ chối" -#: judge/views/organization.py:903 +#: judge/views/organization.py:909 #, 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:1001 +#: judge/views/organization.py:1007 #, python-format msgid "Add blog for %s" msgstr "Thêm bài đăng cho %s" -#: judge/views/organization.py:1065 +#: judge/views/organization.py:1071 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:1097 +#: judge/views/organization.py:1103 #, python-format msgid "Edit blog %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:1148 +#: judge/views/organization.py:1154 #, python-format msgid "Pending blogs in %s" msgstr "Bài đang đợi duyệt trong %s" @@ -3097,12 +3083,12 @@ msgstr "Quá nhiều lần nộp" 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:1177 judge/views/problem.py:1182 +#: judge/views/problem.py:1176 judge/views/problem.py:1181 #, python-format msgid "Submit to %(problem)s" msgstr "Nộp bài cho %(problem)s" -#: judge/views/problem.py:1208 +#: judge/views/problem.py:1207 msgid "Clone Problem" msgstr "Nhân bản bài tập" @@ -3302,8 +3288,8 @@ msgstr "Phải qua một kỳ thi" #: judge/views/submission.py:903 #, python-brace-format msgid "" -"{0}'s submissions for {2} in {4}" +"{0}'s submissions for {2} in {4}" msgstr "" "Các bài nộp của {0} cho {2} trong {4}" @@ -3431,147 +3417,6 @@ msgstr "Dữ liệu không hợp lệ: %s" msgid "Bad latitude or longitude" msgstr "Kinh độ / Vĩ độ không hợp lệ" -#: src/dmoj-wpadmin/test_project/apps/authors/models.py:9 -#, fuzzy -#| msgid "short name" -msgid "first name" -msgstr "tên ngắn" - -#: src/dmoj-wpadmin/test_project/apps/authors/models.py:10 -#, fuzzy -#| msgid "short name" -msgid "last name" -msgstr "tên ngắn" - -#: src/dmoj-wpadmin/test_project/apps/authors/models.py:11 -msgid "biography" -msgstr "tiểu sử" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:12 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:12 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:12 -msgid "name" -msgstr "tên" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:19 -msgid "Category of Books" -msgstr "Thể loại sách" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:20 -msgid "Categories of Books" -msgstr "Thể loại sách" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:26 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:26 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:26 -msgid "title" -msgstr "tiêu đề" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:29 -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:29 -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:29 -msgid "author" -msgstr "tác giả" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:31 -msgid "publication date" -msgstr "ngày xuất bản" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:37 -msgid "Book" -msgstr "Sách" - -#: src/dmoj-wpadmin/test_project/apps/books/models.py:38 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:136 -msgid "Books" -msgstr "Sách" - -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:19 -msgid "Category of CDs" -msgstr "Thể loại CDs" - -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:20 -msgid "Categories of CDs" -msgstr "Thể loại CDs" - -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:36 -msgid "CD" -msgstr "" - -#: src/dmoj-wpadmin/test_project/apps/cds/models.py:37 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:141 -msgid "CDs" -msgstr "" - -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:19 -msgid "Category of DVDs" -msgstr "Thể loại DVDs" - -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:20 -msgid "Categories of DVDs" -msgstr "Thể loại DVDs" - -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:36 -msgid "DVD" -msgstr "" - -#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:37 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:146 -msgid "DVDs" -msgstr "" - -#: src/dmoj-wpadmin/test_project/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Quản trị viên Django" - -#: src/dmoj-wpadmin/test_project/test_project/forms.py:12 -#, python-format -msgid "" -"Please enter the correct %(username)s and password for an admin account. " -"Note that both fields may be case-sensitive." -msgstr "" -"Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản quản trị. Chú ý cả " -"hai trường có phân biệt chữ Hoa-thường." - -#: src/dmoj-wpadmin/test_project/test_project/forms.py:32 -#, python-format -msgid "" -"Please enter the correct %(username)s and password for an user account. Note " -"that both fields may be case-sensitive." -msgstr "" -"Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản thành viên. Chú ý cả " -"hai trường có phân biệt chữ Hoa-thường." - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:27 -#: templates/stats/tab.html:5 -msgid "Site" -msgstr "Trang" - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:38 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:41 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:130 -#: src/dmoj-wpadmin/test_project/test_project/wp.py:133 -msgid "Dashboard" -msgstr "Bảng điều khiển" - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:48 -msgid "Applications" -msgstr "Ứng dụng" - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:53 -#, fuzzy -#| msgid "administrators" -msgid "Administration" -msgstr "người quản lý" - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:64 -msgid "Color theme" -msgstr "Chủ đề màu sắc" - -#: src/dmoj-wpadmin/test_project/test_project/wp.py:66 -msgid "Change color theme" -msgstr "Đổi chủ đề màu sắc" - #: templates/actionbar/list.html:15 msgid "Like" msgstr "Thích" @@ -3657,7 +3502,8 @@ msgid "Profile" msgstr "Trang cá nhân" #: templates/base.html:276 templates/chat/chat.html:21 -#: templates/comments/list.html:125 templates/contest/contest-list-tabs.html:4 +#: templates/comments/content-list.html:80 templates/comments/list.html:126 +#: templates/contest/contest-list-tabs.html:4 #: templates/contest/ranking-table.html:47 templates/internal/problem.html:57 #: templates/organization/org-left-sidebar.html:12 #: templates/problem/left-sidebar.html:6 @@ -3713,8 +3559,9 @@ msgstr "" msgid " posted on %(time)s" msgstr "đã đăng vào %(time)s" -#: templates/blog/blog.html:31 templates/comments/list.html:104 -#: templates/comments/list.html:119 templates/contest/contest-tabs.html:35 +#: templates/blog/blog.html:31 templates/comments/content-list.html:61 +#: templates/comments/content-list.html:75 templates/comments/list.html:105 +#: templates/comments/list.html:120 templates/contest/contest-tabs.html:35 #: templates/contest/list.html:124 templates/contest/tag-title.html:9 #: templates/flatpages/admin_link.html:3 templates/license.html:10 #: templates/problem/editorial.html:15 templates/problem/feed/problems.html:50 @@ -3852,6 +3699,68 @@ msgstr "Tắt thông báo" msgid "users are online" msgstr "người đang trực tuyến" +#: templates/comments/content-list.html:13 +#: templates/comments/content-list.html:14 +#: templates/comments/content-list.html:22 +#: templates/comments/content-list.html:23 templates/comments/list.html:55 +#: templates/comments/list.html:64 +msgid "Please login to vote" +msgstr "Đăng nhập để vote" + +#: templates/comments/content-list.html:43 templates/comments/list.html:86 +#, python-format +msgid "edit %(edits)s" +msgstr "chỉnh sửa %(edits)s" + +#: templates/comments/content-list.html:45 templates/comments/list.html:88 +#: templates/comments/media-js.html:96 +msgid "edited" +msgstr "đã chỉnh sửa" + +#: templates/comments/content-list.html:54 templates/comments/list.html:97 +#: templates/notification/list.html:14 +msgid "Link" +msgstr "Link" + +#: templates/comments/content-list.html:65 +#: templates/comments/content-list.html:71 templates/comments/list.html:110 +#: templates/comments/list.html:117 +msgid "Reply" +msgstr "Phản hồi" + +#: templates/comments/content-list.html:78 templates/comments/list.html:123 +msgid "Hide" +msgstr "Ẩn" + +#: templates/comments/content-list.html:92 +#, fuzzy, python-format +#| msgid "" +#| "This comment is hidden due to too much negative feedback. Click here to view it." +msgid "" +"This comment is hidden due to too much negative feedback. Click here to view it." +msgstr "" +"Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào đây để mở." + +#: templates/comments/content-list.html:107 +msgid "replies" +msgstr "phản hồi" + +#: templates/comments/content-list.html:114 +msgid "reply" +msgstr "phản hồi" + +#: templates/comments/content-list.html:130 templates/comments/list.html:160 +msgid "comment more" +msgstr "bình luận nữa" + +#: templates/comments/content-list.html:137 templates/comments/list.html:168 +msgid "comments more" +msgstr "bình luận nữa" + #: templates/comments/list.html:6 msgid "Write comment" msgstr "Thêm bình luận" @@ -3868,45 +3777,20 @@ msgstr "Nội dung không hợp lệ." msgid "Post!" msgstr "Đăng!" -#: templates/comments/list.html:54 templates/comments/list.html:63 -msgid "Please login to vote" -msgstr "Đăng nhập để vote" - -#: templates/comments/list.html:85 -#, python-format -msgid "edit %(edits)s" -msgstr "chỉnh sửa %(edits)s" - -#: templates/comments/list.html:87 templates/comments/media-js.html:96 -msgid "edited" -msgstr "đã chỉnh sửa" - -#: templates/comments/list.html:96 templates/notification/list.html:14 -msgid "Link" -msgstr "Link" - -#: templates/comments/list.html:109 templates/comments/list.html:116 -msgid "Reply" -msgstr "Trả lời" - -#: templates/comments/list.html:122 -msgid "Hide" -msgstr "Ẩn" - -#: templates/comments/list.html:137 +#: templates/comments/list.html:138 #, python-format msgid "" -"This comment is hidden due to too much negative feedback. Click here to view it." +"This comment is hidden due to too much negative feedback. Click here to view it." msgstr "" "Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào đây để mở." -#: templates/comments/list.html:154 +#: templates/comments/list.html:177 msgid "There are no comments at the moment." msgstr "Không có bình luận nào." -#: templates/comments/list.html:159 +#: templates/comments/list.html:182 msgid "Comments are disabled on this page." msgstr "Bình luận bị tắt trong trang này." @@ -4034,8 +3918,8 @@ msgstr "G:i T, j F, Y" #: templates/contest/contest-datetime.html:39 #, python-format msgid "" -"%(time_limit)s window between %(start_time)s and " -"%(end_time)s" +"%(time_limit)s window between %(start_time)s and " +"%(end_time)s" msgstr "" "Kéo dài %(time_limit)s từ %(start_time)s đến %(end_time)s" @@ -5257,6 +5141,10 @@ msgstr "Thống kê" msgid "AC Submissions by Language" msgstr "Thống kê AC theo ngôn ngữ" +#: templates/stats/tab.html:5 +msgid "Site" +msgstr "Trang" + #: templates/status/judge-status-table.html:4 msgid "Online" msgstr "Trực tuyến" @@ -5864,6 +5752,91 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#, fuzzy +#~| msgid "short name" +#~ msgid "first name" +#~ msgstr "tên ngắn" + +#, fuzzy +#~| msgid "short name" +#~ msgid "last name" +#~ msgstr "tên ngắn" + +#~ msgid "biography" +#~ msgstr "tiểu sử" + +#~ msgid "name" +#~ msgstr "tên" + +#~ msgid "Category of Books" +#~ msgstr "Thể loại sách" + +#~ msgid "Categories of Books" +#~ msgstr "Thể loại sách" + +#~ msgid "title" +#~ msgstr "tiêu đề" + +#~ msgid "author" +#~ msgstr "tác giả" + +#~ msgid "publication date" +#~ msgstr "ngày xuất bản" + +#~ msgid "Book" +#~ msgstr "Sách" + +#~ msgid "Books" +#~ msgstr "Sách" + +#~ msgid "Category of CDs" +#~ msgstr "Thể loại CDs" + +#~ msgid "Categories of CDs" +#~ msgstr "Thể loại CDs" + +#~ msgid "Category of DVDs" +#~ msgstr "Thể loại DVDs" + +#~ msgid "Categories of DVDs" +#~ msgstr "Thể loại DVDs" + +#~ msgid "Django administration" +#~ msgstr "Quản trị viên Django" + +#, python-format +#~ msgid "" +#~ "Please enter the correct %(username)s and password for an admin account. " +#~ "Note that both fields may be case-sensitive." +#~ msgstr "" +#~ "Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản quản trị. Chú ý cả " +#~ "hai trường có phân biệt chữ Hoa-thường." + +#, python-format +#~ msgid "" +#~ "Please enter the correct %(username)s and password for an user account. " +#~ "Note that both fields may be case-sensitive." +#~ msgstr "" +#~ "Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản thành viên. Chú ý " +#~ "cả hai trường có phân biệt chữ Hoa-thường." + +#~ msgid "Dashboard" +#~ msgstr "Bảng điều khiển" + +#~ msgid "Applications" +#~ msgstr "Ứng dụng" + +#, fuzzy +#~| msgid "administrators" +#~ msgid "Administration" +#~ msgstr "người quản lý" + +#~ msgid "Color theme" +#~ msgstr "Chủ đề màu sắc" + +#~ msgid "Change color theme" +#~ msgstr "Đổi chủ đề màu sắc" + #~ msgid "commented on {time}" #~ msgstr "bình luận vào {time}" diff --git a/locale/vi/LC_MESSAGES/dmoj-user.po b/locale/vi/LC_MESSAGES/dmoj-user.po index ffd36e9..c65744d 100644 --- a/locale/vi/LC_MESSAGES/dmoj-user.po +++ b/locale/vi/LC_MESSAGES/dmoj-user.po @@ -33,9 +33,6 @@ msgstr "Đề xuất bài tập" msgid "TanKhoa" msgstr "Tân Khoa" -msgid "Name" -msgstr "Đăng ký tên" - msgid "Report" msgstr "Báo cáo" @@ -345,6 +342,9 @@ msgstr "" msgid "ltt" msgstr "" +msgid "Luyện tập" +msgstr "" + msgid "manacher" msgstr "" @@ -593,3 +593,6 @@ msgstr "" msgid "z-function" msgstr "" + +#~ msgid "Name" +#~ msgstr "Đăng ký tên" diff --git a/make_style.sh b/make_style.sh old mode 100755 new mode 100644 diff --git a/manage.py b/manage.py old mode 100755 new mode 100644 diff --git a/resources/bootstrap/bootstrap.min.css b/resources/bootstrap/bootstrap.min.css old mode 100755 new mode 100644 diff --git a/resources/comments.scss b/resources/comments.scss index 9abca9e..da828b4 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -126,6 +126,28 @@ a { margin: -50px 23px 10px -40px; padding-top: 50px; } + + .show_more_reply { + font-weight: bold; + display: flex; + margin: 16px 40px; + align-items: center; + + svg { + margin-right: 4px; + } + } + + .show_more_comment { + font-weight: bold; + display: flex; + margin: 16px -40px; + align-items: center; + + svg { + margin-right: 4px; + } + } } .no-comments-message { diff --git a/resources/fine-uploader/placeholders/not_available-generic.png b/resources/fine-uploader/placeholders/not_available-generic.png old mode 100755 new mode 100644 diff --git a/resources/fine-uploader/placeholders/waiting-generic.png b/resources/fine-uploader/placeholders/waiting-generic.png old mode 100755 new mode 100644 diff --git a/resources/fontawesome/fontawesome.css b/resources/fontawesome/fontawesome.css old mode 100755 new mode 100644 diff --git a/resources/icons/android-chrome-512x512.png b/resources/icons/android-chrome-512x512.png old mode 100755 new mode 100644 diff --git a/resources/icons/logo.png b/resources/icons/logo.png old mode 100755 new mode 100644 diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html index 0bad8e1..bbed0bc 100644 --- a/templates/actionbar/list.html +++ b/templates/actionbar/list.html @@ -29,7 +29,7 @@ {% if comment_count %} - ({{comment_count}}) + ({{ comment_count }}) {% endif %} diff --git a/templates/comments/content-list.html b/templates/comments/content-list.html new file mode 100644 index 0000000..0c3408d --- /dev/null +++ b/templates/comments/content-list.html @@ -0,0 +1,139 @@ +{% set logged_in = request.user.is_authenticated %} +{% set profile = request.profile if logged_in else None %} +{% for node in mptt_tree(comment_list) recursive %} +
  • +
    +
    +
    + {% if logged_in %} + + {% else %} + + {% endif %} +
    +
    {{ node.score }}
    + {% if logged_in %} + + {% else %} + + {% endif %} +
    +
    +
    +
    + {% with author=node.author, user=node.author.user %} + + + + {% endwith %} + {{ link_user(node.author) }},  + {{ relative_time(node.time, abs=_('{time}'), rel=_('{time}')) }} + + + {% if node.revisions > 1 %} + + ← + + {% if node.revisions > 2 %} + {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} + {% else %} + {{ _('edited') }} + {% endif %} + + + + {% else %} + + {% endif %} + + + + {% if logged_in and not comment_lock %} + {% set can_edit = node.author.id == profile.id and not profile.mute %} + {% if can_edit %} + + + + {% else %} + + + + {% endif %} + {% if perms.judge.change_comment %} + {% if can_edit %} + + {% else %} + + {% endif %} + + + {% endif %} + {% endif %} + +
    +
    + + {% if node.score <= vote_hide_threshold %}
    +

    + {% trans id=node.id %}This comment is hidden due to too much negative feedback. Click here to view it.{% endtrans %} +

    +
    + {% endif %} +
    +
    +
    + + {% if node.count_replies > 1 %} + + + + + + {{ node.count_replies }} {{ _('replies') }} + {% elif node.count_replies %} + + + + + + {{ node.count_replies }} {{ _('reply') }} + {% endif %} +
    • + +
    +{% endfor %} + + + +{% set comment_more = comment_count - offset %} +{% if comment_more == 1 %} + + + + + + {{ comment_count - offset }} {{ _('comment more') }} +{% elif comment_more > 1 %} + + + + + + {{ comment_count - offset }} {{ _('comments more') }} +{% endif %} + diff --git a/templates/comments/list.html b/templates/comments/list.html index 6adf903..9977eb5 100644 --- a/templates/comments/list.html +++ b/templates/comments/list.html @@ -36,14 +36,15 @@ {% endif %}
    {% endif %} - {% if has_comments %} -
      + {% if has_comments or comment_all_list %} +
        {% set logged_in = request.user.is_authenticated %} {% set profile = request.profile if logged_in else None %} - {% for node in mptt_tree(comment_list) recursive %} + {% if comment_all_list %} + {% for node in mptt_tree(comment_all_list) recursive %}
      • + data-max-revision="{{ node.revisions - 1 }}" + data-revision-ajax="{{ url('comment_revision_ajax', node.id) }}" class="comment">
        @@ -149,6 +150,28 @@ {% endif %} {% endwith %} {% endfor %} + {% set comment_more = comment_count - offset %} + {% if comment_more == 1 %} + + + + + + {{ comment_count - offset }} {{ _('comment more') }} + + {% elif comment_more > 1 %} + + + + + + {{ comment_count - offset }} {{ _('comments more') }} + + {% endif %} + {% else %} + {% include "comments/content-list.html" %} + {% endif %} +
      {% elif not comment_lock %}

      {{ _('There are no comments at the moment.') }}

      diff --git a/templates/comments/media-js.html b/templates/comments/media-js.html index b1131d5..131d040 100644 --- a/templates/comments/media-js.html +++ b/templates/comments/media-js.html @@ -119,6 +119,77 @@ } }); } + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + const comment_remove = urlParams.get('comment-id'); + console.log(comment_remove); + + window.comment_get_replies = function (id, parrent_none) { + var $comment_show_btn = $("#comment-" + id + " .show_more_reply"); + $comment_show_btn.hide(); + var $comment = $("#comment-" + id + "-children"); + $comment.append("

      Loading...

      "); + ajax_get_reply('{{ url('comment_get_replies') }}', id, parrent_none); + } + + function ajax_get_reply(url, id, parrent_none) { + return $.ajax({ + url: url, + type: 'GET', + data: { + id: id, + parrent_none: parrent_none, + }, + success: function(data) { + var $comment_loading = $("#comment-" + id + "-children .loading"); + $comment_loading.hide(); + var $comment = $("#comment-" + id + "-children"); + $comment.append(data); + } + }) + } + + window.comment_show_more = function (id, parrent_none, offset, comment_remove) { + console.log(parrent_none) + if (parrent_none == 1) { + var $comment_show_btn = $("#comment-0" + " .show_more_comment"); + $comment_show_btn.hide(); + var $comment = $("#comment-0"); + $comment.append("

      Loading...

      "); + } else { + var $comment_show_btn = $("#comment-" + id + "-children" + " .show_more_comment"); + $comment_show_btn.hide(); + var $comment = $("#comment-" + id + "-children"); + $comment.append("

      Loading...

      "); + } + ajax_comment_show_more('{{ url('comment_show_more') }}', id, parrent_none, offset, comment_remove); + } + + function ajax_comment_show_more(url, id, parrent_none, offset, comment_remove) { + return $.ajax({ + url: url, + type: 'GET', + data: { + id: id, + parrent_none: parrent_none, + offset: offset, + comment_remove: comment_remove, + }, + success: function(data) { + if (parrent_none == 1) { + var $comment_loading = $("#comment-0" + " .loading"); + $comment_loading.hide(); + var $comment = $("#comment-0"); + $comment.append(data); + } else { + var $comment_loading = $("#comment-" + id + "-children .loading"); + $comment_loading.hide(); + var $comment = $("#comment-" + id + "-children"); + $comment.append(data); + } + } + }) + } var get_$votes = function (id) { var $comment = $('#comment-' + id); From b5816bbcd67425999b39cce7ddfc996b80522009 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 22 May 2023 20:52:55 +0700 Subject: [PATCH 103/478] Change make_style.sh to 755 --- make_style.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 make_style.sh diff --git a/make_style.sh b/make_style.sh old mode 100644 new mode 100755 From 57ded6ff5ecf99951f024e171ad44f433d51138a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 22 May 2023 23:11:40 +0700 Subject: [PATCH 104/478] Fix some bugs for new comment --- judge/comments.py | 87 +++++----- judge/views/comment.py | 48 +++--- locale/vi/LC_MESSAGES/django.po | 127 +++++++-------- locale/vi/LC_MESSAGES/dmoj-user.po | 9 +- resources/comments.scss | 4 + templates/comments/content-list.html | 234 +++++++++++++-------------- templates/comments/list.html | 135 +--------------- templates/comments/media-js.html | 26 ++- 8 files changed, 267 insertions(+), 403 deletions(-) diff --git a/judge/comments.py b/judge/comments.py index 2a2f515..5a38380 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -28,6 +28,9 @@ from judge.widgets import HeavyPreviewPageDownWidget from judge.jinja2.reference import get_user_from_text +DEFAULT_OFFSET = 10 + + def add_mention_notifications(comment): user_referred = get_user_from_text(comment.body).exclude(id=comment.author.id) for user in user_referred: @@ -152,92 +155,90 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): return self.render_to_response(context) def get(self, request, *args, **kwargs): - pre_query = None + target_comment = None if "comment-id" in request.GET: comment_id = int(request.GET["comment-id"]) try: - comment_obj = Comment.objects.get(pk=comment_id) + comment_obj = Comment.objects.get(id=comment_id) except Comment.DoesNotExist: raise Http404 - pre_query = comment_obj - while comment_obj is not None: - pre_query = comment_obj - comment_obj = comment_obj.parent + target_comment = comment_obj.get_root() self.object = self.get_object() return self.render_to_response( self.get_context_data( object=self.object, - pre_query=pre_query, + target_comment=target_comment, comment_form=CommentForm(request, initial={"parent": None}), ) ) - def get_context_data(self, pre_query=None, **kwargs): - context = super(CommentedDetailView, self).get_context_data(**kwargs) - queryset = self.object.comments - queryset = queryset.filter(parent=None, hidden=False) - queryset_all = None - comment_count = len(queryset) - context["comment_remove"] = -1 - if (pre_query != None): - comment_remove = pre_query.id - queryset_all = pre_query.get_descendants(include_self=True) - queryset_all = ( - queryset_all.select_related("author__user") + def _get_queryset(self, target_comment): + if target_comment != None: + queryset = target_comment.get_descendants(include_self=True) + queryset = ( + queryset.select_related("author__user") .filter(hidden=False) .defer("author__about") - .annotate(revisions=Count("versions", distinct=True)) + .annotate( + revisions=Count("versions", distinct=True) + ) ) - context["comment_remove"] = comment_remove else: + queryset = self.object.comments + queryset = queryset.filter(parent=None, hidden=False) queryset = ( queryset.select_related("author__user") .defer("author__about") .filter(hidden=False) .annotate( - count_replies=Count("replies", distinct=True), + count_replies=Count("replies", distinct=True), revisions=Count("versions", distinct=True), - )[:10] + )[:DEFAULT_OFFSET] ) - + if self.request.user.is_authenticated: profile = self.request.profile - if (pre_query != None): - queryset_all = queryset_all.annotate( - my_vote=FilteredRelation( - "votes", condition=Q(votes__voter_id=profile.id) - ), - ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) - else: - queryset = queryset.annotate( - my_vote=FilteredRelation( - "votes", condition=Q(votes__voter_id=profile.id) - ), - ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + queryset = queryset.annotate( + my_vote=FilteredRelation( + "votes", condition=Q(votes__voter_id=profile.id) + ), + ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + return queryset + + def get_context_data(self, target_comment=None, **kwargs): + context = super(CommentedDetailView, self).get_context_data(**kwargs) + queryset = self._get_queryset(target_comment) + comment_count = self.object.comments.filter(parent=None, hidden=False).count() + context["target_comment"] = -1 + if (target_comment != None): + context["target_comment"] = target_comment.id + + if self.request.user.is_authenticated: context["is_new_user"] = ( not self.request.user.is_staff and not profile.submission_set.filter( points=F("problem__points") ).exists() ) - + context["has_comments"] = queryset.exists() context["comment_lock"] = self.is_comment_locked() context["comment_list"] = queryset - context["comment_all_list"] = queryset_all context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD if queryset.exists(): context["comment_root_id"] = queryset[0].id else: context["comment_root_id"] = 0 - context["comment_parrent_none"] = 1 - if (pre_query != None): - context["offset"] = 1 + context["comment_parent_none"] = 1 + if target_comment != None: + context["offset"] = 0 + context["comment_more"] = comment_count - 1 else: - context["offset"] = 10 + context["offset"] = DEFAULT_OFFSET + context["comment_more"] = comment_count - DEFAULT_OFFSET - context["limit"] = 10 + context["limit"] = DEFAULT_OFFSET context["comment_count"] = comment_count return context diff --git a/judge/views/comment.py b/judge/views/comment.py index abacb52..3c88923 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -110,46 +110,52 @@ def vote_comment(request, delta): def upvote_comment(request): return vote_comment(request, 1) + def downvote_comment(request): return vote_comment(request, -1) + def get_comments(request, limit=10): try: comment_id = int(request.GET["id"]) - parrent_none = int(request.GET["parrent_none"]) + parent_none = int(request.GET["parent_none"]) except ValueError: return HttpResponseBadRequest() else: if comment_id and not Comment.objects.filter(id=comment_id).exists(): raise Http404() + offset = 0 if "offset" in request.GET: offset = int(request.GET["offset"]) - comment_remove = -1 - if "comment_remove" in request.GET: - comment_remove = int(request.GET["comment_remove"]) + + target_comment = -1 + if "target_comment" in request.GET: + target_comment = int(request.GET["target_comment"]) + comment_root_id = 0 - if (comment_id): + + if comment_id: comment_obj = Comment.objects.get(pk=comment_id) comment_root_id = comment_obj.id else: comment_obj = None + queryset = comment_obj.linked_object.comments - if parrent_none: + if parent_none: queryset = queryset.filter(parent=None, hidden=False) - if (comment_remove != -1): - queryset.get(pk=comment_remove).delete() + queryset = queryset.exclude(pk=target_comment) else: queryset = queryset.filter(parent=comment_obj, hidden=False) comment_count = len(queryset) queryset = ( - queryset.select_related("author__user") - .defer("author__about") - .annotate( - count_replies=Count("replies", distinct=True), - revisions=Count("versions", distinct=True), - )[offset:offset+limit] - ) + queryset.select_related("author__user") + .defer("author__about") + .annotate( + count_replies=Count("replies", distinct=True), + revisions=Count("versions", distinct=True), + )[offset:offset+limit] + ) if request.user.is_authenticated: profile = request.profile queryset = queryset.annotate( @@ -158,6 +164,8 @@ def get_comments(request, limit=10): ), ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) + new_offset = offset + min(len(queryset), limit) + comment_html = loader.render_to_string( "comments/content-list.html", { @@ -166,22 +174,26 @@ def get_comments(request, limit=10): "comment_list": queryset, "vote_hide_threshold" : settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD, "perms": PermWrapper(request.user), - "offset": offset + min(len(queryset), limit), + "offset": new_offset, "limit": limit, "comment_count": comment_count, - "comment_parrent_none": parrent_none, - "comment_remove": comment_remove, + "comment_parent_none": parent_none, + "target_comment": target_comment, + "comment_more": comment_count - new_offset } ) return HttpResponse(comment_html) + def get_show_more(request): return get_comments(request) + def get_replies(request): return get_comments(request) + class CommentMixin(object): model = Comment pk_url_kwarg = "id" diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 268b457..b4bcfb1 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: 2023-05-16 16:17+0700\n" +"POT-Creation-Date: 2023-05-22 23:06+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -41,19 +41,19 @@ msgstr "xem lần cuối" msgid "LQDOJ Chat" msgstr "" -#: dmoj/settings.py:365 +#: dmoj/settings.py:363 msgid "Vietnamese" msgstr "Tiếng Việt" -#: dmoj/settings.py:366 +#: dmoj/settings.py:364 msgid "English" msgstr "" -#: dmoj/urls.py:136 +#: dmoj/urls.py:135 msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:214 templates/base.html:209 +#: dmoj/urls.py:212 templates/base.html:209 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -426,20 +426,20 @@ msgstr "Dạng" msgid "Online Judge" msgstr "" -#: judge/comments.py:61 +#: judge/comments.py:64 msgid "Comment body" msgstr "Nội dung bình luận" -#: judge/comments.py:67 judge/views/ticket.py:78 +#: judge/comments.py:70 judge/views/ticket.py:78 msgid "Your part is silent, little toad." msgstr "Bạn không được phép bình luận." -#: judge/comments.py:76 templates/comments/list.html:17 +#: judge/comments.py:79 templates/comments/list.html:17 msgid "" "You need to have solved at least one problem before your voice can be heard." msgstr "Bạn phải giải ít nhất một bài trước khi được phép bình luận." -#: judge/comments.py:125 +#: judge/comments.py:128 msgid "Posted comment" msgstr "Bình luận đã đăng" @@ -533,7 +533,7 @@ msgid "N j, Y, g:i a" msgstr "g:i a j b, Y" #: judge/jinja2/datetime.py:26 templates/chat/message.html:13 -#: templates/comments/content-list.html:35 templates/comments/list.html:77 +#: templates/comments/content-list.html:36 #, python-brace-format msgid "{time}" msgstr "{time}" @@ -2514,11 +2514,11 @@ msgstr "Tính lại điểm kỳ thi" msgid "Running MOSS" msgstr "Đang chạy MOSS" -#: judge/tasks/submission.py:47 +#: judge/tasks/submission.py:49 msgid "Modifying submissions" msgstr "Chỉnh sửa bài nộp" -#: judge/tasks/submission.py:67 +#: judge/tasks/submission.py:69 msgid "Recalculating user points" msgstr "Tính lại điểm người dùng" @@ -2658,12 +2658,12 @@ 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:243 judge/views/organization.py:817 +#: judge/views/comment.py:255 judge/views/organization.py:817 #: judge/views/organization.py:963 judge/views/organization.py:1128 msgid "Edited from site" msgstr "Chỉnh sửa từ web" -#: judge/views/comment.py:264 +#: judge/views/comment.py:276 msgid "Editing comment" msgstr "Chỉnh sửa bình luận" @@ -3288,8 +3288,8 @@ msgstr "Phải qua một kỳ thi" #: judge/views/submission.py:903 #, python-brace-format msgid "" -"{0}'s submissions for {2} in {4}" +"{0}'s submissions for {2} in {4}" msgstr "" "Các bài nộp của {0} cho {2} trong {4}" @@ -3502,7 +3502,7 @@ msgid "Profile" msgstr "Trang cá nhân" #: templates/base.html:276 templates/chat/chat.html:21 -#: templates/comments/content-list.html:80 templates/comments/list.html:126 +#: templates/comments/content-list.html:81 #: templates/contest/contest-list-tabs.html:4 #: templates/contest/ranking-table.html:47 templates/internal/problem.html:57 #: templates/organization/org-left-sidebar.html:12 @@ -3559,12 +3559,12 @@ msgstr "" msgid " posted on %(time)s" msgstr "đã đăng vào %(time)s" -#: templates/blog/blog.html:31 templates/comments/content-list.html:61 -#: templates/comments/content-list.html:75 templates/comments/list.html:105 -#: templates/comments/list.html:120 templates/contest/contest-tabs.html:35 -#: templates/contest/list.html:124 templates/contest/tag-title.html:9 -#: templates/flatpages/admin_link.html:3 templates/license.html:10 -#: templates/problem/editorial.html:15 templates/problem/feed/problems.html:50 +#: templates/blog/blog.html:31 templates/comments/content-list.html:62 +#: templates/comments/content-list.html:76 +#: templates/contest/contest-tabs.html:35 templates/contest/list.html:124 +#: templates/contest/tag-title.html:9 templates/flatpages/admin_link.html:3 +#: templates/license.html:10 templates/problem/editorial.html:15 +#: templates/problem/feed/problems.html:50 msgid "Edit" msgstr "Chỉnh sửa" @@ -3699,66 +3699,54 @@ msgstr "Tắt thông báo" msgid "users are online" msgstr "người đang trực tuyến" -#: templates/comments/content-list.html:13 #: templates/comments/content-list.html:14 -#: templates/comments/content-list.html:22 -#: templates/comments/content-list.html:23 templates/comments/list.html:55 -#: templates/comments/list.html:64 +#: templates/comments/content-list.html:15 +#: templates/comments/content-list.html:23 +#: templates/comments/content-list.html:24 msgid "Please login to vote" msgstr "Đăng nhập để vote" -#: templates/comments/content-list.html:43 templates/comments/list.html:86 +#: templates/comments/content-list.html:44 #, python-format msgid "edit %(edits)s" msgstr "chỉnh sửa %(edits)s" -#: templates/comments/content-list.html:45 templates/comments/list.html:88 -#: templates/comments/media-js.html:96 +#: templates/comments/content-list.html:46 templates/comments/media-js.html:96 msgid "edited" msgstr "đã chỉnh sửa" -#: templates/comments/content-list.html:54 templates/comments/list.html:97 -#: templates/notification/list.html:14 +#: templates/comments/content-list.html:55 templates/notification/list.html:14 msgid "Link" msgstr "Link" -#: templates/comments/content-list.html:65 -#: templates/comments/content-list.html:71 templates/comments/list.html:110 -#: templates/comments/list.html:117 +#: templates/comments/content-list.html:66 +#: templates/comments/content-list.html:72 msgid "Reply" msgstr "Phản hồi" -#: templates/comments/content-list.html:78 templates/comments/list.html:123 +#: templates/comments/content-list.html:79 msgid "Hide" msgstr "Ẩn" -#: templates/comments/content-list.html:92 +#: templates/comments/content-list.html:94 #, fuzzy, python-format #| msgid "" -#| "This comment is hidden due to too much negative feedback. Click here to view it." +#| "This comment is hidden due to too much negative feedback. Click here to view it." msgid "" "This comment is hidden due to too much negative feedback. Click here to view it." +" href=\"javascript:comment_show_content(%(id)s)\">here to " +"view it." msgstr "" "Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào đây để mở." -#: templates/comments/content-list.html:107 +#: templates/comments/content-list.html:109 msgid "replies" msgstr "phản hồi" -#: templates/comments/content-list.html:114 -msgid "reply" -msgstr "phản hồi" - -#: templates/comments/content-list.html:130 templates/comments/list.html:160 -msgid "comment more" -msgstr "bình luận nữa" - -#: templates/comments/content-list.html:137 templates/comments/list.html:168 -msgid "comments more" +#: templates/comments/content-list.html:129 +msgid "more comments" msgstr "bình luận nữa" #: templates/comments/list.html:6 @@ -3777,20 +3765,11 @@ msgstr "Nội dung không hợp lệ." msgid "Post!" msgstr "Đăng!" -#: templates/comments/list.html:138 -#, python-format -msgid "" -"This comment is hidden due to too much negative feedback. Click here to view it." -msgstr "" -"Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào đây để mở." - -#: templates/comments/list.html:177 +#: templates/comments/list.html:44 msgid "There are no comments at the moment." msgstr "Không có bình luận nào." -#: templates/comments/list.html:182 +#: templates/comments/list.html:49 msgid "Comments are disabled on this page." msgstr "Bình luận bị tắt trong trang này." @@ -3918,8 +3897,8 @@ msgstr "G:i T, j F, Y" #: templates/contest/contest-datetime.html:39 #, python-format msgid "" -"%(time_limit)s window between %(start_time)s and " -"%(end_time)s" +"%(time_limit)s window between %(start_time)s and " +"%(end_time)s" msgstr "" "Kéo dài %(time_limit)s từ %(start_time)s đến %(end_time)s" @@ -5752,6 +5731,22 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "reply" +#~ msgstr "phản hồi" + +#~ msgid "comment more" +#~ msgstr "bình luận nữa" + +#~ msgid "comments more" +#~ msgstr "bình luận nữa" + +#~ msgid "" +#~ "This comment is hidden due to too much negative feedback. Click here to view it." +#~ msgstr "" +#~ "Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào đây để mở." + #, fuzzy #~| msgid "short name" #~ msgid "first name" @@ -5804,7 +5799,6 @@ msgstr "Chọn tất cả" #~ msgid "Django administration" #~ msgstr "Quản trị viên Django" -#, python-format #~ msgid "" #~ "Please enter the correct %(username)s and password for an admin account. " #~ "Note that both fields may be case-sensitive." @@ -5812,7 +5806,6 @@ msgstr "Chọn tất cả" #~ "Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản quản trị. Chú ý cả " #~ "hai trường có phân biệt chữ Hoa-thường." -#, python-format #~ msgid "" #~ "Please enter the correct %(username)s and password for an user account. " #~ "Note that both fields may be case-sensitive." diff --git a/locale/vi/LC_MESSAGES/dmoj-user.po b/locale/vi/LC_MESSAGES/dmoj-user.po index c65744d..ffd36e9 100644 --- a/locale/vi/LC_MESSAGES/dmoj-user.po +++ b/locale/vi/LC_MESSAGES/dmoj-user.po @@ -33,6 +33,9 @@ msgstr "Đề xuất bài tập" msgid "TanKhoa" msgstr "Tân Khoa" +msgid "Name" +msgstr "Đăng ký tên" + msgid "Report" msgstr "Báo cáo" @@ -342,9 +345,6 @@ msgstr "" msgid "ltt" msgstr "" -msgid "Luyện tập" -msgstr "" - msgid "manacher" msgstr "" @@ -593,6 +593,3 @@ msgstr "" msgid "z-function" msgstr "" - -#~ msgid "Name" -#~ msgstr "Đăng ký tên" diff --git a/resources/comments.scss b/resources/comments.scss index da828b4..c606f26 100644 --- a/resources/comments.scss +++ b/resources/comments.scss @@ -306,6 +306,10 @@ a { } } +.show_more_comment { + margin-left: -20px; +} + @media (max-width: 799px) { .hide_texts_on_mobile .actionbar-text { display: none; diff --git a/templates/comments/content-list.html b/templates/comments/content-list.html index 0c3408d..863839f 100644 --- a/templates/comments/content-list.html +++ b/templates/comments/content-list.html @@ -1,139 +1,131 @@ {% set logged_in = request.user.is_authenticated %} {% set profile = request.profile if logged_in else None %} + {% for node in mptt_tree(comment_list) recursive %}
    • -
      -
      -
      - {% if logged_in %} - + data-revision-ajax="{{ url('comment_revision_ajax', node.id) }}" class="comment"> +
      +
      +
      + {% if logged_in %} + + {% else %} + + {% endif %} +
      +
      {{ node.score }}
      + {% if logged_in %} + + {% else %} + + {% endif %} +
      +
      +
      +
      + {% with author=node.author, user=node.author.user %} + + + + {% endwith %} + {{ link_user(node.author) }},  + {{ relative_time(node.time, abs=_('{time}'), rel=_('{time}')) }} + + + {% if node.revisions > 1 %} + + ← + + {% if node.revisions > 2 %} + {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} {% else %} - + {{ _('edited') }} {% endif %} -
      -
      {{ node.score }}
      - {% if logged_in %} - - {% else %} - - {% endif %} -
      -
      -
      -
      - {% with author=node.author, user=node.author.user %} - - - - {% endwith %} - {{ link_user(node.author) }},  - {{ relative_time(node.time, abs=_('{time}'), rel=_('{time}')) }} - - - {% if node.revisions > 1 %} - - ← - - {% if node.revisions > 2 %} - {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} - {% else %} - {{ _('edited') }} - {% endif %} - - - - {% else %} - - {% endif %} - - - - {% if logged_in and not comment_lock %} - {% set can_edit = node.author.id == profile.id and not profile.mute %} - {% if can_edit %} - - - - {% else %} - - - - {% endif %} - {% if perms.judge.change_comment %} - {% if can_edit %} - - {% else %} - - {% endif %} - - - {% endif %} - {% endif %} - -
      -
      - - {% if node.score <= vote_hide_threshold %}
      -

      - {% trans id=node.id %}This comment is hidden due to too much negative feedback. Click here to view it.{% endtrans %} -

      -
      + + + + {% else %} + {% endif %} + + + + {% if logged_in and not comment_lock %} + {% set can_edit = node.author.id == profile.id and not profile.mute %} + {% if can_edit %} + + + + {% else %} + + + + {% endif %} + {% if perms.judge.change_comment %} + {% if can_edit %} + + {% else %} + + {% endif %} + + + {% endif %} + {% endif %} + +
      +
      + + {% if node.score <= vote_hide_threshold %} +
      +

      + {% trans id=node.id %}This comment is hidden due to too much negative feedback. Click here to view it.{% endtrans %} +

      +
      + {% endif %} +
      -
      +
      - {% if node.count_replies > 1 %} + {% if node.count_replies %} - - - - - {{ node.count_replies }} {{ _('replies') }} - {% elif node.count_replies %} - - - - - - {{ node.count_replies }} {{ _('reply') }} - {% endif %} + + + + + {{ node.count_replies }} {{ _('replies') if node.count_replies > 1 else _('reply') }} + + {% endif %}
      • -
      + {% with children=node.get_children() %} + {% if children %} +
        {{ loop(children) }}
      + {% else %} +
        + {% endif %} + {% endwith %} {% endfor %} - - -{% set comment_more = comment_count - offset %} -{% if comment_more == 1 %} - +{% if comment_more > 0 %} + - - + + - {{ comment_count - offset }} {{ _('comment more') }} -{% elif comment_more > 1 %} - - - - - - {{ comment_count - offset }} {{ _('comments more') }} + {{ comment_more }} {{ _('more comments') if comment_more > 1 else _('more comment') }} + {% endif %} - diff --git a/templates/comments/list.html b/templates/comments/list.html index 9977eb5..d561210 100644 --- a/templates/comments/list.html +++ b/templates/comments/list.html @@ -36,142 +36,9 @@ {% endif %}
      {% endif %} - {% if has_comments or comment_all_list %} + {% if has_comments %}
        - {% set logged_in = request.user.is_authenticated %} - {% set profile = request.profile if logged_in else None %} - {% if comment_all_list %} - {% for node in mptt_tree(comment_all_list) recursive %} -
      • -
        -
        -
        - {% if logged_in %} - - {% else %} - - {% endif %} -
        -
        {{ node.score }}
        - {% if logged_in %} - - {% else %} - - {% endif %} -
        -
        -
        -
        - {% with author=node.author, user=node.author.user %} - - - - {% endwith %} - {{ link_user(node.author) }},  - {{ relative_time(node.time, abs=_('{time}'), rel=_('{time}')) }} - - - {% if node.revisions > 1 %} - - ← - - {% if node.revisions > 2 %} - {% trans edits=node.revisions - 1 %}edit {{ edits }}{% endtrans %} - {% else %} - {{ _('edited') }} - {% endif %} - - - - {% else %} - - {% endif %} - - - - {% if logged_in and not comment_lock %} - {% set can_edit = node.author.id == profile.id and not profile.mute %} - {% if can_edit %} - - - - {% else %} - - - - {% endif %} - {% if perms.judge.change_comment %} - {% if can_edit %} - - {% else %} - - {% endif %} - - - {% endif %} - {% endif %} - -
        -
        - - {% if node.score <= vote_hide_threshold %} -
        -

        - {% trans id=node.id %}This comment is hidden due to too much negative feedback. Click here to view it.{% endtrans %} -

        -
        - {% endif %} -
        -
        -
        -
        • - - {% with children=node.get_children() %} - {% if children %} -
          {{ loop(children) }}
        - {% endif %} - {% endwith %} - {% endfor %} - {% set comment_more = comment_count - offset %} - {% if comment_more == 1 %} - - - - - - {{ comment_count - offset }} {{ _('comment more') }} - - {% elif comment_more > 1 %} - - - - - - {{ comment_count - offset }} {{ _('comments more') }} - - {% endif %} - {% else %} {% include "comments/content-list.html" %} - {% endif %} -
      {% elif not comment_lock %}

      {{ _('There are no comments at the moment.') }}

      diff --git a/templates/comments/media-js.html b/templates/comments/media-js.html index 131d040..31a7862 100644 --- a/templates/comments/media-js.html +++ b/templates/comments/media-js.html @@ -121,24 +121,23 @@ } const queryString = window.location.search; const urlParams = new URLSearchParams(queryString); - const comment_remove = urlParams.get('comment-id'); - console.log(comment_remove); + const target_comment = urlParams.get('comment-id'); - window.comment_get_replies = function (id, parrent_none) { + window.comment_get_replies = function (id, parent_none) { var $comment_show_btn = $("#comment-" + id + " .show_more_reply"); $comment_show_btn.hide(); var $comment = $("#comment-" + id + "-children"); $comment.append("

      Loading...

      "); - ajax_get_reply('{{ url('comment_get_replies') }}', id, parrent_none); + ajax_get_reply('{{ url('comment_get_replies') }}', id, parent_none); } - function ajax_get_reply(url, id, parrent_none) { + function ajax_get_reply(url, id, parent_none) { return $.ajax({ url: url, type: 'GET', data: { id: id, - parrent_none: parrent_none, + parent_none: parent_none, }, success: function(data) { var $comment_loading = $("#comment-" + id + "-children .loading"); @@ -149,9 +148,8 @@ }) } - window.comment_show_more = function (id, parrent_none, offset, comment_remove) { - console.log(parrent_none) - if (parrent_none == 1) { + window.comment_show_more = function (id, parent_none, offset, target_comment) { + if (parent_none == 1) { var $comment_show_btn = $("#comment-0" + " .show_more_comment"); $comment_show_btn.hide(); var $comment = $("#comment-0"); @@ -162,21 +160,21 @@ var $comment = $("#comment-" + id + "-children"); $comment.append("

      Loading...

      "); } - ajax_comment_show_more('{{ url('comment_show_more') }}', id, parrent_none, offset, comment_remove); + ajax_comment_show_more('{{ url('comment_show_more') }}', id, parent_none, offset, target_comment); } - function ajax_comment_show_more(url, id, parrent_none, offset, comment_remove) { + function ajax_comment_show_more(url, id, parent_none, offset, target_comment) { return $.ajax({ url: url, type: 'GET', data: { id: id, - parrent_none: parrent_none, + parent_none: parent_none, offset: offset, - comment_remove: comment_remove, + target_comment: target_comment, }, success: function(data) { - if (parrent_none == 1) { + if (parent_none == 1) { var $comment_loading = $("#comment-0" + " .loading"); $comment_loading.hide(); var $comment = $("#comment-0"); From 1cbd4dee49add0c675e15ba717f81d902ae8e648 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 22 May 2023 23:27:04 +0700 Subject: [PATCH 105/478] Fix bug --- judge/comments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/comments.py b/judge/comments.py index 5a38380..88f65e6 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -217,7 +217,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): if self.request.user.is_authenticated: context["is_new_user"] = ( not self.request.user.is_staff - and not profile.submission_set.filter( + and not self.request.profile.submission_set.filter( points=F("problem__points") ).exists() ) From f65238ba420149972a062d759f7fb9496ca8fee7 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 24 May 2023 18:36:15 +0700 Subject: [PATCH 106/478] Remove sleep --- judge/tasks/submission.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/judge/tasks/submission.py b/judge/tasks/submission.py index 1c39b1c..aa474f8 100644 --- a/judge/tasks/submission.py +++ b/judge/tasks/submission.py @@ -1,7 +1,6 @@ from celery import shared_task from django.core.cache import cache from django.utils.translation import gettext as _ -from time import sleep from judge.models import Problem, Profile, Submission from judge.utils.celery import Progress @@ -35,7 +34,6 @@ def rejudge_problem_filter( for submission in queryset.iterator(): submission.judge(rejudge=True, batch_rejudge=True) rejudged += 1 - sleep(0.1) if rejudged % 10 == 0: p.done = rejudged return rejudged From fbd1d865faad69118fa3e23646352eb8740ced95 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 27 May 2023 08:33:19 +0700 Subject: [PATCH 107/478] Try optimizing batch rejudge --- judge/judgeapi.py | 5 +++-- judge/tasks/submission.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/judge/judgeapi.py b/judge/judgeapi.py index 96a2153..dd02898 100644 --- a/judge/judgeapi.py +++ b/judge/judgeapi.py @@ -56,7 +56,7 @@ def judge_request(packet, reply=True): return result -def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=None): +def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=None, delete_testcases=True): from .models import ContestSubmission, Submission, SubmissionTestCase CONTEST_SUBMISSION_PRIORITY = 0 @@ -101,7 +101,8 @@ def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=No ): return False - SubmissionTestCase.objects.filter(submission_id=submission.id).delete() + if delete_testcases: + SubmissionTestCase.objects.filter(submission_id=submission.id).delete() try: response = judge_request( diff --git a/judge/tasks/submission.py b/judge/tasks/submission.py index aa474f8..3cc32ad 100644 --- a/judge/tasks/submission.py +++ b/judge/tasks/submission.py @@ -2,7 +2,7 @@ from celery import shared_task from django.core.cache import cache from django.utils.translation import gettext as _ -from judge.models import Problem, Profile, Submission +from judge.models import Problem, Profile, Submission, SubmissionTestCase from judge.utils.celery import Progress __all__ = ("apply_submission_filter", "rejudge_problem_filter", "rescore_problem") @@ -30,9 +30,15 @@ def rejudge_problem_filter( queryset = apply_submission_filter(queryset, id_range, languages, results, contest) rejudged = 0 - with Progress(self, queryset.count()) as p: + with Progress(self, queryset.count() * 2) as p: + for submission in queryset: + SubmissionTestCase.objects.filter(submission_id=submission.id).delete() + rejudged += 1 + if rejudged % 10 == 0: + p.done = rejudged + for submission in queryset.iterator(): - submission.judge(rejudge=True, batch_rejudge=True) + submission.judge(rejudge=True, batch_rejudge=True, delete_testcases=False) rejudged += 1 if rejudged % 10 == 0: p.done = rejudged From 2291d6bbb8f6c081b7b8b34fe3dbeb1a5be92466 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 27 May 2023 09:00:42 +0700 Subject: [PATCH 108/478] Revert "Try optimizing batch rejudge" This reverts commit fbd1d865faad69118fa3e23646352eb8740ced95. --- judge/judgeapi.py | 5 ++--- judge/tasks/submission.py | 12 +++--------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/judge/judgeapi.py b/judge/judgeapi.py index dd02898..96a2153 100644 --- a/judge/judgeapi.py +++ b/judge/judgeapi.py @@ -56,7 +56,7 @@ def judge_request(packet, reply=True): return result -def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=None, delete_testcases=True): +def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=None): from .models import ContestSubmission, Submission, SubmissionTestCase CONTEST_SUBMISSION_PRIORITY = 0 @@ -101,8 +101,7 @@ def judge_submission(submission, rejudge=False, batch_rejudge=False, judge_id=No ): return False - if delete_testcases: - SubmissionTestCase.objects.filter(submission_id=submission.id).delete() + SubmissionTestCase.objects.filter(submission_id=submission.id).delete() try: response = judge_request( diff --git a/judge/tasks/submission.py b/judge/tasks/submission.py index 3cc32ad..aa474f8 100644 --- a/judge/tasks/submission.py +++ b/judge/tasks/submission.py @@ -2,7 +2,7 @@ from celery import shared_task from django.core.cache import cache from django.utils.translation import gettext as _ -from judge.models import Problem, Profile, Submission, SubmissionTestCase +from judge.models import Problem, Profile, Submission from judge.utils.celery import Progress __all__ = ("apply_submission_filter", "rejudge_problem_filter", "rescore_problem") @@ -30,15 +30,9 @@ def rejudge_problem_filter( queryset = apply_submission_filter(queryset, id_range, languages, results, contest) rejudged = 0 - with Progress(self, queryset.count() * 2) as p: - for submission in queryset: - SubmissionTestCase.objects.filter(submission_id=submission.id).delete() - rejudged += 1 - if rejudged % 10 == 0: - p.done = rejudged - + with Progress(self, queryset.count()) as p: for submission in queryset.iterator(): - submission.judge(rejudge=True, batch_rejudge=True, delete_testcases=False) + submission.judge(rejudge=True, batch_rejudge=True) rejudged += 1 if rejudged % 10 == 0: p.done = rejudged From 90700369788a797806cc22c5d795265f8816a1d2 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 27 May 2023 11:06:40 +0700 Subject: [PATCH 109/478] Fix actionbar style --- templates/actionbar/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html index bbed0bc..6b8e1d6 100644 --- a/templates/actionbar/list.html +++ b/templates/actionbar/list.html @@ -43,7 +43,7 @@ {{_("Bookmark")}} - + From 8cfc58ad91d1efd1ac42ce4c0dbd2f81030b39b8 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 31 May 2023 16:04:47 +0700 Subject: [PATCH 110/478] Fix show types bug for problem feed --- judge/views/problem.py | 1 + 1 file changed, 1 insertion(+) diff --git a/judge/views/problem.py b/judge/views/problem.py index 7fec6fb..5697bd3 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -946,6 +946,7 @@ class ProblemFeed(ProblemList, FeedView): return { "completed_problem_ids": self.get_completed_problems(), "attempted_problems": self.get_attempted_problems(), + "show_types": self.show_types, } def get_context_data(self, **kwargs): From a02814621e5a42c3a6c9f0abcb173c16ff96eb3f Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 2 Jun 2023 12:45:30 +0700 Subject: [PATCH 111/478] Fix chat input --- resources/chatbox.scss | 2 +- templates/chat/chat.html | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/chatbox.scss b/resources/chatbox.scss index ae2be84..c433ce1 100644 --- a/resources/chatbox.scss +++ b/resources/chatbox.scss @@ -63,7 +63,7 @@ #chat-input { width: 100%; - padding: 0.4em 4em 0.6em 1.2em; + padding: 0.4em 4em 1em 1.2em; border: 0; color: black; border-top-left-radius: 0; diff --git a/templates/chat/chat.html b/templates/chat/chat.html index 4993436..beb38b4 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -560,6 +560,10 @@ return !in_user_redirect; }); + $("#chat-input").on("keyup", function() { + $("#chat-input").scrollTop($("#chat-input")[0].scrollHeight); + }); + // https://stackoverflow.com/questions/42121565/detecting-class-change-without-setinterval if (typeof(MutationObserver) !== undefined) { var observer = new MutationObserver(function (event) { From 15950634633e9bdda458ce702b6645bee1d828d5 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 6 Jul 2023 22:37:43 +0700 Subject: [PATCH 112/478] Fix organization submissions --- judge/views/organization.py | 4 ++-- judge/views/submission.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index 05524b8..d83d2bb 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -441,7 +441,7 @@ class OrganizationSubmissions( LoginRequiredMixin, MemberOrganizationMixin, SubmissionsListBase ): template_name = "organization/submissions.html" - + @cached_property def in_contest(self): return False @@ -453,7 +453,7 @@ class OrganizationSubmissions( def get_queryset(self): return ( super() - ._get_entire_queryset() + .get_queryset() .filter(contest_object__organizations=self.organization) ) diff --git a/judge/views/submission.py b/judge/views/submission.py index a846327..a7f3eb0 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -322,6 +322,7 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): context_object_name = "submissions" first_page_href = None include_frozen = False + organization = None def get_result_data(self): result = self._get_result_data() @@ -348,7 +349,11 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): return self.request.profile.current_contest.contest def _get_entire_queryset(self): - queryset = Submission.objects.all() + organization = self.organization or self.request.organization + if organization: + queryset = Submission.objects.filter(contest_object__organizations=organization) + else: + queryset = Submission.objects.all() use_straight_join(queryset) queryset = submission_related(queryset.order_by("-id")) if self.show_problem: @@ -412,10 +417,6 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): def get_queryset(self): queryset = self._get_entire_queryset() if not self.in_contest: - if self.request.organization: - queryset = queryset.filter( - contest_object__organizations=self.request.organization - ) join_sql_subquery( queryset, subquery=str( From 1ca0d51f67618767ac470d19aa2cff2b248a830e Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 6 Jul 2023 22:39:16 +0700 Subject: [PATCH 113/478] Format --- judge/comments.py | 16 +++++++--------- judge/models/comment.py | 4 ++-- judge/models/course.py | 14 +++++++------- judge/views/comment.py | 30 ++++++++++++++---------------- judge/views/course.py | 12 +++++++----- judge/views/organization.py | 2 +- judge/views/submission.py | 4 +++- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/judge/comments.py b/judge/comments.py index 88f65e6..bb8f32b 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -156,7 +156,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get(self, request, *args, **kwargs): target_comment = None - if "comment-id" in request.GET: + if "comment-id" in request.GET: comment_id = int(request.GET["comment-id"]) try: comment_obj = Comment.objects.get(id=comment_id) @@ -179,9 +179,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): queryset.select_related("author__user") .filter(hidden=False) .defer("author__about") - .annotate( - revisions=Count("versions", distinct=True) - ) + .annotate(revisions=Count("versions", distinct=True)) ) else: queryset = self.object.comments @@ -203,7 +201,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): "votes", condition=Q(votes__voter_id=profile.id) ), ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) - + return queryset def get_context_data(self, target_comment=None, **kwargs): @@ -211,9 +209,9 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): queryset = self._get_queryset(target_comment) comment_count = self.object.comments.filter(parent=None, hidden=False).count() context["target_comment"] = -1 - if (target_comment != None): + if target_comment != None: context["target_comment"] = target_comment.id - + if self.request.user.is_authenticated: context["is_new_user"] = ( not self.request.user.is_staff @@ -229,7 +227,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): context["vote_hide_threshold"] = settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD if queryset.exists(): context["comment_root_id"] = queryset[0].id - else: + else: context["comment_root_id"] = 0 context["comment_parent_none"] = 1 if target_comment != None: @@ -238,7 +236,7 @@ class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): else: context["offset"] = DEFAULT_OFFSET context["comment_more"] = comment_count - DEFAULT_OFFSET - + context["limit"] = DEFAULT_OFFSET context["comment_count"] = comment_count return context diff --git a/judge/models/comment.py b/judge/models/comment.py index 335d567..6058cf8 100644 --- a/judge/models/comment.py +++ b/judge/models/comment.py @@ -56,7 +56,7 @@ class Comment(MPTTModel): related_name="replies", on_delete=CASCADE, ) - + versions = VersionRelation() class Meta: @@ -112,7 +112,7 @@ class Comment(MPTTModel): if len(output) >= n: return output return output - + @cached_property def get_replies(self): query = Comment.filter(parent=self) diff --git a/judge/models/course.py b/judge/models/course.py index 457e0ea..e4a155a 100644 --- a/judge/models/course.py +++ b/judge/models/course.py @@ -68,7 +68,7 @@ class Course(models.Model): return False @classmethod - def is_accessible_by(cls,course, profile): + def is_accessible_by(cls, course, profile): userqueryset = CourseRole.objects.filter(course=course, user=profile) if userqueryset.exists(): return True @@ -76,29 +76,29 @@ class Course(models.Model): return False @classmethod - def get_students(cls,course): + def get_students(cls, course): return CourseRole.objects.filter(course=course, role="ST").values("user") @classmethod - def get_assistants(cls,course): + def get_assistants(cls, course): return CourseRole.objects.filter(course=course, role="AS").values("user") @classmethod - def get_teachers(cls,course): + def get_teachers(cls, course): return CourseRole.objects.filter(course=course, role="TE").values("user") @classmethod - def add_student(cls,course, profiles): + def add_student(cls, course, profiles): for profile in profiles: CourseRole.make_role(course=course, user=profile, role="ST") @classmethod - def add_teachers(cls,course, profiles): + def add_teachers(cls, course, profiles): for profile in profiles: CourseRole.make_role(course=course, user=profile, role="TE") @classmethod - def add_assistants(cls,course, profiles): + def add_assistants(cls, course, profiles): for profile in profiles: CourseRole.make_role(course=course, user=profile, role="AS") diff --git a/judge/views/comment.py b/judge/views/comment.py index 3c88923..03285ad 100644 --- a/judge/views/comment.py +++ b/judge/views/comment.py @@ -128,19 +128,19 @@ def get_comments(request, limit=10): offset = 0 if "offset" in request.GET: offset = int(request.GET["offset"]) - + target_comment = -1 if "target_comment" in request.GET: target_comment = int(request.GET["target_comment"]) - + comment_root_id = 0 - + if comment_id: comment_obj = Comment.objects.get(pk=comment_id) comment_root_id = comment_obj.id else: comment_obj = None - + queryset = comment_obj.linked_object.comments if parent_none: queryset = queryset.filter(parent=None, hidden=False) @@ -152,35 +152,33 @@ def get_comments(request, limit=10): queryset.select_related("author__user") .defer("author__about") .annotate( - count_replies=Count("replies", distinct=True), + count_replies=Count("replies", distinct=True), revisions=Count("versions", distinct=True), - )[offset:offset+limit] + )[offset : offset + limit] ) if request.user.is_authenticated: profile = request.profile queryset = queryset.annotate( - my_vote=FilteredRelation( - "votes", condition=Q(votes__voter_id=profile.id) - ), + my_vote=FilteredRelation("votes", condition=Q(votes__voter_id=profile.id)), ).annotate(vote_score=Coalesce(F("my_vote__score"), Value(0))) new_offset = offset + min(len(queryset), limit) comment_html = loader.render_to_string( - "comments/content-list.html", + "comments/content-list.html", { "request": request, - "comment_root_id": comment_root_id, - "comment_list": queryset, - "vote_hide_threshold" : settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD, + "comment_root_id": comment_root_id, + "comment_list": queryset, + "vote_hide_threshold": settings.DMOJ_COMMENT_VOTE_HIDE_THRESHOLD, "perms": PermWrapper(request.user), - "offset": new_offset, + "offset": new_offset, "limit": limit, "comment_count": comment_count, "comment_parent_none": parent_none, "target_comment": target_comment, - "comment_more": comment_count - new_offset - } + "comment_more": comment_count - new_offset, + }, ) return HttpResponse(comment_html) diff --git a/judge/views/course.py b/judge/views/course.py index f24155b..d8582af 100644 --- a/judge/views/course.py +++ b/judge/views/course.py @@ -10,22 +10,25 @@ __all__ = [ "CourseStudentResults", "CourseEdit", "CourseResourceDetailEdit", - "CourseResourceEdit", + "CourseResourceEdit", ] course_directory_file = "" + class CourseListMixin(object): def get_queryset(self): - return Course.objects.filter(is_open = "true").values() + return Course.objects.filter(is_open="true").values() + class CourseList(ListView): model = Course template_name = "course/list.html" queryset = Course.objects.filter(is_public=True).filter(is_open=True) + def get_context_data(self, **kwargs): - context = super(CourseList,self).get_context_data(**kwargs) - available , enrolling = [] , [] + 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) @@ -34,4 +37,3 @@ class CourseList(ListView): context["available"] = available context["enrolling"] = enrolling return context - diff --git a/judge/views/organization.py b/judge/views/organization.py index d83d2bb..799b734 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -441,7 +441,7 @@ class OrganizationSubmissions( LoginRequiredMixin, MemberOrganizationMixin, SubmissionsListBase ): template_name = "organization/submissions.html" - + @cached_property def in_contest(self): return False diff --git a/judge/views/submission.py b/judge/views/submission.py index a7f3eb0..5a2a695 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -351,7 +351,9 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView): def _get_entire_queryset(self): organization = self.organization or self.request.organization if organization: - queryset = Submission.objects.filter(contest_object__organizations=organization) + queryset = Submission.objects.filter( + contest_object__organizations=organization + ) else: queryset = Submission.objects.all() use_straight_join(queryset) From 0b27c9da239acb596dce1babd538759ec3ef959e Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 7 Jul 2023 00:54:52 +0700 Subject: [PATCH 114/478] Fix some css --- judge/views/organization.py | 7 ------- templates/blog/list.html | 5 +++-- templates/problem/list-base.html | 2 +- templates/three-column-content.html | 16 ++++++---------- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/judge/views/organization.py b/judge/views/organization.py index 799b734..58ac765 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -450,13 +450,6 @@ class OrganizationSubmissions( def contest(self): return None - def get_queryset(self): - return ( - super() - .get_queryset() - .filter(contest_object__organizations=self.organization) - ) - def get_context_data(self, **kwargs): context = super(OrganizationSubmissions, self).get_context_data(**kwargs) # context["dynamic_update"] = context["page_obj"].number == 1 diff --git a/templates/blog/list.html b/templates/blog/list.html index 0535def..6677bf8 100644 --- a/templates/blog/list.html +++ b/templates/blog/list.html @@ -67,14 +67,15 @@
      {% if request.in_contest_mode and request.participation.contest.use_clarifications %}
      -

      {{ _('Clarifications') }} +

      + {{ _('Clarifications') }} {% if can_edit_contest %} + style="color: lightcyan; margin-left: auto;"> {% endif %}

      diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html index 0ca5139..e1ac630 100644 --- a/templates/problem/list-base.html +++ b/templates/problem/list-base.html @@ -46,7 +46,7 @@ diff --git a/templates/three-column-content.html b/templates/three-column-content.html index 7063185..986404b 100644 --- a/templates/three-column-content.html +++ b/templates/three-column-content.html @@ -5,24 +5,20 @@ {% block media %} -
      -

      1. Custom checker (PY)

      -
      -

      - Đây là checker mặc định của website, cho phép người dùng cập nhật được nhiều thông tin nhất (chi tiết xem ở bên dưới). Chúng ta cần hoàn thành hàm check dưới đây: -

      - - {{ - """ - def check(process_output, judge_output, **kwargs): - # return True/False - """|highlight('py')}} - -

      - Trong đó, **kwargs có thể chứa các biến sau: -

      -
        -
      • process_output: output
        • -
      • judge_output: đáp án
        • -
      • submission_source: Code bài nộp
        • -
      • judge_input: input
        • -
      • point_value: điểm của test đang chấm
        • -
      • case_position: thứ tự của test
        • -
      • submission_language: ngôn ngữ của bài nộp
        • -
      • execution_time: thời gian chạy
        • -
      -

      Return:

      -
        -
      • Cách 1: Trả về True/False
        • -
      • Cách 2: Trả về một object CheckerResult có thể được gọi như sau 
        CheckerResult(case_passed_bool, points_awarded, feedback='')
        • -
      - -

      Ví dụ:

      -

      Dưới đây là ví dụ cho bài toán: Input gồm 1 số nguyên n. In ra 2 số nguyên a, b sao cho a + b = n. -

      - {{ - """ - from dmoj.result import CheckerResult - - - def wa(feedback): - return CheckerResult(False, 0, feedback) - - - def check(process_output, judge_output, judge_input, **kwargs): - # process the input - input_arr = judge_input.split() - assert(len(input_arr) == 1) - n = int(input_arr[0]) - - # process the contestant's output - output_arr = process_output.split() - - if (len(output_arr) != 2): - return wa('Wrong output format') - - try: - a, b = int(output_arr[0]), int(output_arr[1]) - except: - return wa('Wrong output format') - - if (n == a + b): - return True - return wa('a + b != n') - """| highlight('py')}} -
      -
      -

      2. Custom validator (CPP)

      -
      -

      - Để sử dụng chức năng này, cần viết một chương trình C++ pass vào 3 arguments theo thứ tự input_file, output_file, ans_file tương ứng với các file input, output, đáp án. -

      -

      - Để test chương trình trên máy tính, có thể dùng lệnh như sau (Windows): - 

      -main.exe [input_file] [output_file] [ans_file]
      - hoặc thay bằng ./main trên Linux/MacOS. -

      -

      Return:

      -

      - Chương trình trả về giá trị: -

        -
      • 0 nếu AC (100% điểm)
        • -
      • 1 nếu WA (0 điểm)
        • -
      • 2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC.
        • -
      - Những thông tin được viết ra stdout (bằng cout) sẽ được in ra màn hình cho người nộp bài(feedback) -

      - -

      Ví dụ:

      -

      Chương trình sau dùng để chấm bài toán: Cho n là một số nguyên dương. In ra hai số tự nhiên a, b sao cho a + b = n.

      -

      Nếu in ra a + b = n và a, b >= 0 thì được 100% số điểm, nếu a + b = n nhưng một trong 2 số a, b âm thì được 50% số điểm.

      - {{ - """ - #include - using namespace std; - - int main(int argc, char** argv) { - ifstream inp(argv[1]); - ifstream out(argv[2]); - ifstream ans(argv[3]); - - int n, a, b, c, d; - - inp >> n; - out >> a >> b; - ans >> c >> d; - - if (a + b == c + d) { - cout << a << \" + \" << b << \" = \" << c << \" + \" << d << endl; - - if (a >= 0 && b >= 0) { - return 0; // AC - } - else { - cerr << 0.5; - return 2; // PARTIAL - } - } - else { - cout << \"a + b = \" << a + b << \" != \" << n << endl; - return 1; // WA - } - } - """ | highlight('cpp')}} -
      -
      -

      3. Interactive (CPP)

      -
      -

      - Để sử dụng chức năng này, cần viết một chương trình C++ pass vào 2 arguments input_file answer_file tương ứng file input và đáp án (nếu cần thiết). -

      -

      - Để test chương trình trên máy tính với tư cách thí sinh, có thể dùng lệnh như sau (Windows): - 

      -main.exe [input_file] [answer_file]
      - hoặc thay bằng ./main trên Linux/MacOS. -

      -

      Return:

      -

      - Chương trình trả về giá trị: -

        -
      • 0 nếu AC (100% điểm)
        • -
      • 1 nếu WA (0 điểm)
        • -
      • 2 nếu điểm thành phần. Khi đó cần in ra stderr một số thực trong đoạn [0, 1] thể hiện cho tỷ lệ điểm. Nếu điểm < 1 thì hiển thị WA, điểm = 1 thì hiển thị AC.
        • -
      - Thông tin được in ra trong stderr (bằng cerr) sẽ là feedback hiển thị cho người dùng. -

      - -

      Ví dụ:

      -

      Chương trình sau dùng để chấm bài toán guessgame: Người chơi phải tìm 1 số bí mật n (n chứa trong file input). Mỗi lần họ được hỏi một số x, và chương trình sẽ trả về "SMALLER", "BIGGER" hoặc "HOLA" dựa trên giá trị của n và x. Cần tìm ra n sau không quá 31 câu hỏi.

      - {{ - """ - #include - using namespace std; - - void quit(string reason) { - cerr << reason << endl; - exit(1); - } - - void read(long long& guess) { - if (!(cin >> guess)) exit(1); // Nếu không có dòng này, chương trình sẽ chờ vô hạn - if (guess < 1 || guess > 2e9) exit(1); - } - - int main(int argc, char *argv[]) { - ifstream inp(argv[1]); - int N, guesses = 0; - long long guess; - inp >> N; - - while (guess != N && guesses <= 31) { - read(guess); - if (guess == N) { - cout << \"HOLA\" << endl; - } else if (guess > N) { - cout << \"SMALLER\" << endl; - } else { - cout << \"BIGGER\" << endl; - } - guesses++; - } - cerr << \"Number of used guesses: \" << guesses << endl; - if (guesses <= 31) - return 0; // AC - else { - cerr << \"Used too many guesses\" << endl; - return 1; // WA - } - } - """ | highlight('cpp')}} -
      -{% endblock %} \ No newline at end of file +{% endblock %} +{% block description %} + {{ content|markdown|str|safe}} +{% endblock %} diff --git a/templates/problem/data.html b/templates/problem/data.html index 696cab8..0bc8f4c 100644 --- a/templates/problem/data.html +++ b/templates/problem/data.html @@ -136,13 +136,18 @@ (function toggle_custom() { let $checker = $('#id_problem-data-checker') - let $custom_checker = $('#id_problem-data-custom_checker') - let $validator = $('#id_problem-data-custom_validator') - let $interactive = $('#id_problem-data-interactive_judge') + let $custom_checker = $('#id_problem-data-custom_checker'); + let $validator = $('#id_problem-data-custom_validator'); + let $interactive = $('#id_problem-data-interactive_judge'); + let $sig_handler = $('#id_problem-data-signature_handler'); + let $sig_header = $('#id_problem-data-signature_header'); + let $ioi_signature = $("#id_problem-data-use_ioi_signature"); $tr_checker = $custom_checker.parent().parent(); - $tr_validator = $validator.parent().parent() - $tr_interactive = $interactive.parent().parent() + $tr_validator = $validator.parent().parent(); + $tr_interactive = $interactive.parent().parent(); + $tr_sig_handler = $sig_handler.parent().parent(); + $tr_sig_header = $sig_header.parent().parent(); $td = $checker.parent(); var $sample = $("",{ @@ -152,13 +157,24 @@ href: "{{url('custom_checker_sample')}}" }).appendTo($td); + $("",{ + text: " ({{_('Instruction')}})", + target: "_blank", + href: "{{url('custom_checker_sample')}}" + }).appendTo($ioi_signature.parent()); + $checker.change(function () { $tr_checker.toggle($checker.val() == 'custom').change(); $tr_validator.toggle($checker.val() == 'customval' || $checker.val() == 'testlib').change(); - $tr_interactive.toggle($checker.val() == 'interact').change(); $sample.toggle(['custom', 'customval', 'interact'].includes($checker.val())).change(); }).change(); + + $ioi_signature.change(function() { + $tr_interactive.toggle($ioi_signature.is(':checked')).change(); + $tr_sig_header.toggle($ioi_signature.is(':checked')).change(); + $tr_sig_handler.toggle($ioi_signature.is(':checked')).change(); + }).change(); })(); checker_precision($('#id_problem-data-checker')); From 36e27321f781fa9e13b0341d1a394e56710eca8a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 3 Aug 2023 16:04:39 +0700 Subject: [PATCH 123/478] Migrate pagevote and bookmark to use content_type --- judge/comments.py | 5 -- judge/migrations/0158_migrate_pagevote.py | 70 ++++++++++++++++++ judge/migrations/0159_auto_20230803_1518.py | 23 ++++++ judge/migrations/0160_migrate_bookmark.py | 80 +++++++++++++++++++++ judge/migrations/0161_auto_20230803_1536.py | 28 ++++++++ judge/models/bookmark.py | 36 ++++------ judge/models/contest.py | 2 + judge/models/interface.py | 26 ++++--- judge/models/pagevote.py | 13 +++- judge/models/problem.py | 32 +++++---- judge/views/blog.py | 6 -- judge/views/bookmark.py | 4 +- judge/views/contests.py | 3 - judge/views/organization.py | 3 - judge/views/pagevote.py | 4 +- judge/views/problem.py | 9 --- templates/blog/content.html | 4 +- templates/problem/feed/problems.html | 4 +- templates/user/user-bookmarks.html | 20 +++--- 19 files changed, 285 insertions(+), 87 deletions(-) create mode 100644 judge/migrations/0158_migrate_pagevote.py create mode 100644 judge/migrations/0159_auto_20230803_1518.py create mode 100644 judge/migrations/0160_migrate_bookmark.py create mode 100644 judge/migrations/0161_auto_20230803_1536.py diff --git a/judge/comments.py b/judge/comments.py index bb8f32b..be33a4e 100644 --- a/judge/comments.py +++ b/judge/comments.py @@ -86,11 +86,6 @@ class CommentForm(ModelForm): class CommentedDetailView(TemplateResponseMixin, SingleObjectMixin, View): comment_page = None - def get_comment_page(self): - if self.comment_page is None: - raise NotImplementedError() - return self.comment_page - def is_comment_locked(self): if self.request.user.has_perm("judge.override_comment_lock"): return False diff --git a/judge/migrations/0158_migrate_pagevote.py b/judge/migrations/0158_migrate_pagevote.py new file mode 100644 index 0000000..5563854 --- /dev/null +++ b/judge/migrations/0158_migrate_pagevote.py @@ -0,0 +1,70 @@ +# Generated by Django 3.2.18 on 2023-08-03 07:40 + +from django.db import migrations, models +import django.db.models.deletion +from django.core.exceptions import ObjectDoesNotExist + + +def migrate_pagevote(apps, schema_editor): + PageVote = apps.get_model("judge", "PageVote") + Problem = apps.get_model("judge", "Problem") + Solution = apps.get_model("judge", "Solution") + BlogPost = apps.get_model("judge", "BlogPost") + Contest = apps.get_model("judge", "Contest") + + for vote in PageVote.objects.all(): + page = vote.page + try: + if page.startswith("p:"): + code = page[2:] + vote.linked_object = Problem.objects.get(code=code) + elif page.startswith("s:"): + code = page[2:] + vote.linked_object = Solution.objects.get(problem__code=code) + elif page.startswith("c:"): + key = page[2:] + vote.linked_object = Contest.objects.get(key=key) + elif page.startswith("b:"): + blog_id = page[2:] + vote.linked_object = BlogPost.objects.get(id=blog_id) + vote.save() + except ObjectDoesNotExist: + vote.delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ("contenttypes", "0002_remove_content_type_name"), + ("judge", "0157_auto_20230801_1145"), + ] + + operations = [ + migrations.AddField( + model_name="pagevote", + name="content_type", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="contenttypes.contenttype", + ), + ), + migrations.AddField( + model_name="pagevote", + name="object_id", + field=models.PositiveIntegerField(default=None), + preserve_default=False, + ), + migrations.AlterUniqueTogether( + name="pagevote", + unique_together={("content_type", "object_id")}, + ), + migrations.AddIndex( + model_name="pagevote", + index=models.Index( + fields=["content_type", "object_id"], + name="judge_pagev_content_ed8899_idx", + ), + ), + migrations.RunPython(migrate_pagevote, migrations.RunPython.noop, atomic=True), + ] diff --git a/judge/migrations/0159_auto_20230803_1518.py b/judge/migrations/0159_auto_20230803_1518.py new file mode 100644 index 0000000..691121b --- /dev/null +++ b/judge/migrations/0159_auto_20230803_1518.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.18 on 2023-08-03 08:18 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("contenttypes", "0002_remove_content_type_name"), + ("judge", "0158_migrate_pagevote"), + ] + + operations = [ + migrations.AlterField( + model_name="pagevote", + name="content_type", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="contenttypes.contenttype", + ), + ), + ] diff --git a/judge/migrations/0160_migrate_bookmark.py b/judge/migrations/0160_migrate_bookmark.py new file mode 100644 index 0000000..6fa1b3e --- /dev/null +++ b/judge/migrations/0160_migrate_bookmark.py @@ -0,0 +1,80 @@ +# Generated by Django 3.2.18 on 2023-08-03 08:32 + +from django.db import migrations, models +import django.db.models.deletion +from django.core.exceptions import ObjectDoesNotExist + + +def migrate_bookmark(apps, schema_editor): + BookMark = apps.get_model("judge", "BookMark") + Problem = apps.get_model("judge", "Problem") + Solution = apps.get_model("judge", "Solution") + BlogPost = apps.get_model("judge", "BlogPost") + Contest = apps.get_model("judge", "Contest") + + for bookmark in BookMark.objects.all(): + page = bookmark.page + try: + if page.startswith("p:"): + code = page[2:] + bookmark.linked_object = Problem.objects.get(code=code) + elif page.startswith("s:"): + code = page[2:] + bookmark.linked_object = Solution.objects.get(problem__code=code) + elif page.startswith("c:"): + key = page[2:] + bookmark.linked_object = Contest.objects.get(key=key) + elif page.startswith("b:"): + blog_id = page[2:] + bookmark.linked_object = BlogPost.objects.get(id=blog_id) + bookmark.save() + except ObjectDoesNotExist: + bookmark.delete() + + +class Migration(migrations.Migration): + + dependencies = [ + ("contenttypes", "0002_remove_content_type_name"), + ("judge", "0159_auto_20230803_1518"), + ] + + operations = [ + migrations.AddField( + model_name="bookmark", + name="content_type", + field=models.ForeignKey( + null=True, + on_delete=django.db.models.deletion.CASCADE, + to="contenttypes.contenttype", + ), + ), + migrations.AddField( + model_name="bookmark", + name="object_id", + field=models.PositiveIntegerField(default=1), + ), + migrations.AddField( + model_name="bookmark", + name="score", + field=models.IntegerField(default=0, verbose_name="votes"), + ), + migrations.AlterUniqueTogether( + name="bookmark", + unique_together={("content_type", "object_id")}, + ), + migrations.AddIndex( + model_name="bookmark", + index=models.Index( + fields=["content_type", "object_id"], + name="judge_bookm_content_964329_idx", + ), + ), + migrations.AddIndex( + model_name="makebookmark", + index=models.Index( + fields=["user", "bookmark"], name="judge_makeb_user_id_f0e226_idx" + ), + ), + migrations.RunPython(migrate_bookmark, migrations.RunPython.noop, atomic=True), + ] diff --git a/judge/migrations/0161_auto_20230803_1536.py b/judge/migrations/0161_auto_20230803_1536.py new file mode 100644 index 0000000..7e12b9a --- /dev/null +++ b/judge/migrations/0161_auto_20230803_1536.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.18 on 2023-08-03 08:36 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("contenttypes", "0002_remove_content_type_name"), + ("judge", "0160_migrate_bookmark"), + ] + + operations = [ + migrations.AlterField( + model_name="bookmark", + name="content_type", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + to="contenttypes.contenttype", + ), + ), + migrations.AlterField( + model_name="bookmark", + name="object_id", + field=models.PositiveIntegerField(), + ), + ] diff --git a/judge/models/bookmark.py b/judge/models/bookmark.py index 61afd0c..c773fde 100644 --- a/judge/models/bookmark.py +++ b/judge/models/bookmark.py @@ -2,6 +2,8 @@ from django.db import models from django.db.models import CASCADE from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ObjectDoesNotExist +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType from judge.models.profile import Profile @@ -13,7 +15,11 @@ class BookMark(models.Model): max_length=30, verbose_name=_("associated page"), db_index=True, - ) + ) # deprecated + score = models.IntegerField(verbose_name=_("votes"), default=0) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + linked_object = GenericForeignKey("content_type", "object_id") def get_bookmark(self, user): userqueryset = MakeBookMark.objects.filter(bookmark=self, user=user) @@ -22,31 +28,16 @@ class BookMark(models.Model): else: return False - def page_object(self): - from judge.models.contest import Contest - from judge.models.interface import BlogPost - from judge.models.problem import Problem, Solution - - try: - page = self.page - if page.startswith("p:"): - return Problem.objects.get(code=page[2:]) - elif page.startswith("c:"): - return Contest.objects.get(key=page[2:]) - elif page.startswith("b:"): - return BlogPost.objects.get(id=page[2:]) - elif page.startswith("s:"): - return Solution.objects.get(problem__code=page[2:]) - return None - except ObjectDoesNotExist: - return None - class Meta: verbose_name = _("bookmark") verbose_name_plural = _("bookmarks") + indexes = [ + models.Index(fields=["content_type", "object_id"]), + ] + unique_together = ("content_type", "object_id") def __str__(self): - return self.page + return f"bookmark for {self.linked_object}" class MakeBookMark(models.Model): @@ -56,6 +47,9 @@ class MakeBookMark(models.Model): ) class Meta: + indexes = [ + models.Index(fields=["user", "bookmark"]), + ] unique_together = ["user", "bookmark"] verbose_name = _("make bookmark") verbose_name_plural = _("make bookmarks") diff --git a/judge/models/contest.py b/judge/models/contest.py index 678d7c0..e6740cd 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -299,6 +299,8 @@ class Contest(models.Model): help_text=_("Number of digits to round points to."), ) comments = GenericRelation("Comment") + pagevote = GenericRelation("PageVote") + bookmark = GenericRelation("BookMark") @cached_property def format_class(self): diff --git a/judge/models/interface.py b/judge/models/interface.py index 880b76b..dbec41c 100644 --- a/judge/models/interface.py +++ b/judge/models/interface.py @@ -96,6 +96,8 @@ class BlogPost(models.Model): verbose_name=_("private to organizations"), default=False ) comments = GenericRelation("Comment") + pagevote = GenericRelation("PageVote") + bookmark = GenericRelation("BookMark") def __str__(self): return self.title @@ -130,17 +132,21 @@ class BlogPost(models.Model): and self.authors.filter(id=user.profile.id).exists() ) - @cached_property - def pagevote(self): - page = "b:%s" % self.id - pagevote, _ = PageVote.objects.get_or_create(page=page) - return pagevote + def get_or_create_pagevote(self): + if self.pagevote.count(): + return self.pagevote.first() + new_pagevote = PageVote() + new_pagevote.linked_object = self + new_pagevote.save() + return new_pagevote - @cached_property - def bookmark(self): - page = "b:%s" % self.id - bookmark, _ = BookMark.objects.get_or_create(page=page) - return bookmark + def get_or_create_bookmark(self): + if self.bookmark.count(): + return self.bookmark.first() + new_bookmark = BookMark() + new_bookmark.linked_object = self + new_bookmark.save() + return new_bookmark class Meta: permissions = (("edit_all_post", _("Edit all posts")),) diff --git a/judge/models/pagevote.py b/judge/models/pagevote.py index 16f1c6c..44a2b3c 100644 --- a/judge/models/pagevote.py +++ b/judge/models/pagevote.py @@ -1,6 +1,8 @@ from django.db import models from django.db.models import CASCADE from django.utils.translation import gettext_lazy as _ +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType from judge.models.profile import Profile @@ -12,12 +14,19 @@ class PageVote(models.Model): max_length=30, verbose_name=_("associated page"), db_index=True, - ) + ) # deprecated score = models.IntegerField(verbose_name=_("votes"), default=0) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + linked_object = GenericForeignKey("content_type", "object_id") class Meta: verbose_name = _("pagevote") verbose_name_plural = _("pagevotes") + indexes = [ + models.Index(fields=["content_type", "object_id"]), + ] + unique_together = ("content_type", "object_id") def vote_score(self, user): page_vote = PageVoteVoter.objects.filter(pagevote=self, voter=user) @@ -27,7 +36,7 @@ class PageVote(models.Model): return 0 def __str__(self): - return f"pagevote for {self.page}" + return f"pagevote for {self.linked_object}" class PageVoteVoter(models.Model): diff --git a/judge/models/problem.py b/judge/models/problem.py index 89e88f4..090dec7 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -272,6 +272,8 @@ class Problem(models.Model): objects = TranslatedProblemQuerySet.as_manager() tickets = GenericRelation("Ticket") comments = GenericRelation("Comment") + pagevote = GenericRelation("PageVote") + bookmark = GenericRelation("BookMark") organizations = models.ManyToManyField( Organization, @@ -448,18 +450,6 @@ class Problem(models.Model): def usable_common_names(self): return set(self.usable_languages.values_list("common_name", flat=True)) - @cached_property - def pagevote(self): - page = "p:%s" % self.code - pagevote, _ = PageVote.objects.get_or_create(page=page) - return pagevote - - @cached_property - def bookmark(self): - page = "p:%s" % self.code - bookmark, _ = BookMark.objects.get_or_create(page=page) - return bookmark - @property def usable_languages(self): return self.allowed_languages.filter( @@ -559,6 +549,22 @@ class Problem(models.Model): cache.set(key, result) return result + def get_or_create_pagevote(self): + if self.pagevote.count(): + return self.pagevote.first() + new_pagevote = PageVote() + new_pagevote.linked_object = self + new_pagevote.save() + return new_pagevote + + def get_or_create_bookmark(self): + if self.bookmark.count(): + return self.bookmark.first() + new_bookmark = BookMark() + new_bookmark.linked_object = self + new_bookmark.save() + return new_bookmark + def save(self, *args, **kwargs): super(Problem, self).save(*args, **kwargs) if self.code != self.__original_code: @@ -677,6 +683,8 @@ class Solution(models.Model): authors = models.ManyToManyField(Profile, verbose_name=_("authors"), blank=True) content = models.TextField(verbose_name=_("editorial content")) comments = GenericRelation("Comment") + pagevote = GenericRelation("PageVote") + bookmark = GenericRelation("BookMark") def get_absolute_url(self): problem = self.problem diff --git a/judge/views/blog.py b/judge/views/blog.py index 3985348..0310e27 100644 --- a/judge/views/blog.py +++ b/judge/views/blog.py @@ -109,9 +109,6 @@ class PostList(HomeFeedView): context["page_type"] = "blog" return context - def get_comment_page(self, post): - return "b:%s" % post.id - class TicketFeed(HomeFeedView): model = Ticket @@ -180,9 +177,6 @@ class PostView(TitleMixin, CommentedDetailView, PageVoteDetailView, BookMarkDeta def get_title(self): return self.object.title - def get_comment_page(self): - return "b:%s" % self.object.id - def get_context_data(self, **kwargs): context = super(PostView, self).get_context_data(**kwargs) context["og_image"] = self.object.og_image diff --git a/judge/views/bookmark.py b/judge/views/bookmark.py index 7efd5c4..860003b 100644 --- a/judge/views/bookmark.py +++ b/judge/views/bookmark.py @@ -71,6 +71,6 @@ def undobookmark_page(request): class BookMarkDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get_context_data(self, **kwargs): context = super(BookMarkDetailView, self).get_context_data(**kwargs) - queryset = BookMark.objects.get_or_create(page=self.get_comment_page()) - context["bookmark"] = queryset[0] + queryset = self.object.bookmark + context["bookmark"] = queryset.first() return context diff --git a/judge/views/contests.py b/judge/views/contests.py index 6dd739a..b9f4b14 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -412,9 +412,6 @@ class ContestDetail( ): template_name = "contest/contest.html" - def get_comment_page(self): - return "c:%s" % self.object.key - def get_title(self): return self.object.name diff --git a/judge/views/organization.py b/judge/views/organization.py index 58ac765..962be71 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -270,9 +270,6 @@ class OrganizationHome(OrganizationHomeView, FeedView): .prefetch_related("authors__user", "organizations") ) - def get_comment_page(self, post): - return "b:%s" % post.id - def get_context_data(self, **kwargs): context = super(OrganizationHome, self).get_context_data(**kwargs) context["title"] = self.organization.name diff --git a/judge/views/pagevote.py b/judge/views/pagevote.py index e4c5006..c537651 100644 --- a/judge/views/pagevote.py +++ b/judge/views/pagevote.py @@ -101,6 +101,6 @@ class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get_context_data(self, **kwargs): context = super(PageVoteDetailView, self).get_context_data(**kwargs) - queryset = PageVote.objects.get_or_create(page=self.get_comment_page()) - context["pagevote"] = queryset[0] + queryset = self.object.pagevote + context["pagevote"] = queryset.first() return context diff --git a/judge/views/problem.py b/judge/views/problem.py index 5697bd3..2be9cb4 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -224,9 +224,6 @@ class ProblemSolution( context["has_solved_problem"] = self.problem.id in self.get_completed_problems() return context - def get_comment_page(self): - return "s:" + self.problem.code - class ProblemRaw( ProblemMixin, TitleMixin, TemplateResponseMixin, SingleObjectMixin, View @@ -270,9 +267,6 @@ class ProblemDetail( context_object_name = "problem" template_name = "problem/problem.html" - def get_comment_page(self): - return "p:%s" % self.object.code - def get_context_data(self, **kwargs): context = super(ProblemDetail, self).get_context_data(**kwargs) user = self.request.user @@ -843,9 +837,6 @@ class ProblemFeed(ProblemList, FeedView): title = _("Problem feed") feed_type = None - def get_comment_page(self, problem): - return "p:%s" % problem.code - # arr = [[], [], ..] def merge_recommendation(self, arr): seed = datetime.now().strftime("%d%m%Y") diff --git a/templates/blog/content.html b/templates/blog/content.html index 4124729..535866b 100644 --- a/templates/blog/content.html +++ b/templates/blog/content.html @@ -46,8 +46,8 @@
      {{_("...More")}}
      - {% set pagevote = post.pagevote %} - {% set bookmark = post.bookmark %} + {% set pagevote = post.get_or_create_pagevote() %} + {% set bookmark = post.get_or_create_bookmark() %} {% set hide_actionbar_comment = True %} {% set include_hr = False %} {% set share_url = request.build_absolute_uri(post.get_absolute_url()) %} diff --git a/templates/problem/feed/problems.html b/templates/problem/feed/problems.html index 63f365d..add8566 100644 --- a/templates/problem/feed/problems.html +++ b/templates/problem/feed/problems.html @@ -109,8 +109,8 @@
      {{_("...More")}}
      - {% set pagevote = problem.pagevote %} - {% set bookmark = problem.bookmark %} + {% set pagevote = problem.get_or_create_pagevote() %} + {% set bookmark = problem.get_or_create_bookmark() %} {% set hide_actionbar_comment = True %} {% set include_hr = False %} {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %} diff --git a/templates/user/user-bookmarks.html b/templates/user/user-bookmarks.html index 75aaece..2c15311 100644 --- a/templates/user/user-bookmarks.html +++ b/templates/user/user-bookmarks.html @@ -16,10 +16,11 @@ {% for post in blogs %} - {% if post.bookmark.page_object() %} + {% set object = post.bookmark.linked_object %} + {% if object %} {% endif %} @@ -36,10 +37,11 @@ {% for problem in problems %} - {% if problem.bookmark.page_object() %} + {% set object = problem.bookmark.linked_object %} + {% if object %} {% endif %} @@ -57,10 +59,11 @@ {% for contest in contests %} - {% if contest.bookmark.page_object() %} + {% set object = contest.bookmark.linked_object %} + {% if object %} {% endif %} @@ -78,10 +81,11 @@ {% for solution in solutions %} - {% if solution.bookmark.page_object() %} + {% set object = solution.bookmark.linked_object %} + {% if object %} {% endif %} From 4ceae6d066abce7db5a93bdb291d1cd471e8b868 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 3 Aug 2023 23:19:45 +0700 Subject: [PATCH 124/478] Fix pagevote and bookmark bug for new objects --- judge/models/bookmark.py | 10 ++++++++++ judge/models/contest.py | 4 +++- judge/models/interface.py | 22 +++------------------- judge/models/pagevote.py | 10 ++++++++++ judge/models/problem.py | 24 ++++-------------------- judge/views/bookmark.py | 3 +-- judge/views/pagevote.py | 3 +-- 7 files changed, 32 insertions(+), 44 deletions(-) diff --git a/judge/models/bookmark.py b/judge/models/bookmark.py index c773fde..718141f 100644 --- a/judge/models/bookmark.py +++ b/judge/models/bookmark.py @@ -53,3 +53,13 @@ class MakeBookMark(models.Model): unique_together = ["user", "bookmark"] verbose_name = _("make bookmark") verbose_name_plural = _("make bookmarks") + + +class Bookmarkable: + def get_or_create_bookmark(self): + if self.bookmark.count(): + return self.bookmark.first() + new_bookmark = BookMark() + new_bookmark.linked_object = self + new_bookmark.save() + return new_bookmark diff --git a/judge/models/contest.py b/judge/models/contest.py index e6740cd..a169bd2 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -22,6 +22,8 @@ from judge.models.problem import Problem from judge.models.profile import Organization, Profile from judge.models.submission import Submission from judge.ratings import rate_contest +from judge.models.pagevote import PageVotable +from judge.models.bookmark import Bookmarkable __all__ = [ "Contest", @@ -75,7 +77,7 @@ class ContestTag(models.Model): verbose_name_plural = _("contest tags") -class Contest(models.Model): +class Contest(models.Model, PageVotable, Bookmarkable): SCOREBOARD_VISIBLE = "V" SCOREBOARD_AFTER_CONTEST = "C" SCOREBOARD_AFTER_PARTICIPATION = "P" diff --git a/judge/models/interface.py b/judge/models/interface.py index dbec41c..f7626dc 100644 --- a/judge/models/interface.py +++ b/judge/models/interface.py @@ -11,8 +11,8 @@ from mptt.fields import TreeForeignKey from mptt.models import MPTTModel from judge.models.profile import Organization, Profile -from judge.models.pagevote import PageVote -from judge.models.bookmark import BookMark +from judge.models.pagevote import PageVotable +from judge.models.bookmark import Bookmarkable __all__ = ["MiscConfig", "validate_regex", "NavigationBar", "BlogPost"] @@ -74,7 +74,7 @@ class NavigationBar(MPTTModel): return pattern -class BlogPost(models.Model): +class BlogPost(models.Model, PageVotable, Bookmarkable): title = models.CharField(verbose_name=_("post title"), max_length=100) authors = models.ManyToManyField(Profile, verbose_name=_("authors"), blank=True) slug = models.SlugField(verbose_name=_("slug")) @@ -132,22 +132,6 @@ class BlogPost(models.Model): and self.authors.filter(id=user.profile.id).exists() ) - def get_or_create_pagevote(self): - if self.pagevote.count(): - return self.pagevote.first() - new_pagevote = PageVote() - new_pagevote.linked_object = self - new_pagevote.save() - return new_pagevote - - def get_or_create_bookmark(self): - if self.bookmark.count(): - return self.bookmark.first() - new_bookmark = BookMark() - new_bookmark.linked_object = self - new_bookmark.save() - return new_bookmark - class Meta: permissions = (("edit_all_post", _("Edit all posts")),) verbose_name = _("blog post") diff --git a/judge/models/pagevote.py b/judge/models/pagevote.py index 44a2b3c..5e74c95 100644 --- a/judge/models/pagevote.py +++ b/judge/models/pagevote.py @@ -48,3 +48,13 @@ class PageVoteVoter(models.Model): unique_together = ["voter", "pagevote"] verbose_name = _("pagevote vote") verbose_name_plural = _("pagevote votes") + + +class PageVotable: + def get_or_create_pagevote(self): + if self.pagevote.count(): + return self.pagevote.first() + new_pagevote = PageVote() + new_pagevote.linked_object = self + new_pagevote.save() + return new_pagevote diff --git a/judge/models/problem.py b/judge/models/problem.py index 090dec7..1149f94 100644 --- a/judge/models/problem.py +++ b/judge/models/problem.py @@ -14,8 +14,8 @@ from django.utils.functional import cached_property from django.utils.translation import gettext_lazy as _ from judge.fulltext import SearchQuerySet -from judge.models.pagevote import PageVote -from judge.models.bookmark import BookMark +from judge.models.pagevote import PageVotable +from judge.models.bookmark import Bookmarkable from judge.models.profile import Organization, Profile from judge.models.runtime import Language from judge.user_translations import gettext as user_gettext @@ -124,7 +124,7 @@ class TranslatedProblemQuerySet(SearchQuerySet): ) -class Problem(models.Model): +class Problem(models.Model, PageVotable, Bookmarkable): code = models.CharField( max_length=20, verbose_name=_("problem code"), @@ -549,22 +549,6 @@ class Problem(models.Model): cache.set(key, result) return result - def get_or_create_pagevote(self): - if self.pagevote.count(): - return self.pagevote.first() - new_pagevote = PageVote() - new_pagevote.linked_object = self - new_pagevote.save() - return new_pagevote - - def get_or_create_bookmark(self): - if self.bookmark.count(): - return self.bookmark.first() - new_bookmark = BookMark() - new_bookmark.linked_object = self - new_bookmark.save() - return new_bookmark - def save(self, *args, **kwargs): super(Problem, self).save(*args, **kwargs) if self.code != self.__original_code: @@ -669,7 +653,7 @@ class LanguageTemplate(models.Model): verbose_name_plural = _("language-specific templates") -class Solution(models.Model): +class Solution(models.Model, PageVotable, Bookmarkable): problem = models.OneToOneField( Problem, on_delete=CASCADE, diff --git a/judge/views/bookmark.py b/judge/views/bookmark.py index 860003b..3f4224b 100644 --- a/judge/views/bookmark.py +++ b/judge/views/bookmark.py @@ -71,6 +71,5 @@ def undobookmark_page(request): class BookMarkDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get_context_data(self, **kwargs): context = super(BookMarkDetailView, self).get_context_data(**kwargs) - queryset = self.object.bookmark - context["bookmark"] = queryset.first() + context["bookmark"] = self.object.get_or_create_bookmark() return context diff --git a/judge/views/pagevote.py b/judge/views/pagevote.py index c537651..9ae6d5b 100644 --- a/judge/views/pagevote.py +++ b/judge/views/pagevote.py @@ -101,6 +101,5 @@ class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View): def get_context_data(self, **kwargs): context = super(PageVoteDetailView, self).get_context_data(**kwargs) - queryset = self.object.pagevote - context["pagevote"] = queryset.first() + context["pagevote"] = self.object.get_or_create_pagevote() return context From abe5b5eb92948563de75ab49c191fee64331768b Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 4 Aug 2023 20:19:42 +0700 Subject: [PATCH 125/478] Simplify submission admin --- judge/admin/submission.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/judge/admin/submission.py b/judge/admin/submission.py index 2a6067a..7218bb2 100644 --- a/judge/admin/submission.py +++ b/judge/admin/submission.py @@ -194,13 +194,6 @@ class SubmissionAdmin(admin.ModelAdmin): def has_add_permission(self, request): return False - def has_change_permission(self, request, obj=None): - if not request.user.has_perm("judge.edit_own_problem"): - return False - if request.user.has_perm("judge.edit_all_problem") or obj is None: - return True - return obj.problem.is_editor(request.profile) - def lookup_allowed(self, key, value): return super(SubmissionAdmin, self).lookup_allowed(key, value) or key in ( "problem__code", From d5c492d96b973ddfcf99be931c9c147f3d6c378c Mon Sep 17 00:00:00 2001 From: Zang <84860408+giorzang@users.noreply.github.com> Date: Wed, 2 Aug 2023 07:24:06 +0700 Subject: [PATCH 126/478] Fix name 'datetime' is not defined --- dmoj/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dmoj/settings.py b/dmoj/settings.py index dea5179..d546ac3 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -9,6 +9,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/ """ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import datetime import os import tempfile From d45bdbc4085994b7fc4a307ddb48f8dde78d0283 Mon Sep 17 00:00:00 2001 From: Bao Le <127121163+BaoLe106@users.noreply.github.com> Date: Sun, 6 Aug 2023 20:06:47 +0800 Subject: [PATCH 127/478] Remove "From " in user about --- templates/user/user-about.html | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/templates/user/user-about.html b/templates/user/user-about.html index 834f6cd..ee7f395 100644 --- a/templates/user/user-about.html +++ b/templates/user/user-about.html @@ -59,16 +59,6 @@ {{user.user.first_name}}{% if user.user.last_name %} ({{user.user.last_name}}){% endif %}

      {% endif %} - {% with orgs=user.organizations.all() %} - {% if orgs %} -

      {{ _('From') }} - {% for org in orgs -%} - {{ org.name }} - {%- if not loop.last %}, {% endif %} - {% endfor %} -

      - {% endif %} - {% endwith %} {% if perms.judge.change_profile %} {% with notes=user.notes %} {% if notes %} @@ -78,7 +68,6 @@ {% endif %} {% endwith %} {% endif%} - {% if user.about %}

      {{ _('About') }}

      {% cache 86400 'user_about' user.id MATH_ENGINE %} From 5bd904bac1da79ae509f4b8c77cff1d37a51797d Mon Sep 17 00:00:00 2001 From: Phuoc Dinh Le <47278241+cuom1999@users.noreply.github.com> Date: Sun, 6 Aug 2023 19:43:58 +0700 Subject: [PATCH 128/478] Update README.md --- README.md | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) diff --git a/README.md b/README.md index 7087452..58258eb 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,191 @@ Support plagiarism detection via [Stanford MOSS](https://theory.stanford.edu/~ai Most of the setup are the same as DMOJ installations. You can view the installation guide of DMOJ here: https://docs.dmoj.ca/#/site/installation. There is one minor change: Instead of `git clone https://github.com/DMOJ/site.git`, you clone this repo `git clone https://github.com/LQDJudge/online-judge.git`. + +- Bước 1: cài các thư viện cần thiết + - $ ở đây nghĩa là sudo. Ví dụ dòng đầu nghĩa là chạy lệnh `sudo apt update` + +```jsx +$ apt update +$ apt install git gcc g++ make python3-dev python3-pip libxml2-dev libxslt1-dev zlib1g-dev gettext curl redis-server +$ curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - +$ apt install nodejs +$ npm install -g sass postcss-cli postcss autoprefixer +``` + +- Bước 2: tạo DB + - Server đang dùng MariaDB ≥ 10.5, các bạn cũng có thể dùng Mysql nếu bị conflict (anh chưa test version rõ lắm) + - Nếu các bạn chạy lệnh dưới này xong mà version mariadb bị cũ (< 10.5) thì có thể tra google cách cài MariaDB mới nhất (10.5 hoặc 10.6). + - Các bạn có thể thấy version MariaDB bằng cách gõ lệnh `sudo mysql` (Ctrl + C để quit) + +```jsx +$ apt update +$ apt install mariadb-server libmysqlclient-dev +``` + +- Bước 3: tạo table trong DB + - Các bạn có thể thay tên table và password + +```jsx +$ sudo mysql +mariadb> CREATE DATABASE dmoj DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci; +mariadb> GRANT ALL PRIVILEGES ON dmoj.* TO 'dmoj'@'localhost' IDENTIFIED BY ''; +mariadb> exit +``` + +- Bước 4: Cài đặt môi trường ảo (virtual env) và pull code + - Nếu `pip3 install mysqlclient` bị lỗi thì thử chạy `sudo pip3 install mysqlclient==2.1.1` + +```jsx +$ python3 -m venv dmojsite +$ . dmojsite/bin/activate + +(dmojsite) $ git clone https://github.com/LQDJudge/online-judge.git +(dmojsite) $ cd online-judge +(dmojsite) $ git submodule init +(dmojsite) $ git submodule update +(dmojsite) $ pip3 install -r requirements.txt +(dmojsite) $ pip3 install mysqlclient +(dmojsite) $ pre-commit install +``` + +- Bước 5: tạo local_settings.py. Đây là file để custom setting cho Django. Các bạn tạo file vào `online-judge/dmoj/local_settings.py` + - File mẫu: https://github.com/DMOJ/docs/blob/master/sample_files/local_settings.py + - Nếu bạn đổi tên hoặc mật khẩu table databases thì thay đổi thông tin tương ứng trong `Databases` + - Sau khi xong, chạy lệnh `(dmojsite) $ python3 manage.py check` để kiểm tra +- Bước 6: Compile CSS và translation + - Giải thích: + - Lệnh 1 và 2 gọi sau mỗi lần thay đổi 1 file css hoặc file js (file html thì không cần) + - Lệnh 3 và 4 gọi sau mỗi lần thay đổi file dịch + - Note: Sau khi chạy lệnh này, folder tương ứng với STATIC_ROOT trong local_settings phải được tạo. Nếu chưa được tạo thì mình cần tạo folder đó trước khi chạy 2 lệnh đầu. + +```jsx +(dmojsite) $ ./make_style.sh +(dmojsite) $ python3 manage.py collectstatic +(dmojsite) $ python3 manage.py compilemessages +(dmojsite) $ python3 manage.py compilejsi18n +``` + +- Bước 7: Thêm dữ liệu vào DB + +```jsx +(dmojsite) $ python3 manage.py migrate +(dmojsite) $ python3 manage.py loaddata navbar +(dmojsite) $ python3 manage.py loaddata language_small +(dmojsite) $ python3 manage.py loaddata demo +``` + +- Bước 8: Chạy site. Đến đây thì cơ bản đã hoàn thành (chưa có judge, websocket, celery). Các bạn có thể truy cập tại `localhost:8000` + +```jsx +python3 manage.py runserver 0.0.0.0:8000 +``` + +**Một số lưu ý:** + +1. (WSL) có thể tải ứng dụng Terminal trong Windows Store +2. (WSL) mỗi lần mở ubuntu, các bạn cần chạy lệnh sau để mariadb khởi động: `sudo service mysql restart` (tương tự cho một số service khác như memcached, celery) +3. Sau khi cài đặt, các bạn chỉ cần activate virtual env và chạy lệnh runserver là ok. + +```jsx +. dmojsite/bin/activate +python3 manage.py runserver +``` + +1. Quy trình dev: + 1. Sau khi thay đổi code thì django tự build lại, các bạn chỉ cần F5 + 2. Một số style nằm trong các file .scss. Các bạn cần recompile css thì mới thấy được thay đổi. + +**Optional:** + +************Alias:************ Các bạn có thể lưu các alias này để sau này dùng cho nhanh + +- mtrans: để generate translation khi các bạn add một string trong code +- trans: compile translation (sau khi bạn đã dịch tiếng Việt) +- cr: chuyển tới folder OJ +- pr: chạy server +- sm: restart service (chủ yếu dùng cho WSL) +- sd: activate virtual env +- css: compile các file css + +```jsx +alias mtrans='python3 manage.py makemessages -l vi && python3 manage.py makedmojmessages -l vi' +alias pr='python3 manage.py runserver' +alias sd='source ~/LQDOJ/dmojsite/bin/activate' +alias sm='sudo service mysql restart && sudo service redis-server start && sudo service memcached start' +alias trans='python3 manage.py compilemessages -l vi && python3 manage.py compilejsi18n -l vi' +alias cr='cd ~/LQDOJ/online-judge' +alias css='./make_style.sh && python3 manage.py collectstatic --noinput' +``` + +**Memcached:** dùng cho in-memory cache + +```jsx +$ sudo apt install memcached +``` + +**Websocket:** dùng để live update (như chat) + +- Tạo file online-judge/websocket/config.js + +```jsx +module.exports = { + get_host: '127.0.0.1', + get_port: 15100, + post_host: '127.0.0.1', + post_port: 15101, + http_host: '127.0.0.1', + http_port: 15102, + long_poll_timeout: 29000, +}; +``` + +- Cài các thư viện + +```jsx +(dmojsite) $ npm install qu ws simplesets +(dmojsite) $ pip3 install websocket-client +``` + +- Khởi động (trong 1 tab riêng) + +```jsx +(dmojsite) $ node websocket/daemon.js +``` + +**************Celery:************** (dùng cho một số task như batch rejudge_ + +```jsx +celery -A dmoj_celery worker +``` + +**************Judge:************** + +- Cài đặt ở 1 folder riêng bên ngoài site: + +```jsx +$ apt install python3-dev python3-pip build-essential libseccomp-dev +$ git clone https://github.com/LQDJudge/judge-server.git +$ cd judge-server +$ sudo pip3 install -e . +``` + +- Tạo một file judge.yml ở bên ngoài folder judge-server (file mẫu https://github.com/DMOJ/docs/blob/master/sample_files/judge_conf.yml) +- Thêm judge vào site bằng UI: Admin → Judge → Thêm Judge → nhập id và key (chỉ cần thêm 1 lần) hoặc dùng lệnh `(dmojsite) $ python3 managed.py addjudge `. +- Chạy Bridge (cầu nối giữa judge và site) trong 1 tab riêng trong folder online-judge: + +```jsx +(dmojsite) $ python3 managed.py runbridged +``` + +- Khởi động Judge (trong 1 tab riêng): + +```jsx +$ dmoj -c judge.yml localhost +``` + +- Lưu ý: mỗi lần sau này muốn chạy judge thì mở 1 tab cho bridge và n tab cho judge. Mỗi judge cần 1 file yml khác nhau (chứa authentication khác nhau) + ### Some frequent difficulties when installation: 1. Missing the `local_settings.py`. You need to copy the `local_settings.py` in order to pass the check. From d1e66228fc7434df2665e795f5864ce1e447ce1a Mon Sep 17 00:00:00 2001 From: Phuoc Dinh Le <47278241+cuom1999@users.noreply.github.com> Date: Sun, 6 Aug 2023 19:45:05 +0700 Subject: [PATCH 129/478] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 58258eb..416ae9c 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ $ npm install -g sass postcss-cli postcss autoprefixer ``` - Bước 2: tạo DB - - Server đang dùng MariaDB ≥ 10.5, các bạn cũng có thể dùng Mysql nếu bị conflict (anh chưa test version rõ lắm) + - Server đang dùng MariaDB ≥ 10.5, các bạn cũng có thể dùng Mysql nếu bị conflict - Nếu các bạn chạy lệnh dưới này xong mà version mariadb bị cũ (< 10.5) thì có thể tra google cách cài MariaDB mới nhất (10.5 hoặc 10.6). - Các bạn có thể thấy version MariaDB bằng cách gõ lệnh `sudo mysql` (Ctrl + C để quit) From a75cd01fe22e05ef75a258290357359eecce6a25 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 7 Aug 2023 00:21:35 +0700 Subject: [PATCH 130/478] Fix interactive judge bug --- templates/problem/data.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/problem/data.html b/templates/problem/data.html index 0bc8f4c..f3986eb 100644 --- a/templates/problem/data.html +++ b/templates/problem/data.html @@ -166,12 +166,12 @@ $checker.change(function () { $tr_checker.toggle($checker.val() == 'custom').change(); $tr_validator.toggle($checker.val() == 'customval' || $checker.val() == 'testlib').change(); + $tr_interactive.toggle($checker.val() == 'interact').change(); $sample.toggle(['custom', 'customval', 'interact'].includes($checker.val())).change(); }).change(); $ioi_signature.change(function() { - $tr_interactive.toggle($ioi_signature.is(':checked')).change(); $tr_sig_header.toggle($ioi_signature.is(':checked')).change(); $tr_sig_handler.toggle($ioi_signature.is(':checked')).change(); }).change(); From 9a889d158c238fc660fcdaa719aba66410189724 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 7 Aug 2023 12:42:12 +0700 Subject: [PATCH 131/478] Fix trans --- locale/vi/LC_MESSAGES/django.po | 1 - 1 file changed, 1 deletion(-) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 0ab0dd6..04bb140 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -3753,7 +3753,6 @@ msgid "Hide" msgstr "Ẩn" #: templates/comments/content-list.html:94 -#, fuzzy, python-format #| msgid "" #| "This comment is hidden due to too much negative feedback. Click here to view it." From dfae9607fe93443c071a766e99e881c337b827a4 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 7 Aug 2023 20:31:37 +0700 Subject: [PATCH 132/478] Allow contest editor to view submissions in contest --- judge/models/contest.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/judge/models/contest.py b/judge/models/contest.py index a169bd2..f5ab35b 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -542,10 +542,7 @@ class Contest(models.Model, PageVotable, Bookmarkable): return True # If the user is a contest organizer or curator - if ( - user.has_perm("judge.edit_own_contest") - and user.profile.id in self.editor_ids - ): + if user.profile.id in self.editor_ids: return True return False From 7ac43188a43acc9cb9f865db91eab09793630021 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 7 Aug 2023 20:33:49 +0700 Subject: [PATCH 133/478] Fix bug --- judge/models/contest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/models/contest.py b/judge/models/contest.py index f5ab35b..f9bd0c4 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -542,7 +542,7 @@ class Contest(models.Model, PageVotable, Bookmarkable): return True # If the user is a contest organizer or curator - if user.profile.id in self.editor_ids: + if user and user.profile.id in self.editor_ids: return True return False From f9bdc75176f469cff5fa8ba2773874986231ec32 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 7 Aug 2023 20:36:28 +0700 Subject: [PATCH 134/478] Fix bug --- judge/models/contest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/judge/models/contest.py b/judge/models/contest.py index f9bd0c4..1129076 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -542,7 +542,7 @@ class Contest(models.Model, PageVotable, Bookmarkable): return True # If the user is a contest organizer or curator - if user and user.profile.id in self.editor_ids: + if hasattr(user, "profile") and user.profile.id in self.editor_ids: return True return False From 8f42885482e9d79555b353bb393cbd4c2a35bce9 Mon Sep 17 00:00:00 2001 From: yucyle <121172468+yucyle@users.noreply.github.com> Date: Tue, 8 Aug 2023 17:30:47 +0700 Subject: [PATCH 135/478] Remove group adding in edit profile --- judge/forms.py | 18 ------------------ templates/user/edit-profile.html | 8 +------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/judge/forms.py b/judge/forms.py index 44acd0f..504338b 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -74,7 +74,6 @@ class ProfileForm(ModelForm): model = Profile fields = [ "about", - "organizations", "timezone", "language", "ace_theme", @@ -98,26 +97,9 @@ class ProfileForm(ModelForm): attrs={"style": "max-width:700px;min-width:700px;width:700px"}, ) - def clean(self): - organizations = self.cleaned_data.get("organizations") or [] - max_orgs = settings.DMOJ_USER_MAX_ORGANIZATION_COUNT - - if sum(org.is_open for org in organizations) > max_orgs: - raise ValidationError( - _("You may not be part of more than {count} public groups.").format( - count=max_orgs - ) - ) - - return self.cleaned_data - def __init__(self, *args, **kwargs): user = kwargs.pop("user", None) super(ProfileForm, self).__init__(*args, **kwargs) - if not user.has_perm("judge.edit_all_organization"): - self.fields["organizations"].queryset = Organization.objects.filter( - Q(is_open=True) | Q(id__in=user.profile.organizations.all()), - ) def file_size_validator(file): diff --git a/templates/user/edit-profile.html b/templates/user/edit-profile.html index 05f3b2c..8d2e9ee 100644 --- a/templates/user/edit-profile.html +++ b/templates/user/edit-profile.html @@ -44,7 +44,7 @@ #center-float { position: relative; margin: 0 auto auto -28.5em; - left: 50%; + left: 60%; width: 700px; } @@ -142,12 +142,6 @@       - -
      - {{ _('Affiliated organizations') }}: -
      - {{ form.organizations }} - From 68e705404efe1afba71ff1cb78b2726c6536c312 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 14 Aug 2023 09:10:28 -0500 Subject: [PATCH 136/478] Only allow group contest when cloning --- judge/forms.py | 19 +++++++++++++++++++ judge/views/contests.py | 23 ++++++++++++++++++++--- templates/contest/clone.html | 19 +++++++++++++++++-- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/judge/forms.py b/judge/forms.py index 504338b..362c067 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -474,6 +474,15 @@ class ContestCloneForm(Form): max_length=20, validators=[RegexValidator("^[a-z0-9]+$", _("Contest id must be ^[a-z0-9]+$"))], ) + organization = ChoiceField(choices=(), required=True) + + def __init__(self, *args, org_choices=(), profile=None, **kwargs): + super(ContestCloneForm, self).__init__(*args, **kwargs) + self.fields["organization"].widget = Select2Widget( + attrs={"style": "width: 100%", "data-placeholder": _("Group")}, + ) + self.fields["organization"].choices = org_choices + self.profile = profile def clean_key(self): key = self.cleaned_data["key"] @@ -481,6 +490,16 @@ class ContestCloneForm(Form): raise ValidationError(_("Contest with key already exists.")) return key + def clean_organization(self): + organization_id = self.cleaned_data["organization"] + try: + organization = Organization.objects.get(id=organization_id) + except Exception: + raise ValidationError(_("Group doesn't exist.")) + if not organization.admins.filter(id=self.profile.id).exists(): + raise ValidationError(_("You don't have permission in this group.")) + return organization + class ProblemPointsVoteForm(ModelForm): class Meta: diff --git a/judge/views/contests.py b/judge/views/contests.py index b9f4b14..ff4b320 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -453,9 +453,19 @@ class ContestClone( form_class = ContestCloneForm permission_required = "judge.clone_contest" + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs["org_choices"] = tuple( + Organization.objects.filter(admins=self.request.profile).values_list( + "id", "name" + ) + ) + kwargs["profile"] = self.request.profile + return kwargs + def form_valid(self, form): tags = self.object.tags.all() - organizations = self.object.organizations.all() + organization = form.cleaned_data["organization"] private_contestants = self.object.private_contestants.all() view_contest_scoreboard = self.object.view_contest_scoreboard.all() contest_problems = self.object.contest_problems.all() @@ -469,7 +479,7 @@ class ContestClone( contest.save() contest.tags.set(tags) - contest.organizations.set(organizations) + contest.organizations.set([organization]) contest.private_contestants.set(private_contestants) contest.view_contest_scoreboard.set(view_contest_scoreboard) contest.authors.add(self.request.profile) @@ -480,7 +490,14 @@ class ContestClone( ContestProblem.objects.bulk_create(contest_problems) return HttpResponseRedirect( - reverse("admin:judge_contest_change", args=(contest.id,)) + reverse( + "organization_contest_edit", + args=( + organization.id, + organization.slug, + contest.key, + ), + ) ) diff --git a/templates/contest/clone.html b/templates/contest/clone.html index f1b4a0f..2d3b4aa 100644 --- a/templates/contest/clone.html +++ b/templates/contest/clone.html @@ -25,17 +25,32 @@ {% endblock %} +{% block js_media %} + +{% endblock %} + {% block body %}
      {% csrf_token %} - {% if form.errors %} + {% if form.key.errors %}
      - {{ form.key.errors }} +
      {{ form.key.errors }}
      {% endif %}
      {{ form.key }}
      +
      + {{form.organization}} + {% if form.organization.errors %} +
      +
      {{ form.organization.errors }}
      +
      + {% endif %}
      From 807ba554ca645c9411647ee2ee80592150be97a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=B5=20Trung=20Ho=C3=A0ng=20H=C6=B0ng?= <89190591+HungBacktracking@users.noreply.github.com> Date: Tue, 15 Aug 2023 00:39:41 +0700 Subject: [PATCH 137/478] Fix emoji bar in chat (#76) --- templates/chat/chat.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/chat/chat.html b/templates/chat/chat.html index beb38b4..37d1d04 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -508,9 +508,15 @@ } $('#emoji-button').on('click', function(e) { e.preventDefault(); + e.stopPropagation(); toggleEmoji(); }); + // Đóng bảng emoji khi click bất kỳ chỗ nào trên màn hình + document.addEventListener("click", function() { + tooltip.classList.remove('shown'); // Ẩn bảng emoji + }); + $('emoji-picker').on('emoji-click', function(e) { var $chat = $('#chat-input').get(0); insert_char_after_cursor($chat, e.detail.unicode); From 5de5e278ee79f6a50e07e73cb6efef65c62a6749 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 14 Aug 2023 16:21:38 -0500 Subject: [PATCH 138/478] Fix emoji bar position --- templates/chat/chat.html | 14 +++++++++----- templates/chat/chat_css.html | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/templates/chat/chat.html b/templates/chat/chat.html index 37d1d04..dfc5a06 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -499,9 +499,11 @@ $('#chat-box').scrollTop($('#chat-box')[0].scrollHeight); load_dynamic_update({{last_msg}}); - const button = document.querySelector('#emoji-button') - const tooltip = document.querySelector('.tooltip') - Popper.createPopper(button, tooltip) + const button = document.querySelector('#emoji-button'); + const tooltip = document.querySelector('.tooltip'); + Popper.createPopper(button, tooltip, { + placement: 'left-end', + }); function toggleEmoji() { tooltip.classList.toggle('shown') @@ -513,8 +515,10 @@ }); // Đóng bảng emoji khi click bất kỳ chỗ nào trên màn hình - document.addEventListener("click", function() { - tooltip.classList.remove('shown'); // Ẩn bảng emoji + document.addEventListener("click", function(e) { + if (!tooltip.contains(e.target)) { + tooltip.classList.remove('shown'); // Ẩn bảng emoji + } }); $('emoji-picker').on('emoji-click', function(e) { diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index d6934f5..f5bf8cd 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -43,9 +43,8 @@ } .tooltip { - left: 120vh !important; - transform: translate(100px, 0) !important; position: absolute; + z-index: 1000; } #loader { From 752d21b50064ca0597cceded6f362161df0f7aa6 Mon Sep 17 00:00:00 2001 From: Bao Le <127121163+BaoLe106@users.noreply.github.com> Date: Thu, 17 Aug 2023 22:22:40 +0800 Subject: [PATCH 139/478] Modify left column (#75) --- resources/blog.scss | 13 ++++++++----- resources/darkmode.css | 11 ++++++++--- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/resources/blog.scss b/resources/blog.scss index 9ba7e11..517e5be 100644 --- a/resources/blog.scss +++ b/resources/blog.scss @@ -36,7 +36,6 @@ color: green; font-weight: bold; background-color: lightgreen; - .sidebar-icon { color: green; } @@ -181,6 +180,7 @@ .left-sidebar-item { display: flex; align-items: center; + border-radius: .5em; .sidebar-icon { font-size: large; @@ -278,7 +278,6 @@ padding: 0.8em 0.2em 0.8em 0.2em; display: inline-block; flex: 1; - border-radius: 8px; .sidebar-icon { display: none; @@ -290,6 +289,7 @@ margin-bottom: 1em; border-radius: 7px; display: flex; + background: inherit; } .blog-box { @@ -305,6 +305,11 @@ @media (min-width: 800px) { .left-sidebar-item { + margin-bottom: 10px; + margin-left: 10px; + border: 1px solid lightgray; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.1); + background-color: white; padding: 0.8em 0.2em 0.8em 1em; } @@ -345,9 +350,7 @@ height: 100%; margin-top: -4em; padding-top: 4em; - border-right: 1px solid lightgray; - box-shadow: 0px -10px 2px 0px rgb(0 0 0 / 50%); - background: white; + border-right: 1px; } .feed-table { diff --git a/resources/darkmode.css b/resources/darkmode.css index bff07e2..47c03f5 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -1892,6 +1892,10 @@ noscript #noscript { .middle-content .post .title a:hover { color: rgb(255, 70, 70) !important; } +.left-sidebar-item { + border-color: rgb(60, 65, 68); + background-color: rgb(24, 26, 27); +} .left-sidebar-item.active { color: rgb(114, 255, 114); background-color: rgb(40, 111, 17); @@ -1966,10 +1970,11 @@ noscript #noscript { } @media (min-width: 800px) { .left-sidebar { - border-right-color: rgb(60, 65, 68); - box-shadow: rgba(0, 0, 0, 0.5) 0px -10px 2px 0px; + /* border-right-color: rgb(60, 65, 68); */ + /* box-shadow: rgba(0, 0, 0, 0.5) 0px -10px 2px 0px; */ background-image: initial; - background-color: rgb(24, 26, 27); + + /* background-color: rgb(24, 26, 27); */ } .blog-box { border-left-color: rgb(60, 65, 68); From c4592266043039ee4d3c6e4fb767d91ccbda8cb5 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 21 Aug 2023 17:27:21 -0500 Subject: [PATCH 140/478] Add AMQP websocket --- judge/event_poster_amqp.py | 4 +- websocket/daemon_amqp.js | 199 +++++++++++++++++++++++++++++++++++++ 2 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 websocket/daemon_amqp.js diff --git a/judge/event_poster_amqp.py b/judge/event_poster_amqp.py index 959d882..24cec72 100644 --- a/judge/event_poster_amqp.py +++ b/judge/event_poster_amqp.py @@ -16,7 +16,7 @@ class EventPoster(object): def _connect(self): self._conn = pika.BlockingConnection( - pika.URLParameters(settings.EVENT_DAEMON_AMQP) + pika.URLParameters(settings.EVENT_DAEMON_AMQP), ) self._chan = self._conn.channel() @@ -25,7 +25,7 @@ class EventPoster(object): id = int(time() * 1000000) self._chan.basic_publish( self._exchange, - "", + "#", json.dumps({"id": id, "channel": channel, "message": message}), ) return id diff --git a/websocket/daemon_amqp.js b/websocket/daemon_amqp.js new file mode 100644 index 0000000..5bb294e --- /dev/null +++ b/websocket/daemon_amqp.js @@ -0,0 +1,199 @@ +var WebSocketServer = require('ws').Server; +var set = require('simplesets').Set; +var queue = require('qu'); +var amqp = require('amqp'); +var url = require('url'); + +if (typeof String.prototype.startsWith != 'function') { + String.prototype.startsWith = function (str){ + return this.slice(0, str.length) == str; + }; +} + +const argv = require('yargs') + .demandCommand(3) + .strict() + .usage('Usage: event [options] ') + .options({ + host: { + default: '127.0.0.1', + describe: 'websocket address to listen on' + }, + http_host: { + default: '127.0.0.1', + describe: 'http address to listen on' + }, + http_port: { + default: null, + describe: 'http port to listen on' + }, + max_queue: { + default: 10, + describe: 'queue buffer size' + }, + comet_timeout: { + default: 60000, + describe: 'comet long poll timeout' + } + }) + .argv; + +var followers = new set(); +var pollers = new set(); +var messages = new queue(); +var max_queue = argv.max_queue; +var comet_timeout = argv.comet_timeout; + +var rabbitmq = amqp.createConnection({url: argv._[0]}); + +rabbitmq.on('error', function(e) { + console.log('amqp connection error...', e); + process.exit(1); +}); + +rabbitmq.on('ready', function () { + rabbitmq.queue('', {exclusive: true}, function (q) { + q.bind(argv._[1], '#'); + q.subscribe(function (data) { + console.log(data); + message = JSON.parse(data.data.toString('utf8')); + messages.push(message); + if (messages.length > max_queue) + messages.shift(); + followers.each(function (client) { + client.got_message(message); + }); + pollers.each(function (request) { + request.got_message(message); + }); + }); + }); +}); + +var wss = new WebSocketServer({host: argv.host, port: parseInt(argv._[2])}); + +messages.catch_up = function (client) { + this.each(function (message) { + if (message.id > client.last_msg) + client.got_message(message); + }); +}; + +wss.on('connection', function (socket) { + socket.channel = null; + socket.last_msg = 0; + + var commands = { + start_msg: function (request) { + socket.last_msg = request.start; + }, + set_filter: function (request) { + var filter = {}; + if (Array.isArray(request.filter) && request.filter.length > 0 && + request.filter.every(function (channel, index, array) { + if (typeof channel != 'string') + return false; + filter[channel] = true; + return true; + })) { + socket.filter = filter; + followers.add(socket); + messages.catch_up(socket); + } else { + socket.send(JSON.stringify({ + status: 'error', + code: 'invalid-filter', + message: 'invalid filter: ' + request.filter + })); + } + } + }; + + socket.got_message = function (message) { + if (message.channel in socket.filter) + socket.send(JSON.stringify(message)); + socket.last_msg = message.id; + }; + + socket.on('message', function (request) { + try { + request = JSON.parse(request); + if (typeof request.command !== 'string') + throw {message: 'no command specified'}; + } catch (err) { + socket.send(JSON.stringify({ + status: 'error', + code: 'syntax-error', + message: err.message + })); + return; + } + request.command = request.command.replace(/-/g, '_'); + if (request.command in commands) + commands[request.command](request); + else + socket.send(JSON.stringify({ + status: 'error', + code: 'bad-command', + message: 'bad command: ' + request.command + })); + }); + + socket.on('close', function(code, message) { + followers.remove(socket); + }); +}); + +if (argv.http_port !== null) { + require('http').createServer(function (req, res) { + var parts = url.parse(req.url, true); + + if (!parts.pathname.startsWith('/channels/')) { + res.writeHead(404, {'Content-Type': 'text/plain'}); + res.end('404 Not Found'); + return; + } + + var channels = parts.pathname.slice(10).split('|'); + if (channels.length == 1 && !channels[0].length) { + res.writeHead(400, {'Content-Type': 'text/plain'}); + res.end('400 Bad Request'); + return; + } + + req.channels = {}; + req.last_msg = parseInt(parts.query.last); + if (isNaN(req.last_msg)) req.last_msg = 0; + + channels.forEach(function (channel) { + req.channels[channel] = true; + }); + + req.on('close', function () { + pollers.remove(req); + }); + + req.got_message = function (message) { + if (message.channel in req.channels) { + res.writeHead(200, {'Content-Type': 'application/json'}); + res.end(JSON.stringify(message)); + pollers.remove(req); + return true; + } + return false; + }; + var got = false; + messages.each(function (message) { + if (!got && message.id > req.last_msg) + got = req.got_message(message); + }); + if (!got) { + pollers.add(req); + res.setTimeout(comet_timeout, function () { + pollers.remove(req); + res.writeHead(504, {'Content-Type': 'application/json'}); + res.end('{"error": "timeout"}'); + }); + } + }).listen(argv.http_port, argv.http_host); +} \ No newline at end of file From 105b7e3c75a35cd1c790f3d11ac31152df08a48b Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 21 Aug 2023 18:03:39 -0500 Subject: [PATCH 141/478] Remove debug line --- websocket/daemon_amqp.js | 1 - 1 file changed, 1 deletion(-) diff --git a/websocket/daemon_amqp.js b/websocket/daemon_amqp.js index 5bb294e..e51b0e3 100644 --- a/websocket/daemon_amqp.js +++ b/websocket/daemon_amqp.js @@ -55,7 +55,6 @@ rabbitmq.on('ready', function () { rabbitmq.queue('', {exclusive: true}, function (q) { q.bind(argv._[1], '#'); q.subscribe(function (data) { - console.log(data); message = JSON.parse(data.data.toString('utf8')); messages.push(message); if (messages.length > max_queue) From a22afe0c574cf0be301e6440f39941b8afef6d80 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 21 Aug 2023 23:21:25 -0500 Subject: [PATCH 142/478] Make change user permission stricter --- judge/admin/__init__.py | 5 ++++- judge/admin/profile.py | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/judge/admin/__init__.py b/judge/admin/__init__.py index 5150d9f..94af5aa 100644 --- a/judge/admin/__init__.py +++ b/judge/admin/__init__.py @@ -1,5 +1,6 @@ from django.contrib import admin from django.contrib.admin.models import LogEntry +from django.contrib.auth.models import User from judge.admin.comments import CommentAdmin from judge.admin.contest import ContestAdmin, ContestParticipationAdmin, ContestTagAdmin @@ -11,7 +12,7 @@ from judge.admin.interface import ( ) from judge.admin.organization import OrganizationAdmin, OrganizationRequestAdmin from judge.admin.problem import ProblemAdmin, ProblemPointsVoteAdmin -from judge.admin.profile import ProfileAdmin +from judge.admin.profile import ProfileAdmin, UserAdmin from judge.admin.runtime import JudgeAdmin, LanguageAdmin from judge.admin.submission import SubmissionAdmin from judge.admin.taxon import ProblemGroupAdmin, ProblemTypeAdmin @@ -66,3 +67,5 @@ admin.site.register(Submission, SubmissionAdmin) admin.site.register(Ticket, TicketAdmin) admin.site.register(VolunteerProblemVote, VolunteerProblemVoteAdmin) admin.site.register(Course) +admin.site.unregister(User) +admin.site.register(User, UserAdmin) diff --git a/judge/admin/profile.py b/judge/admin/profile.py index d19a80b..422fc5d 100644 --- a/judge/admin/profile.py +++ b/judge/admin/profile.py @@ -3,6 +3,7 @@ from django.forms import ModelForm from django.utils.html import format_html from django.utils.translation import gettext, gettext_lazy as _, ungettext from reversion.admin import VersionAdmin +from django.contrib.auth.admin import UserAdmin as OldUserAdmin from django_ace import AceWidget from judge.models import Profile @@ -167,3 +168,38 @@ class ProfileAdmin(VersionAdmin): "javascript", request.profile.ace_theme ) return form + + +class UserAdmin(OldUserAdmin): + # Customize the fieldsets for adding and editing users + fieldsets = ( + (None, {"fields": ("username", "password")}), + ("Personal Info", {"fields": ("first_name", "last_name", "email")}), + ( + "Permissions", + { + "fields": ( + "is_active", + "is_staff", + "is_superuser", + "groups", + "user_permissions", + ) + }, + ), + ("Important dates", {"fields": ("last_login", "date_joined")}), + ) + + readonly_fields = ("last_login", "date_joined") + + def get_readonly_fields(self, request, obj=None): + fields = self.readonly_fields + if not request.user.is_superuser: + fields += ( + "is_staff", + "is_active", + "is_superuser", + "groups", + "user_permissions", + ) + return fields From 57136d96523118da83cc04db0909dc99185f4b47 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 23 Aug 2023 22:14:09 -0500 Subject: [PATCH 143/478] Add profile image --- dmoj/settings.py | 1 + judge/forms.py | 17 +- judge/jinja2/gravatar.py | 16 +- judge/migrations/0162_profile_image.py | 21 + judge/models/profile.py | 8 + judge/views/user.py | 8 +- judge/widgets/__init__.py | 1 + judge/widgets/image.py | 16 + locale/vi/LC_MESSAGES/django.po | 840 +++++++++++++------------ templates/base.html | 2 +- templates/blog/dashboard.html | 2 +- templates/chat/user_online_status.html | 2 +- templates/ticket/ticket.html | 2 +- templates/user/edit-profile.html | 18 +- templates/widgets/image.html | 13 + 15 files changed, 529 insertions(+), 438 deletions(-) create mode 100644 judge/migrations/0162_profile_image.py create mode 100644 judge/widgets/image.py create mode 100644 templates/widgets/image.html diff --git a/dmoj/settings.py b/dmoj/settings.py index d546ac3..e205e60 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -84,6 +84,7 @@ DMOJ_STATS_SUBMISSION_RESULT_COLORS = { "CE": "#42586d", "ERR": "#ffa71c", } +DMOJ_PROFILE_IMAGE_ROOT = "profile_images" MARKDOWN_STYLES = {} MARKDOWN_DEFAULT_STYLE = {} diff --git a/judge/forms.py b/judge/forms.py index 362c067..5bc43a9 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -50,6 +50,7 @@ from judge.widgets import ( HeavySelect2Widget, Select2MultipleWidget, DateTimePickerWidget, + ImageWidget, ) from judge.tasks import rescore_contest @@ -78,12 +79,14 @@ class ProfileForm(ModelForm): "language", "ace_theme", "user_script", + "profile_image", ] widgets = { "user_script": AceWidget(theme="github"), "timezone": Select2Widget(attrs={"style": "width:200px"}), "language": Select2Widget(attrs={"style": "width:200px"}), "ace_theme": Select2Widget(attrs={"style": "width:200px"}), + "profile_image": ImageWidget, } has_math_config = bool(settings.MATHOID_URL) @@ -100,12 +103,22 @@ class ProfileForm(ModelForm): def __init__(self, *args, **kwargs): user = kwargs.pop("user", None) super(ProfileForm, self).__init__(*args, **kwargs) + self.fields["profile_image"].required = False + + def clean_profile_image(self): + profile_image = self.cleaned_data.get("profile_image") + if profile_image: + if profile_image.size > 5 * 1024 * 1024: + raise ValidationError( + _("File size exceeds the maximum allowed limit of 5MB.") + ) + return profile_image def file_size_validator(file): - limit = 1 * 1024 * 1024 + limit = 10 * 1024 * 1024 if file.size > limit: - raise ValidationError("File too large. Size should not exceed 1MB.") + raise ValidationError("File too large. Size should not exceed 10MB.") class ProblemSubmitForm(ModelForm): diff --git a/judge/jinja2/gravatar.py b/judge/jinja2/gravatar.py index 2848d92..2231ab3 100644 --- a/judge/jinja2/gravatar.py +++ b/judge/jinja2/gravatar.py @@ -9,14 +9,14 @@ from . import registry @registry.function -def gravatar(email, size=80, default=None): - if isinstance(email, Profile): - if default is None: - default = email.mute - email = email.user.email - elif isinstance(email, AbstractUser): - email = email.email - +def gravatar(profile, size=80, default=None): + assert isinstance(profile, Profile), "profile should be Profile" + profile_image = profile.profile_image + if profile_image: + return profile_image.url + if default is None: + default = profile.mute + email = profile.user.email gravatar_url = ( "//www.gravatar.com/avatar/" + hashlib.md5(utf8bytes(email.strip().lower())).hexdigest() diff --git a/judge/migrations/0162_profile_image.py b/judge/migrations/0162_profile_image.py new file mode 100644 index 0000000..b371f39 --- /dev/null +++ b/judge/migrations/0162_profile_image.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.18 on 2023-08-24 00:50 + +from django.db import migrations, models +import judge.models.profile + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0161_auto_20230803_1536"), + ] + + operations = [ + migrations.AddField( + model_name="profile", + name="profile_image", + field=models.ImageField( + null=True, upload_to=judge.models.profile.profile_image_path + ), + ), + ] diff --git a/judge/models/profile.py b/judge/models/profile.py index 63453e4..8c8a31d 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -1,4 +1,5 @@ from operator import mul +import os from django.conf import settings from django.contrib.auth.models import User @@ -27,6 +28,12 @@ class EncryptedNullCharField(EncryptedCharField): return super(EncryptedNullCharField, self).get_prep_value(value) +def profile_image_path(profile, filename): + tail = filename.split(".")[-1] + new_filename = f"user_{profile.id}.{tail}" + return os.path.join(settings.DMOJ_PROFILE_IMAGE_ROOT, new_filename) + + class Organization(models.Model): name = models.CharField(max_length=128, verbose_name=_("organization title")) slug = models.SlugField( @@ -229,6 +236,7 @@ class Profile(models.Model): blank=True, help_text=_("Notes for administrators regarding this user."), ) + profile_image = models.ImageField(upload_to=profile_image_path, null=True) @cached_property def organization(self): diff --git a/judge/views/user.py b/judge/views/user.py index 9796a90..db073f1 100644 --- a/judge/views/user.py +++ b/judge/views/user.py @@ -402,12 +402,12 @@ class UserPerformancePointsAjax(UserProblemsPage): @login_required def edit_profile(request): - profile = Profile.objects.get(user=request.user) - if profile.mute: - raise Http404() + profile = request.profile if request.method == "POST": form_user = UserForm(request.POST, instance=request.user) - form = ProfileForm(request.POST, instance=profile, user=request.user) + form = ProfileForm( + request.POST, request.FILES, instance=profile, user=request.user + ) if form_user.is_valid() and form.is_valid(): with transaction.atomic(), revisions.create_revision(): form_user.save() diff --git a/judge/widgets/__init__.py b/judge/widgets/__init__.py index cc25941..a9455a9 100644 --- a/judge/widgets/__init__.py +++ b/judge/widgets/__init__.py @@ -3,3 +3,4 @@ from judge.widgets.mixins import CompressorWidgetMixin from judge.widgets.pagedown import * from judge.widgets.select2 import * from judge.widgets.datetime import * +from judge.widgets.image import * diff --git a/judge/widgets/image.py b/judge/widgets/image.py new file mode 100644 index 0000000..89b4fb4 --- /dev/null +++ b/judge/widgets/image.py @@ -0,0 +1,16 @@ +from django import forms + + +class ImageWidget(forms.ClearableFileInput): + template_name = "widgets/image.html" + + def __init__(self, attrs=None, width=80, height=80): + self.width = width + self.height = height + super().__init__(attrs) + + def get_context(self, name, value, attrs=None): + context = super().get_context(name, value, attrs) + context["widget"]["height"] = self.height + context["widget"]["width"] = self.height + return context diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 04bb140..dc1620d 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: 2023-08-01 12:22+0700\n" +"POT-Creation-Date: 2023-08-24 10:09+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -19,9 +19,9 @@ msgstr "" "X-Crowdin-File-ID: 5\n" #: chat_box/models.py:31 chat_box/models.py:54 chat_box/models.py:68 -#: judge/admin/interface.py:150 judge/models/contest.py:635 -#: judge/models/contest.py:844 judge/models/course.py:115 -#: judge/models/profile.py:366 judge/models/profile.py:444 +#: judge/admin/interface.py:150 judge/models/contest.py:636 +#: judge/models/contest.py:845 judge/models/course.py:115 +#: judge/models/profile.py:374 judge/models/profile.py:452 msgid "user" msgstr "người dùng" @@ -41,11 +41,11 @@ msgstr "xem lần cuối" msgid "LQDOJ Chat" msgstr "" -#: dmoj/settings.py:363 +#: dmoj/settings.py:365 msgid "Vietnamese" msgstr "Tiếng Việt" -#: dmoj/settings.py:364 +#: dmoj/settings.py:366 msgid "English" msgstr "" @@ -140,7 +140,7 @@ msgstr[0] "%d kỳ thi đã được đánh dấu ẩn." msgid "Mark contests as hidden" msgstr "Ẩn các kỳ thi" -#: judge/admin/contest.py:377 judge/admin/submission.py:248 +#: judge/admin/contest.py:377 judge/admin/submission.py:241 #, python-format msgid "%d submission was successfully scheduled for rejudging." msgid_plural "%d submissions were successfully scheduled for rejudging." @@ -189,7 +189,7 @@ msgid "diff" msgstr "" #: judge/admin/organization.py:61 judge/admin/problem.py:275 -#: judge/admin/profile.py:116 +#: judge/admin/profile.py:117 msgid "View on site" msgstr "Xem trên trang" @@ -221,7 +221,7 @@ msgstr "Điểm" msgid "Limits" msgstr "Giới hạn" -#: judge/admin/problem.py:217 judge/admin/submission.py:358 +#: judge/admin/problem.py:217 judge/admin/submission.py:351 #: templates/base.html:245 templates/stats/tab.html:4 #: templates/submission/list.html:347 msgid "Language" @@ -255,12 +255,12 @@ msgstr[0] "%d bài tập đã được đánh dấu riêng tư." msgid "Mark problems as private" msgstr "Đánh dấu các bài tập là riêng tư" -#: judge/admin/problem.py:432 judge/admin/submission.py:321 +#: judge/admin/problem.py:432 judge/admin/submission.py:314 #: templates/problem/list.html:18 templates/problem/list.html:37 msgid "Problem code" msgstr "Mã bài" -#: judge/admin/problem.py:444 judge/admin/submission.py:327 +#: judge/admin/problem.py:444 judge/admin/submission.py:320 msgid "Problem name" msgstr "Tên bài" @@ -280,11 +280,11 @@ msgstr "Tổng điểm" msgid "Vote" msgstr "" -#: judge/admin/profile.py:40 +#: judge/admin/profile.py:41 msgid "timezone" msgstr "múi giờ" -#: judge/admin/profile.py:125 judge/admin/submission.py:334 +#: judge/admin/profile.py:126 judge/admin/submission.py:327 #: templates/notification/list.html:12 #: templates/organization/requests/log.html:9 #: templates/organization/requests/pending.html:19 @@ -292,28 +292,28 @@ msgstr "múi giờ" msgid "User" msgstr "Thành viên" -#: judge/admin/profile.py:131 templates/registration/registration_form.html:40 +#: judge/admin/profile.py:132 templates/registration/registration_form.html:40 #: templates/user/import/table_csv.html:8 msgid "Email" msgstr "Email" -#: judge/admin/profile.py:137 judge/views/register.py:36 +#: judge/admin/profile.py:138 judge/views/register.py:36 #: templates/registration/registration_form.html:68 -#: templates/user/edit-profile.html:113 +#: templates/user/edit-profile.html:119 msgid "Timezone" msgstr "Múi giờ" -#: judge/admin/profile.py:143 +#: judge/admin/profile.py:144 msgid "date joined" msgstr "ngày tham gia" -#: judge/admin/profile.py:153 +#: judge/admin/profile.py:154 #, python-format msgid "%d user have scores recalculated." msgid_plural "%d users have scores recalculated." msgstr[0] "%d người dùng đã được tính điểm lại." -#: judge/admin/profile.py:160 +#: judge/admin/profile.py:161 msgid "Recalculate scores" msgstr "Tính điểm lại" @@ -338,7 +338,7 @@ msgid "Capabilities" msgstr "Khả năng" #: judge/admin/submission.py:31 judge/admin/submission.py:53 -#: judge/admin/submission.py:345 +#: judge/admin/submission.py:338 msgid "None" msgstr "None" @@ -360,29 +360,29 @@ msgctxt "contest problem" msgid "%(problem)s in %(contest)s" msgstr "%(problem)s trong %(contest)s" -#: judge/admin/submission.py:220 judge/admin/submission.py:261 +#: judge/admin/submission.py:213 judge/admin/submission.py:254 msgid "You do not have the permission to rejudge submissions." msgstr "Bạn không có quyền chấm lại bài." -#: judge/admin/submission.py:232 +#: judge/admin/submission.py:225 msgid "You do not have the permission to rejudge THAT many submissions." msgstr "Bạn không có quyền chấm lại nhiều bài nộp như vậy." -#: judge/admin/submission.py:255 +#: judge/admin/submission.py:248 msgid "Rejudge the selected submissions" msgstr "Chấm lại các bài nộp đã chọn" -#: judge/admin/submission.py:309 judge/views/problem_manage.py:226 +#: judge/admin/submission.py:302 judge/views/problem_manage.py:226 #, python-format msgid "%d submission were successfully rescored." msgid_plural "%d submissions were successfully rescored." msgstr[0] "%d bài nộp đã được tính điểm lại." -#: judge/admin/submission.py:316 +#: judge/admin/submission.py:309 msgid "Rescore the selected submissions" msgstr "Tính điểm lại cái bài nộp" -#: judge/admin/submission.py:339 templates/notification/list.html:15 +#: judge/admin/submission.py:332 templates/notification/list.html:15 #: templates/organization/requests/log.html:10 #: templates/organization/requests/pending.html:20 #: templates/problem/list.html:154 @@ -391,17 +391,17 @@ msgstr "Tính điểm lại cái bài nộp" msgid "Time" msgstr "Thời gian" -#: judge/admin/submission.py:347 +#: judge/admin/submission.py:340 #, python-format msgid "%d KB" msgstr "%d KB" -#: judge/admin/submission.py:349 +#: judge/admin/submission.py:342 #, python-format msgid "%.2f MB" msgstr "" -#: judge/admin/submission.py:352 templates/submission/status-testcases.html:151 +#: judge/admin/submission.py:345 templates/submission/status-testcases.html:151 msgid "Memory" msgstr "Bộ nhớ" @@ -439,7 +439,7 @@ msgid "" "You need to have solved at least one problem before your voice can be heard." msgstr "Bạn phải giải ít nhất một bài trước khi được phép bình luận." -#: judge/comments.py:128 +#: judge/comments.py:123 msgid "Posted comment" msgstr "Bình luận đã đăng" @@ -467,66 +467,78 @@ msgstr "" msgid "New IOI" msgstr "IOI mới" -#: judge/forms.py:107 judge/views/organization.py:513 -#: judge/views/register.py:62 -#, 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/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:149 +#: judge/forms.py:142 msgid "Any judge" msgstr "" -#: judge/forms.py:355 +#: judge/forms.py:348 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:356 judge/views/stats.py:166 templates/stats/site.html:27 +#: judge/forms.py:349 judge/views/stats.py:166 templates/stats/site.html:27 msgid "New users" msgstr "Thành viên mới" -#: judge/forms.py:373 +#: judge/forms.py:366 #, 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:432 judge/views/register.py:30 +#: judge/forms.py:425 judge/views/register.py:30 #: templates/registration/registration_form.html:34 #: templates/user/base-users-table.html:5 #: templates/user/import/table_csv.html:4 msgid "Username" msgstr "Tên đăng nhập" -#: judge/forms.py:433 templates/registration/registration_form.html:46 +#: judge/forms.py:426 templates/registration/registration_form.html:46 #: templates/registration/registration_form.html:60 #: templates/user/import/table_csv.html:5 msgid "Password" msgstr "Mật khẩu" -#: judge/forms.py:459 +#: judge/forms.py:452 msgid "Two Factor Authentication tokens must be 6 decimal digits." msgstr "Two Factor Authentication phải chứa 6 chữ số." -#: judge/forms.py:472 templates/registration/totp_auth.html:32 +#: judge/forms.py:465 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:479 judge/models/problem.py:133 +#: judge/forms.py:472 judge/models/problem.py:133 msgid "Problem code must be ^[a-z0-9]+$" msgstr "Mã bài phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:486 +#: judge/forms.py:479 msgid "Problem with code already exists." msgstr "Mã bài đã tồn tại." -#: judge/forms.py:493 judge/models/contest.py:91 +#: judge/forms.py:486 judge/models/contest.py:93 msgid "Contest id must be ^[a-z0-9]+$" msgstr "Mã kỳ thi phải có dạng ^[a-z0-9]+$" -#: judge/forms.py:499 +#: judge/forms.py:493 templates/problem/search-form.html:46 +msgid "Group" +msgstr "" + +#: judge/forms.py:501 msgid "Contest with key already exists." msgstr "Mã kỳ thi đã tồn tại." +#: judge/forms.py:509 +msgid "Group doesn't exist." +msgstr "" + +#: judge/forms.py:511 +#, fuzzy +#| msgid "You do not have the permission to rejudge submissions." +msgid "You don't have permission in this group." +msgstr "Bạn không có quyền chấm lại bài." + #: judge/jinja2/datetime.py:26 templates/blog/blog.html:28 #: templates/blog/dashboard.html:21 msgid "N j, Y, g:i a" @@ -555,30 +567,35 @@ msgstr "Bạn phải là thành viên của nhóm." msgid "No such group" msgstr "Nhóm không tồn tại" -#: judge/models/bookmark.py:14 judge/models/comment.py:171 -#: judge/models/pagevote.py:13 +#: judge/models/bookmark.py:16 judge/models/comment.py:171 +#: judge/models/pagevote.py:15 msgid "associated page" msgstr "trang tương ứng" -#: judge/models/bookmark.py:45 +#: judge/models/bookmark.py:19 judge/models/comment.py:48 +#: judge/models/pagevote.py:18 judge/models/problem.py:713 +msgid "votes" +msgstr "bình chọn" + +#: judge/models/bookmark.py:32 #, fuzzy #| msgid "Bookmark" msgid "bookmark" msgstr "Lưu" -#: judge/models/bookmark.py:46 +#: judge/models/bookmark.py:33 #, fuzzy #| msgid "Bookmark" msgid "bookmarks" msgstr "Lưu" -#: judge/models/bookmark.py:60 +#: judge/models/bookmark.py:54 #, fuzzy #| msgid "Bookmark" msgid "make bookmark" msgstr "Lưu" -#: judge/models/bookmark.py:61 +#: judge/models/bookmark.py:55 #, fuzzy #| msgid "Bookmark" msgid "make bookmarks" @@ -608,11 +625,6 @@ msgstr "" msgid "commenter" msgstr "người bình luận" -#: judge/models/comment.py:48 judge/models/pagevote.py:16 -#: judge/models/problem.py:721 -msgid "votes" -msgstr "bình chọn" - #: judge/models/comment.py:50 msgid "hide the comment" msgstr "ẩn bình luận" @@ -667,104 +679,104 @@ msgstr "" msgid "who trigger, used for non-comment" msgstr "" -#: judge/models/contest.py:38 +#: judge/models/contest.py:40 msgid "Invalid colour." msgstr "" -#: judge/models/contest.py:42 +#: judge/models/contest.py:44 msgid "tag name" msgstr "" -#: judge/models/contest.py:46 +#: judge/models/contest.py:48 msgid "Lowercase letters and hyphens only." msgstr "" -#: judge/models/contest.py:51 +#: judge/models/contest.py:53 msgid "tag colour" msgstr "" -#: judge/models/contest.py:53 +#: judge/models/contest.py:55 msgid "tag description" msgstr "" -#: judge/models/contest.py:74 +#: judge/models/contest.py:76 msgid "contest tag" msgstr "" -#: judge/models/contest.py:75 judge/models/contest.py:243 +#: judge/models/contest.py:77 judge/models/contest.py:245 msgid "contest tags" msgstr "nhãn kỳ thi" -#: judge/models/contest.py:83 +#: judge/models/contest.py:85 msgid "Visible" msgstr "Hiển thị" -#: judge/models/contest.py:84 +#: judge/models/contest.py:86 msgid "Hidden for duration of contest" msgstr "Ẩn trong thời gian kỳ thi" -#: judge/models/contest.py:85 +#: judge/models/contest.py:87 msgid "Hidden for duration of participation" msgstr "Ẩn trong thời gian tham gia" -#: judge/models/contest.py:89 +#: judge/models/contest.py:91 msgid "contest id" msgstr "ID kỳ thi" -#: judge/models/contest.py:94 +#: judge/models/contest.py:96 msgid "contest name" msgstr "tên kỳ thi" -#: judge/models/contest.py:98 +#: judge/models/contest.py:100 msgid "These users will be able to edit the contest." msgstr "Những người dùng này có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:104 +#: judge/models/contest.py:106 msgid "" "These users will be able to edit the contest, but will not be listed as " "authors." msgstr "Những người dùng này là tác giả và có quyền chỉnh sửa kỳ thi." -#: judge/models/contest.py:113 +#: judge/models/contest.py:115 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:118 judge/models/course.py:158 +#: judge/models/contest.py:120 judge/models/course.py:158 #: judge/models/runtime.py:211 msgid "description" msgstr "mô tả" -#: judge/models/contest.py:120 judge/models/problem.py:593 +#: judge/models/contest.py:122 judge/models/problem.py:583 #: judge/models/runtime.py:216 msgid "problems" msgstr "bài tập" -#: judge/models/contest.py:122 judge/models/contest.py:640 +#: judge/models/contest.py:124 judge/models/contest.py:641 msgid "start time" msgstr "thời gian bắt đầu" -#: judge/models/contest.py:123 +#: judge/models/contest.py:125 msgid "end time" msgstr "thời gian kết thúc" -#: judge/models/contest.py:125 judge/models/problem.py:186 -#: judge/models/problem.py:628 +#: judge/models/contest.py:127 judge/models/problem.py:186 +#: judge/models/problem.py:618 msgid "time limit" msgstr "giới hạn thời gian" -#: judge/models/contest.py:129 +#: judge/models/contest.py:131 msgid "" "Format hh:mm:ss. For example, if you want a 2-hour contest, enter 02:00:00" msgstr "" "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn tạo kỳ thi dài 2h, hãy " "nhập 02:00:00" -#: judge/models/contest.py:133 +#: judge/models/contest.py:135 msgid "freeze after" msgstr "đóng băng sau" -#: judge/models/contest.py:137 +#: judge/models/contest.py:139 msgid "" "Format hh:mm:ss. For example, if you want to freeze contest after 2 hours, " "enter 02:00:00" @@ -772,12 +784,12 @@ 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:141 judge/models/course.py:28 +#: judge/models/contest.py:143 judge/models/course.py:28 #: judge/models/course.py:164 judge/models/problem.py:225 msgid "publicly visible" msgstr "công khai" -#: judge/models/contest.py:144 +#: judge/models/contest.py:146 msgid "" "Should be set even for organization-private contests, where it determines " "whether the contest is visible to members of the specified organizations." @@ -785,84 +797,84 @@ msgstr "" "Đánh dấu ngay cả với các kỳ thi riêng tư của nhóm, quyết định việc kỳ thi có " "được hiển thị với các thành viên hay không." -#: judge/models/contest.py:150 +#: judge/models/contest.py:152 msgid "contest rated" msgstr "kỳ thi được xếp hạng" -#: judge/models/contest.py:151 +#: judge/models/contest.py:153 msgid "Whether this contest can be rated." msgstr "Quyết định kỳ thi có được xếp hạng không." -#: judge/models/contest.py:155 +#: judge/models/contest.py:157 msgid "scoreboard visibility" msgstr "khả năng hiển thị của bảng điểm" -#: judge/models/contest.py:158 +#: judge/models/contest.py:160 msgid "Scoreboard visibility through the duration of the contest" msgstr "Khả năng hiển thị của bảng điểm trong thời gian kỳ thi" -#: judge/models/contest.py:163 +#: judge/models/contest.py:165 msgid "view contest scoreboard" msgstr "xem bảng điểm kỳ thi" -#: judge/models/contest.py:166 +#: judge/models/contest.py:168 msgid "These users will be able to view the scoreboard." msgstr "Những người dùng này được phép xem bảng điểm." -#: judge/models/contest.py:169 +#: judge/models/contest.py:171 msgid "no comments" msgstr "không bình luận" -#: judge/models/contest.py:170 +#: judge/models/contest.py:172 msgid "Use clarification system instead of comments." msgstr "Dùng hệ thống thông báo thay vì bình luận." -#: judge/models/contest.py:175 +#: judge/models/contest.py:177 msgid "Rating floor for contest" msgstr "Cận dưới rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:181 +#: judge/models/contest.py:183 msgid "Rating ceiling for contest" msgstr "Cận trên rating được xếp hạng trong kỳ thi" -#: judge/models/contest.py:186 +#: judge/models/contest.py:188 msgid "rate all" msgstr "xếp hạng tất cả" -#: judge/models/contest.py:187 +#: judge/models/contest.py:189 msgid "Rate all users who joined." msgstr "Xếp hạng tất cả người dùng đã tham gia (kể cả không nộp)." -#: judge/models/contest.py:192 +#: judge/models/contest.py:194 msgid "exclude from ratings" msgstr "không xếp hạng" -#: judge/models/contest.py:197 +#: judge/models/contest.py:199 msgid "private to specific users" msgstr "riêng tư với các người dùng này" -#: judge/models/contest.py:202 +#: judge/models/contest.py:204 msgid "private contestants" msgstr "thí sinh riêng tư" -#: judge/models/contest.py:203 +#: judge/models/contest.py:205 msgid "If private, only these users may see the contest" msgstr "Nếu riêng tư, chỉ những người dùng này mới thấy kỳ thi" -#: judge/models/contest.py:207 +#: judge/models/contest.py:209 msgid "hide problem tags" msgstr "ẩn nhãn kỳ thi" -#: judge/models/contest.py:208 +#: judge/models/contest.py:210 msgid "Whether problem tags should be hidden by default." msgstr "" "Quyết định việc nhãn bài tập (DP, Tham lam, ...) được ẩn trong kỳ thi không." -#: judge/models/contest.py:212 +#: judge/models/contest.py:214 msgid "run pretests only" msgstr "chỉ chạy pretests" -#: judge/models/contest.py:214 +#: judge/models/contest.py:216 msgid "" "Whether judges should grade pretests only, versus all testcases. Commonly " "set during a contest, then unset prior to rejudging user submissions when " @@ -871,51 +883,51 @@ msgstr "" "Quyết định việc các máy chấm chỉ chấm pretests thay vì tất cả các test. Sau " "kỳ thi, hãy bỏ đánh dấu ô này và chấm lại tất cả các bài." -#: judge/models/contest.py:221 judge/models/interface.py:96 -#: judge/models/problem.py:283 +#: judge/models/contest.py:223 judge/models/interface.py:96 +#: judge/models/problem.py:285 msgid "private to organizations" msgstr "riêng tư với các tổ chức" -#: judge/models/contest.py:226 judge/models/course.py:34 -#: judge/models/interface.py:92 judge/models/problem.py:279 -#: judge/models/profile.py:130 +#: judge/models/contest.py:228 judge/models/course.py:34 +#: judge/models/interface.py:92 judge/models/problem.py:281 +#: judge/models/profile.py:137 msgid "organizations" msgstr "tổ chức" -#: judge/models/contest.py:227 +#: judge/models/contest.py:229 msgid "If private, only these organizations may see the contest" msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được kỳ thi" -#: judge/models/contest.py:230 judge/models/problem.py:256 +#: judge/models/contest.py:232 judge/models/problem.py:256 msgid "OpenGraph image" msgstr "Hình ảnh OpenGraph" -#: judge/models/contest.py:233 judge/models/profile.py:85 +#: judge/models/contest.py:235 judge/models/profile.py:92 msgid "Logo override image" msgstr "Hình ảnh ghi đè logo" -#: judge/models/contest.py:238 +#: judge/models/contest.py:240 msgid "" "This image will replace the default site logo for users inside the contest." msgstr "Ảnh này sẽ thay thế cho logo mặc định trong kỳ thi." -#: judge/models/contest.py:246 +#: judge/models/contest.py:248 msgid "the amount of live participants" msgstr "số lượng thí sinh thi trực tiếp" -#: judge/models/contest.py:250 +#: judge/models/contest.py:252 msgid "contest summary" msgstr "tổng kết kỳ thi" -#: judge/models/contest.py:252 judge/models/problem.py:262 +#: judge/models/contest.py:254 judge/models/problem.py:262 msgid "Plain-text, shown in meta description tag, e.g. for social media." msgstr "" -#: judge/models/contest.py:256 judge/models/profile.py:80 +#: judge/models/contest.py:258 judge/models/profile.py:87 msgid "access code" msgstr "mật khẩu truy cập" -#: judge/models/contest.py:261 +#: judge/models/contest.py:263 msgid "" "An optional code to prompt contestants before they are allowed to join the " "contest. Leave it blank to disable." @@ -923,296 +935,296 @@ msgstr "" "Mật khẩu truy cập cho các thí sinh muốn tham gia kỳ thi. Để trống nếu không " "dùng." -#: judge/models/contest.py:267 judge/models/problem.py:244 +#: judge/models/contest.py:269 judge/models/problem.py:244 msgid "personae non gratae" msgstr "Chặn tham gia" -#: judge/models/contest.py:269 +#: judge/models/contest.py:271 msgid "Bans the selected users from joining this contest." msgstr "Cấm những người dùng được chọn tham gia kỳ thi." -#: judge/models/contest.py:272 +#: judge/models/contest.py:274 msgid "contest format" msgstr "format kỳ thi" -#: judge/models/contest.py:276 +#: judge/models/contest.py:278 msgid "The contest format module to use." msgstr "Format kỳ thi sử dụng." -#: judge/models/contest.py:279 +#: judge/models/contest.py:281 msgid "contest format configuration" msgstr "Tùy chỉnh format kỳ thi" -#: judge/models/contest.py:283 +#: judge/models/contest.py:285 msgid "" "A JSON object to serve as the configuration for the chosen contest format " "module. Leave empty to use None. Exact format depends on the contest format " "selected." msgstr "" -#: judge/models/contest.py:296 +#: judge/models/contest.py:298 msgid "precision points" msgstr "Hiển thị điểm" -#: judge/models/contest.py:299 +#: judge/models/contest.py:301 msgid "Number of digits to round points to." msgstr "Số chữ số thập phân trên bảng điểm." -#: judge/models/contest.py:608 +#: judge/models/contest.py:609 msgid "See private contests" msgstr "" -#: judge/models/contest.py:609 +#: judge/models/contest.py:610 msgid "Edit own contests" msgstr "" -#: judge/models/contest.py:610 +#: judge/models/contest.py:611 msgid "Edit all contests" msgstr "" -#: judge/models/contest.py:611 +#: judge/models/contest.py:612 msgid "Clone contest" msgstr "" -#: judge/models/contest.py:612 templates/contest/moss.html:72 +#: judge/models/contest.py:613 templates/contest/moss.html:72 msgid "MOSS contest" msgstr "" -#: judge/models/contest.py:613 +#: judge/models/contest.py:614 msgid "Rate contests" msgstr "" -#: judge/models/contest.py:614 +#: judge/models/contest.py:615 msgid "Contest access codes" msgstr "" -#: judge/models/contest.py:615 +#: judge/models/contest.py:616 msgid "Create private contests" msgstr "" -#: judge/models/contest.py:616 +#: judge/models/contest.py:617 msgid "Change contest visibility" msgstr "" -#: judge/models/contest.py:617 +#: judge/models/contest.py:618 msgid "Edit contest problem label script" msgstr "Cách hiển thị thứ tự bài tập" -#: judge/models/contest.py:619 judge/models/contest.py:766 -#: judge/models/contest.py:847 judge/models/contest.py:877 +#: judge/models/contest.py:620 judge/models/contest.py:767 +#: judge/models/contest.py:848 judge/models/contest.py:878 #: judge/models/course.py:178 judge/models/submission.py:116 msgid "contest" msgstr "kỳ thi" -#: judge/models/contest.py:620 +#: judge/models/contest.py:621 msgid "contests" msgstr "kỳ thi" -#: judge/models/contest.py:629 +#: judge/models/contest.py:630 msgid "associated contest" msgstr "" -#: judge/models/contest.py:642 +#: judge/models/contest.py:643 msgid "score" msgstr "điểm" -#: judge/models/contest.py:643 +#: judge/models/contest.py:644 msgid "cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:645 +#: judge/models/contest.py:646 msgid "is disqualified" msgstr "đã bị loại" -#: judge/models/contest.py:647 +#: judge/models/contest.py:648 msgid "Whether this participation is disqualified." msgstr "Quyết định thí sinh có bị loại không." -#: judge/models/contest.py:649 +#: judge/models/contest.py:650 msgid "tie-breaking field" msgstr "" -#: judge/models/contest.py:651 +#: judge/models/contest.py:652 msgid "virtual participation id" msgstr "id lần tham gia ảo" -#: judge/models/contest.py:653 +#: judge/models/contest.py:654 msgid "0 means non-virtual, otherwise the n-th virtual participation." msgstr "0 nghĩa là tham gia chính thức, ngược lại là lần tham gia ảo thứ n." -#: judge/models/contest.py:656 +#: judge/models/contest.py:657 msgid "contest format specific data" msgstr "" -#: judge/models/contest.py:659 +#: judge/models/contest.py:660 msgid "same as format_data, but including frozen results" msgstr "" -#: judge/models/contest.py:663 +#: judge/models/contest.py:664 #, fuzzy #| msgid "score" msgid "final score" msgstr "điểm" -#: judge/models/contest.py:665 +#: judge/models/contest.py:666 #, fuzzy #| msgid "cumulative time" msgid "final cumulative time" msgstr "tổng thời gian" -#: judge/models/contest.py:741 +#: judge/models/contest.py:742 #, python-format msgid "%s spectating in %s" msgstr "%s đang theo dõi trong %s" -#: judge/models/contest.py:746 +#: judge/models/contest.py:747 #, python-format msgid "%s in %s, v%d" msgstr "%s trong %s, v%d" -#: judge/models/contest.py:751 +#: judge/models/contest.py:752 #, python-format msgid "%s in %s" msgstr "%s trong %s" -#: judge/models/contest.py:754 +#: judge/models/contest.py:755 msgid "contest participation" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:755 +#: judge/models/contest.py:756 msgid "contest participations" msgstr "lần tham gia kỳ thi" -#: judge/models/contest.py:762 judge/models/contest.py:818 -#: judge/models/contest.py:880 judge/models/problem.py:592 -#: judge/models/problem.py:599 judge/models/problem.py:620 -#: judge/models/problem.py:651 judge/models/problem_data.py:50 +#: judge/models/contest.py:763 judge/models/contest.py:819 +#: judge/models/contest.py:881 judge/models/problem.py:582 +#: judge/models/problem.py:589 judge/models/problem.py:610 +#: judge/models/problem.py:641 judge/models/problem_data.py:50 msgid "problem" msgstr "bài tập" -#: judge/models/contest.py:770 judge/models/contest.py:830 +#: judge/models/contest.py:771 judge/models/contest.py:831 #: judge/models/course.py:182 judge/models/problem.py:209 msgid "points" msgstr "điểm" -#: judge/models/contest.py:771 +#: judge/models/contest.py:772 msgid "partial" msgstr "thành phần" -#: judge/models/contest.py:772 judge/models/contest.py:832 +#: judge/models/contest.py:773 judge/models/contest.py:833 msgid "is pretested" msgstr "dùng pretest" -#: judge/models/contest.py:773 judge/models/interface.py:47 +#: judge/models/contest.py:774 judge/models/interface.py:47 msgid "order" msgstr "thứ tự" -#: judge/models/contest.py:775 +#: judge/models/contest.py:776 msgid "0 to not show testcases, 1 to show" msgstr "0 để ẩn test, 1 để hiện" -#: judge/models/contest.py:776 +#: judge/models/contest.py:777 msgid "visible testcases" msgstr "hiển thị test" -#: judge/models/contest.py:783 +#: judge/models/contest.py:784 msgid "Maximum number of submissions for this problem, or 0 for no limit." msgstr "Số lần nộp tối đa, đặt là 0 nếu không có giới hạn." -#: judge/models/contest.py:785 +#: judge/models/contest.py:786 msgid "max submissions" msgstr "số lần nộp tối đa" -#: judge/models/contest.py:788 +#: judge/models/contest.py:789 msgid "Why include a problem you can't submit to?" msgstr "" -#: judge/models/contest.py:792 +#: judge/models/contest.py:793 #, fuzzy #| msgid "Only for format new IOI. Separated by commas, e.g: 2, 3" msgid "Separated by commas, e.g: 2, 3" msgstr "" "Chỉ dùng với format IOI mới. Các sub cách nhau bởi dấu phẩy. Ví dụ: 2, 3" -#: judge/models/contest.py:793 +#: judge/models/contest.py:794 #, fuzzy #| msgid "frozen subtasks" msgid "hidden subtasks" msgstr "Đóng băng subtasks" -#: judge/models/contest.py:805 +#: judge/models/contest.py:806 msgid "contest problem" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:806 +#: judge/models/contest.py:807 msgid "contest problems" msgstr "bài trong kỳ thi" -#: judge/models/contest.py:812 judge/models/submission.py:233 +#: judge/models/contest.py:813 judge/models/submission.py:233 msgid "submission" msgstr "bài nộp" -#: judge/models/contest.py:825 judge/models/contest.py:851 +#: judge/models/contest.py:826 judge/models/contest.py:852 msgid "participation" msgstr "lần tham gia" -#: judge/models/contest.py:833 +#: judge/models/contest.py:834 msgid "Whether this submission was ran only on pretests." msgstr "Quyết định bài nộp chỉ được chạy trên pretest không." -#: judge/models/contest.py:838 +#: judge/models/contest.py:839 msgid "contest submission" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:839 +#: judge/models/contest.py:840 msgid "contest submissions" msgstr "bài nộp kỳ thi" -#: judge/models/contest.py:855 +#: judge/models/contest.py:856 msgid "rank" msgstr "rank" -#: judge/models/contest.py:856 +#: judge/models/contest.py:857 msgid "rating" msgstr "rating" -#: judge/models/contest.py:857 +#: judge/models/contest.py:858 msgid "raw rating" msgstr "rating thật" -#: judge/models/contest.py:858 +#: judge/models/contest.py:859 msgid "contest performance" msgstr "" -#: judge/models/contest.py:859 +#: judge/models/contest.py:860 msgid "last rated" msgstr "lần cuối được xếp hạng" -#: judge/models/contest.py:863 +#: judge/models/contest.py:864 msgid "contest rating" msgstr "rating kỳ thi" -#: judge/models/contest.py:864 +#: judge/models/contest.py:865 msgid "contest ratings" msgstr "rating kỳ thi" -#: judge/models/contest.py:888 +#: judge/models/contest.py:889 msgid "contest moss result" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:889 +#: judge/models/contest.py:890 msgid "contest moss results" msgstr "kết quả MOSS kỳ thi" -#: judge/models/contest.py:894 +#: judge/models/contest.py:895 msgid "clarified problem" msgstr "" -#: judge/models/contest.py:896 +#: judge/models/contest.py:897 msgid "clarification body" msgstr "" -#: judge/models/contest.py:898 +#: judge/models/contest.py:899 msgid "clarification timestamp" msgstr "" @@ -1222,7 +1234,7 @@ msgstr "" msgid "course name" msgstr "tên đăng nhập" -#: judge/models/course.py:23 judge/models/profile.py:46 +#: judge/models/course.py:23 judge/models/profile.py:53 msgid "organization description" msgstr "mô tả tổ chức" @@ -1248,7 +1260,7 @@ msgstr "" 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:38 +#: judge/models/course.py:43 judge/models/profile.py:45 msgid "Only alphanumeric and hyphens" msgstr "" @@ -1325,7 +1337,7 @@ msgstr "mục cha" msgid "post title" msgstr "tiêu đề bài đăng" -#: judge/models/interface.py:79 judge/models/problem.py:677 +#: judge/models/interface.py:79 judge/models/problem.py:667 msgid "authors" msgstr "tác giả" @@ -1333,7 +1345,7 @@ msgstr "tác giả" msgid "slug" msgstr "slug" -#: judge/models/interface.py:81 judge/models/problem.py:675 +#: judge/models/interface.py:81 judge/models/problem.py:665 msgid "public visibility" msgstr "khả năng hiển thị công khai" @@ -1361,15 +1373,15 @@ msgstr "hình ảnh openGraph" msgid "If private, only these organizations may see the blog post." msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được bài đăng." -#: judge/models/interface.py:146 +#: judge/models/interface.py:136 msgid "Edit all posts" msgstr "Chỉnh sửa tất cả bài đăng" -#: judge/models/interface.py:147 +#: judge/models/interface.py:137 msgid "blog post" msgstr "bài đăng" -#: judge/models/interface.py:148 +#: judge/models/interface.py:138 msgid "blog posts" msgstr "bài đăng" @@ -1397,25 +1409,25 @@ msgstr "thời gian gửi" msgid "messages in the thread" msgstr "tin nhắn trong chuỗi" -#: judge/models/pagevote.py:19 +#: judge/models/pagevote.py:24 #, fuzzy #| msgid "votes" msgid "pagevote" msgstr "bình chọn" -#: judge/models/pagevote.py:20 +#: judge/models/pagevote.py:25 #, fuzzy #| msgid "votes" msgid "pagevotes" msgstr "bình chọn" -#: judge/models/pagevote.py:40 +#: judge/models/pagevote.py:49 #, fuzzy #| msgid "volunteer vote" msgid "pagevote vote" msgstr "vote từ TNV" -#: judge/models/pagevote.py:41 +#: judge/models/pagevote.py:50 #, fuzzy #| msgid "volunteer votes" msgid "pagevote votes" @@ -1466,7 +1478,7 @@ msgstr "đường dẫn" msgid "full name" msgstr "tên đầy đủ" -#: judge/models/problem.py:86 judge/models/profile.py:43 +#: judge/models/problem.py:86 judge/models/profile.py:50 #: judge/models/runtime.py:34 msgid "short name" msgstr "tên ngắn" @@ -1562,7 +1574,7 @@ msgstr "" "Giới hạn thời gian cho bài tập này, theo đơn vị giây. Có thể nhập số thực " "(ví dụ 1.5)" -#: judge/models/problem.py:197 judge/models/problem.py:635 +#: judge/models/problem.py:197 judge/models/problem.py:625 msgid "memory limit" msgstr "Giới hạn bộ nhớ" @@ -1635,95 +1647,95 @@ msgstr "Số lượng người dùng đã giải được bài" msgid "solve rate" msgstr "Tỉ lệ giải đúng" -#: judge/models/problem.py:280 +#: judge/models/problem.py:282 msgid "If private, only these organizations may see the problem." msgstr "Nếu bài riêng tư, chỉ những tổ chức này thấy được" -#: judge/models/problem.py:286 +#: judge/models/problem.py:288 msgid "pdf statement" msgstr "Đề bài bằng file pdf" -#: judge/models/problem.py:604 judge/models/problem.py:625 -#: judge/models/problem.py:656 judge/models/runtime.py:161 +#: judge/models/problem.py:594 judge/models/problem.py:615 +#: judge/models/problem.py:646 judge/models/runtime.py:161 msgid "language" msgstr "" -#: judge/models/problem.py:607 +#: judge/models/problem.py:597 msgid "translated name" msgstr "" -#: judge/models/problem.py:609 +#: judge/models/problem.py:599 msgid "translated description" msgstr "" -#: judge/models/problem.py:613 +#: judge/models/problem.py:603 msgid "problem translation" msgstr "" -#: judge/models/problem.py:614 +#: judge/models/problem.py:604 msgid "problem translations" msgstr "" -#: judge/models/problem.py:644 +#: judge/models/problem.py:634 msgid "language-specific resource limit" msgstr "" -#: judge/models/problem.py:645 +#: judge/models/problem.py:635 msgid "language-specific resource limits" msgstr "" -#: judge/models/problem.py:658 judge/models/submission.py:249 +#: judge/models/problem.py:648 judge/models/submission.py:249 msgid "source code" msgstr "mã nguồn" -#: judge/models/problem.py:662 +#: judge/models/problem.py:652 msgid "language-specific template" msgstr "" -#: judge/models/problem.py:663 +#: judge/models/problem.py:653 msgid "language-specific templates" msgstr "" -#: judge/models/problem.py:670 +#: judge/models/problem.py:660 msgid "associated problem" msgstr "" -#: judge/models/problem.py:676 +#: judge/models/problem.py:666 msgid "publish date" msgstr "" -#: judge/models/problem.py:678 +#: judge/models/problem.py:668 msgid "editorial content" msgstr "nội dung lời giải" -#: judge/models/problem.py:689 +#: judge/models/problem.py:681 #, python-format msgid "Editorial for %s" msgstr "" -#: judge/models/problem.py:693 +#: judge/models/problem.py:685 msgid "solution" msgstr "lời giải" -#: judge/models/problem.py:694 +#: judge/models/problem.py:686 msgid "solutions" msgstr "lời giải" -#: judge/models/problem.py:699 +#: judge/models/problem.py:691 #, fuzzy #| msgid "point value" msgid "proposed point value" msgstr "điểm" -#: judge/models/problem.py:700 +#: judge/models/problem.py:692 msgid "The amount of points you think this problem deserves." msgstr "Bạn nghĩ bài này đáng bao nhiêu điểm?" -#: judge/models/problem.py:714 +#: judge/models/problem.py:706 msgid "The time this vote was cast" msgstr "" -#: judge/models/problem.py:720 +#: judge/models/problem.py:712 msgid "vote" msgstr "" @@ -1895,206 +1907,206 @@ msgstr "điểm" msgid "case is pretest?" msgstr "test là pretest?" -#: judge/models/profile.py:31 +#: judge/models/profile.py:38 msgid "organization title" msgstr "tiêu đề tổ chức" -#: judge/models/profile.py:34 +#: judge/models/profile.py:41 msgid "organization slug" msgstr "tên ngắn đường dẫn" -#: judge/models/profile.py:35 +#: judge/models/profile.py:42 msgid "Organization name shown in URL" msgstr "Tên được hiển thị trong đường dẫn" -#: judge/models/profile.py:44 +#: judge/models/profile.py:51 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:49 +#: judge/models/profile.py:56 msgid "registrant" msgstr "người tạo" -#: judge/models/profile.py:52 +#: judge/models/profile.py:59 msgid "User who registered this organization" msgstr "Người tạo tổ chức" -#: judge/models/profile.py:56 +#: judge/models/profile.py:63 msgid "administrators" msgstr "người quản lý" -#: judge/models/profile.py:58 +#: judge/models/profile.py:65 msgid "Those who can edit this organization" msgstr "Những người có thể chỉnh sửa tổ chức" -#: judge/models/profile.py:61 +#: judge/models/profile.py:68 msgid "creation date" msgstr "ngày tạo" -#: judge/models/profile.py:64 +#: judge/models/profile.py:71 msgid "is open organization?" msgstr "tổ chức mở?" -#: judge/models/profile.py:65 +#: judge/models/profile.py:72 msgid "Allow joining organization" msgstr "Cho phép mọi người tham gia tổ chức" -#: judge/models/profile.py:69 +#: judge/models/profile.py:76 msgid "maximum size" msgstr "số lượng thành viên tối đa" -#: judge/models/profile.py:73 +#: judge/models/profile.py:80 msgid "" "Maximum amount of users in this organization, only applicable to private " "organizations" msgstr "Số người tối đa trong tổ chức, chỉ áp dụng với tổ chức riêng tư" -#: judge/models/profile.py:79 +#: judge/models/profile.py:86 msgid "Student access code" msgstr "Mã truy cập cho học sinh" -#: judge/models/profile.py:90 +#: judge/models/profile.py:97 msgid "" "This image will replace the default site logo for users viewing the " "organization." msgstr "Ảnh này sẽ thay thế logo mặc định khi ở trong tổ chức." -#: judge/models/profile.py:129 judge/models/profile.py:158 -#: judge/models/profile.py:372 judge/models/profile.py:451 +#: judge/models/profile.py:136 judge/models/profile.py:165 +#: judge/models/profile.py:380 judge/models/profile.py:459 msgid "organization" msgstr "" -#: judge/models/profile.py:135 +#: judge/models/profile.py:142 msgid "user associated" msgstr "" -#: judge/models/profile.py:137 +#: judge/models/profile.py:144 msgid "self-description" msgstr "" -#: judge/models/profile.py:140 +#: judge/models/profile.py:147 msgid "location" msgstr "" -#: judge/models/profile.py:146 +#: judge/models/profile.py:153 msgid "preferred language" msgstr "" -#: judge/models/profile.py:154 +#: judge/models/profile.py:161 msgid "last access time" msgstr "" -#: judge/models/profile.py:155 +#: judge/models/profile.py:162 msgid "last IP" msgstr "" -#: judge/models/profile.py:166 +#: judge/models/profile.py:173 msgid "display rank" msgstr "" -#: judge/models/profile.py:174 +#: judge/models/profile.py:181 msgid "comment mute" msgstr "" -#: judge/models/profile.py:175 +#: judge/models/profile.py:182 msgid "Some users are at their best when silent." msgstr "" -#: judge/models/profile.py:179 +#: judge/models/profile.py:186 msgid "unlisted user" msgstr "" -#: judge/models/profile.py:180 +#: judge/models/profile.py:187 msgid "User will not be ranked." msgstr "" -#: judge/models/profile.py:184 +#: judge/models/profile.py:191 #, fuzzy #| msgid "Banned from joining" msgid "banned from voting" msgstr "Bị cấm tham gia" -#: judge/models/profile.py:185 +#: judge/models/profile.py:192 msgid "User will not be able to vote on problems' point values." msgstr "" -#: judge/models/profile.py:190 +#: judge/models/profile.py:197 msgid "user script" msgstr "" -#: judge/models/profile.py:194 +#: judge/models/profile.py:201 msgid "User-defined JavaScript for site customization." msgstr "" -#: judge/models/profile.py:198 +#: judge/models/profile.py:205 msgid "current contest" msgstr "kỳ thi hiện tại" -#: judge/models/profile.py:205 +#: judge/models/profile.py:212 msgid "math engine" msgstr "" -#: judge/models/profile.py:209 +#: judge/models/profile.py:216 msgid "the rendering engine used to render math" msgstr "" -#: judge/models/profile.py:212 +#: judge/models/profile.py:219 msgid "2FA enabled" msgstr "" -#: judge/models/profile.py:214 +#: judge/models/profile.py:221 msgid "check to enable TOTP-based two factor authentication" msgstr "đánh dấu để sử dụng TOTP-based two factor authentication" -#: judge/models/profile.py:220 +#: judge/models/profile.py:227 msgid "TOTP key" msgstr "mã TOTP" -#: judge/models/profile.py:221 +#: judge/models/profile.py:228 msgid "32 character base32-encoded key for TOTP" msgstr "" -#: judge/models/profile.py:223 +#: judge/models/profile.py:230 msgid "TOTP key must be empty or base32" msgstr "" -#: judge/models/profile.py:227 +#: judge/models/profile.py:234 msgid "internal notes" msgstr "ghi chú nội bộ" -#: judge/models/profile.py:230 +#: judge/models/profile.py:237 msgid "Notes for administrators regarding this user." msgstr "Ghi chú riêng cho quản trị viên." -#: judge/models/profile.py:359 +#: judge/models/profile.py:367 msgid "user profile" msgstr "thông tin người dùng" -#: judge/models/profile.py:360 +#: judge/models/profile.py:368 msgid "user profiles" msgstr "thông tin người dùng" -#: judge/models/profile.py:376 +#: judge/models/profile.py:384 msgid "request time" msgstr "thời gian đăng ký" -#: judge/models/profile.py:379 +#: judge/models/profile.py:387 msgid "state" msgstr "trạng thái" -#: judge/models/profile.py:386 +#: judge/models/profile.py:394 msgid "reason" msgstr "lý do" -#: judge/models/profile.py:389 +#: judge/models/profile.py:397 msgid "organization join request" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:390 +#: judge/models/profile.py:398 msgid "organization join requests" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:456 +#: judge/models/profile.py:464 #, fuzzy #| msgid "last seen" msgid "last visit" @@ -2580,17 +2592,17 @@ msgstr "" msgid "How did you corrupt the generator path?" msgstr "" -#: judge/utils/problem_data.py:237 +#: judge/utils/problem_data.py:236 msgid "Invalid interactor judge" msgstr "" -#: judge/utils/problem_data.py:249 +#: judge/utils/problem_data.py:260 #, fuzzy #| msgid "Invalid Return" msgid "Invalid signature handler" msgstr "Invalid Return" -#: judge/utils/problem_data.py:254 +#: judge/utils/problem_data.py:263 msgid "Invalid signature header" msgstr "" @@ -2648,7 +2660,7 @@ msgstr "%h:%m" #: judge/views/about.py:10 templates/organization/home.html:47 #: templates/organization/org-right-sidebar.html:70 -#: templates/user/user-about.html:83 templates/user/user-tabs.html:4 +#: templates/user/user-about.html:72 templates/user/user-tabs.html:4 #: templates/user/users-table.html:22 msgid "About" msgstr "Giới thiệu" @@ -2662,11 +2674,11 @@ msgstr "Hướng dẫn viết trình chấm" msgid "Page %d of Posts" msgstr "Trang %d" -#: judge/views/blog.py:152 +#: judge/views/blog.py:149 msgid "Ticket feed" msgstr "Báo cáo" -#: judge/views/blog.py:169 +#: judge/views/blog.py:166 msgid "Comment feed" msgstr "Bình luận" @@ -2682,8 +2694,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:253 judge/views/organization.py:810 -#: judge/views/organization.py:956 judge/views/organization.py:1121 +#: judge/views/comment.py:253 judge/views/organization.py:807 +#: judge/views/organization.py:953 judge/views/organization.py:1118 msgid "Edited from site" msgstr "Chỉnh sửa từ web" @@ -2692,7 +2704,7 @@ msgid "Editing comment" msgstr "Chỉnh sửa bình luận" #: judge/views/contests.py:119 judge/views/contests.py:387 -#: judge/views/contests.py:392 judge/views/contests.py:649 +#: judge/views/contests.py:392 judge/views/contests.py:663 msgid "No such contest" msgstr "Không có contest nào như vậy" @@ -2703,7 +2715,7 @@ msgstr "Không tìm thấy kỳ thi với mã \"%s\"." #: judge/views/contests.py:139 judge/views/stats.py:178 #: templates/organization/org-left-sidebar.html:5 templates/stats/site.html:21 -#: templates/user/user-bookmarks.html:54 +#: templates/user/user-bookmarks.html:56 msgid "Contests" msgstr "Kỳ thi" @@ -2716,113 +2728,113 @@ 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:454 +#: judge/views/contests.py:451 msgid "Clone Contest" msgstr "Nhân bản kỳ thi" -#: judge/views/contests.py:523 +#: judge/views/contests.py:537 msgid "Contest not ongoing" msgstr "Kỳ thi đang không diễn ra" -#: judge/views/contests.py:524 +#: judge/views/contests.py:538 #, python-format msgid "\"%s\" is not currently ongoing." msgstr "\"%s\" kỳ thi đang không diễn ra." -#: judge/views/contests.py:531 +#: judge/views/contests.py:545 msgid "Already in contest" msgstr "Đã ở trong kỳ thi" -#: judge/views/contests.py:532 +#: judge/views/contests.py:546 #, python-format msgid "You are already in a contest: \"%s\"." msgstr "Bạn đã ở trong kỳ thi: \"%s\"." -#: judge/views/contests.py:542 +#: judge/views/contests.py:556 msgid "Banned from joining" msgstr "Bị cấm tham gia" -#: judge/views/contests.py:544 +#: judge/views/contests.py:558 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:633 +#: judge/views/contests.py:647 #, python-format msgid "Enter access code for \"%s\"" msgstr "Nhập mật khẩu truy cập cho \"%s\"" -#: judge/views/contests.py:650 +#: judge/views/contests.py:664 #, python-format msgid "You are not in contest \"%s\"." msgstr "Bạn không ở trong kỳ thi \"%s\"." -#: judge/views/contests.py:673 +#: judge/views/contests.py:687 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:731 +#: judge/views/contests.py:745 #, python-format msgid "Contests in %(month)s" msgstr "Các kỳ thi trong %(month)s" -#: judge/views/contests.py:732 +#: judge/views/contests.py:746 msgid "F Y" msgstr "F Y" -#: judge/views/contests.py:792 +#: judge/views/contests.py:806 #, python-format msgid "%s Statistics" msgstr "%s Thống kê" -#: judge/views/contests.py:1085 +#: judge/views/contests.py:1099 #, python-format msgid "%s Rankings" msgstr "%s Bảng điểm" -#: judge/views/contests.py:1096 +#: judge/views/contests.py:1110 msgid "???" msgstr "???" -#: judge/views/contests.py:1123 +#: judge/views/contests.py:1137 #, python-format msgid "Your participation in %s" msgstr "Lần tham gia trong %s" -#: judge/views/contests.py:1124 +#: judge/views/contests.py:1138 #, python-format msgid "%s's participation in %s" msgstr "Lần tham gia của %s trong %s" -#: judge/views/contests.py:1138 +#: judge/views/contests.py:1152 msgid "Live" msgstr "Trực tiếp" -#: judge/views/contests.py:1157 templates/contest/contest-tabs.html:19 +#: judge/views/contests.py:1171 templates/contest/contest-tabs.html:19 msgid "Participation" msgstr "Lần tham gia" -#: judge/views/contests.py:1206 +#: judge/views/contests.py:1220 #, python-format msgid "%s MOSS Results" msgstr "%s Kết quả MOSS" -#: judge/views/contests.py:1242 +#: judge/views/contests.py:1256 #, python-format msgid "Running MOSS for %s..." msgstr "Đang chạy MOSS cho %s..." -#: judge/views/contests.py:1265 +#: judge/views/contests.py:1279 #, python-format msgid "Contest tag: %s" msgstr "Nhãn kỳ thi: %s" -#: judge/views/contests.py:1280 judge/views/ticket.py:72 +#: judge/views/contests.py:1294 judge/views/ticket.py:72 msgid "Issue description" msgstr "Mô tả vấn đề" -#: judge/views/contests.py:1323 +#: judge/views/contests.py:1337 #, python-format msgid "New clarification for %s" msgstr "Thông báo mới cho %s" @@ -2889,13 +2901,13 @@ msgstr "Không thể chỉnh sửa tổ chức" 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:193 judge/views/organization.py:340 +#: judge/views/organization.py:193 judge/views/organization.py:337 #, fuzzy #| msgid "Can't edit organization" msgid "Can't access organization" msgstr "Không thể chỉnh sửa tổ chức" -#: judge/views/organization.py:194 judge/views/organization.py:341 +#: judge/views/organization.py:194 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." @@ -2906,57 +2918,62 @@ msgstr "Bạn không được phép chỉnh sửa tổ chức này." msgid "Groups" msgstr "Nhóm" -#: judge/views/organization.py:347 +#: judge/views/organization.py:344 #, python-format msgid "%s Members" msgstr "%s Thành viên" -#: judge/views/organization.py:469 +#: judge/views/organization.py:466 #, python-brace-format msgid "All submissions in {0}" msgstr "Bài nộp trong {0}" -#: judge/views/organization.py:499 judge/views/organization.py:505 -#: judge/views/organization.py:512 +#: 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:500 +#: judge/views/organization.py:497 msgid "You are already in the group." msgstr "Bạn đã ở trong nhóm." -#: judge/views/organization.py:505 +#: 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:528 +#: judge/views/organization.py:510 judge/views/register.py:62 +#, 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:525 msgid "Leaving group" msgstr "Rời nhóm" -#: judge/views/organization.py:529 +#: judge/views/organization.py:526 #, python-format msgid "You are not in \"%s\"." msgstr "Bạn không ở trong \"%s\"." -#: judge/views/organization.py:554 +#: judge/views/organization.py:551 #, python-format msgid "Request to join %s" msgstr "Đăng ký tham gia %s" -#: judge/views/organization.py:584 +#: judge/views/organization.py:581 msgid "Join request detail" msgstr "Chi tiết đơn đăng ký" -#: judge/views/organization.py:626 +#: judge/views/organization.py:623 msgid "Manage join requests" msgstr "Quản lý đơn đăng ký" -#: judge/views/organization.py:630 +#: 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:670 +#: judge/views/organization.py:667 #, python-format msgid "" "Your organization can only receive %d more members. You cannot approve %d " @@ -2965,96 +2982,96 @@ 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:688 +#: 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:691 +#: 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:731 +#: 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:743 +#: 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:763 judge/views/organization.py:771 +#: 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:764 +#: judge/views/organization.py:761 msgid "The user you are trying to kick does not exist!" msgstr "" -#: judge/views/organization.py:772 +#: 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:793 judge/views/organization.py:945 +#: judge/views/organization.py:790 judge/views/organization.py:942 #, fuzzy, python-format #| msgid "Editing %s" msgid "Edit %s" msgstr "Đang chỉnh sửa %s" -#: judge/views/organization.py:821 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:836 +#: judge/views/organization.py:833 msgid "Exceeded limit" msgstr "" -#: judge/views/organization.py:837 +#: 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:842 judge/views/organization.py:867 -#: judge/views/organization.py:1011 +#: judge/views/organization.py:839 judge/views/organization.py:864 +#: judge/views/organization.py:1008 msgid "Added from site" msgstr "Thêm từ web" -#: judge/views/organization.py:858 +#: judge/views/organization.py:855 #: templates/organization/org-right-sidebar.html:55 msgid "Add contest" msgstr "Thêm kỳ thi" -#: judge/views/organization.py:901 judge/views/organization.py:1063 +#: judge/views/organization.py:898 judge/views/organization.py:1060 msgid "Permission denied" msgstr "Truy cập bị từ chối" -#: judge/views/organization.py:902 +#: 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:1000 +#: judge/views/organization.py:997 #, python-format msgid "Add blog for %s" msgstr "Thêm bài đăng cho %s" -#: judge/views/organization.py:1064 +#: judge/views/organization.py:1061 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:1096 +#: judge/views/organization.py:1093 #, python-format msgid "Edit blog %s" msgstr "Chỉnh sửa %s" -#: judge/views/organization.py:1147 +#: judge/views/organization.py:1144 #, python-format msgid "Pending blogs in %s" msgstr "Bài đang đợi duyệt trong %s" @@ -3078,41 +3095,41 @@ msgstr "Hướng dẫn cho {0}" msgid "Editorial for {0}" msgstr "Hướng dẫn cho {0}" -#: judge/views/problem.py:467 templates/contest/contest.html:96 +#: judge/views/problem.py:461 templates/contest/contest.html:96 #: templates/organization/org-left-sidebar.html:4 -#: templates/user/user-about.html:28 templates/user/user-bookmarks.html:34 +#: 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:843 +#: judge/views/problem.py:837 msgid "Problem feed" msgstr "Bài tập" -#: judge/views/problem.py:1071 +#: judge/views/problem.py:1062 msgid "Banned from submitting" msgstr "Bị cấm nộp bài" -#: judge/views/problem.py:1073 +#: judge/views/problem.py:1064 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:1096 +#: judge/views/problem.py:1087 msgid "Too many submissions" msgstr "Quá nhiều lần nộp" -#: judge/views/problem.py:1098 +#: judge/views/problem.py:1089 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:1177 judge/views/problem.py:1182 +#: judge/views/problem.py:1168 judge/views/problem.py:1173 #, python-format msgid "Submit to %(problem)s" msgstr "Nộp bài cho %(problem)s" -#: judge/views/problem.py:1208 +#: judge/views/problem.py:1199 msgid "Clone Problem" msgstr "Nhân bản bài tập" @@ -3188,7 +3205,7 @@ msgstr "Các bài nộp tốt nhất cho {0}" msgid "A username must contain letters, numbers, or underscores" msgstr "Tên đăng nhập phải chứa ký tự, chữ số, hoặc dấu gạch dưới" -#: judge/views/register.py:42 templates/user/edit-profile.html:117 +#: judge/views/register.py:42 templates/user/edit-profile.html:123 msgid "Preferred language" msgstr "Ngôn ngữ ưa thích" @@ -3413,22 +3430,22 @@ msgstr "j M, Y" msgid "M j, Y, G:i" msgstr "j M, Y, G:i" -#: judge/views/user.py:416 +#: judge/views/user.py:414 msgid "Updated on site" msgstr "Được cập nhật trên web" -#: judge/views/user.py:431 templates/admin/auth/user/change_form.html:14 +#: judge/views/user.py:429 templates/admin/auth/user/change_form.html:14 #: templates/admin/auth/user/change_form.html:17 templates/base.html:282 #: templates/user/user-tabs.html:11 msgid "Edit profile" msgstr "Chỉnh sửa thông tin" -#: judge/views/user.py:442 templates/user/user-left-sidebar.html:2 +#: judge/views/user.py:440 templates/user/user-left-sidebar.html:2 #: templates/user/user-list-tabs.html:4 msgid "Leaderboard" msgstr "Xếp hạng" -#: judge/views/user.py:543 +#: judge/views/user.py:541 msgid "Import Users" msgstr "" @@ -3509,7 +3526,7 @@ msgstr "Chỉnh sửa thông tin" msgid "Rejudge" msgstr "Chấm lại" -#: templates/base.html:227 templates/chat/chat.html:600 +#: templates/base.html:227 templates/chat/chat.html:610 msgid "Chat" msgstr "Chat" @@ -3646,7 +3663,7 @@ msgstr "Thêm mới" 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.html:574 +#: templates/chat/chat.html:5 templates/chat/chat.html:584 msgid "Chat Box" msgstr "Chat Box" @@ -3670,21 +3687,21 @@ msgstr "Tin nhắn mới" msgid "Mute this user and delete all messages?" msgstr "Mute người dùng này và xóa tất cả tin nhắn chung?" -#: templates/chat/chat.html:536 templates/chat/chat.html:617 +#: templates/chat/chat.html:546 templates/chat/chat.html:627 #: 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:602 templates/chat/chat.html:609 +#: templates/chat/chat.html:612 templates/chat/chat.html:619 msgid "Online Users" msgstr "Trực tuyến" -#: templates/chat/chat.html:638 +#: templates/chat/chat.html:648 msgid "Emoji" msgstr "" -#: templates/chat/chat.html:639 +#: templates/chat/chat.html:649 msgid "Enter your message" msgstr "Nhập tin nhắn" @@ -3753,9 +3770,7 @@ msgid "Hide" msgstr "Ẩn" #: templates/comments/content-list.html:94 -#| msgid "" -#| "This comment is hidden due to too much negative feedback. Click here to view it." +#, python-format msgid "" "This comment is hidden due to too much negative feedback. Click here " @@ -3868,11 +3883,17 @@ msgstr "Thứ bảy" msgid "Create" msgstr "Tạo mới" -#: templates/contest/clone.html:37 +#: templates/contest/clone.html:45 msgid "Enter a new key for the cloned contest:" msgstr "Nhập mã kỳ thi cho kỳ thi nhân bản:" -#: templates/contest/clone.html:40 templates/problem/clone.html:40 +#: templates/contest/clone.html:47 +#, fuzzy +#| msgid "Groups" +msgid "Group:" +msgstr "Nhóm" + +#: templates/contest/clone.html:55 templates/problem/clone.html:40 msgid "Clone!" msgstr "Nhân bản!" @@ -4164,11 +4185,11 @@ msgstr "Khôi phục kết quả" msgid "Disqualify" msgstr "Hủy kết quả" -#: templates/contest/ranking-table.html:54 templates/user/edit-profile.html:94 +#: templates/contest/ranking-table.html:54 templates/user/edit-profile.html:96 msgid "Fullname" msgstr "Tên đầy đủ" -#: templates/contest/ranking-table.html:55 templates/user/edit-profile.html:98 +#: templates/contest/ranking-table.html:55 templates/user/edit-profile.html:100 #: templates/user/import/table_csv.html:7 msgid "School" msgstr "Trường" @@ -4893,10 +4914,6 @@ msgstr "Hiển thị hướng dẫn" msgid "Have editorial" msgstr "Có hướng dẫn" -#: templates/problem/search-form.html:46 -msgid "Group" -msgstr "" - #: templates/problem/search-form.html:70 templates/problem/search-form.html:72 #: templates/submission/list.html:381 #: templates/submission/submission-list-tabs.html:4 @@ -5092,7 +5109,6 @@ msgid "Default language" msgstr "Ngôn ngữ ưa thích" #: templates/registration/registration_form.html:81 -#: templates/user/edit-profile.html:147 msgid "Affiliated organizations" msgstr "Tổ chức bạn muốn tham gia" @@ -5501,42 +5517,42 @@ msgid "Rank" msgstr "Rank" #: templates/user/edit-profile.html:104 +msgid "Avatar" +msgstr "Ảnh đại diện" + +#: templates/user/edit-profile.html:110 msgid "Self-description" msgstr "Tự giới thiệu" -#: templates/user/edit-profile.html:112 +#: templates/user/edit-profile.html:118 msgid "Select your closest major city" msgstr "Chọn thành phố gần nhất" -#: templates/user/edit-profile.html:121 +#: templates/user/edit-profile.html:127 msgid "Editor theme" msgstr "Giao diện cho code editor" -#: templates/user/edit-profile.html:126 +#: templates/user/edit-profile.html:132 msgid "Math engine" msgstr "" -#: templates/user/edit-profile.html:132 templates/user/edit-profile.html:133 -msgid "Change your avatar" -msgstr "Đổi ảnh đại diện" - #: templates/user/edit-profile.html:139 msgid "Change your password" msgstr "Đổi mật khẩu" -#: templates/user/edit-profile.html:156 +#: templates/user/edit-profile.html:150 msgid "Two Factor Authentication is enabled." msgstr "Two Factor Authentication đã được kích hoạt." -#: templates/user/edit-profile.html:163 +#: templates/user/edit-profile.html:157 msgid "Two Factor Authentication is disabled." msgstr "Two Factor Authentication đã được hủy kích hoạt." -#: templates/user/edit-profile.html:168 +#: templates/user/edit-profile.html:162 msgid "User-script" msgstr "" -#: templates/user/edit-profile.html:172 +#: templates/user/edit-profile.html:166 msgid "Update profile" msgstr "Cập nhật thông tin" @@ -5597,80 +5613,76 @@ msgstr "Rank theo rating" msgid "Rank by points" msgstr "Rank theo điểm" -#: templates/user/user-about.html:64 -msgid "From" -msgstr "Đến từ" - -#: templates/user/user-about.html:75 +#: templates/user/user-about.html:65 msgid "Admin Notes" msgstr "Lưu ý của admin" -#: templates/user/user-about.html:90 +#: templates/user/user-about.html:79 msgid "You have not shared any information." msgstr "Bạn chưa chia sẻ thông tin nào." -#: templates/user/user-about.html:92 +#: templates/user/user-about.html:81 msgid "This user has not shared any information." msgstr "Người dùng này chưa chia sẻ thông tin nào." -#: templates/user/user-about.html:101 +#: templates/user/user-about.html:90 msgid "Awards" msgstr "Thành tích" -#: templates/user/user-about.html:112 +#: templates/user/user-about.html:101 #, python-format msgid "%(label)s (%(date)s)" msgstr "%(label)s (%(date)s)" -#: templates/user/user-about.html:130 +#: templates/user/user-about.html:119 msgid "Mon" msgstr "Thứ 2" -#: templates/user/user-about.html:135 +#: templates/user/user-about.html:124 msgid "Tues" msgstr "Thứ 3" -#: templates/user/user-about.html:140 +#: templates/user/user-about.html:129 msgid "Wed" msgstr "Thứ 4" -#: templates/user/user-about.html:145 +#: templates/user/user-about.html:134 msgid "Thurs" msgstr "Thứ 5" -#: templates/user/user-about.html:150 +#: templates/user/user-about.html:139 msgid "Fri" msgstr "Thứ 6" -#: templates/user/user-about.html:155 +#: templates/user/user-about.html:144 msgid "Sat" msgstr "Thứ 7" -#: templates/user/user-about.html:160 +#: templates/user/user-about.html:149 msgid "Sun" msgstr "CN" -#: templates/user/user-about.html:169 +#: templates/user/user-about.html:158 msgid "Less" msgstr "Ít" -#: templates/user/user-about.html:175 +#: templates/user/user-about.html:164 msgid "More" msgstr "Nhiều" -#: templates/user/user-about.html:184 +#: templates/user/user-about.html:173 msgid "Rating History" msgstr "Các lần thi" -#: templates/user/user-about.html:255 +#: templates/user/user-about.html:244 msgid "past year" msgstr "năm ngoái" -#: templates/user/user-about.html:272 +#: templates/user/user-about.html:261 msgid "total submission(s)" msgstr "bài nộp" -#: templates/user/user-about.html:276 +#: templates/user/user-about.html:265 msgid "submissions in the last year" msgstr "bài nộp trong năm qua" @@ -5702,7 +5714,7 @@ msgstr "Max rating:" msgid "Posts" msgstr "Bài đăng" -#: templates/user/user-bookmarks.html:75 +#: templates/user/user-bookmarks.html:78 msgid "Editorials" msgstr "Lời giải" @@ -5756,6 +5768,12 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "Change your avatar" +#~ msgstr "Đổi ảnh đại diện" + +#~ msgid "From" +#~ msgstr "Đến từ" + #, fuzzy #~| msgid "How did you corrupt the custom checker path?" #~ msgid "How did you corrupt the interactor path?" diff --git a/templates/base.html b/templates/base.html index 1a014af..2dac3b3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -263,7 +263,7 @@ {% else %} diff --git a/templates/blog/list.html b/templates/blog/list.html index 6677bf8..b969749 100644 --- a/templates/blog/list.html +++ b/templates/blog/list.html @@ -42,8 +42,8 @@ {% block left_sidebar %}
      {{ make_tab_item('blog', 'fa fa-rss', url('home'), _('News')) }} - {{ make_tab_item('comment', 'fa fa-comments', url('comment_feed'), _('Comments')) }} - {{ make_tab_item('ticket', 'fa fa-question-circle', url('ticket_feed'), _('Tickets')) }} + {{ make_tab_item('comment', 'fa fa-comments', url('comment_feed'), _('Comment')) }} + {{ make_tab_item('ticket', 'fa fa-question-circle', url('ticket_feed'), _('Ticket')) }} {{ make_tab_item('event', 'fa fa-calendar', '#', _('Events')) }}
      {% endblock %} diff --git a/templates/three-column-content.html b/templates/three-column-content.html index 986404b..c4cd015 100644 --- a/templates/three-column-content.html +++ b/templates/three-column-content.html @@ -118,7 +118,7 @@ {% macro make_tab_item(name, fa, url, text) %}
      - {{ text }} + {{ text }}
      {% endmacro %} diff --git a/templates/user/edit-profile.html b/templates/user/edit-profile.html index 150cbec..0433ffd 100644 --- a/templates/user/edit-profile.html +++ b/templates/user/edit-profile.html @@ -101,7 +101,7 @@ {{ form_user.last_name }} - {{ _('Avatar') }}: + {{ _('Avatar') }}: {{ form.profile_image }} From af5bee5147cc427cda73184300c138b04512485a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 15:36:38 -0500 Subject: [PATCH 150/478] Update emails --- dmoj/urls.py | 20 +- judge/migrations/0163_email_change.py | 18 ++ judge/models/profile.py | 1 + judge/utils/email_render.py | 20 ++ judge/views/email.py | 104 ++++++ judge/views/register.py | 22 +- locale/vi/LC_MESSAGES/django.po | 300 +++++++++++++----- templates/email_change/email_change.html | 21 ++ .../email_change/email_change_failure.html | 4 + .../email_change/email_change_pending.html | 6 + .../email_change/email_change_success.html | 4 + templates/general_email.html | 21 ++ templates/pagedown.html | 2 +- templates/registration/activation_email.html | 29 +- .../registration/password_reset_email.html | 25 +- .../registration/registration_complete.html | 2 +- templates/registration/registration_form.html | 12 - templates/user/edit-profile.html | 40 ++- 18 files changed, 481 insertions(+), 170 deletions(-) create mode 100644 judge/migrations/0163_email_change.py create mode 100644 judge/utils/email_render.py create mode 100644 judge/views/email.py create mode 100644 templates/email_change/email_change.html create mode 100644 templates/email_change/email_change_failure.html create mode 100644 templates/email_change/email_change_pending.html create mode 100644 templates/email_change/email_change_success.html create mode 100644 templates/general_email.html diff --git a/dmoj/urls.py b/dmoj/urls.py index 54a7f12..402a569 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -65,6 +65,7 @@ from judge.views import ( internal, resolver, course, + email, ) from judge.views.problem_data import ( ProblemDataView, @@ -104,19 +105,19 @@ register_patterns = [ # confusing 404. url( r"^activate/(?P\w+)/$", - ActivationView.as_view(title="Activation key invalid"), + ActivationView.as_view(title=_("Activation key invalid")), name="registration_activate", ), url( r"^register/$", - RegistrationView.as_view(title="Register"), + RegistrationView.as_view(title=_("Register")), name="registration_register", ), url( r"^register/complete/$", TitledTemplateView.as_view( template_name="registration/registration_complete.html", - title="Registration Completed", + title=_("Registration Completed"), ), name="registration_complete", ), @@ -124,7 +125,7 @@ register_patterns = [ r"^register/closed/$", TitledTemplateView.as_view( template_name="registration/registration_closed.html", - title="Registration not allowed", + title=_("Registration not allowed"), ), name="registration_disallowed", ), @@ -183,6 +184,17 @@ register_patterns = [ ), name="password_reset_done", ), + url(r"^email/change/$", email.email_change_view, name="email_change"), + url( + r"^email/change/verify/(?P[0-9A-Za-z]+)-(?P.+)/$", + email.verify_email_view, + name="email_change_verify", + ), + url( + r"^email/change/pending$", + email.email_change_pending_view, + name="email_change_pending", + ), url(r"^social/error/$", register.social_auth_error, name="social_auth_error"), url(r"^2fa/$", totp.TOTPLoginView.as_view(), name="login_2fa"), url(r"^2fa/enable/$", totp.TOTPEnableView.as_view(), name="enable_2fa"), diff --git a/judge/migrations/0163_email_change.py b/judge/migrations/0163_email_change.py new file mode 100644 index 0000000..985121d --- /dev/null +++ b/judge/migrations/0163_email_change.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.18 on 2023-08-25 00:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0162_profile_image"), + ] + + operations = [ + migrations.AddField( + model_name="profile", + name="email_change_pending", + field=models.EmailField(blank=True, max_length=254, null=True), + ), + ] diff --git a/judge/models/profile.py b/judge/models/profile.py index 8c8a31d..eb3572a 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -237,6 +237,7 @@ class Profile(models.Model): help_text=_("Notes for administrators regarding this user."), ) profile_image = models.ImageField(upload_to=profile_image_path, null=True) + email_change_pending = models.EmailField(blank=True, null=True) @cached_property def organization(self): diff --git a/judge/utils/email_render.py b/judge/utils/email_render.py new file mode 100644 index 0000000..5d790f5 --- /dev/null +++ b/judge/utils/email_render.py @@ -0,0 +1,20 @@ +from django.template.loader import render_to_string +from django.contrib.sites.shortcuts import get_current_site +from django.conf import settings + + +def render_email_message(request, contexts): + current_site = get_current_site(request) + email_contexts = { + "username": request.user.username, + "domain": current_site.domain, + "protocol": "https" if request.is_secure() else "http", + "site_name": settings.SITE_NAME, + "message": None, + "title": None, + "button_text": "Click here", + "url_path": None, + } + email_contexts.update(contexts) + message = render_to_string("general_email.html", email_contexts) + return message diff --git a/judge/views/email.py b/judge/views/email.py new file mode 100644 index 0000000..ede173a --- /dev/null +++ b/judge/views/email.py @@ -0,0 +1,104 @@ +from django.contrib.auth.tokens import default_token_generator +from django.core.mail import send_mail +from django.shortcuts import render, redirect +from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode +from django.utils.encoding import force_bytes, force_text +from django.conf import settings +from django import forms +from django.utils.translation import gettext_lazy as _ +from django.urls import reverse +from django.contrib.auth.decorators import login_required +from django.contrib.auth.models import User + +from urllib.parse import urlencode, urlunparse, urlparse + +from judge.models import Profile +from judge.utils.email_render import render_email_message + + +class EmailChangeForm(forms.Form): + new_email = forms.EmailField(label=_("New Email")) + + def clean_new_email(self): + new_email = self.cleaned_data.get("new_email") + if User.objects.filter(email=new_email).exists(): + raise forms.ValidationError(_("An account with this email already exists.")) + return new_email + + +@login_required +def email_change_view(request): + form = EmailChangeForm(request.POST or None) + + if request.method == "POST" and form.is_valid(): + new_email = request.POST.get("new_email") + user = request.user + profile = request.profile + + # Generate a token for email verification + token = default_token_generator.make_token(user) + uid = urlsafe_base64_encode(force_bytes(user.pk)) + + # Send the email to the user + subject = _(f"{settings.SITE_NAME} - Email Change Request") + email_contexts = { + "message": _( + "We have received a request to change your email to this email. Click the button below to change your email:" + ), + "title": _("Email Change"), + "button_text": _("Change Email"), + "url_path": reverse( + "email_change_verify", kwargs={"uidb64": uid, "token": token} + ), + } + message = render_email_message(request, email_contexts) + send_mail(subject, message, settings.EMAIL_HOST_USER, [new_email]) + profile.email_change_pending = new_email + profile.save() + return redirect("email_change_pending") + + return render( + request, + "email_change/email_change.html", + { + "form": form, + "title": _("Change email"), + }, + ) + + +def verify_email_view(request, uidb64, token): + try: + uid = force_text(urlsafe_base64_decode(uidb64)) + user = User.objects.get(pk=uid) + except (TypeError, ValueError, OverflowError, User.DoesNotExist): + user = None + if user is not None and default_token_generator.check_token(user, token): + # Update the user's email address + profile = Profile.objects.get(user=user) + new_email = profile.email_change_pending + if new_email: + user.email = new_email + profile.email_change_pending = None + user.save() + profile.save() + + return render( + request, + "email_change/email_change_success.html", + {"title": _("Success"), "user": user}, + ) + + return render( + request, "email_change/email_change_failure.html", {"title": _("Invalid")} + ) + + +def email_change_pending_view(request): + return render( + request, + "email_change/email_change_pending.html", + { + "title": _("Email change pending"), + }, + ) diff --git a/judge/views/register.py b/judge/views/register.py index 76e8267..58d1d6f 100644 --- a/judge/views/register.py +++ b/judge/views/register.py @@ -15,7 +15,7 @@ from registration.backends.default.views import ( from registration.forms import RegistrationForm from sortedm2m.forms import SortedMultipleChoiceField -from judge.models import Language, Organization, Profile, TIMEZONE +from judge.models import Language, Profile, TIMEZONE from judge.utils.recaptcha import ReCaptchaField, ReCaptchaWidget from judge.widgets import Select2MultipleWidget, Select2Widget @@ -43,29 +43,10 @@ class CustomRegistrationForm(RegistrationForm): empty_label=None, widget=Select2Widget(attrs={"style": "width:100%"}), ) - organizations = SortedMultipleChoiceField( - queryset=Organization.objects.filter(is_open=True), - label=_("Groups"), - required=False, - widget=Select2MultipleWidget(attrs={"style": "width:100%"}), - ) if ReCaptchaField is not None: captcha = ReCaptchaField(widget=ReCaptchaWidget()) - def clean_organizations(self): - organizations = self.cleaned_data.get("organizations") or [] - max_orgs = settings.DMOJ_USER_MAX_ORGANIZATION_COUNT - - if sum(org.is_open for org in organizations) > max_orgs: - raise forms.ValidationError( - _("You may not be part of more than {count} public groups.").format( - count=max_orgs - ) - ) - - return self.cleaned_data["organizations"] - def clean_email(self): if User.objects.filter(email=self.cleaned_data["email"]).exists(): raise forms.ValidationError( @@ -116,7 +97,6 @@ class RegistrationView(OldRegistrationView): cleaned_data = form.cleaned_data profile.timezone = cleaned_data["timezone"] profile.language = cleaned_data["language"] - profile.organizations.add(*cleaned_data["organizations"]) profile.save() return user diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 425241f..223d184 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: 2023-08-24 23:09+0700\n" +"POT-Creation-Date: 2023-08-26 03:32+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -21,7 +21,7 @@ msgstr "" #: chat_box/models.py:31 chat_box/models.py:54 chat_box/models.py:68 #: judge/admin/interface.py:150 judge/models/contest.py:636 #: judge/models/contest.py:845 judge/models/course.py:115 -#: judge/models/profile.py:374 judge/models/profile.py:452 +#: judge/models/profile.py:375 judge/models/profile.py:453 msgid "user" msgstr "người dùng" @@ -49,11 +49,27 @@ msgstr "Tiếng Việt" msgid "English" msgstr "" -#: dmoj/urls.py:135 +#: dmoj/urls.py:108 +msgid "Activation key invalid" +msgstr "Mã kích hoạt không hợp lệ" + +#: dmoj/urls.py:113 +msgid "Register" +msgstr "Đăng ký" + +#: dmoj/urls.py:120 +msgid "Registration Completed" +msgstr "Đăng ký hoàn thành" + +#: dmoj/urls.py:128 +msgid "Registration not allowed" +msgstr "Đăng ký không thành công" + +#: dmoj/urls.py:136 msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:212 templates/base.html:209 +#: dmoj/urls.py:216 templates/base.html:209 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -293,13 +309,13 @@ msgid "User" msgstr "Thành viên" #: judge/admin/profile.py:132 templates/registration/registration_form.html:40 -#: templates/user/import/table_csv.html:8 +#: templates/user/edit-profile.html:116 templates/user/import/table_csv.html:8 msgid "Email" msgstr "Email" #: judge/admin/profile.py:138 judge/views/register.py:36 #: templates/registration/registration_form.html:68 -#: templates/user/edit-profile.html:119 +#: templates/user/edit-profile.html:140 msgid "Timezone" msgstr "Múi giờ" @@ -497,7 +513,7 @@ msgstr "Tên đăng nhập" #: judge/forms.py:428 templates/registration/registration_form.html:46 #: templates/registration/registration_form.html:60 -#: templates/user/import/table_csv.html:5 +#: templates/user/edit-profile.html:108 templates/user/import/table_csv.html:5 msgid "Password" msgstr "Mật khẩu" @@ -1972,7 +1988,7 @@ msgid "" msgstr "Ảnh này sẽ thay thế logo mặc định khi ở trong tổ chức." #: judge/models/profile.py:136 judge/models/profile.py:165 -#: judge/models/profile.py:380 judge/models/profile.py:459 +#: judge/models/profile.py:381 judge/models/profile.py:460 msgid "organization" msgstr "" @@ -2078,35 +2094,35 @@ msgstr "ghi chú nội bộ" msgid "Notes for administrators regarding this user." msgstr "Ghi chú riêng cho quản trị viên." -#: judge/models/profile.py:367 +#: judge/models/profile.py:368 msgid "user profile" msgstr "thông tin người dùng" -#: judge/models/profile.py:368 +#: judge/models/profile.py:369 msgid "user profiles" msgstr "thông tin người dùng" -#: judge/models/profile.py:384 +#: judge/models/profile.py:385 msgid "request time" msgstr "thời gian đăng ký" -#: judge/models/profile.py:387 +#: judge/models/profile.py:388 msgid "state" msgstr "trạng thái" -#: judge/models/profile.py:394 +#: judge/models/profile.py:395 msgid "reason" msgstr "lý do" -#: judge/models/profile.py:397 +#: judge/models/profile.py:398 msgid "organization join request" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:398 +#: judge/models/profile.py:399 msgid "organization join requests" msgstr "đơn đăng ký tham gia" -#: judge/models/profile.py:464 +#: judge/models/profile.py:465 #, fuzzy #| msgid "last seen" msgid "last visit" @@ -2839,6 +2855,55 @@ msgstr "Mô tả vấn đề" msgid "New clarification for %s" msgstr "Thông báo mới cho %s" +#: judge/views/email.py:19 +#, fuzzy +#| msgid "Email" +msgid "New Email" +msgstr "Email" + +#: judge/views/email.py:23 +#, fuzzy +#| msgid "Contest with key already exists." +msgid "An account with this email already exists." +msgstr "Mã kỳ thi đã tồn tại." + +#: judge/views/email.py:41 +#, python-brace-format +msgid "{settings.SITE_NAME} - Email Change Request" +msgstr "" + +#: judge/views/email.py:43 +msgid "" +"We have received a request to change your email to this email. Click the " +"button below to change your email:" +msgstr "" +"Chúng tôi đã nhận được yêu cầu thay đổi địa chỉ email của bạn thành địa chỉ " +"email này. Vui lòng nhấp vào nút bên dưới để thay đổi địa chỉ email của bạn:" + +#: judge/views/email.py:44 +msgid "Email Change" +msgstr "Thay đổi Email" + +#: judge/views/email.py:45 +msgid "Change Email" +msgstr "Thay đổi Email" + +#: judge/views/email.py:56 templates/user/edit-profile.html:120 +msgid "Change email" +msgstr "Thay đổi email" + +#: judge/views/email.py:76 +msgid "Success" +msgstr "Thành công" + +#: judge/views/email.py:78 +msgid "Invalid" +msgstr "Không hợp lệ" + +#: judge/views/email.py:83 +msgid "Email change pending" +msgstr "Yêu cầu thay đổi email đang đợi xác thực." + #: judge/views/error.py:17 msgid "404 error" msgstr "Lỗi 404" @@ -2902,19 +2967,17 @@ 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:193 judge/views/organization.py:337 -#, fuzzy -#| msgid "Can't edit organization" msgid "Can't access organization" -msgstr "Không thể chỉnh sửa tổ chức" +msgstr "Không thể truy cập nhóm" #: judge/views/organization.py:194 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:230 judge/views/register.py:48 -#: judge/views/stats.py:184 templates/contest/list.html:89 -#: templates/problem/list-base.html:97 templates/stats/site.html:33 -#: templates/user/user-left-sidebar.html:4 templates/user/user-list-tabs.html:6 +#: judge/views/organization.py:230 judge/views/stats.py:184 +#: templates/contest/list.html:89 templates/problem/list-base.html:97 +#: templates/stats/site.html:33 templates/user/user-left-sidebar.html:4 +#: templates/user/user-list-tabs.html:6 msgid "Groups" msgstr "Nhóm" @@ -2941,7 +3004,7 @@ msgstr "Bạn đã ở trong nhóm." msgid "This group is not open." msgstr "Nhóm này là nhóm kín." -#: judge/views/organization.py:510 judge/views/register.py:62 +#: 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." @@ -3205,11 +3268,11 @@ msgstr "Các bài nộp tốt nhất cho {0}" msgid "A username must contain letters, numbers, or underscores" msgstr "Tên đăng nhập phải chứa ký tự, chữ số, hoặc dấu gạch dưới" -#: judge/views/register.py:42 templates/user/edit-profile.html:123 +#: judge/views/register.py:42 templates/user/edit-profile.html:144 msgid "Preferred language" msgstr "Ngôn ngữ ưa thích" -#: judge/views/register.py:73 +#: judge/views/register.py:54 #, python-format msgid "" "The email address \"%s\" is already taken. Only one registration is allowed " @@ -3217,7 +3280,7 @@ msgid "" msgstr "" "Email \"%s\" đã được sử dụng. Mỗi email chỉ có thể đăng ký một tài khoản." -#: judge/views/register.py:85 +#: judge/views/register.py:66 msgid "" "Your email provider is not allowed due to history of abuse. Please use a " "reputable email provider." @@ -3225,11 +3288,11 @@ msgstr "" "Your email provider is not allowed due to history of abuse. Please use a " "reputable email provider." -#: judge/views/register.py:93 judge/views/register.py:131 +#: judge/views/register.py:74 judge/views/register.py:111 msgid "Registration" msgstr "Đăng ký" -#: judge/views/register.py:145 +#: judge/views/register.py:125 msgid "Authentication failure" msgstr "Xác thực thất bại" @@ -4185,11 +4248,11 @@ msgstr "Khôi phục kết quả" msgid "Disqualify" msgstr "Hủy kết quả" -#: templates/contest/ranking-table.html:54 templates/user/edit-profile.html:96 +#: templates/contest/ranking-table.html:54 templates/user/edit-profile.html:100 msgid "Fullname" msgstr "Tên đầy đủ" -#: templates/contest/ranking-table.html:55 templates/user/edit-profile.html:100 +#: templates/contest/ranking-table.html:55 templates/user/edit-profile.html:104 #: templates/user/import/table_csv.html:7 msgid "School" msgstr "Trường" @@ -4262,6 +4325,26 @@ msgstr "Còn" msgid "Upcoming contests" msgstr "Kỳ thi sắp diễn ra" +#: templates/email_change/email_change.html:19 +msgid "Verify Email" +msgstr "Xác thực Email" + +#: templates/email_change/email_change_failure.html:3 +msgid "Invalid reset link." +msgstr "Đường dẫn không hợp lệ" + +#: templates/email_change/email_change_pending.html:4 +msgid "An email was sent to" +msgstr "Email đã được gửi đến" + +#: templates/email_change/email_change_pending.html:4 +msgid "If you don't see it, kindly check your spam folder as well." +msgstr "Nếu bạn không tìm thấy nó, vui lòng kiểm tra thư mục spam của bạn." + +#: templates/email_change/email_change_success.html:3 +msgid "Your email was sucessfully changed to" +msgstr "Bạn đã đổi email thành công." + #: templates/feed/has_next.html:3 msgid "View more" msgstr "Xem thêm" @@ -4290,6 +4373,10 @@ msgstr "Dừng" msgid "Continue" msgstr "Tiếp tục" +#: templates/general_email.html:15 +msgid "Dear" +msgstr "Xin chào" + #: templates/internal/left-sidebar.html:3 msgid "Average speed" msgstr "Tốc độ trung bình" @@ -4505,6 +4592,10 @@ msgstr "Từ chối" msgid "Kick" msgstr "Đuổi" +#: templates/pagedown.html:9 +msgid "Update Preview" +msgstr "Cập nhật xem trước" + #: templates/problem/clone.html:37 msgid "Enter a new code for the cloned problem:" msgstr "Nhập mã bài mới cho bài tập được nhân bản:" @@ -4994,6 +5085,37 @@ msgstr "%(key)s không phải mã xác thực hợp lệ." msgid "Your account has been successfully activated." msgstr "Tài khoản được kích hoạt thành công." +#: templates/registration/activation_email.html:2 +msgid "Account activation" +msgstr "Kích hoạt tài khoản" + +#: templates/registration/activation_email.html:3 +#, python-format +msgid "" +"Thanks for registering! We're glad to have you. The last step is activating " +"your account. Please activate your account in the next %(expiration_days)d " +"days." +msgstr "" +"Cảm ơn bạn đã đăng ký! Chúng tôi rất vui được chào đón bạn. Bước cuối cùng " +"là kích hoạt tài khoản của bạn. Vui lòng kích hoạt tài khoản trong vòng " +"%(expiration_days)d ngày." + +#: templates/registration/activation_email.html:5 +msgid "Activate" +msgstr "Kích hoạt" + +#: templates/registration/activation_email.html:10 +msgid "" +"Alternatively, you can reply to this message to activate your account. Your " +"reply must keep the following text intact for this to work:" +msgstr "" +"Hoặc bạn có thể trả lời tin nhắn này để kích hoạt tài khoản của bạn. Email " +"trả lời của bạn phải giữ nguyên đoạn văn sau đây:" + +#: templates/registration/activation_email.html:16 +msgid "See you soon!" +msgstr "Hẹn sớm gặp lại bạn!" + #: templates/registration/login.html:9 msgid "Invalid username or password." msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." @@ -5032,6 +5154,7 @@ msgid "Your password has been set. You may go ahead and log in now" msgstr "Mật khẩu đã được cập nhật. Hãy thử đăng nhập lại" #: templates/registration/password_reset_confirm.html:9 +#: templates/registration/password_reset_email.html:5 msgid "Reset Password" msgstr "Reset mật khẩu" @@ -5039,7 +5162,7 @@ msgstr "Reset mật khẩu" msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." -msgstr "Kiểm tra email để xem hướng dẫn đặt mật khẩu." +msgstr "Chúng tôi đã gửi email cho bạn để đặt lại mật khẩu." #: templates/registration/password_reset_done.html:5 msgid "" @@ -5047,13 +5170,25 @@ msgid "" "you registered with, and check your spam folder." msgstr "Nếu bạn không nhận được email, hãy kiểm tra hộp thư rác (spam)." +#: templates/registration/password_reset_email.html:2 +msgid "Password Reset" +msgstr "Đặt lại mật khẩu" + +#: templates/registration/password_reset_email.html:3 +msgid "" +"We have received a request to reset your password. Click the button below to " +"reset your password:" +msgstr "" +"Chúng tôi đã nhận được yêu cầu đặt lại mật khẩu của bạn. Nhấn vào nút bên " +"dưới để đặt lại mật khẩu của bạn:" + #: templates/registration/password_reset_email.txt:1 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -"Bạn nhận được email này vì bạn đã yêu cầu reset mật khẩu tại %(site_name)s." +"Bạn nhận được email này vì bạn đã yêu cầu đặt lại mật khẩu tại %(site_name)s." #: templates/registration/password_reset_email.txt:3 msgid "Please go to the following page and choose a new password:" @@ -5075,7 +5210,7 @@ msgstr "%(site_name)s team" #: templates/registration/password_reset_subject.txt:1 #, python-format msgid "Password reset on %(site_name)s" -msgstr "Reset mật khẩu trên %(site_name)s" +msgstr "Đặt lại mật khẩu trên %(site_name)s" #: templates/registration/profile_creation.html:36 #: templates/registration/username_select.html:7 @@ -5089,8 +5224,9 @@ msgstr "Đăng ký hiện tại đã bị dừng. Hãy liên hệ admin." #: templates/registration/registration_complete.html:3 msgid "" "You have successfully been registered. An email has been sent to the email " -"address you provided to confirm your registration." -msgstr "Bạn đã đăng ký thành công. Kiểm tra email để hoàn thành việc xác thực." +"address you provided to confirm your registration. If you don't see it, " +"kindly check your spam folder as well." +msgstr "Bạn đã đăng ký thành công. Kiểm tra email để hoàn thành việc xác thực. Nếu bạn không tìm thấy nó, vui lòng kiểm tra thư mục spam của bạn." #: templates/registration/registration_form.html:61 msgid "(again, for confirmation)" @@ -5106,21 +5242,9 @@ msgstr "chọn từ bản đồ" #: templates/registration/registration_form.html:78 msgid "Default language" -msgstr "Ngôn ngữ ưa thích" +msgstr "Ngôn ngữ mặc định" -#: templates/registration/registration_form.html:81 -msgid "Affiliated organizations" -msgstr "Tổ chức bạn muốn tham gia" - -#: templates/registration/registration_form.html:97 -msgid "By registering, you agree to our" -msgstr "Bạn đồng ý với" - -#: templates/registration/registration_form.html:98 -msgid "Terms & Conditions" -msgstr "Điều khoản của chúng tôi" - -#: templates/registration/registration_form.html:101 +#: templates/registration/registration_form.html:89 msgid "Register!" msgstr "Đăng ký!" @@ -5128,7 +5252,7 @@ msgstr "Đăng ký!" #: templates/registration/totp_disable.html:45 #: templates/registration/totp_enable.html:83 msgid "Enter the 6-digit code generated by your app:" -msgstr "" +msgstr "Nhập mã xác thực gồm 6 chữ số từ app bạn chọn" #: templates/registration/totp_auth.html:41 #, python-format @@ -5516,43 +5640,51 @@ msgstr "Top Score" msgid "Rank" msgstr "Rank" -#: templates/user/edit-profile.html:104 -msgid "Avatar" -msgstr "Ảnh đại diện" - -#: templates/user/edit-profile.html:110 -msgid "Self-description" -msgstr "Tự giới thiệu" - -#: templates/user/edit-profile.html:118 -msgid "Select your closest major city" -msgstr "Chọn thành phố gần nhất" - -#: templates/user/edit-profile.html:127 -msgid "Editor theme" -msgstr "Giao diện cho code editor" - -#: templates/user/edit-profile.html:132 -msgid "Math engine" -msgstr "" - -#: templates/user/edit-profile.html:139 +#: templates/user/edit-profile.html:111 msgid "Change your password" msgstr "Đổi mật khẩu" -#: templates/user/edit-profile.html:150 +#: templates/user/edit-profile.html:125 +msgid "Avatar" +msgstr "Ảnh đại diện" + +#: templates/user/edit-profile.html:131 +msgid "Self-description" +msgstr "Tự giới thiệu" + +#: templates/user/edit-profile.html:139 +msgid "Select your closest major city" +msgstr "Chọn thành phố gần nhất" + +#: templates/user/edit-profile.html:148 +msgid "Editor theme" +msgstr "Giao diện cho code editor" + +#: templates/user/edit-profile.html:153 +msgid "Math engine" +msgstr "" + +#: templates/user/edit-profile.html:164 msgid "Two Factor Authentication is enabled." msgstr "Two Factor Authentication đã được kích hoạt." -#: templates/user/edit-profile.html:157 -msgid "Two Factor Authentication is disabled." -msgstr "Two Factor Authentication đã được hủy kích hoạt." +#: templates/user/edit-profile.html:168 +msgid "Disable" +msgstr "Tắt" -#: templates/user/edit-profile.html:162 +#: templates/user/edit-profile.html:171 +msgid "Two Factor Authentication is disabled." +msgstr "Two Factor Authentication chưa kích hoạt." + +#: templates/user/edit-profile.html:172 +msgid "Enable" +msgstr "Bật" + +#: templates/user/edit-profile.html:176 msgid "User-script" msgstr "" -#: templates/user/edit-profile.html:166 +#: templates/user/edit-profile.html:180 msgid "Update profile" msgstr "Cập nhật thông tin" @@ -5768,6 +5900,15 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "Affiliated organizations" +#~ msgstr "Tổ chức bạn muốn tham gia" + +#~ msgid "By registering, you agree to our" +#~ msgstr "Bạn đồng ý với" + +#~ msgid "Terms & Conditions" +#~ msgstr "Điều khoản của chúng tôi" + #~ msgid "Change your avatar" #~ msgstr "Đổi ảnh đại diện" @@ -5875,9 +6016,6 @@ msgstr "Chọn tất cả" #~ msgid "Color theme" #~ msgstr "Chủ đề màu sắc" -#~ msgid "Change color theme" -#~ msgstr "Đổi chủ đề màu sắc" - #~ msgid "commented on {time}" #~ msgstr "bình luận vào {time}" diff --git a/templates/email_change/email_change.html b/templates/email_change/email_change.html new file mode 100644 index 0000000..6033d18 --- /dev/null +++ b/templates/email_change/email_change.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% block media %} + +{% endblock %} + +{% block body %} +
      {% csrf_token %} + {{ form.as_table() }}
      +
      + +
      +{% endblock %} \ No newline at end of file diff --git a/templates/email_change/email_change_failure.html b/templates/email_change/email_change_failure.html new file mode 100644 index 0000000..aa3a348 --- /dev/null +++ b/templates/email_change/email_change_failure.html @@ -0,0 +1,4 @@ +{% extends "base.html" %} +{% block body %} +

      {{ _('Invalid reset link.') }}

      +{% endblock %} \ No newline at end of file diff --git a/templates/email_change/email_change_pending.html b/templates/email_change/email_change_pending.html new file mode 100644 index 0000000..3254fab --- /dev/null +++ b/templates/email_change/email_change_pending.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% block body %} + {% if request.profile.email_change_pending %} +

      {{ _('An email was sent to') }} {{request.profile.email_change_pending}}. {{_('If you don\'t see it, kindly check your spam folder as well.')}}

      + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/templates/email_change/email_change_success.html b/templates/email_change/email_change_success.html new file mode 100644 index 0000000..80e41e1 --- /dev/null +++ b/templates/email_change/email_change_success.html @@ -0,0 +1,4 @@ +{% extends "base.html" %} +{% block body %} +

      {{ _('Your email was sucessfully changed to') }} {{user.email}}

      +{% endblock %} \ No newline at end of file diff --git a/templates/general_email.html b/templates/general_email.html new file mode 100644 index 0000000..0fcdbbb --- /dev/null +++ b/templates/general_email.html @@ -0,0 +1,21 @@ + + +
      +
      + {{site_name}} +
      +
      +

      {{title}}

      +

      {{_('Dear')}} {{username}},

      +

      {{message}}

      +
      + +
      \ No newline at end of file diff --git a/templates/pagedown.html b/templates/pagedown.html index ab5867a..294b77d 100644 --- a/templates/pagedown.html +++ b/templates/pagedown.html @@ -6,7 +6,7 @@ {% if show_preview %}
      -
      Update Preview
      +
      {{_('Update Preview')}}
      {% endif %} diff --git a/templates/registration/activation_email.html b/templates/registration/activation_email.html index f5e4eaa..25bf421 100644 --- a/templates/registration/activation_email.html +++ b/templates/registration/activation_email.html @@ -1,23 +1,16 @@ -Thanks for registering on the {{ site.name }}! We're glad to have you. -

      -The last step is activating your account. Please activate your {{ SITE_NAME }} account in the next {{ expiration_days }} days. -

      -Please click on the following link to activate your account: -

      - http://{{ site.domain }}/accounts/activate/{{ activation_key }} -

      - -Alternatively, you can reply to this message to activate your account. -Your reply must keep the following text intact for this to work: +{% set url_path = "/accounts/activate/" + activation_key %} +{% set title = _("Account activation") %} +{% set message = _("Thanks for registering! We're glad to have you. The last step is activating your account. Please activate your account in the next %(expiration_days)d days.", expiration_days=expiration_days) %} +{% set username = user.get_username() %} +{% set button_text = _("Activate") %} +{% set domain = site.domain %} +{% set protocol = "http" %} +{% include "general_email.html" %} +
      +{{_("Alternatively, you can reply to this message to activate your account. Your reply must keep the following text intact for this to work:")}} 
       {{ activation_key }}
      -{% if SITE_ADMIN_EMAIL %} - See you soon! -
      - If you have problems activating your account, feel free to send us an email at {{ SITE_ADMIN_EMAIL }}. -{% else %} - See you soon! -{% endif %} +{{_("See you soon!")}} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html index 30ae59d..0b30eb3 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.html @@ -1,19 +1,6 @@ - -
      -

      LQDOJ -

      -
      -       -
      - - Forgot your password on the {{ site_name }}? Don't worry!

      - To reset the password for your account "{{ user.get_username() }}", click the below button. -

      - Reset password -

      - {% if SITE_ADMIN_EMAIL %} - See you soon! If you have problems resetting your email, feel free to shoot us an email at {{ SITE_ADMIN_EMAIL }} - {% else %} - See you soon! - {% endif %} -
      +{% set url_path = url('password_reset_confirm', uidb64=uid, token=token) %} +{% set title = _("Password Reset") %} +{% set message = _("We have received a request to reset your password. Click the button below to reset your password:") %} +{% set username = user.get_username() %} +{% set button_text = _("Reset Password") %} +{% include "general_email.html" %} \ No newline at end of file diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 6d2b39a..b91a32d 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,4 +1,4 @@ {% extends "base.html" %} {% block body %} -

      {{ _('You have successfully been registered. An email has been sent to the email address you provided to confirm your registration.') }}

      +

      {{ _('You have successfully been registered. An email has been sent to the email address you provided to confirm your registration. If you don\'t see it, kindly check your spam folder as well.') }}

      {% endblock %} \ No newline at end of file diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 58840b1..cf5bc30 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -78,12 +78,6 @@
      {{ _('Default language') }}
      {{ form.language }} -
      {{ _('Affiliated organizations') }}
      - {{ form.organizations }} - {% if form.organizations.errors %} -
      {{ form.organizations.errors }}
      - {% endif %} - {% if form.captcha %}
      {{ form.captcha }}
      {% if form.captcha.errors %} @@ -92,12 +86,6 @@ {% endif %}
      - {% if tos_url %} - - {{ _('By registering, you agree to our') }} - {{ _('Terms & Conditions') }}. - - {% endif %}
      diff --git a/templates/user/edit-profile.html b/templates/user/edit-profile.html index 0433ffd..5ca5a88 100644 --- a/templates/user/edit-profile.html +++ b/templates/user/edit-profile.html @@ -47,6 +47,10 @@ display: flex; justify-content: center; } + + .main-info tr td { + padding-bottom: 1em; + } {% endblock %} @@ -91,7 +95,7 @@ {% csrf_token %} - +
      @@ -101,8 +105,25 @@ - - + + + + + + + + + +
      {{ _('Fullname') }}: {{ form_user.first_name }} {{ form_user.last_name }}
      {{ _('Avatar') }}: {{ form.profile_image }} {{ _('Password') }}: + + {{ _('Change your password') }} + +
      {{ _('Email') }}: + {{ request.user.email }} + + ({{ _('Change email') }}) + +
      {{ _('Avatar') }}: {{ form.profile_image }}
      @@ -133,29 +154,22 @@ {{ form.math_engine }} {% endif %} - - - - {{ _('Change your password') }} - - - - +
      {% if profile.is_totp_enabled %} {{ _('Two Factor Authentication is enabled.') }} {% if require_staff_2fa and request.user.is_staff %} Disable {% else %} - Disable + {{_('Disable')}} {% endif %} {% else %} {{ _('Two Factor Authentication is disabled.') }} - Enable + {{_('Enable')}} {% endif %}

      From b8bee7e63d97e2044241f935b83390b875f70e57 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 15:44:27 -0500 Subject: [PATCH 151/478] Add trans --- judge/views/email.py | 2 +- locale/vi/LC_MESSAGES/django.po | 41 +++++++++++-------- .../registration/activation_email_subject.txt | 2 +- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/judge/views/email.py b/judge/views/email.py index ede173a..c37f857 100644 --- a/judge/views/email.py +++ b/judge/views/email.py @@ -40,7 +40,7 @@ def email_change_view(request): uid = urlsafe_base64_encode(force_bytes(user.pk)) # Send the email to the user - subject = _(f"{settings.SITE_NAME} - Email Change Request") + subject = settings.SITE_NAME + " - " + _("Email Change Request") email_contexts = { "message": _( "We have received a request to change your email to this email. Click the button below to change your email:" diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 223d184..05a4018 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: 2023-08-26 03:32+0700\n" +"POT-Creation-Date: 2023-08-26 03:42+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -69,7 +69,7 @@ msgstr "Đăng ký không thành công" msgid "Login" msgstr "Đăng nhập" -#: dmoj/urls.py:216 templates/base.html:209 +#: dmoj/urls.py:224 templates/base.html:209 #: templates/organization/org-left-sidebar.html:2 msgid "Home" msgstr "Trang chủ" @@ -2855,24 +2855,23 @@ msgstr "Mô tả vấn đề" msgid "New clarification for %s" msgstr "Thông báo mới cho %s" -#: judge/views/email.py:19 +#: judge/views/email.py:20 #, fuzzy #| msgid "Email" msgid "New Email" msgstr "Email" -#: judge/views/email.py:23 +#: judge/views/email.py:25 #, fuzzy #| msgid "Contest with key already exists." msgid "An account with this email already exists." msgstr "Mã kỳ thi đã tồn tại." -#: judge/views/email.py:41 -#, python-brace-format -msgid "{settings.SITE_NAME} - Email Change Request" -msgstr "" - #: judge/views/email.py:43 +msgid "Email Change Request" +msgstr "Thay đổi Email" + +#: judge/views/email.py:46 msgid "" "We have received a request to change your email to this email. Click the " "button below to change your email:" @@ -2880,27 +2879,27 @@ msgstr "" "Chúng tôi đã nhận được yêu cầu thay đổi địa chỉ email của bạn thành địa chỉ " "email này. Vui lòng nhấp vào nút bên dưới để thay đổi địa chỉ email của bạn:" -#: judge/views/email.py:44 +#: judge/views/email.py:48 msgid "Email Change" msgstr "Thay đổi Email" -#: judge/views/email.py:45 +#: judge/views/email.py:49 msgid "Change Email" msgstr "Thay đổi Email" -#: judge/views/email.py:56 templates/user/edit-profile.html:120 +#: judge/views/email.py:65 templates/user/edit-profile.html:120 msgid "Change email" msgstr "Thay đổi email" -#: judge/views/email.py:76 +#: judge/views/email.py:89 msgid "Success" msgstr "Thành công" -#: judge/views/email.py:78 +#: judge/views/email.py:93 msgid "Invalid" msgstr "Không hợp lệ" -#: judge/views/email.py:83 +#: judge/views/email.py:102 msgid "Email change pending" msgstr "Yêu cầu thay đổi email đang đợi xác thực." @@ -5116,6 +5115,11 @@ msgstr "" msgid "See you soon!" msgstr "Hẹn sớm gặp lại bạn!" +#: templates/registration/activation_email_subject.txt:1 +#, python-format +msgid "Activate your %(SITE_NAME)s account" +msgstr "Kích hoạt tài khoản %(SITE_NAME)s" + #: templates/registration/login.html:9 msgid "Invalid username or password." msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ." @@ -5226,7 +5230,9 @@ msgid "" "You have successfully been registered. An email has been sent to the email " "address you provided to confirm your registration. If you don't see it, " "kindly check your spam folder as well." -msgstr "Bạn đã đăng ký thành công. Kiểm tra email để hoàn thành việc xác thực. Nếu bạn không tìm thấy nó, vui lòng kiểm tra thư mục spam của bạn." +msgstr "" +"Bạn đã đăng ký thành công. Kiểm tra email để hoàn thành việc xác thực. Nếu " +"bạn không tìm thấy nó, vui lòng kiểm tra thư mục spam của bạn." #: templates/registration/registration_form.html:61 msgid "(again, for confirmation)" @@ -5900,6 +5906,9 @@ msgstr "Thông tin" msgid "Check all" msgstr "Chọn tất cả" +#~ msgid "{settings.SITE_NAME} - Email Change Request" +#~ msgstr "{settings.SITE_NAME} - Thay đổi email" + #~ msgid "Affiliated organizations" #~ msgstr "Tổ chức bạn muốn tham gia" diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt index b0888c8..5b3bd66 100644 --- a/templates/registration/activation_email_subject.txt +++ b/templates/registration/activation_email_subject.txt @@ -1 +1 @@ -Activate your {{ SITE_NAME }} account \ No newline at end of file +{% trans %}Activate your {{ SITE_NAME }} account{% endtrans %} From 0d3ebaba4710bc7773792e5a311457273f8fe666 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 15:47:20 -0500 Subject: [PATCH 152/478] Add trans --- locale/vi/LC_MESSAGES/django.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index 05a4018..e182034 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2856,10 +2856,8 @@ msgid "New clarification for %s" msgstr "Thông báo mới cho %s" #: judge/views/email.py:20 -#, fuzzy -#| msgid "Email" msgid "New Email" -msgstr "Email" +msgstr "Email mới" #: judge/views/email.py:25 #, fuzzy From 20a8f29cd675e95bf8b74a43123bcea2b4f354f0 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 15:58:59 -0500 Subject: [PATCH 153/478] Send html for email change --- judge/views/email.py | 8 +++++++- locale/vi/LC_MESSAGES/django.po | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/judge/views/email.py b/judge/views/email.py index c37f857..922b74f 100644 --- a/judge/views/email.py +++ b/judge/views/email.py @@ -52,7 +52,13 @@ def email_change_view(request): ), } message = render_email_message(request, email_contexts) - send_mail(subject, message, settings.EMAIL_HOST_USER, [new_email]) + send_mail( + subject, + message, + settings.EMAIL_HOST_USER, + [new_email], + html_message=message, + ) profile.email_change_pending = new_email profile.save() return redirect("email_change_pending") diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index e182034..d1e8a78 100644 --- a/locale/vi/LC_MESSAGES/django.po +++ b/locale/vi/LC_MESSAGES/django.po @@ -2860,10 +2860,8 @@ msgid "New Email" msgstr "Email mới" #: judge/views/email.py:25 -#, fuzzy -#| msgid "Contest with key already exists." msgid "An account with this email already exists." -msgstr "Mã kỳ thi đã tồn tại." +msgstr "Email đã được dùng cho tài khoản khác." #: judge/views/email.py:43 msgid "Email Change Request" From d34fe197542264c293642cde1baafe21028b31f0 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 16:04:07 -0500 Subject: [PATCH 154/478] Check for email exists during verification --- judge/views/email.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/judge/views/email.py b/judge/views/email.py index 922b74f..56c43b9 100644 --- a/judge/views/email.py +++ b/judge/views/email.py @@ -80,10 +80,9 @@ def verify_email_view(request, uidb64, token): except (TypeError, ValueError, OverflowError, User.DoesNotExist): user = None if user is not None and default_token_generator.check_token(user, token): - # Update the user's email address profile = Profile.objects.get(user=user) new_email = profile.email_change_pending - if new_email: + if new_email and not User.objects.filter(email=new_email).exists(): user.email = new_email profile.email_change_pending = None user.save() From 0da2098bbe12a465ac38001993d18c7837a0e163 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 16:51:32 -0500 Subject: [PATCH 155/478] Fix datetimepicker --- judge/widgets/datetime.py | 4 ++-- resources/datetime-picker/datetimepicker.full.min.js | 1 + resources/datetime-picker/datetimepicker.min.css | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 resources/datetime-picker/datetimepicker.full.min.js create mode 100644 resources/datetime-picker/datetimepicker.min.css diff --git a/judge/widgets/datetime.py b/judge/widgets/datetime.py index 6cd7fc5..15bb383 100644 --- a/judge/widgets/datetime.py +++ b/judge/widgets/datetime.py @@ -16,8 +16,8 @@ class DateTimePickerWidget(forms.DateTimeInput): @property def media(self): - css_url = "https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.min.css" - js_url = "https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.full.min.js" + css_url = "/static/datetime-picker/datetimepicker.min.css" + js_url = "/static/datetime-picker/datetimepicker.full.min.js" return forms.Media( js=[js_url], css={"screen": [css_url]}, diff --git a/resources/datetime-picker/datetimepicker.full.min.js b/resources/datetime-picker/datetimepicker.full.min.js new file mode 100644 index 0000000..a2a09c6 --- /dev/null +++ b/resources/datetime-picker/datetimepicker.full.min.js @@ -0,0 +1 @@ +var DateFormatter;!function(){"use strict";var e,t,a,r,n,o,i;o=864e5,i=3600,e=function(e,t){return"string"==typeof e&&"string"==typeof t&&e.toLowerCase()===t.toLowerCase()},t=function(e,a,r){var n=r||"0",o=e.toString();return o.lengths?"20":"19")+i):s,h=!0;break;case"m":case"n":case"M":case"F":if(isNaN(s)){if(!((u=m.getMonth(i))>0))return null;D.month=u}else{if(!(s>=1&&12>=s))return null;D.month=s}h=!0;break;case"d":case"j":if(!(s>=1&&31>=s))return null;D.day=s,h=!0;break;case"g":case"h":if(d=r.indexOf("a")>-1?r.indexOf("a"):r.indexOf("A")>-1?r.indexOf("A"):-1,c=n[d],d>-1)l=e(c,p.meridiem[0])?0:e(c,p.meridiem[1])?12:-1,s>=1&&12>=s&&l>-1?D.hour=s+l-1:s>=0&&23>=s&&(D.hour=s);else{if(!(s>=0&&23>=s))return null;D.hour=s}g=!0;break;case"G":case"H":if(!(s>=0&&23>=s))return null;D.hour=s,g=!0;break;case"i":if(!(s>=0&&59>=s))return null;D.min=s,g=!0;break;case"s":if(!(s>=0&&59>=s))return null;D.sec=s,g=!0}if(!0===h&&D.year&&D.month&&D.day)D.date=new Date(D.year,D.month-1,D.day,D.hour,D.min,D.sec,0);else{if(!0!==g)return null;D.date=new Date(0,0,0,D.hour,D.min,D.sec,0)}return D.date},guessDate:function(e,t){if("string"!=typeof e)return e;var a,r,n,o,i,s,u=this,d=e.replace(u.separators,"\0").split("\0"),l=/^[djmn]/g,f=t.match(u.validParts),c=new Date,m=0;if(!l.test(f[0]))return e;for(n=0;na?a:4,!(r=parseInt(4>a?r.toString().substr(0,4-a)+i:i.substr(0,4))))return null;c.setFullYear(r);break;case 3:c.setHours(s);break;case 4:c.setMinutes(s);break;case 5:c.setSeconds(s)}(o=i.substr(m)).length>0&&d.splice(n+1,0,o)}return c},parseFormat:function(e,a){var r,n=this,s=n.dateSettings,u=/\\?(.?)/gi,d=function(e,t){return r[e]?r[e]():t};return r={d:function(){return t(r.j(),2)},D:function(){return s.daysShort[r.w()]},j:function(){return a.getDate()},l:function(){return s.days[r.w()]},N:function(){return r.w()||7},w:function(){return a.getDay()},z:function(){var e=new Date(r.Y(),r.n()-1,r.j()),t=new Date(r.Y(),0,1);return Math.round((e-t)/o)},W:function(){var e=new Date(r.Y(),r.n()-1,r.j()-r.N()+3),a=new Date(e.getFullYear(),0,4);return t(1+Math.round((e-a)/o/7),2)},F:function(){return s.months[a.getMonth()]},m:function(){return t(r.n(),2)},M:function(){return s.monthsShort[a.getMonth()]},n:function(){return a.getMonth()+1},t:function(){return new Date(r.Y(),r.n(),0).getDate()},L:function(){var e=r.Y();return e%4==0&&e%100!=0||e%400==0?1:0},o:function(){var e=r.n(),t=r.W();return r.Y()+(12===e&&9>t?1:1===e&&t>9?-1:0)},Y:function(){return a.getFullYear()},y:function(){return r.Y().toString().slice(-2)},a:function(){return r.A().toLowerCase()},A:function(){var e=r.G()<12?0:1;return s.meridiem[e]},B:function(){var e=a.getUTCHours()*i,r=60*a.getUTCMinutes(),n=a.getUTCSeconds();return t(Math.floor((e+r+n+i)/86.4)%1e3,3)},g:function(){return r.G()%12||12},G:function(){return a.getHours()},h:function(){return t(r.g(),2)},H:function(){return t(r.G(),2)},i:function(){return t(a.getMinutes(),2)},s:function(){return t(a.getSeconds(),2)},u:function(){return t(1e3*a.getMilliseconds(),6)},e:function(){return/\((.*)\)/.exec(String(a))[1]||"Coordinated Universal Time"},I:function(){return new Date(r.Y(),0)-Date.UTC(r.Y(),0)!=new Date(r.Y(),6)-Date.UTC(r.Y(),6)?1:0},O:function(){var e=a.getTimezoneOffset(),r=Math.abs(e);return(e>0?"-":"+")+t(100*Math.floor(r/60)+r%60,4)},P:function(){var e=r.O();return e.substr(0,3)+":"+e.substr(3,2)},T:function(){return(String(a).match(n.tzParts)||[""]).pop().replace(n.tzClip,"")||"UTC"},Z:function(){return 60*-a.getTimezoneOffset()},c:function(){return"Y-m-d\\TH:i:sP".replace(u,d)},r:function(){return"D, d M Y H:i:s O".replace(u,d)},U:function(){return a.getTime()/1e3||0}},d(e,e)},formatDate:function(e,t){var a,r,n,o,i,s=this,u="";if("string"==typeof e&&!(e=s.parseDate(e,t)))return null;if(e instanceof Date){for(n=t.length,a=0;n>a;a++)"S"!==(i=t.charAt(a))&&"\\"!==i&&(a>0&&"\\"===t.charAt(a-1)?u+=i:(o=s.parseFormat(i,e),a!==n-1&&s.intParts.test(i)&&"S"===t.charAt(a+1)&&(r=parseInt(o)||0,o+=s.dateSettings.ordinal(r)),u+=o));return u}return""}}}();var datetimepickerFactory=function(e){"use strict";function t(e,t,a){this.date=e,this.desc=t,this.style=a}var a={i18n:{ar:{months:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],dayOfWeekShort:["ن","ث","ع","خ","ج","س","ح"],dayOfWeek:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت","الأحد"]},ro:{months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],dayOfWeekShort:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],dayOfWeek:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"]},id:{months:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","November","Desember"],dayOfWeekShort:["Min","Sen","Sel","Rab","Kam","Jum","Sab"],dayOfWeek:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"]},is:{months:["Janúar","Febrúar","Mars","Apríl","Maí","Júní","Júlí","Ágúst","September","Október","Nóvember","Desember"],dayOfWeekShort:["Sun","Mán","Þrið","Mið","Fim","Fös","Lau"],dayOfWeek:["Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur"]},bg:{months:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],dayOfWeekShort:["Нд","Пн","Вт","Ср","Чт","Пт","Сб"],dayOfWeek:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"]},fa:{months:["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"],dayOfWeekShort:["یکشنبه","دوشنبه","سه شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],dayOfWeek:["یک‌شنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنج‌شنبه","جمعه","شنبه","یک‌شنبه"]},ru:{months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],dayOfWeekShort:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],dayOfWeek:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"]},uk:{months:["Січень","Лютий","Березень","Квітень","Травень","Червень","Липень","Серпень","Вересень","Жовтень","Листопад","Грудень"],dayOfWeekShort:["Ндл","Пнд","Втр","Срд","Чтв","Птн","Сбт"],dayOfWeek:["Неділя","Понеділок","Вівторок","Середа","Четвер","П'ятниця","Субота"]},en:{months:["January","February","March","April","May","June","July","August","September","October","November","December"],dayOfWeekShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayOfWeek:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},el:{months:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],dayOfWeekShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],dayOfWeek:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"]},de:{months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],dayOfWeekShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayOfWeek:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"]},nl:{months:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],dayOfWeekShort:["zo","ma","di","wo","do","vr","za"],dayOfWeek:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"]},tr:{months:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],dayOfWeekShort:["Paz","Pts","Sal","Çar","Per","Cum","Cts"],dayOfWeek:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"]},fr:{months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],dayOfWeekShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],dayOfWeek:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"]},es:{months:["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"],dayOfWeekShort:["Dom","Lun","Mar","Mié","Jue","Vie","Sáb"],dayOfWeek:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"]},th:{months:["มกราคม","กุมภาพันธ์","มีนาคม","เมษายน","พฤษภาคม","มิถุนายน","กรกฎาคม","สิงหาคม","กันยายน","ตุลาคม","พฤศจิกายน","ธันวาคม"],dayOfWeekShort:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],dayOfWeek:["อาทิตย์","จันทร์","อังคาร","พุธ","พฤหัส","ศุกร์","เสาร์","อาทิตย์"]},pl:{months:["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],dayOfWeekShort:["nd","pn","wt","śr","cz","pt","sb"],dayOfWeek:["niedziela","poniedziałek","wtorek","środa","czwartek","piątek","sobota"]},pt:{months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],dayOfWeekShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sab"],dayOfWeek:["Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado"]},ch:{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"]},se:{months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],dayOfWeekShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"]},km:{months:["មករា​","កុម្ភៈ","មិនា​","មេសា​","ឧសភា​","មិថុនា​","កក្កដា​","សីហា​","កញ្ញា​","តុលា​","វិច្ឆិកា","ធ្នូ​"],dayOfWeekShort:["អាទិ​","ច័ន្ទ​","អង្គារ​","ពុធ​","ព្រហ​​","សុក្រ​","សៅរ៍"],dayOfWeek:["អាទិត្យ​","ច័ន្ទ​","អង្គារ​","ពុធ​","ព្រហស្បតិ៍​","សុក្រ​","សៅរ៍"]},kr:{months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayOfWeekShort:["일","월","화","수","목","금","토"],dayOfWeek:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"]},it:{months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],dayOfWeekShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],dayOfWeek:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"]},da:{months:["Januar","Februar","Marts","April","Maj","Juni","Juli","August","September","Oktober","November","December"],dayOfWeekShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayOfWeek:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"]},no:{months:["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],dayOfWeekShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayOfWeek:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"]},ja:{months:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayOfWeekShort:["日","月","火","水","木","金","土"],dayOfWeek:["日曜","月曜","火曜","水曜","木曜","金曜","土曜"]},vi:{months:["Tháng 1","Tháng 2","Tháng 3","Tháng 4","Tháng 5","Tháng 6","Tháng 7","Tháng 8","Tháng 9","Tháng 10","Tháng 11","Tháng 12"],dayOfWeekShort:["CN","T2","T3","T4","T5","T6","T7"],dayOfWeek:["Chủ nhật","Thứ hai","Thứ ba","Thứ tư","Thứ năm","Thứ sáu","Thứ bảy"]},sl:{months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],dayOfWeekShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],dayOfWeek:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"]},cs:{months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],dayOfWeekShort:["Ne","Po","Út","St","Čt","Pá","So"]},hu:{months:["Január","Február","Március","Április","Május","Június","Július","Augusztus","Szeptember","Október","November","December"],dayOfWeekShort:["Va","Hé","Ke","Sze","Cs","Pé","Szo"],dayOfWeek:["vasárnap","hétfő","kedd","szerda","csütörtök","péntek","szombat"]},az:{months:["Yanvar","Fevral","Mart","Aprel","May","Iyun","Iyul","Avqust","Sentyabr","Oktyabr","Noyabr","Dekabr"],dayOfWeekShort:["B","Be","Ça","Ç","Ca","C","Ş"],dayOfWeek:["Bazar","Bazar ertəsi","Çərşənbə axşamı","Çərşənbə","Cümə axşamı","Cümə","Şənbə"]},bs:{months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],dayOfWeekShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayOfWeek:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"]},ca:{months:["Gener","Febrer","Març","Abril","Maig","Juny","Juliol","Agost","Setembre","Octubre","Novembre","Desembre"],dayOfWeekShort:["Dg","Dl","Dt","Dc","Dj","Dv","Ds"],dayOfWeek:["Diumenge","Dilluns","Dimarts","Dimecres","Dijous","Divendres","Dissabte"]},"en-GB":{months:["January","February","March","April","May","June","July","August","September","October","November","December"],dayOfWeekShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayOfWeek:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]},et:{months:["Jaanuar","Veebruar","Märts","Aprill","Mai","Juuni","Juuli","August","September","Oktoober","November","Detsember"],dayOfWeekShort:["P","E","T","K","N","R","L"],dayOfWeek:["Pühapäev","Esmaspäev","Teisipäev","Kolmapäev","Neljapäev","Reede","Laupäev"]},eu:{months:["Urtarrila","Otsaila","Martxoa","Apirila","Maiatza","Ekaina","Uztaila","Abuztua","Iraila","Urria","Azaroa","Abendua"],dayOfWeekShort:["Ig.","Al.","Ar.","Az.","Og.","Or.","La."],dayOfWeek:["Igandea","Astelehena","Asteartea","Asteazkena","Osteguna","Ostirala","Larunbata"]},fi:{months:["Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu","Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu"],dayOfWeekShort:["Su","Ma","Ti","Ke","To","Pe","La"],dayOfWeek:["sunnuntai","maanantai","tiistai","keskiviikko","torstai","perjantai","lauantai"]},gl:{months:["Xan","Feb","Maz","Abr","Mai","Xun","Xul","Ago","Set","Out","Nov","Dec"],dayOfWeekShort:["Dom","Lun","Mar","Mer","Xov","Ven","Sab"],dayOfWeek:["Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado"]},hr:{months:["Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj","Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac"],dayOfWeekShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayOfWeek:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"]},ko:{months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayOfWeekShort:["일","월","화","수","목","금","토"],dayOfWeek:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"]},lt:{months:["Sausio","Vasario","Kovo","Balandžio","Gegužės","Birželio","Liepos","Rugpjūčio","Rugsėjo","Spalio","Lapkričio","Gruodžio"],dayOfWeekShort:["Sek","Pir","Ant","Tre","Ket","Pen","Šeš"],dayOfWeek:["Sekmadienis","Pirmadienis","Antradienis","Trečiadienis","Ketvirtadienis","Penktadienis","Šeštadienis"]},lv:{months:["Janvāris","Februāris","Marts","Aprīlis ","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],dayOfWeekShort:["Sv","Pr","Ot","Tr","Ct","Pk","St"],dayOfWeek:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"]},mk:{months:["јануари","февруари","март","април","мај","јуни","јули","август","септември","октомври","ноември","декември"],dayOfWeekShort:["нед","пон","вто","сре","чет","пет","саб"],dayOfWeek:["Недела","Понеделник","Вторник","Среда","Четврток","Петок","Сабота"]},mn:{months:["1-р сар","2-р сар","3-р сар","4-р сар","5-р сар","6-р сар","7-р сар","8-р сар","9-р сар","10-р сар","11-р сар","12-р сар"],dayOfWeekShort:["Дав","Мяг","Лха","Пүр","Бсн","Бям","Ням"],dayOfWeek:["Даваа","Мягмар","Лхагва","Пүрэв","Баасан","Бямба","Ням"]},"pt-BR":{months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],dayOfWeekShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayOfWeek:["Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado"]},sk:{months:["Január","Február","Marec","Apríl","Máj","Jún","Júl","August","September","Október","November","December"],dayOfWeekShort:["Ne","Po","Ut","St","Št","Pi","So"],dayOfWeek:["Nedeľa","Pondelok","Utorok","Streda","Štvrtok","Piatok","Sobota"]},sq:{months:["Janar","Shkurt","Mars","Prill","Maj","Qershor","Korrik","Gusht","Shtator","Tetor","Nëntor","Dhjetor"],dayOfWeekShort:["Die","Hën","Mar","Mër","Enj","Pre","Shtu"],dayOfWeek:["E Diel","E Hënë","E Martē","E Mërkurë","E Enjte","E Premte","E Shtunë"]},"sr-YU":{months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],dayOfWeekShort:["Ned","Pon","Uto","Sre","čet","Pet","Sub"],dayOfWeek:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"]},sr:{months:["јануар","фебруар","март","април","мај","јун","јул","август","септембар","октобар","новембар","децембар"],dayOfWeekShort:["нед","пон","уто","сре","чет","пет","суб"],dayOfWeek:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"]},sv:{months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],dayOfWeekShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],dayOfWeek:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"]},"zh-TW":{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"],dayOfWeek:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"]},zh:{months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayOfWeekShort:["日","一","二","三","四","五","六"],dayOfWeek:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"]},ug:{months:["1-ئاي","2-ئاي","3-ئاي","4-ئاي","5-ئاي","6-ئاي","7-ئاي","8-ئاي","9-ئاي","10-ئاي","11-ئاي","12-ئاي"],dayOfWeek:["يەكشەنبە","دۈشەنبە","سەيشەنبە","چارشەنبە","پەيشەنبە","جۈمە","شەنبە"]},he:{months:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],dayOfWeekShort:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],dayOfWeek:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת","ראשון"]},hy:{months:["Հունվար","Փետրվար","Մարտ","Ապրիլ","Մայիս","Հունիս","Հուլիս","Օգոստոս","Սեպտեմբեր","Հոկտեմբեր","Նոյեմբեր","Դեկտեմբեր"],dayOfWeekShort:["Կի","Երկ","Երք","Չոր","Հնգ","Ուրբ","Շբթ"],dayOfWeek:["Կիրակի","Երկուշաբթի","Երեքշաբթի","Չորեքշաբթի","Հինգշաբթի","Ուրբաթ","Շաբաթ"]},kg:{months:["Үчтүн айы","Бирдин айы","Жалган Куран","Чын Куран","Бугу","Кулжа","Теке","Баш Оона","Аяк Оона","Тогуздун айы","Жетинин айы","Бештин айы"],dayOfWeekShort:["Жек","Дүй","Шей","Шар","Бей","Жум","Ише"],dayOfWeek:["Жекшемб","Дүйшөмб","Шейшемб","Шаршемб","Бейшемби","Жума","Ишенб"]},rm:{months:["Schaner","Favrer","Mars","Avrigl","Matg","Zercladur","Fanadur","Avust","Settember","October","November","December"],dayOfWeekShort:["Du","Gli","Ma","Me","Gie","Ve","So"],dayOfWeek:["Dumengia","Glindesdi","Mardi","Mesemna","Gievgia","Venderdi","Sonda"]},ka:{months:["იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი","ივლისი","აგვისტო","სექტემბერი","ოქტომბერი","ნოემბერი","დეკემბერი"],dayOfWeekShort:["კვ","ორშ","სამშ","ოთხ","ხუთ","პარ","შაბ"],dayOfWeek:["კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი"]}},ownerDocument:document,contentWindow:window,value:"",rtl:!1,format:"Y/m/d H:i",formatTime:"H:i",formatDate:"Y/m/d",startDate:!1,step:60,monthChangeSpinner:!0,closeOnDateSelect:!1,closeOnTimeSelect:!0,closeOnWithoutClick:!0,closeOnInputClick:!0,openOnFocus:!0,timepicker:!0,datepicker:!0,weeks:!1,defaultTime:!1,defaultDate:!1,minDate:!1,maxDate:!1,minTime:!1,maxTime:!1,minDateTime:!1,maxDateTime:!1,allowTimes:[],opened:!1,initTime:!0,inline:!1,theme:"",touchMovedThreshold:5,onSelectDate:function(){},onSelectTime:function(){},onChangeMonth:function(){},onGetWeekOfYear:function(){},onChangeYear:function(){},onChangeDateTime:function(){},onShow:function(){},onClose:function(){},onGenerate:function(){},withoutCopyright:!0,inverseButton:!1,hours12:!1,next:"xdsoft_next",prev:"xdsoft_prev",dayOfWeekStart:0,parentID:"body",timeHeightInTimePicker:25,timepickerScrollbar:!0,todayButton:!0,prevButton:!0,nextButton:!0,defaultSelect:!0,scrollMonth:!0,scrollTime:!0,scrollInput:!0,lazyInit:!1,mask:!1,validateOnBlur:!0,allowBlank:!0,yearStart:1950,yearEnd:2050,monthStart:0,monthEnd:11,style:"",id:"",fixed:!1,roundTime:"round",className:"",weekends:[],highlightedDates:[],highlightedPeriods:[],allowDates:[],allowDateRe:null,disabledDates:[],disabledWeekDays:[],yearOffset:0,beforeShowDay:null,enterLikeTab:!0,showApplyButton:!1},r=null,n=null,o="en",i={meridiem:["AM","PM"]},s=function(){var t=a.i18n[o],s={days:t.dayOfWeek,daysShort:t.dayOfWeekShort,months:t.months,monthsShort:e.map(t.months,function(e){return e.substring(0,3)})};"function"==typeof DateFormatter&&(r=n=new DateFormatter({dateSettings:e.extend({},i,s)}))},u={moment:{default_options:{format:"YYYY/MM/DD HH:mm",formatDate:"YYYY/MM/DD",formatTime:"HH:mm"},formatter:{parseDate:function(e,t){if(l(t))return n.parseDate(e,t);var a=moment(e,t);return!!a.isValid()&&a.toDate()},formatDate:function(e,t){return l(t)?n.formatDate(e,t):moment(e).format(t)},formatMask:function(e){return e.replace(/Y{4}/g,"9999").replace(/Y{2}/g,"99").replace(/M{2}/g,"19").replace(/D{2}/g,"39").replace(/H{2}/g,"29").replace(/m{2}/g,"59").replace(/s{2}/g,"59")}}}};e.datetimepicker={setLocale:function(e){var t=a.i18n[e]?e:"en";o!==t&&(o=t,s())},setDateFormatter:function(t){if("string"==typeof t&&u.hasOwnProperty(t)){var n=u[t];e.extend(a,n.default_options),r=n.formatter}else r=t}};var d={RFC_2822:"D, d M Y H:i:s O",ATOM:"Y-m-dTH:i:sP",ISO_8601:"Y-m-dTH:i:sO",RFC_822:"D, d M y H:i:s O",RFC_850:"l, d-M-y H:i:s T",RFC_1036:"D, d M y H:i:s O",RFC_1123:"D, d M Y H:i:s O",RSS:"D, d M Y H:i:s O",W3C:"Y-m-dTH:i:sP"},l=function(e){return-1!==Object.values(d).indexOf(e)};e.extend(e.datetimepicker,d),s(),window.getComputedStyle||(window.getComputedStyle=function(e){return this.el=e,this.getPropertyValue=function(t){var a=/(-([a-z]))/g;return"float"===t&&(t="styleFloat"),a.test(t)&&(t=t.replace(a,function(e,t,a){return a.toUpperCase()})),e.currentStyle[t]||null},this}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e,t){var a,r;for(a=t||0,r=this.length;a
      '),s=e('
      '),i.append(s),u.addClass("xdsoft_scroller_box").append(i),D=function(e){var t=d(e).y-c+p;t<0&&(t=0),t+s[0].offsetHeight>h&&(t=h-s[0].offsetHeight),u.trigger("scroll_element.xdsoft_scroller",[l?t/l:0])},s.on("touchstart.xdsoft_scroller mousedown.xdsoft_scroller",function(r){n||u.trigger("resize_scroll.xdsoft_scroller",[a]),c=d(r).y,p=parseInt(s.css("margin-top"),10),h=i[0].offsetHeight,"mousedown"===r.type||"touchstart"===r.type?(t.ownerDocument&&e(t.ownerDocument.body).addClass("xdsoft_noselect"),e([t.ownerDocument.body,t.contentWindow]).on("touchend mouseup.xdsoft_scroller",function a(){e([t.ownerDocument.body,t.contentWindow]).off("touchend mouseup.xdsoft_scroller",a).off("mousemove.xdsoft_scroller",D).removeClass("xdsoft_noselect")}),e(t.ownerDocument.body).on("mousemove.xdsoft_scroller",D)):(g=!0,r.stopPropagation(),r.preventDefault())}).on("touchmove",function(e){g&&(e.preventDefault(),D(e))}).on("touchend touchcancel",function(){g=!1,p=0}),u.on("scroll_element.xdsoft_scroller",function(e,t){n||u.trigger("resize_scroll.xdsoft_scroller",[t,!0]),t=t>1?1:t<0||isNaN(t)?0:t,s.css("margin-top",l*t),setTimeout(function(){r.css("marginTop",-parseInt((r[0].offsetHeight-n)*t,10))},10)}).on("resize_scroll.xdsoft_scroller",function(e,t,a){var d,f;n=u[0].clientHeight,o=r[0].offsetHeight,f=(d=n/o)*i[0].offsetHeight,d>1?s.hide():(s.show(),s.css("height",parseInt(f>10?f:10,10)),l=i[0].offsetHeight-s[0].offsetHeight,!0!==a&&u.trigger("scroll_element.xdsoft_scroller",[t||Math.abs(parseInt(r.css("marginTop"),10))/(o-n)]))}),u.on("mousewheel",function(e){var t=Math.abs(parseInt(r.css("marginTop"),10));return(t-=20*e.deltaY)<0&&(t=0),u.trigger("scroll_element.xdsoft_scroller",[t/(o-n)]),e.stopPropagation(),!1}),u.on("touchstart",function(e){f=d(e),m=Math.abs(parseInt(r.css("marginTop"),10))}),u.on("touchmove",function(e){if(f){e.preventDefault();var t=d(e);u.trigger("scroll_element.xdsoft_scroller",[(m-(t.y-f.y))/(o-n)])}}),u.on("touchend touchcancel",function(){f=!1,m=0})),u.trigger("resize_scroll.xdsoft_scroller",[a])):u.find(".xdsoft_scrollbar").hide()})},e.fn.datetimepicker=function(n,i){var s,u,d=this,l=48,f=57,c=96,m=105,h=17,g=46,p=13,D=27,v=8,y=37,b=38,k=39,x=40,T=9,S=116,M=65,w=67,O=86,W=90,_=89,F=!1,C=e.isPlainObject(n)||!n?e.extend(!0,{},a,n):e.extend(!0,{},a),P=0,Y=function(e){e.on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function t(){e.is(":disabled")||e.data("xdsoft_datetimepicker")||(clearTimeout(P),P=setTimeout(function(){e.data("xdsoft_datetimepicker")||s(e),e.off("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",t).trigger("open.xdsoft")},100))})};return s=function(a){function i(){var e,t=!1;return C.startDate?t=A.strToDate(C.startDate):(t=C.value||(a&&a.val&&a.val()?a.val():""))?(t=A.strToDateTime(t),C.yearOffset&&(t=new Date(t.getFullYear()-C.yearOffset,t.getMonth(),t.getDate(),t.getHours(),t.getMinutes(),t.getSeconds(),t.getMilliseconds()))):C.defaultDate&&(t=A.strToDateTime(C.defaultDate),C.defaultTime&&(e=A.strtotime(C.defaultTime),t.setHours(e.getHours()),t.setMinutes(e.getMinutes()))),t&&A.isValidDate(t)?j.data("changed",!0):t="",t||0}function s(t){var n=function(e,t){var a=e.replace(/([\[\]\/\{\}\(\)\-\.\+]{1})/g,"\\$1").replace(/_/g,"{digit+}").replace(/([0-9]{1})/g,"{digit$1}").replace(/\{digit([0-9]{1})\}/g,"[0-$1_]{1}").replace(/\{digit[\+]\}/g,"[0-9_]{1}");return new RegExp(a).test(t)},o=function(e,a){if(!(e="string"==typeof e||e instanceof String?t.ownerDocument.getElementById(e):e))return!1;if(e.createTextRange){var r=e.createTextRange();return r.collapse(!0),r.moveEnd("character",a),r.moveStart("character",a),r.select(),!0}return!!e.setSelectionRange&&(e.setSelectionRange(a,a),!0)};t.mask&&a.off("keydown.xdsoft"),!0===t.mask&&(r.formatMask?t.mask=r.formatMask(t.format):t.mask=t.format.replace(/Y/g,"9999").replace(/F/g,"9999").replace(/m/g,"19").replace(/d/g,"39").replace(/H/g,"29").replace(/i/g,"59").replace(/s/g,"59")),"string"===e.type(t.mask)&&(n(t.mask,a.val())||(a.val(t.mask.replace(/[0-9]/g,"_")),o(a[0],0)),a.on("paste.xdsoft",function(r){var i=(r.clipboardData||r.originalEvent.clipboardData||window.clipboardData).getData("text"),s=this.value,u=this.selectionStart;return s=s.substr(0,u)+i+s.substr(u+i.length),u+=i.length,n(t.mask,s)?(this.value=s,o(this,u)):""===e.trim(s)?this.value=t.mask.replace(/[0-9]/g,"_"):a.trigger("error_input.xdsoft"),r.preventDefault(),!1}),a.on("keydown.xdsoft",function(r){var i,s=this.value,u=r.which,d=this.selectionStart,C=this.selectionEnd,P=d!==C;if(u>=l&&u<=f||u>=c&&u<=m||u===v||u===g){for(i=u===v||u===g?"_":String.fromCharCode(c<=u&&u<=m?u-l:u),u===v&&d&&!P&&(d-=1);;){var Y=t.mask.substr(d,1),A=d0;if(!(/[^0-9_]/.test(Y)&&A&&H))break;d+=u!==v||P?1:-1}if(P){var j=C-d,J=t.mask.replace(/[0-9]/g,"_"),z=J.substr(d,j).substr(1);s=s.substr(0,d)+(i+z)+s.substr(d+j)}else s=s.substr(0,d)+i+s.substr(d+1);if(""===e.trim(s))s=J;else if(d===t.mask.length)return r.preventDefault(),!1;for(d+=u===v?0:1;/[^0-9_]/.test(t.mask.substr(d,1))&&d0;)d+=u===v?0:1;n(t.mask,s)?(this.value=s,o(this,d)):""===e.trim(s)?this.value=t.mask.replace(/[0-9]/g,"_"):a.trigger("error_input.xdsoft")}else if(-1!==[M,w,O,W,_].indexOf(u)&&F||-1!==[D,b,x,y,k,S,h,T,p].indexOf(u))return!0;return r.preventDefault(),!1}))}var u,d,P,Y,A,H,j=e('
      '),J=e('
      xdsoft.net
      '),z=e('
      '),I=e('
      '),N=e('
      '),L=e('
      '),E=L.find(".xdsoft_time_box").eq(0),R=e('
      '),V=e(''),B=e('
      '),G=e('
      '),U=!1,q=0;C.id&&j.attr("id",C.id),C.style&&j.attr("style",C.style),C.weeks&&j.addClass("xdsoft_showweeks"),C.rtl&&j.addClass("xdsoft_rtl"),j.addClass("xdsoft_"+C.theme),j.addClass(C.className),I.find(".xdsoft_month span").after(B),I.find(".xdsoft_year span").after(G),I.find(".xdsoft_month,.xdsoft_year").on("touchstart mousedown.xdsoft",function(t){var a,r,n=e(this).find(".xdsoft_select").eq(0),o=0,i=0,s=n.is(":visible");for(I.find(".xdsoft_select").hide(),A.currentTime&&(o=A.currentTime[e(this).hasClass("xdsoft_month")?"getMonth":"getFullYear"]()),n[s?"hide":"show"](),a=n.find("div.xdsoft_option"),r=0;rC.touchMovedThreshold&&(this.touchMoved=!0)};I.find(".xdsoft_select").xdsoftScroller(C).on("touchstart mousedown.xdsoft",function(e){var t=e.originalEvent;this.touchMoved=!1,this.touchStartPosition=t.touches?t.touches[0]:t,e.stopPropagation(),e.preventDefault()}).on("touchmove",".xdsoft_option",X).on("touchend mousedown.xdsoft",".xdsoft_option",function(){if(!this.touchMoved){void 0!==A.currentTime&&null!==A.currentTime||(A.currentTime=A.now());var t=A.currentTime.getFullYear();A&&A.currentTime&&A.currentTime[e(this).parent().parent().hasClass("xdsoft_monthselect")?"setMonth":"setFullYear"](e(this).data("value")),e(this).parent().parent().hide(),j.trigger("xchange.xdsoft"),C.onChangeMonth&&e.isFunction(C.onChangeMonth)&&C.onChangeMonth.call(j,A.currentTime,j.data("input")),t!==A.currentTime.getFullYear()&&e.isFunction(C.onChangeYear)&&C.onChangeYear.call(j,A.currentTime,j.data("input"))}}),j.getValue=function(){return A.getCurrentTime()},j.setOptions=function(n){var o={};C=e.extend(!0,{},C,n),n.allowTimes&&e.isArray(n.allowTimes)&&n.allowTimes.length&&(C.allowTimes=e.extend(!0,[],n.allowTimes)),n.weekends&&e.isArray(n.weekends)&&n.weekends.length&&(C.weekends=e.extend(!0,[],n.weekends)),n.allowDates&&e.isArray(n.allowDates)&&n.allowDates.length&&(C.allowDates=e.extend(!0,[],n.allowDates)),n.allowDateRe&&"[object String]"===Object.prototype.toString.call(n.allowDateRe)&&(C.allowDateRe=new RegExp(n.allowDateRe)),n.highlightedDates&&e.isArray(n.highlightedDates)&&n.highlightedDates.length&&(e.each(n.highlightedDates,function(a,n){var i,s=e.map(n.split(","),e.trim),u=new t(r.parseDate(s[0],C.formatDate),s[1],s[2]),d=r.formatDate(u.date,C.formatDate);void 0!==o[d]?(i=o[d].desc)&&i.length&&u.desc&&u.desc.length&&(o[d].desc=i+"\n"+u.desc):o[d]=u}),C.highlightedDates=e.extend(!0,[],o)),n.highlightedPeriods&&e.isArray(n.highlightedPeriods)&&n.highlightedPeriods.length&&(o=e.extend(!0,[],C.highlightedDates),e.each(n.highlightedPeriods,function(a,n){var i,s,u,d,l,f,c;if(e.isArray(n))i=n[0],s=n[1],u=n[2],c=n[3];else{var m=e.map(n.split(","),e.trim);i=r.parseDate(m[0],C.formatDate),s=r.parseDate(m[1],C.formatDate),u=m[2],c=m[3]}for(;i<=s;)d=new t(i,u,c),l=r.formatDate(i,C.formatDate),i.setDate(i.getDate()+1),void 0!==o[l]?(f=o[l].desc)&&f.length&&d.desc&&d.desc.length&&(o[l].desc=f+"\n"+d.desc):o[l]=d}),C.highlightedDates=e.extend(!0,[],o)),n.disabledDates&&e.isArray(n.disabledDates)&&n.disabledDates.length&&(C.disabledDates=e.extend(!0,[],n.disabledDates)),n.disabledWeekDays&&e.isArray(n.disabledWeekDays)&&n.disabledWeekDays.length&&(C.disabledWeekDays=e.extend(!0,[],n.disabledWeekDays)),!C.open&&!C.opened||C.inline||a.trigger("open.xdsoft"),C.inline&&(U=!0,j.addClass("xdsoft_inline"),a.after(j).hide()),C.inverseButton&&(C.next="xdsoft_prev",C.prev="xdsoft_next"),C.datepicker?z.addClass("active"):z.removeClass("active"),C.timepicker?L.addClass("active"):L.removeClass("active"),C.value&&(A.setCurrentTime(C.value),a&&a.val&&a.val(A.str)),isNaN(C.dayOfWeekStart)?C.dayOfWeekStart=0:C.dayOfWeekStart=parseInt(C.dayOfWeekStart,10)%7,C.timepickerScrollbar||E.xdsoftScroller(C,"hide"),C.minDate&&/^[\+\-](.*)$/.test(C.minDate)&&(C.minDate=r.formatDate(A.strToDateTime(C.minDate),C.formatDate)),C.maxDate&&/^[\+\-](.*)$/.test(C.maxDate)&&(C.maxDate=r.formatDate(A.strToDateTime(C.maxDate),C.formatDate)),C.minDateTime&&/^\+(.*)$/.test(C.minDateTime)&&(C.minDateTime=A.strToDateTime(C.minDateTime).dateFormat(C.formatDate)),C.maxDateTime&&/^\+(.*)$/.test(C.maxDateTime)&&(C.maxDateTime=A.strToDateTime(C.maxDateTime).dateFormat(C.formatDate)),V.toggle(C.showApplyButton),I.find(".xdsoft_today_button").css("visibility",C.todayButton?"visible":"hidden"),I.find("."+C.prev).css("visibility",C.prevButton?"visible":"hidden"),I.find("."+C.next).css("visibility",C.nextButton?"visible":"hidden"),s(C),C.validateOnBlur&&a.off("blur.xdsoft").on("blur.xdsoft",function(){if(C.allowBlank&&(!e.trim(e(this).val()).length||"string"==typeof C.mask&&e.trim(e(this).val())===C.mask.replace(/[0-9]/g,"_")))e(this).val(null),j.data("xdsoft_datetime").empty();else{var t=r.parseDate(e(this).val(),C.format);if(t)e(this).val(r.formatDate(t,C.format));else{var a=+[e(this).val()[0],e(this).val()[1]].join(""),n=+[e(this).val()[2],e(this).val()[3]].join("");!C.datepicker&&C.timepicker&&a>=0&&a<24&&n>=0&&n<60?e(this).val([a,n].map(function(e){return e>9?e:"0"+e}).join(":")):e(this).val(r.formatDate(A.now(),C.format))}j.data("xdsoft_datetime").setCurrentTime(e(this).val())}j.trigger("changedatetime.xdsoft"),j.trigger("close.xdsoft")}),C.dayOfWeekStartPrev=0===C.dayOfWeekStart?6:C.dayOfWeekStart-1,j.trigger("xchange.xdsoft").trigger("afterOpen.xdsoft")},j.data("options",C).on("touchstart mousedown.xdsoft",function(e){return e.stopPropagation(),e.preventDefault(),G.hide(),B.hide(),!1}),E.append(R),E.xdsoftScroller(C),j.on("afterOpen.xdsoft",function(){E.xdsoftScroller(C)}),j.append(z).append(L),!0!==C.withoutCopyright&&j.append(J),z.append(I).append(N).append(V),e(C.parentID).append(j),A=new function(){var t=this;t.now=function(e){var a,r,n=new Date;return!e&&C.defaultDate&&(a=t.strToDateTime(C.defaultDate),n.setFullYear(a.getFullYear()),n.setMonth(a.getMonth()),n.setDate(a.getDate())),n.setFullYear(n.getFullYear()),!e&&C.defaultTime&&(r=t.strtotime(C.defaultTime),n.setHours(r.getHours()),n.setMinutes(r.getMinutes()),n.setSeconds(r.getSeconds()),n.setMilliseconds(r.getMilliseconds())),n},t.isValidDate=function(e){return"[object Date]"===Object.prototype.toString.call(e)&&!isNaN(e.getTime())},t.setCurrentTime=function(e,a){"string"==typeof e?t.currentTime=t.strToDateTime(e):t.isValidDate(e)?t.currentTime=e:e||a||!C.allowBlank||C.inline?t.currentTime=t.now():t.currentTime=null,j.trigger("xchange.xdsoft")},t.empty=function(){t.currentTime=null},t.getCurrentTime=function(){return t.currentTime},t.nextMonth=function(){void 0!==t.currentTime&&null!==t.currentTime||(t.currentTime=t.now());var a,r=t.currentTime.getMonth()+1;return 12===r&&(t.currentTime.setFullYear(t.currentTime.getFullYear()+1),r=0),a=t.currentTime.getFullYear(),t.currentTime.setDate(Math.min(new Date(t.currentTime.getFullYear(),r+1,0).getDate(),t.currentTime.getDate())),t.currentTime.setMonth(r),C.onChangeMonth&&e.isFunction(C.onChangeMonth)&&C.onChangeMonth.call(j,A.currentTime,j.data("input")),a!==t.currentTime.getFullYear()&&e.isFunction(C.onChangeYear)&&C.onChangeYear.call(j,A.currentTime,j.data("input")),j.trigger("xchange.xdsoft"),r},t.prevMonth=function(){void 0!==t.currentTime&&null!==t.currentTime||(t.currentTime=t.now());var a=t.currentTime.getMonth()-1;return-1===a&&(t.currentTime.setFullYear(t.currentTime.getFullYear()-1),a=11),t.currentTime.setDate(Math.min(new Date(t.currentTime.getFullYear(),a+1,0).getDate(),t.currentTime.getDate())),t.currentTime.setMonth(a),C.onChangeMonth&&e.isFunction(C.onChangeMonth)&&C.onChangeMonth.call(j,A.currentTime,j.data("input")),j.trigger("xchange.xdsoft"),a},t.getWeekOfYear=function(t){if(C.onGetWeekOfYear&&e.isFunction(C.onGetWeekOfYear)){var a=C.onGetWeekOfYear.call(j,t);if(void 0!==a)return a}var r=new Date(t.getFullYear(),0,1);return 4!==r.getDay()&&r.setMonth(0,1+(4-r.getDay()+7)%7),Math.ceil(((t-r)/864e5+r.getDay()+1)/7)},t.strToDateTime=function(e){var a,n,o=[];return e&&e instanceof Date&&t.isValidDate(e)?e:((o=/^([+-]{1})(.*)$/.exec(e))&&(o[2]=r.parseDate(o[2],C.formatDate)),o&&o[2]?(a=o[2].getTime()-6e4*o[2].getTimezoneOffset(),n=new Date(t.now(!0).getTime()+parseInt(o[1]+"1",10)*a)):n=e?r.parseDate(e,C.format):t.now(),t.isValidDate(n)||(n=t.now()),n)},t.strToDate=function(e){if(e&&e instanceof Date&&t.isValidDate(e))return e;var a=e?r.parseDate(e,C.formatDate):t.now(!0);return t.isValidDate(a)||(a=t.now(!0)),a},t.strtotime=function(e){if(e&&e instanceof Date&&t.isValidDate(e))return e;var a=e?r.parseDate(e,C.formatTime):t.now(!0);return t.isValidDate(a)||(a=t.now(!0)),a},t.str=function(){var e=C.format;return C.yearOffset&&(e=(e=e.replace("Y",t.currentTime.getFullYear()+C.yearOffset)).replace("y",String(t.currentTime.getFullYear()+C.yearOffset).substring(2,4))),r.formatDate(t.currentTime,e)},t.currentTime=this.now()},V.on("touchend click",function(e){e.preventDefault(),j.data("changed",!0),A.setCurrentTime(i()),a.val(A.str()),j.trigger("close.xdsoft")}),I.find(".xdsoft_today_button").on("touchend mousedown.xdsoft",function(){j.data("changed",!0),A.setCurrentTime(0,!0),j.trigger("afterOpen.xdsoft")}).on("dblclick.xdsoft",function(){var e,t,r=A.getCurrentTime();r=new Date(r.getFullYear(),r.getMonth(),r.getDate()),e=A.strToDate(C.minDate),r<(e=new Date(e.getFullYear(),e.getMonth(),e.getDate()))||(t=A.strToDate(C.maxDate),r>(t=new Date(t.getFullYear(),t.getMonth(),t.getDate()))||(a.val(A.str()),a.trigger("change"),j.trigger("close.xdsoft")))}),I.find(".xdsoft_prev,.xdsoft_next").on("touchend mousedown.xdsoft",function(){var t=e(this),a=0,r=!1;!function e(n){t.hasClass(C.next)?A.nextMonth():t.hasClass(C.prev)&&A.prevMonth(),C.monthChangeSpinner&&(r||(a=setTimeout(e,n||100)))}(500),e([C.ownerDocument.body,C.contentWindow]).on("touchend mouseup.xdsoft",function t(){clearTimeout(a),r=!0,e([C.ownerDocument.body,C.contentWindow]).off("touchend mouseup.xdsoft",t)})}),L.find(".xdsoft_prev,.xdsoft_next").on("touchend mousedown.xdsoft",function(){var t=e(this),a=0,r=!1,n=110;!function e(o){var i=E[0].clientHeight,s=R[0].offsetHeight,u=Math.abs(parseInt(R.css("marginTop"),10));t.hasClass(C.next)&&s-i-C.timeHeightInTimePicker>=u?R.css("marginTop","-"+(u+C.timeHeightInTimePicker)+"px"):t.hasClass(C.prev)&&u-C.timeHeightInTimePicker>=0&&R.css("marginTop","-"+(u-C.timeHeightInTimePicker)+"px"),E.trigger("scroll_element.xdsoft_scroller",[Math.abs(parseInt(R[0].style.marginTop,10)/(s-i))]),n=n>10?10:n-10,r||(a=setTimeout(e,o||n))}(500),e([C.ownerDocument.body,C.contentWindow]).on("touchend mouseup.xdsoft",function t(){clearTimeout(a),r=!0,e([C.ownerDocument.body,C.contentWindow]).off("touchend mouseup.xdsoft",t)})}),u=0,j.on("xchange.xdsoft",function(t){clearTimeout(u),u=setTimeout(function(){void 0!==A.currentTime&&null!==A.currentTime||(A.currentTime=A.now());for(var t,i,s,u,d,l,f,c,m,h,g="",p=new Date(A.currentTime.getFullYear(),A.currentTime.getMonth(),1,12,0,0),D=0,v=A.now(),y=!1,b=!1,k=!1,x=!1,T=[],S=!0,M="";p.getDay()!==C.dayOfWeekStart;)p.setDate(p.getDate()-1);for(g+="",C.weeks&&(g+=""),t=0;t<7;t+=1)g+="";g+="",g+="",!1!==C.maxDate&&(y=A.strToDate(C.maxDate),y=new Date(y.getFullYear(),y.getMonth(),y.getDate(),23,59,59,999)),!1!==C.minDate&&(b=A.strToDate(C.minDate),b=new Date(b.getFullYear(),b.getMonth(),b.getDate())),!1!==C.minDateTime&&(k=A.strToDate(C.minDateTime),k=new Date(k.getFullYear(),k.getMonth(),k.getDate(),k.getHours(),k.getMinutes(),k.getSeconds())),!1!==C.maxDateTime&&(x=A.strToDate(C.maxDateTime),x=new Date(x.getFullYear(),x.getMonth(),x.getDate(),x.getHours(),x.getMinutes(),x.getSeconds()));var w;for(!1!==x&&(w=31*(12*x.getFullYear()+x.getMonth())+x.getDate());D0&&-1===C.allowDates.indexOf(r.formatDate(p,C.formatDate))&&T.push("xdsoft_disabled");var O=31*(12*p.getFullYear()+p.getMonth())+p.getDate();(!1!==y&&p>y||!1!==k&&pw||c&&!1===c[0])&&T.push("xdsoft_disabled"),-1!==C.disabledDates.indexOf(r.formatDate(p,C.formatDate))&&T.push("xdsoft_disabled"),-1!==C.disabledWeekDays.indexOf(s)&&T.push("xdsoft_disabled"),a.is("[disabled]")&&T.push("xdsoft_disabled"),c&&""!==c[1]&&T.push(c[1]),A.currentTime.getMonth()!==l&&T.push("xdsoft_other_month"),(C.defaultSelect||j.data("changed"))&&r.formatDate(A.currentTime,C.formatDate)===r.formatDate(p,C.formatDate)&&T.push("xdsoft_current"),r.formatDate(v,C.formatDate)===r.formatDate(p,C.formatDate)&&T.push("xdsoft_today"),0!==p.getDay()&&6!==p.getDay()&&-1===C.weekends.indexOf(r.formatDate(p,C.formatDate))||T.push("xdsoft_weekend"),void 0!==C.highlightedDates[r.formatDate(p,C.formatDate)]&&(i=C.highlightedDates[r.formatDate(p,C.formatDate)],T.push(void 0===i.style?"xdsoft_highlighted_default":i.style),h=void 0===i.desc?"":i.desc),C.beforeShowDay&&e.isFunction(C.beforeShowDay)&&T.push(C.beforeShowDay(p)),S&&(g+="",S=!1,C.weeks&&(g+="")),g+='",p.getDay()===C.dayOfWeekStartPrev&&(g+="",S=!0),p.setDate(u+1)}g+="
      "+C.i18n[o].dayOfWeekShort[(t+C.dayOfWeekStart)%7]+"
      "+f+"
      '+u+"
      ",N.html(g),I.find(".xdsoft_label span").eq(0).text(C.i18n[o].months[A.currentTime.getMonth()]),I.find(".xdsoft_label span").eq(1).text(A.currentTime.getFullYear()+C.yearOffset),M="",l="";var W=0;if(!1!==C.minTime){F=A.strtotime(C.minTime);W=60*F.getHours()+F.getMinutes()}var _=1440;if(!1!==C.maxTime){F=A.strtotime(C.maxTime);_=60*F.getHours()+F.getMinutes()}if(!1!==C.minDateTime){F=A.strToDateTime(C.minDateTime);r.formatDate(A.currentTime,C.formatDate)===r.formatDate(F,C.formatDate)&&(l=60*F.getHours()+F.getMinutes())>W&&(W=l)}if(!1!==C.maxDateTime){var F=A.strToDateTime(C.maxDateTime);r.formatDate(A.currentTime,C.formatDate)===r.formatDate(F,C.formatDate)&&(l=60*F.getHours()+F.getMinutes())<_&&(_=l)}if(m=function(t,n){var o,i=A.now(),s=C.allowTimes&&e.isArray(C.allowTimes)&&C.allowTimes.length;i.setHours(t),t=parseInt(i.getHours(),10),i.setMinutes(n),n=parseInt(i.getMinutes(),10),T=[];var u=60*t+n;(a.is("[disabled]")||u>=_||u59||o.getMinutes()===parseInt(n,10))&&(C.defaultSelect||j.data("changed")?T.push("xdsoft_current"):C.initTime&&T.push("xdsoft_init_time")),parseInt(v.getHours(),10)===parseInt(t,10)&&parseInt(v.getMinutes(),10)===parseInt(n,10)&&T.push("xdsoft_today"),M+='
      '+r.formatDate(i,C.formatTime)+"
      "},C.allowTimes&&e.isArray(C.allowTimes)&&C.allowTimes.length)for(D=0;D=_||m((D<10?"0":"")+D,l=(t<10?"0":"")+t))}for(R.html(M),n="",D=parseInt(C.yearStart,10);D<=parseInt(C.yearEnd,10);D+=1)n+='
      '+(D+C.yearOffset)+"
      ";for(G.children().eq(0).html(n),D=parseInt(C.monthStart,10),n="";D<=parseInt(C.monthEnd,10);D+=1)n+='
      '+C.i18n[o].months[D]+"
      ";B.children().eq(0).html(n),e(j).trigger("generate.xdsoft")},10),t.stopPropagation()}).on("afterOpen.xdsoft",function(){if(C.timepicker){var e,t,a,r;R.find(".xdsoft_current").length?e=".xdsoft_current":R.find(".xdsoft_init_time").length&&(e=".xdsoft_init_time"),e?(t=E[0].clientHeight,(a=R[0].offsetHeight)-t<(r=R.find(e).index()*C.timeHeightInTimePicker+1)&&(r=a-t),E.trigger("scroll_element.xdsoft_scroller",[parseInt(r,10)/(a-t)])):E.trigger("scroll_element.xdsoft_scroller",[0])}}),d=0,N.on("touchend click.xdsoft","td",function(t){t.stopPropagation(),d+=1;var r=e(this),n=A.currentTime;if(void 0!==n&&null!==n||(A.currentTime=A.now(),n=A.currentTime),r.hasClass("xdsoft_disabled"))return!1;n.setDate(1),n.setFullYear(r.data("year")),n.setMonth(r.data("month")),n.setDate(r.data("date")),j.trigger("select.xdsoft",[n]),a.val(A.str()),C.onSelectDate&&e.isFunction(C.onSelectDate)&&C.onSelectDate.call(j,A.currentTime,j.data("input"),t),j.data("changed",!0),j.trigger("xchange.xdsoft"),j.trigger("changedatetime.xdsoft"),(d>1||!0===C.closeOnDateSelect||!1===C.closeOnDateSelect&&!C.timepicker)&&!C.inline&&j.trigger("close.xdsoft"),setTimeout(function(){d=0},200)}),R.on("touchstart","div",function(e){this.touchMoved=!1}).on("touchmove","div",X).on("touchend click.xdsoft","div",function(t){if(!this.touchMoved){t.stopPropagation();var a=e(this),r=A.currentTime;if(void 0!==r&&null!==r||(A.currentTime=A.now(),r=A.currentTime),a.hasClass("xdsoft_disabled"))return!1;r.setHours(a.data("hour")),r.setMinutes(a.data("minute")),j.trigger("select.xdsoft",[r]),j.data("input").val(A.str()),C.onSelectTime&&e.isFunction(C.onSelectTime)&&C.onSelectTime.call(j,A.currentTime,j.data("input"),t),j.data("changed",!0),j.trigger("xchange.xdsoft"),j.trigger("changedatetime.xdsoft"),!0!==C.inline&&!0===C.closeOnTimeSelect&&j.trigger("close.xdsoft")}}),z.on("mousewheel.xdsoft",function(e){return!C.scrollMonth||(e.deltaY<0?A.nextMonth():A.prevMonth(),!1)}),a.on("mousewheel.xdsoft",function(e){return!C.scrollInput||(!C.datepicker&&C.timepicker?((P=R.find(".xdsoft_current").length?R.find(".xdsoft_current").eq(0).index():0)+e.deltaY>=0&&P+e.deltaYc+m?(l="bottom",r=c+m-t.top):r-=m):r+j[0].offsetHeight>c+m&&(r=t.top-j[0].offsetHeight+1),r<0&&(r=0),n+a.offsetWidth>d&&(n=d-a.offsetWidth)),i=j[0],H(i,function(e){if("relative"===C.contentWindow.getComputedStyle(e).getPropertyValue("position")&&d>=e.offsetWidth)return n-=(d-e.offsetWidth)/2,!1}),(f={position:o,left:n,top:"",bottom:""})[l]=r,j.css(f)},j.on("open.xdsoft",function(t){var a=!0;C.onShow&&e.isFunction(C.onShow)&&(a=C.onShow.call(j,A.currentTime,j.data("input"),t)),!1!==a&&(j.show(),Y(),e(C.contentWindow).off("resize.xdsoft",Y).on("resize.xdsoft",Y),C.closeOnWithoutClick&&e([C.ownerDocument.body,C.contentWindow]).on("touchstart mousedown.xdsoft",function t(){j.trigger("close.xdsoft"),e([C.ownerDocument.body,C.contentWindow]).off("touchstart mousedown.xdsoft",t)}))}).on("close.xdsoft",function(t){var a=!0;I.find(".xdsoft_month,.xdsoft_year").find(".xdsoft_select").hide(),C.onClose&&e.isFunction(C.onClose)&&(a=C.onClose.call(j,A.currentTime,j.data("input"),t)),!1===a||C.opened||C.inline||j.hide(),t.stopPropagation()}).on("toggle.xdsoft",function(){j.is(":visible")?j.trigger("close.xdsoft"):j.trigger("open.xdsoft")}).data("input",a),q=0,j.data("xdsoft_datetime",A),j.setOptions(C),A.setCurrentTime(i()),a.data("xdsoft_datetimepicker",j).on("open.xdsoft focusin.xdsoft mousedown.xdsoft touchstart",function(){a.is(":disabled")||a.data("xdsoft_datetimepicker").is(":visible")&&C.closeOnInputClick||C.openOnFocus&&(clearTimeout(q),q=setTimeout(function(){a.is(":disabled")||(U=!0,A.setCurrentTime(i(),!0),C.mask&&s(C),j.trigger("open.xdsoft"))},100))}).on("keydown.xdsoft",function(t){var a,r=t.which;return-1!==[p].indexOf(r)&&C.enterLikeTab?(a=e("input:visible,textarea:visible,button:visible,a:visible"),j.trigger("close.xdsoft"),a.eq(a.index(this)+1).focus(),!1):-1!==[T].indexOf(r)?(j.trigger("close.xdsoft"),!0):void 0}).on("blur.xdsoft",function(){j.trigger("close.xdsoft")})},u=function(t){var a=t.data("xdsoft_datetimepicker");a&&(a.data("xdsoft_datetime",null),a.remove(),t.data("xdsoft_datetimepicker",null).off(".xdsoft"),e(C.contentWindow).off("resize.xdsoft"),e([C.contentWindow,C.ownerDocument.body]).off("mousedown.xdsoft touchstart"),t.unmousewheel&&t.unmousewheel())},e(C.ownerDocument).off("keydown.xdsoftctrl keyup.xdsoftctrl").on("keydown.xdsoftctrl",function(e){e.keyCode===h&&(F=!0)}).on("keyup.xdsoftctrl",function(e){e.keyCode===h&&(F=!1)}),this.each(function(){var t=e(this).data("xdsoft_datetimepicker");if(t){if("string"===e.type(n))switch(n){case"show":e(this).select().focus(),t.trigger("open.xdsoft");break;case"hide":t.trigger("close.xdsoft");break;case"toggle":t.trigger("toggle.xdsoft");break;case"destroy":u(e(this));break;case"reset":this.value=this.defaultValue,this.value&&t.data("xdsoft_datetime").isValidDate(r.parseDate(this.value,C.format))||t.data("changed",!1),t.data("xdsoft_datetime").setCurrentTime(this.value);break;case"validate":t.data("input").trigger("blur.xdsoft");break;default:t[n]&&e.isFunction(t[n])&&(d=t[n](i))}else t.setOptions(n);return 0}"string"!==e.type(n)&&(!C.lazyInit||C.open||C.inline?s(e(this)):Y(e(this)))}),d},e.fn.datetimepicker.defaults=a};!function(e){"function"==typeof define&&define.amd?define(["jquery","jquery-mousewheel"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(datetimepickerFactory),function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(e){function t(t){var i=t||window.event,s=u.call(arguments,1),d=0,f=0,c=0,m=0,h=0,g=0;if(t=e.event.fix(i),t.type="mousewheel","detail"in i&&(c=-1*i.detail),"wheelDelta"in i&&(c=i.wheelDelta),"wheelDeltaY"in i&&(c=i.wheelDeltaY),"wheelDeltaX"in i&&(f=-1*i.wheelDeltaX),"axis"in i&&i.axis===i.HORIZONTAL_AXIS&&(f=-1*c,c=0),d=0===c?f:c,"deltaY"in i&&(d=c=-1*i.deltaY),"deltaX"in i&&(f=i.deltaX,0===c&&(d=-1*f)),0!==c||0!==f){if(1===i.deltaMode){var p=e.data(this,"mousewheel-line-height");d*=p,c*=p,f*=p}else if(2===i.deltaMode){var D=e.data(this,"mousewheel-page-height");d*=D,c*=D,f*=D}if(m=Math.max(Math.abs(c),Math.abs(f)),(!o||m=1?"floor":"ceil"](d/o),f=Math[f>=1?"floor":"ceil"](f/o),c=Math[c>=1?"floor":"ceil"](c/o),l.settings.normalizeOffset&&this.getBoundingClientRect){var v=this.getBoundingClientRect();h=t.clientX-v.left,g=t.clientY-v.top}return t.deltaX=f,t.deltaY=c,t.deltaFactor=o,t.offsetX=h,t.offsetY=g,t.deltaMode=0,s.unshift(t,d,f,c),n&&clearTimeout(n),n=setTimeout(a,200),(e.event.dispatch||e.event.handle).apply(this,s)}}function a(){o=null}function r(e,t){return l.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}var n,o,i=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],s="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],u=Array.prototype.slice;if(e.event.fixHooks)for(var d=i.length;d;)e.event.fixHooks[i[--d]]=e.event.mouseHooks;var l=e.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var a=s.length;a;)this.addEventListener(s[--a],t,!1);else this.onmousewheel=t;e.data(this,"mousewheel-line-height",l.getLineHeight(this)),e.data(this,"mousewheel-page-height",l.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var a=s.length;a;)this.removeEventListener(s[--a],t,!1);else this.onmousewheel=null;e.removeData(this,"mousewheel-line-height"),e.removeData(this,"mousewheel-page-height")},getLineHeight:function(t){var a=e(t),r=a["offsetParent"in e.fn?"offsetParent":"parent"]();return r.length||(r=e("body")),parseInt(r.css("fontSize"),10)||parseInt(a.css("fontSize"),10)||16},getPageHeight:function(t){return e(t).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})}); \ No newline at end of file diff --git a/resources/datetime-picker/datetimepicker.min.css b/resources/datetime-picker/datetimepicker.min.css new file mode 100644 index 0000000..14a08a1 --- /dev/null +++ b/resources/datetime-picker/datetimepicker.min.css @@ -0,0 +1 @@ +.xdsoft_datetimepicker{box-shadow:0 5px 15px -5px rgba(0,0,0,0.506);background:#fff;border-bottom:1px solid #bbb;border-left:1px solid #ccc;border-right:1px solid #ccc;border-top:1px solid #ccc;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;padding:8px;padding-left:0;padding-top:2px;position:absolute;z-index:9999;-moz-box-sizing:border-box;box-sizing:border-box;display:none}.xdsoft_datetimepicker.xdsoft_rtl{padding:8px 0 8px 8px}.xdsoft_datetimepicker iframe{position:absolute;left:0;top:0;width:75px;height:210px;background:transparent;border:0}.xdsoft_datetimepicker button{border:none !important}.xdsoft_noselect{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.xdsoft_noselect::selection{background:transparent}.xdsoft_noselect::-moz-selection{background:transparent}.xdsoft_datetimepicker.xdsoft_inline{display:inline-block;position:static;box-shadow:none}.xdsoft_datetimepicker *{-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin:0}.xdsoft_datetimepicker .xdsoft_datepicker,.xdsoft_datetimepicker .xdsoft_timepicker{display:none}.xdsoft_datetimepicker .xdsoft_datepicker.active,.xdsoft_datetimepicker .xdsoft_timepicker.active{display:block}.xdsoft_datetimepicker .xdsoft_datepicker{width:224px;float:left;margin-left:8px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_datepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_datepicker{width:256px}.xdsoft_datetimepicker .xdsoft_timepicker{width:58px;float:left;text-align:center;margin-left:8px;margin-top:0}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker{float:right;margin-right:8px;margin-left:0}.xdsoft_datetimepicker .xdsoft_datepicker.active+.xdsoft_timepicker{margin-top:8px;margin-bottom:3px}.xdsoft_datetimepicker .xdsoft_monthpicker{position:relative;text-align:center}.xdsoft_datetimepicker .xdsoft_label i,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Q0NBRjI1NjM0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Q0NBRjI1NjQ0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDQ0FGMjU2MTQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDQ0FGMjU2MjQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoNEP54AAAIOSURBVHja7Jq9TsMwEMcxrZD4WpBYeKUCe+kTMCACHZh4BFfHO/AAIHZGFhYkBBsSEqxsLCAgXKhbXYOTxh9pfJVP+qutnZ5s/5Lz2Y5I03QhWji2GIcgAokWgfCxNvcOCCGKqiSqhUp0laHOne05vdEyGMfkdxJDVjgwDlEQgYQBgx+ULJaWSXXS6r/ER5FBVR8VfGftTKcITNs+a1XpcFoExREIDF14AVIFxgQUS+h520cdud6wNkC0UBw6BCO/HoCYwBhD8QCkQ/x1mwDyD4plh4D6DDV0TAGyo4HcawLIBBSLDkHeH0Mg2yVP3l4TQMZQDDsEOl/MgHQqhMNuE0D+oBh0CIr8MAKyazBH9WyBuKxDWgbXfjNf32TZ1KWm/Ap1oSk/R53UtQ5xTh3LUlMmT8gt6g51Q9p+SobxgJQ/qmsfZhWywGFSl0yBjCLJCMgXail3b7+rumdVJ2YRss4cN+r6qAHDkPWjPjdJCF4n9RmAD/V9A/Wp4NQassDjwlB6XBiCxcJQWmZZb8THFilfy/lfrTvLghq2TqTHrRMTKNJ0sIhdo15RT+RpyWwFdY96UZ/LdQKBGjcXpcc1AlSFEfLmouD+1knuxBDUVrvOBmoOC/rEcN7OQxKVeJTCiAdUzUJhA2Oez9QTkp72OTVcxDcXY8iKNkxGAJXmJCOQwOa6dhyXsOa6XwEGAKdeb5ET3rQdAAAAAElFTkSuQmCC)}.xdsoft_datetimepicker .xdsoft_label i{opacity:.5;background-position:-92px -19px;display:inline-block;width:9px;height:20px;vertical-align:middle}.xdsoft_datetimepicker .xdsoft_prev{float:left;background-position:-20px 0}.xdsoft_datetimepicker .xdsoft_today_button{float:left;background-position:-70px 0;margin-left:5px}.xdsoft_datetimepicker .xdsoft_next{float:right;background-position:0 0}.xdsoft_datetimepicker .xdsoft_next,.xdsoft_datetimepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_today_button{background-color:transparent;background-repeat:no-repeat;border:0 none;cursor:pointer;display:block;height:30px;opacity:.5;-ms-filter:"alpha(opacity=50)";outline:medium none;overflow:hidden;padding:0;position:relative;text-indent:100%;white-space:nowrap;width:20px;min-width:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_next{float:none;background-position:-40px -15px;height:15px;width:30px;display:block;margin-left:14px;margin-top:7px}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_timepicker .xdsoft_next{float:none;margin-left:0;margin-right:14px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev{background-position:-40px 0;margin-bottom:7px;margin-top:0}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box{height:151px;overflow:hidden;border-bottom:1px solid #ddd}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div{background:#f5f5f5;border-top:1px solid #ddd;color:#666;font-size:12px;text-align:center;border-collapse:collapse;cursor:pointer;border-bottom-width:0;height:25px;line-height:25px}.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:first-child{border-top-width:0}.xdsoft_datetimepicker .xdsoft_today_button:hover,.xdsoft_datetimepicker .xdsoft_next:hover,.xdsoft_datetimepicker .xdsoft_prev:hover{opacity:1;-ms-filter:"alpha(opacity=100)"}.xdsoft_datetimepicker .xdsoft_label{display:inline;position:relative;z-index:9999;margin:0;padding:5px 3px;font-size:14px;line-height:20px;font-weight:bold;background-color:#fff;float:left;width:182px;text-align:center;cursor:pointer}.xdsoft_datetimepicker .xdsoft_label:hover>span{text-decoration:underline}.xdsoft_datetimepicker .xdsoft_label:hover i{opacity:1.0}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select{border:1px solid #ccc;position:absolute;right:0;top:30px;z-index:101;display:none;background:#fff;max-height:160px;overflow-y:hidden}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_monthselect{right:-7px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select.xdsoft_yearselect{right:2px}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#fff;background:#ff8000}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option{padding:2px 10px 2px 5px;text-decoration:none !important}.xdsoft_datetimepicker .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_month{width:100px;text-align:right}.xdsoft_datetimepicker .xdsoft_calendar{clear:both}.xdsoft_datetimepicker .xdsoft_year{width:48px;margin-left:5px}.xdsoft_datetimepicker .xdsoft_calendar table{border-collapse:collapse;width:100%}.xdsoft_datetimepicker .xdsoft_calendar td>div{padding-right:5px}.xdsoft_datetimepicker .xdsoft_calendar th{height:25px}.xdsoft_datetimepicker .xdsoft_calendar td,.xdsoft_datetimepicker .xdsoft_calendar th{width:14.2857142%;background:#f5f5f5;border:1px solid #ddd;color:#666;font-size:12px;text-align:right;vertical-align:middle;padding:0;border-collapse:collapse;cursor:pointer;height:25px}.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_calendar th{width:12.5%}.xdsoft_datetimepicker .xdsoft_calendar th{background:#f1f1f1}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_today{color:#3af}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#3af;box-shadow:#178fe5 0 1px 3px 0 inset;color:#fff;font-weight:700}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month,.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled,.xdsoft_datetimepicker .xdsoft_time_box>div>div.xdsoft_disabled{opacity:.5;-ms-filter:"alpha(opacity=50)";cursor:default}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{opacity:.2;-ms-filter:"alpha(opacity=20)"}.xdsoft_datetimepicker .xdsoft_calendar td:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#fff !important;background:#ff8000 !important;box-shadow:none !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current.xdsoft_disabled:hover{background:#3af !important;box-shadow:#178fe5 0 1px 3px 0 inset !important;color:#fff !important}.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled:hover,.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_disabled:hover{color:inherit !important;background:inherit !important;box-shadow:inherit !important}.xdsoft_datetimepicker .xdsoft_calendar th{font-weight:700;text-align:center;color:#999;cursor:default}.xdsoft_datetimepicker .xdsoft_copyright{color:#ccc !important;font-size:10px;clear:both;float:none;margin-left:8px}.xdsoft_datetimepicker .xdsoft_copyright a{color:#eee !important}.xdsoft_datetimepicker .xdsoft_copyright a:hover{color:#aaa !important}.xdsoft_time_box{position:relative;border:1px solid #ccc}.xdsoft_scrollbar>.xdsoft_scroller{background:#ccc !important;height:20px;border-radius:3px}.xdsoft_scrollbar{position:absolute;width:7px;right:0;top:0;bottom:0;cursor:pointer}.xdsoft_datetimepicker.xdsoft_rtl .xdsoft_scrollbar{left:0;right:auto}.xdsoft_scroller_box{position:relative}.xdsoft_datetimepicker.xdsoft_dark{box-shadow:0 5px 15px -5px rgba(255,255,255,0.506);background:#000;border-bottom:1px solid #444;border-left:1px solid #333;border-right:1px solid #333;border-top:1px solid #333;color:#ccc}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box{border-bottom:1px solid #222}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div{background:#0a0a0a;border-top:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label{background-color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select{border:1px solid #333;background:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option:hover{color:#000;background:#007fff}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label>.xdsoft_select>div>.xdsoft_option.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_label i,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_prev,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_next,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_today_button{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUExQUUzOTA0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUExQUUzOTE0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQTFBRTM4RTQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQTFBRTM4RjQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pp0VxGEAAAIASURBVHja7JrNSgMxEMebtgh+3MSLr1T1Xn2CHoSKB08+QmR8Bx9A8e7RixdB9CKCoNdexIugxFlJa7rNZneTbLIpM/CnNLsdMvNjM8l0mRCiQ9Ye61IKCAgZAUnH+mU3MMZaHYChBnJUDzWOFZdVfc5+ZFLbrWDeXPwbxIqrLLfaeS0hEBVGIRQCEiZoHQwtlGSByCCdYBl8g8egTTAWoKQMRBRBcZxYlhzhKegqMOageErsCHVkk3hXIFooDgHB1KkHIHVgzKB4ADJQ/A1jAFmAYhkQqA5TOBtocrKrgXwQA8gcFIuAIO8sQSA7hidvPwaQGZSaAYHOUWJABhWWw2EMIH9QagQERU4SArJXo0ZZL18uvaxejXt/Em8xjVBXmvFr1KVm/AJ10tRe2XnraNqaJvKE3KHuUbfK1E+VHB0q40/y3sdQSxY4FHWeKJCunP8UyDdqJZenT3ntVV5jIYCAh20vT7ioP8tpf6E2lfEMwERe+whV1MHjwZB7PBiCxcGQWwKZKD62lfGNnP/1poFAA60T7rF1UgcKd2id3KDeUS+oLWV8DfWAepOfq00CgQabi9zjcgJVYVD7PVzQUAUGAQkbNJTBICDhgwYTjDYD6XeW08ZKh+A4pYkzenOxXUbvZcWz7E8ykRMnIHGX1XPl+1m2vPYpL+2qdb8CDAARlKFEz/ZVkAAAAABJRU5ErkJggg==)}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0a0a0a;border:1px solid #222;color:#999}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{background:#0e0e0e}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_today{color:#c50}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_default{background:#ffe9d2;box-shadow:#ffb871 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_highlighted_mint{background:#c1ffc9;box-shadow:#00dd1c 0 1px 4px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_default,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td.xdsoft_current,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div.xdsoft_current{background:#c50;box-shadow:#b03e00 0 1px 3px 0 inset;color:#000}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar td:hover,.xdsoft_datetimepicker.xdsoft_dark .xdsoft_timepicker .xdsoft_time_box>div>div:hover{color:#000 !important;background:#007fff !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_calendar th{color:#666}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright{color:#333 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a{color:#111 !important}.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a:hover{color:#555 !important}.xdsoft_dark .xdsoft_time_box{border:1px solid #333}.xdsoft_dark .xdsoft_scrollbar>.xdsoft_scroller{background:#333 !important}.xdsoft_datetimepicker .xdsoft_save_selected{display:block;border:1px solid #ddd !important;margin-top:5px;width:100%;color:#454551;font-size:13px}.xdsoft_datetimepicker .blue-gradient-button{font-family:"museo-sans","Book Antiqua",sans-serif;font-size:12px;font-weight:300;color:#82878c;height:28px;position:relative;padding:4px 17px 4px 33px;border:1px solid #d7d8da;background:-moz-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(73%,#f4f8fa));background:-webkit-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-o-linear-gradient(top,#fff 0,#f4f8fa 73%);background:-ms-linear-gradient(top,#fff 0,#f4f8fa 73%);background:linear-gradient(to bottom,#fff 0,#f4f8fa 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff',endColorstr='#f4f8fa',GradientType=0)}.xdsoft_datetimepicker .blue-gradient-button:hover,.xdsoft_datetimepicker .blue-gradient-button:focus,.xdsoft_datetimepicker .blue-gradient-button:hover span,.xdsoft_datetimepicker .blue-gradient-button:focus span{color:#454551;background:-moz-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#f4f8fa),color-stop(73%,#FFF));background:-webkit-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-o-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:-ms-linear-gradient(top,#f4f8fa 0,#FFF 73%);background:linear-gradient(to bottom,#f4f8fa 0,#FFF 73%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f8fa',endColorstr='#FFF',GradientType=0)} \ No newline at end of file From 97d02399630d8feacbd57695539ce18141214bc0 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 17:34:33 -0500 Subject: [PATCH 156/478] Add duplication check for contest edit in group --- judge/forms.py | 30 +++++++++++++++++++++++- judge/views/organization.py | 8 +++++-- locale/vi/LC_MESSAGES/django.po | 29 ++++++++++++++--------- resources/widgets.scss | 14 ++++++----- templates/organization/contest/edit.html | 5 ++-- templates/organization/form.html | 3 +-- 6 files changed, 64 insertions(+), 25 deletions(-) diff --git a/judge/forms.py b/judge/forms.py index 5bc43a9..32fc75e 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -538,9 +538,37 @@ class ContestProblemForm(ModelForm): } +class ContestProblemModelFormSet(BaseModelFormSet): + def is_valid(self): + valid = super().is_valid() + + if not valid: + return valid + + problems = set() + duplicates = [] + + for form in self.forms: + if form.cleaned_data and not form.cleaned_data.get("DELETE", False): + problem = form.cleaned_data.get("problem") + if problem in problems: + duplicates.append(problem) + else: + problems.add(problem) + + if duplicates: + for form in self.forms: + problem = form.cleaned_data.get("problem") + if problem in duplicates: + form.add_error("problem", _("This problem is duplicated.")) + return False + + return True + + class ContestProblemFormSet( formset_factory( - ContestProblemForm, formset=BaseModelFormSet, extra=6, can_delete=True + ContestProblemForm, formset=ContestProblemModelFormSet, extra=6, can_delete=True ) ): model = ContestProblem diff --git a/judge/views/organization.py b/judge/views/organization.py index 962be71..0576afe 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -926,8 +926,12 @@ class EditOrganizationContest( super().post(request, *args, **kwargs) return HttpResponseRedirect( reverse( - "organization_contests", - args=(self.organization_id, self.organization.slug), + "organization_contest_edit", + args=( + self.organization_id, + self.organization.slug, + self.contest.key, + ), ) ) diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po index d1e8a78..0cb9282 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: 2023-08-26 03:42+0700\n" +"POT-Creation-Date: 2023-08-26 05:31+0700\n" "PO-Revision-Date: 2021-07-20 03:44\n" "Last-Translator: Icyene\n" "Language-Team: Vietnamese\n" @@ -555,6 +555,10 @@ msgstr "" msgid "You don't have permission in this group." msgstr "Bạn không có quyền chấm lại bài." +#: judge/forms.py:563 +msgid "This problem is duplicated." +msgstr "Bài này bị lặp" + #: judge/jinja2/datetime.py:26 templates/blog/blog.html:28 #: templates/blog/dashboard.html:21 msgid "N j, Y, g:i a" @@ -2883,19 +2887,19 @@ msgstr "Thay đổi Email" msgid "Change Email" msgstr "Thay đổi Email" -#: judge/views/email.py:65 templates/user/edit-profile.html:120 +#: judge/views/email.py:71 templates/user/edit-profile.html:120 msgid "Change email" msgstr "Thay đổi email" -#: judge/views/email.py:89 +#: judge/views/email.py:94 msgid "Success" msgstr "Thành công" -#: judge/views/email.py:93 +#: judge/views/email.py:98 msgid "Invalid" msgstr "Không hợp lệ" -#: judge/views/email.py:102 +#: judge/views/email.py:107 msgid "Email change pending" msgstr "Yêu cầu thay đổi email đang đợi xác thực." @@ -4426,8 +4430,8 @@ msgstr "Hoạt động" #: templates/organization/blog/edit.html:36 #: templates/organization/contest/add.html:36 -#: templates/organization/contest/edit.html:87 -#: templates/organization/form.html:24 +#: templates/organization/contest/edit.html:86 +#: templates/organization/form.html:23 msgid "Save" msgstr "Lưu" @@ -4441,12 +4445,15 @@ msgid "Author" msgstr "Tác giả" #: templates/organization/blog/pending.html:14 -#, fuzzy -#| msgid "posted time" msgid "Post time" -msgstr "thời gian đăng" +msgstr "Thời gian đăng" -#: templates/organization/contest/edit.html:61 +#: 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" diff --git a/resources/widgets.scss b/resources/widgets.scss index f33882d..085d508 100644 --- a/resources/widgets.scss +++ b/resources/widgets.scss @@ -606,6 +606,14 @@ ul.select2-selection__rendered { background: gray; } +ul.errorlist { + margin: 0px; + text-align: right; + list-style: none; + padding: 0px; + color: red; +} + .registration-form { .sortedm2m-container, .sortedm2m-container p.selector-filter { width: 300px; @@ -682,12 +690,6 @@ ul.select2-selection__rendered { width: 450px; } - ul.errorlist { - margin: 0px; - text-align: right; - list-style: none; - } - .full-textfield { padding-top: 0.5em; } diff --git a/templates/organization/contest/edit.html b/templates/organization/contest/edit.html index 101bfbf..5682504 100644 --- a/templates/organization/contest/edit.html +++ b/templates/organization/contest/edit.html @@ -34,11 +34,10 @@ {% block middle_content %}
      {% csrf_token %} - {% if form.errors %} + {% if form.errors or problems_form.errors %}
      x - {{ form.non_field_errors() }} - {{ form.errors }} + {{_("Please fix below errors")}}
      {% endif %} {% for field in form %} diff --git a/templates/organization/form.html b/templates/organization/form.html index 5201ace..85c86d9 100644 --- a/templates/organization/form.html +++ b/templates/organization/form.html @@ -3,8 +3,7 @@ {% if form.errors %}
      x - {{ form.non_field_errors() }} - {{ form.errors }} + {{ _("Please fix below errors") }}
      {% endif %} {% for field in form %} From 8f046c59c172ede5c4d2a9f2540a7e5989ad0f8a Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 18:12:53 -0500 Subject: [PATCH 157/478] Drop output_prefix_override and use show_testcases --- judge/admin/contest.py | 3 +- judge/forms.py | 2 +- judge/migrations/0164_show_testcase.py | 30 +++++++++++++++++++ .../0165_drop_output_prefix_override.py | 17 +++++++++++ judge/models/contest.py | 7 ++--- judge/models/profile.py | 7 +++++ judge/views/submission.py | 6 ++-- templates/submission/status-testcases.html | 5 ---- 8 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 judge/migrations/0164_show_testcase.py create mode 100644 judge/migrations/0165_drop_output_prefix_override.py diff --git a/judge/admin/contest.py b/judge/admin/contest.py index f183880..9c8b6fd 100644 --- a/judge/admin/contest.py +++ b/judge/admin/contest.py @@ -71,7 +71,6 @@ class ContestProblemInlineForm(ModelForm): "hidden_subtasks": TextInput(attrs={"size": "3"}), "points": TextInput(attrs={"size": "1"}), "order": TextInput(attrs={"size": "1"}), - "output_prefix_override": TextInput(attrs={"size": "1"}), } @@ -86,7 +85,7 @@ class ContestProblemInline(admin.TabularInline): "is_pretested", "max_submissions", "hidden_subtasks", - "output_prefix_override", + "show_testcases", "order", "rejudge_column", ) diff --git a/judge/forms.py b/judge/forms.py index 32fc75e..d71ffbc 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -528,7 +528,7 @@ class ContestProblemForm(ModelForm): "problem", "points", "partial", - "output_prefix_override", + "show_testcases", "max_submissions", ) widgets = { diff --git a/judge/migrations/0164_show_testcase.py b/judge/migrations/0164_show_testcase.py new file mode 100644 index 0000000..33cbdf8 --- /dev/null +++ b/judge/migrations/0164_show_testcase.py @@ -0,0 +1,30 @@ +# Generated by Django 3.2.18 on 2023-08-25 23:03 + +from django.db import migrations, models + + +def migrate_show_testcases(apps, schema_editor): + ContestProblem = apps.get_model("judge", "ContestProblem") + + for c in ContestProblem.objects.all(): + if c.output_prefix_override == 1: + c.show_testcases = True + c.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0163_email_change"), + ] + + operations = [ + migrations.AddField( + model_name="contestproblem", + name="show_testcases", + field=models.BooleanField(default=False, verbose_name="visible testcases"), + ), + migrations.RunPython( + migrate_show_testcases, migrations.RunPython.noop, atomic=True + ), + ] diff --git a/judge/migrations/0165_drop_output_prefix_override.py b/judge/migrations/0165_drop_output_prefix_override.py new file mode 100644 index 0000000..ea9b17a --- /dev/null +++ b/judge/migrations/0165_drop_output_prefix_override.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.18 on 2023-08-25 23:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0164_show_testcase"), + ] + + operations = [ + migrations.RemoveField( + model_name="contestproblem", + name="output_prefix_override", + ), + ] diff --git a/judge/models/contest.py b/judge/models/contest.py index 1129076..8bb3d5b 100644 --- a/judge/models/contest.py +++ b/judge/models/contest.py @@ -772,12 +772,9 @@ class ContestProblem(models.Model): partial = models.BooleanField(default=True, verbose_name=_("partial")) is_pretested = models.BooleanField(default=False, verbose_name=_("is pretested")) order = models.PositiveIntegerField(db_index=True, verbose_name=_("order")) - output_prefix_override = models.IntegerField( - help_text=_("0 to not show testcases, 1 to show"), + show_testcases = models.BooleanField( verbose_name=_("visible testcases"), - null=True, - blank=True, - default=0, + default=False, ) max_submissions = models.IntegerField( help_text=_( diff --git a/judge/models/profile.py b/judge/models/profile.py index eb3572a..ccb0e87 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -109,6 +109,13 @@ class Organization(models.Model): "Organization membership test must be Profile or primany key" ) + def delete(self, *args, **kwargs): + contests = self.contest_set + for contest in contests.all(): + if contest.organizations.count() == 1: + contest.delete() + super().delete(*args, **kwargs) + def __str__(self): return self.name diff --git a/judge/views/submission.py b/judge/views/submission.py index 147a2cc..1556dd9 100644 --- a/judge/views/submission.py +++ b/judge/views/submission.py @@ -259,13 +259,13 @@ class SubmissionStatus(SubmissionDetailBase): ) contest = submission.contest_or_none - prefix_length = 0 + show_testcases = False can_see_testcases = self.access_testcases_in_contest() if contest is not None: - prefix_length = contest.problem.output_prefix_override or 0 + show_testcases = contest.problem.show_testcases or False - if contest is None or prefix_length > 0 or can_see_testcases: + if contest is None or show_testcases or can_see_testcases: context["cases_data"] = get_cases_data(submission) context["can_see_testcases"] = True try: diff --git a/templates/submission/status-testcases.html b/templates/submission/status-testcases.html index 4d4b435..2d2547d 100644 --- a/templates/submission/status-testcases.html +++ b/templates/submission/status-testcases.html @@ -1,8 +1,3 @@ -{% if submission.contest_or_none %} - {% set prefix_length = submission.contest_or_none.problem.output_prefix_override %} -{% else %} - {% set prefix_length = None %} -{% endif %} {% set is_pretest = submission.is_pretested %} {% if submission.status != 'IE' %} From 9a825225dd6c622b4c21dfe2d3fa3e7ef2d2dfa4 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 18:38:19 -0500 Subject: [PATCH 158/478] Small UI improvement --- judge/forms.py | 2 +- templates/organization/contest/edit.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/judge/forms.py b/judge/forms.py index d71ffbc..fc73b31 100644 --- a/judge/forms.py +++ b/judge/forms.py @@ -533,7 +533,7 @@ class ContestProblemForm(ModelForm): ) widgets = { "problem": HeavySelect2Widget( - data_view="problem_select2", attrs={"style": "width:100%"} + data_view="problem_select2", attrs={"style": "width: 100%"} ), } diff --git a/templates/organization/contest/edit.html b/templates/organization/contest/edit.html index 5682504..d5d9228 100644 --- a/templates/organization/contest/edit.html +++ b/templates/organization/contest/edit.html @@ -17,7 +17,7 @@ display: inline-flex; } .problems-problem { - width: 40%; + max-width: 60vh; } input[type=number] { width: 5em; @@ -63,7 +63,7 @@ {% for field in problems_form[0] %} {% if not field.is_hidden %} - + {{field.label}} {% endif %} From 3ff608e4ffb1220c4866e7a94a649b61bc6f06b3 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 25 Aug 2023 23:50:03 -0500 Subject: [PATCH 159/478] Add password to email change form --- judge/views/email.py | 14 +++++++++++++- templates/email_change/email_change.html | 4 ---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/judge/views/email.py b/judge/views/email.py index 56c43b9..5544daf 100644 --- a/judge/views/email.py +++ b/judge/views/email.py @@ -9,6 +9,7 @@ from django.utils.translation import gettext_lazy as _ from django.urls import reverse from django.contrib.auth.decorators import login_required from django.contrib.auth.models import User +from django.contrib.auth.hashers import check_password from urllib.parse import urlencode, urlunparse, urlparse @@ -18,6 +19,11 @@ from judge.utils.email_render import render_email_message class EmailChangeForm(forms.Form): new_email = forms.EmailField(label=_("New Email")) + password = forms.CharField(label=_("Password"), widget=forms.PasswordInput) + + def __init__(self, *args, **kwargs): + self.user = kwargs.pop("user", None) + super().__init__(*args, **kwargs) def clean_new_email(self): new_email = self.cleaned_data.get("new_email") @@ -25,10 +31,16 @@ class EmailChangeForm(forms.Form): raise forms.ValidationError(_("An account with this email already exists.")) return new_email + def clean_password(self): + password = self.cleaned_data.get("password") + if not self.user.check_password(password): + raise forms.ValidationError("Invalid password") + return password + @login_required def email_change_view(request): - form = EmailChangeForm(request.POST or None) + form = EmailChangeForm(request.POST or None, user=request.user) if request.method == "POST" and form.is_valid(): new_email = request.POST.get("new_email") diff --git a/templates/email_change/email_change.html b/templates/email_change/email_change.html index 6033d18..edfbfee 100644 --- a/templates/email_change/email_change.html +++ b/templates/email_change/email_change.html @@ -3,10 +3,6 @@ {% block media %} From f11d9b4b53cb13a651e797532e88f5c92b111b31 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Sat, 26 Aug 2023 12:38:50 -0500 Subject: [PATCH 160/478] Fix ticket ui on mobile --- resources/ticket.scss | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/ticket.scss b/resources/ticket.scss index d7f9143..092c1a1 100644 --- a/resources/ticket.scss +++ b/resources/ticket.scss @@ -150,14 +150,6 @@ padding: 7px; } - .message .content :first-child { - margin-top: 0; - } - - .message .content :last-child { - margin-bottom: 0; - } - .new-message .detail { padding: 8px 10px; } @@ -174,4 +166,10 @@ padding-left: 0.5em; padding-top: 1.65em; } +} + +@media (max-width: 799px) { + .ticket-container { + flex-direction: column-reverse; + } } \ No newline at end of file From 2854ac97e930ed112d5ac126409b4a17db032714 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 28 Aug 2023 14:20:35 -0500 Subject: [PATCH 161/478] Make chat faster --- .../migrations/0013_alter_message_time.py | 20 + .../migrations/0014_userroom_unread_count.py | 38 ++ chat_box/models.py | 26 +- chat_box/utils.py | 35 +- chat_box/views.py | 176 +++--- dmoj/settings.py | 3 + judge/migrations/0166_display_rank_index.py | 28 + judge/models/profile.py | 1 + templates/chat/chat.html | 562 +----------------- templates/chat/chat_css.html | 262 ++++---- templates/chat/chat_js.html | 553 +++++++++++++++++ 11 files changed, 903 insertions(+), 801 deletions(-) create mode 100644 chat_box/migrations/0013_alter_message_time.py create mode 100644 chat_box/migrations/0014_userroom_unread_count.py create mode 100644 judge/migrations/0166_display_rank_index.py create mode 100644 templates/chat/chat_js.html diff --git a/chat_box/migrations/0013_alter_message_time.py b/chat_box/migrations/0013_alter_message_time.py new file mode 100644 index 0000000..0f4ddc3 --- /dev/null +++ b/chat_box/migrations/0013_alter_message_time.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.18 on 2023-08-28 01:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("chat_box", "0012_auto_20230308_1417"), + ] + + operations = [ + migrations.AlterField( + model_name="message", + name="time", + field=models.DateTimeField( + auto_now_add=True, db_index=True, verbose_name="posted time" + ), + ), + ] diff --git a/chat_box/migrations/0014_userroom_unread_count.py b/chat_box/migrations/0014_userroom_unread_count.py new file mode 100644 index 0000000..8f407b3 --- /dev/null +++ b/chat_box/migrations/0014_userroom_unread_count.py @@ -0,0 +1,38 @@ +# Generated by Django 3.2.18 on 2023-08-28 06:02 + +from django.db import migrations, models + + +def migrate(apps, schema_editor): + UserRoom = apps.get_model("chat_box", "UserRoom") + Message = apps.get_model("chat_box", "Message") + + for ur in UserRoom.objects.all(): + if not ur.room: + continue + messages = ur.room.message_set + last_msg = messages.first() + try: + if last_msg and last_msg.author != ur.user: + ur.unread_count = messages.filter(time__gte=ur.last_seen).count() + else: + ur.unread_count = 0 + ur.save() + except: + continue + + +class Migration(migrations.Migration): + + dependencies = [ + ("chat_box", "0013_alter_message_time"), + ] + + operations = [ + migrations.AddField( + model_name="userroom", + name="unread_count", + field=models.IntegerField(db_index=True, default=0), + ), + migrations.RunPython(migrate, migrations.RunPython.noop, atomic=True), + ] diff --git a/chat_box/models.py b/chat_box/models.py index 61e39a6..b6d7220 100644 --- a/chat_box/models.py +++ b/chat_box/models.py @@ -1,9 +1,10 @@ from django.db import models -from django.db.models import CASCADE +from django.db.models import CASCADE, Q from django.utils.translation import gettext_lazy as _ from judge.models.profile import Profile +from judge.caching import cache_wrapper __all__ = ["Message", "Room", "UserRoom", "Ignore"] @@ -29,7 +30,9 @@ class Room(models.Model): class Message(models.Model): author = models.ForeignKey(Profile, verbose_name=_("user"), on_delete=CASCADE) - time = models.DateTimeField(verbose_name=_("posted time"), auto_now_add=True) + time = models.DateTimeField( + verbose_name=_("posted time"), auto_now_add=True, db_index=True + ) body = models.TextField(verbose_name=_("body of comment"), max_length=8192) hidden = models.BooleanField(verbose_name="is hidden", default=False) room = models.ForeignKey( @@ -56,6 +59,7 @@ class UserRoom(models.Model): Room, verbose_name="room id", on_delete=CASCADE, default=None, null=True ) last_seen = models.DateTimeField(verbose_name=_("last seen"), auto_now_add=True) + unread_count = models.IntegerField(default=0, db_index=True) class Meta: unique_together = ("user", "room") @@ -74,11 +78,9 @@ class Ignore(models.Model): @classmethod def is_ignored(self, current_user, new_friend): try: - return ( - current_user.ignored_chat_users.get() - .ignored_users.filter(id=new_friend.id) - .exists() - ) + return current_user.ignored_chat_users.ignored_users.filter( + id=new_friend.id + ).exists() except: return False @@ -89,6 +91,16 @@ class Ignore(models.Model): except: return Profile.objects.none() + @classmethod + def get_ignored_rooms(self, user): + try: + ignored_users = self.objects.get(user=user).ignored_users.all() + return Room.objects.filter(Q(user_one=user) | Q(user_two=user)).filter( + Q(user_one__in=ignored_users) | Q(user_two__in=ignored_users) + ) + except: + return Room.objects.none() + @classmethod def add_ignore(self, current_user, friend): ignore, created = self.objects.get_or_create(user=current_user) diff --git a/chat_box/utils.py b/chat_box/utils.py index e25e861..dd59d98 100644 --- a/chat_box/utils.py +++ b/chat_box/utils.py @@ -1,10 +1,12 @@ from cryptography.fernet import Fernet +import hmac +import hashlib from django.conf import settings -from django.db.models import OuterRef, Count, Subquery, IntegerField +from django.db.models import OuterRef, Count, Subquery, IntegerField, Q from django.db.models.functions import Coalesce -from chat_box.models import Ignore, Message, UserRoom +from chat_box.models import Ignore, Message, UserRoom, Room secret_key = settings.CHAT_SECRET_KEY fernet = Fernet(secret_key) @@ -24,25 +26,22 @@ def decrypt_url(message_encrypted): return None, None -def get_unread_boxes(profile): - ignored_users = Ignore.get_ignored_users(profile) - - mess = ( - Message.objects.filter(room=OuterRef("room"), time__gte=OuterRef("last_seen")) - .exclude(author=profile) - .exclude(author__in=ignored_users) - .order_by() - .values("room") - .annotate(unread_count=Count("pk")) - .values("unread_count") +def encrypt_channel(channel): + return ( + hmac.new( + settings.CHAT_SECRET_KEY.encode(), + channel.encode(), + hashlib.sha512, + ).hexdigest()[:16] + + "%s" % channel ) + +def get_unread_boxes(profile): + ignored_rooms = Ignore.get_ignored_rooms(profile) unread_boxes = ( - UserRoom.objects.filter(user=profile, room__isnull=False) - .annotate( - unread_count=Coalesce(Subquery(mess, output_field=IntegerField()), 0), - ) - .filter(unread_count__gte=1) + UserRoom.objects.filter(user=profile, unread_count__gt=0) + .exclude(room__in=ignored_rooms) .count() ) diff --git a/chat_box/views.py b/chat_box/views.py index cea58e1..879dfcf 100644 --- a/chat_box/views.py +++ b/chat_box/views.py @@ -21,6 +21,7 @@ from django.db.models import ( Exists, Count, IntegerField, + F, ) from django.db.models.functions import Coalesce from django.utils import timezone @@ -34,7 +35,7 @@ from judge.jinja2.gravatar import gravatar from judge.models import Friend from chat_box.models import Message, Profile, Room, UserRoom, Ignore -from chat_box.utils import encrypt_url, decrypt_url +from chat_box.utils import encrypt_url, decrypt_url, encrypt_channel import json @@ -49,7 +50,8 @@ class ChatView(ListView): self.room_id = None self.room = None self.messages = None - self.page_size = 20 + self.first_page_size = 20 # only for first request + self.follow_up_page_size = 50 def get_queryset(self): return self.messages @@ -63,10 +65,12 @@ class ChatView(ListView): def get(self, request, *args, **kwargs): request_room = kwargs["room_id"] + page_size = self.follow_up_page_size try: last_id = int(request.GET.get("last_id")) except Exception: last_id = 1e15 + page_size = self.first_page_size only_messages = request.GET.get("only_messages") if request_room: @@ -80,11 +84,12 @@ class ChatView(ListView): request_room = None self.room_id = request_room - self.messages = Message.objects.filter( - hidden=False, room=self.room_id, id__lt=last_id - )[: self.page_size] + self.messages = ( + Message.objects.filter(hidden=False, room=self.room_id, id__lt=last_id) + .select_related("author", "author__user") + .defer("author__about", "author__user_script")[:page_size] + ) if not only_messages: - update_last_seen(request, **kwargs) return super().get(request, *args, **kwargs) return render( @@ -101,10 +106,14 @@ class ChatView(ListView): context["title"] = self.title context["last_msg"] = event.last() - context["status_sections"] = get_status_context(self.request) + context["status_sections"] = get_status_context(self.request.profile) context["room"] = self.room_id context["has_next"] = self.has_next() context["unread_count_lobby"] = get_unread_count(None, self.request.profile) + context["chat_channel"] = encrypt_channel( + "chat_" + str(self.request.profile.id) + ) + context["chat_lobby_channel"] = encrypt_channel("chat_lobby") if self.room: users_room = [self.room.user_one, self.room.user_two] users_room.remove(self.request.profile) @@ -187,7 +196,7 @@ def post_message(request): if not room: event.post( - "chat_lobby", + encrypt_channel("chat_lobby"), { "type": "lobby", "author_id": request.profile.id, @@ -199,7 +208,7 @@ def post_message(request): else: for user in room.users(): event.post( - "chat_" + str(user.id), + encrypt_channel("chat_" + str(user.id)), { "type": "private", "author_id": request.profile.id, @@ -208,6 +217,10 @@ def post_message(request): "tmp_id": request.POST.get("tmp_id"), }, ) + if user != request.profile: + UserRoom.objects.filter(user=user, room=room).update( + unread_count=F("unread_count") + 1 + ) return JsonResponse(ret) @@ -254,35 +267,33 @@ def update_last_seen(request, **kwargs): room_id = request.POST.get("room") else: return HttpResponseBadRequest() - try: profile = request.profile room = None if room_id: - room = Room.objects.get(id=int(room_id)) + room = Room.objects.filter(id=int(room_id)).first() except Room.DoesNotExist: return HttpResponseBadRequest() - except Exception as e: - return HttpResponseBadRequest() if room and not room.contain(profile): return HttpResponseBadRequest() user_room, _ = UserRoom.objects.get_or_create(user=profile, room=room) user_room.last_seen = timezone.now() + user_room.unread_count = 0 user_room.save() return JsonResponse({"msg": "updated"}) def get_online_count(): - last_two_minutes = timezone.now() - timezone.timedelta(minutes=2) - return Profile.objects.filter(last_access__gte=last_two_minutes).count() + last_5_minutes = timezone.now() - timezone.timedelta(minutes=5) + return Profile.objects.filter(last_access__gte=last_5_minutes).count() def get_user_online_status(user): time_diff = timezone.now() - user.last_access - is_online = time_diff <= timezone.timedelta(minutes=2) + is_online = time_diff <= timezone.timedelta(minutes=5) return is_online @@ -319,47 +330,51 @@ def user_online_status_ajax(request): ) -def get_online_status(request_user, queryset, rooms=None): - if not queryset: +def get_online_status(profile, other_profile_ids, rooms=None): + if not other_profile_ids: return None - last_two_minutes = timezone.now() - timezone.timedelta(minutes=2) + joined_ids = ",".join([str(id) for id in other_profile_ids]) + other_profiles = Profile.objects.raw( + f"SELECT * from judge_profile where id in ({joined_ids}) order by field(id,{joined_ids})" + ) + last_5_minutes = timezone.now() - timezone.timedelta(minutes=5) ret = [] - if rooms: - unread_count = get_unread_count(rooms, request_user) + unread_count = get_unread_count(rooms, profile) count = {} for i in unread_count: count[i["other_user"]] = i["unread_count"] - - for user in queryset: + for other_profile in other_profiles: is_online = False - if user.last_access >= last_two_minutes: + if other_profile.last_access >= last_5_minutes: is_online = True - user_dict = {"user": user, "is_online": is_online} - if rooms and user.id in count: - user_dict["unread_count"] = count[user.id] - user_dict["url"] = encrypt_url(request_user.id, user.id) + user_dict = {"user": other_profile, "is_online": is_online} + if rooms and other_profile.id in count: + user_dict["unread_count"] = count[other_profile.id] + user_dict["url"] = encrypt_url(profile.id, other_profile.id) ret.append(user_dict) return ret -def get_status_context(request, include_ignored=False): +def get_status_context(profile, include_ignored=False): if include_ignored: - ignored_users = Profile.objects.none() + ignored_users = [] queryset = Profile.objects else: - ignored_users = Ignore.get_ignored_users(request.profile) + ignored_users = list( + Ignore.get_ignored_users(profile).values_list("id", flat=True) + ) queryset = Profile.objects.exclude(id__in=ignored_users) - last_two_minutes = timezone.now() - timezone.timedelta(minutes=2) + last_5_minutes = timezone.now() - timezone.timedelta(minutes=5) recent_profile = ( - Room.objects.filter(Q(user_one=request.profile) | Q(user_two=request.profile)) + Room.objects.filter(Q(user_one=profile) | Q(user_two=profile)) .annotate( last_msg_time=Subquery( Message.objects.filter(room=OuterRef("pk")).values("time")[:1] ), other_user=Case( - When(user_one=request.profile, then="user_two"), + When(user_one=profile, then="user_two"), default="user_one", ), ) @@ -369,50 +384,49 @@ def get_status_context(request, include_ignored=False): .values("other_user", "id")[:20] ) - recent_profile_id = [str(i["other_user"]) for i in recent_profile] - joined_id = ",".join(recent_profile_id) + recent_profile_ids = [str(i["other_user"]) for i in recent_profile] recent_rooms = [int(i["id"]) for i in recent_profile] - recent_list = None - if joined_id: - recent_list = Profile.objects.raw( - f"SELECT * from judge_profile where id in ({joined_id}) order by field(id,{joined_id})" - ) friend_list = ( - Friend.get_friend_profiles(request.profile) - .exclude(id__in=recent_profile_id) + Friend.get_friend_profiles(profile) + .exclude(id__in=recent_profile_ids) .exclude(id__in=ignored_users) .order_by("-last_access") + .values_list("id", flat=True) ) + admin_list = ( queryset.filter(display_rank="admin") .exclude(id__in=friend_list) - .exclude(id__in=recent_profile_id) + .exclude(id__in=recent_profile_ids) + .values_list("id", flat=True) ) + all_user_status = ( - queryset.filter(display_rank="user", last_access__gte=last_two_minutes) + queryset.filter(last_access__gte=last_5_minutes) .annotate(is_online=Case(default=True, output_field=BooleanField())) .order_by("-rating") .exclude(id__in=friend_list) .exclude(id__in=admin_list) - .exclude(id__in=recent_profile_id)[:30] + .exclude(id__in=recent_profile_ids) + .values_list("id", flat=True)[:30] ) return [ { "title": "Recent", - "user_list": get_online_status(request.profile, recent_list, recent_rooms), + "user_list": get_online_status(profile, recent_profile_ids, recent_rooms), }, { "title": "Following", - "user_list": get_online_status(request.profile, friend_list), + "user_list": get_online_status(profile, friend_list), }, { "title": "Admin", - "user_list": get_online_status(request.profile, admin_list), + "user_list": get_online_status(profile, admin_list), }, { "title": "Other", - "user_list": get_online_status(request.profile, all_user_status), + "user_list": get_online_status(profile, all_user_status), }, ] @@ -423,7 +437,7 @@ def online_status_ajax(request): request, "chat/online_status.html", { - "status_sections": get_status_context(request), + "status_sections": get_status_context(request.profile), "unread_count_lobby": get_unread_count(None, request.profile), }, ) @@ -447,7 +461,6 @@ def get_or_create_room(request): return HttpResponseBadRequest() request_id, other_id = decrypt_url(decrypted_other_id) - if not other_id or not request_id or request_id != request.profile.id: return HttpResponseBadRequest() @@ -475,48 +488,31 @@ def get_or_create_room(request): def get_unread_count(rooms, user): if rooms: - mess = ( - Message.objects.filter( - room=OuterRef("room"), time__gte=OuterRef("last_seen") - ) - .exclude(author=user) - .order_by() - .values("room") - .annotate(unread_count=Count("pk")) - .values("unread_count") - ) - - return ( - UserRoom.objects.filter(user=user, room__in=rooms) - .annotate( - unread_count=Coalesce(Subquery(mess, output_field=IntegerField()), 0), - other_user=Case( - When(room__user_one=user, then="room__user_two"), - default="room__user_one", - ), - ) - .filter(unread_count__gte=1) - .values("other_user", "unread_count") - ) - else: # lobby - mess = ( - Message.objects.filter(room__isnull=True, time__gte=OuterRef("last_seen")) - .exclude(author=user) - .order_by() - .values("room") - .annotate(unread_count=Count("pk")) - .values("unread_count") - ) - res = ( - UserRoom.objects.filter(user=user, room__isnull=True) - .annotate( - unread_count=Coalesce(Subquery(mess, output_field=IntegerField()), 0), + UserRoom.objects.filter(user=user, room__in=rooms, unread_count__gt=0) + .select_related("room__user_one", "room__user_two") + .values("unread_count", "room__user_one", "room__user_two") + ) + for ur in res: + ur["other_user"] = ( + ur["room__user_one"] + if ur["room__user_two"] == user.id + else ur["room__user_two"] ) - .values_list("unread_count", flat=True) + return res + else: # lobby + user_room = UserRoom.objects.filter(user=user, room__isnull=True).first() + if not user_room: + return 0 + last_seen = user_room.last_seen + res = ( + Message.objects.filter(room__isnull=True, time__gte=last_seen) + .exclude(author=user) + .exclude(hidden=True) + .count() ) - return res[0] if len(res) else 0 + return res @login_required diff --git a/dmoj/settings.py b/dmoj/settings.py index e205e60..d03dc27 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -484,3 +484,6 @@ except IOError: pass DEFAULT_AUTO_FIELD = "django.db.models.AutoField" + +# Chat +CHAT_SECRET_KEY = "QUdVFsxk6f5-Hd8g9BXv81xMqvIZFRqMl-KbRzztW-U=" diff --git a/judge/migrations/0166_display_rank_index.py b/judge/migrations/0166_display_rank_index.py new file mode 100644 index 0000000..ffea311 --- /dev/null +++ b/judge/migrations/0166_display_rank_index.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.18 on 2023-08-28 01:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0165_drop_output_prefix_override"), + ] + + operations = [ + migrations.AlterField( + model_name="profile", + name="display_rank", + field=models.CharField( + choices=[ + ("user", "Normal User"), + ("setter", "Problem Setter"), + ("admin", "Admin"), + ], + db_index=True, + default="user", + max_length=10, + verbose_name="display rank", + ), + ), + ] diff --git a/judge/models/profile.py b/judge/models/profile.py index ccb0e87..3f6e430 100644 --- a/judge/models/profile.py +++ b/judge/models/profile.py @@ -183,6 +183,7 @@ class Profile(models.Model): ("setter", "Problem Setter"), ("admin", "Admin"), ), + db_index=True, ) mute = models.BooleanField( verbose_name=_("comment mute"), diff --git a/templates/chat/chat.html b/templates/chat/chat.html index 9cde791..857aaf9 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -7,21 +7,11 @@ - - + {% compress js %} + {% include "chat/chat_js.html" %} + {% endcompress %} + @@ -638,8 +89,7 @@ {% include 'chat/user_online_status.html' %}
      - - + diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index f5bf8cd..d79a22b 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -1,132 +1,134 @@ - + + #content { + padding-top: 0; + } + + ::-webkit-scrollbar { + width: 20px; + } + + ::-webkit-scrollbar-track { + background-color: transparent; + } + + ::-webkit-scrollbar-thumb { + background-color: #d6dee1; + border-radius: 20px; + border: 6px solid transparent; + background-clip: content-box; + } + + ::-webkit-scrollbar-thumb:hover { + background-color: #a8bbbf; + } + + #page-container { + width: 100%; + } + + .body-message img{ + max-height: 12em; + } + + .tooltip:not(.shown) { + display: none; + } + + textarea { + resize: none; + } + + .tooltip { + position: absolute; + z-index: 1000; + } + + #loader { + display: block; + margin-left: auto; + margin-right: auto; + width: 80px; + } + .profile-pic { + height: 2.6em; + width: 2.6em; + border-radius: 0.3em; + margin-top: 0.1em; + float: left; + } + .body-message { + padding-left: 3em; + padding-bottom: 0.5em; + border-bottom: 1px dotted lightgray; + } + .user-time { + margin-bottom: 0.3em; + } + .time { + margin-left: 0.5em; + } + .clear { + clear: both; + } + .content-message { + word-wrap: break-word; + } + .content-message p { + margin: 0; + } + #content { + width: 100%; + } + #content-body { + padding-bottom: 0; + } + #page-container { + min-height: 0; + } + .sidebox h3 { + border-radius: 0; + } + .body-block { + border-radius: 4px; + padding: 0.05em 0.6em; + width: 100%; + } + #search-form { + float: inherit; + } + #search-container { + margin-bottom: 0.4em; + } + #setting { + position: relative; + } + + + @media (min-width: 800px) { + #page-container { + position:fixed; + overflow:hidden; + } + } + @media (max-width: 799px) { + html, body { + max-width: 100%; + overflow-x: hidden; + } + #mobile ul { + width: 100%; + } + .info-pic { + margin-left: 0.5em; + } + .active-span { + display: none; + } + } + +{% endcompress %} \ No newline at end of file diff --git a/templates/chat/chat_js.html b/templates/chat/chat_js.html new file mode 100644 index 0000000..116d949 --- /dev/null +++ b/templates/chat/chat_js.html @@ -0,0 +1,553 @@ + \ No newline at end of file From 9f0213865de5242cfe72d1f2db62e89935229899 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 28 Aug 2023 14:35:44 -0500 Subject: [PATCH 162/478] Move chat template out of compress --- templates/chat/chat.html | 5 +++++ templates/chat/chat_js.html | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/chat/chat.html b/templates/chat/chat.html index 857aaf9..bf65e17 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -42,6 +42,11 @@ return receiver; } + let message_template = ` +{% with message=message_template %} + {% include "chat/message.html" %} +{% endwith %} + `; $(function() { load_dynamic_update({{last_msg}}); }); diff --git a/templates/chat/chat_js.html b/templates/chat/chat_js.html index 116d949..95ca7df 100644 --- a/templates/chat/chat_js.html +++ b/templates/chat/chat_js.html @@ -1,9 +1,4 @@ \ No newline at end of file diff --git a/templates/chat/online_status.html b/templates/chat/online_status.html index edd257b..d82159d 100644 --- a/templates/chat/online_status.html +++ b/templates/chat/online_status.html @@ -27,11 +27,18 @@ fill="{{'green' if user.is_online else 'red'}}"/>
      - - {{ user.user.username }} - - - {{user.unread_count if user.unread_count}} +
      + + {{ user.user.username }} + + {% if user.last_msg %} + + {{ user.last_msg }} + + {% endif %} +
      + + {{user.unread_count if user.unread_count}} {% endfor %} From accf5864137aeb18ace364c2b93c5ac8b6aed8eb Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 29 Aug 2023 18:52:24 -0500 Subject: [PATCH 165/478] Add search to internal problem --- judge/views/internal.py | 21 ++++++++++++++------- templates/internal/problem.html | 5 +++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/judge/views/internal.py b/judge/views/internal.py index 4467fc3..eff02a4 100644 --- a/judge/views/internal.py +++ b/judge/views/internal.py @@ -3,7 +3,7 @@ import json from django.views.generic import ListView from django.utils.translation import gettext as _, gettext_lazy -from django.db.models import Count +from django.db.models import Count, Q from django.http import HttpResponseForbidden from django.urls import reverse @@ -38,13 +38,19 @@ class InternalProblem(InternalView, ListView): **kwargs ) + def get_search_query(self): + return self.request.GET.get("q") or self.request.POST.get("q") + def get_queryset(self): - queryset = ( - Problem.objects.annotate(vote_count=Count("volunteer_user_votes")) - .filter(vote_count__gte=1) - .order_by("-vote_count") - ) - return queryset + queryset = Problem.objects.annotate( + vote_count=Count("volunteer_user_votes") + ).filter(vote_count__gte=1) + query = self.get_search_query() + if query: + queryset = queryset.filter( + Q(code__icontains=query) | Q(name__icontains=query) + ) + return queryset.order_by("-vote_count") def get_context_data(self, **kwargs): context = super(InternalProblem, self).get_context_data(**kwargs) @@ -52,6 +58,7 @@ class InternalProblem(InternalView, ListView): context["title"] = self.title context["page_prefix"] = self.request.path + "?page=" context["first_page_href"] = self.request.path + context["query"] = self.get_search_query() return context diff --git a/templates/internal/problem.html b/templates/internal/problem.html index eebb02c..d1147e8 100644 --- a/templates/internal/problem.html +++ b/templates/internal/problem.html @@ -29,6 +29,11 @@ {% endblock %} {% block middle_content %} + + + + +
      From 944d3a733ed825a1a843ed44d1708ee9249cb1e5 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Tue, 29 Aug 2023 21:50:33 -0500 Subject: [PATCH 166/478] More chat ui --- resources/chatbox.scss | 48 ++++++-------------- resources/darkmode.css | 40 +++++++---------- templates/chat/chat.html | 12 +++-- templates/chat/chat_css.html | 61 +++++++++++++++++++++++++- templates/chat/chat_js.html | 8 +++- templates/chat/user_online_status.html | 2 +- 6 files changed, 107 insertions(+), 64 deletions(-) diff --git a/resources/chatbox.scss b/resources/chatbox.scss index fa37b15..fac7090 100644 --- a/resources/chatbox.scss +++ b/resources/chatbox.scss @@ -11,15 +11,6 @@ float: right; margin-right: 1em; } -#emoji-button { - position: absolute; - right: 1em; - font-size: 2em; - color: lightgray; -} -#emoji-button:hover { - color: gray; -} #chat-log { padding: 0; padding-top: 2em; @@ -58,18 +49,12 @@ overflow-y: scroll; border-bottom-left-radius: 0; border-bottom-right-radius: 0; - height: 75%; + flex-grow: 1; } #chat-input { - width: 100%; - padding: 0.4em 4em 1em 1.2em; - border: 0; color: black; - border-top-left-radius: 0; - border-top-right-radius: 0; - height: 100%; - font-size: 16px; + border: 2px solid #e4a81c; } #chat-online-content { padding: 0; @@ -87,7 +72,7 @@ #chat-container { display: flex; width: 100%; - height: calc(100vh - 3em);; + height: calc(100vh - 3em); border: 1px solid #ccc; /*border-radius: 0 4px 0 0;*/ border-bottom: 0; @@ -99,9 +84,6 @@ #chat-area { flex-grow: 1; } - .chat-left-panel, .chat-right-panel { - display: block !important; - } } #chat-input, #chat-log .content-message { font-family: "Noto Sans", Arial, "Lucida Grande", sans-serif; @@ -109,14 +91,7 @@ .info-pic { height: 100%; } -.info-circle { - position: absolute; - cx: 12%; - cy: 12%; - r: 12%; - stroke: white; - stroke-width: 1; -} + .info-name { margin-left: 10px; font-size: 2em; @@ -173,6 +148,7 @@ display: flex; padding: 15px; gap: 0.5em; + border-radius: 6px; } .status-row:hover { background: lightgray; @@ -191,6 +167,8 @@ border-radius: 15px; max-width: 70%; width: fit-content; + font-size: 1.05rem; + line-height: 1.3; } .message-text-other { background: #eeeeee; @@ -200,7 +178,12 @@ background: rgb(0, 132, 255); color: white; } - +.chat-input-icon { + color: #045343; +} +.chat-input-icon:hover { + background: lightgray; +} .chat { .active-span { color: #636363; @@ -239,9 +222,6 @@ @media (max-width: 799px) { #chat-area { - height: calc(100vh - 50px); - } - #emoji-button { - display: none; + height: calc(100vh - 120px); } } diff --git a/resources/darkmode.css b/resources/darkmode.css index fc2d96d..b0562f9 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -3008,19 +3008,13 @@ a.voted { background-image: initial; background-color: rgb(20, 22, 22); } -#emoji-button { - color: rgb(169, 166, 160); -} -#emoji-button:hover { - color: rgb(126, 119, 107); -} #chat-online { border-right-color: rgb(51, 56, 58); border-bottom-color: initial; } #chat-input { - border-color: initial; color: rgb(193, 191, 188); + border-color: rgb(132, 97, 16); } .selected-status-row { background-color: rgb(41, 44, 46); @@ -3036,9 +3030,6 @@ a.voted { border-bottom-color: initial; } } -.info-circle { - stroke: rgb(193, 191, 188); -} #chat-info { box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 3px; } @@ -3068,6 +3059,13 @@ a.voted { background-color: rgb(0, 88, 169); color: rgb(193, 191, 188); } +.chat-input-icon { + color: rgb(170, 166, 161); +} +.chat-input-icon:hover { + background-image: initial; + background-color: rgb(41, 44, 46); +} .chat .active-span { color: rgb(140, 134, 125); } @@ -3728,19 +3726,6 @@ code .il { .sr-only { border-color: initial; } -::-webkit-scrollbar-track { - background-color: transparent; -} -::-webkit-scrollbar-thumb { - background-color: rgb(33, 41, 45); - border-color: transparent; -} -::-webkit-scrollbar-thumb:hover { - background-color: rgb(50, 65, 68); -} -.body-message { - border-bottom-color: rgb(50, 54, 56); -} .CtxtMenu_InfoContent { border-color: initial; background-color: rgb(28, 30, 32); @@ -3838,6 +3823,15 @@ mjx-merror { mjx-assistive-mml { border-color: initial !important; } +mjx-stretchy-v > mjx-ext { + border-color: transparent; +} +.recently-attempted ul { + list-style-image: initial; +} +.organization-row:last-child { + border-bottom-color: initial; +} /* Override Style */ .vimvixen-hint { diff --git a/templates/chat/chat.html b/templates/chat/chat.html index ea1365e..1991402 100644 --- a/templates/chat/chat.html +++ b/templates/chat/chat.html @@ -84,18 +84,22 @@
      -
      +
      {% include 'chat/user_online_status.html' %}
      -
      -
      - +
      +
      +
      +
      + +
      @@ -319,6 +319,11 @@

      + {% else %} +
      + {{ _('There is no ongoing contest at this time.') }} +
      +
      {% endif %}

      @@ -354,15 +359,17 @@

      {% else %} - {{ _('There are no scheduled contests at this time.') }} -
      +
      + {{ _('There is no scheduled contest at this time.') }} +
      +
      {% endif %}
      +

      + {{ _('Past Contests') }} +

      {% if past_contests %} -

      - {{ _('Past Contests') }} -

      {% if page_obj and page_obj.num_pages > 1 %}
      {% include "list-pages.html" %} @@ -411,6 +418,11 @@ {% include "list-pages.html" %}
      {% endif %} + {% else %} +
      + {{ _('There is no past contest.') }} +
      +
      {% endif %} {% endblock %} From 1749e6480297c9cf183be17c793d67daf69a5434 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 30 Aug 2023 13:07:57 -0500 Subject: [PATCH 168/478] Fix chat css --- judge/views/contests.py | 4 +--- templates/chat/chat_css.html | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/judge/views/contests.py b/judge/views/contests.py index ff4b320..c183435 100644 --- a/judge/views/contests.py +++ b/judge/views/contests.py @@ -1357,9 +1357,7 @@ class ContestClarificationAjax(ContestMixin, DetailView): raise Http404() polling_time = 1 # minute - last_one_minute = last_five_minutes = timezone.now() - timezone.timedelta( - minutes=polling_time - ) + last_one_minute = timezone.now() - timezone.timedelta(minutes=polling_time) queryset = ContestProblemClarification.objects.filter( problem__in=self.object.contest_problems.all(), date__gte=last_one_minute diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index 5e333bf..ccc2feb 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -164,9 +164,10 @@ .info-pic { border-radius: 50%; margin-left: 1em; + width: 3em; } #chat-info { - height: 10%; + height: 3em; } @media (min-width: 800px) { @@ -195,9 +196,6 @@ .active-span { display: none; } - #chat-info { - height: 5%; - } } {% endcompress %} \ No newline at end of file From 1473118c5a316d250087530dc70727f3c719a5e8 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 30 Aug 2023 13:19:51 -0500 Subject: [PATCH 169/478] More css fix for chat --- templates/chat/chat_css.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index ccc2feb..1ae5790 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -164,7 +164,6 @@ .info-pic { border-radius: 50%; margin-left: 1em; - width: 3em; } #chat-info { height: 3em; From abbe5f15e1451c3910a2074c6bcdd929f3ce0b6e Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 30 Aug 2023 18:46:47 -0500 Subject: [PATCH 170/478] Add meta address key to setting --- dmoj/settings.py | 3 +++ judge/user_log.py | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dmoj/settings.py b/dmoj/settings.py index d03dc27..713e31c 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -487,3 +487,6 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Chat CHAT_SECRET_KEY = "QUdVFsxk6f5-Hd8g9BXv81xMqvIZFRqMl-KbRzztW-U=" + +# Nginx +META_REMOTE_ADDRESS_KEY = "REMOTE_ADDR" diff --git a/judge/user_log.py b/judge/user_log.py index 91a4c67..b8aec43 100644 --- a/judge/user_log.py +++ b/judge/user_log.py @@ -1,4 +1,5 @@ from django.utils.timezone import now +from django.conf import settings from judge.models import Profile @@ -17,8 +18,8 @@ class LogUserAccessMiddleware(object): ): updates = {"last_access": now()} # Decided on using REMOTE_ADDR as nginx will translate it to the external IP that hits it. - if request.META.get("REMOTE_ADDR"): - updates["ip"] = request.META.get("REMOTE_ADDR") + if request.META.get(settings.META_REMOTE_ADDRESS_KEY): + updates["ip"] = request.META.get(settings.META_REMOTE_ADDRESS_KEY) Profile.objects.filter(user_id=request.user.pk).update(**updates) return response From b03836715f1ade44393066c0bc61b1c096274923 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Wed, 30 Aug 2023 18:48:04 -0500 Subject: [PATCH 171/478] Fix setting --- dmoj/settings.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dmoj/settings.py b/dmoj/settings.py index 713e31c..d5cfa38 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -477,16 +477,16 @@ ML_OUTPUT_PATH = None # Use subdomain for organizations USE_SUBDOMAIN = False -try: - with open(os.path.join(os.path.dirname(__file__), "local_settings.py")) as f: - exec(f.read(), globals()) -except IOError: - pass - -DEFAULT_AUTO_FIELD = "django.db.models.AutoField" - # Chat CHAT_SECRET_KEY = "QUdVFsxk6f5-Hd8g9BXv81xMqvIZFRqMl-KbRzztW-U=" # Nginx META_REMOTE_ADDRESS_KEY = "REMOTE_ADDR" + +DEFAULT_AUTO_FIELD = "django.db.models.AutoField" + +try: + with open(os.path.join(os.path.dirname(__file__), "local_settings.py")) as f: + exec(f.read(), globals()) +except IOError: + pass From 1f03106766d8c281adc906fd399ebbdce4b26f4d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Thu, 31 Aug 2023 19:35:56 -0500 Subject: [PATCH 172/478] Add ultimate format --- judge/contest_format/__init__.py | 1 + judge/contest_format/ultimate.py | 55 +++++++++++++++++++ .../0167_ultimate_contest_format.py | 32 +++++++++++ 3 files changed, 88 insertions(+) create mode 100644 judge/contest_format/ultimate.py create mode 100644 judge/migrations/0167_ultimate_contest_format.py diff --git a/judge/contest_format/__init__.py b/judge/contest_format/__init__.py index 8d2ccc9..9f6d628 100644 --- a/judge/contest_format/__init__.py +++ b/judge/contest_format/__init__.py @@ -4,4 +4,5 @@ from judge.contest_format.ecoo import ECOOContestFormat from judge.contest_format.icpc import ICPCContestFormat from judge.contest_format.ioi import IOIContestFormat from judge.contest_format.new_ioi import NewIOIContestFormat +from judge.contest_format.ultimate import UltimateContestFormat from judge.contest_format.registry import choices, formats diff --git a/judge/contest_format/ultimate.py b/judge/contest_format/ultimate.py new file mode 100644 index 0000000..7960d02 --- /dev/null +++ b/judge/contest_format/ultimate.py @@ -0,0 +1,55 @@ +from django.utils.translation import gettext_lazy + +from judge.contest_format.ioi import IOIContestFormat +from judge.contest_format.registry import register_contest_format +from django.db.models import Min, OuterRef, Subquery + +# This contest format only counts last submission for each problem. + + +@register_contest_format("ultimate") +class UltimateContestFormat(IOIContestFormat): + name = gettext_lazy("Ultimate") + + def update_participation(self, participation): + cumtime = 0 + score = 0 + format_data = {} + + queryset = participation.submissions + if self.contest.freeze_after: + queryset = queryset.filter( + submission__date__lt=participation.start + self.contest.freeze_after + ) + + queryset = ( + queryset.values("problem_id") + .filter( + id=Subquery( + queryset.filter(problem_id=OuterRef("problem_id")) + .order_by("-id") + .values("id")[:1] + ) + ) + .values_list("problem_id", "submission__date", "points") + ) + + for problem_id, time, points in queryset: + if self.config["cumtime"]: + dt = (time - participation.start).total_seconds() + if points: + cumtime += dt + else: + dt = 0 + format_data[str(problem_id)] = { + "time": dt, + "points": points, + } + score += points + + self.handle_frozen_state(participation, format_data) + participation.cumtime = max(cumtime, 0) + participation.score = round(score, self.contest.points_precision) + participation.tiebreaker = 0 + participation.format_data = format_data + participation.save() diff --git a/judge/migrations/0167_ultimate_contest_format.py b/judge/migrations/0167_ultimate_contest_format.py new file mode 100644 index 0000000..636e882 --- /dev/null +++ b/judge/migrations/0167_ultimate_contest_format.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.18 on 2023-09-01 00:09 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("judge", "0166_display_rank_index"), + ] + + operations = [ + migrations.AlterField( + model_name="contest", + name="format_name", + field=models.CharField( + choices=[ + ("atcoder", "AtCoder"), + ("default", "Default"), + ("ecoo", "ECOO"), + ("icpc", "ICPC"), + ("ioi", "IOI"), + ("ioi16", "New IOI"), + ("ultimate", "Ultimate"), + ], + default="default", + help_text="The contest format module to use.", + max_length=32, + verbose_name="contest format", + ), + ), + ] From 120cc3c06d5b3710a1a7dc1c13aade4e452780fe Mon Sep 17 00:00:00 2001 From: Tran Trong Nghia <80335335+emladevops@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:31:24 +0700 Subject: [PATCH 173/478] Update README.md Profile images nginx guide update. --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 416ae9c..a30ddcf 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,14 @@ python3 manage.py runserver 0.0.0.0:8000 1. (WSL) có thể tải ứng dụng Terminal trong Windows Store 2. (WSL) mỗi lần mở ubuntu, các bạn cần chạy lệnh sau để mariadb khởi động: `sudo service mysql restart` (tương tự cho một số service khác như memcached, celery) -3. Sau khi cài đặt, các bạn chỉ cần activate virtual env và chạy lệnh runserver là ok. +3. Sau khi cài đặt, các bạn chỉ cần activate virtual env và chạy lệnh runserver là ok +4. Đối với nginx, sau khi config xong theo guide của DMOJ, bạn cần thêm location như sau để sử dụng được tính năng profile image, thay thế `path/to/oj` thành đường dẫn nơi bạn đã clone source code. + +``` + location /profile_images/ { + root /path/to/oj; + } +``` ```jsx . dmojsite/bin/activate From b7c6d45b80ebf7fa0bc29c7a621cd719503ba887 Mon Sep 17 00:00:00 2001 From: Tran Trong Nghia <80335335+emladevops@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:31:59 +0700 Subject: [PATCH 174/478] Update README.md Profile Images configuration --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a30ddcf..e534204 100644 --- a/README.md +++ b/README.md @@ -119,9 +119,9 @@ python3 manage.py runserver 0.0.0.0:8000 4. Đối với nginx, sau khi config xong theo guide của DMOJ, bạn cần thêm location như sau để sử dụng được tính năng profile image, thay thế `path/to/oj` thành đường dẫn nơi bạn đã clone source code. ``` - location /profile_images/ { - root /path/to/oj; - } +location /profile_images/ { + root /path/to/oj; +} ``` ```jsx From fa21cde2c9fd7bb09a47b4ba6b8594a2b700900c Mon Sep 17 00:00:00 2001 From: Tran Trong Nghia <80335335+emladevops@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:32:41 +0700 Subject: [PATCH 175/478] Update README.md Fix typo --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e534204..ea64e92 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,11 @@ python3 manage.py runserver 0.0.0.0:8000 1. (WSL) có thể tải ứng dụng Terminal trong Windows Store 2. (WSL) mỗi lần mở ubuntu, các bạn cần chạy lệnh sau để mariadb khởi động: `sudo service mysql restart` (tương tự cho một số service khác như memcached, celery) 3. Sau khi cài đặt, các bạn chỉ cần activate virtual env và chạy lệnh runserver là ok -4. Đối với nginx, sau khi config xong theo guide của DMOJ, bạn cần thêm location như sau để sử dụng được tính năng profile image, thay thế `path/to/oj` thành đường dẫn nơi bạn đã clone source code. +```jsx +. dmojsite/bin/activate +python3 manage.py runserver +``` +5. Đối với nginx, sau khi config xong theo guide của DMOJ, bạn cần thêm location như sau để sử dụng được tính năng profile image, thay thế `path/to/oj` thành đường dẫn nơi bạn đã clone source code. ``` location /profile_images/ { @@ -124,11 +128,6 @@ location /profile_images/ { } ``` -```jsx -. dmojsite/bin/activate -python3 manage.py runserver -``` - 1. Quy trình dev: 1. Sau khi thay đổi code thì django tự build lại, các bạn chỉ cần F5 2. Một số style nằm trong các file .scss. Các bạn cần recompile css thì mới thấy được thay đổi. From 345e9985e3802a89858315a512e988f90bab0d8c Mon Sep 17 00:00:00 2001 From: Tran Trong Nghia <80335335+emladevops@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:34:11 +0700 Subject: [PATCH 176/478] Beautify README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea64e92..d4cdc43 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ location /profile_images/ { } ``` -1. Quy trình dev: +6. Quy trình dev: 1. Sau khi thay đổi code thì django tự build lại, các bạn chỉ cần F5 2. Một số style nằm trong các file .scss. Các bạn cần recompile css thì mới thấy được thay đổi. From 9a89c5a15a83bb9fb9309a535fcff0d4d337d40c Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 1 Sep 2023 17:51:40 -0500 Subject: [PATCH 177/478] Make chat ava square --- templates/chat/chat_css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/chat/chat_css.html b/templates/chat/chat_css.html index 1ae5790..4909345 100644 --- a/templates/chat/chat_css.html +++ b/templates/chat/chat_css.html @@ -162,7 +162,7 @@ stroke-width: 1; } .info-pic { - border-radius: 50%; + border-radius: 5px; margin-left: 1em; } #chat-info { From 41ba0894acb6dd97427589acbd43910d0555adac Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 1 Sep 2023 18:09:30 -0500 Subject: [PATCH 178/478] Add loading bar --- resources/base.scss | 14 ++++++++++++-- resources/common.js | 7 +++++++ resources/vars.scss | 2 ++ templates/base.html | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/resources/base.scss b/resources/base.scss index 48ac6af..687249f 100644 --- a/resources/base.scss +++ b/resources/base.scss @@ -233,7 +233,7 @@ header { top: 0; left: 0; right: 0; - height: 48px; + height: $navbar_height; } nav { @@ -377,7 +377,7 @@ hr { } #content { - margin: 48px auto 1em auto; + margin: $navbar_height auto 1em auto; padding-top: 1em; // Header @@ -860,6 +860,16 @@ select { margin-bottom: 1em; } +#loading-bar { + position: fixed; + top: 0; + left: 0; + height: 2px; + background-color: #993932; + width: 0; + z-index: 9999; +} + @media (max-width: 799px) { #user-links, .anon { padding-right: 0.5em; diff --git a/resources/common.js b/resources/common.js index 488fb33..380dc63 100644 --- a/resources/common.js +++ b/resources/common.js @@ -385,6 +385,12 @@ function onWindowReady() { showTooltip(e.trigger, fallbackMessage(e.action)); }); }); + $('a').click(function() { + $("#loading-bar").show(); + $("#loading-bar").animate({ width: "100%" }, 1500, function() { + $(this).hide(); + }); + }); } $(function() { @@ -429,4 +435,5 @@ $(function() { $('html').click(function () { $nav_list.hide(); }); + }); \ No newline at end of file diff --git a/resources/vars.scss b/resources/vars.scss index 4bcda31..7556626 100644 --- a/resources/vars.scss +++ b/resources/vars.scss @@ -10,3 +10,5 @@ $widget_border_radius: 4px; $table_header_rounding: 6px; $monospace-fonts: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace; + +$navbar_height: 48px; diff --git a/templates/base.html b/templates/base.html index 2e5013e..c5be0ff 100644 --- a/templates/base.html +++ b/templates/base.html @@ -316,6 +316,7 @@ +
      {% if request.in_contest %}
      From 4401fa7376de499141341a053ed9a802badf1819 Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 1 Sep 2023 18:20:10 -0500 Subject: [PATCH 179/478] Simplify nav user span --- resources/base.scss | 10 +++++++++- resources/darkmode.css | 18 +++++++++--------- templates/base.html | 4 ++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/resources/base.scss b/resources/base.scss index 687249f..13f9d6d 100644 --- a/resources/base.scss +++ b/resources/base.scss @@ -191,11 +191,19 @@ header { display: block; margin: 0; - & > li > a > span { + & > li > span { height: 36px; padding-top: 8px; display: block; white-space: nowrap; + cursor: pointer; + + &:hover { + border-top: 2px solid #9c3706; + color: black; + background: rgba(255, 255, 255, 0.25); + margin: 0; + } & > img { vertical-align: middle; diff --git a/resources/darkmode.css b/resources/darkmode.css index b0562f9..4dba034 100644 --- a/resources/darkmode.css +++ b/resources/darkmode.css @@ -1541,6 +1541,12 @@ header { #user-links { color: rgb(146, 141, 132); } +#user-links > ul > li > span:hover { + border-top-color: rgb(165, 58, 7); + color: rgb(193, 191, 188); + background-image: initial; + background-color: rgba(20, 22, 22, 0.25); +} #nav-shadow { background-image: linear-gradient(rgb(41, 44, 46), rgba(0, 0, 0, 0)); @@ -1793,6 +1799,9 @@ noscript #noscript { .background-footer { color: rgb(126, 119, 107); } +#loading-bar { + background-color: rgb(101, 38, 33); +} @media (min-width: 800px) { #page-container { background-image: initial; @@ -3823,15 +3832,6 @@ mjx-merror { mjx-assistive-mml { border-color: initial !important; } -mjx-stretchy-v > mjx-ext { - border-color: transparent; -} -.recently-attempted ul { - list-style-image: initial; -} -.organization-row:last-child { - border-bottom-color: initial; -} /* Override Style */ .vimvixen-hint { diff --git a/templates/base.html b/templates/base.html index c5be0ff..70ec640 100644 --- a/templates/base.html +++ b/templates/base.html @@ -261,14 +261,14 @@ {% if request.user.is_authenticated %} -