@@ -158,19 +186,20 @@
-
-
- Send Message to task owner
-
-
-
-
+
+
+ Send Message
+
- Send Message
- {{interest_msg_status}}
-
-
+
+
+
+
+ Send Updates
+ {{interest_msg_status}}
+
+
diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts
index 274b368..8c23bf8 100644
--- a/src/app/pages/jobactive/jobactive.page.ts
+++ b/src/app/pages/jobactive/jobactive.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
import {NavController} from "@ionic/angular";
import {Router} from "@angular/router";
import {SessionDataProviderService} from "../../store/session-data-provider.service";
@@ -10,6 +10,7 @@ import {WrenchService} from "../../services/wrench.service";
styleUrls: ['./jobactive.page.scss'],
})
export class JobactivePage implements OnInit {
+ @ViewChild('yourmessage') yourmessage;
jobData: any;
tabs = 'activities';
@@ -29,12 +30,78 @@ export class JobactivePage implements OnInit {
ngOnInit() {
+ this.activeJobMsgList();
}
onBack() {
this.navctr.back();
}
+ contrData: {
+ action:number,
+ member_id: number,
+ uid: string,
+ sessionid: string,
+ limit:20,
+ contract:string,
+ offset: 0
+ };
+ msgListTotalData:any;
+ msgListData: [];
+ activeJobMsgList(){
+ this.contrData = {
+ action:14011,
+ member_id: this.sessionDataProviderService.member_id,
+ uid: this.sessionDataProviderService.member_uid,
+ sessionid: this.sessionDataProviderService.session ,
+ limit:20,
+ contract: this.jobData.contract,
+ offset: 0}
+ this.wrenchService.activeJobMsgList(this.contrData).subscribe(
+ msgListTotalData => {
+ this.msgListTotalData = msgListTotalData;
+ // console.log("REFER RETURN->", this.referTotalData);
+ this.msgListData = this.msgListTotalData.result_list;
+ console.log("REFER RETURN DATA->", this.msgListData);
+ }
+ );
+
+ }
+
+ reqData: {
+ 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;
+ sendActiveJobMessage(){
+ if (this.yourmessage.length < 5){
+ alert("Enter Message to send");
+ return;
+ }
+
+ this.reqData = {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
+ }
+
+ 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();
+ }
+ );
+ }
}
diff --git a/src/app/pages/pendinterest/pendinterest.page.scss b/src/app/pages/pendinterest/pendinterest.page.scss
index 8fd1874..e035891 100644
--- a/src/app/pages/pendinterest/pendinterest.page.scss
+++ b/src/app/pages/pendinterest/pendinterest.page.scss
@@ -1,8 +1,8 @@
ion-content {
.back_image {
- width: 100%;
- height: 130px;
+ min-width: 50px;
+ height: auto;
.back {
font-size: 25px;
@@ -10,6 +10,8 @@ ion-content {
}
}
+
+
.flex {
display: flex;
justify-content: space-between;
diff --git a/src/global.scss b/src/global.scss
index cf05c18..5402336 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -125,4 +125,10 @@ ion-modal.custom_modal_bottom {
font-family: 'bold';
color:green;
}
-
+.SENDER{
+ background-color: yellow;
+ margin-left: 50px;
+}
+.RECIPIENT{
+ margin-right: 50px;
+}