|
|
@@ -106,7 +106,7 @@ export const useClassesStore = defineStore("classes", {
|
|
|
|
|
|
if (column == ClassSelectorColumn.Time) {
|
|
|
transformedRules[column].forEach((rule) =>
|
|
|
- foundClasses.push(...filterTimeColumn(classes, rule)),
|
|
|
+ foundClasses.push(...filterTimeColumn(classes, rule))
|
|
|
);
|
|
|
classes = [...new Set(foundClasses)];
|
|
|
return;
|
|
|
@@ -122,7 +122,7 @@ export const useClassesStore = defineStore("classes", {
|
|
|
}
|
|
|
didFilter = true;
|
|
|
foundClasses.push(
|
|
|
- ...classes.filter((c) => c.degree_prg == rule.filterData.degree),
|
|
|
+ ...classes.filter((c) => c.degree_prg == rule.filterData.degree)
|
|
|
);
|
|
|
});
|
|
|
|
|
|
@@ -142,8 +142,8 @@ export const useClassesStore = defineStore("classes", {
|
|
|
(c) =>
|
|
|
c.name.toLowerCase().includes(term) ||
|
|
|
(checkName &&
|
|
|
- c.module?.name.toLocaleLowerCase().includes(term)),
|
|
|
- ),
|
|
|
+ c.module?.name.toLocaleLowerCase().includes(term))
|
|
|
+ )
|
|
|
);
|
|
|
});
|
|
|
break;
|
|
|
@@ -167,7 +167,7 @@ export const useClassesStore = defineStore("classes", {
|
|
|
if (term.length == 0) return;
|
|
|
didFilter = true;
|
|
|
foundClasses.push(
|
|
|
- ...classes.filter((c) => c.class.toLowerCase().includes(term)),
|
|
|
+ ...classes.filter((c) => c.class.toLowerCase().includes(term))
|
|
|
);
|
|
|
});
|
|
|
break;
|
|
|
@@ -179,8 +179,8 @@ export const useClassesStore = defineStore("classes", {
|
|
|
didFilter = true;
|
|
|
foundClasses.push(
|
|
|
...classes.filter((c) =>
|
|
|
- c.teachers.join().toLowerCase().includes(term),
|
|
|
- ),
|
|
|
+ c.teachers.join().toLowerCase().includes(term)
|
|
|
+ )
|
|
|
);
|
|
|
});
|
|
|
break;
|
|
|
@@ -192,8 +192,8 @@ export const useClassesStore = defineStore("classes", {
|
|
|
didFilter = true;
|
|
|
foundClasses.push(
|
|
|
...classes.filter(
|
|
|
- (c) => c.teaching_type == rule.filterData.teachingType,
|
|
|
- ),
|
|
|
+ (c) => c.teaching_type == rule.filterData.teachingType
|
|
|
+ )
|
|
|
);
|
|
|
});
|
|
|
break;
|
|
|
@@ -349,12 +349,15 @@ export const useClassesStore = defineStore("classes", {
|
|
|
this.data[version].degreePrograms = [];
|
|
|
|
|
|
this.allClasses.forEach((m) => {
|
|
|
- if (!this.data[version].degreePrograms.includes(m.degree_prg))
|
|
|
+ if (
|
|
|
+ m.degree_prg.length > 0 &&
|
|
|
+ !this.data[version].degreePrograms.includes(m.degree_prg)
|
|
|
+ )
|
|
|
this.data[version].degreePrograms.push(m.degree_prg);
|
|
|
});
|
|
|
|
|
|
this.data[version].degreePrograms.sort((a, b) =>
|
|
|
- a.toLowerCase().localeCompare(b.toLowerCase()),
|
|
|
+ a.toLowerCase().localeCompare(b.toLowerCase())
|
|
|
);
|
|
|
},
|
|
|
getById(module_id: string): TaughtClass | null {
|
|
|
@@ -464,7 +467,7 @@ export const useClassesStore = defineStore("classes", {
|
|
|
|
|
|
function filterTimeColumn(
|
|
|
modules: TaughtClass[],
|
|
|
- filterset: FilterRule,
|
|
|
+ filterset: FilterRule
|
|
|
): TaughtClass[] {
|
|
|
const timeData = filterset.filterData as Record<string, number>;
|
|
|
const start = timeData.startTime;
|
|
|
@@ -482,7 +485,7 @@ function filterTimeColumn(
|
|
|
modules = modules.filter(
|
|
|
(m) =>
|
|
|
((m.weekday ?? 0) == startingDay && m.from >= startingTime) ||
|
|
|
- (m.weekday ?? 0) > startingDay,
|
|
|
+ (m.weekday ?? 0) > startingDay
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
@@ -495,7 +498,7 @@ function filterTimeColumn(
|
|
|
modules = modules.filter(
|
|
|
(m) =>
|
|
|
(m.weekday ?? 0) == startingDay &&
|
|
|
- (endingTime == 0 || m.to <= endingTime),
|
|
|
+ (endingTime == 0 || m.to <= endingTime)
|
|
|
);
|
|
|
} else {
|
|
|
aEnd *= -1;
|
|
|
@@ -508,7 +511,7 @@ function filterTimeColumn(
|
|
|
(m) =>
|
|
|
(m.weekday ?? 0) < endingDay ||
|
|
|
((m.weekday ?? 0) == endingDay &&
|
|
|
- (endingTime == 0 || m.to <= endingTime)),
|
|
|
+ (endingTime == 0 || m.to <= endingTime))
|
|
|
);
|
|
|
}
|
|
|
}
|