diff --git a/lib/models/Authentication/register_user_requet.dart b/lib/models/Authentication/register_user_requet.dart index ebefcfcf..7758ce5b 100644 --- a/lib/models/Authentication/register_user_requet.dart +++ b/lib/models/Authentication/register_user_requet.dart @@ -76,6 +76,9 @@ class Patientobject { String firstName; String middleName; String lastName; + String firstNameN; + String middleNameN; + String lastNameN; dynamic strDateofBirth; String dateofBirth; int gender; @@ -93,8 +96,11 @@ class Patientobject { this.mobileNumber, this.patientOutSA, this.firstName, - this.middleName, - this.lastName, + this.middleName, + this.lastName, + this.firstNameN, + this.middleNameN, + this.lastNameN, this.strDateofBirth, this.dateofBirth, this.gender, @@ -114,6 +120,9 @@ class Patientobject { firstName = json['FirstName']; middleName = json['MiddleName']; lastName = json['LastName']; + firstNameN = json['FirstNameN']; + middleNameN = json['MiddleNameN']; + lastNameN = json['LastNameN']; strDateofBirth = json['StrDateofBirth']; dateofBirth = json['DateofBirth']; gender = json['Gender']; @@ -136,6 +145,9 @@ class Patientobject { data['FirstName'] = this.firstName; data['MiddleName'] = this.middleName; data['LastName'] = this.lastName; + data['FirstNameN'] = this.firstNameN; + data['MiddleNameN'] = this.middleNameN; + data['LastNameN'] = this.lastNameN; data['StrDateofBirth'] = this.strDateofBirth; data['DateofBirth'] = this.dateofBirth; data['Gender'] = this.gender; diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 7d6f24ee..0cd3ace4 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -201,21 +201,22 @@ class _Login extends State { } }) .catchError((err) { - print(err); + GifLoaderDialogUtils.hideDialog(context); ConfirmDialog dialog = new ConfirmDialog( context: context, confirmMessage: err, okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => { + ConfirmDialog.closeAlertDialog(context), Navigator.of(context).pushNamed( REGISTER, ), - ConfirmDialog.closeAlertDialog(context) + }, cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); dialog.showAlertDialog(context); - GifLoaderDialogUtils.hideDialog(context); + }); // SMSOTP.showLoadingDialog(context, false), } diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index f0eb8e83..e2a55663 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -303,20 +303,18 @@ class _RegisterInfo extends State { Navigator.of(context).pushNamed(HOME) } }).catchError((err) { + GifLoaderDialogUtils.hideDialog(context); ConfirmDialog dialog = new ConfirmDialog( context: context, confirmMessage: err, okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => { - Navigator.of(context).pushNamed( - REGISTER, - ), - ConfirmDialog.closeAlertDialog(context) + ConfirmDialog.closeAlertDialog(context) }, cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); dialog.showAlertDialog(context); - GifLoaderDialogUtils.hideDialog(context); + }); } diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 56293aea..d2cd2081 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -216,21 +216,22 @@ class _Register extends State { .authService .checkPatientForRegisteration(request) .then((response) => {checkUserStatus(response, request)}).catchError((err) { - print(err); + GifLoaderDialogUtils.hideDialog(context); ConfirmDialog dialog = new ConfirmDialog( context: context, confirmMessage: err, okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => { + ConfirmDialog.closeAlertDialog(context) Navigator.of(context).pushNamed( REGISTER, ), - ConfirmDialog.closeAlertDialog(context) + }, cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); dialog.showAlertDialog(context); - GifLoaderDialogUtils.hideDialog(context); + }); }