Merge pull request 'dev_aamir' (#176) from dev_aamir into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/176
pull/179/head
Haroon6138 1 month ago
commit df3b36eb00

@ -1527,4 +1527,7 @@
"bmi": "مؤشر كتلة الجسم", "bmi": "مؤشر كتلة الجسم",
"yesPleaseINeedHelp": "نعم، من فضلك أريد المساعدة", "yesPleaseINeedHelp": "نعم، من فضلك أريد المساعدة",
"noThanksIKnowTheClinic": "لا شكراً، أعرف العيادة" "noThanksIKnowTheClinic": "لا شكراً، أعرف العيادة"
"unableToSendOTP": "تعذر إرسال رمز التحقق لمرة واحدة"
} }

@ -1518,5 +1518,8 @@
"bmi": "BMI", "bmi": "BMI",
"yesPleaseINeedHelp": "Yes, Please I need help", "yesPleaseINeedHelp": "Yes, Please I need help",
"noThanksIKnowTheClinic": "No, Thanks. I Know the clinic" "noThanksIKnowTheClinic": "No, Thanks. I Know the clinic"
"unableToSendOTP": "Unable to send Verification OTP"
} }

@ -432,6 +432,15 @@ class AuthenticationViewModel extends ChangeNotifier {
} else { } else {
// TODO: Handle isSMSSent false // TODO: Handle isSMSSent false
// navigateToOTPScreen(otpTypeEnum: otpTypeEnum, phoneNumber: phoneNumber); // navigateToOTPScreen(otpTypeEnum: otpTypeEnum, phoneNumber: phoneNumber);
if (isFormFamilyFile) {
LoaderBottomSheet.hideLoader();
await _dialogService.showCommonBottomSheetWithoutH(
message: LocaleKeys.unableToSendOTP.tr(),
label: LocaleKeys.notice.tr(),
onOkPressed: () {
_navigationService.pop();
});
}
} }
} }
}, },

@ -1514,5 +1514,6 @@ abstract class LocaleKeys {
static const bmi = 'bmi'; static const bmi = 'bmi';
static const yesPleaseINeedHelp = 'yesPleaseINeedHelp'; static const yesPleaseINeedHelp = 'yesPleaseINeedHelp';
static const noThanksIKnowTheClinic = 'noThanksIKnowTheClinic'; static const noThanksIKnowTheClinic = 'noThanksIKnowTheClinic';
static const unableToSendOTP = 'unableToSendOTP';
} }

@ -42,6 +42,8 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
medicalVM = context.read<MedicalFileViewModel>(); medicalVM = context.read<MedicalFileViewModel>();
WidgetsBinding.instance.addPostFrameCallback((_) { WidgetsBinding.instance.addPostFrameCallback((_) {
medicalVM?.onFamilyFileTabChange(0); medicalVM?.onFamilyFileTabChange(0);
medicalVM?.getAllPendingRecordsByResponseId();
}); });
} }
@ -73,7 +75,7 @@ class _FamilyMedicalScreenState extends State<FamilyMedicalScreen> {
icon: AppAssets.add_icon, icon: AppAssets.add_icon,
fontSize: 16.f, fontSize: 16.f,
borderRadius: 12.r, borderRadius: 12.r,
fontWeight: FontWeight.w500)) fontWeight: FontWeight.w500)).paddingOnly(bottom: 20.h)
: SizedBox(), : SizedBox(),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

@ -321,7 +321,7 @@ class _FamilyCardsState extends State<FamilyCards> {
: Expanded( : Expanded(
child: CustomButton( child: CustomButton(
height: 40.h, height: 40.h,
text: LocaleKeys.confirm.tr(), text: LocaleKeys.acceptLbl.tr(),
onPressed: () { onPressed: () {
navigationService.pop(); navigationService.pop();
widget.onSelect(profile); widget.onSelect(profile);
@ -329,6 +329,7 @@ class _FamilyCardsState extends State<FamilyCards> {
backgroundColor: AppColors.lightGreenButtonColor, backgroundColor: AppColors.lightGreenButtonColor,
borderColor: AppColors.lightGreenButtonColor, borderColor: AppColors.lightGreenButtonColor,
textColor: AppColors.textGreenColor, textColor: AppColors.textGreenColor,
borderWidth: 0,
icon: null, icon: null,
), ),
), ),
@ -336,7 +337,7 @@ class _FamilyCardsState extends State<FamilyCards> {
Expanded( Expanded(
child: CustomButton( child: CustomButton(
height: 40.h, height: 40.h,
text: profile.status == FamilyFileEnum.active.toInt ? LocaleKeys.removeMember.tr() : LocaleKeys.cancel.tr(), text: profile.status == FamilyFileEnum.active.toInt ? LocaleKeys.removeMember.tr() : LocaleKeys.rejectView.tr(),
onPressed: () { onPressed: () {
navigationService.pop(); navigationService.pop();
widget.onRemove(profile); widget.onRemove(profile);

Loading…
Cancel
Save