From 976b4afbbfc6e9c1fe8c8cae1819dee119d7e02a Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 13 Jun 2023 15:28:12 +0100 Subject: [PATCH] API call for worker task completed added --- .../JobActions/CurrentTaskAction.jsx | 39 ++++++++++++++++--- src/services/UsersService.js | 12 ++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx index 9fb4650..d18c17c 100644 --- a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx +++ b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx @@ -1,10 +1,16 @@ -import React, { useState, useRef } from 'react' +import React, { useState } from 'react' +import { useNavigate } from 'react-router-dom' import ModalCom from '../../Helpers/ModalCom' import LoadingSpinner from '../../Spinners/LoadingSpinner' +import usersService from '../../../services/UsersService' + function CurrentTaskAction({jobDetails}) { + const apiCall = new usersService() + const navigate = useNavigate() + const [checked, setChecked] = useState(false) const [reqStatus, setReqStatus] = useState({loading:false, status: false, message: ''}) @@ -20,16 +26,37 @@ function CurrentTaskAction({jobDetails}) { // FUNCTION TO HANDLE WHEN USER CLICKS ON SEND FOR REVIEW AND ACCEPTANCE const taskCompletedSubmit = () => { - setReqStatus({loading:true, status: false, message: ''}) - if(!checked){ + setReqStatus({loading:true, status: false, message: ''}) // Sets loading spinner active + let reqData = { + contract: jobDetails.contract, + contract_uid: jobDetails.contract_uid, + job_action: 'NOTIFY_COMPLETE', + } + if(!checked){ // checks that checkbox is selected setReqStatus({loading:false, status: false, message: 'Please check the box above'}) return setTimeout(()=>{ setReqStatus({loading:false, status: false, message: ''}) }, 3000) } - setTimeout(()=>{ - setReqStatus({loading:false, status: false, message: ''}) - }, 3000) + + // API CALL TO MARK TASK AS COMPLETED BY WORKER + apiCall.taskCompleted(reqData).then((res)=>{ + if(res.status != 200 || res.data.internal_return < 0){ + setReqStatus({loading:false, status: false, message: 'unable to complete request. Try again'}) + return + } + setReqStatus({loading:false, status: true, message: 'Task marked completed successfully'}) + setTimeout(()=>{ // Sets popout to false and navigates user to /mytask after 3 seconds + popUpHandler() + navigate('/mytask', {replace: true}) + }, 3000) + }).catch(err => { + setReqStatus({loading:false, status: false, message: 'Opps! Network error. Try again'}) + }).finally(()=>{ + setTimeout(()=>{ + setReqStatus({loading:false, status: false, message: ''}) + }, 3000) + }) } return ( diff --git a/src/services/UsersService.js b/src/services/UsersService.js index c7a5d74..fb09739 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -653,6 +653,18 @@ class usersService { return this.postAuxEnd("/offersresponse", postData); } + // END POINT FOR WORKER TO MARK TASK AS COMPLETED + taskCompleted(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 14015, + ...reqData, + }; + return this.postAuxEnd("/activetaskstatus", postData); + } + /* - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(username) - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(password)