Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: record_detail: simplify subtask display logic

Browse Source
This commit is contained in:
undefined committed 2022-06-15 11:14:03 +08:00
1 parent a31b890c25
commit a665db80c7
2 files changed
+8 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/ui-default", "name": "@hydrooj/ui-default",
"version": "4.37.20", "version": "4.37.21",
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "hydro.js", "main": "hydro.js",
packages/ui-default/templates/record_detail_status.html
+7 -13
View File
@@ -36,26 +36,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{%- for subtaskId,rcdocs in rdoc.testCases|sort(false,false,'id')|groupby('subtaskId') -%} {% set _key = 'id' if rdoc.testCases|groupby('subtaskId')|length == 1 else 'subtaskId' %}
{% if rcdocs.length != 1 and rcdocs.length != rdoc.testCases.length %} {%- for subtaskId, rcdocs in rdoc.testCases|sort(false,false,_key)|groupby(_key) -%}
{% if rcdocs.length > 1 %}
<tr class="subtask"> <tr class="subtask">
<td class="col--case"> <td class="col--case">
#{{ subtaskId|int|default(0) }} #{{ subtaskId|int|default(1) }}
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{%- for rcdoc in rcdocs -%} {%- for rcdoc in rcdocs|sort(false,false,'id') -%}
{% if rcdocs.length != 1 %} <tr class="{{ 'subtask-case' if rcdocs.length == 1 else 'case' }}">
<tr class="case">
<td class="col--case record-status--border {{ model.builtin.STATUS_CODES[rcdoc['status']] }}"> <td class="col--case record-status--border {{ model.builtin.STATUS_CODES[rcdoc['status']] }}">
#{% if rcdocs.length != rdoc.testCases.length %}{{ rcdoc.subtaskId|int|default(0) }}-{% endif %}{{ rcdoc.id|default(loop.index) }} #{{ subtaskId|int|default(1) }}{% if rcdocs.length > 1 %}-{{ rcdoc.id|default(loop.index) }}{% endif %}
</td> </td>
{% else %}
<tr class="subtask-case">
<td class="col--case record-status--border {{ model.builtin.STATUS_CODES[rcdoc['status']] }}">
#{{ rcdoc.subtaskId|int|default(0) }}
</td>
{% endif %}
<td class="col--status"> <td class="col--status">
<span class="icon record-status--icon {{ model.builtin.STATUS_CODES[rcdoc['status']] }}"></span> <span class="icon record-status--icon {{ model.builtin.STATUS_CODES[rcdoc['status']] }}"></span>
<span class="record-status--text {{ model.builtin.STATUS_CODES[rcdoc['status']] }}"> <span class="record-status--text {{ model.builtin.STATUS_CODES[rcdoc['status']] }}">