Merge pull request 'dev_sultan' (#276) from dev_sultan into master

Reviewed-on: #276
haroon_dev
khansultan1 11 hours ago
commit 855a4e1032

@ -232,6 +232,8 @@ class AppAssets {
static const String general_health = '$svgBasePath/general_health.svg'; static const String general_health = '$svgBasePath/general_health.svg';
static const String women_health = '$svgBasePath/women_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 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 height = '$svgBasePath/height.svg';
static const String weight = '$svgBasePath/weight.svg'; static const String weight = '$svgBasePath/weight.svg';

@ -163,7 +163,7 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
CustomButton( CustomButton(
text: LocaleKeys.startLiveChat.tr(), text: LocaleKeys.startLiveChat.tr(),
onPressed: () async { onPressed: () async {
launchUrl(Uri.parse("https://chat.hmg.com/geneysChat/Index.aspx?RequestedId=44A515DF-E668-46B5-BD76-D7747D9C7308"));
}, },
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedColor,

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_state.dart'; import 'package:hmg_patient_app_new/core/app_state.dart';
import 'package:hmg_patient_app_new/core/dependencies.dart'; import 'package:hmg_patient_app_new/core/dependencies.dart';
import 'package:hmg_patient_app_new/core/enums.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart';
import 'package:hmg_patient_app_new/extensions/route_extensions.dart'; import 'package:hmg_patient_app_new/extensions/route_extensions.dart';
import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart'; import 'package:hmg_patient_app_new/features/book_appointments/book_appointments_view_model.dart';
@ -12,6 +13,8 @@ import 'package:hmg_patient_app_new/presentation/medical_file/medical_file_page.
import 'package:hmg_patient_app_new/routes/app_routes.dart'; import 'package:hmg_patient_app_new/routes/app_routes.dart';
import 'package:hmg_patient_app_new/widgets/bottom_navigation/bottom_navigation.dart'; import 'package:hmg_patient_app_new/widgets/bottom_navigation/bottom_navigation.dart';
import '../health_calculators_and_converts/health_calculators_page.dart';
class LandingNavigation extends StatefulWidget { class LandingNavigation extends StatefulWidget {
const LandingNavigation({super.key}); const LandingNavigation({super.key});
@ -32,7 +35,7 @@ class _LandingNavigationState extends State<LandingNavigation> {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
children: [ children: [
const LandingPage(), 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(), SizedBox(),
// const ToDoPage(), // const ToDoPage(),
// appState.isAuthenticated ? UserInfoSelectionScreen() : /* need add news page */ SizedBox(), // appState.isAuthenticated ? UserInfoSelectionScreen() : /* need add news page */ SizedBox(),

@ -64,10 +64,10 @@ class _TriagePageState extends State<TriagePage> {
void _handleTriageResponse() { void _handleTriageResponse() {
// Case 1: Emergency evidence detected // Case 1: Emergency evidence detected
if (viewModel.hasEmergencyEvidence) { // if (viewModel.hasEmergencyEvidence) {
_showEmergencyDialog(); // _showEmergencyDialog();
return; // return;
} // }
// Get the highest probability condition // Get the highest probability condition
final conditions = viewModel.currentConditions ?? []; final conditions = viewModel.currentConditions ?? [];
@ -80,7 +80,7 @@ class _TriagePageState extends State<TriagePage> {
} }
// Case 2: Should stop flag is true OR Case 3: Probability >= 70% OR Case 4: 7 or more questions answered // 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 // Navigate to results/possible conditions screen
context.navigateWithName(AppRoutes.possibleConditionsPage); context.navigateWithName(AppRoutes.possibleConditionsPage);
return; return;

@ -23,7 +23,7 @@ class BottomNavigation extends StatelessWidget {
BottomNavItem(icon: AppAssets.homeBottom, fillIcon: AppAssets.homeBottomFill, label: LocaleKeys.home.tr(context: context)), BottomNavItem(icon: AppAssets.homeBottom, fillIcon: AppAssets.homeBottomFill, label: LocaleKeys.home.tr(context: context)),
appState.isAuthenticated appState.isAuthenticated
? BottomNavItem(icon: AppAssets.myFilesBottom, fillIcon: AppAssets.myFilesBottomFill, label: LocaleKeys.medicalFile.tr(context: context)) ? 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( BottomNavItem(
icon: AppAssets.bookAppoBottom, icon: AppAssets.bookAppoBottom,
fillIcon: AppAssets.bookAppoBottom, fillIcon: AppAssets.bookAppoBottom,

Loading…
Cancel
Save