Haroon6138
/
HMG_Patient_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Haroon6138:690174c79a3fcac7ba816d5332de51c36490964e
Branches Tags
Haroon6138:master
Haroon6138:updare-to-3.32.sultan
Haroon6138:update-to-3.32-sdk
Haroon6138:lab_result
Haroon6138:merge-update-with-lab-changes
Haroon6138:main
..
compare: Haroon6138:c44c8dac15f4013208e648b4748ca67a322d0c1f
Branches Tags
Haroon6138:master
Haroon6138:updare-to-3.32.sultan
Haroon6138:update-to-3.32-sdk
Haroon6138:lab_result
Haroon6138:merge-update-with-lab-changes
Haroon6138:main

No commits in common. '690174c79a3fcac7ba816d5332de51c36490964e' and 'c44c8dac15f4013208e648b4748ca67a322d0c1f' have entirely different histories.
690174c79a ... c44c8dac15

7 changed files with 15 additions and 25 deletions
Show Stats

12
ios/Runner.xcodeproj/project.pbxproj
Unescape Escape View File

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

6
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
Unescape Escape View File

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

2
lib/core/service/client/base_app_client.dart
Unescape Escape View File

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

5
lib/pages/landing/fragments/home_page_fragment2.dart
Unescape Escape View File

@ -1,4 +1,3 @@
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';
@ -168,9 +167,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",
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(),
// 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,

12
lib/pages/medical/prescriptions/prescription_items_page.dart
Unescape Escape View File

@ -1,5 +1,3 @@
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';
@ -27,9 +25,6 @@ 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';
@ -454,17 +449,14 @@ class PrescriptionItemsPage extends StatelessWidget {
GifLoaderDialogUtils.showMyDialog(context);
await _prescriptionsService
.getMedicationsInstructionsPDF(setupID: prescriptions.setupID!, projectID: prescriptions.projectID!, appointmentNo: prescriptions.appointmentNo.toString())
.then((val) async {
.then((val) {
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), mode: LaunchMode.externalApplication);
// launchUrl(Uri.parse(_prescriptionsService.prescriptionInstructionsPDFLink));
// OpenFilex.open(_prescriptionsService.prescriptionInstructionsPDFLink);
launchUrl(Uri.parse(_prescriptionsService.prescriptionInstructionsPDFLink));
}
});
},

1
lib/pages/medical/reports/report_list_widget.dart
Unescape Escape View File

@ -102,7 +102,6 @@ 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,

2
lib/widgets/data_display/medical/LabResult/newUI/LabItem.dart
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save