Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a6900f6a9 | |||
| 8b3e1e8923 |
@@ -6,6 +6,8 @@ import LoadingSpinner from '../../Spinners/LoadingSpinner'
|
|||||||
|
|
||||||
import usersService from '../../../services/UsersService'
|
import usersService from '../../../services/UsersService'
|
||||||
|
|
||||||
|
import {NewDateTimeFormatter }from '../../../lib/NewDateTimeFormatter'
|
||||||
|
|
||||||
function CurrentTaskAction({jobDetails}) {
|
function CurrentTaskAction({jobDetails}) {
|
||||||
|
|
||||||
const currTime = new Date().getTime() / (1000*60*60)
|
const currTime = new Date().getTime() / (1000*60*60)
|
||||||
@@ -69,7 +71,7 @@ function CurrentTaskAction({jobDetails}) {
|
|||||||
<div className="h-full w-full text-sm text-left text-gray-500">
|
<div className="h-full w-full text-sm text-left text-gray-500">
|
||||||
{jobDetails.job_type == 'MEDIA' ?
|
{jobDetails.job_type == 'MEDIA' ?
|
||||||
<div className="h-full flex justify-center items-center">
|
<div className="h-full flex justify-center items-center">
|
||||||
<button onClick={popUpHandler} type="button" className="btn-gradient h-full text-white p-1 lg:p-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
|
<button onClick={popUpHandler} type="button" className="btn-gradient h-full text-white px-5 py-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
|
||||||
I have completed this task
|
I have completed this task
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -82,7 +84,7 @@ function CurrentTaskAction({jobDetails}) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex justify-center items-center">
|
<div className="flex justify-center items-center">
|
||||||
<button onClick={popUpHandler} type="button" className="custom-btn btn-gradient text-white">
|
<button onClick={popUpHandler} type="button" className="custom-btn btn-gradient px-5 py-2 text-white">
|
||||||
Send for Review
|
Send for Review
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -124,7 +126,18 @@ function CurrentTaskAction({jobDetails}) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="job-action-modal-body w-full px-10 py-8 gap-4">
|
<div className="job-action-modal-body w-full px-10 py-8 gap-4">
|
||||||
<div className="w-full flex flex-col gap-8 items-center">
|
<div className="w-full flex flex-col min-h-[150px] gap-8 items-center">
|
||||||
|
{!canSendForReview ?
|
||||||
|
<>
|
||||||
|
<h1
|
||||||
|
// className='font-bold text-base tracking-wide text-dark-gray dark:text-white'
|
||||||
|
className='font-bold text-xl tracking-wide text-red-500 text-center'
|
||||||
|
>
|
||||||
|
This task can be marked completed after {NewDateTimeFormatter(jobDetails?.minimum_due)}
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
</>
|
||||||
|
:
|
||||||
<>
|
<>
|
||||||
<div className="flex justify-center items-center gap-2">
|
<div className="flex justify-center items-center gap-2">
|
||||||
<input
|
<input
|
||||||
@@ -132,7 +145,6 @@ function CurrentTaskAction({jobDetails}) {
|
|||||||
checked={checked}
|
checked={checked}
|
||||||
onChange={()=>{setChecked(prev => !prev)}}
|
onChange={()=>{setChecked(prev => !prev)}}
|
||||||
className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue'
|
className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue'
|
||||||
disabled={!canSendForReview}
|
|
||||||
/>
|
/>
|
||||||
<p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>If you have completed this task</p>
|
<p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>If you have completed this task</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -163,18 +175,8 @@ function CurrentTaskAction({jobDetails}) {
|
|||||||
}
|
}
|
||||||
{/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
|
{/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
|
||||||
|
|
||||||
{!canSendForReview &&
|
|
||||||
<>
|
|
||||||
<h1
|
|
||||||
// className='font-bold text-base tracking-wide text-dark-gray dark:text-white'
|
|
||||||
className='font-bold text-xl tracking-wide text-red-500 text-center'
|
|
||||||
>
|
|
||||||
This task requires you use about 80% of the time allocated
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
</>
|
</>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/* cancel btn */}
|
{/* cancel btn */}
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ function PastDueJobAction({jobDetails}) {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={popUpHandler}
|
onClick={popUpHandler}
|
||||||
className="custom-btn btn-gradient text-base text-white"
|
className="custom-btn btn-gradient px-5 py-2 text-base text-white"
|
||||||
>
|
>
|
||||||
Cancel or Extend Timeline
|
Cancel or Extend Timeline
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ function PastDueTaskAction({jobDetails}) {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={popUpHandler}
|
onClick={popUpHandler}
|
||||||
className="custom-btn btn-gradient text-base text-white"
|
className="custom-btn btn-gradient px-5 py-2 text-base text-white"
|
||||||
>
|
>
|
||||||
Request Extension
|
Request Extension
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -36,7 +36,21 @@ export default function JobDetailPopout({action, situation, jobDetail}) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="modal-body-wrapper">
|
<div className="modal-body-wrapper">
|
||||||
<p className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'>{jobDetail}</p>
|
{/* <p className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'>{jobDetail}</p> */}
|
||||||
|
{/* <div
|
||||||
|
className='w-full text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white'
|
||||||
|
dangerouslySetInnerHTML={{__html: jobDetail}}
|
||||||
|
>
|
||||||
|
</div> */}
|
||||||
|
<textarea
|
||||||
|
id="Job Delivery Details"
|
||||||
|
readOnly
|
||||||
|
// rows="5"
|
||||||
|
className={`w-full h-full overflow-y-auto text-left text-sm md:text-lg lg:text-xl text-slate-900 dark:text-white`}
|
||||||
|
style={{ resize: "none" }}
|
||||||
|
name="job_detail"
|
||||||
|
value={jobDetail}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="modal-footer-wrapper justify-end">
|
<div className="modal-footer-wrapper justify-end">
|
||||||
<button
|
<button
|
||||||
|
|||||||
+1
-1
@@ -53,7 +53,7 @@
|
|||||||
.job-action {
|
.job-action {
|
||||||
background-color: #4687ba;
|
background-color: #4687ba;
|
||||||
border-radius: 15px;
|
border-radius: 15px;
|
||||||
padding: 3px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.msg_box {
|
.msg_box {
|
||||||
|
|||||||
Reference in New Issue
Block a user