-
-
-
-
-
-
-
-
-
- Members ({{total_family}})
-
-
- Tasks ({{family_active}})
-
-
- Pending ({{suggestion_total}})
-
-
-
-
- Family Account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
@@ -60,7 +25,7 @@
{{item.firstname}} {{item.lastname}} ({{item.age}})
-
+
Last Login:{{item.last_login | date}}
@@ -70,142 +35,187 @@
+
+
+
-
-
-
-
+
+
+ Members ({{total_family}})
+
+
+ Tasks ({{family_active}})
+
+
+ Pending ({{suggestion_total}})
+
+
-
- Total : {{family_active}}
+ Family Account
+
+
-
-
+
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts
index c98cba6..eeb0a36 100644
--- a/src/app/pages/family/family.page.ts
+++ b/src/app/pages/family/family.page.ts
@@ -20,6 +20,9 @@ export class FamilyPage implements OnInit {
session_image_server:string='';
curr_session:string='';
etag:string='';
+ currFamState:any;
+ family_action:string="DEFAULT_FAMILY_PAGE";
+ page_title:string = 'Family Account';
constructor(
private navctr: NavController,
@@ -32,6 +35,12 @@ export class FamilyPage implements OnInit {
addEventListener('family_refresh_list', () => {
this.getFamilyData();
});
+ this.page_title = 'Family Account';
+ this.currFamState = this.router.getCurrentNavigation().extras.state;
+ if ( this.currFamState != undefined && this.currFamState != null){
+ this.family_action = this.currFamState.family_action;
+ this.page_title= "Send Reward";
+ }
}
member_uid:string='';
ngOnInit() {
-
+
- {{item.title}}
- {{item.job_description}}
- {{item.contract}} {{item.price*0.01}} {{item.currency}}
- Due Date: {{item.delivery_date |date}}
+
-
-
+
-
+
+
+
+
+ {{item.firstname}} {{item.lastname}} ({{item.age}})
+
+ Last Login:{{item.last_login | date}}
+
+
+
-
+
+
+
+
+
+ Total : {{family_active}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.job_description}}
+ {{item.contract}} {{item.price*0.01}} {{item.currency}}
+ Due Date: {{item.delivery_date |date}}
+
+
+
+
+
+
+
+ 
+
+ No Pending
+ You have 0 pending suggestions
+
+
+
+ It's fun when the family recommends activities for your approval. Any family member can log in to their profile and send what they are interested in.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- No Pending
- You have 0 pending suggestions
-
-
-
- It's fun when the family recommends activities for your approval. Any family member can log in to their profile and send what they are interested in.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-