diff --git a/apps/frontend/src/routes/_dashboardLayout/assessmentResult/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessmentResult/index.lazy.tsx index 4137d8e..04ecde3 100644 --- a/apps/frontend/src/routes/_dashboardLayout/assessmentResult/index.lazy.tsx +++ b/apps/frontend/src/routes/_dashboardLayout/assessmentResult/index.lazy.tsx @@ -54,7 +54,7 @@ export default function AssessmentResultPage() { ]; const chartData = allAspectsData?.aspects.map((aspect, index) => ({ - aspectName: aspect.AspectName, + aspectName: aspect.aspectName, score: Number(formatScore(aspect.averageScore)), fill: blueColors[index % blueColors.length], })) || []; @@ -64,14 +64,14 @@ export default function AssessmentResultPage() { score: Number(formatScore(subAspect.averageScore)), fill: "#005BFF", aspectId: subAspect.aspectId, - aspectName: allAspectsData?.aspects.find(aspect => aspect.AspectId === subAspect.aspectId)?.AspectName + aspectName: allAspectsData?.aspects.find(aspect => aspect.aspectId === subAspect.aspectId)?.aspectName })) || []; const sortedBarChartData = barChartData.sort((a, b) => (a.aspectId ?? '').localeCompare(b.aspectId ?? '')); const chartConfig = allAspectsData?.aspects.reduce((config, aspect, index) => { - config[aspect.AspectName.toLowerCase()] = { - label: aspect.AspectName, + config[aspect.aspectName.toLowerCase()] = { + label: aspect.aspectName, color: blueColors[index % blueColors.length], }; return config; @@ -96,13 +96,13 @@ export default function AssessmentResultPage() {
{allAspectsData?.aspects.map((aspect) => ( -
+
-

{aspect.AspectName}

+

{aspect.aspectName}

{formatScore(aspect.averageScore)}
{allSubAspectsData?.subAspects.map((subAspect) => { - if (subAspect.aspectId === aspect.AspectId) { + if (subAspect.aspectId === aspect.aspectId) { return (