diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html index cd05247d..3b38814c 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.html @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}}
@@ -86,7 +86,7 @@ -
{{'confirmAddEit, comment' | translate}}
+
{{'confirmAddEit, comment' | translate}}
@@ -94,7 +94,7 @@
-
{{'confirmAddEit, approverList' | translate}}
+
{{'confirmAddEit, approverList' | translate}}

{{ 'general, empty' | translate}}

diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index fb652af8..7a1fc2ce 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -270,4 +270,16 @@ ion-card-content.confirm-details{ width: 80% !important; color: white!important; border-radius: 16px !important; + } + + .approvalTitle-ar{ + font-weight: bold; + font-size: 16px; + text-align: right; + + } + .approvalTitle{ + font-weight: bold; + font-size: 16px; + text-align: left; } \ No newline at end of file diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss index 269ef263..b9478dfa 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.scss @@ -89,9 +89,10 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: solid var(--gray) 1px; border-radius: 21px; // padding-left: 145px !important; - margin-left: 86px; + margin-left: 115px; // padding-right: 129px; - margin-right: -143px; + // margin-right: -143px; + margin-right: -136px; } // {padding-left: unset; // padding-right: unset; @@ -123,7 +124,7 @@ button.item-button.button.button-md.button-clear.button-clear-md { height: 60px; width: 60px; margin-left: -181px; - margin-right: 269px; + margin-right: 259px; } diff --git a/Mohem/src/app/absence/home/home.component.html b/Mohem/src/app/absence/home/home.component.html index 19cd5470..8447e812 100644 --- a/Mohem/src/app/absence/home/home.component.html +++ b/Mohem/src/app/absence/home/home.component.html @@ -50,8 +50,11 @@
- + +
diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 0cbd6a21..1f026374 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -152,7 +152,7 @@ width: 320px; padding-left: 51px; font-size: 14px; - margin-right: 116px; + margin-right: 75px; margin-bottom: -30px; } @@ -258,44 +258,45 @@ margin-top: -13px; width: 11%; height: 6px; } - .div-orng-ar{ - position: relative; - bottom: 59px; - color: black; - background-color: #DDB017; - // background-color: #1FA269; - width: 11%; - height: 6px; - right: 9px; - } .div-red-ar{ position: relative; - bottom: 131px; - color: black; - background-color: #CB3232; - width: 11%; - height: 6px; - right: 92px; - } - .div-red{ - position: relative; - left: 59%; - bottom: 146px; + bottom: 59px; color: black; + // background-color: #DDB017; background-color: #CB3232; - // background-color: #094875; width: 11%; height: 6px; + right: 16px; + } +// .div-red-ar{ +// position: relative; +// bottom: 131px; +// color: black; +// background-color: #CB3232; +// width: 11%; +// height: 6px; +// right: 92px; +// } +// .div-red{ +// position: relative; +// left: 59%; +// bottom: 146px; +// color: black; +// background-color: #CB3232; +// // background-color: #094875; +// width: 11%; +// height: 6px; +// } - .div-orng{ + .div-red{ position: relative; left: 82%; bottom: 80px; color: black; - // background-color: #CB3232; - background-color: #DDB017; + background-color: #CB3232; + // background-color: #DDB017; width: 11%; height: 6px; } @@ -307,5 +308,5 @@ margin-top: -13px; background-color: #1FA269; width: 11%; height: 6px; - right: 10px; + right: 16px; } diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 760b1f1f..fd50e4ef 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -114,7 +114,6 @@ export class HomeComponent implements OnInit { data: [this.accrualNet,this.accrualUsed], backgroundColor: [ '#1FA269', - '#DDB017', '#CB3232',], borderWidth: 2 } @@ -272,7 +271,6 @@ createAbsence() { { data: [this.accrualNet,this.accrualUsed], backgroundColor: [ '#1FA269', - '#DDB017', '#CB3232',], borderWidth: 2 } diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 25cba6c1..682c66b4 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -15,7 +15,9 @@ {{ts.trPK('submitAbsence','startDate')}} - + {{ts.trPK('submitAbsence','startTime')}} @@ -23,7 +25,9 @@ {{ts.trPK('submitAbsence','endDate')}} - + diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 3a2dbe2b..fc438362 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -15,7 +15,7 @@
- +

{{User_name_Emp}}

{{User_Job_name}}

@@ -26,7 +26,7 @@

- + @@ -58,13 +58,13 @@ - +
-
- + @@ -155,7 +155,7 @@
diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 5b3cf302..1579bf40 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -61,8 +61,7 @@ header border-radius: 50% !important; position: relative; color: #7f8c8d; - - + } .changeImgBtn{ @@ -236,6 +235,38 @@ padding: 6px 24px; margin-bottom: -28px; } +.list-en{ + margin-left: 0; + margin-right: 0; + margin-top: -19px; + margin-bottom: 0; + padding-left: 0; + padding-right: 0; + padding-top: 0px; + padding-bottom: 8px; + +} + + +.list-ar{ + margin-left: 0; + margin-right: 0; + margin-top: -19px; + margin-bottom: 0; + padding-left: 0; + padding-right: 0; + padding-top: 0px; + padding-bottom: 8px; + +} +// .sidebar-menu .header-div { + +// text-transform: capitalize; +// height: 100px; +// position: relative; +// display: block; +// margin-bottom: -28px; +// } .list-md .item-block .item-inner, .list-ios .item-block .item-inner { border-color: var(--primary); @@ -279,6 +310,7 @@ button.menu-item.item.item-block.item-ios { width: 100%; } + .menuFooter div { width: 80px; // height: 80px; @@ -286,16 +318,28 @@ button.menu-item.item.item-block.item-ios { } -.menuFooter .CompanyImg { - width: 100%; - height: 100%; +// .menuFooter .CompanyImg { +// width: 100%; +// height: 100%; +// } + + +.menuFooter .CompanyImg{ + width: 80%; + height: 80%; + margin-bottom: -21px; } +// .logoImg{ +// width: 120px; +// position: relative; +// } + .logoImg{ - width: 120px; - position: relative; + width: 77px; + position: relative; + margin-top: -1px; } - .companyTxt { font-size: 12px; color: var(--customnavy); @@ -316,16 +360,31 @@ font-weight: bolder !important; font-weight: bolder !important; } +.profileDiv-ar{ + margin: 5px auto !important; +} -.profileImg{ - width: 160px; - height: 160px; - display: -webkit-inline-box; - display: inline-flex; - overflow: hidden; - background: transparent; - border-radius: 70% !important; - position: relative; - top: 7px; +// .profileImg{ +// width: 160px; +// height: 160px; +// display: -webkit-inline-box; +// display: inline-flex; +// overflow: hidden; +// background: transparent; +// border-radius: 70% !important; +// position: relative; +// top: 7px; +// } + +.profileImg{ + width: 140px; + height: 140px; + display: -webkit-inline-box; + display: inline-flex; + overflow: hidden; + background: transparent; + border-radius: 70% !important; + position: relative; + top: 3px; } \ No newline at end of file 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 05b56ff0..0b8b64df 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 @@ -10,7 +10,7 @@ -
{{'general, addAttach' | translate}}
+
{{'general, addAttach' | translate}}
@@ -86,7 +86,7 @@ -
{{'confirmAddEit, comment' | translate}}
+
{{'confirmAddEit, comment' | translate}}
@@ -94,7 +94,7 @@
-
{{'confirmAddEit, approverList' | translate}}
+
{{'confirmAddEit, approverList' | translate}}

{{ 'general, empty' | translate}}

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 908f7d32..70247b93 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 @@ -240,4 +240,16 @@ width: 80% !important; color: white!important; border-radius: 16px !important; -} \ No newline at end of file +} + +.approvalTitle-ar{ + font-weight: bold; + font-size: 16px; + text-align: right; + +} +.approvalTitle{ + font-weight: bold; + font-size: 16px; + text-align: left; +} diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 64c9c34f..5e2466b4 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -14,15 +14,26 @@
-
- + + +
- + diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index 8304f3dd..fa1450e9 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -14,6 +14,7 @@

{{totalEmployees}}

{{ts.trPK('myTeam','total')}}
{{ts.trPK('myTeam','team-members')}}
+
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index 8266747c..5fbd6377 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -88,9 +88,9 @@ button.item-button.button.button-md.button-clear.button-clear-md { border: solid var(--gray) 1px; border-radius: 21px; // padding-left: 145px !important; - margin-left: 86px; - padding-right: 129px; - margin-right: -143px; + margin-left: 123px; + // padding-right: 129px; + margin-right: -136px; } .filterBtn{ @@ -111,8 +111,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 50%; height: 60px; width: 60px; - margin-left: -181px; - margin-right: 269px; + margin-left: -183px; + margin-right: 260px; } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index 030fd170..33b67cfb 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -1,7 +1,7 @@

{{ts.trPK('general','advanced-search')}}

- +
diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss index f842613c..bef3801b 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.scss @@ -26,6 +26,10 @@ margin-bottom: 20px; } } + +.cancel-ar{ + margin-right: 239px; +} .search-button{ background: #3dcab3; height: 50px; diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts index 5f393e89..8b9db09f 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.ts @@ -16,11 +16,14 @@ export class WorklistAdvancedSearchComponent implements OnInit { public selectedValue = ''; public notificationType = ''; public itemType = ''; + public direction: string; constructor( public modalController: ModalController, public ts: TranslatorService - ) { } + ) { + this.direction = TranslatorService.getCurrentLanguageName(); + } ngOnInit() {} diff --git a/Mohem/src/app/payslip/home/home.component.scss b/Mohem/src/app/payslip/home/home.component.scss index 4d072688..e99ebbd6 100644 --- a/Mohem/src/app/payslip/home/home.component.scss +++ b/Mohem/src/app/payslip/home/home.component.scss @@ -12,7 +12,7 @@ border-bottom-left-radius: -10px !important; padding-top: 8px; padding-bottom: 8px; - margin-left: 18px; + margin-left: 8px; font-size: 12px !important; } .colPayslips{ @@ -34,6 +34,7 @@ font-size: 13px !important; // font-weight: bold !important; font-family: WorkSans-Bold; + margin-left: 8px; } .earingTotH{ text-align: right; diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html index f92e9ad2..692a683a 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html @@ -23,11 +23,24 @@ - - - + + + + - + + + + diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index 602cf3e7..b8e5d124 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -41,6 +41,10 @@ button.item-button.button.button-md.button-clear.button-clear-md { // margin-right: 7%; // width: 100%; // } +.ion-item-ar{ + margin-top: 5%; + margin-right: -6%; +} .ionItem{ border: #e4e4e4 solid; /* margin: 6px; */ @@ -108,13 +112,12 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - // padding-left: 100px !important; - margin-left: 86px; - // padding-right: 129px; - margin-right: -139px; + margin-left: 115px; + margin-right: -132px; } .filterBtn{ @@ -131,8 +134,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 50%; height: 60px; width: 60px; - margin-left: -167px; - margin-right: 247px; + margin-left: -201px; + margin-right: 282px; } *{ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 8977dc37..8e54d034 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -15,7 +15,7 @@ }, "login": { "en": "Login", - "ar": "الدخول" + "ar": "تسجيل الدخول" }, "username": { "en": "User Name", @@ -52,7 +52,7 @@ }, "changepassword": { "en": "Change Password", - "ar": "غير كلمة السر" + "ar": "تغيير كلمة المرور" }, "announcement":{ "en":"Announcement", @@ -899,7 +899,7 @@ }, "worklist": { "en": "Work List", - "ar": "قائمة العمل" + "ar": "الطلبات المعلقة" }, "pending-request":{ "en":"Penading Request", @@ -908,7 +908,7 @@ }, "missing-swipes":{ "en":"Missing Swipes", - "ar":"البصمات المفقوده" + "ar":"فقدان البصمة" }, "leave-balance":{ "en":"Leave Balance", @@ -1036,7 +1036,7 @@ }, "busG": { "en": "Business Group", - "ar": "مجموعة العمل" + "ar": "الإدارة" }, "phone-no": { "en": "Phone Number", @@ -1060,7 +1060,7 @@ }, "payrol": { "en": "Payroll", - "ar": "كشف الرواتب" + "ar": "المشروع" }, "orgEmail": { "en": "Organization Email Address", @@ -1155,7 +1155,7 @@ "en": "Monthly Attendance" }, "monthly-attendance-calendar": { - "ar": "تقويم الحضور الشهري", + "ar": "سجل الحضور الشهري", "en": "Monthly Attendance Calendar" }, "completed": { @@ -1515,15 +1515,15 @@ }, "myTeam-header": { "en": "My Team", - "ar": "فريقى" + "ar": "فريقي" }, "total": { "en": "TOTAL", - "ar": "المجموع" + "ar": "عدد" }, "team-members": { "en": "TEAM MEMBERS", - "ar": "اعضاء الفريق" + "ar": " اعضاء الفريق" }, "team-stats": { "en": "Team Statistics",