From dc850735c46f13bd012411ad5adc7af58aa9df88 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 24 Dec 2023 18:30:41 -0500 Subject: [PATCH] job grp --- src/app/components/job-group/job-group.component.ts | 6 +++++- src/app/components/tracking/tracking.component.ts | 9 ++++++--- src/app/store/jobgroup-data.service.ts | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/components/job-group/job-group.component.ts b/src/app/components/job-group/job-group.component.ts index df3c6af..0980982 100644 --- a/src/app/components/job-group/job-group.component.ts +++ b/src/app/components/job-group/job-group.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 {LoadingController} from "@ionic/angular"; +import {JobgroupDataService} from "../../store/jobgroup-data.service"; @Component({ selector: 'app-job-group', @@ -12,8 +13,11 @@ export class JobGroupComponent implements OnInit { constructor( public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, + public jobgroupDataService: JobgroupDataService, private loadingCtrl: LoadingController) { } - ngOnInit() {} + ngOnInit() { + this.jobgroupDataService.getjobGroupData(); + } } diff --git a/src/app/components/tracking/tracking.component.ts b/src/app/components/tracking/tracking.component.ts index 382f48d..431c9f4 100644 --- a/src/app/components/tracking/tracking.component.ts +++ b/src/app/components/tracking/tracking.component.ts @@ -45,9 +45,12 @@ export class TrackingComponent implements OnInit { ionViewDidEnter() { //debugger; - setTimeout(async () => { - await this.createMap(); - }, 500); + this.platform.ready().then(() => { + this.createMap(); + }) + // setTimeout(async () => { + // await this.createMap(); + // }, 500); } ngOnInit() {} /** diff --git a/src/app/store/jobgroup-data.service.ts b/src/app/store/jobgroup-data.service.ts index 77f0257..1cd527a 100644 --- a/src/app/store/jobgroup-data.service.ts +++ b/src/app/store/jobgroup-data.service.ts @@ -19,7 +19,7 @@ export class JobgroupDataService { async getjobGroupData(){ var reqData = { - action:13025, + action:13045, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session,