Commit 0c28d5b5 authored by janithgamage1.ed's avatar janithgamage1.ed

fix: update

Desc : update project
parent 9fe76f9e
...@@ -32,7 +32,8 @@ export const createCurriculum = async (req, res) => { ...@@ -32,7 +32,8 @@ export const createCurriculum = async (req, res) => {
let totalTutorialMark = 0; let totalTutorialMark = 0;
for (const tutorialId of curriculumData.tutorials) { for (const tutorialId of curriculumData.tutorials) {
const tutorial = await Tutorial.findById(tutorialId); const tutorial = await Tutorial.findById(tutorialId);
totalTutorialMark += tutorial.tutorialMarks; const tutorialMarks = typeof tutorial.tutorialMarks === 'string' ? parseFloat(tutorial.tutorialMarks) : tutorial.tutorialMarks;
totalTutorialMark += isNaN(tutorialMarks) ? 0 : tutorialMarks;
} }
newCurriculum.curriculumMark = totalTutorialMark; newCurriculum.curriculumMark = totalTutorialMark;
...@@ -55,7 +56,8 @@ export const updateCurriculum = async (req, res) => { ...@@ -55,7 +56,8 @@ export const updateCurriculum = async (req, res) => {
let totalTutorialMark = 0; let totalTutorialMark = 0;
for (const tutorialId of updatedCurriculum.tutorials) { for (const tutorialId of updatedCurriculum.tutorials) {
const tutorial = await Tutorial.findById(tutorialId); const tutorial = await Tutorial.findById(tutorialId);
totalTutorialMark += tutorial.tutorialMarks; const tutorialMarks = typeof tutorial.tutorialMarks === 'string' ? parseFloat(tutorial.tutorialMarks) : tutorial.tutorialMarks;
totalTutorialMark += isNaN(tutorialMarks) ? 0 : tutorialMarks;
} }
updatedCurriculum.curriculumMark = totalTutorialMark; updatedCurriculum.curriculumMark = totalTutorialMark;
......
...@@ -23,7 +23,11 @@ export const createTutorial = async (req, res) => { ...@@ -23,7 +23,11 @@ export const createTutorial = async (req, res) => {
const tutorialData = req.body; const tutorialData = req.body;
// Calculate total tutorial marks based on task item marks // Calculate total tutorial marks based on task item marks
const totalTaskMarks = tutorialData.taskItems.reduce((total, task) => total + (task.taskItemMark || 0), 0); const totalTaskMarks = tutorialData.taskItems.reduce((total, task) => {
const taskItemMark = typeof task.taskItemMark === 'string' ? parseFloat(task.taskItemMark) : task.taskItemMark;
return total + (isNaN(taskItemMark) ? 0 : taskItemMark);
}, 0);
tutorialData.tutorialMarks = totalTaskMarks; tutorialData.tutorialMarks = totalTaskMarks;
try { try {
...@@ -40,7 +44,10 @@ export const updateTutorial = async (req, res) => { ...@@ -40,7 +44,10 @@ export const updateTutorial = async (req, res) => {
const updatedTutorialData = req.body; const updatedTutorialData = req.body;
// Calculate total tutorial marks based on updated task item marks // Calculate total tutorial marks based on updated task item marks
const totalTaskMarks = updatedTutorialData.taskItems.reduce((total, task) => total + (task.taskItemMark || 0), 0); const totalTaskMarks = updatedTutorialData.taskItems.reduce((total, task) => {
const taskItemMark = typeof task.taskItemMark === 'string' ? parseFloat(task.taskItemMark) : task.taskItemMark;
return total + (isNaN(taskItemMark) ? 0 : taskItemMark);
}, 0);
updatedTutorialData.tutorialMarks = totalTaskMarks; updatedTutorialData.tutorialMarks = totalTaskMarks;
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment