diff --git a/src/app/components/tracking/tracking.component.ts b/src/app/components/tracking/tracking.component.ts index 6483068..afa141a 100644 --- a/src/app/components/tracking/tracking.component.ts +++ b/src/app/components/tracking/tracking.component.ts @@ -38,7 +38,7 @@ export class TrackingComponent implements OnInit { } ionViewDidEnter() { - debugger; + //debugger; setTimeout(async () => { await this.createMap(); }, 500); diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html index ed55347..3fb022e 100644 --- a/src/app/pages/jobactive/jobactive.page.html +++ b/src/app/pages/jobactive/jobactive.page.html @@ -40,10 +40,10 @@ Timeline: {{jobData.timeline_days}} days - - - - +
+ + By:{{jobData.job_to}} +
@@ -91,14 +91,9 @@ Task Updates - Activities - - - -
@@ -107,7 +102,6 @@
- {{interest_msg_status}} - - - - - - - - - - - - - - - - - -
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.html b/src/app/pages/jobpastdue/jobpastdue.page.html index c815e7b..4bbe90b 100644 --- a/src/app/pages/jobpastdue/jobpastdue.page.html +++ b/src/app/pages/jobpastdue/jobpastdue.page.html @@ -10,7 +10,7 @@ -
+
@@ -26,13 +26,13 @@ {{jobData.title}}
-
- {{jobData.contract}} -
- - Due date: {{jobData.delivery_date |date}} -
-
+ + + + + + + Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}} @@ -41,6 +41,11 @@ Timeline: {{jobData.timeline_days}} days
+
+ + By:{{jobData.job_to}} +
+ @@ -90,16 +95,20 @@ - - + + + Task Updates + + + Activities - - Send Message - + + + @@ -127,10 +136,9 @@
- +
-
@@ -215,6 +223,8 @@
+ +
@@ -222,11 +232,11 @@ - - -
- Return -
- - + + + + + + + diff --git a/src/app/pages/jobpastdue/jobpastdue.page.ts b/src/app/pages/jobpastdue/jobpastdue.page.ts index 396c93d..b50a214 100644 --- a/src/app/pages/jobpastdue/jobpastdue.page.ts +++ b/src/app/pages/jobpastdue/jobpastdue.page.ts @@ -13,7 +13,8 @@ export class JobpastduePage implements OnInit { jobData: any; tabs = 'activities'; item_banner:string = 'default.jpg'; - + session_image_server:string=''; + curr_session:string=''; constructor( private navctr: NavController, private router: Router, @@ -26,6 +27,9 @@ export class JobpastduePage implements OnInit { ngOnInit() { + this.curr_session = this.sessionDataProviderService.session; + this.session_image_server = this.sessionDataProviderService.session_image_server; + //this.activeJobMsgList(); } onBack() { diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html index 929bf3a..3e5155c 100644 --- a/src/app/pages/jobreview/jobreview.page.html +++ b/src/app/pages/jobreview/jobreview.page.html @@ -44,6 +44,10 @@ Timeline: {{jobData.timeline_days}} days +
+ + By:{{jobData.job_to}} +
@@ -58,6 +62,7 @@ Accept +
{{response_result}}
@@ -78,19 +83,36 @@
- - - Send Message to task owner - + + + + + + + + + + + + + + + + Send Response + + + - - - - - Send Message - {{interest_msg_status}} - - + {{interest_msg_status}} + +
diff --git a/src/app/pages/jobreview/jobreview.page.ts b/src/app/pages/jobreview/jobreview.page.ts index 9eaccba..c8db47b 100644 --- a/src/app/pages/jobreview/jobreview.page.ts +++ b/src/app/pages/jobreview/jobreview.page.ts @@ -1,8 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {AlertController, LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; +import {Camera, CameraResultType, CameraSource} from "@capacitor/camera"; @Component({ selector: 'app-jobreview', @@ -10,6 +11,7 @@ import {WrenchService} from "../../services/wrench.service"; styleUrls: ['./jobreview.page.scss'], }) export class JobreviewPage implements OnInit { + @ViewChild('yourmessage') yourmessage; jobData: any; tabs = 'message'; item_banner:string = 'default.jpg'; @@ -90,6 +92,8 @@ export class JobreviewPage implements OnInit { await alert.present(); } + response_result:string=''; + reqData: { action:number, member_id: number, @@ -130,8 +134,13 @@ export class JobreviewPage implements OnInit { doJobActionResponse => { this.doJobActionResponse = doJobActionResponse; console.log("doJobAction RETURN->", this.doJobActionResponse); - // debugger; - + if ( this.doJobActionResponse !=undefined && this.doJobActionResponse.result !=''){ + this.response_result = this.doJobActionResponse.result; + setTimeout(async () => { + this.response_result=''; + await this.onBack(); + }, 3000); + } } ); } @@ -139,4 +148,109 @@ export class JobreviewPage implements OnInit { // return this.getPostData("activejobstatus", reqData); // } + + reqMessageData: { + action:number, member_id: number, uid: string, sessionid: string, msg_type:string, + contract:string, + message:string + }; + + interest_status:string = ""; + interest_msg_status:string = ""; + + msgReqResult:any; + async sendActiveJobMessage(){ + if (this.yourmessage == undefined || this.yourmessage?.length < 5){ + alert("Enter Message to send"); + return; + } + + const loading = await this.loadingCtrl.create({ + message: 'Sending...', + duration: 2500, + }); + this.reqMessageData = {action:14010, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + msg_type: "TEXT", + contract:this.jobData.contract, + message: this.yourmessage + } + + loading.present(); + this.wrenchService.sendTaskMessage(this.reqMessageData).subscribe( + reqResult => { + this.msgReqResult = reqResult; + console.log("msgReqResult RETURN->", this.msgReqResult); + this.interest_msg_status = this.msgReqResult?.status; + //this.activeJobMsgList(); + const event = new Event("app-taskactivities-refresh"); + // Dispatch the event. + dispatchEvent(event); + + } + ); + } + + uploadData: { + action:number, + member_id: number, + uid: string, + contract: string, + sessionid: string, + msg_type:'FILE', + file_name: string, + file_size: number, + file_type: string, + file_data: string + }; + + uploadResult:any; + async startCamera(cameraMode){ + const image = await Camera.getPhoto({ + quality: 50, + width : 600, + height : 300, + allowEditing: false, + resultType: CameraResultType.Base64, + source: (cameraMode == 100 ) ? CameraSource.Camera : CameraSource.Photos // Camera, Photos or Prompt! + }); + + if (image) { + const loading = await this.loadingCtrl.create({ + message: 'Uploading updates', + duration: 5000, + }); + var file_size = parseInt(String(image.base64String.toString().length / 1.3224954) ) ; + // this.saveImage(image) + //debugger; + //image.base64String + this.uploadData={ + action:14010, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + contract: this.jobData.contract, + sessionid: this.sessionDataProviderService.session , + msg_type:'FILE', + file_name: `${this.jobData.contract}-job.${image.format}`, + file_size: file_size , + file_type: `image/${image.format}`, + file_data: image.base64String + }; + // console.log(this.uploadData); + loading.present(); + this.wrenchService.uploadFile(this.uploadData).subscribe( + uploadResult => { + this.uploadResult = uploadResult; + console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); + const event = new Event("app-taskactivities-refresh"); + // Dispatch the event. + dispatchEvent(event); + } + ); + + // console.log( this.uploadData); + } + } } diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index b2237e5..9a7191d 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -41,10 +41,10 @@
- + WrenchBoard Tasks - Ready to Start + Ready to Start ?