diff --git a/src/app/pages/activetask/activetask.page.scss b/src/app/pages/activetask/activetask.page.scss index 1c3cf7a..8fd1874 100644 --- a/src/app/pages/activetask/activetask.page.scss +++ b/src/app/pages/activetask/activetask.page.scss @@ -2,7 +2,7 @@ ion-content { .back_image { width: 100%; - height: 230px; + height: 130px; .back { font-size: 25px; diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index 6f086ab..5d887f6 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -76,7 +76,7 @@ export class FamilyloginPage implements OnInit { } getBlogData(){ - this.wrenchService.getBlogData().subscribe( + this.wrenchService.getBlogData([]).subscribe( blogResult => { this.blogResult = blogResult; console.log("BLOG RETURN->", this.blogResult); diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index d396a2f..668e53f 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -29,7 +29,7 @@ export class HomePage implements OnInit { } ngOnInit() { - this.getBlogData(); + this.getBlogData([]); this.getBannersData(); console.log("BLOG HOME 002->", this.blogDataService.blogData); // this.firstname = this.sessionDataProviderService.firstname; @@ -37,8 +37,8 @@ export class HomePage implements OnInit { blogResult:any; bannerResult:any; bannerData: []; - getBlogData(){ - this.wrenchService.getBlogData().subscribe( + getBlogData(blogReq=[]){ + this.wrenchService.getBlogData(blogReq).subscribe( blogResult => { this.blogResult = blogResult; console.log("BLOG RETURN->", this.blogResult); @@ -81,7 +81,8 @@ export class HomePage implements OnInit { break; case 'blog-page': - + // this.blogDetails(this.getOneBlog(item)); + this.getOneBlog(item); break; case 'my-review-jobs': @@ -105,7 +106,23 @@ export class HomePage implements OnInit { this.router.navigate([pageToNavigate]); } } + selBlogResult:any; + getOneBlog(item){ + const bligTmF ={ + sessionid: this.sessionDataProviderService.session, + blog_id: item.blog_id, + limit: 1 + }; + this.wrenchService.getBlogData(bligTmF).subscribe( + blogResult1 => { + this.selBlogResult = blogResult1.blogdata[0]; + console.log("selBlogResult RETURN->", this.selBlogResult); + this.blogDetails(this.selBlogResult ); + } + ); + return this.selBlogResult; + } blogDetails(item) { var pageToNavigate = 'blogdetail'; this.router.navigate([pageToNavigate],{state: item} ); diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 9de18a4..ccef126 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -36,7 +36,7 @@ export class LoginPage implements OnInit { } getBlogData(){ - this.wrenchService.getBlogData().subscribe( + this.wrenchService.getBlogData([]).subscribe( blogResult => { this.blogResult = blogResult; console.log("BLOG RETURN->", this.blogResult); diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 8863617..ab2dc67 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -74,8 +74,8 @@ export class WrenchService { return this.getPostData('userlogin',loginData); } - getBlogData(){ - const blogReq=[]; + getBlogData(blogReq){ + //const blogReq=[]; return this.getPostData('blogdata',blogReq); //blogdata }