From e2774f023e3e4670c980c24c113696c260fc8de1 Mon Sep 17 00:00:00 2001 From: Ro-hitMali Date: Sat, 13 May 2023 17:40:22 +0530 Subject: [PATCH 1/4] task bar color in progress --- src/components/member-profile/active-task/index.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/components/member-profile/active-task/index.js b/src/components/member-profile/active-task/index.js index f011890e..583a9993 100644 --- a/src/components/member-profile/active-task/index.js +++ b/src/components/member-profile/active-task/index.js @@ -4,8 +4,10 @@ import { timeWas } from '@helper-functions/time-was'; import { percentageofDaysRemaining } from '@helper-functions/taskProgress'; import { estimatedDays } from '@helper-functions/estimated-days'; import { progressIndicator } from '@helper-functions/progressIndicator'; +// import { useState, useEffect } from 'react'; const ActiveTask = ({ taskDetails }) => { + // const [filled, setFilled] = useState(0); const { title, purpose, startedOn, endsOn, percentCompleted } = taskDetails; const completedDate = timeWas(startedOn * 1000, false, endsOn * 1000); const percentOfTaskLeft = 100 - percentCompleted; @@ -21,6 +23,17 @@ const ActiveTask = ({ taskDetails }) => { ); const showProgressIndicator = progressIndicator(showEstimatedDay, classNames); + // const showProgressIndicator = classNames.progressIndicatorYellow; // default yellow + + // if (percentageOfDaysRemaining >= percentOfTaskLeft) { + // showProgressIndicator = classNames.progressIndicatorGreen; // green + // } else if (percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75) { + // showProgressIndicator = classNames.progressIndicatorOrange; // orange + // } else if (percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35) { + // showProgressIndicator = classNames.progressIndicatorRed; // red + // } + // } + return (
From a8ddf447b69343c776d5e4aeeb426875749e09f0 Mon Sep 17 00:00:00 2001 From: Ro-hitMali Date: Sun, 14 May 2023 22:43:30 +0530 Subject: [PATCH 2/4] Fix-taskbar color --- .../member-profile/active-task/index.js | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/src/components/member-profile/active-task/index.js b/src/components/member-profile/active-task/index.js index 583a9993..27b5164e 100644 --- a/src/components/member-profile/active-task/index.js +++ b/src/components/member-profile/active-task/index.js @@ -7,7 +7,6 @@ import { progressIndicator } from '@helper-functions/progressIndicator'; // import { useState, useEffect } from 'react'; const ActiveTask = ({ taskDetails }) => { - // const [filled, setFilled] = useState(0); const { title, purpose, startedOn, endsOn, percentCompleted } = taskDetails; const completedDate = timeWas(startedOn * 1000, false, endsOn * 1000); const percentOfTaskLeft = 100 - percentCompleted; @@ -23,16 +22,31 @@ const ActiveTask = ({ taskDetails }) => { ); const showProgressIndicator = progressIndicator(showEstimatedDay, classNames); + // eslint-disable-next-line no-console + console.log( + completedDate, + percentCompleted, + percentOfTaskLeft, + percentageOfDaysRemaining, + showEstimatedDay, + estimatedDays() + ); + // const showProgressIndicator = classNames.progressIndicatorYellow; // default yellow - // if (percentageOfDaysRemaining >= percentOfTaskLeft) { - // showProgressIndicator = classNames.progressIndicatorGreen; // green - // } else if (percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75) { - // showProgressIndicator = classNames.progressIndicatorOrange; // orange - // } else if (percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35) { - // showProgressIndicator = classNames.progressIndicatorRed; // red - // } - // } + const handleProgressBarColor = () => { + const colorOptions = []; + if (percentageOfDaysRemaining >= percentOfTaskLeft) { + colorOptions.push(classNames.progressIndicatorGreen); // green + } else if (percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75) { + colorOptions.push(classNames.progressIndicatorOrange); // orange + } else if (percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35) { + colorOptions.push(classNames.progressIndicatorRed); // red + } else { + colorOptions.push(classNames.progressIndicatorYellow); // yellow + } + return colorOptions; + }; return (
@@ -53,7 +67,17 @@ const ActiveTask = ({ taskDetails }) => {
= percentOfTaskLeft + // ? 'green' + // : percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75 + // ? 'orange' + // : percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35 + // ? 'red' + // : 'yellow', + }} data-testid="progressIndicator" />
From 0da196d489e160aa93ff185e417446d992658028 Mon Sep 17 00:00:00 2001 From: Ro-hitMali Date: Tue, 16 May 2023 13:57:03 +0530 Subject: [PATCH 3/4] removed unwanted comments --- .../member-profile/active-task/index.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/components/member-profile/active-task/index.js b/src/components/member-profile/active-task/index.js index 27b5164e..90e040f9 100644 --- a/src/components/member-profile/active-task/index.js +++ b/src/components/member-profile/active-task/index.js @@ -22,18 +22,6 @@ const ActiveTask = ({ taskDetails }) => { ); const showProgressIndicator = progressIndicator(showEstimatedDay, classNames); - // eslint-disable-next-line no-console - console.log( - completedDate, - percentCompleted, - percentOfTaskLeft, - percentageOfDaysRemaining, - showEstimatedDay, - estimatedDays() - ); - - // const showProgressIndicator = classNames.progressIndicatorYellow; // default yellow - const handleProgressBarColor = () => { const colorOptions = []; if (percentageOfDaysRemaining >= percentOfTaskLeft) { @@ -70,13 +58,6 @@ const ActiveTask = ({ taskDetails }) => { style={{ width: `${percentCompleted}%`, backgroundColor: `${handleProgressBarColor}`, - // percentageOfDaysRemaining >= percentOfTaskLeft - // ? 'green' - // : percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75 - // ? 'orange' - // : percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35 - // ? 'red' - // : 'yellow', }} data-testid="progressIndicator" /> From 95dbf2c78c33ff4f62cb1df85bf961e24b18aba2 Mon Sep 17 00:00:00 2001 From: Ro-hitMali Date: Thu, 25 May 2023 04:11:47 +0530 Subject: [PATCH 4/4] Fix-progress-bar-color --- .../member-profile/active-task/index.js | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/components/member-profile/active-task/index.js b/src/components/member-profile/active-task/index.js index 90e040f9..bc594620 100644 --- a/src/components/member-profile/active-task/index.js +++ b/src/components/member-profile/active-task/index.js @@ -4,7 +4,6 @@ import { timeWas } from '@helper-functions/time-was'; import { percentageofDaysRemaining } from '@helper-functions/taskProgress'; import { estimatedDays } from '@helper-functions/estimated-days'; import { progressIndicator } from '@helper-functions/progressIndicator'; -// import { useState, useEffect } from 'react'; const ActiveTask = ({ taskDetails }) => { const { title, purpose, startedOn, endsOn, percentCompleted } = taskDetails; @@ -23,19 +22,20 @@ const ActiveTask = ({ taskDetails }) => { const showProgressIndicator = progressIndicator(showEstimatedDay, classNames); const handleProgressBarColor = () => { - const colorOptions = []; if (percentageOfDaysRemaining >= percentOfTaskLeft) { - colorOptions.push(classNames.progressIndicatorGreen); // green - } else if (percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75) { - colorOptions.push(classNames.progressIndicatorOrange); // orange - } else if (percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35) { - colorOptions.push(classNames.progressIndicatorRed); // red - } else { - colorOptions.push(classNames.progressIndicatorYellow); // yellow + return classNames.progressIndicatorGreen; // green } - return colorOptions; + if (percentageOfDaysRemaining < 50 && percentOfTaskLeft > 75) { + return classNames.progressIndicatorOrange; // orange + } + if (percentageOfDaysRemaining < 25 && percentOfTaskLeft > 35) { + return classNames.progressIndicatorRed; // red + } + return classNames.progressIndicatorYellow; // yellow }; + const progressBarColor = handleProgressBarColor(); + return (
@@ -54,11 +54,8 @@ const ActiveTask = ({ taskDetails }) => {