From 074e00785007d01e259cbb0730aab5d1d2ce567f Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sat, 24 Jan 2026 12:47:22 +0000 Subject: [PATCH 1/4] Improve notifications for training day attendance and questions - Add clear messages on announcements/questions pages indicating they only handle training program items, with links to training day pages - Add alerts to side menu showing total unanswered questions and pending delay requests across all training days - Add red circles with counts to each training day in the side menu - Training program questions page now shows alerts for training days with unanswered questions with direct links - Training program attendance page now shows alerts for training days with pending delay requests with direct links - Add orange color styling for delay request indicators to differentiate from question indicators (red) Co-Authored-By: Ron Ryvchin --- cms/server/admin/handlers/archive.py | 20 +++++++++ cms/server/admin/handlers/base.py | 42 +++++++++++++++++++ cms/server/admin/handlers/trainingprogram.py | 21 ++++++++++ cms/server/admin/static/aws_style.css | 4 ++ cms/server/admin/templates/announcements.html | 7 ++++ cms/server/admin/templates/base.html | 19 ++++++++- cms/server/admin/templates/questions.html | 19 +++++++++ .../training_program_attendance.html | 17 ++++++++ 8 files changed, 148 insertions(+), 1 deletion(-) diff --git a/cms/server/admin/handlers/archive.py b/cms/server/admin/handlers/archive.py index bb251c0dce..22d466fee2 100644 --- a/cms/server/admin/handlers/archive.py +++ b/cms/server/admin/handlers/archive.py @@ -700,6 +700,26 @@ def get(self, training_program_id: str): .filter(Question.reply_timestamp.is_(None))\ .filter(Question.ignored.is_(False))\ .count() + + # Get training days with pending delay requests + training_days_with_pending_delays: list[dict] = [] + for td in training_program.training_days: + if td.contest is None: + continue + pending_count = self.sql_session.query(DelayRequest)\ + .join(Participation)\ + .filter(Participation.contest_id == td.contest_id)\ + .filter(DelayRequest.status == "pending")\ + .count() + if pending_count > 0: + training_days_with_pending_delays.append({ + "contest_id": td.contest_id, + "name": td.contest.name, + "pending_count": pending_count, + }) + self.r_params["training_days_with_pending_delays"] = \ + training_days_with_pending_delays + self.render("training_program_attendance.html", **self.r_params) diff --git a/cms/server/admin/handlers/base.py b/cms/server/admin/handlers/base.py index 8057813338..451ff33b51 100644 --- a/cms/server/admin/handlers/base.py +++ b/cms/server/admin/handlers/base.py @@ -509,6 +509,48 @@ def render_params(self) -> dict: .order_by(TrainingProgram.name) .all() ) + + # If viewing a training program, add notification counts for training days + if "training_program" in params and params["training_program"] is not None: + training_program = params["training_program"] + training_day_notifications: dict[int, dict] = {} + total_td_unanswered_questions = 0 + total_td_pending_delay_requests = 0 + + for td in training_program.training_days: + if td.contest is None: + continue + + # Count unanswered questions for this training day + td_unanswered = ( + self.sql_session.query(Question) + .join(Participation) + .filter(Participation.contest_id == td.contest_id) + .filter(Question.reply_timestamp.is_(None)) + .filter(Question.ignored.is_(False)) + .count() + ) + + # Count pending delay requests for this training day + td_pending_delays = ( + self.sql_session.query(DelayRequest) + .join(Participation) + .filter(Participation.contest_id == td.contest_id) + .filter(DelayRequest.status == "pending") + .count() + ) + + training_day_notifications[td.id] = { + "unanswered_questions": td_unanswered, + "pending_delay_requests": td_pending_delays, + } + total_td_unanswered_questions += td_unanswered + total_td_pending_delay_requests += td_pending_delays + + params["training_day_notifications"] = training_day_notifications + params["total_td_unanswered_questions"] = total_td_unanswered_questions + params["total_td_pending_delay_requests"] = total_td_pending_delay_requests + return params def write_error(self, status_code, **kwargs): diff --git a/cms/server/admin/handlers/trainingprogram.py b/cms/server/admin/handlers/trainingprogram.py index e8704544f3..0d2dadaeb6 100644 --- a/cms/server/admin/handlers/trainingprogram.py +++ b/cms/server/admin/handlers/trainingprogram.py @@ -35,6 +35,7 @@ from cms.db import ( Contest, + DelayRequest, TrainingProgram, Participation, Submission, @@ -941,6 +942,26 @@ def get(self, training_program_id: str): .filter(Question.ignored.is_(False))\ .count() + # Get training days with unanswered questions + training_days_with_unanswered: list[dict] = [] + for td in training_program.training_days: + if td.contest is None: + continue + unanswered_count = self.sql_session.query(Question)\ + .join(Participation)\ + .filter(Participation.contest_id == td.contest_id)\ + .filter(Question.reply_timestamp.is_(None))\ + .filter(Question.ignored.is_(False))\ + .count() + if unanswered_count > 0: + training_days_with_unanswered.append({ + "contest_id": td.contest_id, + "name": td.contest.name, + "unanswered_count": unanswered_count, + }) + self.r_params["training_days_with_unanswered_questions"] = \ + training_days_with_unanswered + self.render("questions.html", **self.r_params) diff --git a/cms/server/admin/static/aws_style.css b/cms/server/admin/static/aws_style.css index 06b948f9cf..7386135d6e 100644 --- a/cms/server/admin/static/aws_style.css +++ b/cms/server/admin/static/aws_style.css @@ -547,6 +547,10 @@ body.admin .sidebar-contest a, body.admin .sidebar-item a { text-shadow: none; } +.unread.unread-delay { + background-color: #FF8C00; +} + .secret_notice { font-size: 0.8em; line-height: 1.125em; diff --git a/cms/server/admin/templates/announcements.html b/cms/server/admin/templates/announcements.html index 1880536007..62c3b08911 100644 --- a/cms/server/admin/templates/announcements.html +++ b/cms/server/admin/templates/announcements.html @@ -35,6 +35,13 @@

Announcements

+{% if training_program is defined %} +
+ Note: This page only handles announcements for the training program. + For training day announcements, go to the appropriate training day's announcements page. +
+{% endif %} +

Announcements

diff --git a/cms/server/admin/templates/base.html b/cms/server/admin/templates/base.html index 55500200a4..88ad9617c0 100644 --- a/cms/server/admin/templates/base.html +++ b/cms/server/admin/templates/base.html @@ -481,7 +481,13 @@

  • Submissions
  • Students
  • Tasks
    • -
  • Attendance
    • +
  • + + Attendance +
  • Combined Ranking
  • Announcements
  • @@ -496,6 +502,12 @@

    + + {{ total_td_unanswered_questions|default(0) }} + + + {{ total_td_pending_delay_requests|default(0) }} + Training Days

    @@ -504,6 +516,11 @@

      {% for td in active_training_days %}
    • + {% set td_notifs = training_day_notifications.get(td.id, {}) if training_day_notifications is defined else {} %} + {% set td_unanswered = td_notifs.get("unanswered_questions", 0) %} + {% set td_delays = td_notifs.get("pending_delay_requests", 0) %} + {{ td_unanswered }} + {{ td_delays }} {{ td.contest.name }}
      • {% endfor %} diff --git a/cms/server/admin/templates/questions.html b/cms/server/admin/templates/questions.html index e8e4591347..daee47cb6f 100644 --- a/cms/server/admin/templates/questions.html +++ b/cms/server/admin/templates/questions.html @@ -12,6 +12,25 @@

      Questions

    +{% if training_program is defined %} +
    + Note: This page only handles questions for the training program. + For training day questions, go to the appropriate training day's questions page. + {% if training_days_with_unanswered_questions %} +

    + Training days with unanswered questions: +
      + {% for td_info in training_days_with_unanswered_questions %} +
    • + {{ td_info.name }} + {{ td_info.unanswered_count }} +
      • + {% endfor %} +
    + {% endif %} +
    +{% endif %} + {% if questions != [] %}
    diff --git a/cms/server/admin/templates/training_program_attendance.html b/cms/server/admin/templates/training_program_attendance.html index 8b607e7565..332938153c 100644 --- a/cms/server/admin/templates/training_program_attendance.html +++ b/cms/server/admin/templates/training_program_attendance.html @@ -37,6 +37,23 @@

    Attendance: {{ training_program.name }}

    +
    + Note: This page shows attendance data from archived training days. + For active training day attendance and delay requests, go to the appropriate training day's attendance page. + {% if training_days_with_pending_delays %} +

    + Training days with pending delay requests: +
      + {% for td_info in training_days_with_pending_delays %} +
    • + {{ td_info.name }} + {{ td_info.pending_count }} +
      • + {% endfor %} +
    + {% endif %} +
    +
    From e2398fa8e7fd9a1a3d4aa32fa343185b8c798273 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sat, 24 Jan 2026 17:25:03 +0000 Subject: [PATCH 2/4] Consolidate training program render params into helper method - Refactor render_params_for_training_program() to include contest, unanswered questions count, and training day notifications in a single helper method - Update all training program handlers to use the consolidated helper method - Remove duplicate code for setting training_program, contest, unanswered params - Remove redundant Attendance badge from sidebar (now shown in Training Days) - Fix CSS layout so notification badges stay inline with training day names Co-Authored-By: Ron Ryvchin --- cms/server/admin/handlers/archive.py | 37 ++----- cms/server/admin/handlers/base.py | 108 ++++++++++++------- cms/server/admin/handlers/student.py | 42 ++------ cms/server/admin/handlers/trainingprogram.py | 77 ++----------- cms/server/admin/static/aws_style.css | 9 ++ cms/server/admin/templates/base.html | 8 +- 6 files changed, 105 insertions(+), 176 deletions(-) diff --git a/cms/server/admin/handlers/archive.py b/cms/server/admin/handlers/archive.py index 22d466fee2..cdd278a6df 100644 --- a/cms/server/admin/handlers/archive.py +++ b/cms/server/admin/handlers/archive.py @@ -682,8 +682,7 @@ def get(self, training_program_id: str): key=lambda s: s.participation.user.username if s.participation else "" ) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["archived_training_days"] = archived_training_days self.r_params["attendance_data"] = attendance_data self.r_params["sorted_students"] = sorted_students @@ -694,23 +693,15 @@ def get(self, training_program_id: str): self.r_params["all_training_day_types"] = get_all_training_day_types( training_program) self.r_params["all_student_tags"] = get_all_student_tags(training_program) - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == training_program.managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() - # Get training days with pending delay requests + # Build training days with pending delays from notification data training_days_with_pending_delays: list[dict] = [] + td_notifications = self.r_params.get("training_day_notifications", {}) for td in training_program.training_days: if td.contest is None: continue - pending_count = self.sql_session.query(DelayRequest)\ - .join(Participation)\ - .filter(Participation.contest_id == td.contest_id)\ - .filter(DelayRequest.status == "pending")\ - .count() + td_notif = td_notifications.get(td.id, {}) + pending_count = td_notif.get("pending_delay_requests", 0) if pending_count > 0: training_days_with_pending_delays.append({ "contest_id": td.contest_id, @@ -838,8 +829,7 @@ def get(self, training_program_id: str): key=lambda s: s.participation.user.username if s.participation else "" ) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["archived_training_days"] = filtered_training_days self.r_params["ranking_data"] = ranking_data self.r_params["sorted_students"] = sorted_students @@ -854,12 +844,6 @@ def get(self, training_program_id: str): self.r_params["all_training_day_types"] = get_all_training_day_types( training_program) self.r_params["all_student_tags"] = get_all_student_tags(training_program) - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == training_program.managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("training_program_combined_ranking.html", **self.r_params) @@ -1119,8 +1103,7 @@ def get_training_day_num( params["student_tags_mode"] = student_tags_mode history_url += "?" + urlencode(params) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["student"] = student self.r_params["user_id"] = str(student.participation.user_id) if student.participation else "0" self.r_params["user_count"] = user_count @@ -1136,10 +1119,4 @@ def get_training_day_num( self.r_params["training_day_types"] = training_day_types self.r_params["student_tags"] = student_tags self.r_params["student_tags_mode"] = student_tags_mode - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == training_program.managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("training_program_combined_ranking_detail.html", **self.r_params) diff --git a/cms/server/admin/handlers/base.py b/cms/server/admin/handlers/base.py index 451ff33b51..95877a7954 100644 --- a/cms/server/admin/handlers/base.py +++ b/cms/server/admin/handlers/base.py @@ -510,48 +510,80 @@ def render_params(self) -> dict: .all() ) - # If viewing a training program, add notification counts for training days - if "training_program" in params and params["training_program"] is not None: - training_program = params["training_program"] - training_day_notifications: dict[int, dict] = {} - total_td_unanswered_questions = 0 - total_td_pending_delay_requests = 0 - - for td in training_program.training_days: - if td.contest is None: - continue - - # Count unanswered questions for this training day - td_unanswered = ( - self.sql_session.query(Question) - .join(Participation) - .filter(Participation.contest_id == td.contest_id) - .filter(Question.reply_timestamp.is_(None)) - .filter(Question.ignored.is_(False)) - .count() - ) + return params - # Count pending delay requests for this training day - td_pending_delays = ( - self.sql_session.query(DelayRequest) - .join(Participation) - .filter(Participation.contest_id == td.contest_id) - .filter(DelayRequest.status == "pending") - .count() - ) + def render_params_for_training_program( + self, training_program: "TrainingProgram" + ) -> dict: + """Initialize render params for a training program page. - training_day_notifications[td.id] = { - "unanswered_questions": td_unanswered, - "pending_delay_requests": td_pending_delays, - } - total_td_unanswered_questions += td_unanswered - total_td_pending_delay_requests += td_pending_delays + This is a convenience method that combines render_params(), + setting training_program, contest, unanswered questions count, + and notification counts for training days in the sidebar. - params["training_day_notifications"] = training_day_notifications - params["total_td_unanswered_questions"] = total_td_unanswered_questions - params["total_td_pending_delay_requests"] = total_td_pending_delay_requests + Args: + training_program: The training program being viewed. - return params + Returns: + The initialized r_params dict. + """ + managing_contest = training_program.managing_contest + self.r_params = self.render_params() + self.r_params["training_program"] = training_program + self.r_params["contest"] = managing_contest + + # Count unanswered questions for the managing contest (used in sidebar) + self.r_params["unanswered"] = ( + self.sql_session.query(Question) + .join(Participation) + .filter(Participation.contest_id == managing_contest.id) + .filter(Question.reply_timestamp.is_(None)) + .filter(Question.ignored.is_(False)) + .count() + ) + + # Add notification counts for training days + training_day_notifications: dict[int, dict] = {} + total_td_unanswered_questions = 0 + total_td_pending_delay_requests = 0 + + for td in training_program.training_days: + if td.contest is None: + continue + + # Count unanswered questions for this training day + td_unanswered = ( + self.sql_session.query(Question) + .join(Participation) + .filter(Participation.contest_id == td.contest_id) + .filter(Question.reply_timestamp.is_(None)) + .filter(Question.ignored.is_(False)) + .count() + ) + + # Count pending delay requests for this training day + td_pending_delays = ( + self.sql_session.query(DelayRequest) + .join(Participation) + .filter(Participation.contest_id == td.contest_id) + .filter(DelayRequest.status == "pending") + .count() + ) + + training_day_notifications[td.id] = { + "unanswered_questions": td_unanswered, + "pending_delay_requests": td_pending_delays, + } + total_td_unanswered_questions += td_unanswered + total_td_pending_delay_requests += td_pending_delays + + self.r_params["training_day_notifications"] = training_day_notifications + self.r_params["total_td_unanswered_questions"] = \ + total_td_unanswered_questions + self.r_params["total_td_pending_delay_requests"] = \ + total_td_pending_delay_requests + + return self.r_params def write_error(self, status_code, **kwargs): if "exc_info" in kwargs and kwargs["exc_info"][0] != tornado.web.HTTPError: diff --git a/cms/server/admin/handlers/student.py b/cms/server/admin/handlers/student.py index f7847f4fb3..32168d556c 100644 --- a/cms/server/admin/handlers/student.py +++ b/cms/server/admin/handlers/student.py @@ -54,17 +54,9 @@ def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) managing_contest = training_program.managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() - - assigned_user_ids_q = self.sql_session.query(Participation.user_id).filter( + self.render_params_for_training_program(training_program) + + assigned_user_ids_q= self.sql_session.query(Participation.user_id).filter( Participation.contest == managing_contest ) @@ -308,19 +300,13 @@ def get(self, training_program_id: str, user_id: str): page = int(self.get_query_argument("page", "0")) self.render_params_for_submissions(submission_query, page) - # Get all unique student tags from this training program for autocomplete - self.r_params["training_program"] = training_program + # render_params_for_training_program sets training_program, contest, unanswered + self.render_params_for_training_program(training_program) self.r_params["participation"] = participation self.r_params["student"] = student self.r_params["selected_user"] = participation.user self.r_params["teams"] = self.sql_session.query(Team).all() self.r_params["all_student_tags"] = get_all_student_tags(training_program) - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("student.html", **self.r_params) @require_permission(BaseHandler.PERMISSION_ALL) @@ -535,8 +521,7 @@ def get(self, training_program_id: str, user_id: str): if task_id_str in archived_ranking.task_scores: training_scores[st.task_id] = archived_ranking.task_scores[task_id_str] - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["participation"] = participation self.r_params["student"] = student self.r_params["selected_user"] = participation.user @@ -546,12 +531,6 @@ def get(self, training_program_id: str, user_id: str): self.r_params["available_tasks"] = available_tasks self.r_params["home_scores"] = home_scores self.r_params["training_scores"] = training_scores - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("student_tasks.html", **self.r_params) @@ -703,16 +682,9 @@ def get(self, training_program_id: str): # Get all unique student tags all_student_tags = get_all_student_tags(training_program) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["all_tasks"] = all_tasks self.r_params["all_student_tags"] = all_student_tags - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("bulk_assign_task.html", **self.r_params) @require_permission(BaseHandler.PERMISSION_ALL) diff --git a/cms/server/admin/handlers/trainingprogram.py b/cms/server/admin/handlers/trainingprogram.py index 0d2dadaeb6..4feeedc15e 100644 --- a/cms/server/admin/handlers/trainingprogram.py +++ b/cms/server/admin/handlers/trainingprogram.py @@ -91,15 +91,7 @@ class TrainingProgramHandler(BaseHandler): @require_permission(BaseHandler.AUTHENTICATED) def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) - managing_contest = training_program.managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + self.render_params_for_training_program(training_program) self.render("training_program.html", **self.r_params) @require_permission(BaseHandler.PERMISSION_ALL) @@ -418,18 +410,8 @@ class TrainingProgramTasksHandler(BaseHandler): @require_permission(BaseHandler.AUTHENTICATED) def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) - managing_contest = training_program.managing_contest - - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + self.render_params_for_training_program(training_program) self.r_params["unassigned_tasks"] = \ self.sql_session.query(Task)\ .filter(Task.contest_id.is_(None))\ @@ -712,18 +694,10 @@ def get(self, training_program_id: str, format: str = "online"): for participation_id, tags in rows: student_tags_by_participation[participation_id] = tags or [] - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = self.contest + self.render_params_for_training_program(training_program) self.r_params["show_teams"] = show_teams self.r_params["student_tags_by_participation"] = student_tags_by_participation self.r_params["main_groups_data"] = None # Not used for training program ranking - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == self.contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() if format == "txt": self.set_header("Content-Type", "text/plain") @@ -814,15 +788,7 @@ def get(self, training_program_id: str): managing_contest = training_program.managing_contest self.contest = managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + self.render_params_for_training_program(training_program) query = self.sql_session.query(Submission).join(Task)\ .filter(Task.contest == managing_contest) @@ -841,19 +807,10 @@ class TrainingProgramAnnouncementsHandler(BaseHandler): @require_permission(BaseHandler.AUTHENTICATED) def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) - managing_contest = training_program.managing_contest - self.contest = managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest + self.contest = training_program.managing_contest + self.render_params_for_training_program(training_program) self.r_params["all_student_tags"] = get_all_student_tags(training_program) - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("announcements.html", **self.r_params) @@ -925,9 +882,7 @@ def get(self, training_program_id: str): managing_contest = training_program.managing_contest self.contest = managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest + self.render_params_for_training_program(training_program) self.r_params["questions"] = self.sql_session.query(Question)\ .join(Participation)\ @@ -935,24 +890,14 @@ def get(self, training_program_id: str): .order_by(Question.question_timestamp.desc())\ .order_by(Question.id).all() - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() - - # Get training days with unanswered questions + # Build training days with unanswered questions from notification data training_days_with_unanswered: list[dict] = [] + td_notifications = self.r_params.get("training_day_notifications", {}) for td in training_program.training_days: if td.contest is None: continue - unanswered_count = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == td.contest_id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + td_notif = td_notifications.get(td.id, {}) + unanswered_count = td_notif.get("unanswered_questions", 0) if unanswered_count > 0: training_days_with_unanswered.append({ "contest_id": td.contest_id, diff --git a/cms/server/admin/static/aws_style.css b/cms/server/admin/static/aws_style.css index 7386135d6e..e646e5257f 100644 --- a/cms/server/admin/static/aws_style.css +++ b/cms/server/admin/static/aws_style.css @@ -397,6 +397,13 @@ ul.normal_list { .sidebar-contest, .sidebar-item { padding: 0; margin: 2px 0; + display: flex; + align-items: center; + padding-left: 10px; +} + +.sidebar-contest .unread { + flex-shrink: 0; } .sidebar-contest a, .sidebar-item a { @@ -407,6 +414,8 @@ ul.normal_list { padding: 6px 10px; border-radius: 6px; transition: background-color 0.2s, color 0.2s; + flex: 1; + min-width: 0; } body.admin .sidebar-contest a, body.admin .sidebar-item a { diff --git a/cms/server/admin/templates/base.html b/cms/server/admin/templates/base.html index 88ad9617c0..221541b5fb 100644 --- a/cms/server/admin/templates/base.html +++ b/cms/server/admin/templates/base.html @@ -481,13 +481,7 @@

  • Submissions
  • Students
  • Tasks
    • -
  • - - Attendance -
    • +
  • Attendance
  • Combined Ranking
  • Announcements
  • From 13811579f80b23a50df3fd25e7b0165eb8dc305f Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Sat, 24 Jan 2026 17:29:48 +0000 Subject: [PATCH 3/4] Add training day notifications to overview and resourceslist pages When the contest is a managing contest for a training program, use render_params_for_training_program() to show training day notifications in the sidebar on the overview and resourceslist pages. Co-Authored-By: Ron Ryvchin --- cms/server/admin/handlers/contest.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cms/server/admin/handlers/contest.py b/cms/server/admin/handlers/contest.py index 86153910b8..500f5b273c 100644 --- a/cms/server/admin/handlers/contest.py +++ b/cms/server/admin/handlers/contest.py @@ -288,7 +288,12 @@ def get(self, contest_id: str | None = None): if contest_id is not None: self.contest = self.safe_get_item(Contest, contest_id) - self.r_params = self.render_params() + # If this contest is a managing contest for a training program, + # use render_params_for_training_program to show training day notifications + if self.contest is not None and self.contest.training_program is not None: + self.render_params_for_training_program(self.contest.training_program) + else: + self.r_params = self.render_params() self.render("overview.html", **self.r_params) @@ -298,7 +303,12 @@ def get(self, contest_id: str | None = None): if contest_id is not None: self.contest = self.safe_get_item(Contest, contest_id) - self.r_params = self.render_params() + # If this contest is a managing contest for a training program, + # use render_params_for_training_program to show training day notifications + if self.contest is not None and self.contest.training_program is not None: + self.render_params_for_training_program(self.contest.training_program) + else: + self.r_params = self.render_params() self.r_params["resource_addresses"] = {} services = get_service_shards("ResourceService") for i in range(services): From 12fd2235ea9878420682bb50540c693140975a2e Mon Sep 17 00:00:00 2001 From: Ron Ryvchin Date: Sat, 24 Jan 2026 22:14:47 +0200 Subject: [PATCH 4/4] Notifications on right + new util useage --- cms/server/admin/handlers/archive.py | 9 +- cms/server/admin/handlers/student.py | 9 +- cms/server/admin/handlers/trainingday.py | 27 +----- cms/server/admin/handlers/trainingprogram.py | 12 +-- cms/server/admin/static/aws_style.css | 86 +++++++++++++++++++ cms/server/admin/templates/base.html | 87 ++++++++++++-------- 6 files changed, 154 insertions(+), 76 deletions(-) diff --git a/cms/server/admin/handlers/archive.py b/cms/server/admin/handlers/archive.py index cdd278a6df..9e844b77a2 100644 --- a/cms/server/admin/handlers/archive.py +++ b/cms/server/admin/handlers/archive.py @@ -114,18 +114,11 @@ def get(self, training_program_id: str, training_day_id: str): 'status_label': status_label, }) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["training_day"] = training_day self.r_params["contest"] = contest self.r_params["shared_ips"] = shared_ips self.r_params["users_not_finished"] = users_not_finished - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == training_program.managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() self.render("archive_training_day.html", **self.r_params) @require_permission(BaseHandler.PERMISSION_ALL) diff --git a/cms/server/admin/handlers/student.py b/cms/server/admin/handlers/student.py index 32168d556c..24a331d1a2 100644 --- a/cms/server/admin/handlers/student.py +++ b/cms/server/admin/handlers/student.py @@ -183,6 +183,11 @@ def get(self, training_program_id: str, user_id: str): .filter(Submission.participation == participation) self.render_params_for_remove_confirmation(submission_query) + # Use the helper to set up training program params + self.render_params_for_training_program(training_program) + self.r_params["unanswered"] = 0 # Override for deletion confirmation page + self.r_params["user"] = user + # Count submissions and participations from training days training_day_contest_ids = [td.contest_id for td in training_program.training_days] training_day_contest_ids = [ @@ -207,10 +212,6 @@ def get(self, training_program_id: str, user_id: str): training_day_participations = 0 training_day_submissions = 0 - self.r_params["user"] = user - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = 0 self.r_params["training_day_submissions"] = training_day_submissions self.r_params["training_day_participations"] = training_day_participations self.render("training_program_student_remove.html", **self.r_params) diff --git a/cms/server/admin/handlers/trainingday.py b/cms/server/admin/handlers/trainingday.py index cd64b8a630..1bfe48c62b 100644 --- a/cms/server/admin/handlers/trainingday.py +++ b/cms/server/admin/handlers/trainingday.py @@ -163,17 +163,8 @@ class TrainingProgramTrainingDaysHandler(BaseHandler): @require_permission(BaseHandler.AUTHENTICATED) def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) - managing_contest = training_program.managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + self.render_params_for_training_program(training_program) self.r_params["all_training_day_types"] = get_all_training_day_types( training_program) @@ -251,15 +242,7 @@ def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) managing_contest = training_program.managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = self.sql_session.query(Question)\ - .join(Participation)\ - .filter(Participation.contest_id == managing_contest.id)\ - .filter(Question.reply_timestamp.is_(None))\ - .filter(Question.ignored.is_(False))\ - .count() + self.render_params_for_training_program(training_program) # Get all student tags for the tagify select dropdown tags_query = self.sql_session.query( @@ -446,11 +429,9 @@ def get(self, training_program_id: str, training_day_id: str): if training_day.training_program_id != training_program.id: raise tornado.web.HTTPError(404) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program + self.render_params_for_training_program(training_program) self.r_params["training_day"] = training_day - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = 0 + self.r_params["unanswered"] = 0 # Override for deletion confirmation page # Stats for warning message self.r_params["task_count"] = len(training_day.tasks) diff --git a/cms/server/admin/handlers/trainingprogram.py b/cms/server/admin/handlers/trainingprogram.py index 4feeedc15e..10291a8faa 100644 --- a/cms/server/admin/handlers/trainingprogram.py +++ b/cms/server/admin/handlers/trainingprogram.py @@ -280,10 +280,8 @@ def get(self, training_program_id: str): training_program = self.safe_get_item(TrainingProgram, training_program_id) managing_contest = training_program.managing_contest - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest - self.r_params["unanswered"] = 0 + self.render_params_for_training_program(training_program) + self.r_params["unanswered"] = 0 # Override for deletion confirmation page # Count related data that will be deleted self.r_params["participation_count"] = ( @@ -565,11 +563,9 @@ def get(self, training_program_id: str, task_id: str): managing_contest = training_program.managing_contest task = self.safe_get_item(Task, task_id) - self.r_params = self.render_params() - self.r_params["training_program"] = training_program - self.r_params["contest"] = managing_contest + self.render_params_for_training_program(training_program) self.r_params["task"] = task - self.r_params["unanswered"] = 0 + self.r_params["unanswered"] = 0 # Override for deletion confirmation page self.render("training_program_task_remove.html", **self.r_params) diff --git a/cms/server/admin/static/aws_style.css b/cms/server/admin/static/aws_style.css index e646e5257f..5591e06eb8 100644 --- a/cms/server/admin/static/aws_style.css +++ b/cms/server/admin/static/aws_style.css @@ -1928,3 +1928,89 @@ table.diff-open th.diff-only, table.diff-open td.diff-only { .ranking-table thead th.global-total-header { z-index: 25; } + +.sidebar-badge { + display: inline-flex; + align-items: center; + justify-content: center; + min-width: 18px; /* consistent width for single digits */ + height: 18px; + padding: 0 6px; + border-radius: 10px; /* Pill shape */ + font-size: 0.7em; + font-weight: 700; + line-height: 1; + color: #ffffff; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.15); + white-space: nowrap; + transition: transform 0.2s; +} + +/* 2. Color Variants */ +/* Urgent / Errors (Questions) */ +.sidebar-badge.is-red { + background-color: #EF4444; /* Modern Tailwind Red-500 */ + border: 1px solid #DC2626; +} + +/* Warnings / Pending (Delay Requests) */ +.sidebar-badge.is-amber { + background-color: #F59E0B; /* Modern Tailwind Amber-500 */ + border: 1px solid #D97706; +} + +/* 3. Layout Containers */ + +/* Container to group text on the left (caret + link) */ +.sidebar-link-group { + display: flex; + align-items: center; + flex: 1; /* Takes up remaining space */ + min-width: 0; /* Allows text truncation */ + gap: 10px; +} + +/* Container to group badges on the right */ +.sidebar-badge-container { + display: flex; + align-items: center; + gap: 6px; /* Space between multiple badges */ + margin-left: 8px; /* Space between text and badges */ + flex-shrink: 0; /* Prevent squishing */ +} + +/* 4. Sidebar Element overrides for Flexbox alignment */ + +/* Menu Entries (Overview, Questions, etc.) */ +.menu_entry { + display: flex; + align-items: center; + justify-content: space-between; /* Text left, badge right */ + padding-right: 10px; /* Right padding for the badge */ +} + +.menu_link { + flex-grow: 1; + display: block; +} + +/* Section Titles (Training Days, Contests) */ +.sidebar-section-title { + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 10px; +} + +/* Sub-items (Active Training Days inside folder) */ +.sidebar-contest, .sidebar-item { + display: flex; + align-items: center; + justify-content: space-between; + padding-right: 10px; +} + +/* Override existing link widths to work with flex */ +.sidebar-contest a, .sidebar-item a { + flex: 1; +} diff --git a/cms/server/admin/templates/base.html b/cms/server/admin/templates/base.html index 221541b5fb..4eb9ffce5f 100644 --- a/cms/server/admin/templates/base.html +++ b/cms/server/admin/templates/base.html @@ -300,8 +300,10 @@

    Administration

    {% if contest is none and training_program is not defined %}

    - - Training Programs +
    + + Training Programs +

    {% if training_program_list|length > 0 %} @@ -335,8 +337,10 @@

    - - Contests +
    + + Contests +

    {% if folder_list|length > 0 or root_contests|length > 0 %} @@ -397,8 +401,10 @@

    - - Tasks +
    + + Tasks +

    {% if task_list|length > 0 %} @@ -427,8 +433,10 @@

    - - Users +
    + + Users +

    {% if user_list|length > 0 %} @@ -452,8 +460,10 @@

    - - Teams +
    + + Teams +

    {% if team_list|length > 0 %} @@ -485,24 +495,29 @@

  • Combined Ranking
  • Announcements
  • - Questions +
    + +

    • - - - {{ total_td_unanswered_questions|default(0) }} - - - {{ total_td_pending_delay_requests|default(0) }} - - Training Days +
    + + Training Days +
    +
    + + {{ total_td_unanswered_questions|default(0) }} + + + {{ total_td_pending_delay_requests|default(0) }} + +

    {% set active_training_days = training_program.training_days | selectattr("contest") | list %} @@ -510,12 +525,14 @@

      {% for td in active_training_days %}
    • + {{ td.contest.name }} {% set td_notifs = training_day_notifications.get(td.id, {}) if training_day_notifications is defined else {} %} {% set td_unanswered = td_notifs.get("unanswered_questions", 0) %} {% set td_delays = td_notifs.get("pending_delay_requests", 0) %} - {{ td_unanswered }} - {{ td_delays }} - {{ td.contest.name }} +
      + {{ td_unanswered }} + {{ td_delays }} +
      • {% endfor %}
    @@ -543,18 +560,22 @@

  • Tasks
  • Announcements
  • - Questions +
    + +
  • - Attendance +
    + +