diff --git a/lib/main.dart b/lib/main.dart index 815bea40..cd2aab7a 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -31,13 +31,13 @@ void main() async { await Firebase.initializeApp(); // Pass all uncaught "fatal" errors from the framework to Crashlytics - FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError; + // FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError; // Pass all uncaught asynchronous errors that aren't handled by the Flutter framework to Crashlytics - PlatformDispatcher.instance.onError = (error, stack) { - if (!kDebugMode) FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); - return true; - }; + // PlatformDispatcher.instance.onError = (error, stack) { + // if (!kDebugMode) FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); + // return true; + // }; setupLocator(); HttpOverrides.global = MyHttpOverrides(); diff --git a/lib/pages/MyAppointments/widgets/AppointmentActions.dart b/lib/pages/MyAppointments/widgets/AppointmentActions.dart index 61fddab8..d29030a1 100644 --- a/lib/pages/MyAppointments/widgets/AppointmentActions.dart +++ b/lib/pages/MyAppointments/widgets/AppointmentActions.dart @@ -439,7 +439,7 @@ class _AppointmentActionsState extends State { GifLoaderDialogUtils.showMyDialog(context); DoctorsListService service = new DoctorsListService(); FinalRadiology finalRadiology = new FinalRadiology(); - service.getPatientRadOrders(widget.appo.appointmentNo.toString(), languageID, context).then((res) { + service.getPatientRadOrders(widget.appo.appointmentNo.toString(), widget.appo.projectID, languageID, context).then((res) { GifLoaderDialogUtils.hideDialog(context); if (res['FinalRadiologyList'] != null) { print(res['FinalRadiologyList']); diff --git a/lib/services/appointment_services/GetDoctorsList.dart b/lib/services/appointment_services/GetDoctorsList.dart index 2b039701..943f2112 100644 --- a/lib/services/appointment_services/GetDoctorsList.dart +++ b/lib/services/appointment_services/GetDoctorsList.dart @@ -1285,7 +1285,7 @@ class DoctorsListService extends BaseService { return Future.value(localRes); } - Future getPatientRadOrders(String appoNo, int languageID, BuildContext context) async { + Future getPatientRadOrders(String appoNo, int projectID, int languageID, BuildContext context) async { Map request; if (await this.sharedPref.getObject(USER_PROFILE) != null) { var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); @@ -1295,6 +1295,7 @@ class DoctorsListService extends BaseService { Request req = appGlobal.getPublicRequest(); request = { "AppointmentNo": appoNo, + "ProjectID": projectID, "VersionID": req.VersionID, "Channel": req.Channel, "IPAdress": req.IPAdress, diff --git a/lib/splashPage.dart b/lib/splashPage.dart index 533456ee..c0ff2eb2 100644 --- a/lib/splashPage.dart +++ b/lib/splashPage.dart @@ -86,7 +86,7 @@ class _SplashScreenState extends State { // debugPrint("ALL SHARED PREFERENCES!!!!!"); // debugPrint(jsonEncode(value)); }); - if (!kDebugMode) await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true); + // if (!kDebugMode) await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true); // PushNotificationHandler(context).init(); // Asyncronously } diff --git a/lib/uitl/utils.dart b/lib/uitl/utils.dart index ebe33ac9..2dc03b03 100644 --- a/lib/uitl/utils.dart +++ b/lib/uitl/utils.dart @@ -849,14 +849,12 @@ class Utils { } static Widget tableColumnValueWithFlowChart(String text, String flowChartText, {bool isLast = false, bool isCapitable = true, ProjectViewModel? mProjectViewModel}) { - ProjectViewModel projectViewModel = mProjectViewModel ?? Provider.of(AppGlobal.context); return Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ SizedBox(height: 12), Text( - // isCapitable && !projectViewModel.isArabic ? text.toLowerCase().capitalizeFirstofEach : text, text, maxLines: 2, overflow: TextOverflow.ellipsis, diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index db908230..eb196499 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -161,9 +161,10 @@ class LabResultWidget extends StatelessWidget { Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), // Utils.tableColumnTitle(TranslationBase.of(context).unit, showDivider: false), - // Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), + Utils.tableColumnTitle(TranslationBase.of(context).labResultFlag, showDivider: false), + Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false), - Utils.tableColumnTitle("", showDivider: false), + // Utils.tableColumnTitle("", showDivider: false), ], ), ); @@ -189,23 +190,23 @@ class LabResultWidget extends StatelessWidget { ), Utils.tableColumnValue(labResultList[i].resultValue! + " " + labResultList[i].uOM!, - // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isLast: true, mProjectViewModel: projectViewModel), - // Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""), - // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), - // isLast: true, - // isCapitable: false, - // mProjectViewModel: projectViewModel), - - Utils.tableColumnValue((labResultList[i].referanceRange! ?? ""), - // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + Utils.tableColumnValue((labResultList[i].resultValueFlag ?? ""), + isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), isLast: true, isCapitable: false, mProjectViewModel: projectViewModel), + // Utils.tableColumnValue((labResultList[i].referanceRange! ?? ""), + // // isHighLow: ((labResultList[i].resultValueFlag ?? "").toLowerCase() == "h" || (labResultList[i].resultValueFlag ?? "").toLowerCase() == "l"), + // isLast: true, + // isCapitable: false, + // mProjectViewModel: projectViewModel), + !checkIfCovidLab(patientLabResultList!) ? InkWell( onTap: () { @@ -221,8 +222,8 @@ class LabResultWidget extends StatelessWidget { }, child: Padding( padding: EdgeInsets.only(left: !projectViewModel.isArabic ? 0 : 12, right: !projectViewModel.isArabic ? 12 : 0), - // child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), - child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), + child: Utils.tableColumnValueWithFlowChart(labResultList[i].referanceRange!, TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), + // child: Utils.tableColumnValueWithUnderLine(TranslationBase.of(context).viewFlowChart, isLast: true, isCapitable: false), ), ) : Container(),