From 0bf7dbd72e9f12e3d32cb0db2a166c252b9c8b1e Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Thu, 27 Jun 2019 09:18:53 +0300 Subject: [PATCH] dashboard update --- Mohem/src/app/app.component.html | 52 ++++-- Mohem/src/app/app.component.scss | 4 + Mohem/src/app/app.component.ts | 4 +- Mohem/src/app/home/home.page.html | 12 +- Mohem/src/assets/localization/i18n.json | 227 +++++++++++++++++++++--- 5 files changed, 253 insertions(+), 46 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index edf5dc1b..03b58f52 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -4,32 +4,50 @@ - +
-

{{"home.hello" | translate}}, {{User_name_Emp}}

+

{{ts.trPK('home','hello')}}, {{User_name_Emp}}

- + + + + + + + {{ts.trPK('userProfile','title')}} + + + - - - --> + + + {{ts.trPK('home','logout')}} + + + +
-

{{"userData.dashboard" | translate}}

+

{{ts.trPK('home','dashboard')}}, {{User_name_Emp}}

@@ -33,26 +33,26 @@ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index de7f67ff..5392d1e6 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -90,20 +90,6 @@ "ar":"تحقق مرة واحدة كلمة المرور" } }, -"changePassword":{ - "newPassword":{ - "en":"New Password", - "ar":"كلمة المرور الجديدة" - }, - "confirmPassword":{ - "en":"Confirm Password", - "ar":"تأكيد كلمة المرور" - }, - "passwordchanged":{ - "en":"Your password changed successfully", - "ar":"تم تغيير كلمة المرور الخاصة بك بنجاح" - } -}, "verificationcode": { "verificationcode":{ @@ -688,32 +674,231 @@ "home": { "dashboard":{ "en":"My Dashboard", - "ar":"" + "ar": "الرئيسية" }, "hello": { "en":"Hello", - "ar":"" + "ar":"مرحبا" }, "logout": { "en":"Logout", - "ar":"" + "ar":"تسجيل الخروج" }, "worklist":{ "en":"Work List", - "ar":"" + "ar":"قائمة العمل" }, "possitionAlert":{ "en":"The app could not access your location. Make sure that the location service is enabled from your device settings", - "ar":"" + "ar":"تعذر على التطبيق الوصول إلى موقعك. تأكد من تفعيل خدمة الموقع من إعدادات جهازك" }, "swipeAlertSuccess":{ "en":"Your swipe done successfully", - "ar":"" + "ar":"تم تسجيل الدخول بنجاح" }, "swipeAlertFailed":{ "en":"your swipe Failed, please try again...", - "ar":"" + "ar":"حدث خطاء في تسجيل الدخول فضلاً اعد المحاولة" } +}, +"userProfile": { + "title": + { + "en": "My Profile", + "ar":"معلوماتي" + }, + "empNo": { + "en": "Employee Number", + "ar":"الرقم الوظيفي" + + }, + "busG":{ + "en": "Business Group", + "ar":"مجموعة العمل" + }, + "job":{ + "en": "Job", + "ar":"الوظيفة" + }, + "locName":{ + "en": "Location Name", + "ar": "اسم الموقع" + }, + "payrol": { + "en":"Payroll", + "ar":"كشف الرواتب" + }, + "orgEmail": { + "en":"Organization Email Address", + "ar":"البريد الإلكتروني للمنشأة" + }, + "name":{ + "en": "Emplyee Name", + "ar":"اسم الموظف " + }, + "orgName": { + "en":"Organization Name", + "ar":"اسم المنشأة" + + }, + "position": { + "en":"Position", + "ar":"منصب" + }, + "grade":{ + "en": "Grade", + "ar":"الدرجة" + }, + "category": { + "en":"Category", + "ar":"الفئة" + } +}, +"changePassword": { + "successChange":{ + "en": "Password Changed successfully", + "ar":"تم تغيير كلمة المرور بنجاح" + }, + "currentPassword": { + "en":"Current Password", + "ar": "تغيير كلمة المرور" + }, + "confirmPassword": { + "en":"Confirm Password", + "ar":"" + }, + "newPassword": { + "en":"New Password", + "ar":"" + }, + "changePassword": { + "en":"Change Password", + "ar":"" + }, + "codeNumber": { + "en":"verification code", + "ar":"" + }, + "emptyNewPassword": { + "en":"Please fill New Password field", + "ar":"" + }, + "emptyOldPassword": { + "en":"Please fill Old Password field", + "ar":"" + }, + "emptyConfirmPassword": { + "en":"Please fill Confirm Password field", + "ar":"" + } +}, +"attendance": + { + "attendance":{ + "ar":"الحضور", + "en":"Attendance" + } +}, +"vacationRule": { + "vacationRule":{ + "en": "Vacation Rule", + "ar":"قواعد الإجازات" + }, + "ruleName": { + "en": "Rule Name", + "ar": "اسم القاعدة" + }, + "itemType": { + "en": "Item Type", + "ar": "نوع العنصر" + }, + "notification": { + "en": "Notification", + "ar":"إشعار" + }, + "status":{ + "en": "Status", + "ar": "حالة" + }, + "createRule": { + "en": "Create Rule", + "ar":"إنشاء قاعدة" + }, + "ruleInfo":{ + "en": "Rule Information", + "ar":"معلومات القاعدة" + }, + "deleteVR":{ + "en": "Are you sure you want to delete this rule?", + "ar":"هل تريد فعلا حذف هذه القاعدة؟" + }, + "tip":{ + "en": "

You can EDIT or DELETE your current rules or CREATE RULE

", + "ar":"

يمكنك تعديل أو حذف القواعد الحالية أو إنشاء قاعدة جديدة

" + } +}, +"absenceList": { + "absenceList":{ + "en": "Absence list", + "ar": "قائمة الإجازات" + }, + "accrualBalances":{ + "en": "Accrual Balances", + "ar": "رصيد حساب المستحقات" + }, + "createAbsence":{ + "en": "Create Absence", + "ar":"إنشاء إجازة" + }, + "startDate": { + "en":"Start Date", + "ar":"تاريخ البداية" + }, + "endDate":{ + "en": "End Date", + "ar":"تاريخ النهاية" + }, + "absenceType":{ + "en": "Absence Type", + "ar":"نوع الإجازة" + }, + "absenceCategory": { + "en":"Absence Category", + "ar":"فئة الإجازة" + }, + "days": { + "en":"Days", + "ar":"أيام" + }, + "hours": { + "en":"Hours", + "ar":"ساعات" + }, + "approvalStatus": { + "en":"Approval Status", + "ar":"حالة الموافقة" + }, + "absenceStatus": { + "en":"Absence Status", + "ar":"حالة الإجازة" + }, + "createAbs":{ + "en": "Create Absence", + "ar":"إضافة" + }, + "attach":{ + "en":"Attachments", + "ar":"المرفقات" + }, + "absHeader":{ + "en":"Absence Details", + "ar":"معلومات الإجازة" + }, + "attachList":{ + "en":"Attachment List", + "ar":"قائمة المرفقات" + + } } } \ No newline at end of file