diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index d2367bad..cbca443a 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -2141,6 +2141,15 @@ const Map localizedValues = { "EROnlineCheckInTapOnCheckIn": {"en": "Tap on the check-in button within the app", "ar": "اضغط على زر تسجيل الدخول داخل التطبيق"}, "download": {"en": "Download", "ar": "تحميل"}, "share": {"en": "Share", "ar": "يشارك"}, + "readMore": {"en": "Read More", "ar": "اقرأ أكثر"}, + "showLess": {"en": "Show Less", "ar": "عرض أقل"}, + "change": {"en": "Change", "ar": "فرق"}, + "referenceRange": {"en": "Reference Range", "ar": "النطاق المرجعي"}, + "criticalLow": {"en": "Critical Low", "ar": "النطاق المرجعي"}, + "criticalHigh": {"en": "Critical High", "ar": "حرج مرتفع"}, + "high": {"en": "High", "ar": "مرتفع"}, + "normal": {"en": "Normal", "ar": "عادي"}, + "low": {"en": "Low", "ar": "منخفض"}, "nearest": {"en": "Nearest", "ar": "الأقرب"}, "selectRegion": {"en": "Select Region", "ar": "اختر المنطقة"}, "selectFacitlity": {"en": "Select Facility", "ar": "اختر المنشأة"}, @@ -2368,9 +2377,6 @@ const Map localizedValues = { "pleaseEnterMobile": {"en": "Please enter phone number", "ar":"الرجاء إدخال رقم الهاتف"}, "pleaseEnterValidMobile": {"en": "Please enter valid phone number", "ar":"الرجاء إدخال رقم هاتف صالح"}, "pleaseEnterNationalIdOrFileNo": {"en": "Please enter National id or File no", "ar":"الرجاء إدخال رقم الهوية الوطنية أو رقم الملف"}, - - - "thisResult" : {"en": "This Result", "ar": "هذه النتيجة"}, "seeAllGraphValues" : {"en": "See all values", "ar": "شاهد جميع القيم"}, }; diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index fde45219..176c1137 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -207,7 +207,8 @@ class BaseAppClient { debugPrint(jsonBody); // } // return; - if (await Utils.checkConnection(bypassConnectionCheck: bypassConnectionCheck)) { + // if (await Utils.checkConnection(bypassConnectionCheck: bypassConnectionCheck)) { + if (await Utils.checkConnection(bypassConnectionCheck: true)) { final response = await http.post(Uri.parse(url.trim()), body: json.encode(body), headers: headers); final int statusCode = response.statusCode; if (statusCode < 200 || statusCode >= 400 || json == null) { diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index ff35c8a6..d25996bc 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -745,4 +745,9 @@ class _WelcomeLogin extends State { } }); } + showLoader(bool isTrue) { + setState(() { + isLoading = isTrue; + }); + } } diff --git a/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart b/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart index 9fdf3327..2295142d 100644 --- a/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart +++ b/lib/widgets/data_display/medical/LabResult/FlowChartPage.dart @@ -13,7 +13,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import '../../../../core/enum/viewstate.dart'; +import '../../../../uitl/translations_delegate_base.dart'; import '../../../Loader/gif_loader_container.dart'; +import 'full_screen_lab_result_graph.dart'; import 'lab_result_chart_and_detials.dart'; import 'lab_result_graph.dart'; diff --git a/lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart b/lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart index 920f4b4f..a4e05b7a 100644 --- a/lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart +++ b/lib/widgets/data_display/medical/LabResult/full_screen_lab_result_graph.dart @@ -1,8 +1,8 @@ -import 'package:diplomaticquarterapp/core/viewModels/medical/labs_view_model.dart'; -import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/medical/LabResult/lab_result_graph.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:hmg_patient_app/core/viewModels/medical/labs_view_model.dart'; +import 'package:hmg_patient_app/pages/base/base_view.dart'; +import 'package:hmg_patient_app/uitl/translations_delegate_base.dart'; +import 'package:hmg_patient_app/widgets/data_display/medical/LabResult/lab_result_graph.dart'; +import 'package:hmg_patient_app/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; class FullScreenGraph extends StatelessWidget { diff --git a/lib/widgets/data_display/medical/LabResult/lab_result_graph.dart b/lib/widgets/data_display/medical/LabResult/lab_result_graph.dart index 3abcc50d..58505eb8 100644 --- a/lib/widgets/data_display/medical/LabResult/lab_result_graph.dart +++ b/lib/widgets/data_display/medical/LabResult/lab_result_graph.dart @@ -223,8 +223,8 @@ class DynamicResultChart extends StatelessWidget { ) ]; - var max = LineChartHelper.calculateMaxAxisValues(data).maxX; - print("the maxX is the -------> $max"); + // var max = LineChartHelper.calculateMaxAxisValues(data).maxX; + // print("the maxX is the -------> $max"); return data; }