diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index 691379f..1372f4c 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -7,6 +7,11 @@ import {NavController} from "@ionic/angular"; import { AlertController } from '@ionic/angular'; //import { BarcodeScanner } from '@capacitor-community/barcode-scanner'; import { Preferences } from '@capacitor/preferences'; +import {MarketDataService} from "../../store/market-data.service"; +import {TasksDataService} from "../../store/tasks-data.service"; +import {BannersDataService} from "../../store/banners-data.service"; +import {UserWalletService} from "../../store/user-wallet.service"; +import {IntervalRefreshService} from "../../store/interval-refresh.service"; @Component({ selector: 'app-familylogin', @@ -29,7 +34,12 @@ export class FamilyloginPage implements OnInit { public sessionDataProviderService:SessionDataProviderService, public blogDataService:BlogDataService, private navctr: NavController, - private alertController: AlertController + private alertController: AlertController, + public marketDataService:MarketDataService, + public tasksDataService:TasksDataService, + public bannersDataService:BannersDataService, + public userWalletService: UserWalletService, + public intervalRefreshService: IntervalRefreshService ) { } @@ -59,7 +69,7 @@ export class FamilyloginPage implements OnInit { this.loginResult = loginResult; console.log("INTERNAL RETURN->" + this.loginResult.internal_return); if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) { - this.getBlogData(); + // this.getBlogData(); const setName = async () => { await Preferences.set({ @@ -69,7 +79,7 @@ export class FamilyloginPage implements OnInit { }; setName(); - +this.startUpCalls(); this.router.navigate(['tabs/tab1']); } else{ @@ -83,6 +93,15 @@ export class FamilyloginPage implements OnInit { this.navctr.back(); } + async startUpCalls(){ + this.intervalRefreshService.startIntervalCalls(); // anything with interval call + //this.marketDataService.getJobsData(); + this.getBlogData(); + this.tasksDataService.getJobsData(); + this.userWalletService.getWalletData(); + this.bannersDataService.getBannersData(); + } + async showAlert(mtitle: string, amessage: string) { const alert = await this.alertController.create({ header: 'WrenchBoard', diff --git a/src/app/pages/suggestdetails/suggestdetails.page.html b/src/app/pages/suggestdetails/suggestdetails.page.html index a3eb930..bba49ec 100644 --- a/src/app/pages/suggestdetails/suggestdetails.page.html +++ b/src/app/pages/suggestdetails/suggestdetails.page.html @@ -1,102 +1,120 @@ + + + + + + + + Suggestion Details + + - + + + + + + - - - - - - - {{suggestData.title}} - - - - - - - - - - - - - - - - {{suggestData.description}} + + {{suggestData.title}} + - - - - - Send: {{suggestData.added |date}} + + + + + + + + + + + + + {{suggestData.description}} + - - - Status: {{suggestData.status_text}} + + + + + Sent: {{suggestData.added |date}} + + + + Status: {{suggestData.status_text}} + - - - - Actions - - - History - - + + + Actions + + + History + + - - - - - Send Reminder - - - - - Cancel Request - - - - + + + + + Send Reminder + + + + + Cancel Request + + + + - - - - - + + + + + - - - - + + + + - - - + + + - - Why Using Figma ? - 10 mins + + Why Using Figma ? + 10 mins + + + + - - - + + - - - - - - Return - - - + + + + + + +