@@ -88,23 +88,23 @@
-
Send Updates
+
Send Updates
{{interest_msg_status}}
-
+
- Why Using Figma ?
- 10 mins
+ {{item.msg_date}}
+ {{item.message}}
-
-
-
+
+
+
diff --git a/src/app/pages/activetask/activetask.page.scss b/src/app/pages/activetask/activetask.page.scss
index 357a756..d0baa33 100644
--- a/src/app/pages/activetask/activetask.page.scss
+++ b/src/app/pages/activetask/activetask.page.scss
@@ -1,5 +1,12 @@
ion-content {
+ .SENDER{
+ background-color: yellow;
+ margin-left: 50px;
+ }
+ .RECIPIENT{
+ margin-right: 50px;
+ }
.back_image {
width: auto; //100%;
height: 130px;
diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts
index 73079b4..b116d97 100644
--- a/src/app/pages/activetask/activetask.page.ts
+++ b/src/app/pages/activetask/activetask.page.ts
@@ -1,6 +1,9 @@
-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 'src/app/store/session-data-provider.service';
+import { BlogDataService } from 'src/app/store/blog-data.service';
+import { WrenchService } from 'src/app/services/wrench.service';
@Component({
selector: 'app-activetask',
@@ -8,14 +11,16 @@ import {Router} from "@angular/router";
styleUrls: ['./activetask.page.scss'],
})
export class ActivetaskPage implements OnInit {
-
-
+ @ViewChild('yourmessage') yourmessage;
tabs = 'about';
jobData: any;
constructor(
private navctr: NavController,
- private router: Router
+ private router: Router,
+ public sessionDataProviderService: SessionDataProviderService,
+ private wrenchService: WrenchService,
+ public blogDataService: BlogDataService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
@@ -25,19 +30,107 @@ export class ActivetaskPage implements OnInit {
}
ngOnInit() {
+ this.activeJobMsgList();
}
onBack() {
this.navctr.back();
}
- onMentor() {
- this.router.navigate(['mentor']);
+/*
+ sendTaskMessage(messageData){
+ return this.getPostData("sendtaskmessage", messageData);
+ }
+
+ activeJobMsgList(contractData){
+ return this.getPostData("activejobmsglist", contractData);
+ }
+
+ 'member_id' => int 1
+ 'sessionid' => string '936571FD2E081B667930E7FFDF4D819938171883CA0CC951DC6C4FB184280EB3' (length=64)
+ 'uid' => string '3119b744-42ad-4834-bb83-b737588754ca' (length=36)
+ 'message' => string 'Lorem Ipsum comes from a latin text written in 45BC by Roman statesman, lawyer, scholar, and philosopher, Marcus Tullius Cicero' (length=127)
+ 'msg_type' => string 'TEXT' (length=4)
+ 'contract' => string '49BWBRW738' (length=10)
+ 'action' => int 14010
+ */
+
+
+ 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);
+ }
+ );
+
}
- onEnroll() {
- this.router.navigate(['enroll']);
- }
+ /*
+ 'member_id' => int 1
+ 'sessionid' => string '936571FD2E081B667930E7FFDF4D819938171883CA0CC951DC6C4FB184280EB3' (length=64)
+ 'uid' => string '3119b744-42ad-4834-bb83-b737588754ca' (length=36)
+ 'message' => string 'Lorem Ipsum comes from a latin text written in 45BC by Roman statesman, lawyer, scholar, and philosopher, Marcus Tullius Cicero' (length=127)
+ 'msg_type' => string 'TEXT' (length=4)
+ 'contract' => string '49BWBRW738' (length=10)
+ 'action' => int 14010
+ */
+ 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/allblog/allblog.page.ts b/src/app/pages/allblog/allblog.page.ts
index e0bfa52..c5c5db5 100644
--- a/src/app/pages/allblog/allblog.page.ts
+++ b/src/app/pages/allblog/allblog.page.ts
@@ -17,7 +17,6 @@ export class AllblogPage implements OnInit {
constructor(
private router: Router,
private navctr: NavController,
-
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
public blogDataService: BlogDataService
diff --git a/src/app/pages/invite/invite.page.html b/src/app/pages/invite/invite.page.html
index 981f2d1..866abf6 100644
--- a/src/app/pages/invite/invite.page.html
+++ b/src/app/pages/invite/invite.page.html
@@ -67,6 +67,7 @@
{{item.email}}
+
{{item.added_date}}