Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan

Browse Source 
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
pull/20/head
Sultan khan 2 months ago
parent b4667f5c94 ffb399c704
commit 9f0fb27baf
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File

18
lib/features/authentication/authentication_view_model.dart
Unescape Escape View File

@ -53,7 +53,7 @@ class AuthenticationViewModel extends ChangeNotifier {
_authenticationRepo = authenticationRepo, _authenticationRepo = authenticationRepo,
_localAuthService = localAuthService; _localAuthService = localAuthService;
final TextEditingController nationalIdController = TextEditingController(), phoneNumberController = TextEditingController(), dobController = TextEditingController(); final TextEditingController nationalIdController = TextEditingController(), phoneNumberController = TextEditingController(), dobController = TextEditingController(), nameController = TextEditingController(), emailController = TextEditingController();
CountryEnum selectedCountrySignup = CountryEnum.saudiArabia; CountryEnum selectedCountrySignup = CountryEnum.saudiArabia;
MaritalStatusTypeEnum? maritalStatus; MaritalStatusTypeEnum? maritalStatus;
GenderTypeEnum? genderType; GenderTypeEnum? genderType;
@ -543,7 +543,7 @@ class AuthenticationViewModel extends ChangeNotifier {
}); });
} }
Future<void> onRegisterPress({required OTPTypeEnum otpTypeEnum}) async { Future<void> onRegistrationStart({required OTPTypeEnum otpTypeEnum}) async {
bool isOutSidePatient = selectedCountrySignup.countryCode == CountryEnum.unitedArabEmirates.countryCode ? true : false; bool isOutSidePatient = selectedCountrySignup.countryCode == CountryEnum.unitedArabEmirates.countryCode ? true : false;
final request = await RequestUtils.getPatientAuthenticationRequest( final request = await RequestUtils.getPatientAuthenticationRequest(
@ -574,6 +574,20 @@ class AuthenticationViewModel extends ChangeNotifier {
}); });
} }
Future<void> onRegistrationComplete() async{
// if (emailAddress.text.isEmpty) {
// Utils.showErrorToast(TranslationBase.of(context).enterEmailAddress);
// return;
// } else {
// Navigator.of(context).pop();
// registerNow();
// }
//authVM!.clearDefaultInputValues();
}
Future<void> checkUserStatusForRegistration({required dynamic response, required dynamic request}) async { Future<void> checkUserStatusForRegistration({required dynamic response, required dynamic request}) async {
if (response is Map) { if (response is Map) {
_appState.setAppAuthToken = response["LogInTokenID"]; _appState.setAppAuthToken = response["LogInTokenID"];

4
lib/presentation/authentication/register.dart
Unescape Escape View File

@ -222,7 +222,7 @@ class _RegisterNew extends State<RegisterNew> {
child: CustomButton( child: CustomButton(
text: LocaleKeys.sendOTPSMS.tr(), text: LocaleKeys.sendOTPSMS.tr(),
onPressed: () async { onPressed: () async {
await authVM.onRegisterPress(otpTypeEnum: OTPTypeEnum.sms); await authVM.onRegistrationStart(otpTypeEnum: OTPTypeEnum.sms);
}, },
backgroundColor: AppColors.primaryRedColor, backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedBorderColor, borderColor: AppColors.primaryRedBorderColor,
@ -245,7 +245,7 @@ class _RegisterNew extends State<RegisterNew> {
child: CustomButton( child: CustomButton(
text: LocaleKeys.sendOTPWHATSAPP.tr(), text: LocaleKeys.sendOTPWHATSAPP.tr(),
onPressed: () async { onPressed: () async {
await authVM.onRegisterPress(otpTypeEnum: OTPTypeEnum.whatsapp); await authVM.onRegistrationStart(otpTypeEnum: OTPTypeEnum.whatsapp);
}, },
backgroundColor: AppColors.whiteColor, backgroundColor: AppColors.whiteColor,
borderColor: AppColors.borderOnlyColor, borderColor: AppColors.borderOnlyColor,

14
lib/presentation/authentication/register_step2.dart
Unescape Escape View File

@ -37,7 +37,6 @@ class _RegisterNew extends State<RegisterNewStep2> {
@override @override
void dispose() { void dispose() {
super.dispose(); super.dispose();
// authVM!.clearDefaultInputValues();
} }
@override @override
@ -67,8 +66,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
children: [ children: [
TextInputWidget( TextInputWidget(
labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(), labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
hintText: hintText: authVM!.isUserFromUAE() ? "" : ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}"),
authVM!.isUserFromUAE() ? "" : ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}"),
controller: authVM!.isUserFromUAE() ? authVM!.nameController : null, controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
isEnable: true, isEnable: true,
prefix: null, prefix: null,
@ -319,7 +317,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom), padding: EdgeInsets.only(bottom: MediaQuery.of(bottomSheetContext).viewInsets.bottom),
child: SingleChildScrollView( child: SingleChildScrollView(
child: GenericBottomSheet( child: GenericBottomSheet(
textController: TextEditingController(), textController: authVM!.emailController,
isForEmail: true, isForEmail: true,
buttons: [ buttons: [
Padding( Padding(
@ -327,13 +325,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
child: CustomButton( child: CustomButton(
text: LocaleKeys.submit, text: LocaleKeys.submit,
onPressed: () { onPressed: () {
// if (emailAddress.text.isEmpty) { authVM!.onRegistrationComplete();
// Utils.showErrorToast(TranslationBase.of(context).enterEmailAddress);
// return;
// } else {
// Navigator.of(context).pop();
// registerNow();
// }
}, },
backgroundColor: AppColors.bgGreenColor, backgroundColor: AppColors.bgGreenColor,
borderColor: AppColors.bgGreenColor, borderColor: AppColors.bgGreenColor,

Write Preview
Loading…
Cancel
Save