diff --git a/Mohem/src/app/eit/home/home.component.ts b/Mohem/src/app/eit/home/home.component.ts index 05bd9d7d..48026e4a 100644 --- a/Mohem/src/app/eit/home/home.component.ts +++ b/Mohem/src/app/eit/home/home.component.ts @@ -65,8 +65,10 @@ export class HomeComponent implements OnInit { this.cs.openEitListPage(); } else if (menuEntry.REQUEST_TYPE === 'BASIC_DETAILS') { this.cs.openProfile('basicDetails'); - } else if (menuEntry.REQUEST_TYPE === 'ADDRESS') { - this.cs.openProfile('address'); + } else if (menuEntry.REQUEST_TYPE === 'ADDRESS' || menuEntry.REQUEST_TYPE === 'PHONE_NUMBERS') { + this.cs.openProfile('contact'); + } else if (menuEntry.REQUEST_TYPE === 'CONTACT') { + this.cs.openProfile('family'); } if (menuEntry.REQUEST_TYPE === 'PAYSLIP') { this.cs.openPayslipPage(); diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index f75eadf0..cd57c27f 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -372,7 +372,9 @@ export class HomePage implements OnInit { this.openNotificationsDashbored(); this.showOpenMissingSwipes(); this.showAttendanceTracking(); - this.getAccrualBalance(); + var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); + if (!accrualBalance) + this.getAccrualBalance(); } public Vacation_Rule() { diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index f47eb954..287f4038 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -117,14 +117,14 @@ -

-
+
+ +
{{ts.trPK('userProfile','note-part-1')}}
{{ts.trPK('userProfile','note-part-2')}}
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 467a24dd..bcab0844 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -86,22 +86,29 @@ export class HomeComponent implements OnInit { this.basicDetailsSegment = false; this.addressSegment = false; this.familyMemberSegment = false; + this.contactSegment = false; + this.familyMemberSegment = false; } else if (this.targetValue === 'basicDetails') { this.personalInfoSegment = false; this.basicDetailsSegment = true; this.addressSegment = false; this.familyMemberSegment = false; - } else if (this.targetValue === 'address') { - this.personalInfoSegment = false; - this.basicDetailsSegment = false; - this.addressSegment = true; - this.familyMemberSegment = false; - } else if (this.targetValue === 'fmaily') { + } else if (this.targetValue === 'family') { this.personalInfoSegment = false; this.basicDetailsSegment = false; this.addressSegment = false; this.familyMemberSegment = true; - } else { + } else if (this.targetValue == 'contact') { + + this.personalInfoSegment = false; + this.basicDetailsSegment = false; + this.addressSegment = true; + this.editBasic = false; + this.editAddress = false; + this.familyMemberSegment = false; + this.contactSegment = true; + } + else { this.personalInfoSegment = true; this.basicDetailsSegment = false; this.addressSegment = false;