Merge branch 'sultan' into 'diplomatic-quarter-live'

login loader issue fixed

See merge request Cloud_Solution/diplomatic-quarter!186
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 1c2f08a9fe

@ -384,55 +384,34 @@ class _ConfirmLogin extends State<ConfirmLogin> {
}
getMobileInfo(request) {
GifLoaderDialogUtils.showMyDialog(context);
this
.authService
.getLoginInfo(request)
.then((result) => {
GifLoaderDialogUtils.hideDialog(context),
if (result['SMSLoginRequired'] == false)
{
this.loginTokenID = result.logInTokenID,
this.patientOutSA = result.patientOutSA,
// sms for register the biometric
if (result.isSMSSent)
{
this.onlySMSBox = false,
//this.button();
}
else
{checkActivationCode()}
}
else
{
if (result['IsAuthenticated'] == true)
{
setState(() {
isMoreOption = true;
this.onlySMSBox = true;
// this.fingrePrintBefore = true;
}),
//sharedPref.setBool(ONLY_SMS, true),
// this.cs.sharedService.setSharedData(true, AuthenticationService.ONLY_SMS);
//this.cs.sharedService.setSharedData(this.selectedOption, AuthenticationService.FINGUREPRINT_BEFORE);
// this.cs.confirmLogin();
//this.button();
}
// else
// {
// // this.cs.presentAlert(result.ErrorEndUserMessage);
// }
}
})
.catchError((err) {
// GifLoaderDialogUtils.showMyDialog(context);
this.authService.getLoginInfo(request).then((result) {
GifLoaderDialogUtils.hideDialog(context);
if (result['SMSLoginRequired'] == false) {
this.loginTokenID = result.logInTokenID;
this.patientOutSA = result.patientOutSA;
// sms for register the biometric
if (result.isSMSSent) {
this.onlySMSBox = false;
//this.button();
} else {
checkActivationCode();
}
} else {
if (result['IsAuthenticated'] == true) {
setState(() {
isMoreOption = true;
this.onlySMSBox = true;
// this.fingrePrintBefore = true;
});
}
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
print(err);
});
}
setUser() async {}
setDefault() async {
if (await sharedPref.getObject(IMEI_USER_DATA) != null)
user = SelectDeviceIMEIRES.fromJson(

@ -64,7 +64,7 @@ class _AppDrawerState extends State<AppDrawer> {
padding: EdgeInsets.zero,
children: <Widget>[
Container(
height: SizeConfig.screenHeight * .27,
height: SizeConfig.screenHeight * .28,
padding: EdgeInsets.all(15),
child: InkWell(
child: Column(
@ -466,8 +466,6 @@ class _AppDrawerState extends State<AppDrawer> {
Navigator.of(context).pushNamed(HOME);
}
login() async {
var data = await sharedPref.getObject(IMEI_USER_DATA);
sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
@ -498,7 +496,7 @@ class _AppDrawerState extends State<AppDrawer> {
.familyFileProvider
.silentLoggin(user is AuthenticatedUser ? null : user,
mainUser: user is AuthenticatedUser)
.then((value) async{
.then((value) async {
await authenticatedUserObject.getUser();
_vitalSignService.heightCm = "";
_vitalSignService.weightKg = "";

Loading…
Cancel
Save