Merge branch 'main' of github.com:Yat3s/Kathy into main

sophonify · Sep 8, 2023 · 6b5372b · 6b5372b
2 parents 6c0c030 + 299b7f1
commit 6b5372b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/packages/hydrooj/src/settings.ts b/packages/hydrooj/src/settings.ts
@@ -5,7 +5,7 @@ import { Logger } from './logger';
 import { NestKeys } from './typeutils';
 
 const defaultPath = process.env.CI ? '/tmp/file'
-    : process.env.DEFAULT_STORE_PATH || '/Users/levylv/data/file/hydro';
+    : process.env.DEFAULT_STORE_PATH || '/Users/zhangke/data/file/hydro';
 const FileSetting = Schema.intersect([
     Schema.object({
         type: Schema.union([

diff --git a/packages/ui-default/locales/zh.yaml b/packages/ui-default/locales/zh.yaml
@@ -577,6 +577,7 @@ Not Enrolled: 未参加
 Not started with a number: 不以数字开头
 Not wrapped with space: 两侧不含空格
 Numeric PID: 数字题号
+Alphabetic PID: 题目编号
 objective: 客观题
 Oh, the user doesn't have any contributions!: 啊哦，这个用户还没贡献过题目~
 Oh, the user hasn't created any discussions yet!: 这个用户还没有发布过讨论

diff --git a/packages/ui-default/templates/homework_detail.html b/packages/ui-default/templates/homework_detail.html
@@ -20,17 +20,17 @@ <h1 class="section__title font-bold">{{ _('Problem') }}</h1>
       <div class="section__body no-padding">
         <table class="data-table">
           <colgroup>
+            <col class="">
+            <col class="col--problem">
           {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
-            <col class="col--status">
-            <col class="col--submit-at">
+            <col class="col--status col--problem">
+            <col class="col--submit-at col--problem">
           {% endif %}
-            <col class="col--problem">
-            <col class="col--problem">
           </colgroup>
 
           <thead>
             <tr>
-              <th class="col--status record-status--border text-black font-bold">{{ _('Status') }}</th>
+              <th class="text-black font-bold">{{ _('Alphabetic PID') }}</th>
               <th class="col--problem text-black font-bold">{{ _('Problem') }}</th>
             {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
               <th class="col--status record-status--border text-black font-bold">{{ _('Status') }}</th>
@@ -43,8 +43,8 @@ <h1 class="section__title font-bold">{{ _('Problem') }}</h1>
           {% set ntdoc = model.contest.isDone(tdoc) or (tsdoc.attend and not model.contest.isNotStarted(tdoc)) %}
           {%- for pid in tdoc.pids -%}
             <tr>
-              <td class="col--problem col--problem-name">{{ String.fromCharCode(65+loop.index0) }}</td>
-              <td class="col--problem col--problem-name">
+              <td class="">{{ String.fromCharCode(65+loop.index0) }}</td>
+               <td class="col--problem col--problem-name">
                 {% if isAdmin and not ntdoc %}
                   {{ problem.render_problem_title(pdict[pid], show_invisible_flag=false, show_tags=false) }}
                 {% else %}

diff --git a/packages/ui-default/templates/homework_main.html b/packages/ui-default/templates/homework_main.html
@@ -38,20 +38,20 @@
           </div>
           </div>
 
-      <div class="section__body no-padding">
+      {# <div class="section__body no-padding">
           <form class="flex items-center justify-start medium-6" method="get" id="searchForm" action="{{ url('homework_main') }}">
             <div class="search items-center flex-1 mr-2">
               <input class="search-input" name="q" type="text" value="{{ qs }}" placeholder="比赛名...">
               <button type="submit">
                 <span class="icon icon-search search-icon"></span>
-                {# <img src="{{ UiContext.cdn_prefix }}img/icon_search.svg" width="20" height="20"> #}
+                <img src="{{ UiContext.cdn_prefix }}img/icon_search.svg" width="20" height="20">
               </button>
             </div>
             <button type="submit" class="button rounded-lg border-none show_all_homework">
               显示所有作业比赛
               </button>
           </form>
-        </div> 
+        </div>  #}
 
       <div class="section__body no-padding mt-5">
       {% if not tdocs.length %}

diff --git a/packages/ui-default/templates/partials/scoreboard.html b/packages/ui-default/templates/partials/scoreboard.html
@@ -28,7 +28,7 @@
       <thead>
         <tr>
         {%- for column in rows[0] -%}
-          <th class="col--{{ column.type }}">
+          <th class="col--{{ column.type }} text-black font-bold">
           {%- if column.type == 'problem' and column.raw -%}
             <a href="{{ url('problem_detail', pid=column.raw, query={tid:tdoc.docId}) }}" data-tooltip="{{ pdict[column.raw].title }}">
               {{ column.value }}<br />{{ pdict[column.raw].nAccept|default(0) }}/{{ pdict[column.raw].nSubmit|default(0) }}

diff --git a/packages/ui-default/templates/wiki_help.html b/packages/ui-default/templates/wiki_help.html
@@ -101,6 +101,19 @@ <h1 class="section__title" id="training" data-heading>{{ _('Training') }}</h1>
     <p>我们精心挑选了一些题目组成了训练计划。单击导航栏的“训练”即可进入！</p>
   </div>
 </div>
+<div class="section" data-heading-extract-to="#menu-item-wiki_help">
+  <div class="section__header">
+    <h1 class="section__title" id="homework" data-heading>{{ _('Homework') }}</h1>
+  </div>
+  <div class="section__body typo">
+      <ul>
+      <li>0. 在开始处理作业之前，您需要认领该作业。只有认领了作业，才能查看作业的具体内容和要求。</li>
+      <li>1. 作业通常有一个截止时间，您需要在规定的截止时间内完成和递交作业。如果作业已超过截止时间，但仍在延期时间内，您可以递交作业，但将无法获得全部分数。请注意，延期时间是有限的，所以尽量按时完成作业以获得最高分数。</li>
+      <li>2. 作业通常有一个开放时间，只有在作业开放时间内，您才能查看作业的具体内容和要求。如果作业还未到开放时间，您无法查看作业题目。</li>
+      <li>3. 在完成作业后，您可以递交作业。递交作业后，系统将对您的作业进行评估。不同类型的作业可能有不同的递交和评分规则，请确保仔细阅读作业说明。</li>
+      </ul>
+  </div>
+</div>
 <div class="section" data-heading-extract-to="#menu-item-wiki_help">
   <div class="section__header">
     <h1 class="section__title" id="contest" data-heading>{{ _('Contest') }}</h1>