-
-
- Send Message to task owner
-
+
+
+
+
+
+
+
+
+ Send File
+
+
+
+ Send Updates
+
+
+
-
-
-
+ {{interest_msg_status}}
+
+
- Send Message
- {{interest_msg_status}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.ts b/src/app/pages/jobpastdue/jobpastdue.page.ts
index 955546c..963906f 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.ts
+++ b/src/app/pages/jobpastdue/jobpastdue.page.ts
@@ -1,8 +1,11 @@
-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 {SocketToolsService} from "../../services/socket-tools.service";
+import {FilePicker} from "@capawesome/capacitor-file-picker";
+import {MediaConnectService} from "../../services/media-connect.service";
@Component({
selector: 'app-jobpastdue',
@@ -10,21 +13,31 @@ import {WrenchService} from "../../services/wrench.service";
styleUrls: ['./jobpastdue.page.scss'],
})
export class JobpastduePage implements OnInit {
+ @ViewChild('yourmessage') yourmessage;
jobData: any;
tabs = 'activities';
item_banner:string = 'default.jpg';
session_image_server:string='';
curr_session:string='';
+ socketRoom: string ='';
constructor(
private navctr: NavController,
private router: Router,
private alertController:AlertController,
private loadingCtrl: LoadingController,
public sessionDataProviderService: SessionDataProviderService,
- private wrenchService: WrenchService
+ private wrenchService: WrenchService,
+ private socketToolsService: SocketToolsService,
+ private mediaConnectService: MediaConnectService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
this.item_banner = this.jobData.banner;
+
+ if ( this.jobData == undefined){
+ this.onBack();
+ }
+ this.socketRoom = this.jobData.contract+'-'+this.jobData.contract_uid;
+ this.socketToolsService.joinSocketRoom(this.socketRoom);
}
@@ -153,4 +166,104 @@ export class JobpastduePage implements OnInit {
});
await alert.present();
}
+
+ reqDataMessage: {
+ 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.reqDataMessage = {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
+ }
+
+ await loading.present();
+ this.wrenchService.sendTaskMessage(this.reqDataMessage).subscribe(
+ reqResult => {
+ this.msgReqResult = reqResult;
+ console.log("msgReqResult RETURN->", this.msgReqResult);
+ this.interest_msg_status = this.msgReqResult?.status;
+ this.yourmessage = '';
+ const event = new Event("app-taskactivities-refresh");
+ // Dispatch the event.
+ dispatchEvent(event);
+ this.socketToolsService.emmitSocketEvent("send_message",this.yourmessage, this.socketRoom);
+ }
+ );
+ }
+
+ uploadResult:any;
+ uploadFormData: {
+ action:number,
+ member_id: number,
+ uid: string,
+ contract: string,
+ sessionid: string,
+ msg_type:'FILE'
+ };
+
+ async pickFiles (fileMode) {
+ const result = await FilePicker.pickFiles({
+ types: ['image/png','image/jpeg','video/mp4'],
+ multiple: false,
+ readData:true
+ });
+
+ const loading = await this.loadingCtrl.create({
+ message: 'Uploading...',
+ duration: 5000,
+ });
+
+ if(result){
+ console.log(result);
+ // debugger;
+ this.uploadFormData={
+ action:14010,
+ member_id: this.sessionDataProviderService.member_id,
+ uid: this.sessionDataProviderService.member_uid,
+ contract: this.jobData.contract,
+ sessionid: this.sessionDataProviderService.session ,
+ msg_type:'FILE'
+ };
+
+ console.log(this.uploadFormData);
+ for (const [key, value] of Object.entries( this.uploadFormData )) {
+ console.log(`${key}: ${value}`);
+ }
+
+ var blob = new Blob([ result.files[0].data ], { type: result.files[0].mimeType });
+ var file = new File([blob], result.files[0].name, {type: result.files[0].mimeType });
+//return;
+ await loading.present();
+ this.mediaConnectService.uploadtaskFile(this.uploadFormData, file).subscribe(
+ uploadResult => {
+ loading.dismiss();
+ this.uploadResult = uploadResult;
+ console.log("this.mediaConnectService.uploadFile RETURN DATA->", this.uploadFormData);
+ const event = new Event("app-taskactivities-refresh");
+ // Dispatch the event.
+ dispatchEvent(event);
+ }
+ );
+ }
+ }
}
diff --git a/src/app/pages/jobreview/jobreview.page.ts b/src/app/pages/jobreview/jobreview.page.ts
index 14e1308..24c8981 100644
--- a/src/app/pages/jobreview/jobreview.page.ts
+++ b/src/app/pages/jobreview/jobreview.page.ts
@@ -6,7 +6,7 @@ import {WrenchService} from "../../services/wrench.service";
import {Camera, CameraResultType, CameraSource} from "@capacitor/camera";
import { FilePicker } from '@capawesome/capacitor-file-picker';
import {MediaConnectService} from "../../services/media-connect.service";
-
+import {SocketToolsService} from "../../services/socket-tools.service";
@Component({
selector: 'app-jobreview',
templateUrl: './jobreview.page.html',
@@ -19,6 +19,7 @@ export class JobreviewPage implements OnInit {
item_banner:string = 'default.jpg';
session_image_server:string='';
curr_session:string='';
+ socketRoom: string ='';
constructor(
private navctr: NavController,
private router: Router,
@@ -26,7 +27,8 @@ export class JobreviewPage implements OnInit {
private wrenchService: WrenchService,
private alertController:AlertController,
private loadingCtrl: LoadingController,
- private mediaConnectService: MediaConnectService
+ private mediaConnectService: MediaConnectService,
+ private socketToolsService: SocketToolsService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
this.item_banner = this.jobData.banner;
@@ -34,6 +36,8 @@ export class JobreviewPage implements OnInit {
if ( this.jobData == undefined){
this.onBack();
}
+ this.socketRoom = this.jobData.contract+'-'+this.jobData.contract_uid;
+ this.socketToolsService.joinSocketRoom(this.socketRoom);
}
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 26666c0..0741f03 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -591,7 +591,7 @@ getBlogData(){
this.socketToolsService.stop();
setTimeout(()=>{
this.socketToolsService.setupSocket("NO-NEED-SEND");
- this.socketToolsService.joinSocketRoom("full-market-jobs" );
+ this.socketToolsService.joinSocketRoom("full-markets-jobs" );
}, 5000);
}
/*
diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html
index e29936d..259ace1 100644
--- a/src/app/pages/ownersjob/ownersjob.page.html
+++ b/src/app/pages/ownersjob/ownersjob.page.html
@@ -77,6 +77,8 @@
6 Days
1 Week
2 Weeks
+
3 Weeks
+
4 Weeks
@@ -153,35 +155,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-