Merge pull request #312 from blackav/310-implement-privileged-problem…

…-status-json 310 implement privileged problem status json
blackav · Mar 16, 2024 · 648021c · 648021c
2 parents 9e34685 + 0128e78
commit 648021c
Show file tree

Hide file tree

Showing 10 changed files with 603 additions and 61 deletions.
diff --git a/csp/contests/unpriv_main_page.csp b/csp/contests/unpriv_main_page.csp
@@ -145,7 +145,7 @@ ns_unparse_answers(
 
  unpriv_load_html_style(phr, cnts, 0, 0);
 
- ns_get_user_problems_summary(cs, phr->user_id, phr->login, accepting_mode, start_time, stop_time, &phr->ip, pinfo);
+ ns_get_user_problems_summary(cs, phr->user_id, phr->login, accepting_mode, start_time, stop_time, 0, &phr->ip, pinfo);
  for (i = 1; i <= cs->max_prob; ++i) {
  summoned_count += pinfo[i].summoned_flag;
  }

diff --git a/csp/contests/unpriv_main_run_submit.csp b/csp/contests/unpriv_main_run_submit.csp
@@ -1,15 +1,15 @@
 <%
  if (prob_id > cs->max_prob) prob_id = 0;
  if (prob_id > 0 && !(prob = cs->probs[prob_id])) prob_id = 0;
- if (prob_id > 0 && !serve_is_problem_started(cs, phr->user_id, prob))
+ if (prob_id > 0 && !serve_is_problem_started(cs, phr->user_id, prob, 0))
  prob_id = 0;
  if (prob_id > 0 && prob) {
- serve_is_problem_deadlined(cs, phr->user_id, phr->login, prob, &pinfo[prob_id].deadline);
+ serve_is_problem_deadlined(cs, phr->user_id, phr->login, prob, &pinfo[prob_id].deadline, 0);
  }
 /*
  if (prob_id > 0 && serve_is_problem_deadlined(cs, phr->user_id, phr->login,
  prob,
- &pinfo[prob_id].deadline))
+ &pinfo[prob_id].deadline, 0))
  prob_id = 0;
 */
  //if (prob_id > 0 && prob->disable_user_submit > 0) prob_id = 0;
@@ -437,7 +437,7 @@
  next_prob_id++;
  for (; next_prob_id <= cs->max_prob; next_prob_id++) {
  if (!(prob2 = cs->probs[next_prob_id])) continue;
- if (!serve_is_problem_started(cs, phr->user_id, prob2))
+ if (!serve_is_problem_started(cs, phr->user_id, prob2, 0))
  continue;
  break;
  }

diff --git a/csp/contests/unpriv_main_statements.csp b/csp/contests/unpriv_main_statements.csp
@@ -14,9 +14,9 @@
  variant = 0;
  if (prob_id <= 0 || prob_id > cs->max_prob) continue;
  if (!(prob = cs->probs[prob_id])) continue;
- if (!serve_is_problem_started(cs, phr->user_id, prob)) continue;
+ if (!serve_is_problem_started(cs, phr->user_id, prob, 0)) continue;
  if (serve_is_problem_deadlined(cs, phr->user_id, phr->login,
- prob, &pinfo[prob_id].deadline))
+ prob, &pinfo[prob_id].deadline, 0))
  continue;
  if (prob->variant_num > 0
  && (variant = find_variant(cs, phr->user_id, prob_id, 0)) <= 0)

diff --git a/csp/contests/unpriv_main_summary.csp b/csp/contests/unpriv_main_summary.csp
@@ -104,7 +104,7 @@
 <%
  for (prob_id = 1; prob_id <= cs->max_prob; prob_id++) {
  if (!(prob = cs->probs[prob_id])) continue;
- if (!serve_is_problem_started(cs, phr->user_id, prob)) continue;
+ if (!serve_is_problem_started(cs, phr->user_id, prob, 0)) continue;
  if (prob->hidden > 0) continue;
 
  const unsigned char *s = "";

diff --git a/include/ejudge/new-server.h b/include/ejudge/new-server.h
@@ -521,6 +521,7 @@ ns_get_user_problems_summary(
  int accepting_mode,
  time_t start_time,
  time_t stop_time,
+ time_t point_in_time,
  const ej_ip_t *ip,
  struct UserProblemInfo *pinfo); /* user problem info */
 

diff --git a/include/ejudge/serve_state.h b/include/ejudge/serve_state.h
@@ -2,7 +2,7 @@
 #ifndef __SERVE_STATE_H__
 #define __SERVE_STATE_H__
 
-/* Copyright (C) 2006-2023 Alexander Chernov <[email protected]> */
+/* Copyright (C) 2006-2024 Alexander Chernov <[email protected]> */
 
 /*
  * This program is free software; you can redistribute it and/or modify
@@ -899,14 +899,16 @@ int
 serve_is_problem_started(
  const serve_state_t state,
  int user_id,
- const struct section_problem_data *prob);
+ const struct section_problem_data *prob,
+ time_t point_in_time);
 int
 serve_is_problem_deadlined(
  const serve_state_t state,
  int user_id,
  const unsigned char *user_login,
  const struct section_problem_data *prob,
- time_t *p_deadline);
+ time_t *p_deadline,
+ time_t point_in_time);
 int
 serve_is_problem_started_2(
  const serve_state_t state,