diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html index 7b0da53..1908706 100644 --- a/src/app/pages/activetask/activetask.page.html +++ b/src/app/pages/activetask/activetask.page.html @@ -71,8 +71,6 @@
- - {{interest_msg_status}} -
diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html index a0916c6..ed55347 100644 --- a/src/app/pages/jobactive/jobactive.page.html +++ b/src/app/pages/jobactive/jobactive.page.html @@ -10,7 +10,7 @@ -
+
@@ -25,13 +25,13 @@
-
- {{jobData.contract}} -
- - Due date: {{jobData.delivery_date |date}} -
-
+ + + + + + + Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}} @@ -87,133 +87,79 @@ - - - Activities - + + + Task Updates + + + + Activities + - - Send Message - + - - - - - - - - - - - - - - - - - - - - - - - -
- +
-
+
+ + + + + + + + + + + + + + + + Send Response + + + - - - Send Message - - - - - Send Updates - - - - {{interest_msg_status}} - - - - - - - + {{interest_msg_status}} + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts index 6a61261..5bda44a 100644 --- a/src/app/pages/jobactive/jobactive.page.ts +++ b/src/app/pages/jobactive/jobactive.page.ts @@ -1,8 +1,9 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {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-jobactive', @@ -13,7 +14,7 @@ export class JobactivePage implements OnInit { @ViewChild('yourmessage') yourmessage; jobData: any; - tabs = 'activities'; + tabs = 'message'; item_banner:string = 'default.jpg'; session_image_server:string=''; curr_session:string=''; @@ -22,7 +23,8 @@ export class JobactivePage implements OnInit { private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService + private wrenchService: WrenchService, + private loadingCtrl: LoadingController ) { this.jobData = this.router.getCurrentNavigation().extras.state; this.item_banner = this.jobData.banner; @@ -31,6 +33,7 @@ export class JobactivePage implements OnInit { ngOnInit() { this.curr_session = this.sessionDataProviderService.session; + this.session_image_server = this.sessionDataProviderService.session_image_server; //this.activeJobMsgList(); } @@ -80,12 +83,16 @@ export class JobactivePage implements OnInit { interest_msg_status:string = ""; msgReqResult:any; - sendActiveJobMessage(){ - if (this.yourmessage.length < 5){ + 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.reqData = {action:14010, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, @@ -95,14 +102,78 @@ export class JobactivePage implements OnInit { message: this.yourmessage } + loading.present(); this.wrenchService.sendTaskMessage(this.reqData).subscribe( reqResult => { this.msgReqResult = reqResult; console.log("msgReqResult RETURN->", this.msgReqResult); this.interest_msg_status = this.msgReqResult?.status; - // this.activeJobMsgList(); + //this.activeJobMsgList(); + const event = new Event("app-taskactivities-refresh"); + // Dispatch the event. + dispatchEvent(event); + } ); } + + uploadData: { + action:number, + member_id: number, + uid: string, + family_uid: 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:11305, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + family_uid: 'FAKE', + sessionid: this.sessionDataProviderService.session , + msg_type:'FILE', + file_name: `family-banner.${image.format}`, + file_size: file_size , + file_type: `image/${image.format}`, + file_data: image.base64String + }; + //console.log(image); + loading.present(); + // this.wrenchService.uploadFile(this.uploadData).subscribe( + // uploadResult => { + // this.uploadResult = uploadResult; + // console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); + // } + // ); + + console.log( this.uploadData); + } + } + }