diff --git a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx index 8bcecd4..11b1e15 100644 --- a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx +++ b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx @@ -6,6 +6,8 @@ import LoadingSpinner from '../../Spinners/LoadingSpinner' import usersService from '../../../services/UsersService' +import {NewDateTimeFormatter }from '../../../lib/NewDateTimeFormatter' + function CurrentTaskAction({jobDetails}) { const currTime = new Date().getTime() / (1000*60*60) @@ -69,7 +71,7 @@ function CurrentTaskAction({jobDetails}) {
{jobDetails.job_type == 'MEDIA' ?
-
@@ -82,7 +84,7 @@ function CurrentTaskAction({jobDetails}) {
-
@@ -124,7 +126,18 @@ function CurrentTaskAction({jobDetails}) {
-
+
+ {!canSendForReview ? + <> +

+ This task can be marked completed after {NewDateTimeFormatter(jobDetails?.minimum_due)} +

+ + + : <>
{setChecked(prev => !prev)}} className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' - disabled={!canSendForReview} />

If you have completed this task

@@ -163,18 +175,8 @@ function CurrentTaskAction({jobDetails}) { } {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/} - {!canSendForReview && - <> -

- This task requires you use about 80% of the time allocated -

- - - } + }
{/* cancel btn */} diff --git a/src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx b/src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx index 0d22c4f..234d27f 100644 --- a/src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx +++ b/src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx @@ -121,7 +121,7 @@ function PastDueJobAction({jobDetails}) { diff --git a/src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx b/src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx index 065202d..bc21ca2 100644 --- a/src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx +++ b/src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx @@ -129,7 +129,7 @@ function PastDueTaskAction({jobDetails}) { diff --git a/src/components/MyActiveJobs/JobDetailPopout.jsx b/src/components/MyActiveJobs/JobDetailPopout.jsx index 618a3a5..b83964f 100644 --- a/src/components/MyActiveJobs/JobDetailPopout.jsx +++ b/src/components/MyActiveJobs/JobDetailPopout.jsx @@ -36,7 +36,21 @@ export default function JobDetailPopout({action, situation, jobDetail}) {
-

{jobDetail}

+ {/*

{jobDetail}

*/} + {/*
+
*/} +