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 a4763dde..0785bfb1 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.ts +++ b/Mohem/src/app/authentication/business-card/business-card.component.ts @@ -26,11 +26,10 @@ export class BusinessCardComponent implements OnInit { ngOnInit() { this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); this.direction = TranslatorService.getCurrentLanguageName(); - console.log(this.userInfo); - this.authService .loadAuthenticatedUser() .subscribe((user: AuthenticatedUser) => { + console.log(user); if (user) { let jobTitle = user.POSITION_NAME.split('.'); if (jobTitle && jobTitle.length > 1) { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 91774704..0094a606 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -437,6 +437,7 @@ export class WorklistMainComponent implements OnInit { result.GetAbsenceCollectionNotificationBodyList; } } else if (Type === "ADDRESS") { + console.log(result.GetAddressNotificationBodyList) if (result.GetAddressNotificationBodyList) { this.notificationBodyRes = result.GetAddressNotificationBodyList; diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html index 1aff4ba1..6ac756a4 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.html +++ b/Mohem/src/app/pending-transaction/home/home.component.html @@ -71,7 +71,7 @@
-
{{transaction.CREATION_DATE}}
+
{{transaction.CREATION_DATE}}

{{'transaction, created-for' | translate}}

diff --git a/Mohem/src/app/pending-transaction/home/home.component.scss b/Mohem/src/app/pending-transaction/home/home.component.scss index 1f4f2512..d5c8e7ac 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.scss +++ b/Mohem/src/app/pending-transaction/home/home.component.scss @@ -17,7 +17,7 @@ .color-black{ color:#000; } -.date{ +.date-en{ position: absolute; font-size: 14px; padding: 10px; @@ -26,6 +26,15 @@ color:#969696; margin: -8px; } +.date-ar{ + position: absolute; + font-size: 14px; + padding: 10px; + left: 10px; + width: 100px; + color:#969696; + margin: -8px; +} .transaction-list{ margin-top:20px; } diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 8cd0067e..8920347a 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -199,7 +199,7 @@ ion-thumbnail.menu-thumb { margin: -12px 0px 0px 25px; } .service-row-ar { - width: 108%; + width: 104%; margin: -12px 0px 0px 0px; } @@ -1178,7 +1178,7 @@ $actionBtnSize: 36px; .card-size-info-ar{ width: 90%; - right: 5%; + right: 3%; padding-right: 0px; margin-left: 0px; }