Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu 78b14ec797 past due common head banner fixed 2023-06-11 05:35:50 +01:00
CHIEFSOFT\ameye 8b0954c28c fix text 2023-06-10 17:28:46 -04:00
CHIEFSOFT\ameye 15ef592252 Job actions 2023-06-10 17:25:34 -04:00
ameye 4d74946f0d Merge branch 'bug-link-mismatch' of WrenchBoard/Users-Wrench into master 2023-06-10 21:20:48 +00:00
6 changed files with 67 additions and 22 deletions
@@ -6,7 +6,7 @@ function CurrentJobAction() {
<p className="my-3 py-1 text-base active-owner">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td className=" py-4">
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
@@ -34,23 +34,25 @@ function CurrentTaskAction({jobDetails}) {
return (
<div className='job-action'>
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 active-worker">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td>
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
If you have completed this task and ready for review and acceptance, click "Set Status" button.
I completed this task and ready for review and acceptance.
</h1>
</div>
</div>
</td>
<td className="text-right px-2">
</tr>
<tr>
<td>
<div className="flex justify-center items-center">
<button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Set Status
<button onClick={popUpHandler} type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Send of Review
</button>
</div>
</td>
@@ -3,9 +3,31 @@ import React from 'react'
function PastDueJobAction() {
return (
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & PastDue
</p>
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 owner-pastdue">
<tbody>
<tr className="border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td>
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
Time allocated has passed
</h1>
</div>
</div>
</td>
</tr>
<tr>
<td>
<div className="flex justify-center items-center">
<button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Cancel or Extend Timeline
</button>
</div>
</td>
</tr>
</tbody>
</table>
</div>
)
}
@@ -3,9 +3,31 @@ import React from 'react'
function PastDueTaskAction() {
return (
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & PastDue
</p>
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 worker-pastdue">
<tbody>
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td>
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
You have missed the allocated time
</h1>
</div>
</div>
</td>
</tr>
<tr>
<td>
<div className="flex justify-center items-center">
<button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Request Extension
</button>
</div>
</td>
</tr>
</tbody>
</table>
</div>
)
}
@@ -6,7 +6,7 @@ function ReviewJobAction() {
<p className="my-3 py-1 text-base">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 review-owner">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td className=" py-4">
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
@@ -16,10 +16,11 @@ function ReviewJobAction() {
</div>
</div>
</td>
<td className="text-right py-4 px-2">
</tr>
<tr>
<td>
<div className="flex justify-center items-center">
<button type="button" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
<button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Reject/Accepts
</button>
</div>
+3 -5
View File
@@ -3,12 +3,10 @@ import usersService from "../services/UsersService";
//import MyJobs from "../components/MyJobs";
//import MyActiveJobs from "../components/MyActiveJobs";
import MyPastDueJobs from "../components/MyActiveJobs/MyPastDueJobs";
import { useSelector } from "react-redux";
export default function MyPastDueJobsPage() {
const commonHeadData =()=>{
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
}
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const [MyJobList, setMyJobList] = useState([]);
const api = new usersService();
//TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive
@@ -29,7 +27,7 @@ export default function MyPastDueJobsPage() {
<>
<MyPastDueJobs
MyJobList={MyJobList}
commonHeadData={commonHeadData}
commonHeadData={commonHeadBanner?.result_list}
/>
</>
);