admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Issues_July_2W: Project overview widgets #256

Merged
vikas.nale merged 17 commits from Issues_July_2W into main 2025-07-15 12:28:46 +00:00
Conversation 0 Commits 17 Files Changed 21 +9 -1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 999b8bfb99 - Show all commits

8
src/pages/Activities/DailyTask.jsx
View File

@ -14,6 +14,8 @@ import GlobalModel from "../../components/common/GlobalModel";
import AssignTask from "../../components/Project/AssignTask"; import AssignTask from "../../components/Project/AssignTask";
import SubTask from "../../components/Activities/SubTask"; import SubTask from "../../components/Activities/SubTask";
import {formatNumber} from "../../utils/dateUtils"; import {formatNumber} from "../../utils/dateUtils";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
const DailyTask = () => { const DailyTask = () => {
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
@ -32,6 +34,8 @@ const DailyTask = () => {
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK)
const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK)
const { const {
TaskList, TaskList,
@ -386,6 +390,7 @@ const DailyTask = () => {
</td> </td>
<td className="text-center"> <td className="text-center">
<div className="d-flex justify-content-end"> <div className="d-flex justify-content-end">
{ ReportTaskRights &&
<button <button
type="button" type="button"
className={`btn btn-xs btn-primary ${ className={`btn btn-xs btn-primary ${
@ -400,7 +405,8 @@ const DailyTask = () => {
> >
Report Report
</button> </button>
{task.reportedDate && ( }
{(ApprovedTaskRights && task.reportedDate ) && (
<button <button
type="button" type="button"
className={`btn btn-xs btn-warning ${ className={`btn btn-xs btn-warning ${

2
src/utils/constants.jsx
View File

@ -29,6 +29,8 @@ export const INFRASTRUCTURE = "9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c";
export const MANAGE_TASK = "08752f33-3b29-4816-b76b-ea8a968ed3c5" export const MANAGE_TASK = "08752f33-3b29-4816-b76b-ea8a968ed3c5"
export const APPROVE_TASK = "db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"
export const VIEW_TASK = "9fcc5f87-25e3-4846-90ac-67a71ab92e3c" export const VIEW_TASK = "9fcc5f87-25e3-4846-90ac-67a71ab92e3c"
export const ASSIGN_REPORT_TASK = "6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2" export const ASSIGN_REPORT_TASK = "6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"