Fo pro ws uml assessment

app/courses/[courseId]/progress/page.tsx

@@ -13,7 +13,6 @@ import {
   IconButton,
   Slide,
   Typography,
-  useTheme,
 } from "@mui/material";
 import { useParams } from "next/navigation";
 import { useEffect, useMemo, useState } from "react";
@@ -127,7 +126,7 @@ export default function LearningProgress() {
 
         const progressItem = progressBySkillValues.get(key)!;
 
-        progressItem.progressSum += skill.skillValue.skillValue;
+        progressItem.progressSum += skill.skillValue?.skillValue ?? 0;
         /*progressItem.averageProgressSum +=
           skill.skillAllUsersStats.skillValueSum;*/
         progressItem.count++;
@@ -262,8 +261,6 @@ export default function LearningProgress() {
     sessionStorage.setItem("previousProgress", JSON.stringify([...tempMap]));
   }, [course.skills, progressBySkill, uniqueCategories.length]);
 
-  const theme = useTheme();
-
   if (uniqueCategories.length === 0) {
     return (
       <Typography variant="body1">
@@ -395,7 +392,9 @@ export default function LearningProgress() {
                     competencyName={category}
                     startProgress={Math.floor(previousCategoryProgressValue)}
                     endProgress={Math.floor(categoryProgressValue)}
-                    averageProgress={/*Math.floor(categoryAverageProgressValue)*/0}
+                    averageProgress={
+                      /*Math.floor(categoryAverageProgressValue)*/ 0
+                    }
                     color={stringToColor(category)}
                     onClick={() => {
                       setSelectedCategory(
@@ -407,7 +406,7 @@ export default function LearningProgress() {
                     isSelected={category === sortedCategories[selectedCategory]}
                     isUrgent={urgent}
                     showAverageProgress={showAverageProgress}
-                    participantCount={/*maxParticipantCountForaSkill*/0}
+                    participantCount={/*maxParticipantCountForaSkill*/ 0}
                     courseMemberCount={course.numberOfCourseMemberships}
                     openTaskCount={
                       filteredSuggestionsByCategory(category).length
@@ -507,7 +506,9 @@ export default function LearningProgress() {
                     small={true}
                     startProgress={Math.floor(previousSkillProgressValue)}
                     endProgress={Math.floor(skillProgressValue)}
-                    averageProgress={/*Math.floor(skillAverageProgressValue)*/0}
+                    averageProgress={
+                      /*Math.floor(skillAverageProgressValue)*/ 0
+                    }
                     color={stringToColor(currentSkill.skillCategory)}
                     onClick={() => {
                       const currentIndex = currentUniqueSkills.findIndex(
@@ -525,7 +526,7 @@ export default function LearningProgress() {
                     }
                     isUrgent={urgent}
                     showAverageProgress={showAverageProgress}
-                    participantCount={/*maxParticipantCount*/0}
+                    participantCount={/*maxParticipantCount*/ 0}
                     courseMemberCount={course.numberOfCourseMemberships}
                     openTaskCount={
                       filteredSuggestionsBySkill(currentSkill.skillName).length

app/courses/[courseId]/uml/[umlId]/lecturer.tsx

@@ -0,0 +1,192 @@
+"use client";
+
+import EditIcon from "@mui/icons-material/Edit";
+import InfoIcon from "@mui/icons-material/Info";
+import PeopleIcon from "@mui/icons-material/People";
+import {
+  Box,
+  Button,
+  CircularProgress,
+  Snackbar,
+  Stack,
+  Tab,
+  Tabs,
+} from "@mui/material";
+import { useParams } from "next/navigation";
+import { useMemo, useState } from "react";
+import { useLazyLoadQuery, useMutation } from "react-relay";
+
+import {
+  umlApiFindUserInfosQuery,
+  umlApiGetLecturerExerciseOverviewQuery,
+  umlApiUpdateTutorSolutionMutation,
+} from "@/components/hylimo/api/UmlApi";
+import { getSemanticModel } from "@/components/hylimo/semanticModelGenerator";
+import { AddUMLAssignmentModal } from "@/components/uml-assignment/AddUMLAssignmentModal";
+import ExerciseInfoTab from "@/components/uml-assignment/ExerciseInfoTab";
+import SubmissionsTab from "@/components/uml-assignment/SubmissionsTab";
+
+export default function LecturerUmlAssignment() {
+  const { umlId } = useParams();
+  const [tabIndex, setTabIndex] = useState(0);
+  const [isEditModalOpen, setIsEditModalOpen] = useState(false);
+  const [refreshKey, setRefreshKey] = useState(0);
+  const [snackbar, setSnackbar] = useState({ open: false, message: "" });
+
+  const data = useLazyLoadQuery<any>(
+    umlApiGetLecturerExerciseOverviewQuery,
+    { assessmentId: umlId },
+    { fetchPolicy: "network-only", fetchKey: refreshKey }
+  );
+
+  const studentIds = useMemo(() => {
+    const ids =
+      data?.getUmlExerciseByAssessmentId?.studentSubmissions?.map(
+        (sub: any) => sub.studentId
+      ) || [];
+
+    // Defensive: filter out empty values and duplicates before querying user infos.
+    return Array.from(
+      new Set(ids.filter((id: any) => typeof id === "string" && id.length > 0))
+    );
+  }, [data?.getUmlExerciseByAssessmentId?.studentSubmissions]);
+
+  // Fetch user infos for all students
+  const userInfosData = useLazyLoadQuery<any>(
+    umlApiFindUserInfosQuery,
+    { ids: studentIds },
+    { fetchPolicy: "network-only" }
+  );
+
+  const userInfos = useMemo(() => {
+    const userMap: Record<string, any> = {};
+    if (userInfosData?.findUserInfos) {
+      userInfosData.findUserInfos.forEach((user: any) => {
+        // Backend may return null entries when referenced users no longer exist.
+        if (user?.id) {
+          userMap[user.id] = user;
+        }
+      });
+    }
+    return userMap;
+  }, [userInfosData?.findUserInfos]);
+
+  const [updateTutorSolution, isUpdating] = useMutation(
+    umlApiUpdateTutorSolutionMutation
+  );
+
+  const exercise = data?.getUmlExerciseByAssessmentId;
+  const content = data?.findContentsByIds?.[0];
+
+  const handleUpdateTutorSolution = async (newCode: string) => {
+    let semanticModelJson: string | null = null;
+    const semanticModelResult = await getSemanticModel(newCode);
+    semanticModelJson = JSON.stringify(semanticModelResult);
+    updateTutorSolution({
+      variables: {
+        assessmentId: umlId,
+        tutorSolution: {
+          diagramCode: newCode,
+          semanticModel: semanticModelJson,
+        },
+      },
+      onCompleted: () =>
+        setSnackbar({
+          open: true,
+          message: "Tutor solution updated successfully!",
+        }),
+      onError: () =>
+        setSnackbar({
+          open: true,
+          message: "Failed to update tutor solution.",
+        }),
+    });
+  };
+
+  if (!exercise || !content)
+    return (
+      <Box p={4} textAlign="center">
+        <CircularProgress />
+      </Box>
+    );
+
+  return (
+    <Box sx={{ width: "100%", position: "relative" }}>
+      {/* Top Action Bar */}
+      <Stack
+        direction="row"
+        justifyContent="space-between"
+        alignItems="center"
+        mb={2}
+      >
+        <Tabs
+          value={tabIndex}
+          onChange={(_, v) => setTabIndex(v)}
+          color="primary"
+        >
+          <Tab icon={<InfoIcon />} iconPosition="start" label="Exercise Info" />
+          <Tab icon={<PeopleIcon />} iconPosition="start" label="Submissions" />
+        </Tabs>
+
+        <Button
+          variant="outlined"
+          startIcon={<EditIcon />}
+          onClick={() => setIsEditModalOpen(true)}
+          sx={{ borderRadius: 2 }}
+        >
+          Edit Exercise
+        </Button>
+      </Stack>
+
+      {/* Tab Content */}
+      <Box mt={2}>
+        {tabIndex === 0 && !isEditModalOpen ? (
+          <ExerciseInfoTab
+            exercise={exercise}
+            onUpdateTutorSolution={handleUpdateTutorSolution}
+            isUpdating={isUpdating}
+          />
+        ) : tabIndex === 1 ? (
+          <SubmissionsTab exercise={exercise} userInfos={userInfos} />
+        ) : null}
+      </Box>
+      {isEditModalOpen && exercise && content && (
+        <AddUMLAssignmentModal
+          key={umlId + "-" + String(isEditModalOpen)}
+          open={isEditModalOpen}
+          onClose={() => setIsEditModalOpen(false)}
+          onUpdated={() => setRefreshKey((prev) => prev + 1)}
+          assessmentId={umlId as string}
+          chapterId={content.metadata?.chapterId}
+          initialData={{
+            description: exercise.description,
+            gradingRules: exercise.gradingRules || "",
+            diagramCode: exercise.tutorSolution?.diagramCode,
+            totalPoints: exercise.totalPoints,
+            requiredPercentage: exercise.requiredPercentage,
+            showSolution: exercise.showSolution ?? true,
+            metadata: {
+              name: content.metadata?.name || "",
+              rewardPoints: content.metadata?.rewardPoints || 0,
+              suggestedDate: content.metadata?.suggestedDate,
+              tagNames: content.metadata?.tagNames || [],
+            },
+            assessmentMetadata: {
+              skillPoints: content.assessmentMetadata?.skillPoints || 0,
+              skillTypes: content.assessmentMetadata?.skillTypes || [],
+              initialLearningInterval:
+                content.assessmentMetadata?.initialLearningInterval ?? null,
+            },
+          }}
+        />
+      )}
+
+      <Snackbar
+        open={snackbar.open}
+        autoHideDuration={4000}
+        onClose={() => setSnackbar({ ...snackbar, open: false })}
+        message={snackbar.message}
+      />
+    </Box>
+  );
+}

app/courses/[courseId]/uml/[umlId]/page.tsx

@@ -0,0 +1,33 @@
+"use client";
+
+import LecturerUmlAssignment from "@/app/courses/[courseId]/uml/[umlId]/lecturer";
+import StudentUMLAssignment from "@/app/courses/[courseId]/uml/[umlId]/student";
+import { PageError } from "@/components/PageError";
+import { PageView, usePageView } from "@/src/currentView";
+import { isUUID } from "@/src/utils";
+import { Container } from "@mui/material";
+import { useParams } from "next/navigation";
+
+export default function UMLAssignmentPage() {
+  const [pageView] = usePageView();
+  const { umlId } = useParams();
+
+  if (!isUUID(umlId)) {
+    return <PageError message="Invalid UML assessment id." />;
+  }
+
+  switch (pageView) {
+    case PageView.Student:
+      return <StudentUMLAssignment />;
+
+    case PageView.Lecturer:
+      return (
+        <Container maxWidth={false} sx={{ py: 2 }}>
+          <LecturerUmlAssignment />
+        </Container>
+      );
+
+    default:
+      return <PageError message="Unauthorized or unknown view state." />;
+  }
+}