updates

ios/Runner.xcodeproj/project.pbxproj

@@ -583,7 +583,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -601,7 +601,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.6.015;
+				MARKETING_VERSION = 4.6.017;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -735,7 +735,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -753,7 +753,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.6.015;
+				MARKETING_VERSION = 4.6.017;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -779,7 +779,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -797,7 +797,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.6.015;
+				MARKETING_VERSION = 4.6.017;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.HMG.HMG-Smartphone";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -41,9 +41,9 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"

lib/core/service/client/base_app_client.dart

@@ -187,7 +187,7 @@ class BaseAppClient {
 
       // body['IdentificationNo'] = 1023854217;
       // body['MobileNo'] = "531940021";  //0560717232
-      // body['PatientID'] = 4771637; //4609100
+      // body['PatientID'] = 4772171; //4609100
       // body['TokenID'] = "@dm!n";
 
       // Patient ID: 3027574

lib/pages/landing/fragments/home_page_fragment2.dart

@@ -1,3 +1,4 @@
+import 'package:hmg_patient_app/config/config.dart';
 import 'package:hmg_patient_app/config/size_config.dart';
 import 'package:hmg_patient_app/core/viewModels/dashboard_view_model.dart';
 import 'package:hmg_patient_app/core/viewModels/project_view_model.dart';
@@ -167,9 +168,9 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
                       );
                     },
                     child: SvgPicture.network(
-                      "https://marathoon.com/service/hmgvideo/Banner_English.svg",
+                      // "https://marathoon.com/service/hmgvideo/Banner_English.svg",
                       // "https://marathoon.com/service/hmgvideo/Banner_Arabic.svg",
-                      // projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.titleArabic!.split("\$")[1].trim() : projectViewModel.hisProjectOffers.first.titleName!.split("\$")[1].trim(),
+                      BASE_URL.contains("uat.") ? "https://marathoon.com/service/hmgvideo/Banner_English.svg" : projectViewModel.isArabic ? projectViewModel.hisProjectOffers.first.titleArabic!.split("\$")[1].trim() : projectViewModel.hisProjectOffers.first.titleName!.split("\$")[1].trim(),
                       // height: 300,
                       width: MediaQuery.of(context).size.width,
                       fit: BoxFit.contain,

lib/pages/medical/prescriptions/prescription_items_page.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:hmg_patient_app/core/enum/viewstate.dart';
 import 'package:hmg_patient_app/core/model/prescriptions/Prescriptions.dart';
 import 'package:hmg_patient_app/core/model/prescriptions/prescription_report.dart';
@@ -25,6 +27,9 @@ import 'package:hmg_patient_app/widgets/show_zoom_image_dialog.dart';
 import 'package:hmg_patient_app/widgets/transitions/fade_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
+import 'package:open_filex/open_filex.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -449,14 +454,17 @@ class PrescriptionItemsPage extends StatelessWidget {
                               GifLoaderDialogUtils.showMyDialog(context);
                               await _prescriptionsService
                                   .getMedicationsInstructionsPDF(setupID: prescriptions.setupID!, projectID: prescriptions.projectID!, appointmentNo: prescriptions.appointmentNo.toString())
-                                  .then((val) {
+                                  .then((val) async {
                                 if (_prescriptionsService.hasError) {
                                   GifLoaderDialogUtils.hideDialog(context);
                                   AppToast.showErrorToast(message: _prescriptionsService.error ?? "Unable to get PDF.");
                                 } else {
                                   GifLoaderDialogUtils.hideDialog(context);
                                   print(_prescriptionsService.prescriptionInstructionsPDFLink);
-                                  launchUrl(Uri.parse(_prescriptionsService.prescriptionInstructionsPDFLink));
+
+                                  launchUrl(Uri.parse(_prescriptionsService.prescriptionInstructionsPDFLink), mode: LaunchMode.externalApplication);
+                                  // launchUrl(Uri.parse(_prescriptionsService.prescriptionInstructionsPDFLink));
+                                  // OpenFilex.open(_prescriptionsService.prescriptionInstructionsPDFLink);
                                 }
                               });
                             },

lib/pages/medical/reports/report_list_widget.dart

@@ -102,6 +102,7 @@ class ReportListWidget extends StatelessWidget {
                               children: <Widget>[
                                 if (report.projectName != null) MyRichText(TranslationBase.of(context).hospital + ":", report.projectName!, projectViewModel.isArabic),
                                 if (report.clinicDescription != null) MyRichText(TranslationBase.of(context).clinic + ":", report.clinicDescription!, projectViewModel.isArabic),
+                                // MyRichText(TranslationBase.of(context).invoiceNo + ":", report.invoiceNo_VP.toString(), projectViewModel.isArabic),
                                 Row(
                                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                   mainAxisSize: MainAxisSize.max,

lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart

@@ -85,7 +85,7 @@ class _LabItemState extends State<LabItem> {
               children: [
                 ItemResultCardWidgetWithParams(
                   title: data?.description ?? '',
-                  subTitle: data?.resultValue ?? '',
+                  subTitle: "${data?.resultValue} ${data?.uOM}" ?? '',
                   referenceRange: data?.referanceRange ?? '',
                   percentage: data?.percentage ?? 0.0,
                   note: data?.notes ?? '',