diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index ef0bc8f..0262b15 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -17,7 +17,8 @@ export class FamiliyDashComponent implements OnInit { family_dash_show:number =10; pageItem:{ - page_name: number + page_name: number, + family_action: string } constructor(private navctr: NavController, private router: Router, @@ -26,25 +27,34 @@ export class FamiliyDashComponent implements OnInit { private wrenchService: WrenchService) { addEventListener('app_fastreward_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + // 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.router.navigate(['addfamilykid'],{state: this.pageItem}); + // 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.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); addEventListener('app_familiy_addfamily_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); addEventListener('app_familiy_allowance_action', () => { - this.router.navigate(['family'],{state: this.pageItem}); + this.pageItem.family_action = ""; + this.router.navigate(['family'],{state: {page_name: 0, family_action: ''}}); }); + + this.bannerData = this.bannersDataService.bannerData; + this.homebannerCount = this.bannersDataService.homebannerCount; + // let us keep refreshing - internal so serve call var interval = setInterval( ()=> { this.bannerData = this.bannersDataService.bannerData; this.homebannerCount = this.bannersDataService.homebannerCount; diff --git a/src/app/components/familycards/fastreward/fastreward.component.html b/src/app/components/familycards/fastreward/fastreward.component.html index 2715933..5b898c3 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.html +++ b/src/app/components/familycards/fastreward/fastreward.component.html @@ -1,91 +1,16 @@ -
+