bug fixes

merge-update-with-lab-changes
Sultan Khan 5 years ago
parent 8d7cc20b70
commit 8c5746f7b1

@ -111,10 +111,7 @@ const Map localizedValues = {
'login': {'en': 'Login', 'ar': 'تسجيل الدخول'}, 'login': {'en': 'Login', 'ar': 'تسجيل الدخول'},
'loginregister': {'en': 'Login / Register', 'ar': 'تسجيل الدخول'}, 'loginregister': {'en': 'Login / Register', 'ar': 'تسجيل الدخول'},
'poweredBy': {'en': 'Powered By', 'ar': 'مشغل بواسطة'}, 'poweredBy': {'en': 'Powered By', 'ar': 'مشغل بواسطة'},
"welcome": { "welcome": {"en": "Welcome", "ar": "مرحبا"},
"en": "Welcome",
"ar": "مرحبا"
},
"welcome_text": { "welcome_text": {
"en": "Dr. Sulaiman Al Habib Mobile Application", "en": "Dr. Sulaiman Al Habib Mobile Application",
"ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك" "ar": "الدكتور سليمان الحبيب لتطبيقات الهاتف المتحرك"
@ -130,12 +127,11 @@ const Map localizedValues = {
"ar": "اختر من الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي." "ar": "اختر من الخيارات أدناه لتسجيل الدخول إلى ملفك الطبي."
}, },
"registernow": {"en": "Register Now", "ar": "تسجيل الان"}, "registernow": {"en": "Register Now", "ar": "تسجيل الان"},
"nationalID": { "en": "Enter the Identification Number", "nationalID": {
"ar": "أدخل رقم الهوية الوطنية او الاقامة"}, "en": "Enter the Identification Number",
"national-id": { "ar": "أدخل رقم الهوية الوطنية او الاقامة"
"en": "National ID",
"ar": "رقم الهوية"
}, },
"national-id": {"en": "National ID", "ar": "رقم الهوية"},
"fileNo": {"en": "File Number", "ar": "رقم الملف"}, "fileNo": {"en": "File Number", "ar": "رقم الملف"},
"fileno": {"en": "File No", "ar": "رقم الملف"}, "fileno": {"en": "File No", "ar": "رقم الملف"},
"forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"}, "forgotFileNo": {"en": "Forgot file Number?", "ar": "نسيت رقم الملف الطبي؟"},
@ -680,38 +676,20 @@ const Map localizedValues = {
}, },
// pharmacy module // pharmacy module
"medicationRefill": { "medicationRefill": {"en": "MEDICATION REFILL", "ar": "إعادة تعبئة الدواء"},
"en": "MEDICATION REFILL",
"ar": "إعادة تعبئة الدواء"
},
"offersAndPromotions": { "offersAndPromotions": {
"en": "OFFERS & SPECIAL PROMOTIONS", "en": "OFFERS & SPECIAL PROMOTIONS",
"ar": "العروض والترقيات الخاصة" "ar": "العروض والترقيات الخاصة"
}, },
"myPrescriptions": { "myPrescriptions": {"en": "MY PRESCRIPTIONS", "ar": "وصفاتي"},
"en": "MY PRESCRIPTIONS",
"ar": "وصفاتي"
},
"searchAndScanMedication": { "searchAndScanMedication": {
"en": "SEARCH & SCAN FOR MEDICATION", "en": "SEARCH & SCAN FOR MEDICATION",
"ar": "البحث والمسح للأدوية" "ar": "البحث والمسح للأدوية"
}, },
"shopByBrands": { "shopByBrands": {"en": "Shop By Brands", "ar": "تسوق حسب الماركات"},
"en": "Shop By Brands", "recentlyViewed": {"en": "Recently Viewed", "ar": "شوهدت مؤخرا"},
"ar": "تسوق حسب الماركات" "bestSellers": {"en": "Best Sellers", "ar": "أفضل البائعين"},
}, "deleteAllItems": {"en": "Delete All Items", "ar": "حذف كافة العناصر"},
"recentlyViewed": {
"en": "Recently Viewed",
"ar": "شوهدت مؤخرا"
},
"bestSellers": {
"en": "Best Sellers",
"ar": "أفضل البائعين"
},
"deleteAllItems": {
"en": "Delete All Items",
"ar": "حذف كافة العناصر"
},
"select-gender": {"en": "Select Gender", "ar": "اختر الجنس"}, "select-gender": {"en": "Select Gender", "ar": "اختر الجنس"},
"i-am-a": {"en": "I am a ...", "ar": "أنا ..."}, "i-am-a": {"en": "I am a ...", "ar": "أنا ..."},
"select-age": {"en": "Select Your Age", "ar": "حدد العمر"}, "select-age": {"en": "Select Your Age", "ar": "حدد العمر"},
@ -720,9 +698,12 @@ const Map localizedValues = {
"drag-point": { "drag-point": {
"en": "Drag point to change your age", "en": "Drag point to change your age",
"ar": "اسحب لتغيير عمرك" "ar": "اسحب لتغيير عمرك"
},"HHCNotAuthMsg": { },
"en": "This service provides a set of home health care services, continuous and comprehensive follow-up in their places of residence for those who cannot access health facilities, such as (laboratory analyzes - radiology - vaccinations - physical therapy), etc.", "HHCNotAuthMsg": {
"ar": "من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة" "en":
"This service provides a set of home health care services, continuous and comprehensive follow-up in their places of residence for those who cannot access health facilities, such as (laboratory analyzes - radiology - vaccinations - physical therapy), etc.",
"ar":
"من خلال هذه الخدمة يمكنك طلب مجموعة من الفحوصات التي تساعدك وتساعد طبيبك في فهم حالتك الصحية الحالية ومن ثم تحديد المخاطر المحتملة"
}, },
"email": {"en": "Email", "ar": "البريد الالكتروني"}, "email": {"en": "Email", "ar": "البريد الالكتروني"},
"Book": {"en": "Book", "ar": "احجز"}, "Book": {"en": "Book", "ar": "احجز"},
@ -912,8 +893,14 @@ const Map localizedValues = {
"LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"}, "LiveChat": {"en": "Live Chat", "ar": "محادثة مباشرة"},
"Service": {"en": "Service", "ar": "خدمة"}, "Service": {"en": "Service", "ar": "خدمة"},
"HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'}, "HMGServiceLabel": {"en": "HMG Service", 'ar': 'خدمات الحبيب'},
"HealthWeatherIndicators": {"en": "Health Weather Indicators", 'ar': ' مؤشرات الطقس الصحية '}, "HealthWeatherIndicators": {
"HealthTipsBasedOnCurrentWeather": {"en": "Health Tips Based On Current Weather", 'ar': ' نصائح صحية على أساس الطقس الحالي '}, "en": "Health Weather Indicators",
'ar': ' مؤشرات الطقس الصحية '
},
"HealthTipsBasedOnCurrentWeather": {
"en": "Health Tips Based On Current Weather",
'ar': ' نصائح صحية على أساس الطقس الحالي '
},
"MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "}, "MoreDetails": {"en": "More details", "ar": " المزيد من التفاصيل "},
"SendCopy": {"en": "Send Copy", "ar": "ارسال نسخة"}, "SendCopy": {"en": "Send Copy", "ar": "ارسال نسخة"},
"ResendOrder": {"en": "Resend order & deliver", "ar": "إعادة طلب و توصيل"}, "ResendOrder": {"en": "Resend order & deliver", "ar": "إعادة طلب و توصيل"},
@ -922,125 +909,59 @@ const Map localizedValues = {
"Average": {"en": "Average", "ar": "المعدل"}, "Average": {"en": "Average", "ar": "المعدل"},
"DailyDoses": {"en": "Daily Doses", "ar": "جرعات يومية"}, "DailyDoses": {"en": "Daily Doses", "ar": "جرعات يومية"},
"Period": {"en": "Period", "ar": "الفترة"}, "Period": {"en": "Period", "ar": "الفترة"},
"cm": { "cm": {"en": "CM", "ar": "سم"},
"en": "CM", "kg": {"en": "kg", "ar": "كجم"},
"ar": "سم" "mass": {"en": "Mass", "ar": "كتلة"},
}, "temp-c": {"en": "°C", "ar": "°س"},
"kg": { "bpm": {"en": "bpm", "ar": "نبضة"},
"en": "kg", "respiration-signs": {"en": "Respiration", "ar": "تنفس"},
"ar": "كجم" "sys-dias": {"en": "SBP/DBP", "ar": "إنقباض/إنبساط"},
}, "body": {"en": "Body \n Mass", "ar": "كتلة\nالجسم"},
"mass": { "feedback": {"en": "Feedback", "ar": "رأيك يهمنا"},
"en": "Mass", "send": {"en": "Send", "ar": "أرسل"},
"ar": "كتلة" "status": {"en": "Status", "ar": "الحالة"},
},
"temp-c": {
"en": "°C",
"ar": "°س"
},
"bpm": {
"en": "bpm",
"ar": "نبضة"
},
"respiration-signs": {
"en": "Respiration",
"ar": "تنفس"
},
"sys-dias": {
"en": "SBP/DBP",
"ar": "إنقباض/إنبساط"
},
"body": {
"en": "Body \n Mass",
"ar": "كتلة\nالجسم"
},
"feedback": {
"en": "Feedback",
"ar": "رأيك يهمنا"
},
"send": {
"en": "Send",
"ar": "أرسل"
},
"status": {
"en": "Status",
"ar": "الحالة"
},
"like-to-hear": { "like-to-hear": {
"en": "We would love to hear the feedback, concerns on healthcare services and eServices experience. Please use the below form", "en":
"ar": "يسعدنا سماع ملاحظاتك حول خدمات الرعاية الصحية والخدمات الإلكترونية. يرجى تعبئة الحقول المطلوبة" "We would love to hear the feedback, concerns on healthcare services and eServices experience. Please use the below form",
}, "ar":
"subject": { "يسعدنا سماع ملاحظاتك حول خدمات الرعاية الصحية والخدمات الإلكترونية. يرجى تعبئة الحقول المطلوبة"
"en": "Subject",
"ar": "الموضوع"
},
"message": {
"en": "Message",
"ar": "رسالة"
}, },
"subject": {"en": "Subject", "ar": "الموضوع"},
"message": {"en": "Message", "ar": "رسالة"},
"empty-subject": { "empty-subject": {
"en": "Please enter the subject", "en": "Please enter the subject",
"ar": "يرجى ادخال الموضوع" "ar": "يرجى ادخال الموضوع"
}, },
"empty-message": { "empty-message": {"en": "Please enter message", "ar": "يرجى ادخال الموضوع"},
"en": "Please enter message", "select-attachment": {"en": "Select Attachment", "ar": "إختر المرفق"},
"ar": "يرجى ادخال الموضوع" "complain-appo": {"en": "Complaint for appointment", "ar": "شكوى على موعد"},
},
"select-attachment": {
"en": "Select Attachment",
"ar": "إختر المرفق"
},
"complain-appo": {
"en": "Complaint for appointment",
"ar": "شكوى على موعد"
},
"complain-without-appo": { "complain-without-appo": {
"en": "Complaint without appointment", "en": "Complaint without appointment",
"ar": "شكوى بدون موعد" "ar": "شكوى بدون موعد"
}, },
"question": { "question": {"en": "Question", "ar": "سؤال"},
"en": "Question", "message-type": {"en": "Message Type", "ar": "نوع الرسالة"},
"ar": "سؤال" "compliment": {"en": "compliment", "ar": "ثناء"},
}, "suggestion": {"en": "Suggestion", "ar": "إقتراح"},
"message-type": { "your-feedback": {"en": "Your feedback was sent", "ar": "إقتراح"},
"en": "Message Type",
"ar": "نوع الرسالة"
},
"compliment": {
"en": "compliment",
"ar": "ثناء"
},
"suggestion": {
"en": "Suggestion",
"ar": "إقتراح"
},
"your-feedback": {
"en": "Your feedback was sent",
"ar": "إقتراح"
},
"select-part": { "select-part": {
"en": "Please select the part that complain about", "en": "Please select the part that complain about",
"ar": "يرجى تحديد الجزء الذي تشكو منه" "ar": "يرجى تحديد الجزء الذي تشكو منه"
}, },
"number": { "number": {"en": "Number", "ar": "الرقم"},
"en": "Number", "not-classified": {"en": "Not classified", "ar": "غير محدد"},
"ar": "الرقم"
},
"not-classified": {
"en": "Not classified",
"ar": "غير محدد"
},
"selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"}, "selectClinic": {"en": "Select Clinic", "ar": " بحث بالعيادة"},
"reviews": {"en": "Reviews", "ar": "تقييمات"}, "reviews": {"en": "Reviews", "ar": "تقييمات"},
"searchItemError": {"en": "Item name should be more than 3 character ", "ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"}, "searchItemError": {
"en": "Item name should be more than 3 character ",
"ar": "يجب أن يكون اسم العنصر أكثر من 3 أحرف"
},
"YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "}, "YouCanFind": {"en": "You Can Find ", "ar": "باستطاعتك العثور على "},
"ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "}, "ItemInSearch": {"en": " Item In Search", "ar": " عنصر في البحث "},
"blood-donation": { "blood-donation": {"en": "Blood Donation", "ar": "التبرع بالدم"},
"en": "Blood Donation",
"ar": "التبرع بالدم"
},
"blood-instruction": { "blood-instruction": {
"en": "Enter the required information, In order to register for Blood Donation Service", "en":
"Enter the required information, In order to register for Blood Donation Service",
"ar": "ادخل المعلومات المطلوبة للتسجيل بخدمة التبرع بالدم" "ar": "ادخل المعلومات المطلوبة للتسجيل بخدمة التبرع بالدم"
}, },
"view-terms": { "view-terms": {
@ -1050,64 +971,26 @@ const Map localizedValues = {
"InvoiceNo": {"en": " Invoice No", "ar": "رقم الفاتورة"}, "InvoiceNo": {"en": " Invoice No", "ar": "رقم الفاتورة"},
"SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"}, "SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
"GeneralResult": {"en": "General Result", "ar": "نتيجة عامة"}, "GeneralResult": {"en": "General Result", "ar": "نتيجة عامة"},
"show-more-btn": { "show-more-btn": {"en": "Flow Chart", "ar": "النتائج التراكمية"},
"en": "Flow Chart",
"ar": "النتائج التراكمية"
},
"value": { "value": {"en": "Value", "ar": "القيمة"},
"en": "Value", "range": {"en": "Range", "ar": "المدى"},
"ar": "القيمة" "out-patient": {"en": "Out Patient", "ar": "عيادات خارجية"},
}, "in-patient": {"en": "In Patient", "ar": "تنويم"},
"range": { "report": {"en": "Radiology Report", "ar": "تقرير الاشعة"},
"en": "Range", "open-rad": {"en": "Open Image", "ar": "فتح صور الاشعة"},
"ar": "المدى" "send-copy": {"en": "Email the Report", "ar": "أرسل التقرير"},
}, "appoSurvey": {"en": "Survey", "ar": "إستبيان"},
"out-patient": { "appoSurveySubtitle": {"en": "Survey", "ar": "إستبيان"},
"en": "Out Patient",
"ar": "عيادات خارجية"
},
"in-patient": {
"en": "In Patient",
"ar": "تنويم"
},
"report": {
"en": "Radiology Report",
"ar": "تقرير الاشعة"
},
"open-rad": {
"en": "Open Image",
"ar": "فتح صور الاشعة"
},
"send-copy": {
"en": "Email the Report",
"ar": "أرسل التقرير"
},
"appoSurvey": {
"en": "Survey",
"ar": "إستبيان"
},
"appoSurveySubtitle": {
"en": "Survey",
"ar": "إستبيان"
},
"vaccination": { "vaccination": {"en": "Vaccination", "ar": "جدول التطعيمات"},
"en": "Vaccination", "welcomeBack": {"en": "Welcome back", "ar": "مرحبا مرة أخرى"},
"ar": "جدول التطعيمات"
},
"welcomeBack": {
"en": "Welcome back",
"ar": "مرحبا مرة أخرى"
},
"instructions": { "instructions": {
"en": "Please ensure that the email address is up-to-date and process to view the schedule", "en":
"Please ensure that the email address is up-to-date and process to view the schedule",
"ar": "يرجى التأكد من صحة عنوان البريد الالكتروني و المتابعة لعرض الجدول " "ar": "يرجى التأكد من صحة عنوان البريد الالكتروني و المتابعة لعرض الجدول "
}, },
"update-email": { "update-email": {"en": "Update Email", "ar": "تحديث البريد الالكتروني"},
"en": "Update Email",
"ar": "تحديث البريد الالكتروني"
},
"updated-email": { "updated-email": {
"en": "Updated email successfully", "en": "Updated email successfully",
@ -1119,42 +1002,19 @@ const Map localizedValues = {
"ar": "عرض قائمة الأطفال" "ar": "عرض قائمة الأطفال"
}, },
"add-child": { "add-child": {"en": "Add New Child", "ar": "اضافة طفل"},
"en": "Add New Child", "child-name": {"en": "Child Name", "ar": "اسم الطفل"},
"ar": "اضافة طفل" "childDob": {"en": "Birth Date", "ar": "تاريخ الولادة"},
}, "delete": {"en": "Delete", "ar": "حذف"},
"child-name": {
"en": "Child Name",
"ar": "اسم الطفل"
},
"childDob": {
"en": "Birth Date",
"ar": "تاريخ الولادة"
},
"delete": {
"en": "Delete",
"ar": "حذف"
},
"deleted-child-mes": { "deleted-child-mes": {
"en": "The request was successful. The children have removed from the vaccination schedule subscription service.", "en":
"The request was successful. The children have removed from the vaccination schedule subscription service.",
"ar": "تم حذف الطفل بنجاح" "ar": "تم حذف الطفل بنجاح"
}, },
"deleted-child":{ "deleted-child": {"en": "Delete child", "ar": "إالغاء الطفل"},
"en":"Delete child", "visit": {"en": "Visit", "ar": "زيارة"},
"ar":"إالغاء الطفل" "description-vaccination": {"en": "Description", "ar": "وصف"},
}, "due-date": {"en": "Due date", "ar": "تاريخ الاستحقاق"},
"visit": {
"en": "Visit",
"ar": "زيارة"
},
"description-vaccination": {
"en": "Description",
"ar": "وصف"
},
"due-date": {
"en": "Due date",
"ar": "تاريخ الاستحقاق"
},
"valid-email": { "valid-email": {
"en": "Please enter valid email", "en": "Please enter valid email",
"ar": "الرجاء إدخال عنوان بريد صحيح" "ar": "الرجاء إدخال عنوان بريد صحيح"
@ -1164,57 +1024,60 @@ const Map localizedValues = {
"ar": "ارسال جدول التطعيمات الى بريدك الالكتروني؟" "ar": "ارسال جدول التطعيمات الى بريدك الالكتروني؟"
}, },
"email-success": { "email-success": {
"en": " The request was successful. You will receive the Schedule in moments.", "en":
" The request was successful. You will receive the Schedule in moments.",
"ar": "تم ارسال جدول التطعيمات " "ar": "تم ارسال جدول التطعيمات "
}, },
"add-instructions": { "add-instructions": {
"en": "Add the child's information below to recieve the schedule of vaccinations.", "en":
"Add the child's information below to recieve the schedule of vaccinations.",
"ar": "أضف معلومات الطفل لاستلام جدول التطعيمات" "ar": "أضف معلومات الطفل لاستلام جدول التطعيمات"
}, },
"added-child": { "added-child": {
"en": "The request was successful. You have added a child to the vaccination schedule subscription service.", "en":
"The request was successful. You have added a child to the vaccination schedule subscription service.",
"ar": "تمت الاضافة بنجاح." "ar": "تمت الاضافة بنجاح."
}, },
"appUpdate": { "appUpdate": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"},
"en": "UPDATE THE APP",
"ar": "تحديث التطبيق"
},
"ereferralSaveSuccess": { "ereferralSaveSuccess": {
"en": "The referral request has been submitted successfully, you will be contacted ASAP to complete the process. Referral request no is ", "en":
"ar": " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية. رقم طلب الإحالة" "The referral request has been submitted successfully, you will be contacted ASAP to complete the process. Referral request no is ",
}, "ar":
"referralStatus": { " تم إرسال طلب الإحالة بنجاح ، وسيتم الاتصال بك في أسرع وقت ممكن لإكمال العملية. رقم طلب الإحالة"
"en": "Referral Status", },
"ar": "حالة الإحالة" "referralStatus": {"en": "Referral Status", "ar": "حالة الإحالة"},
}, "referralDate": {"en": "Referral Date", "ar": "تاريخ الإحالة"},
"referralDate": { "patientName": {"en": "Patient Name", "ar": "اسم المريض"},
"en": "Referral Date", "referralNumber": {"en": "Referral Number", "ar": "رقم الإحالة"},
"ar": "تاريخ الإحالة" "requestID": {"en": "Request ID", "ar": " رقم الطلب"},
}, "OrderStatus": {"en": "Status", "ar": "الحاله"},
"patientName": { "pickupDate": {"en": "Pickup Date", "ar": "التاريخ"},
"en": "Patient Name",
"ar": "اسم المريض"
},
"referralNumber": {
"en": "Referral Number",
"ar": "رقم الإحالة"
},
"requestID": {
"en": "Request ID",
"ar": " رقم الطلب"
},
"OrderStatus": {
"en": "Status",
"ar": "الحاله"
},"pickupDate": {"en": "Pickup Date", "ar": "التاريخ"},
"serviceName": {"en": "Service Name", "ar": " اسم الخدمة"}, "serviceName": {"en": "Service Name", "ar": " اسم الخدمة"},
"orderLocation": {"en": "Location", "ar": "الموقع"}, "orderLocation": {"en": "Location", "ar": "الموقع"},
"selectService": {"en": "Select Service", "ar": "حدد الخدمة"}, "selectService": {"en": "Select Service", "ar": "حدد الخدمة"},
"coveredService": {"en": "Covered Service : ", "ar": " الخدمات المغطاة : "}, "coveredService": {"en": "Covered Service : ", "ar": " الخدمات المغطاة : "},
"selectAddress": {"en": "Select Address", "ar": "حدد العنوان"}, "selectAddress": {"en": "Select Address", "ar": "حدد العنوان"},
"addNewAddress": {"en": "Add New Address", "ar": "أضف عنوان جديد"}, "addNewAddress": {"en": "Add New Address", "ar": "أضف عنوان جديد"},
"selectedService": {"en": "Selected Service : ", "ar": " الخدمات المختارة : "}, "selectedService": {
"cancelOrderMsg": {"en": "Are you sure!! want to cancel this order", "ar": "هل أنت واثق!! تريد إلغاء هذا الطلب"}, "en": "Selected Service : ",
"processDoneSuccessfully": {"en": "Process Done Successfully", "ar": "تمت العملية بنجاح"}, "ar": " الخدمات المختارة : "
"selectHomeHealthCareServices": {"en": "Select Home Health Care Services", "ar": " حدد خدمات الرعاية الصحية المنزلية"}, },
"cancelOrderMsg": {
"en": "Are you sure!! want to cancel this order",
"ar": "هل أنت واثق!! تريد إلغاء هذا الطلب"
},
"processDoneSuccessfully": {
"en": "Process Done Successfully",
"ar": "تمت العملية بنجاح"
},
"selectHomeHealthCareServices": {
"en": "Select Home Health Care Services",
"ar": " حدد خدمات الرعاية الصحية المنزلية"
},
"family-info": {
"en":
"Through this service, you will be able to link your family medical files to your medical file so that you can manage their records by login to your medical file.",
"ar":
"هذه الخدمة تم تصميمها لتتمكن من ربط الملفات الطبية للعائلة بملفك الطبي حتى تتمكن من إدارة سجلاتهم عن طريق تسجيل الدخول إلى ملفك الطبي."
}
}; };

@ -13,7 +13,7 @@ class WeatherViewModel extends BaseViewModel {
WeatherService _weatherService = locator<WeatherService>(); WeatherService _weatherService = locator<WeatherService>();
List<GetCityInfoList> get weatherIndicatorData => List<GetCityInfoList> get weatherIndicatorData =>
_weatherService.weatherIndicatorData; _weatherService.weatherIndicatorData;
getWeatherData({int id, int projectID}) async { getWeatherData() async {
setState(ViewState.Busy); setState(ViewState.Busy);
// if (id != null && projectID != null) { // if (id != null && projectID != null) {

@ -52,6 +52,8 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
void initState() { void initState() {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) { WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
getAuthUser(); getAuthUser();
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
locationUtils.getCurrentLocation(); locationUtils.getCurrentLocation();
}); });
super.initState(); super.initState();
@ -384,7 +386,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
}); });
} }
var data = await this.sharedPref.getObject(WEATHER); var data = await this.sharedPref.getObject(WEATHER);
weather = data['Temperature'].toString() + '\u2103' ?? '--'; weather = data != null ? data['Temperature'].toString() + '\u2103' : '--';
print(data);
} }
} }

@ -18,110 +18,120 @@ class HealthWeatherIndicator extends StatefulWidget {
_HospitalsPageState createState() => _HospitalsPageState(); _HospitalsPageState createState() => _HospitalsPageState();
} }
class _HospitalsPageState extends State<HealthWeatherIndicator> { class _HospitalsPageState extends State<HealthWeatherIndicator> {
var data; var data;
AppSharedPreferences sharedPref = AppSharedPreferences(); AppSharedPreferences sharedPref = AppSharedPreferences();
LocationUtils locationUtils; LocationUtils locationUtils;
var weather = '--'; var weather = '--';
@override @override
void initState() { void initState() {
locationUtils = locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context); new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance WidgetsBinding.instance
.addPostFrameCallback((_) => locationUtils.getCurrentLocation()); .addPostFrameCallback((_) => locationUtils.getCurrentLocation());
getWeather();
super.initState(); super.initState();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<WeatherViewModel>( return BaseView<WeatherViewModel>(
onModelReady: (model) => model.getWeatherData(), onModelReady: (model) => model.getWeatherData(),
allowAny: true,
builder: (_, mode, widget) => AppScaffold( builder: (_, mode, widget) => AppScaffold(
isShowDecPage: false, isShowDecPage: false,
appBarTitle: TranslationBase.of(context).healthWeatherIndicators, appBarTitle: TranslationBase.of(context).healthWeatherIndicators,
isShowAppBar: true, isShowAppBar: true,
baseViewModel: mode, body: mode.weatherIndicatorData.length > 0
body: mode.weatherIndicatorData.length>0 ? SingleChildScrollView( ? SingleChildScrollView(
child: Column(children: [ child: Column(children: [
Container( Container(
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
width: double.infinity, width: double.infinity,
height: 150, height: 150,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: ExactAssetImage('assets/images/Weather_img.png'), image:
fit: BoxFit.cover, ExactAssetImage('assets/images/Weather_img.png'),
), fit: BoxFit.cover,
borderRadius: BorderRadius.circular(8.0)), ),
child: Padding( borderRadius: BorderRadius.circular(8.0)),
padding: EdgeInsets.symmetric(horizontal: 10.0), child: Padding(
child: Row( padding: EdgeInsets.symmetric(horizontal: 10.0),
children: [ child: Row(
Expanded( children: [
flex: 3, Expanded(
child: Column( flex: 3,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Texts(
TranslationBase.of(context)
.healthWeatherIndicators,
color: Colors.white,
fontWeight: FontWeight.w600,
),
Texts(
TranslationBase.of(context)
.healthTipsBasedOnCurrentWeather,
color: Colors.white,
fontSize: 14,
),
],
)),
Expanded(
flex: 2,
child: InkWell(
onTap: () {
},
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( AppText(
mainAxisAlignment: MainAxisAlignment.center, TranslationBase.of(context)
children: [ .healthWeatherIndicators,
Image.asset( color: Colors.white,
'assets/images/Weather_ico.png', fontWeight: FontWeight.w600,
width: 60, ),
height: 60, AppText(
), TranslationBase.of(context)
AppText(weather, .healthTipsBasedOnCurrentWeather,
fontSize: 22, color: Colors.white) color: Colors.white,
], fontSize: 14,
), ),
], ],
)), )),
) Expanded(
], flex: 2,
child: InkWell(
onTap: () {},
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Image.asset(
'assets/images/Weather_ico.png',
width: 60,
height: 60,
),
AppText(weather,
fontSize: 22, color: Colors.white)
],
),
],
)),
)
],
),
), ),
), ),
), Padding(
Padding(padding: EdgeInsets.all(15), child:AppText( projectViewModel.isArabic ? mode.weatherIndicatorData[0].cityNameN : mode.weatherIndicatorData[0].cityName, fontSize: 24, fontWeight: FontWeight.bold,)), padding: EdgeInsets.all(15),
Padding( child: AppText(
padding: EdgeInsets.all(15), projectViewModel.isArabic
child: Column(children: ? mode.weatherIndicatorData[0].cityNameN
mode.weatherIndicatorData : mode.weatherIndicatorData[0].cityName,
.map((data) { fontSize: 24,
return WeatherSlider( fontWeight: FontWeight.bold,
data); )),
}).toList() Padding(
padding: EdgeInsets.all(15),
))])) : Container(child:AppText('Loading...'))), child: Column(
children: mode.weatherIndicatorData.map((data) {
return WeatherSlider(data);
}).toList()))
]))
: Container()),
); );
} }
getWeather() async{
getWeather() async {
var data = await this.sharedPref.getObject(WEATHER); var data = await this.sharedPref.getObject(WEATHER);
weather = data['Temperature'].toString() + '\u2103' ?? '--'; setState(() {
weather = data['Temperature'].toString() + '\u2103' ?? '--';
});
} }
} }

@ -1,12 +1,13 @@
import 'dart:ui'; import 'dart:ui';
import 'package:diplomaticquarterapp/config/size_config.dart'; import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as list;
import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
@ -28,7 +29,6 @@ import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/routes.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class MyFamily extends StatefulWidget { class MyFamily extends StatefulWidget {
final bool isAppbarVisible; final bool isAppbarVisible;
MyFamily({this.isAppbarVisible =true}); MyFamily({this.isAppbarVisible =true});
@ -37,6 +37,7 @@ class MyFamily extends StatefulWidget {
} }
class _MyFamily extends State<MyFamily> with TickerProviderStateMixin { class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
List<ImagesInfo> imagesInfo = List();
final familyFileProvider = FamilyFilesProvider(); final familyFileProvider = FamilyFilesProvider();
AppSharedPreferences sharedPref = new AppSharedPreferences(); AppSharedPreferences sharedPref = new AppSharedPreferences();
var userID; var userID;
@ -56,12 +57,27 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
} }
bool expandFlag = false; bool expandFlag = false;
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectViewModel = Provider.of(context); imagesInfo.add(ImagesInfo(
imageEn:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/0.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/0.png'),
);
imagesInfo.add(ImagesInfo(
imageEn:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png',
imageAr:
'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'),
);
projectViewModel = Provider.of(context);
return AppScaffold( return AppScaffold(
appBarTitle: TranslationBase.of(context).myFamilyFiles, appBarTitle: TranslationBase.of(context).myFamilyFiles,
isShowAppBar: widget.isAppbarVisible, isShowAppBar: widget.isAppbarVisible,
imagesInfo: imagesInfo,
description: TranslationBase.of(context).familyInfo,
body: Scaffold( body: Scaffold(
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
appBar: PreferredSize( appBar: PreferredSize(
@ -648,7 +664,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
// Navigator.of(context).pushNamed( // Navigator.of(context).pushNamed(
// HOME, // HOME,
// ); // );
result = CheckActivationCode.fromJson(result); result = list.CheckActivationCode.fromJson(result);
var familyFile = await sharedPref.getObject(FAMILY_FILE); var familyFile = await sharedPref.getObject(FAMILY_FILE);
var mainUser = await sharedPref.getObject(MAIN_USER); var mainUser = await sharedPref.getObject(MAIN_USER);
this.sharedPref.clear(); this.sharedPref.clear();

@ -19,6 +19,7 @@ import 'package:diplomaticquarterapp/theme/theme_notifier.dart';
import 'package:diplomaticquarterapp/theme/theme_value.dart'; import 'package:diplomaticquarterapp/theme/theme_value.dart';
import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart'; import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
import 'package:diplomaticquarterapp/uitl/LocalNotification.dart'; import 'package:diplomaticquarterapp/uitl/LocalNotification.dart';
import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart';
import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
@ -71,7 +72,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
} }
bool isPageNavigated = false; bool isPageNavigated = false;
LocationUtils locationUtils;
_changeCurrentTab(int tab) { _changeCurrentTab(int tab) {
setState(() { setState(() {
currentTab = tab; currentTab = tab;
@ -138,7 +139,10 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
pageController = PageController(keepPage: true); pageController = PageController(keepPage: true);
_firebaseMessaging.setAutoInitEnabled(true); _firebaseMessaging.setAutoInitEnabled(true);
locationUtils =
new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance
.addPostFrameCallback((_) => locationUtils.getCurrentLocation());
if (Platform.isIOS) { if (Platform.isIOS) {

@ -15,12 +15,12 @@ class LocationUtils {
void getCurrentLocation() async { void getCurrentLocation() async {
print("current location"); print("current location");
isLocationServiceEnabled().then((value) { Geolocator.isLocationServiceEnabled().then((value) {
if (value) { if (value) {
checkPermission().then((permission) { Geolocator.checkPermission().then((permission) {
if (permission == LocationPermission.always || if (permission == LocationPermission.always ||
permission == LocationPermission.whileInUse) { permission == LocationPermission.whileInUse) {
getLastKnownPosition().then((value) => setLocation(value)); Geolocator.getLastKnownPosition().then((value) => setLocation(value));
} }
if (permission == LocationPermission.denied || if (permission == LocationPermission.denied ||
@ -48,9 +48,9 @@ class LocationUtils {
okFunction: () => { okFunction: () => {
ConfirmDialog.closeAlertDialog(context), ConfirmDialog.closeAlertDialog(context),
if (isPermissionError) if (isPermissionError)
openAppSettings() Geolocator.openAppSettings()
else else
openLocationSettings() Geolocator.openLocationSettings()
}, },
cancelFunction: () => {}); cancelFunction: () => {});
return dialog.showAlertDialog(context); return dialog.showAlertDialog(context);

@ -953,15 +953,86 @@ class TranslationBase {
String get OrderStatus => localizedValues['OrderStatus'][locale.languageCode]; String get OrderStatus => localizedValues['OrderStatus'][locale.languageCode];
String get pickupDate => localizedValues['pickupDate'][locale.languageCode]; String get pickupDate => localizedValues['pickupDate'][locale.languageCode];
String get serviceName => localizedValues['serviceName'][locale.languageCode]; String get serviceName => localizedValues['serviceName'][locale.languageCode];
String get orderLocation => localizedValues['orderLocation'][locale.languageCode]; String get orderLocation =>
String get selectService => localizedValues['selectService'][locale.languageCode]; localizedValues['orderLocation'][locale.languageCode];
String get coveredService => localizedValues['coveredService'][locale.languageCode]; String get selectService =>
String get selectAddress => localizedValues['selectAddress'][locale.languageCode]; localizedValues['selectService'][locale.languageCode];
String get addNewAddress => localizedValues['addNewAddress'][locale.languageCode]; String get coveredService =>
String get selectedService => localizedValues['selectedService'][locale.languageCode]; localizedValues['coveredService'][locale.languageCode];
String get cancelOrderMsg => localizedValues['cancelOrderMsg'][locale.languageCode]; String get selectAddress =>
String get processDoneSuccessfully => localizedValues['processDoneSuccessfully'][locale.languageCode]; localizedValues['selectAddress'][locale.languageCode];
String get selectHomeHealthCareServices => localizedValues['selectHomeHealthCareServices'][locale.languageCode]; String get addNewAddress =>
localizedValues['addNewAddress'][locale.languageCode];
String get selectedService =>
localizedValues['selectedService'][locale.languageCode];
String get cancelOrderMsg =>
localizedValues['cancelOrderMsg'][locale.languageCode];
String get processDoneSuccessfully =>
localizedValues['processDoneSuccessfully'][locale.languageCode];
String get selectHomeHealthCareServices =>
localizedValues['selectHomeHealthCareServices'][locale.languageCode];
String get labResults => localizedValues['labResults'][locale.languageCode];
String get doctorRating =>
localizedValues['doctorRating'][locale.languageCode];
String get good => localizedValues['good'][locale.languageCode];
String get v_good => localizedValues['v-good'][locale.languageCode];
String get excellent => localizedValues['excellent'][locale.languageCode];
String get below_average =>
localizedValues['below-average'][locale.languageCode];
String get infoSigns => localizedValues['info-signs'][locale.languageCode];
String get infoAdvancePayment =>
localizedValues['info-advance-payment'][locale.languageCode];
String get infoMyBalance =>
localizedValues['info-my-balance'][locale.languageCode];
String get erContant => localizedValues['er-contant'][locale.languageCode];
String get er => localizedValues['er'][locale.languageCode];
String get transportationService =>
localizedValues['transportation-Service'][locale.languageCode];
String get infoAmbulance =>
localizedValues['info-ambulance'][locale.languageCode];
String get transportHeading =>
localizedValues['RRT-transport-heading'][locale.languageCode];
String get sar => localizedValues['sar'][locale.languageCode];
String get directionHeading =>
localizedValues['RRT-direction-heading'][locale.languageCode];
String get toHospital => localizedValues['to-hospital'][locale.languageCode];
String get fromHospital =>
localizedValues['from-hospital'][locale.languageCode];
String get oneDirec => localizedValues['one-direc'][locale.languageCode];
String get twoDirec => localizedValues['two-direc'][locale.languageCode];
String get pickupLocation =>
localizedValues['pickup-location'][locale.languageCode];
String get pickupSpot => localizedValues['pickup-spot'][locale.languageCode];
String get insideHome => localizedValues['inside-home'][locale.languageCode];
String get haveAppo => localizedValues['have-appo'][locale.languageCode];
String get dropoffLocation =>
localizedValues['dropoff-location'][locale.languageCode];
String get selectAll => localizedValues['select-all'][locale.languageCode];
String get selectMap => localizedValues['select-map'][locale.languageCode];
String get noAppointment =>
localizedValues['no-appointment'][locale.languageCode];
String get patientShareB =>
localizedValues['patient-share'][locale.languageCode];
String get patientShareTax =>
localizedValues['patient-share-tax'][locale.languageCode];
String get patientShareTotal =>
localizedValues['patient-share-total'][locale.languageCode];
String get selectAmbulate =>
localizedValues['select-ambulate'][locale.languageCode];
String get wheelchair => localizedValues['wheelchair'][locale.languageCode];
String get walker => localizedValues['walker"'][locale.languageCode];
String get stretcher => localizedValues['stretcher'][locale.languageCode];
String get none => localizedValues['none'][locale.languageCode];
String get RRTSummary => localizedValues['RRT-Summary'][locale.languageCode];
String get billAmount => localizedValues['bill-amount'][locale.languageCode];
String get transportMethod =>
localizedValues['transport-method'][locale.languageCode];
String get directions => localizedValues['directions'][locale.languageCode];
String get infoMyAppointments =>
localizedValues['info-my-appointments'][locale.languageCode];
String get infoTodo => localizedValues['info-todo'][locale.languageCode];
String get familyInfo => localizedValues['family-info'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

Loading…
Cancel
Save