-
+
{{item.title}}
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts
index 12df50d..f135f06 100644
--- a/src/app/pages/family/family.page.ts
+++ b/src/app/pages/family/family.page.ts
@@ -44,11 +44,14 @@ export class FamilyPage implements OnInit {
this.router.navigate(['enroll']);
}
familyMemebr(item){
- this.router.navigate(['familymember'],{state: item});
+ var famItem = {jobManagerActiveData: this.jobManagerActiveData,
+ familyPendingData:this.familyPendingData,
+ itemData:item};
+ this.router.navigate(['familymember'],{state: famItem});
}
usrData: {
- action:22010, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
+ action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
};
familyTotalData:any;
familyData: [];
diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html
index ad1ba8a..f7637e9 100644
--- a/src/app/pages/familymember/familymember.page.html
+++ b/src/app/pages/familymember/familymember.page.html
@@ -57,37 +57,19 @@
-
+
-
+
- Why Using Figma ?
- 10 mins
+ {{item.title}}
+ {{item.job_description}}
+ {{item.contract}} {{item.price*0.01}} {{item.currency}}
+ Due Date: {{item.delivery_date |date}}
-
-
-
-
-
- Suggested Tasks
- 0
-
-
-
-
-
-
-
-
- Why Using Figma ?
- 10 mins
-
-
-
-
+
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index 187f137..fa874a3 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -19,6 +19,7 @@ export class FamilymemberPage implements OnInit {
member_username:string='';
member_pin:string='';
family_uid:string='';
+ jobManagerActiveData:any;
member_qr_string ='0000000';
@@ -29,9 +30,11 @@ export class FamilymemberPage implements OnInit {
private wrenchService: WrenchService,
) {
this.familyMemberData = this.router.getCurrentNavigation().extras.state;
- this.member_firstname= this.familyMemberData.firstname;
- this.member_lastname = this.familyMemberData.lastname;
- this.family_uid = this.familyMemberData.family_uid;
+ //debugger;
+ this.member_firstname= this.familyMemberData.itemData.firstname;
+ this.member_lastname = this.familyMemberData.itemData.lastname;
+ this.family_uid = this.familyMemberData.itemData.family_uid;
+ this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
}
ngOnInit() {
diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts
index 19a1818..6dd300d 100644
--- a/src/app/services/wrench.service.ts
+++ b/src/app/services/wrench.service.ts
@@ -209,6 +209,8 @@ export class WrenchService {
familyManage(postData){
return this.getPostData("/familymanage", postData);
}
+
+
/*
diff --git a/src/assets/images/task-list.svg b/src/assets/images/task-list.svg
new file mode 100644
index 0000000..dde19c3
--- /dev/null
+++ b/src/assets/images/task-list.svg
@@ -0,0 +1 @@
+
\ No newline at end of file