Updates & fixes

dev_3.3_faiz_payfort
haroon amjad 2 years ago
parent fddb423451
commit 3401496739

@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-FIRAnalyticsDebugEnabled"
isEnabled = "NO">
</CommandLineArgument>
<CommandLineArgument
argument = "-v"
isEnabled = "NO">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
BuildableName = "Runner.app"
BlueprintName = "Runner"
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

@ -75,9 +75,13 @@ class BaseAppClient {
body['Channel'] = CHANNEL; body['Channel'] = CHANNEL;
if (body.containsKey('LanguageID')) { if (body.containsKey('LanguageID')) {
if(body['LanguageID'] != null) { if (body['LanguageID'] != null) {
//change this line because language issue happened on dental //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 { } else {
body['LanguageID'] = Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isArabic ? 1 : 2; body['LanguageID'] = Provider.of<ProjectViewModel>(AppGlobal.context, listen: false).isArabic ? 1 : 2;
} }
@ -716,7 +720,7 @@ class BaseAppClient {
String getSessionId(String id) { String getSessionId(String id) {
///return id.replaceAll(RegExp('/[^\w\s]/'), ''); ///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 { static defaultHttpParameters() async {

@ -28,12 +28,14 @@ class AskDoctorViewModel extends BaseViewModel {
setState(ViewState.Error); setState(ViewState.Error);
} else if (_myDoctorService.patientDoctorAppointmentList.length != 0) { } else if (_myDoctorService.patientDoctorAppointmentList.length != 0) {
_myDoctorService.patientDoctorAppointmentList.forEach((element) { _myDoctorService.patientDoctorAppointmentList.forEach((element) {
List<PatientDoctorAppointmentList> doctorByClinic = patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.projectName).toList(); if (!element.isLiveCareClinic) {
List<PatientDoctorAppointmentList> doctorByClinic = patientDoctorAppointmentListHospital.where((elementClinic) => elementClinic.filterName == element.projectName).toList();
if (doctorByClinic.length != 0) { if (doctorByClinic.length != 0) {
patientDoctorAppointmentListHospital[patientDoctorAppointmentListHospital.indexOf(doctorByClinic[0])].patientDoctorAppointmentList.add(element); patientDoctorAppointmentListHospital[patientDoctorAppointmentListHospital.indexOf(doctorByClinic[0])].patientDoctorAppointmentList.add(element);
} else { } else {
patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(filterName: element.projectName, patientDoctorAppointment: element)); patientDoctorAppointmentListHospital.add(PatientDoctorAppointmentList(filterName: element.projectName, patientDoctorAppointment: element));
}
} }
setState(ViewState.Idle); setState(ViewState.Idle);
}); });

@ -341,8 +341,8 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
return requestDecoratedContainerWithExpandable( return requestDecoratedContainerWithExpandable(
TranslationBase.of(context).sentRequest, TranslationBase.of(context).sentRequest,
[ [
Expanded(flex: 4, child: columnText(TranslationBase.of(context).name)), Expanded(flex: 3, child: columnText(TranslationBase.of(context).name)),
Expanded(flex: 2, child: columnText(TranslationBase.of(context).status)), Expanded(flex: 1, child: columnText(TranslationBase.of(context).status)),
], ],
sentRecordsList.map<Widget>((result) { sentRecordsList.map<Widget>((result) {
return sentItemView(result); return sentItemView(result);
@ -351,29 +351,26 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Widget sentItemView(GetAllSharedRecordsByStatusList result) { Widget sentItemView(GetAllSharedRecordsByStatusList result) {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Expanded(flex: 2, child: rowText(result.patientName)), Expanded(flex: 3, child: rowText(result.patientName)),
Expanded( Expanded(
flex: 1, flex: 1,
child: Row( child: Container(
children: [ padding: EdgeInsets.only(top: 3, bottom: 3, left: 8, right: 8),
Container( decoration: BoxDecoration(
padding: EdgeInsets.only(top: 3, bottom: 3, left: 8, right: 8), borderRadius: BorderRadius.circular(50),
decoration: BoxDecoration( color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127),
borderRadius: BorderRadius.circular(50), ),
color: result.status == 3 ? Color(0xff349745) : Color(0xffD02127), child: Text(
), result.statusDescription != null ? result.statusDescription : "",
child: Text( style: TextStyle(
result.statusDescription != null ? result.statusDescription : "", fontSize: 10,
style: TextStyle( color: Colors.white,
fontSize: 10, letterSpacing: -0.4,
color: Colors.white, fontWeight: FontWeight.w600,
letterSpacing: -0.4,
fontWeight: FontWeight.w600,
),
),
), ),
], ),
), ),
), ),
], ],
@ -553,6 +550,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
List<GetAllSharedRecordsByStatusList> sentRecordsList = []; List<GetAllSharedRecordsByStatusList> sentRecordsList = [];
Future getFamilyFiles() async { Future getFamilyFiles() async {
int languageID = projectViewModel.isArabic ? 1 : 2;
GetAllSharedRecordsByStatusResponse familySharedRecords; GetAllSharedRecordsByStatusResponse familySharedRecords;
if (await sharedPref.getObject(FAMILY_FILE) != null) { if (await sharedPref.getObject(FAMILY_FILE) != null) {
familySharedRecords = GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE)); familySharedRecords = GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE));
@ -560,7 +558,6 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
try { try {
if (familySharedRecords == null) { if (familySharedRecords == null) {
int languageID = Provider.of<ProjectViewModel>(context, listen: false).isArabic ? 1 : 2;
familySharedRecords = await familyFileProvider.getSharedRecordByStatus(languageID); familySharedRecords = await familyFileProvider.getSharedRecordByStatus(languageID);
} }
familySharedRecordsList =[]; familySharedRecordsList =[];
@ -573,7 +570,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
}); });
approvedRecordsList = []; approvedRecordsList = [];
pendingRecordsList = []; pendingRecordsList = [];
GetAllSharedRecordsByStatusResponse pendingAndApprovedRecords = await getUserViewRequest(); GetAllSharedRecordsByStatusResponse pendingAndApprovedRecords = await getUserViewRequest(languageID);
pendingAndApprovedRecords.getAllSharedRecordsByStatusList.forEach((element) { pendingAndApprovedRecords.getAllSharedRecordsByStatusList.forEach((element) {
print(element.toJson()); print(element.toJson());
@ -589,9 +586,9 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
} }
Future getUserViewRequest() async { Future getUserViewRequest(int languageID) async {
var user = await sharedPref.getObject(USER_PROFILE); var user = await sharedPref.getObject(USER_PROFILE);
return familyFileProvider.getUserViewRequest(user['PatientID']); return familyFileProvider.getUserViewRequest(user['PatientID'], languageID);
} }
Future<GetAllSharedRecordsByStatusResponse> getSentRequest() async { Future<GetAllSharedRecordsByStatusResponse> getSentRequest() async {
@ -617,7 +614,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Widget columnText(String title) { Widget columnText(String title) {
return Text( return Text(
title, title,
textAlign: TextAlign.left, // textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
color: CustomColors.textDarkColor, color: CustomColors.textDarkColor,
@ -630,7 +627,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
Widget rowText(String title) { Widget rowText(String title) {
return Text( return Text(
title, title,
textAlign: TextAlign.left, // textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
color: CustomColors.textColor, color: CustomColors.textColor,

@ -501,7 +501,6 @@ class _MyAppointmentsState extends State<MyAppointments> with SingleTickerProvid
getPatientAppointmentHistory(false, true); getPatientAppointmentHistory(false, true);
} }
}); });
//_pageController.animateToPage(index, duration: Duration(milliseconds: 250), curve: Curves.easeInOut);
}, },
), ),
), ),

@ -61,7 +61,7 @@ class FamilyFilesProvider with ChangeNotifier {
} }
} }
Future<GetAllSharedRecordsByStatusResponse> getUserViewRequest(responseID) async { Future<GetAllSharedRecordsByStatusResponse> getUserViewRequest(responseID, int languageID) async {
try { try {
dynamic localRes; dynamic localRes;
Map<String, dynamic> request = {}; Map<String, dynamic> request = {};

@ -669,7 +669,7 @@ class _AppDrawerState extends State<AppDrawer> {
}).catchError((err) { }).catchError((err) {
GifLoaderDialogUtils.hideDialog(context); GifLoaderDialogUtils.hideDialog(context);
print(err); print(err);
AppToast.showErrorToast(message: err.toString()); // AppToast.showErrorToast(message: err.toString());
Navigator.of(context).pop(); Navigator.of(context).pop();
}); });
} }

Loading…
Cancel
Save