From d0cdcc0ab8b248b10f866c7fd0cc153b0dc65ccc Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Tue, 14 Nov 2023 17:14:50 +0300
Subject: [PATCH 01/25] Change year in footer to 23

---
 compsciclub_ru/jinja2/lms/layouts/v1_base.html | 2 +-
 compsciclub_ru/templates/base.html             | 2 +-
 lms/jinja2/lms/layouts/v1_base.html            | 2 +-
 lms/templates/base.html                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compsciclub_ru/jinja2/lms/layouts/v1_base.html b/compsciclub_ru/jinja2/lms/layouts/v1_base.html
index 287805922d..5ac5c6755d 100644
--- a/compsciclub_ru/jinja2/lms/layouts/v1_base.html
+++ b/compsciclub_ru/jinja2/lms/layouts/v1_base.html
@@ -79,7 +79,7 @@
     <div class="footer">
       <div class="container">
         <div class="row">
-          <div class="col-xs-7">{{ request.site.name }}, {{ ESTABLISHED }}–22 {{ _("гг.") }}</div>
+          <div class="col-xs-7">{{ request.site.name }}, {{ ESTABLISHED }}–23 {{ _("гг.") }}</div>
           <div class="col-xs-5 social">
             {% if request.branch.code == 'spb' %}
             <a href="https://t.me/compsciclub" target="_blank" rel="noopener"><i class="fa fa-telegram fa-2x"></i></a>
diff --git a/compsciclub_ru/templates/base.html b/compsciclub_ru/templates/base.html
index 8fc1662029..f7b92c97c9 100644
--- a/compsciclub_ru/templates/base.html
+++ b/compsciclub_ru/templates/base.html
@@ -83,7 +83,7 @@
     <div class="footer">
       <div class="container">
         <div class="row">
-          <div class="col-xs-8">{{ request.site.name }}, {{ ESTABLISHED }}–22 {% trans "гг." %}</div>
+          <div class="col-xs-8">{{ request.site.name }}, {{ ESTABLISHED }}–23 {% trans "гг." %}</div>
           <div class="col-xs-4 social">
             {% if request.branch.code == 'spb' %}
             <a href="https://t.me/compsciclub" target="_blank" rel="noopener"><i class="fa fa-telegram fa-2x"></i></a>
diff --git a/lms/jinja2/lms/layouts/v1_base.html b/lms/jinja2/lms/layouts/v1_base.html
index f749b53f31..ca51d50a7e 100644
--- a/lms/jinja2/lms/layouts/v1_base.html
+++ b/lms/jinja2/lms/layouts/v1_base.html
@@ -63,7 +63,7 @@
     <div class="footer">
       <div class="container">
         <div class="row">
-          <div class="col-xs-12 text-center">{{ request.site.name }}, {{ ESTABLISHED }}–22 {{ _("гг.") }}</div>
+          <div class="col-xs-12 text-center">{{ request.site.name }}, {{ ESTABLISHED }}–23 {{ _("гг.") }}</div>
         </div>
       </div>
     </div>
diff --git a/lms/templates/base.html b/lms/templates/base.html
index 885bd276fa..9ad8789411 100644
--- a/lms/templates/base.html
+++ b/lms/templates/base.html
@@ -58,7 +58,7 @@
     <div class="footer">
       <div class="container">
         <div class="row">
-          <div class="col-xs-12 text-center">{{ request.site.name }}, {{ ESTABLISHED }}–22 {% trans "гг." %}</div>
+          <div class="col-xs-12 text-center">{{ request.site.name }}, {{ ESTABLISHED }}–23 {% trans "гг." %}</div>
         </div>
       </div>
     </div>

From a7ee4dff7003806b56f110024c21e46b79558803 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Sun, 7 Jan 2024 14:43:17 +0300
Subject: [PATCH 02/25] Add study year to gradebook

---
 lk_yandexdataschool_ru/settings/local.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lk_yandexdataschool_ru/settings/local.py b/lk_yandexdataschool_ru/settings/local.py
index 08c4b0fe81..43442866f4 100644
--- a/lk_yandexdataschool_ru/settings/local.py
+++ b/lk_yandexdataschool_ru/settings/local.py
@@ -8,7 +8,6 @@
 JS_REVERSE_JS_VAR_NAME = 'URLS'
 JS_REVERSE_INCLUDE_ONLY_NAMESPACES = ['stats-api', 'admission-api']
 JS_REVERSE_OUTPUT_PATH = str(DJANGO_ASSETS_ROOT / "v1" / "js" / "vendor")
-
 if DEBUG:
     INSTALLED_APPS += ['django_extensions']
     # Translate .po files with UI

From fb7e2e23e8c66fbdf04e7bc049ec9849d043f820 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Mon, 8 Jan 2024 17:41:16 +0300
Subject: [PATCH 03/25] Review changes

---
 lk_yandexdataschool_ru/settings/local.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lk_yandexdataschool_ru/settings/local.py b/lk_yandexdataschool_ru/settings/local.py
index 43442866f4..08c4b0fe81 100644
--- a/lk_yandexdataschool_ru/settings/local.py
+++ b/lk_yandexdataschool_ru/settings/local.py
@@ -8,6 +8,7 @@
 JS_REVERSE_JS_VAR_NAME = 'URLS'
 JS_REVERSE_INCLUDE_ONLY_NAMESPACES = ['stats-api', 'admission-api']
 JS_REVERSE_OUTPUT_PATH = str(DJANGO_ASSETS_ROOT / "v1" / "js" / "vendor")
+
 if DEBUG:
     INSTALLED_APPS += ['django_extensions']
     # Translate .po files with UI

From 1a9c907e0739006e5ca6a51e1f1d89576507a97e Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Mon, 15 Jan 2024 13:19:46 +0300
Subject: [PATCH 04/25] Change year_of_admission to year_of_curiculum in
 gradebook

---
 lms/jinja2/lms/gradebook/gradebook_form.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lms/jinja2/lms/gradebook/gradebook_form.html b/lms/jinja2/lms/gradebook/gradebook_form.html
index 023c196f6b..b8559cba5b 100644
--- a/lms/jinja2/lms/gradebook/gradebook_form.html
+++ b/lms/jinja2/lms/gradebook/gradebook_form.html
@@ -144,7 +144,9 @@ <h2>
                       {% endif %} {{ student.get_abbreviated_short_name() }}
                     </a>
                     <div class="cell __study_year {{ loop.cycle('', 'even') }}">
-                      {{ gradebook_student.student_profile.year_of_admission }}
+                      {% if gradebook_student.student_profile.year_of_curriculum %}
+                      {{ gradebook_student.student_profile.year_of_curriculum }}
+                      {% endif %}
                     </div>
                     <div class="cell __final_grade {{ loop.cycle('', 'even') }}">
                       {{ form.get_final_widget(gradebook_student.enrollment_id) }}

From 8f7527fc87d54def1f71a61e17b4e486418b989e Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 19 Jan 2024 21:58:22 +0300
Subject: [PATCH 05/25] Remove ProgramsView from students learning menu

---
 lk_yandexdataschool_ru/menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lk_yandexdataschool_ru/menu.py b/lk_yandexdataschool_ru/menu.py
index 6fad7b984b..3f40e4c7c7 100644
--- a/lk_yandexdataschool_ru/menu.py
+++ b/lk_yandexdataschool_ru/menu.py
@@ -26,7 +26,7 @@
             MenuItem(pgettext_lazy("menu", "Полезное"), '/learning/useful/', weight=60),
             MenuItem(pgettext_lazy("menu", "Кодекс чести"), '/learning/hc/', weight=70),
             MenuItem(pgettext_lazy("menu", "Программы обучения"), '/learning/programs/', weight=70),
-            MenuItem(pgettext_lazy("menu", "Проекты организаторов"), '/learning/internships/', weight=80),
+            # MenuItem(pgettext_lazy("menu", "Проекты организаторов"), '/learning/internships/', weight=80),
         ],
         permissions=(
             "learning.view_study_menu",

From 6184cfcc3493b0143bcff346ad15c1cee1ef9035 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:44:27 +0300
Subject: [PATCH 06/25] Change default settings module

---
 manage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manage.py b/manage.py
index 970a0adccd..79c3453d90 100755
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,7 @@
 if __name__ == "__main__":
     # On production use --settings to override default behavior
     os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                          "compscicenter_ru.settings.local")
+                          "lk_yandexdataschool_ru.settings.local")
 
     from django.core.management import execute_from_command_line
 

From 95828389c21c140bb9e9fb6226764ca1b491d75d Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:45:14 +0300
Subject: [PATCH 07/25] Ignore pytest Deprecated warnings

---
 lk_yandexdataschool_ru/pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lk_yandexdataschool_ru/pytest.ini b/lk_yandexdataschool_ru/pytest.ini
index fc5b7340e7..d26f9cd2d5 100644
--- a/lk_yandexdataschool_ru/pytest.ini
+++ b/lk_yandexdataschool_ru/pytest.ini
@@ -21,3 +21,4 @@ filterwarnings =
     ignore:smart_text\(\) is deprecated in favor:PendingDeprecationWarning
     ignore:The providing_args argument is deprecated:PendingDeprecationWarning
     ignore:'.*' defines default_app_config = '.*':PendingDeprecationWarning
+    ignore::DeprecationWarning

From 3ba3f0d1677c15fcb9ce99be76bc230cbe7bb366 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:46:28 +0300
Subject: [PATCH 08/25] Add autofail_ungraded functional

---
 .../management/commands/autofail_ungraded.py  | 34 +++++++++++++++++++
 apps/staff/templates/staff/exports.html       |  8 +++++
 apps/staff/urls.py                            |  3 +-
 apps/staff/views.py                           | 12 +++++++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 apps/projects/management/commands/autofail_ungraded.py

diff --git a/apps/projects/management/commands/autofail_ungraded.py b/apps/projects/management/commands/autofail_ungraded.py
new file mode 100644
index 0000000000..3956a4639c
--- /dev/null
+++ b/apps/projects/management/commands/autofail_ungraded.py
@@ -0,0 +1,34 @@
+from django.core.management import BaseCommand, CommandError
+
+from courses.constants import SemesterTypes
+from courses.models import Semester
+from learning.models import Enrollment
+from learning.settings import GradeTypes
+
+class Command(BaseCommand):
+    help = """
+    Set grade to fail for all ungraded students. Only in courses of current semester by default.
+    Set --prev-sem flag to apply for courses from Autumn 2020 till previous semester.
+    """
+
+    def add_arguments(self, parser):
+        parser.add_argument("site", type=str, help='Site to search for enrollments')
+        parser.add_argument('--prev-sem', action='store_true', help='If flag is true, script works for previous '
+                                                                    'semesters')
+
+    def handle(self, *args, **options):
+        site = options["site"]
+        enrollments = Enrollment.objects.select_related("student_profile__branch__site", "course__semester")
+        current_term = Semester.get_current()
+        if options['prev_sem']:
+            term = Semester.objects.get(year=2020, type=SemesterTypes.AUTUMN)
+            enrollments = enrollments.filter(grade=GradeTypes.NOT_GRADED,
+                                course__semester__lte=term,
+                                course__semester__gt=current_term,
+                                student_profile__branch__site__domain=site)
+        else:
+            enrollments = enrollments.filter(grade=GradeTypes.NOT_GRADED,
+                                             course__semester=current_term,
+                                             student_profile__branch__site__domain=site)
+        graded = enrollments.update(grade=GradeTypes.UNSATISFACTORY)
+        return str(graded)
diff --git a/apps/staff/templates/staff/exports.html b/apps/staff/templates/staff/exports.html
index 25bb95710d..2b1b54a954 100644
--- a/apps/staff/templates/staff/exports.html
+++ b/apps/staff/templates/staff/exports.html
@@ -72,6 +72,14 @@ <h4 class="list-group-item-heading">Оценки по проектам, {% trans
             </ul>
           </div>
         </div>
+        <h2>Незачеты</h2>
+        <div class="list-group">
+          <div class="list-group-item">
+            <h4 class="list-group-item-heading">Невыставленные оценки по курсам, {% trans current_term.type %} {{ current_term.year }}</h4>
+            <p><a href="{% url 'staff:autofail_ungraded' %}" class="btn btn-primary btn-wide"
+                  onclick="return confirm('Вы уверены? Это действие нельзя обратить')">Превратить в незачеты </a></p>
+          </div>
+        </div>
         <a name="will-graduate"></a>
         <h2 class="content-title">Будущий выпуск</h2>
         <div class="list-group">
diff --git a/apps/staff/urls.py b/apps/staff/urls.py
index 23c32e0795..c43eda3a97 100644
--- a/apps/staff/urls.py
+++ b/apps/staff/urls.py
@@ -17,7 +17,7 @@
     ProgressReportForSemesterView, ProgressReportFullView, StudentFacesView,
     StudentSearchCSVView, StudentSearchView, SurveySubmissionsReportView,
     SurveySubmissionsStatsView, WillGraduateStatsReportView, autograde_projects,
-    create_alumni_profiles
+    autofail_ungraded, create_alumni_profiles
 )
 
 app_name = 'staff'
@@ -64,6 +64,7 @@ def to_url(self, value):
 
     path('commands/create-alumni-profiles/', create_alumni_profiles, name='create_alumni_profiles'),  # deprecated
     path('commands/autograde-projects/', autograde_projects, name='autograde_projects'),
+    path('commands/autofail_ungraded/', autofail_ungraded, name='autofail_ungraded'),
 
     path('course-participants/', CourseParticipantsIntersectionView.as_view(), name='course_participants_intersection'),
 
diff --git a/apps/staff/views.py b/apps/staff/views.py
index c850648ae4..b2365a6ae2 100644
--- a/apps/staff/views.py
+++ b/apps/staff/views.py
@@ -631,6 +631,18 @@ def autograde_projects(request):
         messages.error(request, str(e))
     return HttpResponseRedirect(reverse("staff:exports"))
 
+def autofail_ungraded(request):
+    if not request.user.is_curator:
+        return HttpResponseForbidden()
+    try:
+        graded = call_command("autofail_ungraded", request.site)
+        messages.success(
+            request, f"Операция выполнена успешно.<br>" f"Выставлено незачетов: {graded}"
+        )
+    except CommandError as e:
+        messages.error(request, str(e))
+    return HttpResponseRedirect(reverse("staff:exports"))
+
 
 # FIXME: replace with staff.api.views.CreateAlumniProfiles (already tested) - needs to write js part
 def create_alumni_profiles(request: HttpRequest):

From 59e25e1f9dc5bb4fb185988161dcac1666b2f152 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:47:15 +0300
Subject: [PATCH 09/25] Add tests for autofail_ungraded

---
 apps/projects/tests/test_commands.py | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/apps/projects/tests/test_commands.py b/apps/projects/tests/test_commands.py
index 5e95a27b1e..fc66856e5a 100644
--- a/apps/projects/tests/test_commands.py
+++ b/apps/projects/tests/test_commands.py
@@ -7,7 +7,10 @@
 from django.core import management
 from django.core.management import CommandError
 
+from courses.constants import SemesterTypes
 from courses.tests.factories import SemesterFactory
+from learning.settings import GradeTypes
+from learning.tests.factories import EnrollmentFactory
 from notifications import NotificationTypes
 from notifications.models import Notification
 from projects.constants import (
@@ -17,6 +20,7 @@
 from projects.tests.factories import (
     ProjectFactory, ProjectStudentFactory, ReportingPeriodFactory
 )
+from core.tests.factories import SiteFactory
 
 
 @pytest.mark.django_db
@@ -49,6 +53,47 @@ def test_autograde_projects(settings):
     assert project_student.final_grade == ProjectStudent.GRADES.CREDIT
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize("prev_sem, current_grade, previous_grade, enrollment_2020_grade, enrollment_2018_grade",
+                         [(False, GradeTypes.UNSATISFACTORY, GradeTypes.NOT_GRADED, GradeTypes.NOT_GRADED,
+                           GradeTypes.NOT_GRADED),
+                          (True, GradeTypes.NOT_GRADED, GradeTypes.UNSATISFACTORY, GradeTypes.UNSATISFACTORY,
+                           GradeTypes.NOT_GRADED)])
+def test_autofail_ungraded(settings, prev_sem, current_grade, previous_grade, enrollment_2020_grade,
+                           enrollment_2018_grade):
+    settings.LANGUAGE_CODE = 'ru'
+    current_term = SemesterFactory.create_current()
+    previous_term = SemesterFactory.create_prev(current_term)
+    term_2020_autumn = SemesterFactory(year=2020, type=SemesterTypes.AUTUMN)
+    term_2018_autumn = SemesterFactory(year=2018, type=SemesterTypes.AUTUMN)
+    site = SiteFactory(domain="lk.yandexdataschool.ru")
+    out = StringIO()
+
+    current_enrollment = EnrollmentFactory(course__semester=current_term)
+    previous_enrollment = EnrollmentFactory(course__semester=previous_term)
+    enrollment_2020 = EnrollmentFactory(course__semester=term_2020_autumn)
+    enrollment_2018 = EnrollmentFactory(course__semester=term_2018_autumn)
+
+    assert current_enrollment.grade == GradeTypes.NOT_GRADED
+    assert previous_enrollment.grade == GradeTypes.NOT_GRADED
+    assert enrollment_2020.grade == GradeTypes.NOT_GRADED
+    assert enrollment_2018.grade == GradeTypes.NOT_GRADED
+
+    management.call_command("autofail_ungraded", site, prev_sem=prev_sem, stdout=out)
+
+    assert out.getvalue().strip() != "0"
+
+    current_enrollment.refresh_from_db()
+    previous_enrollment.refresh_from_db()
+    enrollment_2020.refresh_from_db()
+    enrollment_2018.refresh_from_db()
+
+    assert current_enrollment.grade == current_grade
+    assert previous_enrollment.grade == previous_grade
+    assert enrollment_2020.grade == enrollment_2020_grade
+    assert enrollment_2018.grade == enrollment_2018_grade
+
+
 @pytest.mark.django_db
 def test_projects_notifications(settings, mocker):
     settings.LANGUAGE_CODE = 'ru'

From a6c4e010a7c89d6024a9867ef1546a2d393abd69 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Sun, 7 Jan 2024 14:43:17 +0300
Subject: [PATCH 10/25] Add study year to gradebook

---
 lk_yandexdataschool_ru/settings/local.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lk_yandexdataschool_ru/settings/local.py b/lk_yandexdataschool_ru/settings/local.py
index 08c4b0fe81..43442866f4 100644
--- a/lk_yandexdataschool_ru/settings/local.py
+++ b/lk_yandexdataschool_ru/settings/local.py
@@ -8,7 +8,6 @@
 JS_REVERSE_JS_VAR_NAME = 'URLS'
 JS_REVERSE_INCLUDE_ONLY_NAMESPACES = ['stats-api', 'admission-api']
 JS_REVERSE_OUTPUT_PATH = str(DJANGO_ASSETS_ROOT / "v1" / "js" / "vendor")
-
 if DEBUG:
     INSTALLED_APPS += ['django_extensions']
     # Translate .po files with UI

From 747e1c8171f715bde7e4f8bae83d4ad5e877c7fb Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Mon, 8 Jan 2024 17:41:16 +0300
Subject: [PATCH 11/25] Review changes

---
 lk_yandexdataschool_ru/settings/local.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lk_yandexdataschool_ru/settings/local.py b/lk_yandexdataschool_ru/settings/local.py
index 43442866f4..08c4b0fe81 100644
--- a/lk_yandexdataschool_ru/settings/local.py
+++ b/lk_yandexdataschool_ru/settings/local.py
@@ -8,6 +8,7 @@
 JS_REVERSE_JS_VAR_NAME = 'URLS'
 JS_REVERSE_INCLUDE_ONLY_NAMESPACES = ['stats-api', 'admission-api']
 JS_REVERSE_OUTPUT_PATH = str(DJANGO_ASSETS_ROOT / "v1" / "js" / "vendor")
+
 if DEBUG:
     INSTALLED_APPS += ['django_extensions']
     # Translate .po files with UI

From fd11ac865d1a4faaea9b81d9c6995cba7989a22f Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 19 Jan 2024 21:58:22 +0300
Subject: [PATCH 12/25] Remove ProgramsView from students learning menu

---
 lk_yandexdataschool_ru/menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lk_yandexdataschool_ru/menu.py b/lk_yandexdataschool_ru/menu.py
index 6fad7b984b..3f40e4c7c7 100644
--- a/lk_yandexdataschool_ru/menu.py
+++ b/lk_yandexdataschool_ru/menu.py
@@ -26,7 +26,7 @@
             MenuItem(pgettext_lazy("menu", "Полезное"), '/learning/useful/', weight=60),
             MenuItem(pgettext_lazy("menu", "Кодекс чести"), '/learning/hc/', weight=70),
             MenuItem(pgettext_lazy("menu", "Программы обучения"), '/learning/programs/', weight=70),
-            MenuItem(pgettext_lazy("menu", "Проекты организаторов"), '/learning/internships/', weight=80),
+            # MenuItem(pgettext_lazy("menu", "Проекты организаторов"), '/learning/internships/', weight=80),
         ],
         permissions=(
             "learning.view_study_menu",

From c093933d4d1eeb94a7bcd23cea333aaf55e7312f Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:44:27 +0300
Subject: [PATCH 13/25] Change default settings module

---
 manage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manage.py b/manage.py
index 970a0adccd..79c3453d90 100755
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,7 @@
 if __name__ == "__main__":
     # On production use --settings to override default behavior
     os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                          "compscicenter_ru.settings.local")
+                          "lk_yandexdataschool_ru.settings.local")
 
     from django.core.management import execute_from_command_line
 

From 03f001b0f5732000ff59e8dabb6d7574fef45212 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:45:14 +0300
Subject: [PATCH 14/25] Ignore pytest Deprecated warnings

---
 lk_yandexdataschool_ru/pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lk_yandexdataschool_ru/pytest.ini b/lk_yandexdataschool_ru/pytest.ini
index fc5b7340e7..d26f9cd2d5 100644
--- a/lk_yandexdataschool_ru/pytest.ini
+++ b/lk_yandexdataschool_ru/pytest.ini
@@ -21,3 +21,4 @@ filterwarnings =
     ignore:smart_text\(\) is deprecated in favor:PendingDeprecationWarning
     ignore:The providing_args argument is deprecated:PendingDeprecationWarning
     ignore:'.*' defines default_app_config = '.*':PendingDeprecationWarning
+    ignore::DeprecationWarning

From 700812acaffebed94b8b23acac36f0e661f10998 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:46:28 +0300
Subject: [PATCH 15/25] Add autofail_ungraded functional

---
 .../management/commands/autofail_ungraded.py  | 34 +++++++++++++++++++
 apps/staff/templates/staff/exports.html       |  8 +++++
 apps/staff/urls.py                            |  3 +-
 apps/staff/views.py                           | 12 +++++++
 4 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 apps/projects/management/commands/autofail_ungraded.py

diff --git a/apps/projects/management/commands/autofail_ungraded.py b/apps/projects/management/commands/autofail_ungraded.py
new file mode 100644
index 0000000000..3956a4639c
--- /dev/null
+++ b/apps/projects/management/commands/autofail_ungraded.py
@@ -0,0 +1,34 @@
+from django.core.management import BaseCommand, CommandError
+
+from courses.constants import SemesterTypes
+from courses.models import Semester
+from learning.models import Enrollment
+from learning.settings import GradeTypes
+
+class Command(BaseCommand):
+    help = """
+    Set grade to fail for all ungraded students. Only in courses of current semester by default.
+    Set --prev-sem flag to apply for courses from Autumn 2020 till previous semester.
+    """
+
+    def add_arguments(self, parser):
+        parser.add_argument("site", type=str, help='Site to search for enrollments')
+        parser.add_argument('--prev-sem', action='store_true', help='If flag is true, script works for previous '
+                                                                    'semesters')
+
+    def handle(self, *args, **options):
+        site = options["site"]
+        enrollments = Enrollment.objects.select_related("student_profile__branch__site", "course__semester")
+        current_term = Semester.get_current()
+        if options['prev_sem']:
+            term = Semester.objects.get(year=2020, type=SemesterTypes.AUTUMN)
+            enrollments = enrollments.filter(grade=GradeTypes.NOT_GRADED,
+                                course__semester__lte=term,
+                                course__semester__gt=current_term,
+                                student_profile__branch__site__domain=site)
+        else:
+            enrollments = enrollments.filter(grade=GradeTypes.NOT_GRADED,
+                                             course__semester=current_term,
+                                             student_profile__branch__site__domain=site)
+        graded = enrollments.update(grade=GradeTypes.UNSATISFACTORY)
+        return str(graded)
diff --git a/apps/staff/templates/staff/exports.html b/apps/staff/templates/staff/exports.html
index 25bb95710d..2b1b54a954 100644
--- a/apps/staff/templates/staff/exports.html
+++ b/apps/staff/templates/staff/exports.html
@@ -72,6 +72,14 @@ <h4 class="list-group-item-heading">Оценки по проектам, {% trans
             </ul>
           </div>
         </div>
+        <h2>Незачеты</h2>
+        <div class="list-group">
+          <div class="list-group-item">
+            <h4 class="list-group-item-heading">Невыставленные оценки по курсам, {% trans current_term.type %} {{ current_term.year }}</h4>
+            <p><a href="{% url 'staff:autofail_ungraded' %}" class="btn btn-primary btn-wide"
+                  onclick="return confirm('Вы уверены? Это действие нельзя обратить')">Превратить в незачеты </a></p>
+          </div>
+        </div>
         <a name="will-graduate"></a>
         <h2 class="content-title">Будущий выпуск</h2>
         <div class="list-group">
diff --git a/apps/staff/urls.py b/apps/staff/urls.py
index 23c32e0795..c43eda3a97 100644
--- a/apps/staff/urls.py
+++ b/apps/staff/urls.py
@@ -17,7 +17,7 @@
     ProgressReportForSemesterView, ProgressReportFullView, StudentFacesView,
     StudentSearchCSVView, StudentSearchView, SurveySubmissionsReportView,
     SurveySubmissionsStatsView, WillGraduateStatsReportView, autograde_projects,
-    create_alumni_profiles
+    autofail_ungraded, create_alumni_profiles
 )
 
 app_name = 'staff'
@@ -64,6 +64,7 @@ def to_url(self, value):
 
     path('commands/create-alumni-profiles/', create_alumni_profiles, name='create_alumni_profiles'),  # deprecated
     path('commands/autograde-projects/', autograde_projects, name='autograde_projects'),
+    path('commands/autofail_ungraded/', autofail_ungraded, name='autofail_ungraded'),
 
     path('course-participants/', CourseParticipantsIntersectionView.as_view(), name='course_participants_intersection'),
 
diff --git a/apps/staff/views.py b/apps/staff/views.py
index c850648ae4..b2365a6ae2 100644
--- a/apps/staff/views.py
+++ b/apps/staff/views.py
@@ -631,6 +631,18 @@ def autograde_projects(request):
         messages.error(request, str(e))
     return HttpResponseRedirect(reverse("staff:exports"))
 
+def autofail_ungraded(request):
+    if not request.user.is_curator:
+        return HttpResponseForbidden()
+    try:
+        graded = call_command("autofail_ungraded", request.site)
+        messages.success(
+            request, f"Операция выполнена успешно.<br>" f"Выставлено незачетов: {graded}"
+        )
+    except CommandError as e:
+        messages.error(request, str(e))
+    return HttpResponseRedirect(reverse("staff:exports"))
+
 
 # FIXME: replace with staff.api.views.CreateAlumniProfiles (already tested) - needs to write js part
 def create_alumni_profiles(request: HttpRequest):

From d9cc663eb599f08bec9b9f2d00f2374da84e0e39 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 16:47:15 +0300
Subject: [PATCH 16/25] Add tests for autofail_ungraded

---
 apps/projects/tests/test_commands.py | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/apps/projects/tests/test_commands.py b/apps/projects/tests/test_commands.py
index 5e95a27b1e..fc66856e5a 100644
--- a/apps/projects/tests/test_commands.py
+++ b/apps/projects/tests/test_commands.py
@@ -7,7 +7,10 @@
 from django.core import management
 from django.core.management import CommandError
 
+from courses.constants import SemesterTypes
 from courses.tests.factories import SemesterFactory
+from learning.settings import GradeTypes
+from learning.tests.factories import EnrollmentFactory
 from notifications import NotificationTypes
 from notifications.models import Notification
 from projects.constants import (
@@ -17,6 +20,7 @@
 from projects.tests.factories import (
     ProjectFactory, ProjectStudentFactory, ReportingPeriodFactory
 )
+from core.tests.factories import SiteFactory
 
 
 @pytest.mark.django_db
@@ -49,6 +53,47 @@ def test_autograde_projects(settings):
     assert project_student.final_grade == ProjectStudent.GRADES.CREDIT
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize("prev_sem, current_grade, previous_grade, enrollment_2020_grade, enrollment_2018_grade",
+                         [(False, GradeTypes.UNSATISFACTORY, GradeTypes.NOT_GRADED, GradeTypes.NOT_GRADED,
+                           GradeTypes.NOT_GRADED),
+                          (True, GradeTypes.NOT_GRADED, GradeTypes.UNSATISFACTORY, GradeTypes.UNSATISFACTORY,
+                           GradeTypes.NOT_GRADED)])
+def test_autofail_ungraded(settings, prev_sem, current_grade, previous_grade, enrollment_2020_grade,
+                           enrollment_2018_grade):
+    settings.LANGUAGE_CODE = 'ru'
+    current_term = SemesterFactory.create_current()
+    previous_term = SemesterFactory.create_prev(current_term)
+    term_2020_autumn = SemesterFactory(year=2020, type=SemesterTypes.AUTUMN)
+    term_2018_autumn = SemesterFactory(year=2018, type=SemesterTypes.AUTUMN)
+    site = SiteFactory(domain="lk.yandexdataschool.ru")
+    out = StringIO()
+
+    current_enrollment = EnrollmentFactory(course__semester=current_term)
+    previous_enrollment = EnrollmentFactory(course__semester=previous_term)
+    enrollment_2020 = EnrollmentFactory(course__semester=term_2020_autumn)
+    enrollment_2018 = EnrollmentFactory(course__semester=term_2018_autumn)
+
+    assert current_enrollment.grade == GradeTypes.NOT_GRADED
+    assert previous_enrollment.grade == GradeTypes.NOT_GRADED
+    assert enrollment_2020.grade == GradeTypes.NOT_GRADED
+    assert enrollment_2018.grade == GradeTypes.NOT_GRADED
+
+    management.call_command("autofail_ungraded", site, prev_sem=prev_sem, stdout=out)
+
+    assert out.getvalue().strip() != "0"
+
+    current_enrollment.refresh_from_db()
+    previous_enrollment.refresh_from_db()
+    enrollment_2020.refresh_from_db()
+    enrollment_2018.refresh_from_db()
+
+    assert current_enrollment.grade == current_grade
+    assert previous_enrollment.grade == previous_grade
+    assert enrollment_2020.grade == enrollment_2020_grade
+    assert enrollment_2018.grade == enrollment_2018_grade
+
+
 @pytest.mark.django_db
 def test_projects_notifications(settings, mocker):
     settings.LANGUAGE_CODE = 'ru'

From 88017c582ad05ebd335836cb6706e7c2fc88c441 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Fri, 26 Jan 2024 17:45:48 +0300
Subject: [PATCH 17/25] test fix

---
 apps/projects/tests/test_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/projects/tests/test_commands.py b/apps/projects/tests/test_commands.py
index fc66856e5a..ef9c9c4ac9 100644
--- a/apps/projects/tests/test_commands.py
+++ b/apps/projects/tests/test_commands.py
@@ -66,7 +66,7 @@ def test_autofail_ungraded(settings, prev_sem, current_grade, previous_grade, en
     previous_term = SemesterFactory.create_prev(current_term)
     term_2020_autumn = SemesterFactory(year=2020, type=SemesterTypes.AUTUMN)
     term_2018_autumn = SemesterFactory(year=2018, type=SemesterTypes.AUTUMN)
-    site = SiteFactory(domain="lk.yandexdataschool.ru")
+    site = SiteFactory()
     out = StringIO()
 
     current_enrollment = EnrollmentFactory(course__semester=current_term)

From 1acae182f828e209acb333e23ee514960966c4be Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Wed, 31 Jan 2024 21:57:25 +0300
Subject: [PATCH 18/25] Add logging

---
 apps/projects/management/commands/autofail_ungraded.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/projects/management/commands/autofail_ungraded.py b/apps/projects/management/commands/autofail_ungraded.py
index 3956a4639c..7f9e722afd 100644
--- a/apps/projects/management/commands/autofail_ungraded.py
+++ b/apps/projects/management/commands/autofail_ungraded.py
@@ -1,10 +1,14 @@
-from django.core.management import BaseCommand, CommandError
+import logging
+
+from django.core.management import BaseCommand
 
 from courses.constants import SemesterTypes
 from courses.models import Semester
 from learning.models import Enrollment
 from learning.settings import GradeTypes
 
+logger = logging.getLogger(__name__)
+
 class Command(BaseCommand):
     help = """
     Set grade to fail for all ungraded students. Only in courses of current semester by default.
@@ -30,5 +34,6 @@ def handle(self, *args, **options):
             enrollments = enrollments.filter(grade=GradeTypes.NOT_GRADED,
                                              course__semester=current_term,
                                              student_profile__branch__site__domain=site)
+        logger.info(f"Change grades of {current_term} enrollments from Not Graded to Unsatisfactory")
         graded = enrollments.update(grade=GradeTypes.UNSATISFACTORY)
         return str(graded)

From 5e061b8aac288fab6571552cc51a6e818d734f04 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Wed, 31 Jan 2024 22:00:31 +0300
Subject: [PATCH 19/25] Add useful comment

---
 lk_yandexdataschool_ru/menu.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lk_yandexdataschool_ru/menu.py b/lk_yandexdataschool_ru/menu.py
index 3f40e4c7c7..8883ad1020 100644
--- a/lk_yandexdataschool_ru/menu.py
+++ b/lk_yandexdataschool_ru/menu.py
@@ -26,6 +26,7 @@
             MenuItem(pgettext_lazy("menu", "Полезное"), '/learning/useful/', weight=60),
             MenuItem(pgettext_lazy("menu", "Кодекс чести"), '/learning/hc/', weight=70),
             MenuItem(pgettext_lazy("menu", "Программы обучения"), '/learning/programs/', weight=70),
+            # Commented to return fast in autumn semester
             # MenuItem(pgettext_lazy("menu", "Проекты организаторов"), '/learning/internships/', weight=80),
         ],
         permissions=(

From f9943df01c39c4b09cc266d525a04638ecd61d35 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Thu, 1 Feb 2024 16:35:29 +0300
Subject: [PATCH 20/25] Review changes

---
 apps/staff/urls.py | 5 +++--
 manage.py          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/staff/urls.py b/apps/staff/urls.py
index c43eda3a97..11678e948a 100644
--- a/apps/staff/urls.py
+++ b/apps/staff/urls.py
@@ -16,10 +16,11 @@
     OfficialDiplomasCSVView, OfficialDiplomasListView, OfficialDiplomasTeXView,
     ProgressReportForSemesterView, ProgressReportFullView, StudentFacesView,
     StudentSearchCSVView, StudentSearchView, SurveySubmissionsReportView,
-    SurveySubmissionsStatsView, WillGraduateStatsReportView, autograde_projects,
-    autofail_ungraded, create_alumni_profiles
+    SurveySubmissionsStatsView, WillGraduateStatsReportView
 )
 
+from staff.views import autograde_projects, autofail_ungraded, create_alumni_profiles
+
 app_name = 'staff'
 
 
diff --git a/manage.py b/manage.py
index 79c3453d90..970a0adccd 100755
--- a/manage.py
+++ b/manage.py
@@ -10,7 +10,7 @@
 if __name__ == "__main__":
     # On production use --settings to override default behavior
     os.environ.setdefault("DJANGO_SETTINGS_MODULE",
-                          "lk_yandexdataschool_ru.settings.local")
+                          "compscicenter_ru.settings.local")
 
     from django.core.management import execute_from_command_line
 

From 0ffac1d074e30e3830919850a01b05c68d2d24cb Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Tue, 30 Jan 2024 18:58:01 +0300
Subject: [PATCH 21/25] Add gradebook ref to courses

---
 lms/jinja2/lms/courses/course_detail.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lms/jinja2/lms/courses/course_detail.html b/lms/jinja2/lms/courses/course_detail.html
index ac3c90e81f..d2fea740fd 100644
--- a/lms/jinja2/lms/courses/course_detail.html
+++ b/lms/jinja2/lms/courses/course_detail.html
@@ -19,7 +19,13 @@ <h2 class="course-main-title">
             <a href="{{ url('admin:courses_course_change', object_id=course.pk) }}" target="_blank"><i
               class="fa fa-pencil-square-o"></i></a>{% endif %}<br>
           <small>{{ course.main_branch.name }} / {{ course.semester }}, <a href="{{ course.meta_course.get_absolute_url() }}">посмотреть
-            все семестры</a></small>
+            все семестры</a>
+          {% if user.is_curator or user in course.teachers.all()%}
+            <br>
+           <a href="{{request.build_absolute_uri(url('staff:gradebook', **course.url_kwargs))}}">
+              Ведомость</a>
+          {% endif %}
+            </small>
         </h2>
 
         <ul class="nav nav-tabs square" role="tablist" id="course-detail-page__tablist">

From 8f7932e07b010ea4474bd92c8def5dbbc0670f11 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Tue, 30 Jan 2024 20:18:29 +0300
Subject: [PATCH 22/25] Add Useful to teaching tab

---
 apps/info_blocks/constants.py            |  1 +
 apps/learning/teaching/urls.py           |  3 ++-
 apps/learning/teaching/views/__init__.py | 13 +++++++++++++
 lk_yandexdataschool_ru/menu.py           |  4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/apps/info_blocks/constants.py b/apps/info_blocks/constants.py
index 679c80bc23..c3e134e078 100644
--- a/apps/info_blocks/constants.py
+++ b/apps/info_blocks/constants.py
@@ -4,6 +4,7 @@ class CurrentInfoBlockTags:
     Need to be kept in sync with actual DB values, will be removed in favor of tabs in the new design.
     """
     USEFUL = "hint"
+    TEACHERS_USEFUL = "teachers-hint"
     HONOR_CODE = "honor-code"
     INTERNSHIP = "internship"
     PROGRAMS = "programs"
diff --git a/apps/learning/teaching/urls.py b/apps/learning/teaching/urls.py
index 8934757319..f7fef9d6cb 100644
--- a/apps/learning/teaching/urls.py
+++ b/apps/learning/teaching/urls.py
@@ -9,7 +9,7 @@
 )
 from learning.teaching.views import (
     CalendarFullView, CalendarPersonalView, CourseListView, CourseStudentProgressView,
-    GradeBookListView
+    GradeBookListView, TeachingUsefulListView
 )
 from learning.teaching.views import TimetableView as TeacherTimetable
 from learning.teaching.views.assignments import (
@@ -53,6 +53,7 @@
     path('', RedirectView.as_view(pattern_name='teaching:assignments_check_queue', permanent=False), name='base'),
     path('timetable/', TeacherTimetable.as_view(), name='timetable'),
     path('calendar/', CalendarPersonalView.as_view(), name='calendar'),
+    path('useful/', TeachingUsefulListView.as_view(), name='teaching_useful'),
     path('full-calendar/', CalendarFullView.as_view(), name='calendar_full'),
     path('courses/', include([
         path('', CourseListView.as_view(), name='course_list'),
diff --git a/apps/learning/teaching/views/__init__.py b/apps/learning/teaching/views/__init__.py
index 63505a4018..bd5bd363fa 100644
--- a/apps/learning/teaching/views/__init__.py
+++ b/apps/learning/teaching/views/__init__.py
@@ -19,6 +19,8 @@
 from courses.utils import MonthPeriod, extended_month_date_range, get_current_term_pair
 from courses.views.calendar import MonthEventsCalendarView
 from courses.views.mixins import CourseURLParamsMixin
+from info_blocks.constants import CurrentInfoBlockTags
+from info_blocks.models import InfoBlock
 from learning.calendar import get_all_calendar_events, get_teacher_calendar_events
 from learning.gradebook.views import GradeBookListBaseView
 from learning.models import Enrollment, StudentAssignment
@@ -159,3 +161,14 @@ def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
             "student_assignments": student_assignments
         }
         return context
+
+class TeachingUsefulListView(PermissionRequiredMixin, generic.ListView):
+    context_object_name = "faq"
+    template_name = "learning/study/useful.html"
+    permission_required = "teaching.view_faq"
+
+    def get_queryset(self):
+        return (InfoBlock.objects
+                .for_site(self.request.site)
+                .with_tag(CurrentInfoBlockTags.TEACHERS_USEFUL)
+                .order_by("sort"))
diff --git a/lk_yandexdataschool_ru/menu.py b/lk_yandexdataschool_ru/menu.py
index 8883ad1020..8ac8dfdc24 100644
--- a/lk_yandexdataschool_ru/menu.py
+++ b/lk_yandexdataschool_ru/menu.py
@@ -65,6 +65,10 @@
                 pgettext_lazy("menu", "Ведомости"),
                 reverse('teaching:gradebook_list'),
                 weight=50),
+            MenuItem(
+                pgettext_lazy("menu", "Полезное"),
+                reverse('teaching:teaching_useful'),
+                weight=50),
         ],
         permissions=(
             "learning.view_teaching_menu",

From 3f74203a1c614553590e556c71872e649952d94e Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Wed, 31 Jan 2024 21:11:44 +0300
Subject: [PATCH 23/25] Color panel headings of graduated student profiles

---
 lms/jinja2/lms/user_profile/_tab_student_profiles.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lms/jinja2/lms/user_profile/_tab_student_profiles.html b/lms/jinja2/lms/user_profile/_tab_student_profiles.html
index 18ff4472f6..7dfb1b5ed7 100644
--- a/lms/jinja2/lms/user_profile/_tab_student_profiles.html
+++ b/lms/jinja2/lms/user_profile/_tab_student_profiles.html
@@ -1,7 +1,15 @@
 <div class="panel-group" role="tablist">
   {% for student_profile in student_profiles %}
     <div class="panel panel-default">
-      <div class="panel-heading" role="tab" id="headingOne">
+      {% if student_profile.status == StudentStatuses.GRADUATE%}
+        {% if student_profile.graduate_profile%}
+          <div class="panel-heading" role="tab" id="headingOne" style="background-color: #40e0d0;">
+        {% else %}
+          <div class="panel-heading" role="tab" id="headingOne" style="background-color: #add8e6;">
+        {% endif %}
+      {% else %}
+        <div class="panel-heading" role="tab" id="headingOne">
+      {% endif %}
         <h4 class="panel-title">
           <a role="button" data-toggle="collapse" href="#student-profile-{{ student_profile.pk }}"
              aria-expanded="{{ "true" if loop.first else "false" }}"

From 65f88f15a4fafdba150ac62acb98901cf3f1fdb1 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Thu, 1 Feb 2024 17:58:35 +0300
Subject: [PATCH 24/25] Add html parse to honor code

---
 apps/templates/learning/study/honor_code.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/templates/learning/study/honor_code.html b/apps/templates/learning/study/honor_code.html
index ad2a99b42b..1515cc52b1 100644
--- a/apps/templates/learning/study/honor_code.html
+++ b/apps/templates/learning/study/honor_code.html
@@ -12,7 +12,7 @@ <h3 class="content-title">Кодекс чести студента</h3>
             <br><br>
             <ul>
                 {% for qa in faq %}
-                    <li>{{ qa.content }}</li>
+                    <li>{{ qa.content|safe }}</li>
                 {% endfor %}
             </ul>
         {% else %}

From cca7d80fc0f149ea29ada311011c50180a5b6b97 Mon Sep 17 00:00:00 2001
From: Charnushevich Dzmitry <dmi4er4@gmail.com>
Date: Thu, 1 Feb 2024 22:23:12 +0300
Subject: [PATCH 25/25] Review changes

---
 lms/jinja2/lms/courses/course_detail.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/jinja2/lms/courses/course_detail.html b/lms/jinja2/lms/courses/course_detail.html
index d2fea740fd..8de51a3dc6 100644
--- a/lms/jinja2/lms/courses/course_detail.html
+++ b/lms/jinja2/lms/courses/course_detail.html
@@ -19,9 +19,9 @@ <h2 class="course-main-title">
             <a href="{{ url('admin:courses_course_change', object_id=course.pk) }}" target="_blank"><i
               class="fa fa-pencil-square-o"></i></a>{% endif %}<br>
           <small>{{ course.main_branch.name }} / {{ course.semester }}, <a href="{{ course.meta_course.get_absolute_url() }}">посмотреть
-            все семестры</a>
+            все семестры</a></small>
           {% if user.is_curator or user in course.teachers.all()%}
-            <br>
+            <br><small>
            <a href="{{request.build_absolute_uri(url('staff:gradebook', **course.url_kwargs))}}">
               Ведомость</a>
           {% endif %}