Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/development_v3.3' into dev_v3.13.6

Browse Source 
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/MyAppointments/widgets/AppointmentActions.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/reports/report_home_page.dart
dev_v3.13.6_BLE_Faiz
Aamir.Muhammad 1 year ago
parent 21e4bb5138 3a65113149
commit d9cf383648
7 changed files with 101 additions and 66 deletions
Show Stats Download Patch File Download Diff File

14
lib/config/config.dart
Unescape Escape View File

@ -20,11 +20,13 @@ var PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
var PACKAGES_ORDERS = '/api/orders'; var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items'; var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara'; var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/';
// var BASE_URL = 'http://10.50.100.198:4422/'; // var BASE_URL = 'http://10.50.100.198:4422/';
// var BASE_URL = 'https://uat.hmgwebservices.com/';
//var BASE_URL = 'https://hmgwebservices.com/';
var BASE_URL = 'https://uat.hmgwebservices.com/'; var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/'; // var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.20.200.111:1010/'; // var BASE_URL = 'http://10.20.200.111:1010/';
// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/'; // var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/'; // var BASE_URL = 'https://vidamergeuat.cloudsolutions.com.sa/';
@ -344,7 +346,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
var CHANNEL = 3; var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958'; var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20'; var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 15.6; var VERSION_ID = 15.7;
var SETUP_ID = '91877'; var SETUP_ID = '91877';
var LANGUAGE = 2; var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0; // var PATIENT_OUT_SA = 0;
@ -668,10 +670,10 @@ var GET_DENTAL_INSTRUCTIONS = 'Services/OUTPs.svc/Rest/getProcedureNotification'
//PAYFORT //PAYFORT
var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails"; var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse"; var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
// var payFortEnvironment = FortEnvironment.production; var payFortEnvironment = FortEnvironment.production;
// var applePayMerchantId = "merchant.com.hmgwebservices"; var applePayMerchantId = "merchant.com.hmgwebservices";
var payFortEnvironment = FortEnvironment.test; // var payFortEnvironment = FortEnvironment.test;
var applePayMerchantId = "merchant.com.hmgwebservices.uat"; // var applePayMerchantId = "merchant.com.hmgwebservices.uat";
class AppGlobal { class AppGlobal {
static var context; static var context;

10
lib/core/service/client/base_app_client.dart
Unescape Escape View File

@ -201,11 +201,11 @@ class BaseAppClient {
body.removeWhere((key, value) => key == null || value == null); body.removeWhere((key, value) => key == null || value == null);
// if (AppGlobal.isNetworkDebugEnabled) { if (AppGlobal.isNetworkDebugEnabled) {
print("URL : $url"); // print("URL : $url");
final jsonBody = json.encode(body); // final jsonBody = json.encode(body);
print(jsonBody); // print(jsonBody);
// } }
if (await Utils.checkConnection( if (await Utils.checkConnection(
bypassConnectionCheck: bypassConnectionCheck)) { bypassConnectionCheck: bypassConnectionCheck)) {

3
lib/pages/MyAppointments/AppointmentDetails.dart
Unescape Escape View File

@ -120,6 +120,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
widget.appo.clinicID == 23 || widget.appo.clinicID == 23 ||
widget.appo.clinicID == 265 || widget.appo.clinicID == 265 ||
widget.appo.clinicID == 134 || widget.appo.clinicID == 134 ||
widget.appo.clinicID == 253 ||
widget.appo.isExecludeDoctor! || widget.appo.isExecludeDoctor! ||
widget.appo.isLiveCareAppointment!) widget.appo.isLiveCareAppointment!)
? false ? false
@ -158,6 +159,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
widget.appo.clinicID == 253 || widget.appo.clinicID == 253 ||
widget.appo.clinicID == 265 || widget.appo.clinicID == 265 ||
widget.appo.clinicID == 134 || widget.appo.clinicID == 134 ||
widget.appo.clinicID == 253 ||
widget.appo.isExecludeDoctor! || widget.appo.isExecludeDoctor! ||
widget.appo.isLiveCareAppointment!) { widget.appo.isLiveCareAppointment!) {
_tabController!.index = _tabController!.previousIndex; _tabController!.index = _tabController!.previousIndex;
@ -175,6 +177,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails> with SingleTick
widget.appo.clinicID == 47 || widget.appo.clinicID == 47 ||
widget.appo.clinicID == 265 || widget.appo.clinicID == 265 ||
widget.appo.clinicID == 253 || widget.appo.clinicID == 253 ||
widget.appo.clinicID == 134 ||
widget.appo!.isExecludeDoctor! || widget.appo!.isExecludeDoctor! ||
widget.appo!.isLiveCareAppointment! widget.appo!.isLiveCareAppointment!
? Tab( ? Tab(

11
lib/pages/MyAppointments/widgets/AppointmentActions.dart
Unescape Escape View File

@ -80,11 +80,12 @@ class _AppointmentActionsState extends State<AppointmentActions> {
shrinkWrap: true, shrinkWrap: true,
itemBuilder: (context, index) { itemBuilder: (context, index) {
// bool shouldEnable = ((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) || (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") || appoButtonsList[index].caller == "openReschedule"); // bool shouldEnable = ((widget.appo.clinicID == 17 || widget.appo.clinicID == 47) || (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") || appoButtonsList[index].caller == "openReschedule");
bool shouldEnable = (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47 || widget.appo.clinicID == 134) && appoButtonsList[index].caller == "openReschedule") || bool shouldEnable =
(widget.appo.isLiveCareAppointment! && appoButtonsList[index].caller == "askDoc") || (((widget.appo.clinicID == 17 || widget.appo.clinicID == 47 || widget.appo.clinicID == 134 || widget.appo.clinicID == 253) && appoButtonsList[index].caller == "openReschedule") ||
(Utils.isVidaPlusProject(projectViewModel, widget.appo.projectID) && (widget.appo.isLiveCareAppointment && appoButtonsList[index].caller == "askDoc") ||
widget.appo.clinicID == 10 && (Utils.isVidaPlusProject(projectViewModel, widget.appo.projectID) &&
(appoButtonsList[index].caller == "prescriptions" || appoButtonsList[index].caller == "radiology" || appoButtonsList[index].caller == "labResult"))); widget.appo.clinicID == 10 &&
(appoButtonsList[index].caller == "prescriptions" || appoButtonsList[index].caller == "radiology" || appoButtonsList[index].caller == "labResult")));
return InkWell( return InkWell(
onTap: shouldEnable onTap: shouldEnable
? null ? null

25
lib/pages/login/confirm-login.dart
Unescape Escape View File

@ -761,22 +761,17 @@ class _ConfirmLogin extends State<ConfirmLogin> {
} else { } else {
authService authService
.checkActivationCode(request, value) .checkActivationCode(request, value)
.then((result) => .then((result) => {
{
res = result, res = result,
if (result is Map) if (result is Map)
{ {
result = CheckActivationCode.fromJson( result = CheckActivationCode.fromJson(result as Map<String, dynamic>),
result as Map<String, dynamic>),
if(result.errorCode =='699'){ if(result.errorCode =='699'){
//699 block run here //699 block run here
GifLoaderDialogUtils.hideDialog(context), GifLoaderDialogUtils.hideDialog(context),
Future.delayed(Duration(seconds: 2), () { Future.delayed(Duration(seconds: 2), () {
AppToast.showErrorToast(message: result.errorEndUserMessage); AppToast.showErrorToast(message: result.errorEndUserMessage);
Navigator.popUntil( Navigator.popUntil(context, (route) => Utils.route(route, equalsTo: Login));
context,
(route) =>
Utils.route(route, equalsTo: Login));
}) })
} }
else if (this.registerd_data != null && else if (this.registerd_data != null &&
@ -793,21 +788,18 @@ class _ConfirmLogin extends State<ConfirmLogin> {
sharedPref.remove(FAMILY_FILE), sharedPref.remove(FAMILY_FILE),
result.list.isFamily = false, result.list.isFamily = false,
userData = result.list, userData = result.list,
sharedPref.setString( sharedPref.setString(BLOOD_TYPE, result.patientBloodType),
BLOOD_TYPE, result.patientBloodType ?? "O+"),
//Remove o+ from here Added by Aamir //Remove o+ from here Added by Aamir
authenticatedUserObject.user = result.list, authenticatedUserObject.user = result.list,
projectViewModel.setPrivilege(privilegeList: res), projectViewModel.setPrivilege(privilegeList: res),
sharedPref.setObject(MAIN_USER, result.list), sharedPref.setObject(MAIN_USER, result.list),
sharedPref.setObject(USER_PROFILE, result.list), sharedPref.setObject(USER_PROFILE, result.list),
loginTokenID = result.logInTokenID, loginTokenID = result.logInTokenID,
sharedPref.setObject( sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID),
LOGIN_TOKEN_ID, result.logInTokenID), sharedPref.setString(TOKEN, result.authenticationTokenID),
sharedPref.setString(
TOKEN, result.authenticationTokenID),
projectViewModel.analytics.loginRegistration
.login_successful(),
checkIfUserAgreedBefore(result), checkIfUserAgreedBefore(result),
projectViewModel.analytics.loginRegistration.login_successful(),
} }
} }
else else
@ -815,6 +807,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
// Navigator.of(context).pop(), // Navigator.of(context).pop(),
GifLoaderDialogUtils.hideDialog(context), GifLoaderDialogUtils.hideDialog(context),
Future.delayed(Duration(seconds: 1), () { Future.delayed(Duration(seconds: 1), () {
Navigator.of(context).pop();
AppToast.showErrorToast(message: result); AppToast.showErrorToast(message: result);
startSMSService(tempType); startSMSService(tempType);
}), }),

100
lib/pages/medical/reports/report_home_page.dart
Unescape Escape View File

@ -71,38 +71,74 @@ class _HomeReportPageState extends State<HomeReportPage> with SingleTickerProvid
body: Container( body: Container(
child: Column( child: Column(
children: [ children: [
TabBar( // TabBar(
controller: _tabController_new, // controller: _tabController_new,
indicatorWeight: 3.0, // indicatorWeight: 3.0,
indicatorSize: TabBarIndicatorSize.tab, // indicatorSize: TabBarIndicatorSize.tab,
labelColor: Color(0xff2B353E), // labelColor: Color(0xff2B353E),
unselectedLabelColor: Color(0xff575757), // unselectedLabelColor: Color(0xff575757),
labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20), // labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
labelStyle: TextStyle( // labelStyle: TextStyle(
fontSize: 16, // fontSize: 16,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
letterSpacing: -0.48, // letterSpacing: -0.48,
), // ),
unselectedLabelStyle: TextStyle( // unselectedLabelStyle: TextStyle(
fontSize: 16, // fontSize: 16,
fontWeight: FontWeight.w600, // fontWeight: FontWeight.w600,
letterSpacing: -0.48, // letterSpacing: -0.48,
), // ),
onTap: (int value) { // onTap: (int value) {
print(value); // print(value);
setState(() {}); // setState(() {});
}, // },
tabs: [ // tabs: [
Text( // Text(
TranslationBase.of(context).outpatient, // TranslationBase.of(context).outpatient,
style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'), // style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
), // ),
Text( // Text(
TranslationBase.of(context).inPatient, // TranslationBase.of(context).inPatient,
style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'), // style: TextStyle(fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
), // ),
], // ],
), // ),
// TabBar(
// controller: _tabController_new,
// indicatorWeight: 3.0,
// indicatorSize: TabBarIndicatorSize.tab,
// labelColor: Color(0xff2B353E),
// unselectedLabelColor: Color(0xff575757),
// labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20),
// labelStyle: TextStyle(
// fontSize: 16,
// fontWeight: FontWeight.w600,
// letterSpacing: -0.48,
// ),
// unselectedLabelStyle: TextStyle(
// fontSize: 16,
// fontWeight: FontWeight.w600,
// letterSpacing: -0.48,
// ),
// onTap: (int value) {
// print(value);
// setState(() {});
// },
// tabs: [
// Text(
// TranslationBase.of(context).outpatient,
// style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'),
// ),
// Text(
// TranslationBase.of(context).inPatient,
// style: TextStyle(fontFamily: projectViewModel!.isArabic ? 'Cairo' : 'Poppins'),
// ),
// ],
// ),
if (model.user != null) if (model.user != null)
Expanded( Expanded(
child: TabBarView( child: TabBarView(

4
lib/widgets/in_app_browser/InAppBrowser.dart
Unescape Escape View File

@ -38,9 +38,9 @@ class MyInAppBrowser extends InAppBrowser {
static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL LIVE
// static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT // static String APPLE_PAY_PAYFORT_URL = 'https://hmgwebservices.com/PayFortWebLive/PayFortApi/MakeApplePayRequest'; // Payfort Payment Gateway URL UAT
static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT // static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWeb/pages/SendPayFortRequest.aspx'; // Payfort Payment Gateway URL UAT
// static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE static String SERVICE_URL = 'https://hmgwebservices.com/PayFortWebLive/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL LIVE
// static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS // static String SERVICE_URL = 'https://uat.hmgwebservices.com/payfortforvidaplus/pages/SendPayFortRequest.aspx'; //Payfort Payment Gateway URL UAT VIDA PLUS

Write Preview
Loading…
Cancel
Save