diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 78c03ae2..470486e8 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -65,14 +65,14 @@ - + diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index 60ff3b33..a352def4 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -52,7 +52,7 @@ {{userInfo.name_en}} - {{userInfo.job_en}} + {{jobName}} {{userInfo.mobile}} {{userInfo.email}} {{userInfo.company_url}} @@ -114,7 +114,7 @@ {{userInfo.name_en}} - {{userInfo.job_en}} + {{jobName}} {{userInfo.mobile}} {{userInfo.email}} {{userInfo.company_url}} diff --git a/Mohem/src/app/authentication/business-card/business-card.component.ts b/Mohem/src/app/authentication/business-card/business-card.component.ts index 28a3bde3..f98cb5a1 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.ts +++ b/Mohem/src/app/authentication/business-card/business-card.component.ts @@ -2,6 +2,8 @@ import { Component, OnInit, Input } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { AuthenticationService } from 'src/app/hmg-common/services/authentication/authentication.service'; +import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; @Component({ selector: 'app-business-card', @@ -12,15 +14,27 @@ export class BusinessCardComponent implements OnInit { public userInfo: any; public userJobName: any; + public jobName: any; constructor( public modalCtrl: ModalController, public ts: TranslatorService, - public common: CommonService + public common: CommonService, + public authService: AuthenticationService, ) { } ngOnInit() { this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); - console.log(this.userInfo); + + this.authService + .loadAuthenticatedUser() + .subscribe((user: AuthenticatedUser) => { + if (user) { + let jobTitle = user.POSITION_NAME.split('.'); + if (jobTitle && jobTitle.length > 1) { + this.jobName = jobTitle[0] + " " + jobTitle[1]; + } + } + }); } diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index fe589875..70345d87 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -142,7 +142,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 3.2; + request.VersionID = 3.3; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 62631565..70a9d157 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; - public static host = 'https://uat.hmgwebservices.com/'; - // public static host = 'https://hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 00f2cdef..0d778fa6 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -63,10 +63,10 @@ {{'general,other-services' | translate}} - + - + diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index 732b701b..1e28d33b 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -118,7 +118,7 @@ {{getDotted(item.description_Ar, 30)}} - {{isApproved ? "Appoved" :"Pending"}} + diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 95668d4d..37facd7a 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -1,7 +1,7 @@ diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html index 2f577610..1aff4ba1 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.html +++ b/Mohem/src/app/pending-transaction/home/home.component.html @@ -45,7 +45,7 @@ {{ 'general,to-date' | translate}} {{ts.trPK('userProfile','contact-details')}} - + @@ -118,14 +118,14 @@ - + + + {{ts.trPK('userProfile','note-part-1')}} {{ts.trPK('userProfile','note-part-2')}} @@ -209,7 +209,7 @@ - + diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index d9f61f5b..b109de5b 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -86,6 +86,7 @@ export class HomeComponent implements OnInit { this.basicDetailsSegment = false; this.addressSegment = false; this.familyMemberSegment = false; + this.contactSegment = false; } else if (this.targetValue === 'basicDetails') { this.personalInfoSegment = false; this.basicDetailsSegment = true; @@ -95,6 +96,7 @@ export class HomeComponent implements OnInit { this.personalInfoSegment = false; this.basicDetailsSegment = false; this.addressSegment = true; + this.contactSegment = true; this.familyMemberSegment = false; } else if (this.targetValue === 'fmaily') { this.personalInfoSegment = false; @@ -105,6 +107,7 @@ export class HomeComponent implements OnInit { this.personalInfoSegment = true; this.basicDetailsSegment = false; this.addressSegment = false; + this.contactSegment = false; this.familyMemberSegment = false; } }); @@ -172,8 +175,8 @@ export class HomeComponent implements OnInit { if (user) { console.log(user); this.personalInfo = user; - this.getPhoneNumbers(); - this.getContactInfo(); + // this.getPhoneNumbers(); + // this.getContactInfo(); let jobTitle = user.POSITION_NAME.split('.'); if (jobTitle && jobTitle.length > 1) { this.jobName = jobTitle[0] + " " + jobTitle[1]; @@ -321,7 +324,7 @@ export class HomeComponent implements OnInit { case "contact": this.personalInfoSegment = false; this.basicDetailsSegment = false; - this.addressSegment = false; + this.addressSegment = true; this.editBasic = false; this.editAddress = false; this.familyMemberSegment = false; @@ -343,13 +346,15 @@ export class HomeComponent implements OnInit { this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData'); this.openAddBasicDetails(); } else if (allowVal == 'contact') { - + // this.openAddAddress(); this.openContact() - } else if ('add-update-contact') { - this.transactionNo++; - this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData'); - this.cs.openAddUpdateContact(); - } else { + } + // else if ('add-update-contact') { + // this.transactionNo++; + // this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: undefined, transNo: this.transactionNo }, 'AddEITData'); + // this.cs.openAddUpdateContact(); + // } + else { this.openAddAddress(); } } diff --git a/Mohem/src/app/termination/termination-form/termination-form.component.html b/Mohem/src/app/termination/termination-form/termination-form.component.html index f8fa6523..19e39eee 100644 --- a/Mohem/src/app/termination/termination-form/termination-form.component.html +++ b/Mohem/src/app/termination/termination-form/termination-form.component.html @@ -12,7 +12,7 @@ - + {{'vacation-rule, next-label' | translate}} \ No newline at end of file
{{getDotted(item.description_Ar, 30)}}
{{isApproved ? "Appoved" :"Pending"}}