Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders

 Conflicts:
	lib/models/doctor/profile_req_Model.dart
merge-requests/882/head
hussam al-habibeh 4 years ago
commit aaabae5900

@ -15,4 +15,12 @@ class NavigationService {
Future<dynamic> pushNamedAndRemoveUntil(String routeName) {
return navigatorKey.currentState.pushNamedAndRemoveUntil(routeName,(asd)=>false);
}
Future<dynamic> pushAndRemoveUntil(Route newRoute) {
return navigatorKey.currentState.pushAndRemoveUntil(newRoute,(asd)=>false);
}
pop() {
return navigatorKey.currentState.pop();
}
}

@ -24,14 +24,14 @@ class ProfileReqModel {
{this.projectID,
this.clinicID,
this.doctorID,
this.isRegistered = true,
this.isRegistered =true,
this.license,
this.languageID,
this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress = '11.11.11.11',
this.versionID = 6.5,
this.channel = 9,
this.sessionID = 'E2bsEeYEJo',
this.iPAdress='11.11.11.11',
// this.versionID=5.5,
this.channel=9,
this.sessionID='E2bsEeYEJo',
this.tokenID,
this.isLoginForDoctorApp = true});

@ -31,7 +31,6 @@ class VitalSignReqModel {
this.tokenID,
this.stamp = '2020-04-26T09:32:18.317Z',
this.iPAdress='11.11.11.11',
this.versionID=5.8,
this.channel=9,
this.sessionID='E2bsEeYEJo',
this.isLoginForDoctorApp=true,

@ -550,10 +550,15 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
Helpers.showErrorToast(authenticationViewModel.error);
} else {
await authenticationViewModel.onCheckActivationCodeSuccess();
if(value !=null)
Navigator.pop(context);
Navigator.pop(context);
navigateToLandingPage();
if(value !=null){
if(Navigator.canPop(context))
Navigator.pop(context);
}
if(Navigator.canPop(context))
Navigator.pop(context);
navigateToLandingPage();
}
}

@ -2,6 +2,7 @@ import 'package:connectivity/connectivity.dart';
import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart';
import 'package:doctor_app_flutter/core/service/NavigationService.dart';
import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart';
@ -17,6 +18,7 @@ import 'package:html/parser.dart';
import '../UpdatePage.dart';
import '../config/size_config.dart';
import '../locator.dart';
import '../util/dr_app_toast_msg.dart';
import 'dr_app_shared_pref.dart';
@ -188,16 +190,26 @@ class Helpers {
}
navigateToUpdatePage(String message, String androidLink, iosLink) {
Navigator.pushAndRemoveUntil(
AppGlobal.CONTEX,
FadePage(
page: UpdatePage(
message: message,
androidLink: androidLink,
iosLink: iosLink,
),
locator<NavigationService>().pushAndRemoveUntil(
FadePage(
page: UpdatePage(
message: message,
androidLink: androidLink,
iosLink: iosLink,
),
(r) => false);
),
);
// Navigator.pushAndRemoveUntil(
// AppGlobal.CONTEX,
// FadePage(
// page: UpdatePage(
// message: message,
// androidLink: androidLink,
// iosLink: iosLink,
// ),
// ),
// (r) => false);
}
static String parseHtmlString(String htmlString) {
@ -277,7 +289,13 @@ class Helpers {
String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60));
return "$twoDigitMinutes:$twoDigitSeconds";
}
static double getTextFieldHeight(){
return SizeConfig.heightMultiplier * (SizeConfig.isHeightVeryShort ?10:SizeConfig.isHeightShort?8:6);
static double getTextFieldHeight() {
return SizeConfig.heightMultiplier *
(SizeConfig.isHeightVeryShort
? 10
: SizeConfig.isHeightShort
? 8
: 6);
}
}

@ -9,6 +9,7 @@ class GifLoaderDialogUtils {
}
static hideDialog(BuildContext context) {
if(Navigator.canPop(context))
Navigator.of(context).pop();
}
}

Loading…
Cancel
Save