From 6e71aa7f13a516054ba399a6ee6b8e0e63fe2a7c Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Mon, 9 Mar 2026 12:39:05 +0300 Subject: [PATCH] updates & fixes --- lib/core/api/api_client.dart | 2 +- lib/features/lab/lab_view_model.dart | 5 ++++- .../widgets/ask_doctor_request_type_select.dart | 1 + .../widgets/ask_doctor_appointment_card.dart | 13 ++++++++++++- lib/presentation/authentication/login.dart | 6 ++++-- lib/widgets/bottomsheet/exception_bottom_sheet.dart | 2 +- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart index 106b8fd4..b17db626 100644 --- a/lib/core/api/api_client.dart +++ b/lib/core/api/api_client.dart @@ -195,7 +195,7 @@ class ApiClientImp implements ApiClient { } // body['TokenID'] = "@dm!n"; - // body['PatientID'] = 4772997; + // body['PatientID'] = 4773715; // body['PatientTypeID'] = 1; // body['PatientOutSA'] = 0; // body['SessionID'] = "45786230487560q"; diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart index cd062b9e..07cbbde3 100644 --- a/lib/features/lab/lab_view_model.dart +++ b/lib/features/lab/lab_view_model.dart @@ -527,7 +527,10 @@ class LabViewModel extends ChangeNotifier { rangeEnd = 100.0; break; default: - throw ArgumentError('Invalid flag: $flag'); + rangeStart = 40.0; + rangeEnd = 59.0; + break; + // throw ArgumentError('Invalid flag: $flag'); } // Clamp input value to 0-100 and map it to the range bounds diff --git a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart index 376c27a9..3002c1c9 100644 --- a/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart +++ b/lib/presentation/appointments/widgets/ask_doctor_request_type_select.dart @@ -5,6 +5,7 @@ import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/utils.dart'; import 'package:hmg_patient_app_new/extensions/string_extensions.dart'; import 'package:hmg_patient_app_new/extensions/widget_extensions.dart'; +import 'package:hmg_patient_app_new/features/ask_doctor/models/ask_doctor_appointments_list.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/ask_doctor_request_type_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/patient_appointment_history_response_model.dart'; import 'package:hmg_patient_app_new/features/my_appointments/my_appointments_view_model.dart'; diff --git a/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart b/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart index e4185e72..d58b75e9 100644 --- a/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart +++ b/lib/presentation/ask_doctor/widgets/ask_doctor_appointment_card.dart @@ -171,7 +171,18 @@ class AskDoctorAppointmentCard extends StatelessWidget { child: AskDoctorRequestTypeSelect( askDoctorRequestTypeList: myAppointmentsViewModel.askDoctorRequestTypeList, myAppointmentsViewModel: myAppointmentsViewModel, - patientAppointmentHistoryResponseModel: PatientAppointmentHistoryResponseModel() + patientAppointmentHistoryResponseModel: PatientAppointmentHistoryResponseModel( + appointmentNo: askDoctorAppointmentHistoryList.appointmentNo, + doctorID: askDoctorAppointmentHistoryList.doctorID!, + doctorName: askDoctorAppointmentHistoryList.doctorName!, + doctorTitle: askDoctorAppointmentHistoryList.doctorTitle!, + doctorImageURL: askDoctorAppointmentHistoryList.doctorImageURL!, + clinicID: askDoctorAppointmentHistoryList.clinicID!, + clinicName: askDoctorAppointmentHistoryList.clinicName!, + projectID: askDoctorAppointmentHistoryList.projectID!, + projectName: askDoctorAppointmentHistoryList.projectName!, + appointmentDate: askDoctorAppointmentHistoryList.appointmentDate!, + ), // myAppointmentsVM.patientAppointmentsHistoryList[index], ), callBackFunc: () {}, diff --git a/lib/presentation/authentication/login.dart b/lib/presentation/authentication/login.dart index 9f64bde4..28b47304 100644 --- a/lib/presentation/authentication/login.dart +++ b/lib/presentation/authentication/login.dart @@ -188,7 +188,8 @@ class LoginScreenState extends State { }, backgroundColor: AppColors.primaryRedColor, borderColor: AppColors.primaryRedBorderColor, - textColor: AppColors.whiteColor, + textColor: Colors.white, + iconColor: Colors.white, icon: AppAssets.message, ), ), @@ -219,9 +220,10 @@ class LoginScreenState extends State { }, backgroundColor: Colors.white, borderColor: AppColors.borderOnlyColor, - textColor: AppColors.textColor, + textColor: AppColors.whiteColor, icon: AppAssets.whatsapp, iconColor: null, + applyThemeColor: false, ), ), ], diff --git a/lib/widgets/bottomsheet/exception_bottom_sheet.dart b/lib/widgets/bottomsheet/exception_bottom_sheet.dart index 16531bdb..ea5f8d83 100644 --- a/lib/widgets/bottomsheet/exception_bottom_sheet.dart +++ b/lib/widgets/bottomsheet/exception_bottom_sheet.dart @@ -47,7 +47,7 @@ class _ExceptionBottomSheetState extends State { child: Container( padding: EdgeInsets.all(24.h), decoration: BoxDecoration( - color: Color(0xFFF8F8FA), + color: AppColors.whiteColor, borderRadius: const BorderRadius.vertical(top: Radius.circular(16)), ), child: Column(