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

core&ui: add contest/homework group filter (#589)

Browse Source
This commit is contained in:
panda authored and GitHub committed 2023-06-09 16:01:26 +08:00
1 parent 93bf79e6ad
commit 6f6bdee077
5 files changed
+47 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/src/handler/contest.ts
+10 -5
View File
@@ -73,32 +73,37 @@ ScheduleModel.Worker.addHandler('contest', async (doc) => {
export class ContestListHandler extends Handler {
@param('rule', Types.Range(contest.RULES), true)
@param('group', Types.Name, true)
@param('page', Types.PositiveInt, true)
async get(domainId: string, rule = '', page = 1) {
async get(domainId: string, rule = '', group = '', page = 1) {
if (rule && contest.RULES[rule].hidden) throw new BadRequestError();
const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name);
if (group && !groups.includes(group)) throw new NotAssignedError(group);
const rules = Object.keys(contest.RULES).filter((i) => !contest.RULES[i].hidden);
const q = {
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST)
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST) && !group
? {}
: {
$or: [
{ maintainer: this.user._id },
{ owner: this.user._id },
{ assign: { $in: this.user.group } },
{ assign: { $in: groups } },
{ assign: { $size: 0 } },
],
},
...rule ? { rule } : { rule: { $in: rules } },
...group ? { assign: { $in: [group] } } : {},
};
const cursor = contest.getMulti(domainId, q);
const qs = rule ? `rule=${rule}` : '';
let qs = rule ? `rule=${rule}` : '';
if (group) qs += qs ? `&group=${group}` : `group=${group}`;
const [tdocs, tpcount] = await paginate<Tdoc>(cursor, page, system.get('pagination.contest'));
const tids = [];
for (const tdoc of tdocs) tids.push(tdoc.docId);
const tsdict = await contest.getListStatus(domainId, this.user._id, tids);
this.response.template = 'contest_main.html';
this.response.body = {
page, tpcount, qs, rule, tdocs, tsdict,
page, tpcount, qs, rule, tdocs, tsdict, groups, group,
};
}
}
packages/hydrooj/src/handler/homework.ts
+9 -4
View File
@@ -21,20 +21,24 @@ const validatePenaltyRules = (input: string) => yaml.load(input);
const convertPenaltyRules = validatePenaltyRules;
class HomeworkMainHandler extends Handler {
@param('group', Types.Name, true)
@param('page', Types.PositiveInt, true)
async get(domainId: string, page = 1) {
async get(domainId: string, group = '', page = 1) {
const groups = (await user.listGroup(domainId, this.user._id)).map((i) => i.name);
if (group && !groups.includes(group)) throw new NotAssignedError(group);
const cursor = contest.getMulti(domainId, {
rule: 'homework',
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_HOMEWORK)
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_HOMEWORK) && !group
? {}
: {
$or: [
{ maintainer: this.user._id },
{ owner: this.user._id },
{ assign: { $in: this.user.group } },
{ assign: { $in: groups } },
{ assign: { $size: 0 } },
],
},
...group ? { assign: { $in: [group] } } : {},
});
const [tdocs, tpcount] = await paginate<Tdoc>(cursor, page, system.get('pagination.contest'));
const calendar = [];
@@ -46,8 +50,9 @@ class HomeworkMainHandler extends Handler {
} else cal.endAt = tdoc.penaltySince;
calendar.push(cal);
}
const qs = group ? `group=${group}` : '';
this.response.body = {
tdocs, calendar, tpcount, page,
tdocs, calendar, tpcount, page, qs, groups, group,
};
this.response.template = 'homework_main.html';
}