Skip to content

Commit b4b03df

Browse files
committed
Merge remote-tracking branch 'origin/main' into FoPro_WS_UML-Assessment & Fix linting
2 parents 0ad0f1d + 83daa38 commit b4b03df

3 files changed

Lines changed: 4 additions & 9 deletions

File tree

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// @ts-nocheck
2-
/* eslint-disable */
31
"use client";
42

53
import { pageLearningProgressQuery } from "@/__generated__/pageLearningProgressQuery.graphql";
@@ -15,7 +13,6 @@ import {
1513
IconButton,
1614
Slide,
1715
Typography,
18-
useTheme,
1916
} from "@mui/material";
2017
import { useParams } from "next/navigation";
2118
import { useEffect, useMemo, useState } from "react";
@@ -129,7 +126,7 @@ export default function LearningProgress() {
129126

130127
const progressItem = progressBySkillValues.get(key)!;
131128

132-
progressItem.progressSum += skill.skillValue.skillValue;
129+
progressItem.progressSum += skill.skillValue?.skillValue ?? 0;
133130
/*progressItem.averageProgressSum +=
134131
skill.skillAllUsersStats.skillValueSum;*/
135132
progressItem.count++;
@@ -264,8 +261,6 @@ export default function LearningProgress() {
264261
sessionStorage.setItem("previousProgress", JSON.stringify([...tempMap]));
265262
}, [course.skills, progressBySkill, uniqueCategories.length]);
266263

267-
const theme = useTheme();
268-
269264
if (uniqueCategories.length === 0) {
270265
return (
271266
<Typography variant="body1">

src/feedbackUtils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { graphql, useMutation } from "react-relay";
22

3-
import { useAITutorStore } from "@/stores/aiTutorStore";
43
import {
54
feedbackUtilsSendMessageMutation,
65
feedbackUtilsSendMessageMutation$variables,
76
} from "@/__generated__/feedbackUtilsSendMessageMutation.graphql";
7+
import { useAITutorStore } from "@/stores/aiTutorStore";
88

99
const sendMessageMutation = graphql`
1010
mutation feedbackUtilsSendMessageMutation(

src/schema.graphql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,7 @@ type Query {
13561356
inventoryForUser: Inventory!
13571357
isAccessTokenAvailable(provider: ExternalServiceProviderDto!): Boolean!
13581358
itemsByUserId(userId: UUID!): [UserItem!]!
1359+
latestProactiveFeedback: String
13591360
mediaRecords: [MediaRecord!]! @deprecated(reason: "In production there should probably be no way to get all media records of the system.")
13601361
mediaRecordsByContentIds(contentIds: [UUID!]!): [[MediaRecord!]!]!
13611362
mediaRecordsByIds(ids: [UUID!]!): [MediaRecord!]!
@@ -1622,11 +1623,10 @@ type Skill {
16221623
skillCategory: String!
16231624
skillLevels: SkillLevels
16241625
skillName: String!
1625-
skillValue: Float!
1626+
skillValue: SkillValue!
16261627
}
16271628

16281629
type SkillAllUsersStats {
1629-
averageSkillValue: Float!
16301630
participantCount: Int!
16311631
skillId: UUID!
16321632
skillValueSum: Float!

0 commit comments

Comments
 (0)