diff --git a/assets/images/BMI/BMIChart_AR.png b/assets/images/BMI/BMIChart_AR.png new file mode 100644 index 00000000..405574c0 Binary files /dev/null and b/assets/images/BMI/BMIChart_AR.png differ diff --git a/assets/images/BMI/BMIChart_EN.png b/assets/images/BMI/BMIChart_EN.png new file mode 100644 index 00000000..2432e888 Binary files /dev/null and b/assets/images/BMI/BMIChart_EN.png differ diff --git a/assets/images/BMI/bmi_blue_female_ar.png b/assets/images/BMI/bmi_blue_female_ar.png new file mode 100644 index 00000000..483cb664 Binary files /dev/null and b/assets/images/BMI/bmi_blue_female_ar.png differ diff --git a/assets/images/BMI/bmi_blue_female_en.png b/assets/images/BMI/bmi_blue_female_en.png new file mode 100644 index 00000000..9984736e Binary files /dev/null and b/assets/images/BMI/bmi_blue_female_en.png differ diff --git a/assets/images/BMI/bmi_blue_male_ar.png b/assets/images/BMI/bmi_blue_male_ar.png new file mode 100644 index 00000000..d4ff734c Binary files /dev/null and b/assets/images/BMI/bmi_blue_male_ar.png differ diff --git a/assets/images/BMI/bmi_blue_male_en.png b/assets/images/BMI/bmi_blue_male_en.png new file mode 100644 index 00000000..ec50a0c6 Binary files /dev/null and b/assets/images/BMI/bmi_blue_male_en.png differ diff --git a/assets/images/BMI/bmi_green_female_ar.png b/assets/images/BMI/bmi_green_female_ar.png new file mode 100644 index 00000000..f8dc4759 Binary files /dev/null and b/assets/images/BMI/bmi_green_female_ar.png differ diff --git a/assets/images/BMI/bmi_green_female_en.png b/assets/images/BMI/bmi_green_female_en.png new file mode 100644 index 00000000..b4eb32e0 Binary files /dev/null and b/assets/images/BMI/bmi_green_female_en.png differ diff --git a/assets/images/BMI/bmi_green_male_ar.png b/assets/images/BMI/bmi_green_male_ar.png new file mode 100644 index 00000000..380d8384 Binary files /dev/null and b/assets/images/BMI/bmi_green_male_ar.png differ diff --git a/assets/images/BMI/bmi_green_male_en.png b/assets/images/BMI/bmi_green_male_en.png new file mode 100644 index 00000000..78693310 Binary files /dev/null and b/assets/images/BMI/bmi_green_male_en.png differ diff --git a/assets/images/BMI/bmi_orange_female_ar.png b/assets/images/BMI/bmi_orange_female_ar.png new file mode 100644 index 00000000..b2437c14 Binary files /dev/null and b/assets/images/BMI/bmi_orange_female_ar.png differ diff --git a/assets/images/BMI/bmi_orange_female_en.png b/assets/images/BMI/bmi_orange_female_en.png new file mode 100644 index 00000000..31779cd3 Binary files /dev/null and b/assets/images/BMI/bmi_orange_female_en.png differ diff --git a/assets/images/BMI/bmi_orange_male_ar.png b/assets/images/BMI/bmi_orange_male_ar.png new file mode 100644 index 00000000..291b316e Binary files /dev/null and b/assets/images/BMI/bmi_orange_male_ar.png differ diff --git a/assets/images/BMI/bmi_orange_male_en.png b/assets/images/BMI/bmi_orange_male_en.png new file mode 100644 index 00000000..c6ebb5eb Binary files /dev/null and b/assets/images/BMI/bmi_orange_male_en.png differ diff --git a/assets/images/BMI/bmi_red_female_ar.png b/assets/images/BMI/bmi_red_female_ar.png new file mode 100644 index 00000000..0e4d7339 Binary files /dev/null and b/assets/images/BMI/bmi_red_female_ar.png differ diff --git a/assets/images/BMI/bmi_red_female_en.png b/assets/images/BMI/bmi_red_female_en.png new file mode 100644 index 00000000..0d5dfe80 Binary files /dev/null and b/assets/images/BMI/bmi_red_female_en.png differ diff --git a/assets/images/BMI/bmi_red_male_ar.png b/assets/images/BMI/bmi_red_male_ar.png new file mode 100644 index 00000000..86a47cb2 Binary files /dev/null and b/assets/images/BMI/bmi_red_male_ar.png differ diff --git a/assets/images/BMI/bmi_red_male_en.png b/assets/images/BMI/bmi_red_male_en.png new file mode 100644 index 00000000..452aa4f3 Binary files /dev/null and b/assets/images/BMI/bmi_red_male_en.png differ diff --git a/assets/images/BMI/bmi_yellow_female_ar.png b/assets/images/BMI/bmi_yellow_female_ar.png new file mode 100644 index 00000000..7453a642 Binary files /dev/null and b/assets/images/BMI/bmi_yellow_female_ar.png differ diff --git a/assets/images/BMI/bmi_yellow_female_en.png b/assets/images/BMI/bmi_yellow_female_en.png new file mode 100644 index 00000000..d2374c22 Binary files /dev/null and b/assets/images/BMI/bmi_yellow_female_en.png differ diff --git a/assets/images/BMI/bmi_yellow_male_ar.png b/assets/images/BMI/bmi_yellow_male_ar.png new file mode 100644 index 00000000..754cf6ea Binary files /dev/null and b/assets/images/BMI/bmi_yellow_male_ar.png differ diff --git a/assets/images/BMI/bmi_yellow_male_en.png b/assets/images/BMI/bmi_yellow_male_en.png new file mode 100644 index 00000000..f64decfe Binary files /dev/null and b/assets/images/BMI/bmi_yellow_male_en.png differ diff --git a/assets/images/BMI/default.png b/assets/images/BMI/default.png new file mode 100644 index 00000000..cef9f7d7 Binary files /dev/null and b/assets/images/BMI/default.png differ diff --git a/assets/images/pharmacy/shipping_image.png b/assets/images/pharmacy/shipping_image.png new file mode 100644 index 00000000..ba16e92c Binary files /dev/null and b/assets/images/pharmacy/shipping_image.png differ diff --git a/assets/images/pharmacy/shipping_image_ar.png b/assets/images/pharmacy/shipping_image_ar.png new file mode 100644 index 00000000..cb623a62 Binary files /dev/null and b/assets/images/pharmacy/shipping_image_ar.png differ diff --git a/lib/config/config.dart b/lib/config/config.dart index 296bbbbe..3ca7f502 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -241,6 +241,9 @@ const IS_ALLOW_ASK_DOCTOR = 'Services/Doctors.svc/REST/GetPatientDoctorAppointmentResult'; const GET_CALL_REQUEST_TYPE = 'Services/Doctors.svc/REST/GetCallRequestType_LOV'; +const ADD_VIDA_REQUEST = + 'Services/ER_VirtualCall.svc/REST/PatientER_VidaRequestInseart'; + const SEND_CALL_REQUEST = 'Services/Doctors.svc/REST/InsertCallInfo'; const GET_LIVECARE_CLINICS = @@ -289,7 +292,7 @@ const GET_PATIENT_HEALTH_STATS = const CHANNEL = 3; const GENERAL_ID = 'Cs2020@2016\$2958'; const IP_ADDRESS = '10.20.10.20'; -const VERSION_ID = 8.4; +const VERSION_ID = 6.1; const SETUP_ID = '91877'; const LANGUAGE = 2; const PATIENT_OUT_SA = 0; @@ -535,6 +538,10 @@ const GET_SUB_CATEGORISE = const GET_SUB_PRODUCTS = 'products?categoryid='; const GET_FINAL_PRODUCTS = 'products?fields=id,reviews,discount_ids,name,namen,localized_names,display_order,short_description,full_description,full_descriptionn,sku,order_minimum_quantity,order_maximum_quantity,price,old_price,images,is_rx,rx_message,rx_messagen,discount_name,discount_namen,approved_rating_sum,approved_total_reviews,allow_back_in_stock_subscriptions,stock_quantity,stock_availability,stock_availabilityn,discount_percentage&CategoryId='; +const GET_CLINIC_CATEGORY = 'Services/Doctors.svc/REST/DP_GetClinicCategory'; +const GET_DISEASE_BY_CLINIC_ID = + 'Services/Doctors.svc/REST/DP_GetDiseasesByClinicID'; +const SEARCH_DOCTOR_BY_TIME = 'Services/Doctors.svc/REST/SearchDoctorsByTime'; const TIMER_MIN = 10; diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index b8043dc3..23d92fee 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -877,7 +877,7 @@ const Map localizedValues = { "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": "البريد الالكتروني"}, "Book": {"en": "Book", "ar": "احجز"}, @@ -1695,7 +1695,77 @@ const Map localizedValues = { }, "videoAppo": {"en": "Video Call Appointment", "ar": "موعد اتصال فيديو"}, - // "visit": {"en" : "Visit", "ar": "الزيارة"}, + + "generalHealth": {"en": "General Health", "ar": "صحة عامة"}, + "womanHealth": {"en": "Women's Health", "ar": "صحة المرأة"}, + "bmi": {"en": "BMI", "ar": "الكتلة"}, + "calc-health": {"en": "Calculators", "ar": "الصحية"}, + "calories": {"en": "Calories", "ar": "سعرات"}, + "bmr": {"en": "BMR", "ar": "معدل الأيض القاعدي"}, + "idealBody": {"en": "Ideal Body", "ar": "الجسم المثالي"}, + "body_word": {"en": "Body", "ar": "الجسم"}, + "fat": {"en": "Fat", "ar": "دهون"}, + "carbohydrate": {"en": "Carbohydrate", "ar": "كربوهيدرات"}, + "proteinFat": {"en": "Protein Fat", "ar": "دهون البروتين"}, + "ovulation": {"en": "Ovulation", "ar": "الإباضة"}, + "delivery": {"en": "Delivery", "ar": "الولادة"}, + "bmiCalcDesc": { + "en": + "'Calculate the BMI value and weight\n status to identify the healthy weight .\n Not appropriate for children and women\n who are pregnant or breastfeeding'", + "ar": + "حساب قيمة مؤشر كتلة الجسم وحالة الوزن لتحديد الوزن الصحي. \n وغير مناسب للأطفال والنساء الحوامل أو المرضعات" + }, + "selectUnit": {"en": "Select Unit", "ar": "اختر الوحدة"}, + "feet": {"en": "Feet", "ar": "قدم"}, + "pound": {"en": "Pound", "ar": "رطل"}, + "seeListOfDoctor": {"en": "See List Of Doctors", "ar": "انظر قائمة الأطباء"}, + "obese": {"en": "Obese", "ar": "سمين"}, + "overWeight": {"en": "OverWeight", "ar": "وزن زائد"}, + "healthy": {"en": "Healthy", "ar": "صحي"}, + "underWeight": {"en": "UnderWeight", "ar": "نقص الوزن"}, + "bmiCalcMsgObese": { + "en": + "A BMI of over 30 indicates that are heavily overweight. Health may be at risk if not lose weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.", + "ar": + "يشير مؤشر كتلة الجسم الذي يزيد عن 30 إلى زيادة الوزن بشكل كبير. قد تكون الصحة في خطر إذا لم تفقد الوزن. يوصى بالتحدث إلى الطبيب أو أخصائي التغذية للحصول على المشورة. لحجز موعد ، انقر أدناه للبدء." + }, + "bmiCalcMsgOverweight": { + "en": + 'A BMI of 25 - 30 indicates that are slightly overweight. May be advised to lose some weight for health reasons. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get ', + "ar": + "يشير مؤشر كتلة الجسم من 25 إلى 30 إلى زيادة الوزن قليلاً. قد ينصح بفقدان بعض الوزن لأسباب صحية. يوصى بالتحدث إلى الطبيب أو أخصائي التغذية للحصول على المشورة. لحجز موعد ، انقر أدناه للحصول على" + }, + "bmiCalcMsgHealthy": { + "en": + "A BMI of 18.5 - 25 indicates that are at a healthy weight for the height. By maintaining a healthy weight, lower the risk of developing severe health problems. To book an appointment, click below to get started.", + "ar": + "يشير مؤشر كتلة الجسم من 18.5 - 25 إلى وزن صحي بالنسبة للطول. بالحفاظ على وزن صحي ، قلل من خطر الإصابة بمشاكل صحية خطيرة. لحجز موعد ، انقر أدناه للبدء." + }, + "bmiCalcMsgUnderWeight": { + "en": + "A BMI of less than 18.5 indicates that are underweight, so may need to put on some weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.", + "ar": + "يشير مؤشر كتلة الجسم الذي يقل عن 18.5 إلى أنك تعاني من نقص الوزن ، لذلك قد تحتاج إلى زيادة الوزن. يوصى بالتحدث إلى الطبيب أو أخصائي التغذية للحصول على المشورة. لحجز موعد ، انقر أدناه للبدء." + }, + "bariatrics": {"en": "Bariatrics", "ar": "طب السمنة"}, + "bariatricsHeaderMsg": { + "en": + "Choose one of the following symptoms to show the right doctors or choose a consultation to show all", + "ar": + "اختر أحد الأعراض التالية لتظهر للأطباء المناسبين أو اختر استشارة لإظهار الكل" + }, + "continue": {"en": "CONTINUE", "ar": "إستمرار"}, + "skip": {"en": "SKIP", "ar": "تخطى"}, + "calorieCalcDesc": { + "en": + "Calculates daily calorie intake based on several factors, like height, weight, age, gender and daily physical activity ", + "ar": + "يحسب السعرات الحرارية اليومية بناءً على عدة عوامل ، مثل الطول والوزن والعمر والجنس والنشاط البدني اليومي" + }, + "age11_120_years": { + "en": "The Age ( 11 - 120 ) yrs", + "ar": "العمر (11 - 120) سنة" + }, "weight-add": {"en": "Enter Weight Value", "ar": "أدخل الوزن "}, "systolic-add": {"en": "Enter Systolic Value", "ar": "أدخل قيمة الإنقباض "}, "diastolic-add": {"en": "Enter Diastolic Value", "ar": "أدخل قيمة الإنبساط "}, @@ -1769,6 +1839,74 @@ const Map localizedValues = { "en": "Please enter verification code", "ar": "الرجاء إدخال رمز التحقق" }, + "select-location": {"en": "Select Location", "ar": "اختر موقعا"}, + "result-header": { + "en": "Get The Result During 8 Hours", + "ar": "احصل على النتيجة خلال 8 ساعة" + }, + "covid-info": { + "en": + "We are using the advance technology to test COVID-19, The sample for examination is taking between the nose and mouth (nasopharyngeal swab), the examination is done by ELITE In Genius of the company ELITECH GROUP MOLECULAR DIAGNOSTICS, Note that the device belongs to an Italian company and is manufactured in Japan with RC- PCR​", + "ar": + "يتوفر لدينا أحدث جهاز خاص بفحص مرض الكورونا (COVID-19) طريقة الفحص تؤخذ مسحة من البلعوم الأنفي ( عن طريف الأنف) ويتم الفحص بواسطة جهاز ELITE In Genius التابع لشركة ELITECH GROUP MOLECULAR DIAGNOSTICS علما بأن الجهاز تابع لشركة إيطالية ومصنع في اليابان بتقينة RC-PCR" + }, + "select-appo": { + "en": "Kindly select one of the available appointments from below:", + "ar": "يرجى اختيار أحد المواعيد المتاحة من أدناه:" + }, + "covid-alert-header": { + "en": "Pay With-in 15 mins to confirm the appointment", + "ar": "الرجاء اتمام عملية الدفع خلال 15 دقيقه لتاكيد الموعد" + }, + "covid-alert-info": { + "en": + "Payment for Covid-19 Test should Be made with-in 15 mins otherwise The system will Cancel the Scheduled appointment automatically​", + "ar": + "سيتم الغاء الموعد عن طريق النظام بشكل الي في حال عدم اتمام عمليه الدفع خلال 15 دقيقة​" + }, + "covid-alert-mins": {"en": "Pay With-in 15 mins", "ar": "ادفع خلال 15 دقيقة"}, + "back": {"en": "Back", "ar": "رجوع"}, + "get-directions": {"en": "Get Directions", "ar": "احصل على الاتجاهات"}, + "selected-location": {"en": "Selected Location:", "ar": "الموقع المحدد:"}, + "test-fee": {"en": "Test Fee", "ar": "رسوم الاختبار"}, + "pay-options": { + "en": "You can pay by the following Options:", + "ar": "يمكنك الدفع عن طريق الخيارات التالية:" + }, + "livecare-service": {"en": "LiveCare Service", "ar": "خدمة لايف كير"}, + "livecare-service-desc": { + "en": + "is to obtain medical advice with a specialist doctor Via a video call", + "ar": "هي الحصول على استشارة طبية مع طبيب مختص عن طريق اتصال فيديو" + }, + "why-livecare": {"en": "WHY LIVECARE", "ar": "لماذا خدمة اللايف كير"}, + "livecare-point-1": { + "en": + "No need to wait you will get Medical consultation immediately via Video call", + "ar": + "لا داعي للانتظار سوف تحصل على الاستشارة الطبية فورا عن طريق مكالمة الفيديو" + }, + "doc-virtual-appo-ins4": { + "en": "The doctor will see your medical file", + "ar": "سوف يتمكن الطبيب من الاطلاع على ملفك الطبي كامل" + }, + "doc-virtual-appo-ins5": { + "en": "Free prescription delivery service", + "ar": "خدمة توصيل الادوية مجانا" + }, + "livecare-summary": { + "en": + "** The service is included with some insurance companies according to the terms and conditions With our best wishes for health and wellness", + "ar": + "** الخدمة مشمولة لدى بعض شركات التامين على حسب الشروط والاحكام مع تمنياتنا لكم بدوام الصحة والعافية" + }, + "livecare-option-1": { + "en": "Get Medical consultation immediately", + "ar": "الحصول على الاستشارة فورا" + }, + "livecare-option-2": {"en": "Instant video call", "ar": "اتصال فيديو فوري"}, + "livecare-option-3": {"en": "Book Appointment", "ar": "حجز موعد"}, + "livecare-option-4": {"en": "Schedule video call", "ar": "اتصال فيديو مجدول"}, "sms_code": {"en": "Enter SMS Code here", "ar": "أدخل رمز التحقق هنا"}, "code_failure": { "en": "Didn’t received the code", @@ -1785,5 +1923,8 @@ const Map localizedValues = { "ar": "اختر الوحدة المفضلة" }, "select-unit": {"en": "Select unit", "ar": "اختر وحدة القياس"}, - "try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'} + "try-saying": {"en": "Try saying something", "ar": 'حاول قول شيء ما'}, + + "app-update": {"en": "UPDATE THE APP", "ar": "تحديث التطبيق"}, + // "visit": {"en" : "Visit", "ar": "الزيارة"}, }; diff --git a/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart b/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart new file mode 100644 index 00000000..ff1f0eb0 --- /dev/null +++ b/lib/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart @@ -0,0 +1,68 @@ +class ClinicCategory { + int clinicID; + int categoryID; + String categoryName; + String categoryNameN; + String icon; + String bodyImageEN; + String fullImageEN; + String bodyImageAR; + String fullmageAR; + bool isActive; + bool isCategoryGroup; + Null sortOrderAR; + Null sortOrderEN; + String clinicName; + + ClinicCategory( + {this.clinicID, + this.categoryID, + this.categoryName, + this.categoryNameN, + this.icon, + this.bodyImageEN, + this.fullImageEN, + this.bodyImageAR, + this.fullmageAR, + this.isActive, + this.isCategoryGroup, + this.sortOrderAR, + this.sortOrderEN, + this.clinicName}); + + ClinicCategory.fromJson(Map json) { + clinicID = json['ClinicID']; + categoryID = json['CategoryID']; + categoryName = json['CategoryName']; + categoryNameN = json['CategoryNameN']; + icon = json['Icon']; + bodyImageEN = json['BodyImageEN']; + fullImageEN = json['FullImageEN']; + bodyImageAR = json['BodyImageAR']; + fullmageAR = json['FullmageAR']; + isActive = json['IsActive']; + isCategoryGroup = json['IsCategoryGroup']; + sortOrderAR = json['SortOrderAR']; + sortOrderEN = json['SortOrderEN']; + clinicName = json['ClinicName']; + } + + Map toJson() { + final Map data = new Map(); + data['ClinicID'] = this.clinicID; + data['CategoryID'] = this.categoryID; + data['CategoryName'] = this.categoryName; + data['CategoryNameN'] = this.categoryNameN; + data['Icon'] = this.icon; + data['BodyImageEN'] = this.bodyImageEN; + data['FullImageEN'] = this.fullImageEN; + data['BodyImageAR'] = this.bodyImageAR; + data['FullmageAR'] = this.fullmageAR; + data['IsActive'] = this.isActive; + data['IsCategoryGroup'] = this.isCategoryGroup; + data['SortOrderAR'] = this.sortOrderAR; + data['SortOrderEN'] = this.sortOrderEN; + data['ClinicName'] = this.clinicName; + return data; + } +} diff --git a/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart b/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart new file mode 100644 index 00000000..e92fa8da --- /dev/null +++ b/lib/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart @@ -0,0 +1,44 @@ +class DiseasesByClinic { + int diseasesID; + String diseasesEN; + String diseasesAR; + int diseasesCategoryID; + Null diseasesCategoryEN; + Null diseasesCategoryAR; + String diseases; + Null diseasesCategory; + + DiseasesByClinic( + {this.diseasesID, + this.diseasesEN, + this.diseasesAR, + this.diseasesCategoryID, + this.diseasesCategoryEN, + this.diseasesCategoryAR, + this.diseases, + this.diseasesCategory}); + + DiseasesByClinic.fromJson(Map json) { + diseasesID = json['DiseasesID']; + diseasesEN = json['Diseases_EN']; + diseasesAR = json['Diseases_AR']; + diseasesCategoryID = json['Diseases_CategoryID']; + diseasesCategoryEN = json['Diseases_CategoryEN']; + diseasesCategoryAR = json['Diseases_CategoryAR']; + diseases = json['Diseases']; + diseasesCategory = json['Diseases_Category']; + } + + Map toJson() { + final Map data = new Map(); + data['DiseasesID'] = this.diseasesID; + data['Diseases_EN'] = this.diseasesEN; + data['Diseases_AR'] = this.diseasesAR; + data['Diseases_CategoryID'] = this.diseasesCategoryID; + data['Diseases_CategoryEN'] = this.diseasesCategoryEN; + data['Diseases_CategoryAR'] = this.diseasesCategoryAR; + data['Diseases'] = this.diseases; + data['Diseases_Category'] = this.diseasesCategory; + return data; + } +} \ No newline at end of file diff --git a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart index 803a80f0..12d7eab3 100644 --- a/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart +++ b/lib/core/service/AlHabibMedicalService/customer_addresses_service.dart @@ -77,9 +77,9 @@ class CustomerAddressesService extends BaseService { class CustomerInfo { bool isRegistered; String userName; - Null password; + dynamic password; String email; - Null errorMessage; + dynamic errorMessage; String mobileNumber; int customerId; @@ -121,19 +121,19 @@ class AddressInfo { String firstName; String lastName; String email; - Null company; + dynamic company; int countryId; String country; - Null stateProvinceId; + dynamic stateProvinceId; String city; String address1; String address2; String zipPostalCode; String phoneNumber; - Null faxNumber; + dynamic faxNumber; String customerAttributes; String createdOnUtc; - Null province; + dynamic province; String latLong; AddressInfo( diff --git a/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart b/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart new file mode 100644 index 00000000..b59eadac --- /dev/null +++ b/lib/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart @@ -0,0 +1,76 @@ +import 'package:diplomaticquarterapp/config/config.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart'; +import 'package:diplomaticquarterapp/core/service/base_service.dart'; + +class BariatricsService extends BaseService { + List clinicCategoryList = []; + List diseasesList = []; + + Future getClinicCategory() async { + hasError = false; + Map body = Map(); + var languageID = + await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + + body['ClinicID'] = 108; // hint: it is static depend on IONIC project + body['isDentalAllowedBackend'] = false; + body['LanguageID'] = languageID == 'ar' ? 1 : 2; + + await baseAppClient.post(GET_CLINIC_CATEGORY, + onSuccess: (dynamic response, int statusCode) { + clinicCategoryList.clear(); + if (response['ClinicCategoryList'] != null) + response['ClinicCategoryList'].forEach((city) { + clinicCategoryList.add(ClinicCategory.fromJson(city)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + Future getDiseaseByClinicId() async { + hasError = false; + Map body = Map(); + body['ClinicID'] = 108; // hint: it is static depend on IONIC project + + await baseAppClient.post(GET_DISEASE_BY_CLINIC_ID, + onSuccess: (dynamic response, int statusCode) { + diseasesList.clear(); + if (response['DiseasesByClinicList'] != null) + response['DiseasesByClinicList'].forEach((city) { + diseasesList.add(DiseasesByClinic.fromJson(city)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + Future searchDoctorsByTime(DiseasesByClinic disease) async { + hasError = false; + var languageID = + await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + + Map body = Map(); + body['ClinicID'] = 108; // hint: it is static depend on IONIC project + body['ContinueDentalPlan'] = false; + body['DiseaseID'] = disease.diseasesID; + body['IsGetNearAppointment'] = false; + body['IsSearchAppointmnetByClinicID'] = true; + body['LanguageID'] = languageID == 'ar' ? 1 : 2; + body['Latitude'] = 0; + body['License'] = true; + body['Longitude'] = 0; + body['isDentalAllowedBackend'] = false; + + await baseAppClient.post(SEARCH_DOCTOR_BY_TIME, + onSuccess: (dynamic response, int statusCode) { + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } +} diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 849bcee7..a953b562 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -44,11 +44,16 @@ class BaseAppClient { } try { //Map profile = await sharedPref.getObj(DOCTOR_PROFILE); + var pharmacyToken = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN); + var user = await sharedPref.getObject(USER_PROFILE); + Map headers = { + 'Content-Type': 'application/json', + 'Accept': 'application/json' + }; if (!isExternal) { String token = await sharedPref.getString(TOKEN); - print(await sharedPref.getString(APP_LANGUAGE)); - var languageID = await sharedPref.getString(APP_LANGUAGE) ?? 'ar'; - var user = await sharedPref.getObject(USER_PROFILE); + var languageID = + await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); if (body.containsKey('SetupID')) { body['SetupID'] = body.containsKey('SetupID') ? body['SetupID'] != null @@ -102,22 +107,25 @@ class BaseAppClient { ? body['PatientID'] : user['PatientID']; body['PatientOutSA'] = user['OutSA']; - body['SessionID'] = SESSION_ID; //getSessionId(token); + body['SessionID'] = SESSION_ID; //getSe + headers = { + 'Content-Type': 'application/json', + 'Accept': 'application/json', + 'Authorization': pharmacyToken, + 'Mobilenumber': user['MobileNumber'].toString(), + 'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9', + 'Username': user['PatientID'].toString(), + }; } } } print("URL : $url"); print("Body : ${json.encode(body)}"); - var ss = json.encode(body); if (await Utils.checkConnection()) { final response = await http.post(url.trim(), - body: json.encode(body), - headers: { - 'Content-Type': 'application/json', - 'Accept': 'application/json' - }); + body: json.encode(body), headers: headers); final int statusCode = response.statusCode; print("statusCode :$statusCode"); if (statusCode < 200 || statusCode >= 400 || json == null) { @@ -155,11 +163,21 @@ class BaseAppClient { onSuccess(parsed, statusCode); } else if (parsed['MessageStatus'] == 2 && parsed['IsAuthenticated']) { - onFailure( - parsed['message'] ?? - parsed['ErrorEndUserMessage'] ?? - parsed['ErrorMessage'], - statusCode); + if (parsed['message'] == null && + parsed['ErrorEndUserMessage'] == null) { + if (parsed['ErrorSearchMsg'] == null) { + onFailure("Server Error found with no available message", + statusCode); + } else { + onFailure(parsed['ErrorSearchMsg'], statusCode); + } + } else { + onFailure( + parsed['message'] ?? + parsed['ErrorEndUserMessage'] ?? + parsed['ErrorMessage'], + statusCode); + } } else if (!parsed['IsAuthenticated']) { await logout(); @@ -256,15 +274,6 @@ class BaseAppClient { var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN); var user = await sharedPref.getObject(USER_PROFILE); - Map test = { - 'Content-Type': 'application/json', - 'Accept': 'application/json', - 'Authorization': token, - 'Mobilenumber': user['MobileNumber'].toString(), - 'Statictoken': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9', - 'Username': user['PatientID'].toString(), - }; - if (await Utils.checkConnection()) { final response = await http.get(url.trim(), headers: { 'Content-Type': 'application/json', diff --git a/lib/core/service/parmacyModule/parmacy_module_service.dart b/lib/core/service/parmacyModule/parmacy_module_service.dart index c400d788..3be9fe1a 100644 --- a/lib/core/service/parmacyModule/parmacy_module_service.dart +++ b/lib/core/service/parmacyModule/parmacy_module_service.dart @@ -67,6 +67,7 @@ class PharmacyModuleService extends BaseService { } Future generatePharmacyToken() async { + await getUser(); Map queryParams = { 'Filenumber':user.patientID.toString(), 'MobileNumber':user.mobileNumber, diff --git a/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart b/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart new file mode 100644 index 00000000..9348c116 --- /dev/null +++ b/lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart @@ -0,0 +1,48 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/ClinicCategory.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart'; +import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; + +import '../../../../locator.dart'; + +class BariatricsViewModel extends BaseViewModel { + BariatricsService _service = locator(); + + List get clinicCategoryList => _service.clinicCategoryList; + + List get diseasesList => _service.diseasesList; + + void getClinicCategory() async { + setState(ViewState.Busy); + await _service.getClinicCategory(); + if (_service.hasError) { + error = _service.error; + setState(ViewState.Error); + } else { + getDiseaseByClinicId(); + } + } + + void getDiseaseByClinicId() async { + setState(ViewState.Busy); + await _service.getDiseaseByClinicId(); + if (_service.hasError) { + error = _service.error; + setState(ViewState.Error); + } else { + setState(ViewState.Idle); + } + } + + Future searchDoctorsByTime(DiseasesByClinic disease) async { + setState(ViewState.Busy); + await _service.searchDoctorsByTime(disease); + if (_service.hasError) { + error = _service.error; + setState(ViewState.ErrorLocal); + } else { + setState(ViewState.Idle); + } + } +} diff --git a/lib/core/viewModels/PrescriptionDeliveryViewModel.dart b/lib/core/viewModels/PrescriptionDeliveryViewModel.dart new file mode 100644 index 00000000..e9731bae --- /dev/null +++ b/lib/core/viewModels/PrescriptionDeliveryViewModel.dart @@ -0,0 +1,26 @@ +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; +import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; + +import '../../locator.dart'; + +class PrescriptionDeliveryViewModel extends BaseViewModel{ + + CustomerAddressesService _customerAddressesService = locator(); + + List get addressesList => _customerAddressesService.addressesList; + + Future getCustomerAddresses() async { + setState(ViewState.Busy); + await _customerAddressesService.getCustomerAddresses( + ); + if (_customerAddressesService.hasError) { + error = _customerAddressesService.error; + setState(ViewState.ErrorLocal); + } else { + setState(ViewState.Idle); + } + } + + +} \ No newline at end of file diff --git a/lib/locator.dart b/lib/locator.dart index 7b4d646a..0aafccf7 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -22,6 +22,7 @@ import 'package:get_it/get_it.dart'; import 'core/service/AlHabibMedicalService/cmc_service.dart'; import 'core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'core/service/AlHabibMedicalService/e_referral_service.dart'; +import 'core/service/AlHabibMedicalService/health-calculator/bariatrics-service.dart'; import 'core/service/AlHabibMedicalService/home_health_care_service.dart'; import 'core/service/AuthenticatedUserObject.dart'; import 'core/service/appointment_rate_service.dart'; @@ -71,6 +72,8 @@ import 'core/service/parmacyModule/parmacy_module_service.dart'; import 'core/service/offers_service.dart'; import 'core/service/pharmacy_categorise_service.dart'; +import 'core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart'; +import 'core/viewModels/PrescriptionDeliveryViewModel.dart'; import 'core/viewModels/TermsConditionsViewModel.dart'; import 'core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; import 'core/viewModels/appointment_rate_view_model.dart'; @@ -217,6 +220,7 @@ void setupLocator() { locator.registerLazySingleton(() => PrivilegeService()); locator.registerLazySingleton(() => WeatherService()); locator.registerLazySingleton(() => TermsConditionsService()); + locator.registerLazySingleton(() => BariatricsService()); /// View Model locator.registerFactory(() => HospitalViewModel()); @@ -259,6 +263,7 @@ void setupLocator() { locator.registerFactory(() => EyeViewModel()); locator.registerFactory(() => ActiveMedicationsViewModel()); locator.registerFactory(() => AskDoctorViewModel()); + locator.registerFactory(() => PrescriptionDeliveryViewModel()); locator.registerFactory(() => AllergiesViewModel()); locator.registerFactory(() => HomeHealthCareViewModel()); @@ -280,6 +285,7 @@ void setupLocator() { //pharmacy locator.registerFactory(() => PharmacyCategoriseViewModel()); locator.registerFactory(() => OffersCategoriseViewModel()); + locator.registerFactory(() => BariatricsViewModel()); // Offer And Packages //---------------------- diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart index b745e0c9..4f6213d5 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart @@ -43,7 +43,7 @@ class _CMCPageState extends State builder: (_, model, widget) => AppScaffold( isShowAppBar: true, description:TranslationBase.of(context).infoCMC, - imagesInfo: [ImagesInfo(imageAr: 'assets/images/AlHabibMedicalService/Wifi-AR.png',imageEn: 'assets/images/AlHabibMedicalService/Wifi-EN.png', isAsset: true)], + imagesInfo: [ImagesInfo(imageAr: 'assets/images/Wifi-AR.png',imageEn: 'assets/images/wifi-EN.png', isAsset: true)], appBarTitle: TranslationBase.of(context).comprehensiveMedicalCheckup, body: Scaffold( extendBodyBehindAppBar: true, diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart index 3180cf18..1c10e594 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart @@ -1,5 +1,6 @@ import 'dart:ui'; +import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/all_habib_medical_services/e_referral_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; @@ -37,13 +38,14 @@ class _HomeHealthCarePageState extends State Widget build(BuildContext context) { return BaseView( onModelReady: (model){ - // model.getHHCAllServices(); model.getHHCAllPresOrders(); }, builder: (_, model, widget) => AppScaffold( isShowAppBar: true, description: TranslationBase.of(context).HHCNotAuthMsg, appBarTitle: TranslationBase.of(context).homeHealthCare, + imagesInfo: [ImagesInfo(imageAr: 'assets/images/Wifi-AR.png',imageEn: 'assets/images/wifi-EN.png', isAsset: true)], + body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart new file mode 100644 index 00000000..d9665aa4 --- /dev/null +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart @@ -0,0 +1,190 @@ +import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HealthCalculator/DiseasesByClinic.dart'; +import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +// TODO mosa_remark +class BariatricsPage extends StatefulWidget { + final age; + final gender; + final double obeseResult; + + BariatricsPage(this.age, this.gender, this.obeseResult); + + @override + _BariatricsPageState createState() => _BariatricsPageState(); +} + +class _BariatricsPageState extends State { + DiseasesByClinic _selectedDisease; + + @override + Widget build(BuildContext context) { + ProjectViewModel projectProvider = Provider.of(context); + + return BaseView( + onModelReady: (model) => model.getClinicCategory(), + builder: (_, model, w) => + AppScaffold( + isShowAppBar: true, + appBarTitle: "${TranslationBase + .of(context) + .bariatrics}", + baseViewModel: model, + body: Column( + children: [ + Container( + margin: EdgeInsets.all(8.0), + child: Center( + child: Texts(TranslationBase + .of(context) + .bariatricsHeaderMsg), + ), + ), + Expanded( + child: Container( + margin: EdgeInsets.symmetric( + horizontal: 16.0, vertical: 8.0), + child: Row( + children: [ + Expanded( + child: SingleChildScrollView( + child: Column( + children: [ + ...model.diseasesList + .map((item) => + RadioListTile( + title: Texts("${item.diseases}"), + activeColor: Colors.blue.shade700, + value: item.diseasesID, + groupValue: _selectedDisease != null + ? _selectedDisease.diseasesID + : -1, + selected: _selectedDisease != null ? item + .diseasesID == + _selectedDisease.diseasesID : false, + onChanged: (val) { + setState(() { + _selectedDisease = item; + }); + }, + )) + .toList() + ], + ), + ), + ), + Image.asset( + _getImageName(widget.gender, widget.obeseResult, + projectProvider.isArabic), + fit: BoxFit.cover, + ), + ], + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16), + child: BorderedButton( + TranslationBase + .of(context) + .continues, + fontSize: SizeConfig.textMultiplier * 2.1, + textColor: Colors.white, + vPadding: 8, + hPadding: 8, + backgroundColor: Theme + .of(context) + .primaryColor, + radius: 8, + fontWeight: FontWeight.bold, + handler: () async { + await model.searchDoctorsByTime(_selectedDisease); + if(model.state == ViewState.ErrorLocal){ + AppToast.showErrorToast(message: model.error); + } + // Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => BariatricsPage()), + // ); + }, + ), + ), + Container( + margin: EdgeInsets.only(bottom: 16.0, left: 16, right: 16), + child: BorderedButton( + TranslationBase + .of(context) + .skip, + fontSize: SizeConfig.textMultiplier * 2.1, + textColor: Colors.blue, + vPadding: 8, + hPadding: 8, + backgroundColor: Color(0x00000000), + radius: 8, + hasBorder: true, + borderColor: Color(0x00000000), + fontWeight: FontWeight.bold, + handler: () async { + await model.searchDoctorsByTime(_selectedDisease); + if(model.state == ViewState.ErrorLocal){ + AppToast.showErrorToast(message: model.error); + } + // Navigator.push( + // context, + // MaterialPageRoute(builder: (context) => BariatricsPage()), + // ); + }, + ), + ), + ], + ), + ), + ); + } + + _getImageName(int gender, double obeseResult, bool isArabic) { + String path = "assets/images/BMI/"; + double result = obeseResult; + + if (result < 18.5 && gender == 1) { + path += "bmi_blue_male"; + } else if (result >= 18.5 && result <= 24.9 && gender == 1) { + path += "bmi_green_male"; + } else if (result >= 25 && result <= 29.9 && gender == 1) { + path += "bmi_yellow_male"; + } else if (result >= 30 && result <= 34.9 && gender == 1) { + path += "bmi_orange_male"; + } else if (result >= 35 && gender == 1) { + path += "bmi_red_male"; + } else if (result < 18.5 && gender == 2) { + path += "bmi_blue_female"; + } else if (result >= 18.5 && result <= 24.9 && gender == 2) { + path += "bmi_green_female"; + } else if (result >= 25 && result <= 29.9 && gender == 2) { + path += "bmi_yellow_female"; + } else if (result >= 30 && result <= 34.9 && gender == 2) { + path += "bmi_orange_female"; + } else if (result >= 35 && gender == 2) { + path += "bmi_red_female"; + } else { + path += "default.png"; + } + + if (isArabic) { + path += "_ar.png"; + } else { + path += "_en.png"; + } + return path; + } +} diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart index 68cd2c99..2dbf2035 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bmi_calculator.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -27,6 +28,7 @@ class _BMICalculatorState extends State { Color ftCard = inactiveCardColor; Color lbCard = inactiveCardColor; Color kgCard = activeCardColor; + void updateColor(int type) { //MG/DLT card if (type == 1) { @@ -84,31 +86,27 @@ class _BMICalculatorState extends State { return bmiResult; } - void showTextResult() { + void showTextResult(BuildContext context) { if (bmiResult >= 30) { - textResult = 'Obese'; + textResult = TranslationBase.of(context).obese; } else if (bmiResult < 30 && bmiResult >= 25) { - textResult = 'OverWeight'; + textResult = TranslationBase.of(context).overWeight; } else if (bmiResult < 25 && bmiResult >= 18.5) { - textResult = 'Healthy'; + textResult = TranslationBase.of(context).healthy; } else if (bmiResult < 18.5) { - textResult = 'UnderWeight'; + textResult = TranslationBase.of(context).underWeight; } } - void showMsg() { + void showMsg(BuildContext context) { if (bmiResult >= 30) { - msg = - 'A BMI of over 30 indicates that are heavily overweight. Health may be at risk if not lose weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.'; + msg = TranslationBase.of(context).bmiCalcMsgObese; } else if (bmiResult < 30 && bmiResult >= 25) { - msg = - 'A BMI of 25 - 30 indicates that are slightly overweight. May be advised to lose some weight for health reasons. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get '; + msg = TranslationBase.of(context).bmiCalcMsgOverweight; } else if (bmiResult < 25 && bmiResult >= 18.5) { - msg = - 'A BMI of 18.5 - 25 indicates that are at a healthy weight for the height. By maintaining a healthy weight, lower the risk of developing severe health problems. To book an appointment, click below to get started.'; + msg = TranslationBase.of(context).bmiCalcMsgHealthy; } else if (bmiResult < 18.5) { - msg = - 'A BMI of less than 18.5 indicates that are underweight, so may need to put on some weight. Recommended talking to a doctor or a dietician for advice. To book an appointment, click below to get started.'; + msg = TranslationBase.of(context).bmiCalcMsgUnderWeight; } } @@ -121,26 +119,28 @@ class _BMICalculatorState extends State { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, - appBarTitle: 'BMI Calculator', + isShowDecPage: false, + appBarTitle: + "${TranslationBase.of(context).bmi} ${TranslationBase.of(context).calcHealth}", body: SingleChildScrollView( child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ Center( child: Container( - width: 350.0, + margin: EdgeInsets.symmetric(vertical: 8, horizontal: 16), child: Padding( padding: EdgeInsets.symmetric(vertical: 15.0), child: Text( - 'Calculate the BMI value and weight\n status to identify the healthy weight .\n Not appropriate for children and women\n who are pregnant or breastfeeding', + TranslationBase.of(context).bmiCalcDesc, style: TextStyle(fontSize: 18.0), ), ), ), ), Container( - height: 200.0, - width: 350.0, + margin: EdgeInsets.symmetric(vertical: 8, horizontal: 16), + padding: EdgeInsets.only(bottom: 16), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(12.0), @@ -151,7 +151,7 @@ class _BMICalculatorState extends State { children: [ Padding( padding: EdgeInsets.all(8.0), - child: Texts('Height'), + child: Texts(TranslationBase.of(context).height), ), ], ), @@ -241,7 +241,7 @@ class _BMICalculatorState extends State { children: [ Padding( padding: EdgeInsets.all(8.0), - child: Texts('Select Unit'), + child: Texts(TranslationBase.of(context).selectUnit), ), ], ), @@ -273,7 +273,8 @@ class _BMICalculatorState extends State { child: Padding( padding: const EdgeInsets.symmetric( vertical: 0.0, horizontal: 18.0), - child: Center(child: Texts('CM')), + child: Center( + child: Texts(TranslationBase.of(context).cm)), ), ), ), @@ -302,7 +303,8 @@ class _BMICalculatorState extends State { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Center(child: Texts('FT')), + child: Center( + child: Texts(TranslationBase.of(context).feet)), ), ), ), @@ -315,8 +317,8 @@ class _BMICalculatorState extends State { height: 25.0, ), Container( - height: 200.0, - width: 350.0, + margin: EdgeInsets.symmetric(vertical: 8, horizontal: 16), + padding: EdgeInsets.only(bottom: 16), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(12.0), @@ -327,7 +329,7 @@ class _BMICalculatorState extends State { children: [ Padding( padding: EdgeInsets.all(8.0), - child: Texts('Weight'), + child: Texts(TranslationBase.of(context).weight), ), ], ), @@ -417,7 +419,7 @@ class _BMICalculatorState extends State { children: [ Padding( padding: EdgeInsets.all(8.0), - child: Texts('Select Unit'), + child: Texts(TranslationBase.of(context).selectUnit), ), ], ), @@ -449,7 +451,8 @@ class _BMICalculatorState extends State { child: Padding( padding: const EdgeInsets.symmetric( vertical: 0.0, horizontal: 18.0), - child: Center(child: Texts('KG')), + child: Center( + child: Texts(TranslationBase.of(context).kg)), ), ), ), @@ -478,7 +481,9 @@ class _BMICalculatorState extends State { child: Padding( padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Center(child: Texts('LB')), + child: Center( + child: + Texts(TranslationBase.of(context).pound)), ), ), ), @@ -491,15 +496,15 @@ class _BMICalculatorState extends State { height: 25.0, ), Container( - height: 50.0, - width: 350.0, + margin: EdgeInsets.symmetric(vertical: 8, horizontal: 16), + padding: EdgeInsets.symmetric(vertical: 8), child: SecondaryButton( - label: 'CALCULATE', + label: TranslationBase.of(context).calculate, onTap: () => { setState(() { calculateBMI(); - showTextResult(); - showMsg(); + showTextResult(context); + showMsg(context); { Navigator.push( context, diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart index bfbd10b7..8ac6b06c 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmi_calculator/result_page.dart @@ -1,5 +1,9 @@ import 'dart:ffi'; +import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/bmi_calculator/bariatrics-screen.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/borderedButton.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -12,6 +16,7 @@ class ResultPage extends StatelessWidget { final String msg; ResultPage({this.finalResult, this.textResult, this.msg}); + Color inductorColor; double percent; @@ -45,53 +50,74 @@ class ResultPage extends StatelessWidget { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, - appBarTitle: "BMI Calculator", + appBarTitle: + "${TranslationBase.of(context).bmi} ${TranslationBase.of(context).calcHealth}", body: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - SizedBox( - // height: 40.0, - ), - Center( - child: CircularPercentIndicator( - radius: 220.0, - lineWidth: 20.0, - percent: percentInductor(), - center: Column( - mainAxisAlignment: MainAxisAlignment.center, + Expanded( + child: SingleChildScrollView( + child: Column( children: [ - Text( - finalResult.toStringAsFixed(1), - style: TextStyle( - fontSize: 18.0, - fontWeight: FontWeight.bold, + Container( + margin: EdgeInsets.only(top: 50), + child: Center( + child: CircularPercentIndicator( + radius: 220.0, + lineWidth: 20.0, + percent: percentInductor(), + center: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text( + finalResult.toStringAsFixed(1), + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.bold, + ), + ), + SizedBox( + height: 5.0, + ), + Text( + textResult, + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.w600, + ), + ), + ], + ), + progressColor: colorInductor(), + backgroundColor: Colors.white, + ), ), ), - SizedBox( - height: 5.0, - ), - Text( - textResult, - style: TextStyle( - fontSize: 16.0, - fontWeight: FontWeight.w600, - ), + Container( + margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16), + child: Texts(msg), ), ], ), - progressColor: colorInductor(), - backgroundColor: Colors.white, ), ), Container( - height: 120, - width: 280.0, - child: Texts(msg), - ), - Container( - width: 350, - child: Button( - label: 'See List Of Doctors', + margin: EdgeInsets.symmetric(horizontal: 16, vertical: 16), + child: BorderedButton( + TranslationBase.of(context).seeListOfDoctor, + fontSize: SizeConfig.textMultiplier * 2.1, + textColor: Colors.white, + vPadding: 8, + hPadding: 8, + backgroundColor: Theme.of(context).primaryColor, + radius: 8, + fontWeight: FontWeight.bold, + handler: (){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => BariatricsPage(1, 1, finalResult)), + ); + }, ), ), ], diff --git a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart index 01393e0b..b393600f 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/bmr_calculator/bmr_calculator.dart @@ -122,6 +122,7 @@ class _BmrCalculatorState extends State { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, + isShowDecPage: false, appBarTitle: 'Bmr Calculator', body: Padding( padding: EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart index e2196540..d4e9c427 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; @@ -29,6 +30,7 @@ class _CalorieCalculatorState extends State { int weight = 0; double calories; String dropdownValue; + void updateColor(int type) { //MG/DLT card if (type == 1) { @@ -102,89 +104,91 @@ class _CalorieCalculatorState extends State { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, - appBarTitle: 'Calorie Calculator', - body: Padding( - padding: const EdgeInsets.symmetric(horizontal: 25.0, vertical: 15.0), - child: SingleChildScrollView( - child: Container( - height: 890.0, - child: Column( - //mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.all(10.0), - child: Texts( - 'Calculates daily calorie intake based on several factors, like height, weight, age, gender and daily physical activity rate', - ), - ), - Padding( - padding: - EdgeInsets.symmetric(horizontal: 10.0, vertical: 15.0), - child: Texts('Gender'), - ), - Container( - width: 350, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(35.0), - color: Colors.white, - border: Border.all( - color: Colors.black45, - )), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - GestureDetector( - onTap: () { - setState(() { - updateColor(1); - isMale = false; - }); - }, - child: Container( - height: 55.0, - width: 170.0, - decoration: BoxDecoration( - color: maleCard, - borderRadius: BorderRadius.circular(35.0), + isShowDecPage: false, + appBarTitle: + "${TranslationBase.of(context).calories} ${TranslationBase.of(context).calcHealth}", + body: Column( + children: [ + Expanded( + child: SingleChildScrollView( + child: Container( + margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0), + child: Column( + //mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts( + TranslationBase.of(context).calorieCalcDesc, + ), + SizedBox( + height: 8.0, + ), + Texts(TranslationBase.of(context).gender), + SizedBox( + height: 8.0, + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(30.0), + color: Colors.white, + border: Border.all( + color: Colors.black45, + )), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColor(1); + isMale = false; + }); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 16), + decoration: BoxDecoration( + color: maleCard, + borderRadius: BorderRadius.circular(30.0), + ), + child: Center( + child: Texts( + TranslationBase.of(context).female)), + ), + ), ), - child: Center(child: Texts('FEMALE')), - ), - ), - GestureDetector( - onTap: () { - setState(() { - updateColor(2); - isMale = true; - }); - }, - child: Container( - height: 55.0, - width: 170.0, - decoration: BoxDecoration( - color: femaleCard, - borderRadius: BorderRadius.circular(35.0), + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColor(2); + isMale = true; + }); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 16), + decoration: BoxDecoration( + color: femaleCard, + borderRadius: BorderRadius.circular(30.0), + ), + child: Center( + child: Texts( + TranslationBase.of(context).male)), + ), + ), ), - child: Center(child: Texts('MALE')), - ), + ], ), - ], - ), - ), - SizedBox( - height: 15.0, - ), - Texts( - 'The Age ( 11 - 120 ) yrs', - ), - SizedBox( - height: 10.0, - ), - Row( - children: [ + ), + SizedBox( + height: 12.0, + ), + Texts( + TranslationBase.of(context).age11_120Years, + ), Container( - width: 340.0, - height: 60.0, + margin: + EdgeInsets.symmetric(horizontal: 4.0, vertical: 12.0), decoration: BoxDecoration( color: Colors.white, ), @@ -195,7 +199,7 @@ class _CalorieCalculatorState extends State { vertical: 10.0, horizontal: 8.0), child: Center( child: Container( - width: 60.0, + width: 60, foregroundDecoration: BoxDecoration( borderRadius: BorderRadius.circular(5.0), border: Border.all( @@ -206,12 +210,16 @@ class _CalorieCalculatorState extends State { child: Row( children: [ Expanded( - child: Center( - child: Text(age.toString()), + child: Padding( + padding: const EdgeInsets.all(4.0), + child: Center( + child: Text(age.toString()), + ), ), ), Container( - height: 38.0, + padding: + EdgeInsets.symmetric(horizontal: 4), child: Column( crossAxisAlignment: CrossAxisAlignment.center, @@ -274,16 +282,12 @@ class _CalorieCalculatorState extends State { ], ), ), - ], - ), - Texts( - 'Height', - ), - Row( - children: [ + Texts( + TranslationBase.of(context).height, + ), Container( - width: 340.0, - height: 60.0, + margin: + EdgeInsets.symmetric(horizontal: 4.0, vertical: 12.0), decoration: BoxDecoration( color: Colors.white, ), @@ -305,12 +309,16 @@ class _CalorieCalculatorState extends State { child: Row( children: [ Expanded( - child: Center( - child: Text(height.toString()), + child: Padding( + padding: const EdgeInsets.all(4.0), + child: Center( + child: Text(height.toString()), + ), ), ), Container( - height: 38.0, + padding: + EdgeInsets.symmetric(horizontal: 4.0), child: Column( crossAxisAlignment: CrossAxisAlignment.center, @@ -373,85 +381,90 @@ class _CalorieCalculatorState extends State { ], ), ), - ], - ), - Texts('Select Unit'), - SizedBox( - height: 5.0, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - GestureDetector( - onTap: () { - setState(() { - updateColorHeight(1); - }); - }, - child: Container( - height: 55.0, - width: 150.0, - decoration: BoxDecoration( - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 3, - blurRadius: 7, - offset: - Offset(0, 3), // changes position of shadow - ), - ], - color: cmCard, - borderRadius: BorderRadius.circular(3.0), - ), - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 0.0, horizontal: 18.0), - child: Center(child: Texts('CM')), - ), - ), + Texts( + TranslationBase.of(context).selectUnit, + ), + SizedBox( + height: 8.0, ), - GestureDetector( - onTap: () { - setState(() { - updateColorHeight(2); - }); - }, - child: Container( - height: 55.0, - width: 150.0, - decoration: BoxDecoration( - color: ftCard, - borderRadius: BorderRadius.circular(3.0), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 3, - blurRadius: 7, - offset: - Offset(0, 3), // changes position of shadow + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColorHeight(1); + }); + }, + child: Container( + padding: EdgeInsets.all(12), + margin: EdgeInsets.symmetric(horizontal: 8), + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: cmCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts(TranslationBase.of(context).cm)), + ), ), - ], + ), ), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Center(child: Texts('Ft')), + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColorHeight(2); + }); + }, + child: Container( + padding: EdgeInsets.all(12), + margin: EdgeInsets.symmetric(horizontal: 8), + decoration: BoxDecoration( + color: ftCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts(TranslationBase.of(context).feet))), + ), + ), ), - ), + ], + ), + SizedBox( + height: 8.0, + ), + Texts( + TranslationBase.of(context).weight, + ), + SizedBox( + height: 5.0, ), - ], - ), - SizedBox( - height: 5.0, - ), - Texts( - 'Weight', - ), - Row( - children: [ Container( - width: 340.0, - height: 60.0, + margin: + EdgeInsets.symmetric(horizontal: 4.0, vertical: 12.0), decoration: BoxDecoration( color: Colors.white, ), @@ -500,7 +513,8 @@ class _CalorieCalculatorState extends State { ), onTap: () { setState(() { - if (weight < 250) weight++; + if (weight < 250) + weight++; }); }, ), @@ -541,137 +555,140 @@ class _CalorieCalculatorState extends State { ], ), ), - ], - ), - Texts('Select Unit'), - SizedBox( - height: 5.0, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - GestureDetector( - onTap: () { - setState(() { - updateColorWeight(1); - }); - }, - child: Container( - height: 55.0, - width: 150.0, - decoration: BoxDecoration( - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 3, - blurRadius: 7, - offset: - Offset(0, 3), // changes position of shadow + Texts(TranslationBase.of(context).selectUnit), + SizedBox( + height: 5.0, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColorWeight(1); + }); + }, + child: Container( + padding: EdgeInsets.all(12), + margin: EdgeInsets.symmetric(horizontal: 8), + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + color: kgCard, + borderRadius: BorderRadius.circular(3.0), + ), + child: Padding( + padding: const EdgeInsets.symmetric( + vertical: 0.0, horizontal: 18.0), + child: Center(child: Texts(TranslationBase.of(context).kg)), + ), ), - ], - color: kgCard, - borderRadius: BorderRadius.circular(3.0), - ), - child: Padding( - padding: const EdgeInsets.symmetric( - vertical: 0.0, horizontal: 18.0), - child: Center(child: Texts('KG')), + ), ), - ), - ), - GestureDetector( - onTap: () { - setState(() { - updateColorWeight(2); - }); - }, - child: Container( - height: 55.0, - width: 150.0, - decoration: BoxDecoration( - color: lbCard, - borderRadius: BorderRadius.circular(3.0), - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 3, - blurRadius: 7, - offset: - Offset(0, 3), // changes position of shadow + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + updateColorWeight(2); + }); + }, + child: Container( + padding: EdgeInsets.all(12), + margin: EdgeInsets.symmetric(horizontal: 8), + decoration: BoxDecoration( + color: lbCard, + borderRadius: BorderRadius.circular(3.0), + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 3, + blurRadius: 7, + offset: Offset( + 0, 3), // changes position of shadow + ), + ], + ), + child: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 16.0), + child: Center(child: Texts(TranslationBase.of(context).pound)), + ), ), - ], + ), ), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Center(child: Texts('LB')), + ], + ), + SizedBox( + height: 8.0, + ), + Texts(TranslationBase.of(context).activityLevel), + Container( + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black87), + underline: Container( + height: 2, + color: Colors.black54, ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'Almost Inactive(Little or no exercises)', + 'Lighty Active (1-3) days per week', + 'very Active(6-7) days per week', + 'Super Active(very hard exercises)' + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), ), ), - ], - ), - SizedBox( - height: 5.0, - ), - Texts('Activity level'), - Container( - width: 300, - child: DropdownButton( - value: dropdownValue, - icon: Icon(Icons.arrow_downward), - iconSize: 24, - elevation: 16, - style: TextStyle(color: Colors.black87), - underline: Container( - height: 2, - color: Colors.black54, + SizedBox( + height: 25.0, ), - onChanged: (String newValue) { - setState(() { - dropdownValue = newValue; - }); - }, - items: [ - 'Almost Inactive(Little or no exercises)', - 'Lighty Active (1-3) days per week', - 'very Active(6-7) days per week', - 'Super Active(very hard exercises)' - ].map>((String value) { - return DropdownMenuItem( - value: value, - child: Text(value), - ); - }).toList(), - ), - ), - SizedBox( - height: 25.0, - ), - Container( - height: 100.0, - width: 350.0, - child: SecondaryButton( - label: 'CALCULATE', - onTap: () { - setState(() { - calculateCalories(); - print(calories); - { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => CalorieResultPage( - calorie: calories, - )), - ); - } - }); - }, - ), + ], ), - ], + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0), + child: SecondaryButton( + label: TranslationBase.of(context).calculate, + onTap: () { + setState(() { + calculateCalories(); + print(calories); + { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CalorieResultPage( + calorie: calories, + )), + ); + } + }); + }, ), ), - ), + ], ), ); } diff --git a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart index 5c52ecb0..110b2afc 100644 --- a/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart +++ b/lib/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_result_page.dart @@ -1,3 +1,4 @@ +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; @@ -12,7 +13,8 @@ class CalorieResultPage extends StatelessWidget { @override Widget build(BuildContext context) { return AppScaffold( - appBarTitle: 'Calorie Calculator', + isShowDecPage: false, + appBarTitle: "${TranslationBase.of(context).calories} ${TranslationBase.of(context).calculators}", isShowAppBar: true, body: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, diff --git a/lib/pages/AlHabibMedicalService/health_converter.dart b/lib/pages/AlHabibMedicalService/health_converter.dart index 2b3b1a8e..5ae80183 100644 --- a/lib/pages/AlHabibMedicalService/health_converter.dart +++ b/lib/pages/AlHabibMedicalService/health_converter.dart @@ -18,6 +18,7 @@ class _HealthConverterState extends State { Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, + isShowDecPage: false, appBarTitle: TranslationBase.of(context).converters, body: Column( children: [ diff --git a/lib/pages/AlHabibMedicalService/​ health_calculators.dart b/lib/pages/AlHabibMedicalService/​ health_calculators.dart index d3bd4bed..80e0079f 100644 --- a/lib/pages/AlHabibMedicalService/​ health_calculators.dart +++ b/lib/pages/AlHabibMedicalService/​ health_calculators.dart @@ -3,6 +3,7 @@ import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculat import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/calorie_calculator/calorie_calculator.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/health_calculator/ovulation_period/ovulation_period.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -37,7 +38,8 @@ class _HealthCalculatorsState extends State Widget build(BuildContext context) { return AppScaffold( isShowAppBar: true, - appBarTitle: 'Health Calculators', + isShowDecPage: false, + appBarTitle: TranslationBase.of(context).calculators, body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( @@ -72,13 +74,13 @@ class _HealthCalculatorsState extends State Container( width: MediaQuery.of(context).size.width * 0.35, child: Center( - child: Texts('General Health'), + child: Texts(TranslationBase.of(context).generalHealth), ), ), Container( width: MediaQuery.of(context).size.width * 0.35, child: Center( - child: Texts("Women's Health"), + child: Texts(TranslationBase.of(context).womanHealth), ), ), ], @@ -115,9 +117,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'BMI', + title: TranslationBase.of(context).bmi, imagePath: 'bmi_health_calculator.png', - subTitle: 'Calculators', + subTitle: TranslationBase.of(context).calcHealth, ), ), ), @@ -133,9 +135,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Calories', + title: TranslationBase.of(context).calories, imagePath: 'calories-calculator.png', - subTitle: 'Calculators', + subTitle: TranslationBase.of(context).calcHealth, ), ), ), @@ -155,9 +157,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'BMR', + title: TranslationBase.of(context).bmr, imagePath: 'BMR_calculator.png', - subTitle: 'Calculators', + subTitle: TranslationBase.of(context).calcHealth, ), ), ), @@ -173,9 +175,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Ideal Body', + title: TranslationBase.of(context).idealBody, imagePath: 'body_weight.png', - subTitle: 'Weight', + subTitle: TranslationBase.of(context).weight, ), ), ), @@ -195,9 +197,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Body', + title: TranslationBase.of(context).bodyWord, imagePath: 'body_fat.png', - subTitle: 'Fat', + subTitle: TranslationBase.of(context).fat, ), ), ), @@ -213,9 +215,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Carbohydrate', + title: TranslationBase.of(context).carbohydrate, imagePath: 'carb_protein.png', - subTitle: 'Protein Fat', + subTitle: TranslationBase.of(context).proteinFat, ), ), ), @@ -243,9 +245,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Ovulation', + title: TranslationBase.of(context).ovulation, imagePath: 'ovulation_period_icon.png', - subTitle: 'Period', + subTitle: TranslationBase.of(context).period, ), ), ), @@ -261,9 +263,9 @@ class _HealthCalculatorsState extends State ); }, child: MedicalProfileItem( - title: 'Delivery', + title: TranslationBase.of(context).delivery, imagePath: 'delivery_date_icon.png', - subTitle: 'Due Date', + subTitle: TranslationBase.of(context).dueDate, ), ), ), diff --git a/lib/pages/Blood/blood_donation.dart b/lib/pages/Blood/blood_donation.dart index e0fa2aec..6d1e98ea 100644 --- a/lib/pages/Blood/blood_donation.dart +++ b/lib/pages/Blood/blood_donation.dart @@ -29,7 +29,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:provider/provider.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; //import '../../../core/model/my_balance/AdvanceModel.dart'; import 'confirm_payment_page.dart'; diff --git a/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart b/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart index d165a895..5cfb2372 100644 --- a/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart +++ b/lib/pages/Blood/dialogs/ConfirmSMSDialog.dart @@ -8,13 +8,13 @@ import 'package:diplomaticquarterapp/core/model/my_balance/patient_info_and_mobi import 'package:diplomaticquarterapp/core/viewModels/medical/my_balance_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class ConfirmSMSDialog extends StatefulWidget { final String phoneNumber; @@ -112,32 +112,31 @@ class _ConfirmSMSDialogState extends State { height: 40, color: Theme.of(context).primaryColor, child: Stack( - children: [ Center( - child: Texts( - 'SMS', - color: Colors.white, - textAlign: TextAlign.center, - ), - ), - Positioned(child: Container( - child: InkWell( - onTap: () => Navigator.pop(context), - child: Container( - decoration: BoxDecoration( - shape: BoxShape.circle, color: Colors.white), - child: Icon( - Icons.clear, - color: Colors.grey[900], - )), + child: Texts( + 'SMS', + color: Colors.white, + textAlign: TextAlign.center, ), ), - left: projectViewModel.isArabic? 2:0, - right: projectViewModel.isArabic? 0:2, + Positioned( + child: Container( + child: InkWell( + onTap: () => Navigator.pop(context), + child: Container( + decoration: BoxDecoration( + shape: BoxShape.circle, color: Colors.white), + child: Icon( + Icons.clear, + color: Colors.grey[900], + )), + ), + ), + left: projectViewModel.isArabic ? 2 : 0, + right: projectViewModel.isArabic ? 0 : 2, ) ], - ), ), Image.asset( @@ -335,14 +334,13 @@ class _ConfirmSMSDialogState extends State { void submit(MyBalanceViewModel model) { if (verifyAccountForm.currentState.validate()) { + GifLoaderDialogUtils.showMyDialog(context); final activationCode = digit1.text + digit2.text + digit3.text + digit4.text; model .checkActivationCodeForAdvancePayment(activationCode: activationCode) - .then((value) {}) - .showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) .then((value) { + GifLoaderDialogUtils.hideDialog(context); Navigator.pop(context, true); }); } diff --git a/lib/pages/BookAppointment/BookConfirm.dart b/lib/pages/BookAppointment/BookConfirm.dart index 03a28d90..ae968764 100644 --- a/lib/pages/BookAppointment/BookConfirm.dart +++ b/lib/pages/BookAppointment/BookConfirm.dart @@ -61,6 +61,7 @@ class _BookConfirmState extends State { toDoProvider = Provider.of(context); return AppScaffold( appBarTitle: TranslationBase.of(context).bookAppo, + isShowDecPage: false, isShowAppBar: true, body: SingleChildScrollView( child: Container( @@ -461,6 +462,7 @@ class _BookConfirmState extends State { dialog.showAlertDialog(context); } }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); AppToast.showErrorToast(message: err); print(err); }); diff --git a/lib/pages/BookAppointment/DentalComplaints.dart b/lib/pages/BookAppointment/DentalComplaints.dart index 34a7e1e1..614189e0 100644 --- a/lib/pages/BookAppointment/DentalComplaints.dart +++ b/lib/pages/BookAppointment/DentalComplaints.dart @@ -5,9 +5,9 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/DentalComplai import 'package:diplomaticquarterapp/pages/livecare/widgets/clinic_card.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class DentalComplaints extends StatefulWidget { SearchInfo searchInfo; @@ -59,12 +59,14 @@ class _DentalComplaintsState extends State { } getChiefComplaintsList() { + GifLoaderDialogUtils.showMyDialog(context); getLanguageID(); ClinicListService service = new ClinicListService(); service .getChiefComplaintsList( widget.searchInfo.ClinicID, widget.searchInfo.ProjectID, context) .then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { print(res['List_DentalChiefComplain']); setState(() { @@ -75,8 +77,8 @@ class _DentalComplaintsState extends State { }); } else {} }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } } diff --git a/lib/pages/BookAppointment/QRCode.dart b/lib/pages/BookAppointment/QRCode.dart index e92c2348..00fb2fc8 100644 --- a/lib/pages/BookAppointment/QRCode.dart +++ b/lib/pages/BookAppointment/QRCode.dart @@ -10,11 +10,11 @@ import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsLis import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class QRCode extends StatefulWidget { PatientShareResponse patientShareResponse; @@ -235,6 +235,7 @@ class _QRCodeState extends State { okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () { + GifLoaderDialogUtils.showMyDialog(context); service .sendAppointmentQREmail( widget.authUser.emailAddress, @@ -247,15 +248,14 @@ class _QRCodeState extends State { widget.patientShareResponse.doctorSpeciality), context) .then((res) { - print(res); + GifLoaderDialogUtils.hideDialog(context); ConfirmDialog.closeAlertDialog(context); }).catchError((err) { ConfirmDialog.closeAlertDialog(context); + GifLoaderDialogUtils.hideDialog(context); AppToast.showErrorToast(message: err); print(err); - }).showProgressBar( - text: "Loading", - backgroundColor: Colors.blue.withOpacity(0.6)); + }); }, cancelFunction: () => {}); dialog.showAlertDialog(context); diff --git a/lib/pages/BookAppointment/SearchResults.dart b/lib/pages/BookAppointment/SearchResults.dart index 0c65a789..e5f219f0 100644 --- a/lib/pages/BookAppointment/SearchResults.dart +++ b/lib/pages/BookAppointment/SearchResults.dart @@ -26,6 +26,7 @@ class _SearchResultsState extends State { Widget build(BuildContext context) { return AppScaffold( appBarTitle: TranslationBase.of(context).bookAppo, + isShowDecPage: false, isShowAppBar: true, body: Container( margin: EdgeInsets.all(10.0), diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart index 01c9ee92..7e4e8fa9 100644 --- a/lib/pages/BookAppointment/components/SearchByClinic.dart +++ b/lib/pages/BookAppointment/components/SearchByClinic.dart @@ -13,7 +13,6 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/card/rounded_container.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class SearchByClinic extends StatefulWidget { final List clnicIds; @@ -213,6 +212,7 @@ class _SearchByClinicState extends State { }); } + // TODO Mosa_REMARk to come back later getDoctorsList(BuildContext context) { GifLoaderDialogUtils.showMyDialog(context); SearchInfo searchInfo = new SearchInfo(); diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index 1e1945b5..5e4ea91c 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -4,7 +4,6 @@ import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import '../SearchResults.dart'; diff --git a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart index 27f37d0a..57377d75 100644 --- a/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart +++ b/lib/pages/BookAppointment/widgets/DentalComplaintCard.dart @@ -3,8 +3,8 @@ import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/services/clinic_services/get_clinic_service.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; // ignore: must_be_immutable class DentalComplaintCard extends StatefulWidget { @@ -70,11 +70,13 @@ class _DentalComplaintCardState extends State { List _patientDoctorAppointmentListHospital = List(); + GifLoaderDialogUtils.showMyDialog(context); ClinicListService service = new ClinicListService(); service .getChiefComplaintDoctorList(widget.listDentalChiefComplain.iD, widget.listDentalChiefComplain.projectID, context) .then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { print(res['List_DentalDoctorChiefComplaintMapping']); setState(() { @@ -114,9 +116,9 @@ class _DentalComplaintCardState extends State { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); } }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } Future navigateToSearchResults( diff --git a/lib/pages/BookAppointment/widgets/DoctorView.dart b/lib/pages/BookAppointment/widgets/DoctorView.dart index 1562c5f7..2788145f 100644 --- a/lib/pages/BookAppointment/widgets/DoctorView.dart +++ b/lib/pages/BookAppointment/widgets/DoctorView.dart @@ -6,7 +6,6 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; import 'package:rating_bar/rating_bar.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import '../DoctorProfile.dart'; diff --git a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart index f21a9718..1e6911e2 100644 --- a/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart +++ b/lib/pages/Covid-DriveThru/Covid-TimeSlots.dart @@ -16,7 +16,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:intl/intl.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:table_calendar/table_calendar.dart'; class CovidTimeSlots extends StatefulWidget { @@ -113,7 +112,7 @@ class _CovidTimeSlotsState extends State @override Widget build(BuildContext context) { return AppScaffold( - appBarTitle: "COVID-19 TEST", + appBarTitle: TranslationBase.of(context).covidTest, isShowAppBar: true, body: SingleChildScrollView( child: Container( @@ -147,8 +146,8 @@ class _CovidTimeSlotsState extends State children: [ Container( margin: EdgeInsets.only( - left: 20.0, right: 20.0, top: 40.0), - child: Text("COVID-19 TEST", + left: 20.0, right: 20.0, top: 20.0), + child: Text(TranslationBase.of(context).covidTest, style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, @@ -157,7 +156,7 @@ class _CovidTimeSlotsState extends State Container( margin: EdgeInsets.only( left: 20.0, right: 20.0, top: 10.0), - child: Text("Drive-Thru", + child: Text(TranslationBase.of(context).driveThru, style: TextStyle( color: Colors.white, fontSize: 24.0)), ), @@ -179,8 +178,7 @@ class _CovidTimeSlotsState extends State children: [ Container( margin: EdgeInsets.all(10.0), - child: Text( - "Kindly select one of the available appointments from below: ", + child: Text(TranslationBase.of(context).selectAppo, style: TextStyle(color: Colors.black, fontSize: 16.0)), ), @@ -493,10 +491,8 @@ class _CovidTimeSlotsState extends State print(res); if (res['MessageStatus'] == 1) { AppToast.showSuccessToast(message: "Appointment Booked Successfully"); - // Future.delayed(new Duration(milliseconds: 1800), () { getPatientShare(context, res['AppointmentNo'], docObject.clinicID, docObject.projectID, docObject); - // }); } else { GifLoaderDialogUtils.hideDialog(context); appo = new AppoitmentAllHistoryResultList(); @@ -522,9 +518,9 @@ class _CovidTimeSlotsState extends State } }).catchError((err) { AppToast.showErrorToast(message: err); + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } cancelAppointment(DoctorList docObject, AppoitmentAllHistoryResultList appo, @@ -543,8 +539,7 @@ class _CovidTimeSlotsState extends State } }).catchError((err) { print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } getPatientShare(context, String appointmentNo, int clinicID, int projectID, @@ -553,17 +548,14 @@ class _CovidTimeSlotsState extends State service .getPatientShare(appointmentNo, clinicID, projectID, context) .then((res) { - print(res); - widget.patientShareResponse = new PatientShareResponse.fromJson(res); - }) - .catchError((err) { - print(err); - }) - .showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) - .then((value) { - navigateToPaymentAlert(); - }); + GifLoaderDialogUtils.hideDialog(context); + print(res); + widget.patientShareResponse = new PatientShareResponse.fromJson(res); + navigateToPaymentAlert(); + }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); + print(err); + }); } navigateToPaymentAlert() { @@ -576,12 +568,12 @@ class _CovidTimeSlotsState extends State getCovidFreeSlots(BuildContext context, int projectID) { CovidDriveThruService service = new CovidDriveThruService(); + GifLoaderDialogUtils.showMyDialog(context); service.getCovidFreeSlots(context, projectID).then((res) { - print(res['COVID19_FreeTimeSlots']); + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { if (res['COVID19_FreeTimeSlots'].length != 0) { freeSlotsResponse = res['COVID19_FreeTimeSlots']; - print(res['COVID19_FreeTimeSlots'].length); _getJSONSlots().then((value) => { setState(() => { widget.selectedClinicID = @@ -599,7 +591,6 @@ class _CovidTimeSlotsState extends State } }).catchError((err) { print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } } diff --git a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart index 0563c4bd..c82fd0f1 100644 --- a/lib/pages/Covid-DriveThru/covid-drivethru-location.dart +++ b/lib/pages/Covid-DriveThru/covid-drivethru-location.dart @@ -1,13 +1,16 @@ +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/CovidDriveThru/CovidPaymentInfoResponse.dart'; import 'package:diplomaticquarterapp/models/CovidDriveThru/DriveThroughTestingCenterModel.dart'; import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-payment-details.dart'; import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/covid-drivethru/covid-drivethru.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; import 'package:maps_launcher/maps_launcher.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; +import 'package:provider/provider.dart'; class CovidDrivethruLocation extends StatefulWidget { @override @@ -23,6 +26,8 @@ class _CovidDrivethruLocationState extends State { String projectName = ""; String projectID = ""; + ProjectViewModel projectViewModel; + @override void initState() { WidgetsBinding.instance @@ -32,8 +37,9 @@ class _CovidDrivethruLocationState extends State { @override Widget build(BuildContext context) { + projectViewModel = Provider.of(context); return AppScaffold( - appBarTitle: "COVID-19 TEST", + appBarTitle: TranslationBase.of(context).covidTest, isShowAppBar: true, body: SingleChildScrollView( child: Container( @@ -41,8 +47,10 @@ class _CovidDrivethruLocationState extends State { child: Column( children: [ Container( - alignment: Alignment.centerLeft, - child: Text("Get The Result During 8 Hours", + alignment: projectViewModel.isArabic + ? Alignment.centerRight + : Alignment.centerLeft, + child: Text(TranslationBase.of(context).resultHeader, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 22.0, @@ -50,14 +58,15 @@ class _CovidDrivethruLocationState extends State { ), Container( margin: EdgeInsets.only(top: 10.0), - child: Text( - "We are using the advance technology to test COVID-19, The sample for examination is taking between the nose and mouth (nasopharyngeal swab), the examination is done by ELITE In Genius of the company ELITECH GROUP MOLECULAR DIAGNOSTICS, Note that the device belongs to an Italian company and is manufactured in Japan with RC- PCR​", + child: Text(TranslationBase.of(context).covidInfo, style: TextStyle(fontSize: 16.0, color: Colors.black)), ), Container( margin: EdgeInsets.only(top: 20.0), - alignment: Alignment.centerLeft, - child: Text("Select Location", + alignment: projectViewModel.isArabic + ? Alignment.centerRight + : Alignment.centerLeft, + child: Text(TranslationBase.of(context).selectLocation, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 18.0, @@ -79,7 +88,7 @@ class _CovidDrivethruLocationState extends State { margin: EdgeInsets.only(top: 15.0), child: DropdownButtonHideUnderline( child: DropdownButton( - hint: new Text("Select Address"), + hint: new Text(TranslationBase.of(context).selectAddress), value: projectDropdownValue, items: projectsList.map((item) { return new DropdownMenuItem( @@ -98,8 +107,10 @@ class _CovidDrivethruLocationState extends State { isLocationSelected ? Container( margin: EdgeInsets.only(top: 15.0), - alignment: Alignment.centerLeft, - child: Text("Selected Location", + alignment: projectViewModel.isArabic + ? Alignment.centerRight + : Alignment.centerLeft, + child: Text(TranslationBase.of(context).selectLocation, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 18.0, @@ -150,8 +161,8 @@ class _CovidDrivethruLocationState extends State { onPressed: () { getDirections(); }, - child: - Text("GET DIRECTIONS", style: TextStyle(fontSize: 18.0)), + child: Text(TranslationBase.of(context).getDirections, + style: TextStyle(fontSize: 18.0)), ), ), ), @@ -178,7 +189,8 @@ class _CovidDrivethruLocationState extends State { onPressed: () { back(); }, - child: Text("BACK", style: TextStyle(fontSize: 18.0)), + child: Text(TranslationBase.of(context).back, + style: TextStyle(fontSize: 18.0)), ), ), ), @@ -201,7 +213,8 @@ class _CovidDrivethruLocationState extends State { onPressed: () { next(); }, - child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + child: Text(TranslationBase.of(context).next, + style: TextStyle(fontSize: 18.0)), ), ), ), @@ -258,35 +271,35 @@ class _CovidDrivethruLocationState extends State { CovidPaymentInfoResponse covidPaymentInfoResponse = new CovidPaymentInfoResponse(); + GifLoaderDialogUtils.showMyDialog(context); + service .getCovidPaymentInformation(context, int.parse(projectID)) .then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { setState(() { covidPaymentInfoResponse = CovidPaymentInfoResponse.fromJson( res['COVID19_PatientShare']); print(covidPaymentInfoResponse.procedureNameField); }); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CovidPaymentDetails( + covidPaymentInfoResponse: covidPaymentInfoResponse, + projectID: int.parse(projectID), + ))); } else {} }) .catchError((err) { print(err); - }) - .showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) - .then((value) { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => CovidPaymentDetails( - covidPaymentInfoResponse: covidPaymentInfoResponse, - projectID: int.parse(projectID), - ))); }); } getProjectsList(BuildContext context) { CovidDriveThruService service = new CovidDriveThruService(); + GifLoaderDialogUtils.showMyDialog(context); service.getCovidProjectsList(context).then((res) { print(res); if (res['MessageStatus'] == 1) { @@ -296,10 +309,11 @@ class _CovidDrivethruLocationState extends State { projectsList.add(new DriveThroughTestingCenterModel.fromJson(v)); }); }); + GifLoaderDialogUtils.hideDialog(context); } else {} }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } } diff --git a/lib/pages/Covid-DriveThru/covid-payment-details.dart b/lib/pages/Covid-DriveThru/covid-payment-details.dart index 1254997d..07914c9e 100644 --- a/lib/pages/Covid-DriveThru/covid-payment-details.dart +++ b/lib/pages/Covid-DriveThru/covid-payment-details.dart @@ -23,7 +23,7 @@ class _CovidPaymentDetailsState extends State { @override Widget build(BuildContext context) { return AppScaffold( - appBarTitle: "COVID-19 TEST", + appBarTitle: TranslationBase.of(context).covidTest, isShowAppBar: true, body: SingleChildScrollView( child: Container( @@ -57,8 +57,8 @@ class _CovidPaymentDetailsState extends State { children: [ Container( margin: EdgeInsets.only( - left: 20.0, right: 20.0, top: 40.0), - child: Text("COVID-19 TEST", + left: 20.0, right: 20.0, top: 20.0), + child: Text(TranslationBase.of(context).covidTest, style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, @@ -67,7 +67,7 @@ class _CovidPaymentDetailsState extends State { Container( margin: EdgeInsets.only( left: 20.0, right: 20.0, top: 10.0), - child: Text("Drive-Thru", + child: Text(TranslationBase.of(context).driveThru, style: TextStyle( color: Colors.white, fontSize: 24.0)), ), @@ -88,7 +88,7 @@ class _CovidPaymentDetailsState extends State { alignment: Alignment.center, margin: EdgeInsets.only(left: 0.0, right: 20.0, top: 30.0), - child: Text("Test Fees", + child: Text(TranslationBase.of(context).testFee, style: TextStyle( color: Colors.black, fontSize: 22.0, @@ -156,7 +156,7 @@ class _CovidPaymentDetailsState extends State { Container( alignment: Alignment.center, margin: EdgeInsets.fromLTRB(20.0, 15.0, 20.0, 5.0), - child: Text("You can pay by following options: ", + child: Text(TranslationBase.of(context).payOptions, textAlign: TextAlign.center, style: TextStyle( fontSize: 16.0, @@ -197,7 +197,7 @@ class _CovidPaymentDetailsState extends State { onPressed: () { cancel(); }, - child: Text("CANCEL", style: TextStyle(fontSize: 18.0)), + child: Text(TranslationBase.of(context).cancel, style: TextStyle(fontSize: 18.0)), ), ), ), @@ -218,7 +218,7 @@ class _CovidPaymentDetailsState extends State { disabledTextColor: Colors.white, disabledColor: Colors.grey[500], onPressed: isAgree ? next : null, - child: Text("NEXT", style: TextStyle(fontSize: 18.0)), + child: Text(TranslationBase.of(context).next, style: TextStyle(fontSize: 18.0)), ), ), ), diff --git a/lib/pages/ToDoList/ToDo.dart b/lib/pages/ToDoList/ToDo.dart index 383bedb3..622f88c8 100644 --- a/lib/pages/ToDoList/ToDo.dart +++ b/lib/pages/ToDoList/ToDo.dart @@ -365,7 +365,9 @@ class _ToDoState extends State { color: Color(0xff20bc44), ), height: 30.0, - margin: projectViewModel.isArabic ? EdgeInsets.fromLTRB(160.0, 0.0, 30.0, 0.0) : EdgeInsets.fromLTRB(30.0, 0.0, 160.0, 0.0), + margin: projectViewModel.isArabic + ? EdgeInsets.fromLTRB(160.0, 0.0, 30.0, 0.0) + : EdgeInsets.fromLTRB(30.0, 0.0, 160.0, 0.0), transform: Matrix4.translationValues(0.0, -8.0, 0.0), child: Row( mainAxisAlignment: MainAxisAlignment.start, @@ -385,14 +387,17 @@ class _ToDoState extends State { ), widget.appoList[index].isLiveCareAppointment ? Container( - child: Text(TranslationBase.of(context).videoAppo, + child: Text( + TranslationBase.of(context).videoAppo, style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, fontSize: 12.0)), ) : Container( - child: Text(TranslationBase.of(context).walkinAppo, + child: Text( + TranslationBase.of(context) + .walkinAppo, style: TextStyle( color: Colors.white, fontWeight: FontWeight.bold, @@ -825,20 +830,25 @@ class _ToDoState extends State { res['Fort_id'], res['PaymentMethod'], context) .then((res) { GifLoaderDialogUtils.hideDialog(context); - print(res['OnlineCheckInAppointments'][0]['AdvanceNumber']); + print(res['OnlineCheckInAppointments'][0]); addAdvancedNumberRequest( res['OnlineCheckInAppointments'][0]['AdvanceNumber'].toString(), paymentReference, appo.appointmentNo.toString(), - appo); + appo, + res['OnlineCheckInAppointments'][0]); }).catchError((err) { print(err); GifLoaderDialogUtils.hideDialog(context); }); } - addAdvancedNumberRequest(String advanceNumber, String paymentReference, - String appointmentID, AppoitmentAllHistoryResultList appo) { + addAdvancedNumberRequest( + String advanceNumber, + String paymentReference, + String appointmentID, + AppoitmentAllHistoryResultList appo, + dynamic apptData) { GifLoaderDialogUtils.showMyDialog(context); DoctorsListService service = new DoctorsListService(); service @@ -846,8 +856,25 @@ class _ToDoState extends State { advanceNumber, paymentReference, appointmentID, context) .then((res) { GifLoaderDialogUtils.hideDialog(context); + if (appo.isLiveCareAppointment) + addVIDARequestInsert(advanceNumber, paymentReference, apptData); + else + getAppoQR(context, appo); + }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); + print(err); + }); + } + + addVIDARequestInsert( + String advanceNumber, String paymentReference, dynamic apptData) { + GifLoaderDialogUtils.showMyDialog(context); + DoctorsListService service = new DoctorsListService(); + service + .addVIDARequest(advanceNumber, paymentReference, apptData, context) + .then((res) { + GifLoaderDialogUtils.hideDialog(context); print(res); - getAppoQR(context, appo); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); print(err); diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 0498b688..d8463653 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -473,7 +473,8 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context).cmcHeading, + TranslationBase.of(context) + .homeHealthCare, textAlign: TextAlign.center, color: Colors.white, fontWeight: FontWeight.w700, @@ -545,8 +546,7 @@ class _HomePageState extends State { height: 10, ), Texts( - TranslationBase.of(context) - .emergencyService, + TranslationBase.of(context).cmcHeading, textAlign: TextAlign.center, color: Colors.white, fontWeight: FontWeight.w700, diff --git a/lib/pages/livecare/livecare_home.dart b/lib/pages/livecare/livecare_home.dart index 1974753f..bbad8d4c 100644 --- a/lib/pages/livecare/livecare_home.dart +++ b/lib/pages/livecare/livecare_home.dart @@ -3,12 +3,10 @@ import 'package:diplomaticquarterapp/pages/livecare/widgets/LiveCarePendingReque import 'package:diplomaticquarterapp/pages/livecare/widgets/clinic_list.dart'; import 'package:diplomaticquarterapp/pages/livecare/widgets/livecare_logs.dart'; import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; - -import 'livecare_type_select.dart'; class LiveCareHome extends StatefulWidget { static bool showFooterButton = true; @@ -35,7 +33,9 @@ class _LiveCareHomeState extends State pendingERRequestHistoryList = new ErRequestHistoryList(); - WidgetsBinding.instance.addPostFrameCallback((_) => getLiveCareHistory()); + WidgetsBinding.instance.addPostFrameCallback((_) { + if (!isDataLoaded) getLiveCareHistory(); + }); super.initState(); } @@ -89,6 +89,7 @@ class _LiveCareHomeState extends State } void getLiveCareHistory() { + GifLoaderDialogUtils.showMyDialog(context); setState(() { isDataLoaded = false; hasLiveCareRequest = false; @@ -96,38 +97,31 @@ class _LiveCareHomeState extends State LiveCareService service = new LiveCareService(); PatientERVirtualHistoryResponse patientERVirtualHistoryResponse = new PatientERVirtualHistoryResponse(); - service - .getLivecareHistory(context) - .then((res) { - setState(() { - print(res['ErRequestHistoryList'].length); - if (res['ErRequestHistoryList'].length != 0) { - patientERVirtualHistoryResponse = - PatientERVirtualHistoryResponse.fromJson(res); - erRequestHistoryList = - patientERVirtualHistoryResponse.erRequestHistoryList; + service.getLivecareHistory(context).then((res) { + GifLoaderDialogUtils.hideDialog(context); + setState(() { + print(res['ErRequestHistoryList'].length); + if (res['ErRequestHistoryList'].length != 0) { + patientERVirtualHistoryResponse = + PatientERVirtualHistoryResponse.fromJson(res); + erRequestHistoryList = + patientERVirtualHistoryResponse.erRequestHistoryList; - if (patientERVirtualHistoryResponse - .erRequestHistoryList[0].callStatus < - 4) { - pendingERRequestHistoryList = - patientERVirtualHistoryResponse.erRequestHistoryList[0]; - hasLiveCareRequest = true; - } else { - hasLiveCareRequest = false; - } - } - }); - }) - .catchError((err) { - print(err); - }) - .showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) - .then((value) { - setState(() { - isDataLoaded = true; - }); - }); + if (patientERVirtualHistoryResponse + .erRequestHistoryList[0].callStatus < + 4) { + pendingERRequestHistoryList = + patientERVirtualHistoryResponse.erRequestHistoryList[0]; + hasLiveCareRequest = true; + } else { + hasLiveCareRequest = false; + } + } + isDataLoaded = true; + }); + }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); + print(err); + }); } } diff --git a/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart b/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart index 19144263..72ca4ce9 100644 --- a/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart +++ b/lib/pages/livecare/livecare_scheduling/schedule_clinic_card.dart @@ -36,7 +36,7 @@ class _ScheduleClinicCardState extends State { child: Text( widget.languageID == 'ar' ? widget.clinicsHaveScheduleList.clinicDescN != null ? widget.clinicsHaveScheduleList.clinicDescN: "" - : widget.clinicsHaveScheduleList.clinicDesc != null ? widget.clinicsHaveScheduleList.clinicDesc: "Dermatology", + : widget.clinicsHaveScheduleList.clinicDesc != null ? widget.clinicsHaveScheduleList.clinicDesc: "Test Clinic", style: TextStyle( fontSize: 16.0, color: diff --git a/lib/pages/livecare/livecare_type_select.dart b/lib/pages/livecare/livecare_type_select.dart index 833c9698..00c2b717 100644 --- a/lib/pages/livecare/livecare_type_select.dart +++ b/lib/pages/livecare/livecare_type_select.dart @@ -51,20 +51,19 @@ class _LiveCareTypeSelectState extends State { ), Container( alignment: Alignment.center, - child: Text("LiveCare Service", + child: Text(TranslationBase.of(context).livecareService, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 20.0))), Container( margin: EdgeInsets.only(top: 10.0), alignment: Alignment.center, child: Text( - "is to obtain medical advice with a specialist doctor Via a video call", + TranslationBase.of(context).livecareServiceDesc, textAlign: TextAlign.center, style: TextStyle(fontSize: 18.0))), Container( margin: EdgeInsets.only(top: 15.0), - alignment: Alignment.centerLeft, - child: Text("WHY LIVECARE?", + child: Text(TranslationBase.of(context).whyLivecare, style: TextStyle( fontWeight: FontWeight.bold, fontSize: 20.0))), Container( @@ -77,7 +76,7 @@ class _LiveCareTypeSelectState extends State { width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), child: Text( - "No need to wait, you will get Medical consultation immediately via Video call.", + TranslationBase.of(context).livecarePoint1, overflow: TextOverflow.clip, style: TextStyle(fontSize: 14.0)), ) @@ -93,7 +92,7 @@ class _LiveCareTypeSelectState extends State { Container( width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), - child: Text("The doctor will see your medical file.", + child: Text(TranslationBase.of(context).docVirtualAppoIns4, overflow: TextOverflow.clip, style: TextStyle(fontSize: 14.0)), ) @@ -109,7 +108,7 @@ class _LiveCareTypeSelectState extends State { Container( width: MediaQuery.of(context).size.width * 0.72, margin: EdgeInsets.all(10.0), - child: Text("Free Prescription delivery service.", + child: Text(TranslationBase.of(context).docVirtualAppoIns5, overflow: TextOverflow.clip, style: TextStyle(fontSize: 14.0)), ) @@ -119,7 +118,7 @@ class _LiveCareTypeSelectState extends State { Container( margin: EdgeInsets.only(top: 20.0), child: Text( - "** The service is included with some insurance companies according to the terms and conditions With our best wishes for health and wellness", + TranslationBase.of(context).livecareSummary, style: TextStyle(fontSize: 16.0))), InkWell( onTap: (){ @@ -134,7 +133,7 @@ class _LiveCareTypeSelectState extends State { child: Row( children: [ Container( - margin: EdgeInsets.only(left: 20.0), + margin: EdgeInsets.only(left: 10.0, right: 10.0), child: SvgPicture.asset( "assets/images/new-design/liveCare_logo_icon_white.svg", width: 80), @@ -144,7 +143,7 @@ class _LiveCareTypeSelectState extends State { margin: EdgeInsets.fromLTRB(30.0, 20.0, 0.0, 0.0), child: Column( children: [ - Text("Get Medical consultation immediately", + Text(TranslationBase.of(context).livecareOption1, overflow: TextOverflow.clip, style: TextStyle( fontWeight: FontWeight.bold, @@ -152,8 +151,7 @@ class _LiveCareTypeSelectState extends State { color: Colors.white)), Container( margin: EdgeInsets.only(top: 10.0), - alignment: Alignment.centerLeft, - child: Text("Instant video call", + child: Text(TranslationBase.of(context).livecareOption2, style: TextStyle( fontSize: 18.0, color: Colors.white)), ) @@ -176,19 +174,18 @@ class _LiveCareTypeSelectState extends State { child: Row( children: [ Container( - margin: EdgeInsets.only(left: 20.0), + margin: EdgeInsets.only(left: 10.0, right: 10.0), child: Image.asset( "assets/images/new-design/calendar.png", width: 70), ), Container( width: MediaQuery.of(context).size.width * 0.58, - margin: EdgeInsets.fromLTRB(30.0, 30.0, 0.0, 0.0), + margin: EdgeInsets.fromLTRB(30.0, 20.0, 0.0, 0.0), child: Column( children: [ Container( - alignment: Alignment.centerLeft, - child: Text("Book Appointment", + child: Text(TranslationBase.of(context).livecareOption3, overflow: TextOverflow.clip, style: TextStyle( fontWeight: FontWeight.bold, @@ -197,8 +194,7 @@ class _LiveCareTypeSelectState extends State { ), Container( margin: EdgeInsets.only(top: 10.0), - alignment: Alignment.centerLeft, - child: Text("Schedule Video Call", + child: Text(TranslationBase.of(context).livecareOption4, style: TextStyle( fontSize: 18.0, color: Colors.white)), ) diff --git a/lib/pages/livecare/widgets/LiveCareHistoryCard.dart b/lib/pages/livecare/widgets/LiveCareHistoryCard.dart index 15c14557..36e8274f 100644 --- a/lib/pages/livecare/widgets/LiveCareHistoryCard.dart +++ b/lib/pages/livecare/widgets/LiveCareHistoryCard.dart @@ -5,11 +5,11 @@ import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class LiveCareHistoryCard extends StatefulWidget { ErRequestHistoryList erRequestHistoryList; @@ -178,6 +178,7 @@ class _LiveCareHistoryCardState extends State { sendInvoiceEmail(context) { ConfirmDialog.closeAlertDialog(context); LiveCareService service = new LiveCareService(); + GifLoaderDialogUtils.showMyDialog(context); service .sendLiveCareInvoiceEmail( widget.erRequestHistoryList.appointmentNo.toString(), @@ -189,8 +190,7 @@ class _LiveCareHistoryCardState extends State { }).catchError((err) { AppToast.showErrorToast(message: err); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } getAuthenticatedUser() async { diff --git a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart index bfd42e62..839fb02c 100644 --- a/lib/pages/livecare/widgets/LiveCarePendingRequest.dart +++ b/lib/pages/livecare/widgets/LiveCarePendingRequest.dart @@ -3,9 +3,9 @@ import 'package:diplomaticquarterapp/models/FamilyFiles/PatientERVirtualHistoryR import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class LiveCarePendingRequest extends StatefulWidget { ErRequestHistoryList pendingERRequestHistoryList; @@ -149,19 +149,17 @@ class _LiveCarePendingRequestState extends State { cancelLiveCareRequest() { LiveCareService service = new LiveCareService(); + GifLoaderDialogUtils.showMyDialog(context); service .cancelLiveCareRequest(widget.pendingERRequestHistoryList.vCID, context) .then((res) { - AppToast.showSuccessToast( - message: "LiveCare request cancelled successfully"); - }) - .catchError((err) { - print(err); - }) - .showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)) - .then((value) { - widget.getLiveCareHistory(); - }); + GifLoaderDialogUtils.hideDialog(context); + AppToast.showSuccessToast( + message: "LiveCare request cancelled successfully"); + widget.getLiveCareHistory(); + }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); + print(err); + }); } } diff --git a/lib/pages/livecare/widgets/clinic_card.dart b/lib/pages/livecare/widgets/clinic_card.dart index 56613034..9ea12f01 100644 --- a/lib/pages/livecare/widgets/clinic_card.dart +++ b/lib/pages/livecare/widgets/clinic_card.dart @@ -2,8 +2,8 @@ import 'package:diplomaticquarterapp/models/LiveCare/ClinicsServiceTimingsRespon import 'package:diplomaticquarterapp/models/LiveCare/LiveCareClinicsListResponse.dart'; import 'package:diplomaticquarterapp/services/livecare_services/livecare_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'ClinicTimingsDialog.dart'; @@ -90,9 +90,11 @@ class _State extends State { getClinicTimings(PatientERGetClinicsList patientERGetClinicsList) { LiveCareService service = new LiveCareService(); + GifLoaderDialogUtils.showMyDialog(context); service .getLivecareClinicTiming(patientERGetClinicsList.serviceID, context) .then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { setState(() { clinicsServiceTimingsResponse = @@ -129,8 +131,8 @@ class _State extends State { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); } }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } } diff --git a/lib/pages/livecare/widgets/clinic_list.dart b/lib/pages/livecare/widgets/clinic_list.dart index 195d8879..5cfdacc6 100644 --- a/lib/pages/livecare/widgets/clinic_list.dart +++ b/lib/pages/livecare/widgets/clinic_list.dart @@ -54,6 +54,8 @@ class _clinic_listState extends State { MyInAppBrowser browser; + bool isLiveCareTypeSelected = false; + @override void initState() { liveCareClinicsListResponse = new LiveCareClinicsListResponse(); @@ -61,7 +63,7 @@ class _clinic_listState extends State { new LiveCareScheduleClinicsListResponse(); WidgetsBinding.instance.addPostFrameCallback((_) { - openLiveCareSelectionDialog(); + if (!isLiveCareTypeSelected) openLiveCareSelectionDialog(); }); getLanguageID(); @@ -431,6 +433,7 @@ class _clinic_listState extends State { Navigator.pop(context); } else { print(value); + isLiveCareTypeSelected = true; if (value == "immediate") { setState(() { currentSelectedLiveCareType = "immediate"; diff --git a/lib/pages/medical/ask_doctor/ask_doctor_page.dart b/lib/pages/medical/ask_doctor/ask_doctor_page.dart index 6beed0dc..795d1869 100644 --- a/lib/pages/medical/ask_doctor/ask_doctor_page.dart +++ b/lib/pages/medical/ask_doctor/ask_doctor_page.dart @@ -12,7 +12,6 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:rating_bar/rating_bar.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; class AskDoctorPage extends StatelessWidget { @override diff --git a/lib/pages/medical/balance/advance_payment_page.dart b/lib/pages/medical/balance/advance_payment_page.dart index fce664f7..c7dd5d37 100644 --- a/lib/pages/medical/balance/advance_payment_page.dart +++ b/lib/pages/medical/balance/advance_payment_page.dart @@ -20,7 +20,6 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import '../../../core/model/my_balance/AdvanceModel.dart'; import 'confirm_payment_page.dart'; diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index 58014e24..8d49a89b 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -122,7 +122,7 @@ class _MedicalProfilePageState extends State { childAspectRatio: MediaQuery.of(context) .size .width / - (MediaQuery.of(context).size.height / 2.40), + (MediaQuery.of(context).size.height / 2.20), ), itemCount: myMedicalList.length, itemBuilder: (BuildContext context, int index) { diff --git a/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart b/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart new file mode 100644 index 00000000..b33246de --- /dev/null +++ b/lib/pages/medical/prescriptions/PrescriptionIDeliveryAddressPage.dart @@ -0,0 +1,99 @@ +import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:diplomaticquarterapp/core/model/prescriptions/Prescriptions.dart'; + +class PrescriptionDeliveryAddressPage extends StatelessWidget { + final Prescriptions prescriptions; + + const PrescriptionDeliveryAddressPage({Key key, this.prescriptions}) + : super(key: key); + + @override + Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); + + return AppScaffold( + isShowAppBar: true, + appBarTitle: 'Delivery Address', + body: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 15, + ), + InkWell( + onTap: () {}, + child: Container( + margin: EdgeInsets.only(left: 10, right: 10, top: 15), + height: 50, + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + borderRadius: BorderRadius.circular(7), + color: Colors.white, + shape: BoxShape.rectangle, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Container( + child: Texts( + 'Selected Address', + variant: 'bodyText', + ), + margin: EdgeInsets.only(left: 10, right: 10), + ), + Icon( + Icons.arrow_drop_down, + size: 22, + color: Colors.grey, + ) + ], + ), + ), + ), + SizedBox( + height: 15, + ), + Container( + + child: Image.asset(projectViewModel.isArabic + ? 'assets/images/pharmacy/shipping_image_ar.png' + : 'assets/images/pharmacy/shipping_image.png',height: 300,), + ) + ], + ), + ), + bottomSheet: Container( + width: double.infinity, + height: MediaQuery.of(context).size.height * 0.25, + color: Colors.grey[100], + child: Column( + children: [ + Divider(), + Container( + width: MediaQuery.of(context).size.width * 0.8, + child: Button( + label: 'Add New Address'.toUpperCase(), + onTap: () {}, + ), + ), + Container( + width: MediaQuery.of(context).size.width * 0.8, + child: Button( + label: 'Continue'.toUpperCase(), + backgroundColor: Colors.green[200], + onTap: () {}, + )) + ], + ), + )); + } +} diff --git a/lib/pages/medical/prescriptions/prescription_items_page.dart b/lib/pages/medical/prescriptions/prescription_items_page.dart index 6fb07f68..864bdca2 100644 --- a/lib/pages/medical/prescriptions/prescription_items_page.dart +++ b/lib/pages/medical/prescriptions/prescription_items_page.dart @@ -7,6 +7,7 @@ import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescription_details_page.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -14,12 +15,13 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../widgets/dialogs/confirm_send_email_dialog.dart'; +import 'PrescriptionIDeliveryAddressPage.dart'; class PrescriptionItemsPage extends StatelessWidget { final Prescriptions prescriptions; PrescriptionItemsPage({Key key, this.prescriptions}); - + //TODO @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); @@ -181,7 +183,7 @@ class PrescriptionItemsPage extends StatelessWidget { ), bottomSheet: Container( width: double.infinity, - height: MediaQuery.of(context).size.height * 0.14, + height: MediaQuery.of(context).size.height * 0.25, color: Colors.grey[100], child: Column( children: [ @@ -197,12 +199,22 @@ class PrescriptionItemsPage extends StatelessWidget { loading: model.state == ViewState.BusyLocal, ), ), - if (false) Container( width: MediaQuery.of(context).size.width * 0.8, - child: Button( + child: SecondaryButton( label: TranslationBase.of(context).resendOrder, - backgroundColor: Colors.green[200], + color: Colors.green[200], + onTap: (){ + var asd=""; + Navigator.push( + context, + FadePage( + page: PrescriptionDeliveryAddressPage( + prescriptions: prescriptions, + ), + ), + ); + }, )) ], ), diff --git a/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart b/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart index eb0c1675..20217ca9 100644 --- a/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart +++ b/lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart @@ -3,9 +3,9 @@ import 'dart:io'; import 'package:carousel_slider/carousel_slider.dart'; import 'package:diplomaticquarterapp/pages/medical/smart_watch_health_data/health_data_list.dart'; import 'package:diplomaticquarterapp/services/smartwatch_integration/SmartWatchIntegrationService.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:url_launcher/url_launcher.dart'; class SmartWatchInstructions extends StatefulWidget { @@ -796,7 +796,9 @@ class _SmartWatchInstructionsState extends State { getLastPatientRecord(BuildContext context) { SmartWatchIntegrationService service = new SmartWatchIntegrationService(); + GifLoaderDialogUtils.showMyDialog(context); service.getLastPatientRecord(context).then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { print(res['Med_GetPatientLastRecordList']); setState(() { @@ -807,9 +809,9 @@ class _SmartWatchInstructionsState extends State { }); } else {} }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } _openHealthDataList() { diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 72f18979..65fe2b04 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -10,6 +10,7 @@ import 'package:diplomaticquarterapp/models/Request.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; +import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:flutter/cupertino.dart'; class DoctorsListService extends BaseService { @@ -934,6 +935,64 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } + Future addVIDARequest(String advanceNumber, + String paymentReference, dynamic apptData, BuildContext context) async { + Map request; + if (await this.sharedPref.getObject(USER_PROFILE) != null) { + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); + authUser = data; + } + var languageID = + await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + Request req = appGlobal.getPublicRequest(); + request = { + "AdvanceNumber": advanceNumber, + "PaymentReferenceNumber": paymentReference, + "AppointmentNo": apptData.AppointmentNo, + "AcceptedBy": apptData.DoctorID, + "ServiceID": apptData.ServiceID, + "ProjectID": apptData.ProjectID, + "ClinicID": apptData.ClinicID, + "ClientRequestID": Utils.getAppointmentTransID( + apptData.ProjectID, apptData.ClinicID, apptData.AppointmentNo), + "AppointmentDate": apptData.AppointmentDate, + "DeviceType": Platform.isIOS ? "iOS" : "Android", + "VersionID": req.VersionID, + "Channel": req.Channel, + "LanguageID": languageID == 'ar' ? 1 : 2, + "IPAdress": req.IPAdress, + "generalid": req.generalid, + "PatientOutSA": authUser.outSA, + "SessionID": "YckwoXhUmWBsnHKEKig", + "isDentalAllowedBackend": false, + "DeviceTypeID": req.DeviceTypeID, + "PatientID": authUser.patientID, + "TokenID": "@dm!n", + "PatientTypeID": authUser.patientType, + "PatientType": authUser.patientType + }; + + // request.DeviceToken = this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); + // request.Latitude = this.cs.sharedService.getSharedData('userLat', false); + // request.Longitude = this.cs.sharedService.getSharedData('userLong', false); + // request.ServiceID = apptData.ServiceID; + // request.ProjectID = apptData.ProjectID; + // request.ClinicID = apptData.ClinicID; + // request.ClientRequestID = AppointmentModel.getAppointmentTransID(apptData); + // request.AppointmentDate = apptData.AppointmentDate; + // request.DeviceType = this.getDeviceType(); + // request.VoipToken = this.platform.is('ios') ? this.cs.sharedService.getSharedData(AuthenticationService.APNS_TOKEN, false) : ""; + dynamic localRes; + await baseAppClient.post(ADD_VIDA_REQUEST, + onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); + return Future.value(localRes); + } + Future isAllowedToAskDoctor(int docID, BuildContext context) async { Map request; if (await this.sharedPref.getObject(USER_PROFILE) != null) { @@ -1109,14 +1168,16 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } - Future getPatientLabOrdersByAppoNo(dynamic appoNo, dynamic projID, dynamic clinicID, BuildContext context) async { + Future getPatientLabOrdersByAppoNo(dynamic appoNo, dynamic projID, + dynamic clinicID, BuildContext context) async { Map request; if (await this.sharedPref.getObject(USER_PROFILE) != null) { var data = AuthenticatedUser.fromJson( await this.sharedPref.getObject(USER_PROFILE)); authUser = data; } - var languageID = await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); + var languageID = + await sharedPref.getStringWithDefaultValue(APP_LANGUAGE, 'ar'); Request req = appGlobal.getPublicRequest(); request = { "AppointmentNo": appoNo, @@ -1140,10 +1201,10 @@ class DoctorsListService extends BaseService { dynamic localRes; await baseAppClient.post(GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT, onSuccess: (response, statusCode) async { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: request); + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: request); return Future.value(localRes); } diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index 4003f2ba..cd481df0 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -1401,6 +1401,48 @@ class TranslationBase { localizedValues["bloodD-enter-desc"][locale.languageCode]; String get viewTermsConditions => localizedValues["viewTermsConditions"][locale.languageCode]; + String get generalHealth => + localizedValues["generalHealth"][locale.languageCode]; + String get womanHealth => localizedValues["womanHealth"][locale.languageCode]; + String get bmi => localizedValues["bmi"][locale.languageCode]; + String get calcHealth => localizedValues["calc-health"][locale.languageCode]; + String get calories => localizedValues["calories"][locale.languageCode]; + String get bmr => localizedValues["bmr"][locale.languageCode]; + String get idealBody => localizedValues["idealBody"][locale.languageCode]; + String get bodyWord => localizedValues["body_word"][locale.languageCode]; + String get fat => localizedValues["fat"][locale.languageCode]; + String get carbohydrate => + localizedValues["carbohydrate"][locale.languageCode]; + String get proteinFat => localizedValues["proteinFat"][locale.languageCode]; + String get ovulation => localizedValues["ovulation"][locale.languageCode]; + String get delivery => localizedValues["delivery"][locale.languageCode]; + String get bmiCalcDesc => localizedValues["bmiCalcDesc"][locale.languageCode]; + String get selectUnit => localizedValues["selectUnit"][locale.languageCode]; + String get feet => localizedValues["feet"][locale.languageCode]; + String get pound => localizedValues["pound"][locale.languageCode]; + String get seeListOfDoctor => + localizedValues["seeListOfDoctor"][locale.languageCode]; + String get obese => localizedValues["obese"][locale.languageCode]; + String get overWeight => localizedValues["overWeight"][locale.languageCode]; + String get healthy => localizedValues["healthy"][locale.languageCode]; + String get underWeight => localizedValues["underWeight"][locale.languageCode]; + String get bmiCalcMsgObese => + localizedValues["bmiCalcMsgObese"][locale.languageCode]; + String get bmiCalcMsgOverweight => + localizedValues["bmiCalcMsgOverweight"][locale.languageCode]; + String get bmiCalcMsgHealthy => + localizedValues["bmiCalcMsgHealthy"][locale.languageCode]; + String get bmiCalcMsgUnderWeight => + localizedValues["bmiCalcMsgUnderWeight"][locale.languageCode]; + String get bariatrics => localizedValues["bariatrics"][locale.languageCode]; + String get bariatricsHeaderMsg => + localizedValues["bariatricsHeaderMsg"][locale.languageCode]; + String get continues => localizedValues["continue"][locale.languageCode]; + String get skip => localizedValues["skip"][locale.languageCode]; + String get calorieCalcDesc => + localizedValues["calorieCalcDesc"][locale.languageCode]; + String get age11_120Years => + localizedValues["age11_120_years"][locale.languageCode]; String get walkinAppo => localizedValues["WalkinAppo"][locale.languageCode]; String get videoAppo => localizedValues["videoAppo"][locale.languageCode]; String get weightAdd => localizedValues["weight-add"][locale.languageCode]; @@ -1409,6 +1451,48 @@ class TranslationBase { String get diastolicAdd => localizedValues["systolic-add"][locale.languageCode]; String get cmcHeading => localizedValues["cmc-heading"][locale.languageCode]; + String get selectLocation => + localizedValues["select-location"][locale.languageCode]; + String get resultHeader => + localizedValues["result-header"][locale.languageCode]; + String get covidInfo => localizedValues["covid-info"][locale.languageCode]; + String get selectAppo => localizedValues["select-appo"][locale.languageCode]; + String get covidAlertHeader => + localizedValues["covid-alert-header"][locale.languageCode]; + String get covidAlertInfo => + localizedValues["covid-alert-info"][locale.languageCode]; + String get covidAlertMins => + localizedValues["covid-alert-mins"][locale.languageCode]; + String get back => localizedValues["back"][locale.languageCode]; + String get getDirections => + localizedValues["get-directions"][locale.languageCode]; + String get selectedLocation => + localizedValues["selected-location"][locale.languageCode]; + String get testFee => localizedValues["test-fee"][locale.languageCode]; + String get payOptions => localizedValues["pay-options"][locale.languageCode]; + String get livecareService => + localizedValues["livecare-service"][locale.languageCode]; + String get livecareServiceDesc => + localizedValues["livecare-service-desc"][locale.languageCode]; + String get whyLivecare => + localizedValues["why-livecare"][locale.languageCode]; + String get livecarePoint1 => + localizedValues["livecare-point-1"][locale.languageCode]; + String get docVirtualAppoIns4 => + localizedValues["doc-virtual-appo-ins4"][locale.languageCode]; + String get docVirtualAppoIns5 => + localizedValues["doc-virtual-appo-ins5"][locale.languageCode]; + String get livecareSummary => + localizedValues["livecare-summary"][locale.languageCode]; + + String get livecareOption1 => + localizedValues["livecare-option-1"][locale.languageCode]; + String get livecareOption2 => + localizedValues["livecare-option-2"][locale.languageCode]; + String get livecareOption3 => + localizedValues["livecare-option-3"][locale.languageCode]; + String get livecareOption4 => + localizedValues["livecare-option-4"][locale.languageCode]; String get today => localizedValues["today"][locale.languageCode]; String get week => localizedValues["week"][locale.languageCode]; @@ -1442,7 +1526,7 @@ class TranslationBase { String get l => localizedValues["l"][locale.languageCode]; String get customLabel => localizedValues["custom-label"][locale.languageCode]; - String get selectUnit => localizedValues["select-unit"][locale.languageCode]; + String get customLabelInLitres => localizedValues["custom-label-in-litres"][locale.languageCode]; String get customLabelInMililitres => diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index b2c52b2b..85e97429 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -206,33 +206,30 @@ class Utils { ); }, child: isLogin - ? Container( - height: 120, - child: Stack(children: [ - MedicalProfileItem( - title: TranslationBase.of(context).myAppointments, - imagePath: 'my_appointment_icon.png', - subTitle: TranslationBase.of(context).myAppointmentsList, - hasBadge: true, - ), - Positioned( - right: 0.0, - child: Badge( - toAnimate: false, - position: BadgePosition.topEnd(), - shape: BadgeShape.circle, - badgeColor: secondaryColor.withOpacity(1.0), - borderRadius: BorderRadius.circular(8), - badgeContent: Container( - padding: EdgeInsets.all(2.0), - child: Text(count.toString(), - style: - TextStyle(color: Colors.white, fontSize: 16.0)), - ), + ? Stack(children: [ + MedicalProfileItem( + title: TranslationBase.of(context).myAppointments, + imagePath: 'my_appointment_icon.png', + subTitle: TranslationBase.of(context).myAppointmentsList, + hasBadge: true, + ), + Positioned( + right: 0.0, + child: Badge( + toAnimate: false, + position: BadgePosition.topEnd(), + shape: BadgeShape.circle, + badgeColor: secondaryColor.withOpacity(1.0), + borderRadius: BorderRadius.circular(8), + badgeContent: Container( + padding: EdgeInsets.all(2.0), + child: Text(count.toString(), + style: + TextStyle(color: Colors.white, fontSize: 16.0)), ), ), - ]), - ) + ), + ]) : MedicalProfileItem( title: TranslationBase.of(context).myAppointments, imagePath: 'my_appointment_icon.png', diff --git a/lib/widgets/data_display/medical/medical_profile_item.dart b/lib/widgets/data_display/medical/medical_profile_item.dart index 1751e0e5..15a08218 100644 --- a/lib/widgets/data_display/medical/medical_profile_item.dart +++ b/lib/widgets/data_display/medical/medical_profile_item.dart @@ -22,31 +22,32 @@ class MedicalProfileItem extends StatelessWidget { @override Widget build(BuildContext context) { ProjectViewModel projectViewModel = Provider.of(context); - return RoundedContainer( - showBorder: true, - borderWidth: 0, - margin: 4, - child: Container( - padding: EdgeInsets.all(10), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Texts(title, - fontSize: 1.5 * SizeConfig.textMultiplier, - color: secondaryColor, - fontWeight: FontWeight.bold), - Texts(subTitle,fontSize: 1.4 * SizeConfig.textMultiplier,), - Align( - alignment:projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight, - child: Image.asset( - "assets/images/medical/$imagePath", - height: SizeConfig.heightMultiplier * 5, - width: SizeConfig.heightMultiplier * 5, - ), - ) - ], - ), + return Container( + height: 180, + margin: EdgeInsets.all(5), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Colors.white + ), + padding: EdgeInsets.all(10), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Texts(title, + fontSize: 1.5 * SizeConfig.textMultiplier, + color: secondaryColor, + fontWeight: FontWeight.bold), + Texts(subTitle,fontSize: 1.4 * SizeConfig.textMultiplier,), + Align( + alignment:projectViewModel.isArabic ? Alignment.bottomLeft : Alignment.bottomRight, + child: Image.asset( + "assets/images/medical/$imagePath", + height: SizeConfig.heightMultiplier * 5, + width: SizeConfig.heightMultiplier * 5, + ), + ) + ], ), ); } diff --git a/lib/widgets/in_app_browser/InAppBrowser.dart b/lib/widgets/in_app_browser/InAppBrowser.dart index ba7dfd8b..603c5108 100644 --- a/lib/widgets/in_app_browser/InAppBrowser.dart +++ b/lib/widgets/in_app_browser/InAppBrowser.dart @@ -8,17 +8,17 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; class MyInAppBrowser extends InAppBrowser { - // static String SERVICE_URL = - // 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - static String SERVICE_URL = - 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE + 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT - // static String PREAUTH_SERVICE_URL = - // 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT + // static String SERVICE_URL = + // 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE static String PREAUTH_SERVICE_URL = - 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store + 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort PreAuth Payment Gateway URL UAT + + // static String PREAUTH_SERVICE_URL = + // 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort PreAuth Payment Gateway URL Live Store static List successURLS = [ 'success', diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index 4005c70f..b1f381e3 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -1,55 +1,41 @@ import 'dart:collection'; -import 'dart:convert'; +import 'dart:math'; import 'package:diplomaticquarterapp/config/config.dart'; -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorListResponse.dart'; import 'package:diplomaticquarterapp/models/Appointments/DoctorProfile.dart'; -import 'package:diplomaticquarterapp/pages/BookAppointment/BookingOptions.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; -import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; import 'package:diplomaticquarterapp/pages/ErService/NearestEr.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; +import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; -import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; -import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; -import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; import 'package:diplomaticquarterapp/pages/medical/patient_sick_leave_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/reports/report_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/vital_sign/vital_sign_details_screen.dart'; import 'package:diplomaticquarterapp/pages/vaccine/my_vaccines_screen.dart'; +import 'package:diplomaticquarterapp/routes.dart'; import 'package:diplomaticquarterapp/services/appointment_services/GetDoctorsList.dart'; +import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; import 'package:diplomaticquarterapp/services/robo_search/search_provider.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; -import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_tts/flutter_tts.dart'; -import 'package:hexcolor/hexcolor.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:speech_to_text/speech_recognition_error.dart'; import 'package:speech_to_text/speech_recognition_result.dart'; import 'package:speech_to_text/speech_to_text.dart'; -import 'dart:math'; -import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; -import 'package:diplomaticquarterapp/routes.dart'; -import 'dart:math'; -import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; -import 'package:diplomaticquarterapp/routes.dart'; -import 'package:smart_progress_bar/smart_progress_bar.dart'; -import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart'; -import 'package:diplomaticquarterapp/pages/feedback/feedback_home_page.dart'; class BottomBarSearch extends StatefulWidget { @override @@ -78,6 +64,7 @@ class _SearchBot extends State { bool _isInit = true; TextEditingController searchController = TextEditingController(); + @override void initState() { requestPermissions(); @@ -434,10 +421,12 @@ class _SearchBot extends State { List arr = []; List arrDistance = []; DoctorsListService service = new DoctorsListService(); + GifLoaderDialogUtils.showMyDialog(context); service .getDoctorsList(clinicId, projectId, false, context, doctorId: doctorId, doctorName: doctorName) .then((res) { + GifLoaderDialogUtils.hideDialog(context); if (res['MessageStatus'] == 1) { setState(() { if (res['SearchDoctorsByTime_IsVoiceCommandList'] != null && @@ -485,9 +474,9 @@ class _SearchBot extends State { AppToast.showErrorToast(message: res['ErrorEndUserMessage']); } }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); print(err); - }).showProgressBar( - text: "Loading", backgroundColor: Colors.blue.withOpacity(0.6)); + }); } Future navigateToDoctorProfile(context, docObject, docProfile,