diff --git a/assets/images/svg/ai_overview.svg b/assets/images/svg/ai_overview.svg
new file mode 100644
index 0000000..95c29aa
--- /dev/null
+++ b/assets/images/svg/ai_overview.svg
@@ -0,0 +1,19 @@
+
diff --git a/assets/images/svg/calculator_icon.svg b/assets/images/svg/calculator_icon.svg
new file mode 100644
index 0000000..989a4db
--- /dev/null
+++ b/assets/images/svg/calculator_icon.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/svg/guard_icon.svg b/assets/images/svg/guard_icon.svg
new file mode 100644
index 0000000..e3a68d9
--- /dev/null
+++ b/assets/images/svg/guard_icon.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/svg/high_caution.svg b/assets/images/svg/high_caution.svg
new file mode 100644
index 0000000..d268468
--- /dev/null
+++ b/assets/images/svg/high_caution.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/svg/information-circle.svg b/assets/images/svg/information-circle.svg
new file mode 100644
index 0000000..f1a850e
--- /dev/null
+++ b/assets/images/svg/information-circle.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 88d5630..11ab941 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -1522,9 +1522,44 @@
"trackerAndOthers": "المتتبع وأخرى",
"bmi": "مؤشر كتلة الجسم",
"yesPleaseINeedHelp": "نعم، من فضلك أريد المساعدة",
- "noThanksIKnowTheClinic": "لا شكراً، أعرف العيادة",
- "unableToSendOTP": "تعذر إرسال رمز التحقق لمرة واحدة",
-
+ "aiOverView": "AI ملخص",
+ "generateAiAnalysis": "قم بإجراء تحليل لهذا الطلب AI",
+ "aiAnalysis": "AI تحليل",
+ "prediction": "تنبؤ",
+ "prevention": "وقاية",
+ "disclaimer": "تنصل",
+ "thisAboveInfo": "المعلومات المذكورة أعلاه مُولّدة بواسطة AI بناءً على نتائج تحاليلك المخبرية، وهي لأغراض إعلامية فقط. لا ينبغي اعتبارها تشخيصًا طبيًا أو خطة علاجية. استشر طبيبك دائمًا للحصول على نصيحة طبية مُخصصة قبل اتخاذ أي قرارات تتعلق بصحتك.",
+ "aiDisclaimer": "سيتم مشاركة بيانات نتائج تحاليلك المخبرية بشكل آمن مع خدمة الذكاء الاصطناعي لدينا لتحليلها. يساعد هذا في تقديم رؤى صحية مُخصصة. هل ترغب في المتابعة؟",
+ "consent": "موافقة",
+ "bmiNormalDescription": "مؤشر كتلة جسمك ضمن المعدل الصحي. استمر في اتباع نظام غذائي متوازن، وممارسة النشاط البدني بانتظام، وإجراء الفحوصات الدورية للحفاظ على صحة جيدة. راقب أي تغييرات ملحوظة مع مرور الوقت.",
+ "bmiUnderweightDescription": "يشير مؤشر كتلة الجسم إلى أنك تعاني من نقص الوزن. لذا، يُنصح بزيادة السعرات الحرارية المتناولة من خلال تناول الأطعمة الغنية بالعناصر الغذائية، وممارسة تمارين المقاومة لبناء العضلات، واستشارة أخصائي رعاية صحية للتحقق من وجود أسباب كامنة.",
+ "bmiOverweightDescription": "يشير مؤشر كتلة الجسم إلى زيادة الوزن. لذا، يُنصح بالسعي إلى إنقاص الوزن تدريجياً وبشكل مستدام من خلال تقليل السعرات الحرارية بشكل معتدل، وممارسة النشاط البدني بانتظام، واختيار الأطعمة الصحية. استشر طبيبك قبل إجراء أي تغييرات جذرية في نمط حياتك.",
+ "caloriesMaintenanceDescription": "السعرات الحرارية اليومية المُقدَّرة للحفاظ على وزنك الحالي بناءً على مستوى نشاطك ومعدل الأيض لديك. استخدم هذه الكمية كخط أساس: زدها قليلاً لزيادة الكتلة العضلية، أو قللها قليلاً لإنقاص الوزن تدريجياً. تابع تقدمك وعدّل الخطة كل أسبوعين إلى أربعة أسابيع.",
+ "caloriesModerateDeficitDescription": "نظام غذائي معتدل لتقليل السعرات الحرارية مصمم لإنقاص الوزن بشكل ثابت ومستدام (عادةً من 0.25 إلى 0.5 كيلوغرام أسبوعيًا). يُنصح بدمجه مع تمارين المقاومة وتناول كمية كافية من البروتين للحفاظ على الكتلة العضلية. تجنب التخفيضات الحادة في السعرات الحرارية واستشر طبيبًا مختصًا إذا كنت تعاني من أي حالة صحية.",
+ "caloriesAggressiveDeficitDescription": "يؤدي خفض السعرات الحرارية بشكل كبير إلى فقدان الوزن بشكل أسرع، ولكنه قد يصعب الاستمرار عليه ويزيد من خطر نقص العناصر الغذائية والإرهاق وفقدان الكتلة العضلية. لا يُنصح باتباعه على المدى الطويل؛ استشر طبيبًا أو أخصائي تغذية قبل الاستمرار.",
+ "bodyFatEssentialDescription": "نسبة الدهون في جسمك ضمن النطاق الأساسي/الرياضي. هذا المستوى شائع لدى الرياضيين ويشير إلى انخفاض نسبة الدهون في الجسم. مع أن هذا قد يكون مثاليًا للأداء، تأكد من الحفاظ على تغذية سليمة ووظائف هرمونية متوازنة. استشر طبيبًا إذا شعرت بالتعب، أو واجهت مشاكل هرمونية، أو أي مخاوف صحية أخرى.",
+ "bodyFatFitnessDescription": "نسبة الدهون في جسمك ضمن النطاق الصحي. وهذا يدل على مستوى صحي من الدهون في الجسم يرتبط بلياقة بدنية جيدة. حافظ على نمط حياتك الحالي، بما في ذلك ممارسة الرياضة بانتظام واتباع نظام غذائي متوازن، للحفاظ على هذا المستوى الصحي.",
+ "bodyFatAverageDescription": "نسبة الدهون في جسمك ضمن المعدل الطبيعي/المقبول، وهي نسبة تُعتبر صحية لعموم الناس. لتحسين تكوين جسمك، يُنصح بممارسة تمارين القوة، وتمارين القلب والأوعية الدموية، واتباع نظام غذائي متوازن. ركّز على التغييرات التدريجية والمستدامة للحفاظ على صحتك على المدى الطويل.",
+ "bodyFatObeseDescription": "نسبة الدهون في جسمك أعلى من المعدل الصحي الموصى به. قد يزيد هذا من المخاطر الصحية، بما في ذلك أمراض القلب والأوعية الدموية، والسكري، ومشاكل المفاصل. يُنصح باستشارة طبيب أو أخصائي تغذية معتمد لوضع خطة علاجية شخصية تشمل التغذية المتوازنة، والنشاط البدني المنتظم، وتعديلات نمط الحياة لتحقيق إدارة مستدامة للوزن.",
+ "bmrNormalDescription": "معدل الأيض الأساسي لديك ضمن النطاق المتوقع لحالتك. معدل الأيض الأساسي هو الطاقة التي يحتاجها جسمك في حالة الراحة للحفاظ على وظائفه الحيوية (التنفس، الدورة الدموية، درجة الحرارة). استخدم هذه القيمة كأساس لتقدير إجمالي احتياجاتك اليومية من الطاقة من خلال تطبيق مُعامل النشاط. حافظ على نظام غذائي متوازن وممارسة النشاط البدني بانتظام لدعم صحة التمثيل الغذائي.",
+ "bmrLowDescription": "معدل الأيض الأساسي لديك أقل من المعدل الطبيعي لحالتك. تشمل الأسباب المحتملة انخفاض كتلة العضلات، أو تراجع التمثيل الغذائي المرتبط بالتقدم في السن، أو التكيف الأيضي الناتج عن تقييد السعرات الحرارية لفترة طويلة. يُنصح بالتركيز على تمارين المقاومة لبناء العضلات والحفاظ عليها، والتأكد من تناول كميات كافية من البروتين والمغذيات الدقيقة، واستشارة أخصائي رعاية صحية إذا كان هذا الأمر غير متوقع.",
+ "bmrHighDescription": "معدل الأيض الأساسي لديك أعلى من المتوسط \u200B\u200Bبالنسبة لحالتك. قد يعكس هذا زيادة في كتلة العضلات، أو صغر السن، أو ارتفاع معدل الأيض لديك بشكل طبيعي، مما يعني أنك تحرق طاقة أكبر أثناء الراحة. استخدم هذه المعلومات لتحديد احتياجاتك من السعرات الحرارية: احتياجات أعلى للحفاظ على الوزن أو بناء العضلات، ونقص معتدل في السعرات الحرارية لإنقاص الوزن. استشر طبيبك إذا لاحظت أي تغيرات سريعة غير مبررة.",
+ "ibwAtTargetDescription": "Your weight is at the ideal target. Maintain your current habits — balanced diet and regular activity — to keep this.",
+ "ibwBelowTargetDescription": "You are below the ideal weight by {kg} kg. Aim to gradually increase weight with a modest calorie surplus, nutrient-dense foods, and resistance training.",
+ "ibwAboveTargetDescription": "You are above the ideal weight by {kg} kg. Aim for a gradual, sustainable weight reduction through a moderate calorie deficit, increased activity, and balanced nutrition.",
+ "ibwCloseToRangeDescription": "Your weight is close to the ideal range. Maintain a balanced diet and regular activity; follow personalized advice from a healthcare professional if needed.",
+ "ibwUnderweightDescription": "You are below the ideal weight by {kg} kg. Focus on increasing calorie intake with nutrient-dense foods, prioritize protein and resistance training to build healthy mass, and consider consulting a healthcare professional.",
+ "ibwUnderweightGenericDescription": "You appear underweight compared to the ideal. Consider increasing calorie intake with nutrient-dense foods and resistance training; seek professional guidance if needed.",
+ "ibwOverweightDescription": "You are above the ideal weight by {kg} kg. Aim for a gradual, sustainable weight loss strategy — moderate calorie deficit, regular physical activity, and balanced nutrition. Consult a professional before major changes.",
+ "ibwOverweightGenericDescription": "You appear above the ideal weight. Consider a gradual, sustainable calorie deficit combined with activity and balanced nutrition; consult a professional if needed.",
+ "dietVeryLowCarbsDescription": "Very low‑carb (ketogenic) approach: minimal carbohydrates, higher fat and moderate protein. May support rapid weight loss and improved blood sugar control for some, but can be hard to sustain and may cause nutrient gaps. Monitor hydration/electrolytes and consult a professional for long‑term use.",
+ "dietLowCarbsDescription": "Low‑carb, higher‑protein plan: reduced carbohydrates with increased protein to support satiety and muscle maintenance. Helpful for weight management and glycemic control when balanced with vegetables and healthy fats. Ensure adequate fiber and micronutrients.",
+ "dietModerateCarbsDescription": "Moderate carbohydrate intake with balanced protein and fats: provides steady energy for daily activity and exercise while allowing flexibility. Suitable for many people aiming for sustainable weight management and performance.",
+ "dietUSDAGuidelinesDescription": "USDA‑based balanced pattern: emphasizes fruits, vegetables, whole grains, lean proteins, and limited added sugars and saturated fats. Evidence‑based framework for general health, nutrient adequacy, and chronic disease prevention.",
+ "dietZoneDietDescription": "Zone Diet (~40% carbs / 30% protein / 30% fat): emphasizes hormonal balance and portion control. May improve body composition and energy for some, but requires planning; personalize with a nutrition professional.",
+ "contextDependent": "يعتمد السياق",
+ "calculatedValue": "القيمة المحسوبة",
+ "calculationFormula": "صيغة الحساب",
"confirmYourLocation": "قم بتأكيد موقعك",
"confirmYourLocationDesc": "يرجى تأكيد موقعك الحالي لعرض الاتجاهات المناسبة.",
"insideHospital": "أنا داخل المستشفى",
@@ -1532,5 +1567,9 @@
"servicePriceList": "قائمة أسعار الخدمات",
"servicePriceListDesc": "توضح قائمة أسعار الخدمات أدناه رسوم الخدمات الصحية المقدمة للمرضى بنظام الدفع النقدي. أما فيما يتعلق بالخدمات المشمولة بالتأمين، فسيتم تطبيق التغطية التأمينية والتحقق من الأهلية واحتساب نسب التحمل وفقًا لشروط وثيقة التأمين وجدول المنافع المعتمد لكل شركة تأمين.",
"servicePriceListRights": "يحق للمريض الحصول على متابعة مجانية في غضون 14 يومًا من الزيارة الأولى",
- "serviceName": "اسم الخدمة"
+ "serviceName": "اسم الخدمة",
+ "noFreeSlot": "لا توجد مواعيد متاحة في التاريخ المحدد. يرجى اختيار تاريخ آخر أو إعادة المحاولة لاحقاً.",
+ "noThanksIKnowTheClinic": "لا، شكراً. أنا أعرف العيادة.",
+ "unableToSendOTP": "تعذر إرسال رمز التحقق لمرة واحدة",
+ "loadingAIAnalysis": "جارٍ تحميل بياناتك وتحليلها، يُرجى التحلي بالصبر ودع الذكاء الاصطناعي يقوم بالمهمة. يُرجى التحلي بالصبر، فقد يستغرق هذا بعض الوقت."
}
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index 47f0d69..3f1bc78 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -1439,7 +1439,6 @@
"healthy": "Healthy",
"warning": "Warning",
"vitalSignDetails": "Vital Sign Details",
- "resultOf": "Result of {date}",
"resultOfNoDate": "Result of --",
"referenceRangeBetween": "Reference range: {low} – {high} {unit}",
"referenceRangeMin": "Reference range: ≥ {low} {unit}",
@@ -1475,7 +1474,6 @@
"remindersSet": "Reminders Set!",
"dailyWaterRemindersScheduledAt": "Daily water reminders scheduled at:",
"waterConsumption": "Water Consumption",
- "selectActivityLevel": "Select Activity Level",
"selectNumberOfReminders": "Select Number of Reminders",
"h2oSettings": "H20 Settings",
"settingsSavedSuccessfully": "Settings saved successfully",
@@ -1515,8 +1513,6 @@
"trackerAndOthers": "Tracker & Others",
"bmi": "BMI",
"yesPleaseINeedHelp": "Yes, Please I need help",
- "noThanksIKnowTheClinic": "No, Thanks. I Know the clinic",
- "unableToSendOTP": "Unable to send Verification OTP",
"confirmYourLocation": "Confirm Your Location",
"confirmYourLocationDesc": "Please confirm your present location to view appropriate directions.",
"insideHospital": "I am inside the hospital",
@@ -1524,6 +1520,47 @@
"servicePriceList": "Services Price List",
"servicePriceListDesc": "Below is the services price list outline the healthcare services fees for cash payments, where the insurance coverage, eligibility, and co-payment deductions will be processed in accordance with the insurance policy terms and the table of benefits of each insurance providers:",
"servicePriceListRights": "The patient has the right to a free follow-up within 14 days of initial visit",
-
- "serviceName": "Service Name"
+ "serviceName": "Service Name",
+ "noFreeSlot": "No free slot available for the selected date. Please select another date or check back later.",
+ "noThanksIKnowTheClinic": "No, Thanks. I Know the clinic",
+ "unableToSendOTP": "Unable to send Verification OTP",
+ "aiOverView": "AI Overview",
+ "generateAiAnalysis": "Generate AI analysis for this order",
+ "aiAnalysis": "AI Analysis",
+ "prediction": "Prediction",
+ "prevention": "Prevention",
+ "disclaimer": "Disclaimer",
+ "thisAboveInfo": "The above information is generated by AI based on your lab results and is intended for informational purposes only. It should not be considered a medical diagnosis or treatment plan. Always consult with your healthcare provider for personalized medical advice and before making any health-related decisions.",
+ "aiDisclaimer": "Your lab result data will be securely shared with our AI Analyzer for analysis. This helps provide personalized health insights. Do you want to proceed?",
+ "consent": "Consent",
+ "bmiNormalDescription": "Your BMI is within the healthy range. Continue a balanced diet, regular physical activity, and routine checkups to maintain good health. Monitor any significant changes over time.",
+ "bmiUnderweightDescription": "BMI suggests you are underweight. Consider increasing calorie intake with nutrient-dense foods, include resistance training to build muscle, and consult a healthcare professional to check for underlying causes.",
+ "bmiOverweightDescription": "BMI indicates overweight. Aim for gradual, sustainable weight loss through a modest calorie deficit, regular physical activity, and healthier food choices. Seek medical advice before major lifestyle changes.",
+ "caloriesMaintenanceDescription": "Estimated daily calories to maintain your current weight given your activity level and metabolism. Use this as a baseline: increase slightly for muscle gain, or create a small deficit for gradual weight loss. Track progress and adjust every 2–4 weeks.",
+ "caloriesModerateDeficitDescription": "A moderate calorie reduction designed for steady, sustainable weight loss (typically 0.25–0.5 kg per week). Combine with resistance training and adequate protein to preserve muscle. Avoid extreme cuts and consult a professional if you have medical conditions.",
+ "caloriesAggressiveDeficitDescription": "A large calorie reduction that may produce faster weight loss but can be hard to sustain and increase risk of nutrient deficiencies, fatigue, or muscle loss. Not recommended long-term; seek guidance from a healthcare or nutrition professional before continuing.",
+ "bodyFatEssentialDescription": "Your body fat percentage is in the essential/athletic range. This level is typical for athletes and indicates very low body fat. While this may be optimal for performance, ensure you maintain adequate nutrition and hormone function. Consult a healthcare professional if you experience fatigue, hormonal issues, or other health concerns.",
+ "bodyFatFitnessDescription": "Your body fat percentage is in the fitness range. This indicates a healthy level of body fat associated with good physical conditioning. Maintain your current lifestyle habits including regular exercise and balanced nutrition to sustain this healthy range.",
+ "bodyFatAverageDescription": "Your body fat percentage is in the average/acceptable range. This is considered a healthy range for general population. To improve body composition, consider incorporating strength training, cardiovascular exercise, and a balanced diet. Focus on gradual, sustainable changes for long-term health.",
+ "bodyFatObeseDescription": "Your body fat percentage is above the recommended healthy range. This may increase health risks including cardiovascular disease, diabetes, and joint problems. Consider consulting a healthcare provider or registered dietitian to develop a personalized plan that includes balanced nutrition, regular physical activity, and lifestyle modifications for sustainable weight management.",
+ "bmrNormalDescription": "Your Basal Metabolic Rate (BMR) is within the expected range for your profile. BMR is the energy your body needs at rest to maintain vital functions (breathing, circulation, temperature). Use this value as the baseline for estimating total daily energy needs by applying an activity multiplier. Maintain a balanced diet and regular physical activity to support metabolic health.",
+ "bmrLowDescription": "Your BMR is lower than typical for your profile. Possible causes include lower lean muscle mass, age-related metabolic decline, or metabolic adaptation from prolonged calorie restriction. Consider focusing on resistance training to build/maintain muscle, ensure adequate protein and micronutrient intake, and consult a healthcare professional if this is unexpected.",
+ "bmrHighDescription": "Your BMR is higher than average for your profile. This can reflect greater lean mass, younger age, or a naturally higher metabolic rate, meaning you burn more energy at rest. Use this information to tailor calorie targets: higher needs for maintenance or muscle gain, moderate deficit for weight loss. Seek medical advice if you notice rapid unexplained changes.",
+ "ibwAtTargetDescription": "Your weight is at the ideal target. Maintain your current habits — balanced diet and regular activity — to keep this.",
+ "ibwBelowTargetDescription": "You are below the ideal weight by {kg} kg. Aim to gradually increase weight with a modest calorie surplus, nutrient-dense foods, and resistance training.",
+ "ibwAboveTargetDescription": "You are above the ideal weight by {kg} kg. Aim for a gradual, sustainable weight reduction through a moderate calorie deficit, increased activity, and balanced nutrition.",
+ "ibwCloseToRangeDescription": "Your weight is close to the ideal range. Maintain a balanced diet and regular activity; follow personalized advice from a healthcare professional if needed.",
+ "ibwUnderweightDescription": "You are below the ideal weight by {kg} kg. Focus on increasing calorie intake with nutrient-dense foods, prioritize protein and resistance training to build healthy mass, and consider consulting a healthcare professional.",
+ "ibwUnderweightGenericDescription": "You appear underweight compared to the ideal. Consider increasing calorie intake with nutrient-dense foods and resistance training; seek professional guidance if needed.",
+ "ibwOverweightDescription": "You are above the ideal weight by {kg} kg. Aim for a gradual, sustainable weight loss strategy — moderate calorie deficit, regular physical activity, and balanced nutrition. Consult a professional before major changes.",
+ "ibwOverweightGenericDescription": "You appear above the ideal weight. Consider a gradual, sustainable calorie deficit combined with activity and balanced nutrition; consult a professional if needed.",
+ "dietVeryLowCarbsDescription": "Very low‑carb (ketogenic) approach: minimal carbohydrates, higher fat and moderate protein. May support rapid weight loss and improved blood sugar control for some, but can be hard to sustain and may cause nutrient gaps. Monitor hydration/electrolytes and consult a professional for long‑term use.",
+ "dietLowCarbsDescription": "Low‑carb, higher‑protein plan: reduced carbohydrates with increased protein to support satiety and muscle maintenance. Helpful for weight management and glycemic control when balanced with vegetables and healthy fats. Ensure adequate fiber and micronutrients.",
+ "dietModerateCarbsDescription": "Moderate carbohydrate intake with balanced protein and fats: provides steady energy for daily activity and exercise while allowing flexibility. Suitable for many people aiming for sustainable weight management and performance.",
+ "dietUSDAGuidelinesDescription": "USDA‑based balanced pattern: emphasizes fruits, vegetables, whole grains, lean proteins, and limited added sugars and saturated fats. Evidence‑based framework for general health, nutrient adequacy, and chronic disease prevention.",
+ "dietZoneDietDescription": "Zone Diet (~40% carbs / 30% protein / 30% fat): emphasizes hormonal balance and portion control. May improve body composition and energy for some, but requires planning; personalize with a nutrition professional.",
+ "contextDependent": "Context Dependent",
+ "calculatedValue": "Calculated Value",
+ "calculationFormula": "Calculation Formula",
+ "loadingAIAnalysis": "Loading and analysing your data, Please be patient and let the AI do the magic. Please be patient, This might take some time."
}
diff --git a/icon.jpg b/icon.jpg
new file mode 100644
index 0000000..65ca5c0
Binary files /dev/null and b/icon.jpg differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 7a41ae2..dd2d96e 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -18,12 +18,12 @@
61243B562EC5FA3700D46FA0 /* PenguinNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61243B432EC5FA3700D46FA0 /* PenguinNavigator.swift */; };
61243B572EC5FA3700D46FA0 /* PenguinViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61243B462EC5FA3700D46FA0 /* PenguinViewFactory.swift */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
- 766D8CB62EC60BE600D05E07 /* Penguin.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB32EC60BE600D05E07 /* Penguin.xcframework */; };
- 766D8CB72EC60BE600D05E07 /* Penguin.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB32EC60BE600D05E07 /* Penguin.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 766D8CB82EC60BE600D05E07 /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB42EC60BE600D05E07 /* PenNavUI.xcframework */; };
- 766D8CB92EC60BE600D05E07 /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB42EC60BE600D05E07 /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 766D8CBA2EC60BE600D05E07 /* PenguinINRenderer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB52EC60BE600D05E07 /* PenguinINRenderer.xcframework */; };
- 766D8CBB2EC60BE600D05E07 /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 766D8CB52EC60BE600D05E07 /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 765A5A8C2F35CD8B0003FF7D /* Penguin.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A802F35CD730003FF7D /* Penguin.xcframework */; };
+ 765A5A8D2F35CD8B0003FF7D /* Penguin.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A802F35CD730003FF7D /* Penguin.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 765A5A8E2F35CD8B0003FF7D /* PenguinINRenderer.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */; };
+ 765A5A8F2F35CD8B0003FF7D /* PenguinINRenderer.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 765A5A902F35CD8B0003FF7D /* PenNavUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */; };
+ 765A5A912F35CD8B0003FF7D /* PenNavUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -41,15 +41,15 @@
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
- 9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+ 765A5A922F35CD8B0003FF7D /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
- 766D8CB72EC60BE600D05E07 /* Penguin.xcframework in Embed Frameworks */,
- 766D8CBB2EC60BE600D05E07 /* PenguinINRenderer.xcframework in Embed Frameworks */,
- 766D8CB92EC60BE600D05E07 /* PenNavUI.xcframework in Embed Frameworks */,
+ 765A5A8F2F35CD8B0003FF7D /* PenguinINRenderer.xcframework in Embed Frameworks */,
+ 765A5A8D2F35CD8B0003FF7D /* Penguin.xcframework in Embed Frameworks */,
+ 765A5A912F35CD8B0003FF7D /* PenNavUI.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -73,9 +73,9 @@
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; };
7595037DD52211B91157B0F3 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; };
- 766D8CB32EC60BE600D05E07 /* Penguin.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Penguin.xcframework; path = Frameworks/Penguin.xcframework; sourceTree = ""; };
- 766D8CB42EC60BE600D05E07 /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenNavUI.xcframework; path = Frameworks/PenNavUI.xcframework; sourceTree = ""; };
- 766D8CB52EC60BE600D05E07 /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = PenguinINRenderer.xcframework; path = Frameworks/PenguinINRenderer.xcframework; sourceTree = ""; };
+ 765A5A802F35CD730003FF7D /* Penguin.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = Penguin.xcframework; sourceTree = ""; };
+ 765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = PenguinINRenderer.xcframework; sourceTree = ""; };
+ 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = PenNavUI.xcframework; sourceTree = ""; };
769C9BF82E6F106D009F68A9 /* RunnerDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerDebug.entitlements; sourceTree = ""; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; };
8E12CEEB8E334EE22D5259D7 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; };
@@ -95,9 +95,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 766D8CB62EC60BE600D05E07 /* Penguin.xcframework in Frameworks */,
- 766D8CBA2EC60BE600D05E07 /* PenguinINRenderer.xcframework in Frameworks */,
- 766D8CB82EC60BE600D05E07 /* PenNavUI.xcframework in Frameworks */,
+ 765A5A8C2F35CD8B0003FF7D /* Penguin.xcframework in Frameworks */,
+ 765A5A902F35CD8B0003FF7D /* PenNavUI.xcframework in Frameworks */,
+ 765A5A8E2F35CD8B0003FF7D /* PenguinINRenderer.xcframework in Frameworks */,
DE1EF78253E64BE86845D2CC /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -136,9 +136,9 @@
766D8CB22EC60BE600D05E07 /* Frameworks */ = {
isa = PBXGroup;
children = (
- 766D8CB32EC60BE600D05E07 /* Penguin.xcframework */,
- 766D8CB52EC60BE600D05E07 /* PenguinINRenderer.xcframework */,
- 766D8CB42EC60BE600D05E07 /* PenNavUI.xcframework */,
+ 765A5A802F35CD730003FF7D /* Penguin.xcframework */,
+ 765A5A812F35CD730003FF7D /* PenguinINRenderer.xcframework */,
+ 765A5A822F35CD730003FF7D /* PenNavUI.xcframework */,
D562310E31D1DDEFA02A6C12 /* Pods_Runner.framework */,
);
name = Frameworks;
@@ -235,10 +235,10 @@
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
- 9705A1C41CF9048500538489 /* Embed Frameworks */,
- 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
8372B02399CDF54531650AD4 /* [CP] Embed Pods Frameworks */,
81DE7C26F41956799E954FCE /* [CP] Copy Pods Resources */,
+ 765A5A922F35CD8B0003FF7D /* Embed Frameworks */,
+ 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
);
buildRules = (
);
@@ -524,8 +524,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ MARKETING_VERSION = 0.0.1;
+ PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -710,8 +710,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ MARKETING_VERSION = 0.0.1;
+ PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -739,8 +739,8 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 1.0.0;
- PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
+ MARKETING_VERSION = 0.0.1;
+ PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.HMGPatientApp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart
index ea8062d..231b037 100644
--- a/lib/core/api/api_client.dart
+++ b/lib/core/api/api_client.dart
@@ -181,6 +181,16 @@ class ApiClientImp implements ApiClient {
body[_appState.isAuthenticated ? 'TokenID' : 'LogInTokenID'] = _appState.appAuthToken;
}
+ if (url.contains("HMGAI_Lab_Analyze_Orders_API")) {
+ url = "https://uat.hmgwebservices.com/Services/Patients.svc/REST/HMGAI_Lab_Analyze_Orders_API";
+ body['TokenID'] = "@dm!n";
+ }
+
+ if (url.contains("HMGAI_Lab_Analyzer_API")) {
+ url = "https://uat.hmgwebservices.com/Services/Patients.svc/REST/HMGAI_Lab_Analyzer_API";
+ body['TokenID'] = "@dm!n";
+ }
+
// body['TokenID'] = "@dm!n";
// body['PatientID'] = 4768663;
// body['PatientTypeID'] = 1;
diff --git a/lib/core/api_consts.dart b/lib/core/api_consts.dart
index 5b6e5cc..f78c020 100644
--- a/lib/core/api_consts.dart
+++ b/lib/core/api_consts.dart
@@ -904,9 +904,12 @@ class ApiConsts {
static String getPatientBloodGroup = "services/PatientVarification.svc/REST/BloodDonation_GetBloodGroupDetails";
static String getPatientBloodAgreement = "Services/PatientVarification.svc/REST/CheckUserAgreementForBloodDonation";
+ static String getAiOverViewLabOrders = "Services/Patients.svc/REST/HMGAI_Lab_Analyze_Orders_API";
+ static String getAiOverViewLabOrder = "Services/Patients.svc/REST/HMGAI_Lab_Analyzer_API";
// ************ static values for Api ****************
- static final double appVersionID = 19.7;
+ // static final double appVersionID = 19.7;
+ static final double appVersionID = 50.7;
static final int appChannelId = 3;
static final String appIpAddress = "10.20.10.20";
static final String appGeneralId = "Cs2020@2016\$2958";
diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart
index 5b8d2ed..d9d7120 100644
--- a/lib/core/app_assets.dart
+++ b/lib/core/app_assets.dart
@@ -251,6 +251,10 @@ class AppAssets {
static const String alertSquare = '$svgBasePath/alert-square.svg';
static const String arrowRight = '$svgBasePath/arrow-right.svg';
static const String tickIcon = '$svgBasePath/tick.svg';
+ static const String guradIcon = '$svgBasePath/guard_icon.svg';
+ static const String calculatorIcon = '$svgBasePath/calculator_icon.svg';
+ static const String informationIcon = '$svgBasePath/information-circle.svg';
+ static const String highCautionIcon = '$svgBasePath/high_caution.svg';
// Symptoms Checker
static const String calendarGrey = '$svgBasePath/calendar-grey.svg';
@@ -322,6 +326,7 @@ class AppAssets {
static const String doctorResponseIcon = '$svgBasePath/doctor_response_icon.svg';
static const String changeLanguageHomePageIcon = '$svgBasePath/change_language_home_page.svg';
+ static const String aiOverView = '$svgBasePath/ai_overview.svg';
// PNGS //
static const String hmgLogo = '$pngBasePath/hmg_logo.png';
diff --git a/lib/core/utils/loading_utils.dart b/lib/core/utils/loading_utils.dart
index 1a99278..bd24d30 100644
--- a/lib/core/utils/loading_utils.dart
+++ b/lib/core/utils/loading_utils.dart
@@ -38,7 +38,7 @@ class LoadingUtils {
child: Material(
child: Center(
child: isSuccessDialog ? Utils.getSuccessWidget(loadingText: loadingText) : Utils.getLoadingWidget(loadingText: loadingText),
- ),
+ ).paddingSymmetrical(24.w, 0),
),
);
}).then((value) {
diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart
index a236de5..f087f74 100644
--- a/lib/extensions/string_extensions.dart
+++ b/lib/extensions/string_extensions.dart
@@ -222,8 +222,7 @@ extension EmailValidator on String {
decoration: isUnderLine ? TextDecoration.underline : null),
);
- Widget toText16(
- {Color? color,
+ Widget toText16({bool isEnglishOnly = false, Color? color,
bool isUnderLine = false,
bool isBold = false,
bool isCenter = false,
@@ -247,6 +246,7 @@ extension EmailValidator on String {
overflow: textOverflow,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
+ fontFamily: isEnglishOnly ? "Poppins" : getIt.get().getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins',
decorationColor: decorationColor),
);
@@ -423,11 +423,12 @@ extension DynamicTextStyleExtension on BuildContext {
Locale? locale,
TextBaseline? textBaseline,
FontStyle? fontStyle,
+ String? fontFamily,
bool isLanguageSwitcher = false}) {
AppState appState = getIt.get();
final family = appState.getLanguageCode() == "ar" ? 'GESSTwo' : 'Poppins';
return TextStyle(
- fontFamily: family,
+ fontFamily: fontFamily ?? family,
fontSize: fontSize,
fontWeight: fontWeight,
color: color,
diff --git a/lib/features/authentication/authentication_view_model.dart b/lib/features/authentication/authentication_view_model.dart
index c79e8ec..50bd1ca 100644
--- a/lib/features/authentication/authentication_view_model.dart
+++ b/lib/features/authentication/authentication_view_model.dart
@@ -282,9 +282,10 @@ class AuthenticationViewModel extends ChangeNotifier {
loginTypeEnum = otpTypeEnum == OTPTypeEnum.sms ? LoginTypeEnum.sms : LoginTypeEnum.whatsapp;
- if (phoneNumberController.text.isEmpty) {
- phoneNumberController.text = "504278212";
- }
+ // if (phoneNumberController.text.isEmpty) {
+ // phoneNumberController.text = "504278212";
+ // }
+
bool isValidated = ValidationUtils.isValidatePhoneAndId(phoneNumber: phoneNumberController.text, nationalId: nationalIdController.text);
if (!isValidated) {
@@ -407,7 +408,6 @@ class AuthenticationViewModel extends ChangeNotifier {
return;
}
patientShareRequestID = apiResponse.data['PatientShareRequestID'];
- print("PatientShareRequestID ==============: $patientShareRequestID");
_appState.setFamilyFileTokenID = apiResponse.data['LogInTokenID'];
}
if (apiResponse.messageStatus == 2) {
diff --git a/lib/features/book_appointments/book_appointments_repo.dart b/lib/features/book_appointments/book_appointments_repo.dart
index cab79ad..fc541d2 100644
--- a/lib/features/book_appointments/book_appointments_repo.dart
+++ b/lib/features/book_appointments/book_appointments_repo.dart
@@ -185,7 +185,7 @@ class BookAppointmentsRepoImp implements BookAppointmentsRepo {
body: mapDevice,
onFailure: (error, statusCode, {messageStatus, failureType}) {
failure = failureType;
- onError!(error);
+ // onError!(error);
},
onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
try {
diff --git a/lib/features/book_appointments/book_appointments_view_model.dart b/lib/features/book_appointments/book_appointments_view_model.dart
index c60a827..9b53a13 100644
--- a/lib/features/book_appointments/book_appointments_view_model.dart
+++ b/lib/features/book_appointments/book_appointments_view_model.dart
@@ -103,6 +103,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
String selectedAppointmentDate = "";
String selectedAppointmentTime = "";
+ String selectedAppointmentDisplayDate = "";
dynamic freeSlotsResponse;
@@ -385,9 +386,10 @@ class BookAppointmentsViewModel extends ChangeNotifier {
notifyListeners();
}
- setSelectedAppointmentDateTime(String date, String time) {
+ setSelectedAppointmentDateTime(String date, String time, String displayDate) {
selectedAppointmentDate = date;
selectedAppointmentTime = time;
+ selectedAppointmentDisplayDate = displayDate;
notifyListeners();
}
@@ -581,7 +583,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
result.fold(
(failure) async {
- onError?.call(LocaleKeys.noDoctorFound.tr());
+ onError?.call(selectedClinic.clinicID == 23 ? failure.message : LocaleKeys.noDoctorFound.tr());
},
(apiResponse) async {
if (apiResponse.messageStatus == 2) {
@@ -669,7 +671,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
Future getDoctorFreeSlots({bool isBookingForLiveCare = false, Function(dynamic)? onSuccess, Function(String)? onError}) async {
docFreeSlots.clear();
DateTime date;
- final DateFormat formatter = DateFormat('HH:mm', "en-US");
+ final DateFormat formatter = DateFormat('HH:mm');
final DateFormat dateFormatter = DateFormat('yyyy-MM-dd');
Map _eventsParsed;
diff --git a/lib/features/lab/lab_repo.dart b/lib/features/lab/lab_repo.dart
index e661157..a4cdcf1 100644
--- a/lib/features/lab/lab_repo.dart
+++ b/lib/features/lab/lab_repo.dart
@@ -5,6 +5,8 @@ import 'package:hmg_patient_app_new/core/common_models/generic_api_model.dart';
import 'package:dartz/dartz.dart';
import 'package:hmg_patient_app_new/core/utils/date_util.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart';
+import 'package:hmg_patient_app_new/features/lab/models/resp_models/ai_overview_labresults_by_ai_model.dart';
+import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_order_response_by_ai_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_special_result.dart';
import 'package:hmg_patient_app_new/services/logger_service.dart';
@@ -13,6 +15,7 @@ import 'models/resp_models/lab_result.dart' show LabResult;
abstract class LabRepo {
Future>>> getPatientLabOrders();
+
Future>>> getPatientLabResults(PatientLabOrdersResponseModel laborder, bool isVidaPlus, String procedureName);
Future>>> getPatientLabResultsByHospitals(PatientLabOrdersResponseModel laborder, bool isVidaPlus);
@@ -22,6 +25,10 @@ abstract class LabRepo {
Future>> getLabResultReportPDF({required PatientLabOrdersResponseModel labOrder});
Future>> getLabResultsByAppointmentNo({required num appointmentNo, required num projectID, required num clinicID});
+
+ Future>> getPatientAiOverViewLabOrders(var payload);
+
+ Future>> getPatientAiOverViewLabOrder(var payload);
}
class LabRepoImp implements LabRepo {
@@ -71,10 +78,7 @@ class LabRepoImp implements LabRepo {
}
@override
- Future>>> getPatientLabResults(
- PatientLabOrdersResponseModel laborder, bool isVidaPlus, String procedureName
- ) async {
-
+ Future>>> getPatientLabResults(PatientLabOrdersResponseModel laborder, bool isVidaPlus, String procedureName) async {
Map request = Map();
request['InvoiceNo_VP'] = isVidaPlus ? laborder!.invoiceNo : "0";
request['InvoiceNo'] = isVidaPlus ? "0" : laborder!.invoiceNo;
@@ -100,10 +104,7 @@ class LabRepoImp implements LabRepo {
throw Exception("lab list is empty");
}
- final labOrders = list
- .map((item) => LabResult.fromJson(item as Map))
- .toList()
- .cast();
+ final labOrders = list.map((item) => LabResult.fromJson(item as Map)).toList().cast();
apiResponse = GenericApiModel>(
messageStatus: messageStatus,
@@ -125,9 +126,7 @@ class LabRepoImp implements LabRepo {
}
@override
- Future>>>
- getPatientLabResultsByHospitals(
- PatientLabOrdersResponseModel laborder, bool isVidaPlus) async {
+ Future>>> getPatientLabResultsByHospitals(PatientLabOrdersResponseModel laborder, bool isVidaPlus) async {
Map request = Map();
request['InvoiceNo_VP'] = isVidaPlus ? laborder!.invoiceNo : "0";
request['InvoiceNo'] = isVidaPlus ? "0" : laborder!.invoiceNo;
@@ -175,9 +174,7 @@ class LabRepoImp implements LabRepo {
}
@override
- Future>>>
- getSpecialLabResult(
- PatientLabOrdersResponseModel laborder, bool isVidaPlus) async {
+ Future>>> getSpecialLabResult(PatientLabOrdersResponseModel laborder, bool isVidaPlus) async {
Map request = Map();
request['InvoiceNo_VP'] = isVidaPlus ? laborder!.invoiceNo : "0";
request['InvoiceNo'] = isVidaPlus ? "0" : laborder!.invoiceNo;
@@ -203,11 +200,7 @@ class LabRepoImp implements LabRepo {
throw Exception("lab list is empty");
}
- final labOrders = list
- .map((item) => PatientLabSpecialResult.fromJson(
- item as Map))
- .toList()
- .cast();
+ final labOrders = list.map((item) => PatientLabSpecialResult.fromJson(item as Map)).toList().cast();
apiResponse = GenericApiModel>(
messageStatus: messageStatus,
@@ -318,4 +311,76 @@ class LabRepoImp implements LabRepo {
return Left(UnknownFailure(e.toString()));
}
}
+
+ @override
+ Future>> getPatientAiOverViewLabOrder(var labOrder) async {
+ try {
+ GenericApiModel? apiResponse;
+ Failure? failure;
+ await apiClient.post(
+ ApiConsts.getAiOverViewLabOrder,
+ body: labOrder,
+ onFailure: (error, statusCode, {messageStatus, failureType}) {
+ failure = failureType;
+ },
+ onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
+ try {
+ var res;
+ if (response["analysis_result"] != null) {
+ res = response["analysis_result"];
+ }
+ apiResponse = GenericApiModel(
+ messageStatus: messageStatus,
+ statusCode: statusCode,
+ errorMessage: null,
+ data: LabOrderResponseByAi.fromJson(res),
+ );
+ } catch (e) {
+ failure = DataParsingFailure(e.toString());
+ }
+ },
+ );
+ if (failure != null) return Left(failure!);
+ if (apiResponse == null) return Left(ServerFailure("Unknown error"));
+ return Right(apiResponse!);
+ } catch (e) {
+ return Left(UnknownFailure(e.toString()));
+ }
+ }
+
+ @override
+ Future>> getPatientAiOverViewLabOrders(var labOrder) async {
+ try {
+ GenericApiModel? apiResponse;
+ Failure? failure;
+ await apiClient.post(
+ ApiConsts.getAiOverViewLabOrders,
+ body: {"lab_results": labOrder},
+ onFailure: (error, statusCode, {messageStatus, failureType}) {
+ failure = failureType;
+ },
+ onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
+ try {
+ var res;
+ if (response["lab_analysis_result"] != null) {
+ res = response["lab_analysis_result"];
+ }
+ apiResponse = GenericApiModel(
+ messageStatus: messageStatus,
+ statusCode: statusCode,
+ errorMessage: null,
+ data: LabOrdersResponseByAi.fromJson(res),
+ );
+ } catch (e) {
+ failure = DataParsingFailure(e.toString());
+ }
+ },
+ );
+ if (failure != null) return Left(failure!);
+ if (apiResponse == null) return Left(ServerFailure("Unknown error"));
+ return Right(apiResponse!);
+ } catch (e) {
+ return Left(UnknownFailure(e.toString()));
+ }
+ }
}
diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart
index 1047dbc..22e4859 100644
--- a/lib/features/lab/lab_view_model.dart
+++ b/lib/features/lab/lab_view_model.dart
@@ -1,16 +1,24 @@
import 'dart:collection';
+import 'dart:convert';
import 'dart:core';
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/common_models/data_points.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
import 'package:hmg_patient_app_new/core/utils/date_util.dart';
+import 'package:hmg_patient_app_new/core/utils/loading_utils.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart' show Utils;
import 'package:hmg_patient_app_new/features/lab/lab_repo.dart';
+import 'package:hmg_patient_app_new/features/lab/models/ai_overview_labresult_model_payload.dart';
+import 'package:hmg_patient_app_new/features/lab/models/resp_models/ai_overview_labresults_by_ai_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/lab_result.dart';
+import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_order_response_by_ai_model.dart';
import 'package:hmg_patient_app_new/features/lab/models/resp_models/patient_lab_orders_response_model.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart';
import 'package:hmg_patient_app_new/presentation/lab/lab_results/lab_result_details.dart';
+import 'package:hmg_patient_app_new/presentation/labAiAnalysis/lab_ai_analysis_detailed_page.dart';
+import 'package:hmg_patient_app_new/services/cache_service.dart';
import 'package:hmg_patient_app_new/services/error_handler_service.dart';
import 'package:hmg_patient_app_new/services/navigation_service.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
@@ -53,20 +61,7 @@ class LabViewModel extends ChangeNotifier {
List mainLabResults = [];
List mainGraphPoints = [];
List filteredGraphValues = [];
- List months = [
- 'Jan',
- 'Feb',
- 'Mar',
- 'April',
- 'May',
- 'Jun',
- 'July',
- 'Aug',
- 'Sep',
- 'Oct',
- 'Nov',
- 'Dec'
- ];
+ List months = ['Jan', 'Feb', 'Mar', 'April', 'May', 'Jun', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
late List _labSuggestionsList = [];
@@ -86,22 +81,22 @@ class LabViewModel extends ChangeNotifier {
List> patientLabOrdersByHospital = [];
List> patientLabOrdersViewList = [];
- LabViewModel(
- {required this.labRepo,
- required this.errorHandlerService,
- required this.navigationService});
+ LabOrderResponseByAi? labOrderResponseByAi;
+ LabOrdersResponseByAi? labOrdersResponseByAi;
+
+ LabViewModel({required this.labRepo, required this.errorHandlerService, required this.navigationService});
initLabProvider() {
// if (isLabNeedToLoad) {
- patientLabOrders.clear();
- filteredLabOrders.clear();
- labOrderTests.clear();
- isLabOrdersLoading = true;
- isLabResultsLoading = true;
- patientLabOrdersByClinic.clear();
- patientLabOrdersByHospital.clear();
- patientLabOrdersViewList.clear();
- getPatientLabOrders();
+ patientLabOrders.clear();
+ filteredLabOrders.clear();
+ labOrderTests.clear();
+ isLabOrdersLoading = true;
+ isLabResultsLoading = true;
+ patientLabOrdersByClinic.clear();
+ patientLabOrdersByHospital.clear();
+ patientLabOrdersViewList.clear();
+ getPatientLabOrders();
// }
notifyListeners();
}
@@ -133,13 +128,13 @@ class LabViewModel extends ChangeNotifier {
final result = await labRepo.getPatientLabOrders();
result.fold(
- (failure) async {
- isLabOrdersLoading = false;
- isLabResultsLoading = false;
- notifyListeners();
- },
- // => await errorHandler_service.handleError(failure: failure),
- (apiResponse) {
+ (failure) async {
+ isLabOrdersLoading = false;
+ isLabResultsLoading = false;
+ notifyListeners();
+ },
+ // => await errorHandler_service.handleError(failure: failure),
+ (apiResponse) {
if (apiResponse.messageStatus == 2) {
// dialogService.showErrorDialog(message: apiResponse.errorMessage!, onOkPressed: () {});
} else if (apiResponse.messageStatus == 1) {
@@ -203,11 +198,7 @@ class LabViewModel extends ChangeNotifier {
}
filterSuggestions() {
- final List labels = patientLabOrders
- .expand((order) => order.testDetails ?? [])
- .map((detail) => detail.description)
- .whereType()
- .toList();
+ final List labels = patientLabOrders.expand((order) => order.testDetails ?? []).map((detail) => detail.description).whereType().toList();
_labSuggestionsList = labels.toSet().toList();
notifyListeners();
@@ -322,14 +313,12 @@ class LabViewModel extends ChangeNotifier {
);
}
- Future getPatientLabResultByHospital(
- PatientLabOrdersResponseModel laborder) async {
+ Future getPatientLabResultByHospital(PatientLabOrdersResponseModel laborder) async {
isLabResultByHospitalLoading = true;
notifyListeners();
mainLabResultsByHospitals.clear();
- final result = await labRepo.getPatientLabResultsByHospitals(laborder,
- Utils.isVidaPlusProject(int.parse(laborder.projectID ?? "0")));
+ final result = await labRepo.getPatientLabResultsByHospitals(laborder, Utils.isVidaPlusProject(int.parse(laborder.projectID ?? "0")));
result.fold(
(failure) async {
@@ -353,12 +342,9 @@ class LabViewModel extends ChangeNotifier {
mainLabResults.clear();
filteredGraphValues.clear();
maxY = double.negativeInfinity;
- minY = double.infinity;
- maxX = double.infinity;
- final result = await labRepo.getPatientLabResults(
- laborder,
- Utils.isVidaPlusProject(int.parse(laborder.projectID ?? "0")),
- procedureName);
+ minY = double.infinity;
+ maxX = double.infinity;
+ final result = await labRepo.getPatientLabResults(laborder, Utils.isVidaPlusProject(int.parse(laborder.projectID ?? "0")), procedureName);
result.fold(
(failure) async {
@@ -372,7 +358,6 @@ class LabViewModel extends ChangeNotifier {
var recentThree = sort(apiResponse.data!);
mainLabResults = recentThree;
-
double highRefrenceValue = double.negativeInfinity;
String? flagForHighReferenceRange;
double lowRefenceValue = double.infinity;
@@ -380,11 +365,10 @@ class LabViewModel extends ChangeNotifier {
recentThree.reversed.forEach((element) {
try {
- var dateTime =
- DateUtil.convertStringToDate(element.verifiedOnDateTime!);
+ var dateTime = DateUtil.convertStringToDate(element.verifiedOnDateTime!);
var resultValue = double.parse(element.resultValue!);
- var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag??"");
- if (resultValue>maxY) {
+ var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag ?? "");
+ if (resultValue > maxY) {
maxY = resultValue;
maxX = maxY;
}
@@ -401,14 +385,13 @@ class LabViewModel extends ChangeNotifier {
}
filteredGraphValues.add(DataPoint(
- value: transformedValue,
- actualValue:element.resultValue!,
- label: formatDateAsMMYY(dateTime),
- unitOfMeasurement: element.uOM,
- displayTime: resultDate(dateTime),
- time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
- referenceValue: element.calculatedResultFlag ?? "",
-
+ value: transformedValue,
+ actualValue: element.resultValue!,
+ label: formatDateAsMMYY(dateTime),
+ unitOfMeasurement: element.uOM,
+ displayTime: resultDate(dateTime),
+ time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
+ referenceValue: element.calculatedResultFlag ?? "",
));
} catch (e) {}
});
@@ -417,6 +400,10 @@ class LabViewModel extends ChangeNotifier {
lowRefenceValue = minY;
}
+ if (minY > lowRefenceValue) {
+ minY = lowRefenceValue - 25;
+ }
+
this.flagForHighReferenceRange = flagForHighReferenceRange;
this.flagForLowReferenceRange = flagForLowReferenceRange;
highTransformedReferenceValue = double.parse(transformValueInRange(highRefrenceValue, flagForHighReferenceRange ?? "").toStringAsFixed(1));
@@ -424,7 +411,7 @@ class LabViewModel extends ChangeNotifier {
this.highRefrenceValue = double.parse(highRefrenceValue.toStringAsFixed(1));
this.lowRefenceValue = double.parse(lowRefenceValue.toStringAsFixed(1));
- if(maxY< highRefrenceValue) {
+ if (maxY < highRefrenceValue) {
maxY = highRefrenceValue;
}
maxY += 25;
@@ -434,7 +421,9 @@ class LabViewModel extends ChangeNotifier {
checkIfGraphShouldBeDisplayed(recentResult);
recentResult.verifiedOn = resultDate(DateUtil.convertStringToDate(recentResult.verifiedOnDateTime!));
// filteredGraphValues = [filteredGraphValues.first];
- navigationService.push(MaterialPageRoute(
+ labOrderResponseByAi = null;
+ navigationService.push(
+ MaterialPageRoute(
builder: (_) => LabResultDetails(recentLabResult: recentResult, testDescription: testDescription),
),
);
@@ -444,14 +433,13 @@ class LabViewModel extends ChangeNotifier {
);
}
- void checkIfGraphShouldBeDisplayed(LabResult recentResult){
+ void checkIfGraphShouldBeDisplayed(LabResult recentResult) {
shouldShowGraph = recentResult.checkIfGraphShouldBeDisplayed();
isGraphVisible = shouldShowGraph;
notifyListeners();
}
- Future getPatientSpecialResult(
- PatientLabOrdersResponseModel laborder) async {
+ Future getPatientSpecialResult(PatientLabOrdersResponseModel laborder) async {
isSpecialResultsLoading = true;
labSpecialResult = "";
notifyListeners();
@@ -473,8 +461,7 @@ class LabViewModel extends ChangeNotifier {
StringBuffer htmlbuffer = StringBuffer("");
apiResponse.data?.forEach((element) {
- if(element.resultDataHTML != null && element.resultDataHTML?.isNotEmpty == true)
- htmlbuffer.write("${element.resultDataHTML}
");
+ if (element.resultDataHTML != null && element.resultDataHTML?.isNotEmpty == true) htmlbuffer.write("${element.resultDataHTML}
");
});
labSpecialResult = htmlbuffer.toString();
@@ -486,10 +473,8 @@ class LabViewModel extends ChangeNotifier {
);
}
- String resultDate(DateTime date){
-
-
- return '${date.day} ${months[date.month-1]},${date.year}';
+ String resultDate(DateTime date) {
+ return '${date.day} ${months[date.month - 1]},${date.year}';
}
double transformValueInRange(double inputValue, String flag) {
@@ -497,7 +482,7 @@ class LabViewModel extends ChangeNotifier {
double rangeStart, rangeEnd;
switch (flag) {
- case'LCL':
+ case 'LCL':
case 'CL':
rangeStart = 0.0;
rangeEnd = 19.0;
@@ -534,16 +519,17 @@ class LabViewModel extends ChangeNotifier {
debugPrint("the transformed value is $transformedValue");
return transformedValue;
}
+
void getSelectedDateRange(DateTime? start, DateTime? end) {
maxY = double.negativeInfinity;
- if(start == null && end == null) {
+ if (start == null && end == null) {
mainLabResults.forEach((element) {
final time = DateUtil.convertStringToDate(element.verifiedOnDateTime!);
- try{
+ try {
var resultValue = double.parse(element.resultValue!);
- var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag??"");
+ var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag ?? "");
if (resultValue > maxY) {
maxY = resultValue;
}
@@ -552,54 +538,43 @@ class LabViewModel extends ChangeNotifier {
actualValue: element.resultValue!,
label: formatDateAsMMYY(time),
unitOfMeasurement: element.uOM,
-
displayTime: resultDate(time),
time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
referenceValue: element.calculatedResultFlag ?? "",
));
- }catch(e){
-
- }
+ } catch (e) {}
});
-
- }else {
+ } else {
filteredGraphValues.clear();
mainLabResults.forEach((element) {
try {
- var dateTime =
- DateUtil.convertStringToDate(element.verifiedOnDateTime!);
+ var dateTime = DateUtil.convertStringToDate(element.verifiedOnDateTime!);
var resultValue = double.parse(element.resultValue!);
- var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag??"");
+ var transformedValue = transformValueInRange(double.parse(element.resultValue!), element.calculatedResultFlag ?? "");
if (resultValue > maxY) {
maxY = resultValue;
}
if (start != null && end == null) {
if (dateTime.isAtSameMomentAs(start)) {
-
filteredGraphValues.add(DataPoint(
value: transformedValue,
actualValue: element.resultValue!,
unitOfMeasurement: element.uOM,
-
label: formatDateAsMMYY(dateTime),
displayTime: resultDate(dateTime),
- time:
- DateUtil.convertStringToDate(element.verifiedOnDateTime),
+ time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
referenceValue: element.calculatedResultFlag ?? ""));
}
} else if (start != null && end != null) {
if ((dateTime.isAfter(start)) && (dateTime.isBefore(end))) {
-
filteredGraphValues.add(DataPoint(
value: transformedValue,
actualValue: element.resultValue!,
label: formatDateAsMMYY(dateTime),
unitOfMeasurement: element.uOM,
-
displayTime: resultDate(dateTime),
- time:
- DateUtil.convertStringToDate(element.verifiedOnDateTime),
+ time: DateUtil.convertStringToDate(element.verifiedOnDateTime),
referenceValue: element.calculatedResultFlag ?? ""));
}
}
@@ -608,16 +583,13 @@ class LabViewModel extends ChangeNotifier {
}
filteredGraphValues = sortFilteredList(filteredGraphValues).reversed.toList();
-
notifyListeners();
}
String formatDateAsMMYY(DateTime date) {
-
- return '${months[date.month-1]}, ${date.year}';
+ return '${months[date.month - 1]}, ${date.year}';
}
-
List sortByFlagAndValue(List original) {
const priorityOrder = ['LCL', 'CL', 'L', 'N', 'H', 'CH', 'HCH'];
@@ -651,7 +623,6 @@ class LabViewModel extends ChangeNotifier {
}
List sort(List original) {
-
final copy = List.from(original);
copy.sort((a, b) {
final aDate = DateUtil.convertStringToDate(a.verifiedOnDateTime);
@@ -666,8 +637,6 @@ class LabViewModel extends ChangeNotifier {
}
List sortFilteredList(List original) {
-
-
final copy = List.from(original);
copy.sort((a, b) {
final aDate = a.time;
@@ -702,7 +671,7 @@ class LabViewModel extends ChangeNotifier {
}
}
- String getFormattedDate(DateTime date){
+ String getFormattedDate(DateTime date) {
return DateFormat('EEEE, dd MMMM. yyyy').format(date);
}
@@ -716,7 +685,7 @@ class LabViewModel extends ChangeNotifier {
case 'N':
return AppAssets.ic_normal_result;
case 'H':
- return AppAssets.ic_low_result;
+ return AppAssets.ic_low_result;
case 'CH':
case 'HCH':
return AppAssets.ic_critical_low_result;
@@ -758,8 +727,81 @@ class LabViewModel extends ChangeNotifier {
}
}
- alterGraphVisibility(){
+ alterGraphVisibility() {
isGraphVisible = !isGraphVisible;
notifyListeners();
}
+
+ Future getAiOverviewLabOrders({required PatientLabOrdersResponseModel labOrder, required String loadingText}) async {
+ // LoadingUtils.showFullScreenLoader(loadingText: "Loading and analysing your data,\nPlease be patient and let the AI do the magic. \nPlease be patient, This might take some time.");
+ LoadingUtils.showFullScreenLoader(loadingText: loadingText);
+ List