diff --git a/lib/config/config.dart b/lib/config/config.dart index 0f38756d..d9aa00ce 100755 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -4,14 +4,14 @@ const MAX_SMALL_SCREEN = 660; const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; - // const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; -const BASE_URL_LIVE_CARE = 'https://uat.hmgwebservices.com/'; + const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/'; +// const BASE_URL_LIVE_CARE = 'https://uat.hmgwebservices.com/'; const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/'; -// const BASE_URL = 'https://hmgwebservices.com/'; +const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'http://10.20.200.111:1010/'; -const BASE_URL = 'https://uat.hmgwebservices.com/'; +// const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/'; @@ -413,7 +413,7 @@ const TRANSACTION_NO = 0; const LANGUAGE_ID = 2; const STAMP = '2020-04-27T12:17:17.721Z'; const IP_ADDRESS = '9.9.9.9'; -const VERSION_ID = 9.8; +const VERSION_ID = 9.9; const CHANNEL = 9; const SESSION_ID = 'BlUSkYymTt'; const IS_LOGIN_FOR_DOCTOR_APP = true; diff --git a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart index 54fdb631..ba18ce27 100644 --- a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart +++ b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart @@ -115,7 +115,7 @@ class SickLeaveService extends BaseService { Future getSickLeavePatient(patientMRN) async { _sickLeavePatientRequestModel = SickLeavePatientRequestModel( - patientID: patientMRN, patientTypeID: 2, patientType: 1); + patientID: patientMRN, patientTypeID: 2, patientType: 1, patientMRN: patientMRN); hasError = false; getAllSickLeavePatient = []; getAllSickLeavePatient.clear(); diff --git a/lib/main.dart b/lib/main.dart index 043beb2b..e6c49ce9 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -30,12 +30,11 @@ void main() async { //clearing all the shared pref on the inital start to avoid any profile issue Future clearPrefsOnFirstLaunch() async { - SharedPreferences prefs = await SharedPreferences. getInstance(); + SharedPreferences prefs = await SharedPreferences.getInstance(); bool isFirstLaunch = prefs.getBool('isFirstLaunch') ?? true; - await prefs.clear(); // Clear all prefs + await prefs.clear(); // Clear all prefs } - class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { @@ -60,37 +59,41 @@ class MyApp extends StatelessWidget { ) ], child: Consumer( - builder: (context, projectProvider, child) => MaterialApp( - showSemanticsDebugger: false, - title: 'Doctors App', - locale: projectProvider.appLocal, - localizationsDelegates: [ - TranslationBaseDelegate(), - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - DefaultCupertinoLocalizations.delegate - ], - supportedLocales: [ - const Locale('ar', ''), // Arabic - const Locale('en', ''), // English - ], - theme: ThemeData( - primarySwatch: Colors.grey, - primaryColor: Colors.grey, - //buttonColor: HexColor('#D02127'), - fontFamily: 'Poppins', - dividerColor: Colors.grey[350], + builder: (context, projectProvider, child) => SafeArea( + top: false, + bottom: Platform.isAndroid ? true : false, + child: MaterialApp( + showSemanticsDebugger: false, + title: 'Doctors App', + locale: projectProvider.appLocal, + localizationsDelegates: [ + TranslationBaseDelegate(), + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + DefaultCupertinoLocalizations.delegate + ], + supportedLocales: [ + const Locale('ar', ''), // Arabic + const Locale('en', ''), // English + ], + theme: ThemeData( + primarySwatch: Colors.grey, + primaryColor: Colors.grey, + //buttonColor: HexColor('#D02127'), + fontFamily: 'Poppins', + dividerColor: Colors.grey[350], - // backgroundColor: Color.fromRGBO(255, 255, 255, 1), - useMaterial3: false), - navigatorKey: locator().navigatorKey, - navigatorObservers: [ - locator().getAnalyticsObserver(), - ], - initialRoute: INIT_ROUTE, - routes: routes, - debugShowCheckedModeBanner: false, + // backgroundColor: Color.fromRGBO(255, 255, 255, 1), + useMaterial3: false), + navigatorKey: locator().navigatorKey, + navigatorObservers: [ + locator().getAnalyticsObserver(), + ], + initialRoute: INIT_ROUTE, + routes: routes, + debugShowCheckedModeBanner: false, + ), ), ), ); diff --git a/pubspec.yaml b/pubspec.yaml index 61752971..0ea3a0c8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.4.24+1 +version: 1.4.26+1 environment: