diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index 28b85fc..1f27ae2 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -1,4 +1,8 @@ import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-familiy-dash', @@ -7,7 +11,41 @@ import { Component, OnInit } from '@angular/core'; }) export class FamiliyDashComponent implements OnInit { - constructor() { } + constructor(private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService) { + addEventListener('app_fastreward_action', () => { + // this.tabs="lesson"; + //this.get(); + this.router.navigate(['family']); + }); + + addEventListener('app_familiy_nokids_action', () => { + //this.tabs="lesson"; + //this.get(); + this.router.navigate(['family']); + }); + + addEventListener('app_familiy_notask_action', () => { + //this.tabs="lesson"; + //this.get(); + this.router.navigate(['family']); + }); + + addEventListener('app_familiy_addfamily_action', () => { + //this.tabs="lesson"; + //this.get(); + this.router.navigate(['family']); + }); + + addEventListener('app_familiy_allowance_action', () => { + //this.tabs="lesson"; + //this.get(); + this.router.navigate(['family']); + }); + + } ngOnInit() {} diff --git a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts index 1a75a2f..97bef03 100644 --- a/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts +++ b/src/app/components/familycards/familiy-addfamily/familiy-addfamily.component.ts @@ -12,7 +12,8 @@ export class FamiliyAddfamilyComponent implements OnInit { ngOnInit() {} cardAction(){ - alert('card-action'); + //alert('card-action'); + dispatchEvent(new Event("app_familiy_addfamily_action")); } } diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html index dbee532..42cbb7d 100644 --- a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.html @@ -1,7 +1,7 @@ - Add Allowance + Setup Allowance
@@ -10,5 +10,4 @@ -
\ No newline at end of file diff --git a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts index 6d8f47b..6e44bb4 100644 --- a/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts +++ b/src/app/components/familycards/familiy-allowance/familiy-allowance.component.ts @@ -12,7 +12,8 @@ export class FamiliyAllowanceComponent implements OnInit { ngOnInit() {} cardAction(){ - alert('card-action'); + //alert('card-action'); + dispatchEvent(new Event("app_familiy_allowance_action")); } } diff --git a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts index 2fd700f..8ebb18a 100644 --- a/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts +++ b/src/app/components/familycards/familiy-nokids/familiy-nokids.component.ts @@ -12,7 +12,8 @@ export class FamiliyNokidsComponent implements OnInit { ngOnInit() {} cardAction(){ - alert('card-action'); + // alert('card-action'); + dispatchEvent(new Event("app_familiy_nokids_action")); } } diff --git a/src/app/components/familycards/familiy-notask/familiy-notask.component.ts b/src/app/components/familycards/familiy-notask/familiy-notask.component.ts index 7fa2638..15a730d 100644 --- a/src/app/components/familycards/familiy-notask/familiy-notask.component.ts +++ b/src/app/components/familycards/familiy-notask/familiy-notask.component.ts @@ -12,7 +12,8 @@ export class FamiliyNotaskComponent implements OnInit { ngOnInit() {} cardAction(){ - alert('card-action'); + //alert('card-action'); + dispatchEvent(new Event("app_familiy_notask_action")); } } diff --git a/src/app/components/familycards/fastreward/fastreward.component.ts b/src/app/components/familycards/fastreward/fastreward.component.ts index d233230..38a5750 100644 --- a/src/app/components/familycards/fastreward/fastreward.component.ts +++ b/src/app/components/familycards/fastreward/fastreward.component.ts @@ -22,8 +22,8 @@ export class FastrewardComponent implements OnInit { ngOnInit() { this.getFamilyData(); } - familyAcc(){ - this.router.navigate(['family']); + familyAcc(){ + dispatchEvent(new Event("app_fastreward_action")); } usrData: { action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0 @@ -51,9 +51,8 @@ export class FastrewardComponent implements OnInit { ); } + familyMemebr(item){ - familyMemebr(item){ - - } + } }