completed till otp receiving

pull/12/head
faizatflutter 2 months ago
parent 702c504d4e
commit 26f0ffda2c

@ -735,10 +735,6 @@ class ApiConsts {
static num VERSION_ID = 18.9; static num VERSION_ID = 18.9;
static final String selectDeviceImei = 'Services/Patients.svc/REST/Patient_SELECTDeviceIMEIbyIMEI';
static final String sendActivationCode = 'Services/Authentication.svc/REST/SendActivationCodebyOTPNotificationType';
static setBackendURLs() { static setBackendURLs() {
switch (appEnvironmentType) { switch (appEnvironmentType) {
case AppEnvironmentTypeEnum.prod: case AppEnvironmentTypeEnum.prod:

@ -1,6 +1,5 @@
import 'dart:developer';
import 'dart:convert'; import 'dart:convert';
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_export.dart'; import 'package:hmg_patient_app_new/core/app_export.dart';

@ -45,7 +45,7 @@ class InsuranceRepoImp implements InsuranceRepo {
onFailure: (error, statusCode, {messageStatus, failureType}) { onFailure: (error, statusCode, {messageStatus, failureType}) {
failure = failureType; failure = failureType;
}, },
onSuccess: (response, statusCode, {messageStatus}) { onSuccess: (response, statusCode, {messageStatus, errorMessage}) {
try { try {
final list = response['List_PatientInsuranceCard']; final list = response['List_PatientInsuranceCard'];
if (list == null || list.isEmpty) { if (list == null || list.isEmpty) {

@ -24,10 +24,10 @@ class LoginScreen extends StatefulWidget {
const LoginScreen({super.key}); const LoginScreen({super.key});
@override @override
_LoginScreen createState() => _LoginScreen(); LoginScreenState createState() => LoginScreenState();
} }
class _LoginScreen extends State<LoginScreen> { class LoginScreenState extends State<LoginScreen> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -160,12 +160,12 @@ class _LoginScreen extends State<LoginScreen> {
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: SingleChildScrollView( child: SingleChildScrollView(
child: GenericBottomSheet( child: GenericBottomSheet(
countryCode: authVM.selectedCountrySignup.countryCode, countryCode: authViewModel.selectedCountrySignup.countryCode,
initialPhoneNumber: "", initialPhoneNumber: "",
textController: phoneNumberController, textController: phoneNumberController,
isEnableCountryDropdown: true, isEnableCountryDropdown: true,
onCountryChange: authVM.onCountryChange, onCountryChange: authViewModel.onCountryChange,
onChange: authVM.onPhoneNumberChange, onChange: authViewModel.onPhoneNumberChange,
buttons: [ buttons: [
Padding( Padding(
padding: EdgeInsets.only(bottom: 10.h), padding: EdgeInsets.only(bottom: 10.h),

@ -223,10 +223,7 @@ class _RegisterNew extends State<RegisterNew> {
child: CustomButton( child: CustomButton(
text: LocaleKeys.sendOTPSMS.tr(), text: LocaleKeys.sendOTPSMS.tr(),
onPressed: () { onPressed: () {
Navigator.of(context).push(MaterialPageRoute( Navigator.of(context).push(MaterialPageRoute(builder: (BuildContext context) => OTPVerificationPage(phoneNumber: '12234567')));
builder: (BuildContext context) => OTPVerificationPage(
phoneNumber: '12234567',
)));
// if (mobileNo.isEmpty) { // if (mobileNo.isEmpty) {
// context.showBottomSheet( // context.showBottomSheet(

@ -1,15 +1,12 @@
import 'dart:convert';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get_it/get_it.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart'; import 'package:hmg_patient_app_new/core/app_assets.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/common_models/nationality_country_model.dart'; import 'package:hmg_patient_app_new/core/common_models/nationality_country_model.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/enums.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart'; import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/extensions/context_extensions.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.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/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart'; import 'package:hmg_patient_app_new/features/authentication/authentication_view_model.dart';
@ -112,8 +109,8 @@ class _RegisterNew extends State<RegisterNewStep2> {
labelText: LocaleKeys.gender.tr(), labelText: LocaleKeys.gender.tr(),
hintText: LocaleKeys.malE.tr(), hintText: LocaleKeys.malE.tr(),
isEnable: true, isEnable: true,
dropdownItems: GenderTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(), dropdownItems: GenderTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: genderType != null ? (appState!.isArabic() ? genderType!.typeAr : genderType!.type) : "", selectedValue: genderType != null ? (appState.isArabic() ? genderType.typeAr : genderType.type) : "",
onChange: authVM.onGenderChange, onChange: authVM.onGenderChange,
isBorderAllowed: false, isBorderAllowed: false,
hasSelectionCustomIcon: true, hasSelectionCustomIcon: true,
@ -147,8 +144,8 @@ class _RegisterNew extends State<RegisterNewStep2> {
labelText: LocaleKeys.maritalStatus.tr(), labelText: LocaleKeys.maritalStatus.tr(),
hintText: LocaleKeys.married.tr(), hintText: LocaleKeys.married.tr(),
isEnable: true, isEnable: true,
dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState!.isArabic() ? e.typeAr : e.type).toList(), dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: maritalStatus != null ? (appState!.isArabic() ? maritalStatus.typeAr : maritalStatus.type) : "", selectedValue: maritalStatus != null ? (appState.isArabic() ? maritalStatus.typeAr : maritalStatus.type) : "",
onChange: authVM.onMaritalStatusChange, onChange: authVM.onMaritalStatusChange,
isBorderAllowed: false, isBorderAllowed: false,
hasSelectionCustomIcon: true, hasSelectionCustomIcon: true,
@ -161,7 +158,7 @@ class _RegisterNew extends State<RegisterNewStep2> {
) )
: TextInputWidget( : TextInputWidget(
labelText: LocaleKeys.maritalStatus.tr(), labelText: LocaleKeys.maritalStatus.tr(),
hintText: appState!.isArabic() hintText: appState.isArabic()
? (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.typeAr) ? (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.typeAr)
: (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.type), : (MaritalStatusTypeExtension.fromValue(widget.nHICData!.maritalStatusCode)!.type),
isEnable: true, isEnable: true,

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save