Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

updates & fixes

Browse Source
dev_3.13.6_search_lab_rad
haroon amjad 6 months ago
parent f56a1627db
commit cb68731679
7 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File

24
android/app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -174,20 +174,20 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<!-- <intent-filter android:autoVerify="true">-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- <category android:name="android.intent.category.DEFAULT" />-->
<!-- <category android:name="android.intent.category.BROWSABLE" />-->
<data
android:host="hmg.com"
android:scheme="http" />
<data
android:host="www.hmg.com"
android:scheme="http" />
<data android:scheme="https" />
</intent-filter>
<!-- <data-->
<!-- android:host="hmg.com"-->
<!-- android:scheme="http" />-->
<!-- <data-->
<!-- android:host="www.hmg.com"-->
<!-- android:scheme="http" />-->
<!-- <data android:scheme="https" />-->
<!-- </intent-filter>-->
<intent-filter>
<action android:name="FLUTTER_NOTIFICATION_CLICK" />

6
lib/config/config.dart
Unescape Escape View File

@ -21,8 +21,8 @@ var PACKAGES_ORDERS = '/api/orders';
var PACKAGES_ORDER_HISTORY = '/api/orders/items';
var PACKAGES_TAMARA_OPT = '/api/orders/paymentoptions/tamara';
// var BASE_URL = 'http://10.50.100.198:2018/';
// var BASE_URL = 'https://uat.hmgwebservices.com/';
var BASE_URL = 'https://hmgwebservices.com/';
var BASE_URL = 'https://uat.hmgwebservices.com/';
// var BASE_URL = 'https://hmgwebservices.com/';
// var BASE_URL = 'http://10.201.204.103/';
// var BASE_URL = 'https://orash.cloudsolutions.com.sa/';
// var BASE_URL = 'https://vidauat.cloudsolutions.com.sa/';
@ -354,7 +354,7 @@ var CAN_PAY_FOR_FOR_WALKIN_APPOINTMENT = 'Services/Doctors.svc/REST/CanPayForWal
var CHANNEL = 3;
var GENERAL_ID = 'Cs2020@2016\$2958';
var IP_ADDRESS = '10.20.10.20';
var VERSION_ID = 18.4;
var VERSION_ID = 18.5;
var SETUP_ID = '91877';
var LANGUAGE = 2;
// var PATIENT_OUT_SA = 0;

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'] = 2007395; //4609100
// body['PatientID'] = 814121; //4609100
// body['TokenID'] = "@dm!n";
// Patient ID: 3027574

1
lib/core/service/medical/reports_service.dart
Unescape Escape View File

@ -195,6 +195,7 @@ class ReportsService extends BaseService {
body['ClinicName'] = clinicName;
body['ProjectID'] = projectID;
body['InvoiceNo'] = invoiceNo;
body['InvoiceNo_VP'] = invoiceNo;
body['PrintedByName'] = user.firstName! + " " + user.lastName!;
dynamic response;

24
lib/pages/medical/balance/my_balance_page.dart
Unescape Escape View File

@ -120,14 +120,16 @@ class MyBalancePage extends StatelessWidget {
),
),
mWidth(6),
projectViewModel.isArabic
? SvgPicture.asset(
"assets/images/new/Saudi_Riyal_Symbol.svg",
width: 22,
height: 22,
color: Colors.white,
)
: Container(),
projectViewModel.user!.outSA == 1
? Container()
: projectViewModel.isArabic
? SvgPicture.asset(
"assets/images/new/Saudi_Riyal_Symbol.svg",
width: 22,
height: 22,
color: Colors.white,
)
: Container(),
],
),
Text(
@ -199,7 +201,11 @@ class MyBalancePage extends StatelessWidget {
),
),
mWidth(6),
projectViewModel.isArabic ? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16) : Container(),
projectViewModel.user!.outSA == 1
? Container()
: projectViewModel.isArabic
? SvgPicture.asset("assets/images/new/Saudi_Riyal_Symbol.svg", width: 16, height: 16)
: Container(),
],
),
],

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

@ -209,8 +209,15 @@ class ReportListWidget extends StatelessWidget {
GifLoaderDialogUtils.showMyDialog(AppGlobal.context);
ReportsService _reportsService = locator<ReportsService>();
_reportsService
.getMedicalReportPDF(report.projectName!, report.clinicDescription!, report.doctorName, DateUtil.convertDateToString(report.requestDate!), report.invoiceNo.toString(), report.projectID!,
DateUtil.convertDateToString(report.requestDate!), report.setupId!)
.getMedicalReportPDF(
report.projectName!,
report.clinicDescription!,
report.doctorName,
DateUtil.convertDateToString(report.requestDate!),
(Utils.isVidaPlusProject(projectViewModel, report.projectID!) ? report.invoiceNo_VP.toString() : report.invoiceNo.toString()),
report.projectID!,
DateUtil.convertDateToString(report.requestDate!),
report.setupId!)
.then((value) async {
GifLoaderDialogUtils.hideDialog(AppGlobal.context);
String path = await _createFileFromString(value["MedicalReportBase64"], "pdf");

2
pubspec.yaml
Unescape Escape View File

@ -1,7 +1,7 @@
name: diplomaticquarterapp
description: A new Flutter application.
version: 4.6.011+1
version: 4.6.092+4050092
environment:
sdk: ">=3.0.0 <3.13.0"

Write Preview
Loading…
Cancel
Save