From cf1b48dd0433b2bfbc5776de7c98b21b2a554d4c Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 18 Dec 2023 07:16:37 -0500 Subject: [PATCH] suggest --- .../suggestedlist/suggestedlist.component.ts | 53 ++++++++++++------- src/app/pages/familylogin/familylogin.page.ts | 2 +- src/app/pages/suggest/suggest.page.ts | 7 ++- src/app/store/interval-refresh.service.ts | 2 +- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/src/app/components/suggestedlist/suggestedlist.component.ts b/src/app/components/suggestedlist/suggestedlist.component.ts index f8d363a..4b79adf 100644 --- a/src/app/components/suggestedlist/suggestedlist.component.ts +++ b/src/app/components/suggestedlist/suggestedlist.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; import {Router} from "@angular/router"; +import {FamilyDataService} from "../../store/family-data.service"; @Component({ selector: 'app-suggestedlist', @@ -13,7 +14,14 @@ export class SuggestedlistComponent implements OnInit { constructor( public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, - private router: Router,) { } + private router: Router, + public familyDataService:FamilyDataService + ) { + addEventListener('family_refresh_after_suggest', () => { + this.getFamilySuggestList(); + }); + + } ngOnInit() { this.getFamilySuggestList(); @@ -30,24 +38,31 @@ export class SuggestedlistComponent implements OnInit { familySuggestData:any; suggested_count:number = 0; getFamilySuggestList(){ - this.usrData = { - action:13010, - member_id: this.sessionDataProviderService.member_id, - uid: this.sessionDataProviderService.member_uid, - sessionid: this.sessionDataProviderService.session, - 'limit': 30, - 'offset': 0 - }; - this.wrenchService.familySuggestList(this.usrData).subscribe( - familySuggestResult => { - this.familySuggestResult = familySuggestResult; - console.log("familySuggestResult RETURN->", this.familySuggestResult); - this.familySuggestData = this.familySuggestResult.result_list; - //debugger; - this.suggested_count = this.familySuggestData.length; - console.log("*** this.suggested_count ==== ",this.suggested_count) - } - ); + this.familySuggestData = this.familyDataService.familySuggestData; + this.suggested_count = this.familySuggestData?.length; + setTimeout(()=>{ + this.familySuggestData = this.familyDataService.familySuggestData; // just read no server reqyuest + this.suggested_count = this.familySuggestData?.length; + }, 5000); + + // this.usrData = { + // action:13010, + // member_id: this.sessionDataProviderService.member_id, + // uid: this.sessionDataProviderService.member_uid, + // sessionid: this.sessionDataProviderService.session, + // 'limit': 30, + // 'offset': 0 + // }; + // this.wrenchService.familySuggestList(this.usrData).subscribe( + // familySuggestResult => { + // this.familySuggestResult = familySuggestResult; + // console.log("familySuggestResult RETURN->", this.familySuggestResult); + // this.familySuggestData = this.familySuggestResult.result_list; + // //debugger; + // this.suggested_count = this.familySuggestData.length; + // console.log("*** this.suggested_count ==== ",this.suggested_count) + // } + // ); } getSuggestedDetails(item){ var stateParam = { diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index e3f4459..316790b 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -102,7 +102,7 @@ this.startUpCalls(); this.tasksDataService.getJobsData(); this.userWalletService.getWalletData(); this.bannersDataService.getBannersData(); - this.familyDataService.familySuggestData(); + this.familyDataService.getFamilySuggestList(); } async showAlert(mtitle: string, amessage: string) { diff --git a/src/app/pages/suggest/suggest.page.ts b/src/app/pages/suggest/suggest.page.ts index ed58c6f..703fa67 100644 --- a/src/app/pages/suggest/suggest.page.ts +++ b/src/app/pages/suggest/suggest.page.ts @@ -4,6 +4,7 @@ import {Router} from "@angular/router"; import {WrenchService} from "../../services/wrench.service"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import { OverlayEventDetail } from '@ionic/core/components'; +import {FamilyDataService} from "../../store/family-data.service"; @Component({ selector: 'app-suggest', @@ -22,12 +23,13 @@ isDisabled:boolean = true; private router: Router, private wrenchService: WrenchService, public sessionDataProviderService:SessionDataProviderService, - private loadingCtrl: LoadingController + private loadingCtrl: LoadingController, + public familyDataService:FamilyDataService ) { addEventListener('family_refresh_after_suggest', () => { this.tabs="lesson"; - this.getFamilySampleSuggest(); + //this.get(); }); } @@ -137,6 +139,7 @@ modalSeleted:any; console.log("suggestResult RETURN->", this.suggestResult); if (this.suggestResult?.internal_return >=0 && this.suggestResult?.suggest_id> 0){ this.suggestMessage="Send to parent."; + this.familyDataService.getFamilySuggestList(); dispatchEvent(new Event("family_refresh_after_suggest")); setTimeout(()=>{ this.suggestMessage=''; diff --git a/src/app/store/interval-refresh.service.ts b/src/app/store/interval-refresh.service.ts index 777f38a..62b1a75 100644 --- a/src/app/store/interval-refresh.service.ts +++ b/src/app/store/interval-refresh.service.ts @@ -35,7 +35,7 @@ export class IntervalRefreshService { this.usersoffersDataService.getMyOffersData(); if ( this.sessionDataProviderService.account_type=='FAMILY'){ - this.familyDataService.familySuggestData(); + this.familyDataService.getFamilySuggestList(); }