diff --git a/GoogleService-Info_DQ.plist b/GoogleService-Info_DQ.plist
new file mode 100644
index 00000000..633037cb
--- /dev/null
+++ b/GoogleService-Info_DQ.plist
@@ -0,0 +1,38 @@
+
+
+
+
+ CLIENT_ID
+ 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt
+ ANDROID_CLIENT_ID
+ 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com
+ API_KEY
+ AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA
+ GCM_SENDER_ID
+ 815750722565
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.HMG.HMG-Smartphone
+ PROJECT_ID
+ api-project-815750722565
+ STORAGE_BUCKET
+ api-project-815750722565.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:815750722565:ios:328ec247a81a2ca23c186c
+ DATABASE_URL
+ https://api-project-815750722565.firebaseio.com
+
+
\ No newline at end of file
diff --git a/GoogleService-Info_HMG.plist b/GoogleService-Info_HMG.plist
new file mode 100644
index 00000000..153aa2c6
--- /dev/null
+++ b/GoogleService-Info_HMG.plist
@@ -0,0 +1,38 @@
+
+
+
+
+ CLIENT_ID
+ 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com
+ REVERSED_CLIENT_ID
+ com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt
+ ANDROID_CLIENT_ID
+ 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com
+ API_KEY
+ AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA
+ GCM_SENDER_ID
+ 815750722565
+ PLIST_VERSION
+ 1
+ BUNDLE_ID
+ com.HMG.Smartphone
+ PROJECT_ID
+ api-project-815750722565
+ STORAGE_BUCKET
+ api-project-815750722565.appspot.com
+ IS_ADS_ENABLED
+
+ IS_ANALYTICS_ENABLED
+
+ IS_APPINVITE_ENABLED
+
+ IS_GCM_ENABLED
+
+ IS_SIGNIN_ENABLED
+
+ GOOGLE_APP_ID
+ 1:815750722565:ios:328ec247a81a2ca23c186c
+ DATABASE_URL
+ https://api-project-815750722565.firebaseio.com
+
+
\ No newline at end of file
diff --git a/ios/.gitignore b/ios/.gitignore
index e67828a4..e96ef602 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -30,6 +30,3 @@ Runner/GeneratedPluginRegistrant.*
!default.mode2v3
!default.pbxuser
!default.perspectivev3
-/Runner.xcworkspace/contents.xcworkspacedata
-/Runner.xcodeproj/project.pbxproj
-/Flutter/.last_build_id
diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id
index 4a225219..b5ed87ba 100644
--- a/ios/Flutter/.last_build_id
+++ b/ios/Flutter/.last_build_id
@@ -1 +1 @@
-d69545ca05f0ca200eba92121a1458fb
\ No newline at end of file
+a30437b5671472a3d6a8672edcfc504b
\ No newline at end of file
diff --git a/ios/Podfile b/ios/Podfile
index 1d1a003e..313ea4a1 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -38,4 +38,4 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_ios_build_settings(target)
end
-end
\ No newline at end of file
+end
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 31d8d1f5..a28140cf 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
+
+
-
-
+
+
+
+
-
-
-
- DisableBuildSystemDeprecationWarning
-
- PreviewsEnabled
-
-
-
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 6a2a87ce..832de5bc 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
- Dr. Alhabib MC
+ Dr. Sulaiman Al Habib MC
CFBundleExecutable
$(EXECUTABLE_NAME)
CFBundleIdentifier
@@ -24,6 +24,8 @@
$(FLUTTER_BUILD_NUMBER)
LSRequiresIPhoneOS
+ NSAppleMusicUsageDescription
+ Required usage description for a Flutter dependency
NSBluetoothAlwaysUsageDescription
This App requires access to Bluetooth to connect blood pressure & blood sugar devices with the app to analyze the data.
NSBluetoothPeripheralUsageDescription
@@ -50,12 +52,11 @@
This app requires photo library access to select image as document & upload it.
NSRemindersUsageDescription
This app requires calendar access to set reminders for Virtual & Normal Appointments.
- NSSpeechRecognitionUsageDescription
- This app requires access to speech recognition to identify which words are spoken into the microphone.
- NSAppleMusicUsageDescription
- Required usage description for a Flutter dependency
+ NSSpeechRecognitionUsageDescription
+ This app requires access to speech recognition to identify which words are spoken into the microphone.
UIBackgroundModes
+ fetch
remote-notification
UILaunchStoryboardName
@@ -75,7 +76,5 @@
UIViewControllerBasedStatusBarAppearance
- io.flutter.embedded_views_preview
-
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 8b70069e..27361254 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -41,6 +41,8 @@ const GET_Patient_LAB_SPECIAL_RESULT =
const GET_Patient_LAB_RESULT = 'Services/Patients.svc/REST/GetPatientLabResults';
const GET_Patient_LAB_ORDERS_RESULT = 'Services/Patients.svc/REST/GetPatientLabOrdersResults';
+const SEND_LAB_REPORT_EMAIL = 'Services/Notifications.svc/REST/SendLabReportEmail';
+
///
const GET_PATIENT_ORDERS = 'Services/Patients.svc/REST/GetPatientRadOrders';
const GET_PATIENT_LAB_ORDERS_BY_APPOINTMENT = 'Services/Patients.svc/REST/GetPatientLabResultsByAppointmentNo';
@@ -248,7 +250,7 @@ const UPDATE_HEALTH_TERMS =
const CHANNEL = 3;
const GENERAL_ID = 'Cs2020@2016\$2958';
const IP_ADDRESS = '10.20.10.20';
-const VERSION_ID = 6.1;
+const VERSION_ID = 7.0;
const SETUP_ID = '91877';
const LANGUAGE = 2;
const PATIENT_OUT_SA = 0;
@@ -384,7 +386,7 @@ class AppGlobal {
Request getPublicRequest() {
Request request = new Request();
- request.VersionID = 6.0; //3.6;
+ request.VersionID = 7.0; //3.6;
request.Channel = 3;
request.IPAdress = "10.20.10.20";
request.generalid = 'Cs2020@2016\$2958';
@@ -393,8 +395,6 @@ class AppGlobal {
request.IPAdress = IP_ADDRESS; //"10.20.10.20";
request.generalid = GENERAL_ID; //'Cs2020@2016\$2958';
request.PatientOutSA = 0;
- request.SessionID = "wEVNbagIkaNhGECWZjHaA";
- request.TokenID = "@dm!n";
request.isDentalAllowedBackend = false;
request.DeviceTypeID = Platform.isIOS ? 1 : 2;
request.DeviceType = Platform.isIOS ? "iOS" : "Android";
diff --git a/lib/core/model/hospitals/hospitals_model.dart b/lib/core/model/hospitals/hospitals_model.dart
index 264528c7..92421db9 100644
--- a/lib/core/model/hospitals/hospitals_model.dart
+++ b/lib/core/model/hospitals/hospitals_model.dart
@@ -13,7 +13,7 @@ class HospitalsModel {
String latitude;
String longitude;
dynamic mainProjectID;
- Null projectOutSA;
+ bool projectOutSA;
bool usingInDoctorApp;
HospitalsModel(
diff --git a/lib/core/service/medical/labs_service.dart b/lib/core/service/medical/labs_service.dart
index 92914964..ecf8e047 100644
--- a/lib/core/service/medical/labs_service.dart
+++ b/lib/core/service/medical/labs_service.dart
@@ -120,7 +120,7 @@ class LabsService extends BaseService {
_requestSendLabReportEmail.patientMobileNumber = user.mobileNumber;
_requestSendLabReportEmail.projectName = patientLabOrder.projectName;
- await baseAppClient.post(GET_Patient_LAB_SPECIAL_RESULT,
+ await baseAppClient.post(SEND_LAB_REPORT_EMAIL,
onSuccess: (dynamic response, int statusCode) {
}, onFailure: (String error, int statusCode) {
diff --git a/lib/core/viewModels/qr_view_model.dart b/lib/core/viewModels/qr_view_model.dart
index 9833d6c8..378da2cf 100644
--- a/lib/core/viewModels/qr_view_model.dart
+++ b/lib/core/viewModels/qr_view_model.dart
@@ -1,5 +1,5 @@
import 'dart:convert';
-import 'package:barcode_scan_fix/barcode_scan.dart';
+// import 'package:barcode_scan/barcode_scan.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/qr/qr_parking_model.dart';
@@ -15,11 +15,11 @@ class QrViewModel extends BaseViewModel {
readQr() async {
//TODO fix the barcode scan
- String result = await BarcodeScanner.scan();
- var data = json.decode(result);
- var qRParkingID = data['QRParkingID'];
+ // ScanResult result = await BarcodeScanner.scan();
+ // var data = json.decode(result.rawContent);
+ // var qRParkingID = data['QRParkingID'];
setState(ViewState.BusyLocal);
- await _qrService.getQRParkingByID(qRParkingID);
+ // await _qrService.getQRParkingByID(qRParkingID);
if (_qrService.hasError) {
error = _qrService.error;
setState(ViewState.ErrorLocal);
diff --git a/lib/pages/BookAppointment/components/SearchByClinic.dart b/lib/pages/BookAppointment/components/SearchByClinic.dart
index 4d5d4d49..587d76d6 100644
--- a/lib/pages/BookAppointment/components/SearchByClinic.dart
+++ b/lib/pages/BookAppointment/components/SearchByClinic.dart
@@ -179,6 +179,7 @@ class _SearchByClinicState extends State {
getProjectsList();
} else {}
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
print(err);
});
}
@@ -196,6 +197,7 @@ class _SearchByClinicState extends State {
filterClinic();
} else {}
}).catchError((err) {
+ GifLoaderDialogUtils.hideDialog(context);
print(err);
});
}
@@ -313,7 +315,7 @@ class _SearchByClinicState extends State {
filterClinic() {
setState(() {
- if (widget.clnicIds.length > 0) {
+ if (widget.clnicIds != null && widget.clnicIds.length > 0) {
clinicsList = clinicsList
.where((i) => widget.clnicIds.indexOf(i.clinicID) > -1)
.toList();
diff --git a/lib/pages/MyAppointments/models/ArrivedButtons.dart b/lib/pages/MyAppointments/models/ArrivedButtons.dart
index a710e00c..6baf7858 100644
--- a/lib/pages/MyAppointments/models/ArrivedButtons.dart
+++ b/lib/pages/MyAppointments/models/ArrivedButtons.dart
@@ -40,8 +40,8 @@ class ArrivedButtons {
"caller": "insertComplaint"
},
{
- "title": TranslationBase.of(AppGlobal.context).insuranceApproval,
- "subtitle": TranslationBase.of(AppGlobal.context).insuranceSubtitle,
+ "title": TranslationBase.of(AppGlobal.context).insurance,
+ "subtitle": TranslationBase.of(AppGlobal.context).approvals,
"icon": "assets/images/new-design/insurance_approvals_icon.png",
"caller": "Insurance"
},
diff --git a/lib/pages/insurance/insurance_update_screen.dart b/lib/pages/insurance/insurance_update_screen.dart
index 70a3a302..4e82d244 100644
--- a/lib/pages/insurance/insurance_update_screen.dart
+++ b/lib/pages/insurance/insurance_update_screen.dart
@@ -102,7 +102,7 @@ class _InsuranceUpdateState extends State
controller: _tabController,
children: [
Container(
- child: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.isNotEmpty
+ child: model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList != null && model.getAllSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.isNotEmpty
? ListView.builder(
itemCount: model.getAllSharedRecordsByStatusResponse
.getAllSharedRecordsByStatusList.length,
diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart
index dcf51b3d..bb562888 100644
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@@ -570,7 +570,7 @@ class _HomePageState extends State {
title: TranslationBase.of(context).lab,
imagePath: 'lab_result_icon.png',
subTitle:
- TranslationBase.of(context).lab,
+ TranslationBase.of(context).radiologySubtitle,
),
),
),
diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart
index 37592733..8e87e978 100644
--- a/lib/pages/medical/medical_profile_page.dart
+++ b/lib/pages/medical/medical_profile_page.dart
@@ -315,7 +315,7 @@ class _MedicalProfilePageState extends State {
},
child: MedicalProfileItem(
title: TranslationBase.of(context)
- .insuranceApproval,
+ .insurance,
imagePath:
'insurance_approvals_icon.png',
subTitle: TranslationBase.of(context)
diff --git a/lib/services/clinic_services/get_clinic_service.dart b/lib/services/clinic_services/get_clinic_service.dart
index 4bde015b..5e72d601 100644
--- a/lib/services/clinic_services/get_clinic_service.dart
+++ b/lib/services/clinic_services/get_clinic_service.dart
@@ -81,13 +81,10 @@ class ClinicListService extends BaseService {
request = {
"LanguageID": languageID == 'ar' ? 1 : 2,
"IPAdress": "10.20.10.20",
- "VersionID": req.VersionID,
"Channel": req.Channel,
"generalid": 'Cs2020@2016\$2958',
"PatientOutSA": 0,
- "TokenID": "",
- "DeviceTypeID": req.DeviceTypeID,
- "SessionID": null
+ "DeviceTypeID": req.DeviceTypeID
};
dynamic localRes;
diff --git a/pubspec.yaml b/pubspec.yaml
index 1ee96451..e8984699 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: diplomaticquarterapp
description: A new Flutter application.
-version: 1.0.6+7
+version: 1.1.0+11
environment:
sdk: ">=2.6.0 <3.0.0"
@@ -83,7 +83,7 @@ dependencies:
google_maps_flutter: ^1.2.0
# Qr code Scanner
- barcode_scan_fix: ^1.0.2
+# barcode_scan: ^3.0.1
# Rating Stars
rating_bar: ^0.2.0