diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart index 17707250..20e60f5a 100644 --- a/lib/core/app_assets.dart +++ b/lib/core/app_assets.dart @@ -232,6 +232,8 @@ class AppAssets { static const String general_health = '$svgBasePath/general_health.svg'; static const String women_health = '$svgBasePath/women_health.svg'; static const String add_new_family_icon = '$svgBasePath/add_new_family_icon.svg'; + static const String h_calc = '$svgBasePath/h_calc.svg'; + static const String h_calc_selected = '$svgBasePath/h_calc_selected.svg'; static const String height = '$svgBasePath/height.svg'; static const String weight = '$svgBasePath/weight.svg'; diff --git a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart index 99cd0dec..23c0c07b 100644 --- a/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart +++ b/lib/presentation/book_appointment/livecare/immediate_livecare_pending_request_page.dart @@ -163,7 +163,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State { physics: const NeverScrollableScrollPhysics(), children: [ const LandingPage(), - appState.isAuthenticated ? MedicalFilePage(showBackIcon: false) : /* need add feedback page */ FeedbackPage(), + appState.isAuthenticated ? MedicalFilePage(showBackIcon: false) : /* need add feedback page */ HealthCalculatorsPage(type: HealthCalConEnum.calculator), SizedBox(), // const ToDoPage(), // appState.isAuthenticated ? UserInfoSelectionScreen() : /* need add news page */ SizedBox(), diff --git a/lib/presentation/symptoms_checker/triage_screen.dart b/lib/presentation/symptoms_checker/triage_screen.dart index c839365c..13715c71 100644 --- a/lib/presentation/symptoms_checker/triage_screen.dart +++ b/lib/presentation/symptoms_checker/triage_screen.dart @@ -64,10 +64,10 @@ class _TriagePageState extends State { void _handleTriageResponse() { // Case 1: Emergency evidence detected - if (viewModel.hasEmergencyEvidence) { - _showEmergencyDialog(); - return; - } + // if (viewModel.hasEmergencyEvidence) { + // _showEmergencyDialog(); + // return; + // } // Get the highest probability condition final conditions = viewModel.currentConditions ?? []; @@ -80,7 +80,7 @@ class _TriagePageState extends State { } // Case 2: Should stop flag is true OR Case 3: Probability >= 70% OR Case 4: 7 or more questions answered - if (viewModel.shouldStopTriage || highestProbability >= 70.0 || viewModel.triageQuestionCount >= 30) { + if (highestProbability >= 70.0 || viewModel.triageQuestionCount >= 30) { // Navigate to results/possible conditions screen context.navigateWithName(AppRoutes.possibleConditionsPage); return; diff --git a/lib/widgets/bottom_navigation/bottom_navigation.dart b/lib/widgets/bottom_navigation/bottom_navigation.dart index fe586fe4..2401def4 100644 --- a/lib/widgets/bottom_navigation/bottom_navigation.dart +++ b/lib/widgets/bottom_navigation/bottom_navigation.dart @@ -23,7 +23,7 @@ class BottomNavigation extends StatelessWidget { BottomNavItem(icon: AppAssets.homeBottom, fillIcon: AppAssets.homeBottomFill, label: LocaleKeys.home.tr(context: context)), appState.isAuthenticated ? BottomNavItem(icon: AppAssets.myFilesBottom, fillIcon: AppAssets.myFilesBottomFill, label: LocaleKeys.medicalFile.tr(context: context)) - : BottomNavItem(icon: AppAssets.feedback, fillIcon: AppAssets.feedbackFill, label: LocaleKeys.feedback.tr()), + : BottomNavItem(icon: AppAssets.h_calc, fillIcon: AppAssets.h_calc_selected, label: LocaleKeys.healthTools.tr()), BottomNavItem( icon: AppAssets.bookAppoBottom, fillIcon: AppAssets.bookAppoBottom,