mirror of
https://github.com/BetterSEQTA/BetterSEQTA-Plus.git
synced 2026-06-06 11:44:40 +00:00
Revert "fix: add some better detection logic for assements widget #429"
This reverts commit 01cd5d1428.
This commit is contained in:
@@ -28,17 +28,9 @@ async function fetchJSON(url: string, body: any) {
|
|||||||
|
|
||||||
async function loadSubjects() {
|
async function loadSubjects() {
|
||||||
const res = await fetchJSON("/seqta/student/load/subjects?", {});
|
const res = await fetchJSON("/seqta/student/load/subjects?", {});
|
||||||
const activeGroup = res.payload.find((s: any) => s.active === 1);
|
return res.payload
|
||||||
const activeYear = activeGroup?.year;
|
.filter((s: any) => s.active === 1)
|
||||||
const allSubjects = res.payload
|
|
||||||
.filter((s: any) => s.year === activeYear)
|
|
||||||
.flatMap((s: any) => s.subjects);
|
.flatMap((s: any) => s.subjects);
|
||||||
const seen = new Set<string>();
|
|
||||||
return allSubjects.filter((s: Subject) => {
|
|
||||||
if (seen.has(s.code)) return false;
|
|
||||||
seen.add(s.code);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function loadPrefs(student: number) {
|
async function loadPrefs(student: number) {
|
||||||
|
|||||||
@@ -113,16 +113,7 @@ export async function loadHomePage() {
|
|||||||
callHomeTimetable(TodayFormatted, true);
|
callHomeTimetable(TodayFormatted, true);
|
||||||
|
|
||||||
const activeClass = classes.find((c: any) => c.hasOwnProperty("active"));
|
const activeClass = classes.find((c: any) => c.hasOwnProperty("active"));
|
||||||
const activeYear = activeClass?.year;
|
const activeSubjects = activeClass?.subjects || [];
|
||||||
const allSubjectsInYear = classes
|
|
||||||
.filter((c: any) => c.year === activeYear)
|
|
||||||
.flatMap((c: any) => c.subjects || []);
|
|
||||||
const seen = new Set<string>();
|
|
||||||
const activeSubjects = allSubjectsInYear.filter((s: any) => {
|
|
||||||
if (seen.has(s.code)) return false;
|
|
||||||
seen.add(s.code);
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
const activeSubjectCodes = activeSubjects.map((s: any) => s.code);
|
const activeSubjectCodes = activeSubjects.map((s: any) => s.code);
|
||||||
const currentAssessments = assessments
|
const currentAssessments = assessments
|
||||||
.filter((a: any) => activeSubjectCodes.includes(a.code))
|
.filter((a: any) => activeSubjectCodes.includes(a.code))
|
||||||
|
|||||||
Reference in New Issue
Block a user