diff --git a/public/assets/css/default.css b/public/assets/css/default.css index 936c150b..42852b61 100644 --- a/public/assets/css/default.css +++ b/public/assets/css/default.css @@ -175,3 +175,7 @@ .text-darkgreen { color: #16a085; } + +.table-row-header { + background-color: #efefef; +} diff --git a/src/components/Activities/ReportTask.jsx b/src/components/Activities/ReportTask.jsx index 1d02b432..286d3df4 100644 --- a/src/components/Activities/ReportTask.jsx +++ b/src/components/Activities/ReportTask.jsx @@ -43,7 +43,7 @@ export const ReportTask = ({ report, closeModal, refetch }) => { }; let response = await TasksRepository.reportTask(reportData); - showToast("succesfully", "success"); + showToast("Task reported successfully.", "success"); refetch(); closeModal(); } catch (error) { diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 9345ef4b..6455453d 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -32,13 +32,12 @@ const DailyTask = () => { // Sync projectId (either from URL or pick first accessible one) useEffect(() => { if (!project_lodaing && projects.length > 0 && !initialized) { - if (selectedProject === 1 || selectedProject === undefined) { + if (selectedProject === 1 || selectedProject === undefined) { dispatch(setProjectId(projects[0].id)); } setInitialized(true); } - }, [project_lodaing, projects, projectId, selectedProject, initialized]); const dispatch = useDispatch(selectedProject); @@ -68,8 +67,6 @@ const DailyTask = () => { ...new Set(TaskLists.map((task) => task.assignmentDate.split("T")[0])), ].sort((a, b) => new Date(b) - new Date(a)); setDates(AssignmentDates); - - }, [TaskLists]); const [selectedTask, selectTask] = useState(null); @@ -90,7 +87,7 @@ const DailyTask = () => { useEffect(() => { popoverRefs.current.forEach((el) => { - console.log(el) + console.log(el); if (el) { new bootstrap.Popover(el, { trigger: "focus", @@ -144,7 +141,7 @@ const DailyTask = () => {
Loading..
@@ -195,7 +191,7 @@ const DailyTask = () => { {dates.map((date, i) => { return (