merge-requests/140/head
Sultan Khan 5 years ago
parent 0eedb788c3
commit a16145d7f1

@ -76,6 +76,9 @@ class Patientobject {
String firstName; String firstName;
String middleName; String middleName;
String lastName; String lastName;
String firstNameN;
String middleNameN;
String lastNameN;
dynamic strDateofBirth; dynamic strDateofBirth;
String dateofBirth; String dateofBirth;
int gender; int gender;
@ -95,6 +98,9 @@ class Patientobject {
this.firstName, this.firstName,
this.middleName, this.middleName,
this.lastName, this.lastName,
this.firstNameN,
this.middleNameN,
this.lastNameN,
this.strDateofBirth, this.strDateofBirth,
this.dateofBirth, this.dateofBirth,
this.gender, this.gender,
@ -114,6 +120,9 @@ class Patientobject {
firstName = json['FirstName']; firstName = json['FirstName'];
middleName = json['MiddleName']; middleName = json['MiddleName'];
lastName = json['LastName']; lastName = json['LastName'];
firstNameN = json['FirstNameN'];
middleNameN = json['MiddleNameN'];
lastNameN = json['LastNameN'];
strDateofBirth = json['StrDateofBirth']; strDateofBirth = json['StrDateofBirth'];
dateofBirth = json['DateofBirth']; dateofBirth = json['DateofBirth'];
gender = json['Gender']; gender = json['Gender'];
@ -136,6 +145,9 @@ class Patientobject {
data['FirstName'] = this.firstName; data['FirstName'] = this.firstName;
data['MiddleName'] = this.middleName; data['MiddleName'] = this.middleName;
data['LastName'] = this.lastName; data['LastName'] = this.lastName;
data['FirstNameN'] = this.firstNameN;
data['MiddleNameN'] = this.middleNameN;
data['LastNameN'] = this.lastNameN;
data['StrDateofBirth'] = this.strDateofBirth; data['StrDateofBirth'] = this.strDateofBirth;
data['DateofBirth'] = this.dateofBirth; data['DateofBirth'] = this.dateofBirth;
data['Gender'] = this.gender; data['Gender'] = this.gender;

@ -201,21 +201,22 @@ class _Login extends State<Login> {
} }
}) })
.catchError((err) { .catchError((err) {
print(err); GifLoaderDialogUtils.hideDialog(context);
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: err, confirmMessage: err,
okText: TranslationBase.of(context).confirm, okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {
ConfirmDialog.closeAlertDialog(context),
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
REGISTER, REGISTER,
), ),
ConfirmDialog.closeAlertDialog(context)
}, },
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
GifLoaderDialogUtils.hideDialog(context);
}); });
// SMSOTP.showLoadingDialog(context, false), // SMSOTP.showLoadingDialog(context, false),
} }

@ -303,20 +303,18 @@ class _RegisterInfo extends State<RegisterInfo> {
Navigator.of(context).pushNamed(HOME) Navigator.of(context).pushNamed(HOME)
} }
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: err, confirmMessage: err,
okText: TranslationBase.of(context).confirm, okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {
Navigator.of(context).pushNamed(
REGISTER,
),
ConfirmDialog.closeAlertDialog(context) ConfirmDialog.closeAlertDialog(context)
}, },
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
GifLoaderDialogUtils.hideDialog(context);
}); });
} }

@ -216,21 +216,22 @@ class _Register extends State<Register> {
.authService .authService
.checkPatientForRegisteration(request) .checkPatientForRegisteration(request)
.then((response) => {checkUserStatus(response, request)}).catchError((err) { .then((response) => {checkUserStatus(response, request)}).catchError((err) {
print(err); GifLoaderDialogUtils.hideDialog(context);
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
confirmMessage: err, confirmMessage: err,
okText: TranslationBase.of(context).confirm, okText: TranslationBase.of(context).confirm,
cancelText: TranslationBase.of(context).cancel_nocaps, cancelText: TranslationBase.of(context).cancel_nocaps,
okFunction: () => { okFunction: () => {
ConfirmDialog.closeAlertDialog(context)
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
REGISTER, REGISTER,
), ),
ConfirmDialog.closeAlertDialog(context)
}, },
cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)}); cancelFunction: () => {ConfirmDialog.closeAlertDialog(context)});
dialog.showAlertDialog(context); dialog.showAlertDialog(context);
GifLoaderDialogUtils.hideDialog(context);
}); });
} }

Loading…
Cancel
Save