From 775b3ed5edbfc6d5dbeb451af27aec4dbbb153de Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 9 Dec 2023 23:34:51 -0500
Subject: [PATCH] task status

---
 src/app/pages/activetask/activetask.page.html |  6 +++++-
 src/app/pages/activetask/activetask.page.ts   | 14 ++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html
index dac193b..03a24ea 100644
--- a/src/app/pages/activetask/activetask.page.html
+++ b/src/app/pages/activetask/activetask.page.html
@@ -179,8 +179,12 @@
                     </ion-card-header>
 
                     <ion-card-content>
-                        <ion-button *ngIf="jobData.ext_request==''; " color="secondary" size="small" shape="round" expand="block" (click)="requestExtension()">Request Extension</ion-button>
+                        <ion-button *ngIf="jobData.ext_request==''; " color="secondary" size="small"
+                                    shape="round"
+                                    [disabled]="isDisabled"
+                                    expand="block" (click)="requestExtension()">Request Extension</ion-button>
                         <div *ngIf="jobData.ext_request != ''; " >You have requested extension on : {{jobData.ext_request |date}}</div>
+                        <div *ngIf="request_result != ''; " >{{request_result}}</div>
                     </ion-card-content>
                 </ion-card>
             </div>
diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts
index 55e56de..6900987 100644
--- a/src/app/pages/activetask/activetask.page.ts
+++ b/src/app/pages/activetask/activetask.page.ts
@@ -5,6 +5,7 @@ import { SessionDataProviderService } from 'src/app/store/session-data-provider.
 import { BlogDataService } from 'src/app/store/blog-data.service';
 import { WrenchService } from 'src/app/services/wrench.service';
 import {Camera, CameraResultType, CameraSource} from "@capacitor/camera";
+import {TasksDataService} from "../../store/tasks-data.service";
 
 @Component({
   selector: 'app-activetask',
@@ -25,6 +26,7 @@ export class ActivetaskPage implements OnInit {
       public sessionDataProviderService: SessionDataProviderService,
       private alertController:AlertController,
       private wrenchService: WrenchService,
+      public tasksDataService:TasksDataService,
       public blogDataService: BlogDataService,
       private loadingCtrl: LoadingController
   ) {
@@ -303,6 +305,8 @@ export class ActivetaskPage implements OnInit {
     }
   }
 
+  request_result:string='';
+  isDisabled:boolean= false;
   async requestExtension(){
     let reqData = {
       contract: this.jobData.contract,
@@ -329,13 +333,15 @@ export class ActivetaskPage implements OnInit {
         {
           text: "Send Request",
           handler: () => {
-loading.present();
+          loading.present();
             // API CALL TO MARK TASK AS COMPLETED BY WORKER
             this.wrenchService.workerJobAction(reqData).subscribe((res)=> {
+             // debugger;
               loading.dismiss();
-                  if (res.status != 200 || res.data.internal_return < 0) {
-                    //  setReqStatus({loading:false, status: false, message: 'unable to complete request. Try again'})
-                    // Alert("Unable to set task as completed, try again soon");
+                  if (res.result != '' || res.internal_return == 0) {
+                    this.request_result = res.result;
+                    this.isDisabled=true;
+                    this.tasksDataService.getJobsData();
                   } else {
                    // this.router.navigate(['mytasks']);
                   }