From 85c3275ae6f390f5da6b5719a26b6c0637ba5e6c Mon Sep 17 00:00:00 2001 From: "saket.agrahari" <saket.agrahari@geant.org> Date: Thu, 17 Aug 2023 09:49:04 +0100 Subject: [PATCH] [COMP-253][COMP-254] Progress Bar --- survey-frontend/src/ProgressBar.tsx | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/survey-frontend/src/ProgressBar.tsx b/survey-frontend/src/ProgressBar.tsx index 728abfc5..25644d55 100644 --- a/survey-frontend/src/ProgressBar.tsx +++ b/survey-frontend/src/ProgressBar.tsx @@ -14,6 +14,18 @@ function ProgressBar({ surveyModel, pageNoSetter }) { const filterCallback = (question) => { + const typesWithLengthCheck = ["checkbox", "text","comment","multipletext"]; + if (typesWithLengthCheck.includes(question.getType())) { + if (question.value !== null && question.value !== undefined) { + if (question.value.length > 0) { + console.log("question.type len",question.getType()) + return true; // Non-empty array + } else if (Object.keys(question.value).length > 0 && question.getType()==="multipletext") { + return Object.values(question.value)[0]!== undefined; + }// Non-empty multitext object + } + return false; + } return question.value !== null && question.value !== undefined; }; @@ -31,6 +43,16 @@ function ProgressBar({ surveyModel, pageNoSetter }) { const answeredCount = sectionQuestions.filter(filterCallback).length; const unansweredCount = questionCount - answeredCount; const completionPercentage = answeredCount / questionCount; + // console.log("sectionQuestions:",sectionQuestions) + if(answeredCount>0){ + // console.log("answeredQuestion:",sectionQuestions.filter(filterCallback)) + // console.log("questionCount: ",questionCount) + // console.log("answeredCount: ",answeredCount) + } + + // console.log("unansweredCount: ",unansweredCount) + // console.log("completionPercentage: ",completionPercentage) + progressArray.push({ -- GitLab