From 0bd13e3918e3ad27ce99d68d1a95d53ff0cfb95f Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 13 Feb 2024 11:05:53 -0500 Subject: [PATCH] Assign tasks --- .../familiy-dash/familiy-dash.component.ts | 3 --- src/app/pages/family/family.page.html | 26 +++++++++++++++++++ src/app/pages/family/family.page.ts | 10 +++++++ .../pages/familymember/familymember.page.ts | 3 +++ 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index 1202c04..73c401b 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -27,17 +27,14 @@ export class FamiliyDashComponent implements OnInit { private wrenchService: WrenchService) { addEventListener('app_fastreward_action', () => { - // this.pageItem.family_action = "FAMILY_ACTION_SEND_REWARD"; this.router.navigate(['family'],{state: {page_name: 0, family_action: 'FAMILY_ACTION_SEND_REWARD'}}); }); addEventListener('app_familiy_nokids_action', () => { - // this.pageItem.family_action = "FAMILY_ACTION_NO_KIDS"; this.router.navigate(['addfamilykid'],{state: {page_name: 0, family_action: 'FAMILY_ACTION_NO_KIDS'}}); }); addEventListener('app_familiy_notask_action', () => { - // this.pageItem.family_action = "FAMILY_ACTION_NO_TASKS"; this.router.navigate(['family'],{state: {page_name: 0, family_action: 'FAMILY_ACTION_NO_TASKS'}}); }); diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index eb28312..6d10a81 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -15,6 +15,32 @@
+ +
+
+ + +
Select kid to send task to:
+
+
+
+
+ +
+ {{item.firstname}} {{item.lastname}} ({{item.age}}) + + Last Login:{{item.last_login | date}} +
+
+
+ +
+
+ +
+
+
+
Your Wallet:
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts index d28f3b3..179eba2 100644 --- a/src/app/pages/family/family.page.ts +++ b/src/app/pages/family/family.page.ts @@ -117,6 +117,16 @@ export class FamilyPage implements OnInit { this.router.navigate(["familymember"], { state: famItem }); } + familyMemeberToTaks(item) { + var famItem = { + jobManagerActiveData: this.jobManagerActiveData, + familyPendingData: this.familyPendingData, + itemData: item, + startPage: "TASK", + }; + this.router.navigate(["familymember"], { state: famItem }); + } + usrData: { action: number; member_id: number; diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts index e8f4052..1da07a4 100644 --- a/src/app/pages/familymember/familymember.page.ts +++ b/src/app/pages/familymember/familymember.page.ts @@ -69,6 +69,9 @@ export class FamilymemberPage implements OnInit { if (this.familyMemberData.startPage == 'WALLET'){ this.startFamilyMemberReward(); } + if (this.familyMemberData.startPage == 'TASK'){ + this.tabs = 'about'; + } } }