mirror of
https://github.com/BetterSEQTA/BetterSEQTA-Plus.git
synced 2026-06-06 03:34:40 +00:00
fix: assessments on homepage failed to load
This commit is contained in:
+18
-16
@@ -1960,20 +1960,17 @@ function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
let overdueDates = []
|
let overdueDates = []
|
||||||
let upcomingDates = {}
|
let upcomingDates = {}
|
||||||
|
|
||||||
// date = '2022/3/20'
|
|
||||||
// var Today = new Date(date)
|
|
||||||
|
|
||||||
var Today = new Date()
|
var Today = new Date()
|
||||||
|
|
||||||
// Removes overdue assessments from the upcoming assessments array and pushes to overdue array
|
// Removes overdue assessments from the upcoming assessments array and pushes to overdue array
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
const element = assessments[i]
|
const assessment = assessments[i]
|
||||||
let assessmentdue = new Date(element.due)
|
let assessmentdue = new Date(assessment.due)
|
||||||
|
|
||||||
CheckSpecialDay(Today, assessmentdue)
|
CheckSpecialDay(Today, assessmentdue)
|
||||||
if (assessmentdue < Today) {
|
if (assessmentdue < Today) {
|
||||||
if (!CheckSpecialDay(Today, assessmentdue)) {
|
if (!CheckSpecialDay(Today, assessmentdue)) {
|
||||||
overdueDates.push(element)
|
overdueDates.push(assessment)
|
||||||
assessments.splice(i, 1)
|
assessments.splice(i, 1)
|
||||||
i--
|
i--
|
||||||
}
|
}
|
||||||
@@ -1984,11 +1981,13 @@ function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
TomorrowDate.setDate(TomorrowDate.getDate() + 1)
|
TomorrowDate.setDate(TomorrowDate.getDate() + 1)
|
||||||
|
|
||||||
GetLessonColours().then((colours) => {
|
GetLessonColours().then((colours) => {
|
||||||
|
|
||||||
let subjects = colours
|
let subjects = colours
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
let subjectname = `timetable.subject.colour.${assessments[i].code}`
|
let subjectname = `timetable.subject.colour.${assessments[i].code}`
|
||||||
|
|
||||||
let subject = subjects.find((element: any) => element.name === subjectname)
|
let subject = subjects.find((element: any) => element.name === subjectname)
|
||||||
|
|
||||||
if (!subject) {
|
if (!subject) {
|
||||||
assessments[i].colour = '--item-colour: #8e8e8e;'
|
assessments[i].colour = '--item-colour: #8e8e8e;'
|
||||||
} else {
|
} else {
|
||||||
@@ -1996,6 +1995,7 @@ function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
GetThresholdOfColor(subject.value); // result (originally) result = GetThresholdOfColor
|
GetThresholdOfColor(subject.value); // result (originally) result = GetThresholdOfColor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let i = 0; i < activeSubjects.length; i++) {
|
for (let i = 0; i < activeSubjects.length; i++) {
|
||||||
const element = activeSubjects[i]
|
const element = activeSubjects[i]
|
||||||
let subjectname = `timetable.subject.colour.${element.code}`
|
let subjectname = `timetable.subject.colour.${element.code}`
|
||||||
@@ -2012,6 +2012,7 @@ function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CreateFilters(activeSubjects)
|
CreateFilters(activeSubjects)
|
||||||
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
let type
|
let type
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
@@ -2028,9 +2029,9 @@ function CreateUpcomingSection(assessments: any, activeSubjects: any) {
|
|||||||
// eslint-disable-next-line
|
// eslint-disable-next-line
|
||||||
class_ = "upcoming-date-container",
|
class_ = "upcoming-date-container",
|
||||||
)
|
)
|
||||||
dateObj.assessments = []
|
dateObj.assessments = [];
|
||||||
|
|
||||||
dateObj = upcomingDates[element.due as keyof typeof upcomingDates] as any
|
(upcomingDates[element.due as keyof typeof upcomingDates] as any) = dateObj
|
||||||
}
|
}
|
||||||
let assessmentDateDiv = upcomingDates[element.due as keyof typeof upcomingDates];
|
let assessmentDateDiv = upcomingDates[element.due as keyof typeof upcomingDates];
|
||||||
|
|
||||||
@@ -2576,24 +2577,25 @@ async function loadHomePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
result1.then(open1, onError)
|
result1.then(open1, onError)
|
||||||
let activeClassList: any
|
|
||||||
|
|
||||||
const assessments = await GetUpcomingAssessments()
|
const assessments = await GetUpcomingAssessments()
|
||||||
const classes = await GetActiveClasses()
|
const classes = await GetActiveClasses()
|
||||||
|
|
||||||
|
let activeClass;
|
||||||
|
|
||||||
// Gets all subjects for the student
|
// Gets all subjects for the student
|
||||||
for (let i = 0; i < classes.length; i++) {
|
for (let i = 0; i < classes.length; i++) {
|
||||||
const element = classes[i]
|
const element = classes[i];
|
||||||
// eslint-disable-next-line
|
|
||||||
if (element.hasOwnProperty("active")) { // for some reason eslint gets mad, even though it works?
|
if (element.hasOwnProperty("active")) {
|
||||||
// Finds the active class list with the current subjects
|
// Finds the active class list with the current subjects
|
||||||
activeClassList = classes[i]
|
activeClass = classes[i]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let activeSubjects = []
|
let activeSubjects = []
|
||||||
if (activeClassList?.subjects) {
|
if (activeClass?.subjects) {
|
||||||
activeSubjects = activeClassList.subjects
|
activeSubjects = activeClass.subjects
|
||||||
}
|
}
|
||||||
|
|
||||||
let activeSubjectCodes = []
|
let activeSubjectCodes = []
|
||||||
@@ -2606,7 +2608,7 @@ async function loadHomePage() {
|
|||||||
let CurrentAssessments = []
|
let CurrentAssessments = []
|
||||||
for (let i = 0; i < assessments.length; i++) {
|
for (let i = 0; i < assessments.length; i++) {
|
||||||
if (activeSubjectCodes.includes(assessments[i].code)) {
|
if (activeSubjectCodes.includes(assessments[i].code)) {
|
||||||
CurrentAssessments.push(element)
|
CurrentAssessments.push(assessments[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ import { SettingsState } from '../../types/storage';
|
|||||||
export async function appendBackgroundToUI() {
|
export async function appendBackgroundToUI() {
|
||||||
const settings = await browser.storage.local.get() as SettingsState;
|
const settings = await browser.storage.local.get() as SettingsState;
|
||||||
|
|
||||||
console.log(settings.theme);
|
|
||||||
|
|
||||||
if (settings.theme == '') return;
|
if (settings.theme == '') return;
|
||||||
|
|
||||||
const parent = document.getElementById('container');
|
const parent = document.getElementById('container');
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ export default class StorageListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleStorageChanges(changes: any) {
|
handleStorageChanges(changes: any) {
|
||||||
console.log('Storage changed:', changes);
|
|
||||||
Object.keys(changes).forEach((changeKey) => {
|
Object.keys(changes).forEach((changeKey) => {
|
||||||
switch (changeKey) {
|
switch (changeKey) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user