diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
deleted file mode 100644
index ea96fe5f..00000000
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart
index c234304f..43b0a9b1 100644
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@@ -75,9 +75,13 @@ class BaseAppClient {
body['Channel'] = CHANNEL;
if (body.containsKey('LanguageID')) {
- if(body['LanguageID'] != null) {
+ if (body['LanguageID'] != null) {
//change this line because language issue happened on dental
- body['LanguageID'] = body['LanguageID'] =='ar' ? 1 : body['LanguageID'] =='en' ? 2 : body['LanguageID'];
+ body['LanguageID'] = body['LanguageID'] == 'ar'
+ ? 1
+ : body['LanguageID'] == 'en'
+ ? 2
+ : body['LanguageID'];
} else {
body['LanguageID'] = Provider.of(AppGlobal.context, listen: false).isArabic ? 1 : 2;
}
@@ -716,7 +720,7 @@ class BaseAppClient {
String getSessionId(String id) {
///return id.replaceAll(RegExp('/[^\w\s]/'), '');
- return id.replaceAll(RegExp('/[^a-zA-Z]'), '');
+ if (id != null) return id.replaceAll(RegExp('/[^a-zA-Z]'), '');
}
static defaultHttpParameters() async {
diff --git a/lib/core/viewModels/medical/ask_doctor_view_model.dart b/lib/core/viewModels/medical/ask_doctor_view_model.dart
index abe2220c..9f8d9862 100644
--- a/lib/core/viewModels/medical/ask_doctor_view_model.dart
+++ b/lib/core/viewModels/medical/ask_doctor_view_model.dart
@@ -28,12 +28,14 @@ class AskDoctorViewModel extends BaseViewModel {
setState(ViewState.Error);
} else if (_myDoctorService.patientDoctorAppointmentList.length != 0) {
_myDoctorService.patientDoctorAppointmentList.forEach((element) {
- List doctorByClinic = patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.projectName).toList();
+ if (!element.isLiveCareClinic) {
+ List doctorByClinic = patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.projectName).toList();
- if (doctorByClinic.length != 0) {
- patientDoctorAppointmentListHospital[patientDoctorAppointmentListHospital.indexOf(doctorByClinic[0])].patientDoctorAppointmentList.add(element);
- } else {
- patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(filterName: element.projectName, patientDoctorAppointment: element));
+ if (doctorByClinic.length != 0) {
+ patientDoctorAppointmentListHospital[patientDoctorAppointmentListHospital.indexOf(doctorByClinic[0])].patientDoctorAppointmentList.add(element);
+ } else {
+ patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(filterName: element.projectName, patientDoctorAppointment: element));
+ }
}
setState(ViewState.Idle);
});
diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart
index 9feb62ec..ef6f5e3d 100644
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@@ -341,8 +341,8 @@ class _MyFamily extends State with TickerProviderStateMixin {
return requestDecoratedContainerWithExpandable(
TranslationBase.of(context).sentRequest,
[
- Expanded(flex: 4, child: columnText(TranslationBase.of(context).name)),
- Expanded(flex: 2, child: columnText(TranslationBase.of(context).status)),
+ Expanded(flex: 3, child: columnText(TranslationBase.of(context).name)),
+ Expanded(flex: 1, child: columnText(TranslationBase.of(context).status)),
],
sentRecordsList.map((result) {
return sentItemView(result);
@@ -351,29 +351,26 @@ class _MyFamily extends State with TickerProviderStateMixin {
Widget sentItemView(GetAllSharedRecordsByStatusList result) {
return Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Expanded(flex: 2, child: rowText(result.patientName)),
+ Expanded(flex: 3, child: rowText(result.patientName)),
Expanded(
flex: 1,
- child: Row(
- children: [
- Container(
- padding: EdgeInsets.only(top: 3, bottom: 3, left: 8, right: 8),
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(50),
- color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
- ),
- child: Text(
- result.statusDescription != null ? result.statusDescription : "",
- style: TextStyle(
- fontSize: 10,
- color: Colors.white,
- letterSpacing: -0.4,
- fontWeight: FontWeight.w600,
- ),
- ),
+ child: Container(
+ padding: EdgeInsets.only(top: 3, bottom: 3, left: 8, right: 8),
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(50),
+ color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
+ ),
+ child: Text(
+ result.statusDescription != null ? result.statusDescription : "",
+ style: TextStyle(
+ fontSize: 10,
+ color: Colors.white,
+ letterSpacing: -0.4,
+ fontWeight: FontWeight.w600,
),
- ],
+ ),
),
),
],
@@ -553,6 +550,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
List sentRecordsList = [];
Future getFamilyFiles() async {
+ int languageID = projectViewModel.isArabic ? 1 : 2;
GetAllSharedRecordsByStatusResponse familySharedRecords;
if (await sharedPref.getObject(FAMILY_FILE) != null) {
familySharedRecords = GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE));
@@ -560,7 +558,6 @@ class _MyFamily extends State with TickerProviderStateMixin {
GifLoaderDialogUtils.showMyDialog(context);
try {
if (familySharedRecords == null) {
- int languageID = Provider.of(context, listen: false).isArabic ? 1 : 2;
familySharedRecords = await familyFileProvider.getSharedRecordByStatus(languageID);
}
familySharedRecordsList =[];
@@ -573,7 +570,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
});
approvedRecordsList = [];
pendingRecordsList = [];
- GetAllSharedRecordsByStatusResponse pendingAndApprovedRecords = await getUserViewRequest();
+ GetAllSharedRecordsByStatusResponse pendingAndApprovedRecords = await getUserViewRequest(languageID);
pendingAndApprovedRecords.getAllSharedRecordsByStatusList.forEach((element) {
print(element.toJson());
@@ -589,9 +586,9 @@ class _MyFamily extends State with TickerProviderStateMixin {
GifLoaderDialogUtils.hideDialog(context);
}
- Future getUserViewRequest() async {
+ Future getUserViewRequest(int languageID) async {
var user = await sharedPref.getObject(USER_PROFILE);
- return familyFileProvider.getUserViewRequest(user['PatientID']);
+ return familyFileProvider.getUserViewRequest(user['PatientID'], languageID);
}
Future getSentRequest() async {
@@ -617,7 +614,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
Widget columnText(String title) {
return Text(
title,
- textAlign: TextAlign.left,
+ // textAlign: TextAlign.left,
style: TextStyle(
fontSize: 12,
color: CustomColors.textDarkColor,
@@ -630,7 +627,7 @@ class _MyFamily extends State with TickerProviderStateMixin {
Widget rowText(String title) {
return Text(
title,
- textAlign: TextAlign.left,
+ // textAlign: TextAlign.left,
style: TextStyle(
fontSize: 10,
color: CustomColors.textColor,
diff --git a/lib/pages/MyAppointments/MyAppointments.dart b/lib/pages/MyAppointments/MyAppointments.dart
index 072c622e..b1477b77 100644
--- a/lib/pages/MyAppointments/MyAppointments.dart
+++ b/lib/pages/MyAppointments/MyAppointments.dart
@@ -501,7 +501,6 @@ class _MyAppointmentsState extends State with SingleTickerProvid
getPatientAppointmentHistory(false, true);
}
});
- //_pageController.animateToPage(index, duration: Duration(milliseconds: 250), curve: Curves.easeInOut);
},
),
),
diff --git a/lib/services/family_files/family_files_provider.dart b/lib/services/family_files/family_files_provider.dart
index 4b8b31ad..f209812e 100644
--- a/lib/services/family_files/family_files_provider.dart
+++ b/lib/services/family_files/family_files_provider.dart
@@ -61,7 +61,7 @@ class FamilyFilesProvider with ChangeNotifier {
}
}
- Future getUserViewRequest(responseID) async {
+ Future getUserViewRequest(responseID, int languageID) async {
try {
dynamic localRes;
Map request = {};
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index 8f3cf40c..af6cd03f 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -669,7 +669,7 @@ class _AppDrawerState extends State {
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
print(err);
- AppToast.showErrorToast(message: err.toString());
+ // AppToast.showErrorToast(message: err.toString());
Navigator.of(context).pop();
});
}