diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index 0b8b64df..a3a64748 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -1,10 +1,11 @@ - {{headerTitle}} + {{headerTitle}} + diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss index 70247b93..dcfa8ed2 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.scss @@ -229,7 +229,14 @@ .header-toolbar-new{ --background: #22c6b3; } - +.title{ + margin-top: -37px; + margin-left: 85px; +} +.title-ar{ + margin-top: -37px; + margin-right: 101px; +} .confirmEitOkButton{ white-space: normal !important; text-transform: capitalize !important; diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts index 7f393498..105d71a1 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.ts @@ -75,7 +75,8 @@ export class FileUploderProfileComponent implements OnInit { async openFile() { const actionSheet = await this.actionSheetCtrl.create({ - header: 'Change Profile Photo', + // header: 'Change Profile Photo', + header: this.ts.trPK('userProfile', 'changeImg'), buttons: [{ // text: 'Delete Current Image', // role: 'destructive', @@ -85,7 +86,8 @@ export class FileUploderProfileComponent implements OnInit { // this.deleteCurrent(); // } // },{ - text: 'Take Photo', + // text: 'Take Photo', + text: this.ts.trPK('general', 'takePhoto'), icon: 'camera', handler: () => { console.log('Take Photo'); @@ -94,7 +96,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Choose from Library', + // text: 'Choose from Library', + text: this.ts.trPK('general', 'Choose-from-Library'), icon: 'images', handler: () => { console.log('Favorite clicked'); @@ -102,7 +105,8 @@ export class FileUploderProfileComponent implements OnInit { } }, { - text: 'Cancel', + // text: 'Cancel', + text: this.ts.trPK('general', 'cancel'), icon: 'close', role: 'cancel', handler: () => { diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index fa1450e9..5af1f667 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -45,7 +45,7 @@ - + diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html index da57e57b..8aac3734 100644 --- a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html +++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html @@ -13,7 +13,7 @@ style="margin-right: -22px;margin-top: -10px;"> -

More Action

+

{{ts.trPK('general','moreAction')}}

diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index f87f27f3..6235a216 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -71,7 +71,7 @@
- Employee will also on leave
+ {{ts.trPK('worklistMain','employee-on-leave')}}
@@ -102,12 +102,12 @@ -
+
-
+
@@ -240,7 +240,7 @@ --> -
Employee Detail
+
{{'userProfile, emp-detail' | translate}}
diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 59845218..3e914c50 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -3,6 +3,7 @@ + {{ts.trPK('userProfile','changepicture')}} diff --git a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html index e7dc61b3..997f0b79 100644 --- a/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html +++ b/Mohem/src/app/vacation-rule/create-vacation-rule/create-vacation-rule.component.html @@ -41,13 +41,15 @@ {{'vacation-rule, start-date' | translate}} - + {{'vacation-rule, end-date' | translate}} - + {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html index a216c9cc..f4fa3715 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.html @@ -118,12 +118,14 @@ {{'vacation-rule, start-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, end-date' | translate}} + placeholder="MM/DD/YYYY hh:mm:ss A" required cancelText="{{ts.trPK('general','cancel')}}" + doneText="{{ts.trPK('general','done')}}"> {{'vacation-rule, message-label' | translate}} diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 94277c80..0f337db3 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,10 +249,22 @@ "en": "Cancel", "ar": "إلغاء" }, + "takePhoto": { + "en": "Take Photo", + "ar": "أخذ صورة" + }, + "Choose-from-Library": { + "en": "Choose from Library", + "ar": " الإختيار من قائمة الصور" + }, "done": { "en": "Done", "ar": "تم" }, + "moreAction": { + "en": "More Action", + "ar": "المزيد" + }, "close": { "en": "Close", "ar": "إغلق" @@ -994,7 +1006,7 @@ }, "changepicture": { "en": "Change Picture", - "ar": "تغيير الصوره" + "ar": "تغيير الصورة" }, "empNo": { "en": "Employee Number", @@ -1970,6 +1982,10 @@ "en": "Employee Information", "ar": "معلومات الموظف" }, + "employee-on-leave": { + "en": "Employee will also on leave", + "ar": "الموظف سوف يكون في اجازة ايضا" + }, "info": { "en": "Info", "ar": "تفاصيل"