diff --git a/src/app/components/familiy-dash/familiy-dash.component.ts b/src/app/components/familiy-dash/familiy-dash.component.ts index 1068994..172d618 100644 --- a/src/app/components/familiy-dash/familiy-dash.component.ts +++ b/src/app/components/familiy-dash/familiy-dash.component.ts @@ -117,6 +117,10 @@ export class FamiliyDashComponent implements OnInit { case "acc-family": pageToNavigate = "family"; break; + + case "acc-family/activities": + pageToNavigate = "family"; + break; } if (pageToNavigate != "") { this.router.navigate([pageToNavigate], { state: item }); diff --git a/src/app/components/jobowner-dash/jobowner-dash.component.ts b/src/app/components/jobowner-dash/jobowner-dash.component.ts index f151e7c..cf3e809 100644 --- a/src/app/components/jobowner-dash/jobowner-dash.component.ts +++ b/src/app/components/jobowner-dash/jobowner-dash.component.ts @@ -49,8 +49,6 @@ export class JobownerDashComponent implements OnInit { pageToNavigate ='pendinterest'; break; - - case 'offer-interest': pageToNavigate = 'jobinterest'; break @@ -59,6 +57,10 @@ export class JobownerDashComponent implements OnInit { pageToNavigate = 'family'; break; + case "acc-family/activities": + pageToNavigate = "family"; + break; + } if(pageToNavigate !=''){ this.router.navigate([pageToNavigate],{state: item}); diff --git a/src/app/components/offers-received/offers-received.component.html b/src/app/components/offers-received/offers-received.component.html index e151e6b..238240e 100644 --- a/src/app/components/offers-received/offers-received.component.html +++ b/src/app/components/offers-received/offers-received.component.html @@ -19,7 +19,7 @@ -
+
{{(item.job_description.length<95)? item.job_description :item.job_description.substring(0,95)+'...' }}
diff --git a/src/app/components/offers-received/offers-received.component.ts b/src/app/components/offers-received/offers-received.component.ts index 0cb1d5f..ab60d0e 100644 --- a/src/app/components/offers-received/offers-received.component.ts +++ b/src/app/components/offers-received/offers-received.component.ts @@ -11,8 +11,8 @@ import { BannersDataService } from "../../store/banners-data.service"; styleUrls: ['./offers-received.component.scss'], }) export class OffersReceivedComponent implements OnInit { -@ViewChild('offerData') offerData: []; - +//@ViewChild('offerData') offerData: []; + offerData: []; constructor( private navctrl: NavController, private router: Router, @@ -27,7 +27,7 @@ export class OffersReceivedComponent implements OnInit { setInterval(()=>{ this.offerData = this.bannersDataService.offerData; this.session_image_server = this.sessionDataProviderService.session_image_server; - }, 5000); + }, 15000); } ngOnInit() { @@ -66,8 +66,15 @@ export class OffersReceivedComponent implements OnInit { // ); // // } - +currOpenOffer:string=''; openOfferDetail(item){ +if ( this.currOpenOffer != '' && this.currOpenOffer == item.offer_uid){ + this.currOpenOffer = '' +}else +{ + this.currOpenOffer = item.offer_uid; +} + } diff --git a/src/app/components/workers-dash/workers-dash.component.ts b/src/app/components/workers-dash/workers-dash.component.ts index d240931..64db4e5 100644 --- a/src/app/components/workers-dash/workers-dash.component.ts +++ b/src/app/components/workers-dash/workers-dash.component.ts @@ -136,8 +136,6 @@ export class WorkersDashComponent implements OnInit { pageToNavigate ='pendinterest'; break; - - case 'offer-interest': pageToNavigate = 'jobinterest'; break @@ -146,6 +144,10 @@ export class WorkersDashComponent implements OnInit { pageToNavigate = 'family'; break; + case "acc-family/activities": + pageToNavigate = "family"; + break; + } if(pageToNavigate !=''){ this.router.navigate([pageToNavigate],{state: item}); diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index bc71e5b..14c10b5 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -78,7 +78,8 @@
- + +
diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index b32bcbf..b49da2b 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -208,9 +208,10 @@ export class HomePage implements OnInit { // ); } onDetails(item) { + debugger; // var pageToNavigate = 'detail'; var pageToNavigate = ""; - //alert(item.link_path); + alert(item.link_path); switch (item.link_path) { case "referral": pageToNavigate = "invite"; @@ -251,6 +252,10 @@ export class HomePage implements OnInit { case "acc-family": pageToNavigate = "family"; break; + + case "acc-family/activities": + pageToNavigate = "family"; + break; } if (pageToNavigate != "") { this.router.navigate([pageToNavigate], { state: item });