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

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/313
master
Haroon6138 1 day ago
commit 8f76503bd7

@ -915,8 +915,10 @@ class HmgServicesViewModel extends ChangeNotifier {
if (apiResponse.messageStatus == 1) { if (apiResponse.messageStatus == 1) {
vitalSignList = apiResponse.data ?? []; vitalSignList = apiResponse.data ?? [];
hasVitalSignDataLoaded = true; hasVitalSignDataLoaded = true;
if (vitalSignList.isNotEmpty) {
getIt.get<SymptomsCheckerViewModel>().setSelectedHeight(vitalSignList.first.heightCm); getIt.get<SymptomsCheckerViewModel>().setSelectedHeight(vitalSignList.first.heightCm);
getIt.get<SymptomsCheckerViewModel>().setSelectedWeight(vitalSignList.first.weightKg); getIt.get<SymptomsCheckerViewModel>().setSelectedWeight(vitalSignList.first.weightKg);
}
notifyListeners(); notifyListeners();
if (onSuccess != null) { if (onSuccess != null) {
onSuccess(apiResponse); onSuccess(apiResponse);

@ -248,7 +248,7 @@ class _OtherDetailsStepState extends State<OtherDetailsStep> {
child: Consumer<HabibWalletViewModel>( child: Consumer<HabibWalletViewModel>(
builder: (context, habibWalletVM, child) { builder: (context, habibWalletVM, child) {
final hospitals = habibWalletVM.advancePaymentHospitals; final hospitals = habibWalletVM.advancePaymentHospitals;
if (hospitals == null || hospitals.isEmpty) { if (hospitals.isEmpty) {
return const Center( return const Center(
child: Padding( child: Padding(
padding: EdgeInsets.all(16.0), padding: EdgeInsets.all(16.0),
@ -289,19 +289,15 @@ class _OtherDetailsStepState extends State<OtherDetailsStep> {
} }
void _addMedicalReport(String image, File file, ReferralFormManager formManager) { void _addMedicalReport(String image, File file, ReferralFormManager formManager) {
// Max 1 file // Remove max 1 file check
// if (formManager.formData.medicalReportImages.isNotEmpty) {
// formManager.setFieldError('medicalReport', LocaleKeys.maxOneFileAllowed.tr(context: context));
// return;
// }
// Max 1 MB // Max 1 MB
final fileSizeInBytes = file.lengthSync(); final fileSizeInBytes = file.lengthSync();
if (fileSizeInBytes > 1 * 1024 * 1024) { if (fileSizeInBytes > 1 * 1024 * 1024) {
formManager.setFieldError('medicalReport', LocaleKeys.fileSizeExceedsLimit.tr(context: context)); formManager.setFieldError('medicalReport', 'File size exceeds 1MB limit.');
return; return;
} }
final newAttachment = EReferralAttachment( final newAttachment = EReferralAttachment(
fileName: 'medical_report_${formManager.formData.medicalReportImages.length + 1}.png', fileName: 'medical_report_formManager.formData.medicalReportImages.length + 1}.png',
base64String: image base64String: image
); );
@ -315,19 +311,15 @@ class _OtherDetailsStepState extends State<OtherDetailsStep> {
} }
void _addInsuranceDocument(String image, File file, ReferralFormManager formManager) { void _addInsuranceDocument(String image, File file, ReferralFormManager formManager) {
// Max 1 file // Remove max 1 file check
if (formManager.formData.insuredPatientImages.isNotEmpty) {
formManager.setFieldError('insuredDocument', LocaleKeys.maxOneFileAllowed.tr(context: context));
return;
}
// Max 1 MB // Max 1 MB
final fileSizeInBytes = file.lengthSync(); final fileSizeInBytes = file.lengthSync();
if (fileSizeInBytes > 1 * 1024 * 1024) { if (fileSizeInBytes > 1 * 1024 * 1024) {
formManager.setFieldError('insuredDocument', LocaleKeys.fileSizeExceedsLimit.tr(context: context)); formManager.setFieldError('insuredDocument', 'File size exceeds 1MB limit.');
return; return;
} }
final newAttachment = EReferralAttachment( final newAttachment = EReferralAttachment(
fileName: 'insurance_${formManager.formData.insuredPatientImages.length + 1}.png', fileName: 'insurance_formManager.formData.insuredPatientImages.length + 1}.png',
base64String: image base64String: image
); );

Loading…
Cancel
Save