Merge branch '9-prof-calendars-with-oauth2-login-2' into 'development'

feat: Add professor dashboard for module selection, filtering, and calendar creation.

See merge request htwk-software/htwkalender!133
This commit is contained in:
Elmar Kresse
2025-11-23 00:01:18 +01:00

View File

@@ -15,11 +15,10 @@ const { t } = useI18n({ useScope: "global" });
const router = useRouter(); const router = useRouter();
import { fetchProfessorModules, type ApiModule } from "../../api/fetchProfessorModules"; import { fetchProfessorModules, type ApiModule } from "../../api/fetchProfessorModules";
type ModuleWithScore = Module & { confidenceScore: number };
const modules = ref<Module[]>(new Array(10)); const modules = ref<Module[]>(new Array(10));
const selectedModules = ref<Module[]>([]); const selectedModules = ref<Module[]>([]);
const loading = ref(true); const loading = ref(true);
const confidenceScores = ref<Map<string, number>>(new Map());
const filters = ref({ const filters = ref({
name: { name: {
@@ -44,35 +43,35 @@ onMounted(async () => {
const result = await fetchProfessorModules(); const result = await fetchProfessorModules();
// Convert API response to Module instances with all required fields // Convert API response to Module instances with all required fields
const moduleObjects = result.map((apiModule: ApiModule) => new Module( const moduleObjects = result.map((apiModule: ApiModule) => {
apiModule.uuid, const module = new Module(
apiModule.name, apiModule.uuid,
apiModule.course, apiModule.name,
apiModule.eventType || "", apiModule.course,
apiModule.name, // userDefinedName defaults to module name apiModule.eventType || "",
apiModule.prof, apiModule.name, // userDefinedName defaults to module name
apiModule.semester, apiModule.prof,
false, // reminder defaults to false apiModule.semester,
[] // events defaults to empty array false, // reminder defaults to false
)); [] // events defaults to empty array
);
// Store confidence score separately
confidenceScores.value.set(module.uuid, apiModule.confidenceScore || 0);
return module;
});
// Sort modules by confidence score (highest first) // Sort modules by confidence score (highest first)
// Note: confidenceScore is not part of Module class, so we need to preserve it const sortedModules = moduleObjects.sort((a: Module, b: Module) => {
const sortedModules = moduleObjects.map((module: Module, index: number) => { const scoreA = confidenceScores.value.get(a.uuid) || 0;
const originalData = result[index]; const scoreB = confidenceScores.value.get(b.uuid) || 0;
return { return scoreB - scoreA; // Descending order
...module,
confidenceScore: originalData.confidenceScore || 0
};
}).sort((a: ModuleWithScore, b: ModuleWithScore) => {
return (b.confidenceScore || 0) - (a.confidenceScore || 0); // Descending order
}); });
// Clear temporary entries and set actual modules // Clear temporary entries and set actual modules
modules.value = sortedModules; modules.value = sortedModules;
// Pre-select modules with confidence score >= 0.7 (good match or better) // Pre-select modules with confidence score >= 0.7 (good match or better)
selectedModules.value = sortedModules.filter((m: ModuleWithScore) => (m.confidenceScore || 0) >= 0.7); selectedModules.value = sortedModules.filter((m: Module) => (confidenceScores.value.get(m.uuid) || 0) >= 0.7);
console.log("Modules loaded:", modules.value.length, "Pre-selected:", selectedModules.value.length); console.log("Modules loaded:", modules.value.length, "Pre-selected:", selectedModules.value.length);
} catch (error: unknown) { } catch (error: unknown) {
@@ -186,23 +185,23 @@ const createCalendar = () => {
<Skeleton></Skeleton> <Skeleton></Skeleton>
</template> </template>
</Column> </Column>
<Column field="confidenceScore" :header="t('professor.match')" sortable> <Column :header="t('professor.match')">
<template #body="slotProps"> <template #body="slotProps">
<div v-if="loading"> <div v-if="loading">
<Skeleton></Skeleton> <Skeleton></Skeleton>
</div> </div>
<div v-else> <div v-else>
<span v-if="slotProps.data.confidenceScore >= 0.9" style="color: green; font-weight: bold;"> <span v-if="(confidenceScores.get(slotProps.data.uuid) || 0) >= 0.9" style="color: green; font-weight: bold;">
{{ Math.round(slotProps.data.confidenceScore * 100) }}% {{ Math.round((confidenceScores.get(slotProps.data.uuid) || 0) * 100) }}%
</span> </span>
<span v-else-if="slotProps.data.confidenceScore >= 0.7" style="color: #4CAF50;"> <span v-else-if="(confidenceScores.get(slotProps.data.uuid) || 0) >= 0.7" style="color: #4CAF50;">
{{ Math.round(slotProps.data.confidenceScore * 100) }}% {{ Math.round((confidenceScores.get(slotProps.data.uuid) || 0) * 100) }}%
</span> </span>
<span v-else-if="slotProps.data.confidenceScore >= 0.5" style="color: orange;"> <span v-else-if="(confidenceScores.get(slotProps.data.uuid) || 0) >= 0.5" style="color: orange;">
{{ Math.round(slotProps.data.confidenceScore * 100) }}% {{ Math.round((confidenceScores.get(slotProps.data.uuid) || 0) * 100) }}%
</span> </span>
<span v-else style="color: #999;"> <span v-else style="color: #999;">
{{ Math.round(slotProps.data.confidenceScore * 100) }}% {{ Math.round((confidenceScores.get(slotProps.data.uuid) || 0) * 100) }}%
</span> </span>
</div> </div>
</template> </template>