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

Merge branch 'dev_v3.13.6' into dev_3.13.6_Development

Browse Source
dev_3.13.6_Development
haroon amjad 1 year ago
parent f6b89e1ae6 31aa09e35b
commit adf00e101f
14 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -14,16 +14,16 @@
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" tools:node="remove"/>
<uses-permission android:name="android.permission.BROADCAST_STICKY" tools:node="remove"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" tools:node="remove"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" tools:node="remove"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" tools:node="remove" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.VIBRATE" />

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

@ -22,8 +22,8 @@ var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:1022/';
// 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://hmgwebservices.com/';
// var BASE_URL = 'http://10.20.200.111:1010/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@ -344,7 +344,7 @@ var UPDATE_COVID_QUESTIONNAIRE = 'Services/Doctors.svc/REST/COVID19_Questionnari
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 15.8;
var VERSION_ID = 15.9;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;
@ -678,10 +678,10 @@ var GET_PROJECT_FROM_NFC = 'Services/OUTPs.svc/Rest/GetProjectByNFC';
//PAYFORT
var getPayFortProjectDetails = "Services/PayFort_Serv.svc/REST/GetPayFortProjectDetails";
var addPayFortApplePayResponse = "Services/PayFort_Serv.svc/REST/AddResponse";
// var payFortEnvironment = FortEnvironment.production;
// var applePayMerchantId = "merchant.com.hmgwebservices";
var payFortEnvironment = FortEnvironment.test;
var applePayMerchantId = "merchant.com.hmgwebservices.uat";
var payFortEnvironment = FortEnvironment.production;
var applePayMerchantId = "merchant.com.hmgwebservices";
// var payFortEnvironment = FortEnvironment.test;
// var applePayMerchantId = "merchant.com.hmgwebservices.uat";
class AppGlobal {
static var context;

2
lib/config/localized_values.dart
Unescape Escape View File

@ -549,7 +549,7 @@ const Map localizedValues = {
"emergency": {"en": "Emergency", "ar": "الطوارئ"},
"erservices": {"en": "Emergency", "ar": "الطوارئ"},
"services2": {"en": "Services", "ar": "خدمات"},
"cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "للتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
"cantSeeProfile": {"en": "To view your medical profile, please log in or register now", "ar": "لتصفح ملفك الطبي الرجاء تسجيل الدخول أو التسجيل الآن"},
"loginRegisterNow": {"en": "Login or Register Now", "ar": "تسجيل الدخول أو التسجيل الآن"},
"HMGPharmacy": {"en": "HMG Pharmacy", "ar": "صيدلية HMG"},
"ecommerceSolution": {"en": "Ecommerce Solution", "ar": "حل التجارة الإلكترونية"},

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

@ -193,7 +193,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; //0560717232
// body['PatientID'] = 4767978; //4609100
// body['PatientID'] = 283093; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574

6
lib/pages/DrawerPages/family/my-family.dart
Unescape Escape View File

@ -476,7 +476,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
var mainUser = await sharedPref.getObject(MAIN_USER);
var loginType = await sharedPref.getInt(LAST_LOGIN);
var pushToken = await sharedPref.getString(PUSH_TOKEN);
var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN);
// var oneSignalPushToken = await sharedPref.getString(ONESIGNAL_APNS_TOKEN ?? "");
this.sharedPref.clear();
if (mainUser["PatientID"] != result.list.patientID) {
result.list.isFamily = true;
@ -484,7 +484,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
this.sharedPref.setString(APP_LANGUAGE, currentLang);
this.sharedPref.setString(BLOOD_TYPE, bloodType);
this.sharedPref.setString(PUSH_TOKEN, pushToken);
this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
// this.sharedPref.setString(ONESIGNAL_APNS_TOKEN, oneSignalPushToken);
this.sharedPref.setInt(LAST_LOGIN, loginType ?? 1);
await this.sharedPref.setObject(MAIN_USER, mainUser);
await this.sharedPref.setObject(USER_PROFILE, result.list);
@ -497,6 +497,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Provider.of<ProjectViewModel>(context, listen: false).setUser(result.list);
Provider.of<ProjectViewModel>(context, listen: false).authenticatedUserObject.user = result.list;
await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
try {
// await appointmentRateViewModel.getIsLastAppointmentRatedList();
await getToDoCount();

4
lib/pages/conference/zoom/call_screen.dart
Unescape Escape View File

@ -50,7 +50,7 @@ class _CallScreenState extends State<CallScreen> {
var sharingUser = useState<ZoomVideoSdkUser?>(null);
var videoInfo = useState<String>('');
var isSharing = useState(false);
var isMuted = useState(true);
var isMuted = useState(false);
var isVideoOn = useState(false);
var isSpeakerOn = useState(false);
var isRenameModalVisible = useState(false);
@ -78,7 +78,7 @@ class _CallScreenState extends State<CallScreen> {
Future<void>.microtask(() async {
var token = generateJwt(args.sessionName, args.role);
try {
Map<String, bool> SDKaudioOptions = {"connect": true, "mute": true, "autoAdjustSpeakerVolume": false};
Map<String, bool> SDKaudioOptions = {"connect": true, "mute": false, "autoAdjustSpeakerVolume": false};
Map<String, bool> SDKvideoOptions = {
"localVideoOn": true,
};

2
lib/pages/login/login.dart
Unescape Escape View File

@ -358,7 +358,7 @@ class _Login extends State<Login> {
}
this.authService.checkActivationCode(request, code).then((result) async {
sharedPref.remove(FAMILY_FILE);
registerGeoZones();
// registerGeoZones();
projectViewModel.setPrivilege(privilegeList: result);
result = CheckActivationCode.fromJson(result);
result.list.isFamily = false;

2
lib/pages/medical/radiology/radiology_details_page.dart
Unescape Escape View File

@ -56,7 +56,7 @@ class RadiologyDetailsPage extends StatelessWidget {
finalRadiology!.projectName!,
finalRadiology!.orderDate,
null,
finalRadiology!.nationalityFlagURL!,
finalRadiology!.nationalityFlagURL ?? "",
finalRadiology!.doctorRate,
finalRadiology!.actualDoctorRate,
finalRadiology!.noOfPatientsRate,

2
lib/pages/medical/smart_watch_health_data/heartrate/heartrateTracker.dart
Unescape Escape View File

@ -132,8 +132,8 @@ class _HeartRateTrackerState extends State<HeartRateTracker> with SingleTickerPr
GifLoaderDialogUtils.hideDialog(context);
weekyHearRateList.clear();
res['Med_GetAvgWeekTransactionsStsList'].forEach((element) {
weekyHearRateList.add(new WeeklyHeartRateResModel.fromJson(element));
if (element['ValueAvg'] != null) {
weekyHearRateList.add(new WeeklyHeartRateResModel.fromJson(element));
num value = element['ValueAvg'];
avgWeeklyHearRateValue += value.toInt();
weeklyDataLength++;

18
lib/uitl/push-notification-handler.dart
Unescape Escape View File

@ -367,16 +367,16 @@ class PushNotificationHandler {
// print("Push Notification getToken: " + token!);
// onToken(token!);
// });
FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String? token) {
print("Push Notification getToken: " + token!);
onToken(token!);
});
// FirebaseMessaging.instance.getToken(vapidKey: 'BHRJG8sIzcysWxPw3B6xQjz_85nUuCfU6EAmpH18kyUTmB2cj35IdFwCyWSab80SA1v6oBSWVh-p6PcHPw_y00Y').then((String? token) {
// print("Push Notification getToken: " + token!);
// onToken(token!);
// });
if (Platform.isIOS) {
FirebaseMessaging.instance.getAPNSToken().then((value) {
print("Push APNS getToken: " + value!);
});
}
// if (Platform.isIOS) {
// FirebaseMessaging.instance.getAPNSToken().then((value) {
// print("Push APNS getToken: " + value!);
// });
// }
FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
}

4
lib/uitl/utils.dart
Unescape Escape View File

@ -390,7 +390,7 @@ class Utils {
imagePath: 'assets/images/new-design/virtual_tour_icon.png',
isPngImage: true,
subTitle: TranslationBase.of(context).service,
isEnable: projectViewModel.havePrivilege(85),
isEnable: projectViewModel.havePrivilege(105),
),
));
@ -403,7 +403,7 @@ class Utils {
imagePath: 'medical_instructions.svg',
isPngImage: false,
subTitle: TranslationBase.of(context).service,
isEnable: projectViewModel.havePrivilege(85),
isEnable: projectViewModel.havePrivilege(106),
),
));

2
lib/widgets/drawer/app_drawer_widget.dart
Unescape Escape View File

@ -725,6 +725,8 @@ class _AppDrawerState extends State<AppDrawer> {
int languageID = Provider.of<ProjectViewModel>(context, listen: false).isArabic ? 1 : 2;
await this.sharedPref.remove(APPOINTMENT_HISTORY_MEDICAL);
appointmentRateViewModel
.getIsLastAppointmentRatedList(languageID)
.then((value) => {

2
lib/widgets/new_design/doctor_header.dart
Unescape Escape View File

@ -107,7 +107,7 @@ class DoctorHeader extends StatelessWidget {
if (headerModel.nationalityFlagURL != null)
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
child: headerModel.nationalityFlagURL.isNotEmpty && headerModel.nationalityFlagURL != null && headerModel.nationalityFlagURL != 'null'? Image.network(headerModel.nationalityFlagURL, height: 20) : SizedBox(),
),
],
)

2
pubspec.yaml
Unescape Escape View File

@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
version: 4.5.93+1
version: 4.5.061+4050061
environment:
sdk: ">=3.0.0 <3.13.0"

Write Preview
Loading…
Cancel
Save