From 4bbc408d01513fd9ef08518f99eaf56d8fd5b600 Mon Sep 17 00:00:00 2001 From: Ivona Nicetin Date: Wed, 2 Apr 2025 14:59:57 -0700 Subject: [PATCH 1/2] priority changes color in task tables --- frontend/react-app/src/pages/MyTasks.jsx | 20 ++++++++++++++++++++ frontend/react-app/src/pages/TeamTasks.jsx | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/frontend/react-app/src/pages/MyTasks.jsx b/frontend/react-app/src/pages/MyTasks.jsx index c300d7a..5cc7272 100644 --- a/frontend/react-app/src/pages/MyTasks.jsx +++ b/frontend/react-app/src/pages/MyTasks.jsx @@ -124,6 +124,26 @@ const headerAndAccessors = [ { Header: "Priority", accessor: "priority", + Cell: (original) => { + const prioirtyValue = original.value; + let color; + switch (prioirtyValue) { + case "HIGH": + color = "red"; + break; + case "MEDIUM": + color = "orange"; + break; + case "LOW": + color = "green"; + break; + default: + color = "black"; + } + + return {prioirtyValue}; + } + }, { Header: "Is Locked", diff --git a/frontend/react-app/src/pages/TeamTasks.jsx b/frontend/react-app/src/pages/TeamTasks.jsx index ac28d5d..14d8e06 100644 --- a/frontend/react-app/src/pages/TeamTasks.jsx +++ b/frontend/react-app/src/pages/TeamTasks.jsx @@ -143,6 +143,26 @@ function TeamTasks(){ { Header: "Priority", accessor: "priority", + Cell: (original) => { + const prioirtyValue = original.value; + let color; + switch (prioirtyValue) { + case "HIGH": + color = "red"; + break; + case "MEDIUM": + color = "orange"; + break; + case "LOW": + color = "green"; + break; + default: + color = "black"; + } + + return {prioirtyValue}; + } + }, { Header: "Status", From e4e8509de028b0a791cf2634f6993a00193d1126 Mon Sep 17 00:00:00 2001 From: Ivona Nicetin Date: Wed, 2 Apr 2025 15:30:21 -0700 Subject: [PATCH 2/2] formatting issue for status in task tables --- frontend/react-app/src/pages/MyTasks.jsx | 18 ++++++++++++++++ frontend/react-app/src/pages/TeamTasks.jsx | 24 +++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/frontend/react-app/src/pages/MyTasks.jsx b/frontend/react-app/src/pages/MyTasks.jsx index 5cc7272..d375553 100644 --- a/frontend/react-app/src/pages/MyTasks.jsx +++ b/frontend/react-app/src/pages/MyTasks.jsx @@ -120,6 +120,24 @@ const headerAndAccessors = [ { Header: "Status", accessor: "status", + Cell: (original) => { + const statusValue = original.value; + let formattedStatus; + switch (statusValue) { + case "InProgress": + formattedStatus = "In Progress"; + break; + case "notStarted": + formattedStatus = "Not Started"; + break; + case "done": + formattedStatus = "Done"; + break; + default: + formattedStatus = statusValue; + } + return {formattedStatus}; + } }, { Header: "Priority", diff --git a/frontend/react-app/src/pages/TeamTasks.jsx b/frontend/react-app/src/pages/TeamTasks.jsx index 14d8e06..f8d3ccd 100644 --- a/frontend/react-app/src/pages/TeamTasks.jsx +++ b/frontend/react-app/src/pages/TeamTasks.jsx @@ -165,9 +165,27 @@ function TeamTasks(){ }, { - Header: "Status", - accessor: "status", - }, + Header: "Status", + accessor: "status", + Cell: (original) => { + const statusValue = original.value; + let formattedStatus; + switch (statusValue) { + case "InProgress": + formattedStatus = "In Progress"; + break; + case "notStarted": + formattedStatus = "Not Started"; + break; + case "done": + formattedStatus = "Done"; + break; + default: + formattedStatus = statusValue; + } + return {formattedStatus}; + } + }, { Header: "Is Locked", accessor: "isLocked",