fix
This commit is contained in:
@@ -19,9 +19,9 @@ export class MermsDashPage implements OnInit {
|
||||
constructor(
|
||||
private router: Router,
|
||||
private mermsServiceProviderService: MermsServiceProviderService,
|
||||
private mermsSessionService : MermsSessionService
|
||||
private mermsSessionService: MermsSessionService
|
||||
) {
|
||||
this.welcomeName =this.mermsSessionService.getUserFormatedName();
|
||||
this.welcomeName = this.mermsSessionService.getUserFormatedName();
|
||||
this.currentDateFormated = this.mermsSessionService.getThisData();
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ export class MermsDashPage implements OnInit {
|
||||
};
|
||||
|
||||
cardData: any;
|
||||
pendingEncounterData:any;
|
||||
|
||||
getDashData() {
|
||||
console.log('MermsServiceProviderService::getDashData() ######## @@@@ ########');
|
||||
@@ -49,16 +50,30 @@ export class MermsDashPage implements OnInit {
|
||||
|
||||
try {
|
||||
this.mermsServiceProviderService.genericGetService('provider/recentencounter', this.currentProviderData).subscribe(cardData => {
|
||||
console.log("card data result 22k: ", this.cardData);
|
||||
if (cardData.hasOwnProperty('result_list') && Array.isArray(cardData['result_list'])) {
|
||||
|
||||
|
||||
console.log("card data result 22k: ", cardData[0]['payload']);
|
||||
this.cardData = cardData[0]['payload'];
|
||||
if (cardData.hasOwnProperty('payload') && Array.isArray(cardData['payload'])) {
|
||||
this.cardData = cardData['payload'];
|
||||
console.log("card data result 22k: ", this.cardData);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
try {
|
||||
this.mermsServiceProviderService.genericGetService('provider/pendingencounter', this.currentProviderData).subscribe(pendingEncounterData => {
|
||||
console.log("card data result 22k: ", pendingEncounterData[0]['payload']);
|
||||
this.pendingEncounterData = pendingEncounterData[0]['payload'];
|
||||
|
||||
});
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
|
||||
}
|
||||
|
||||
goSettings() {
|
||||
@@ -74,7 +89,7 @@ export class MermsDashPage implements OnInit {
|
||||
goHome() {
|
||||
|
||||
}
|
||||
goCalendar(){
|
||||
goCalendar() {
|
||||
this.router.navigateByUrl('/merms-calendar')
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user