Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed issues

Browse Source
merge-requests/361/head
Fatimah Alshammari 4 years ago
parent 74d0826342
commit 34ccb132dc
6 changed files with 96 additions and 184 deletions
Show Stats Download Patch File Download Diff File

1
lib/config/localized_values.dart
Unescape Escape View File

@ -1178,6 +1178,7 @@ const Map localizedValues = {
},
"offerAndPackages": {"en": "Offers And Packages", "ar": "العروض والباقات"},
"InvoiceNo": {"en": "Invoice No", "ar": "رقم الفاتورة"},
"InvoiceDate": {"en": "Invoice Date", "ar": "تاريخ الفاتورة"},
"SpecialResult": {"en": " Special Result", "ar": "نتيجة خاصة"},
"GeneralResult": {"en": "General Result", "ar": "نتيجة عامة"},
"show-more-btn": {"en": "Flow Chart", "ar": "النتائج التراكمية"},

158
lib/core/service/ancillary_orders_service.dart
Unescape Escape View File

@ -38,165 +38,7 @@ class AncillaryOrdersService extends BaseService {
hasError = false;
await baseAppClient.post(GET_ANCILLARY_ORDERS_DETAILS,
onSuccess: (dynamic response, int statusCode) {
// _ancillaryProcLists.clear();
_ancillaryProcLists = [];
// response['AncillaryOrderProcList'] = [
// {
// "AncillaryOrderProcList": [
// {
// "ApprovalLineItemNo": 0,
// "ApprovalNo": 0,
// "ApprovalStatus": "",
// "ApprovalStatusID": 0,
// "CompanyShare": 501.3,
// "CompanyShareWithTax": 576.5,
// "CompanyTaxAmount": 75.19,
// "DiscountAmount": 55.7,
// "DiscountCategory": 1,
// "DiscountType": "P",
// "DiscountTypeValue": 10,
// "IsApprovalCreated": false,
// "IsApprovalRequired": false,
// "IsCovered": false,
// "OrderDate": "/Date(1601758800000+0300)/",
// "OrderLineItemNo": 1,
// "OrderNo": 2020000001,
// "PartnerID": 0,
// "PartnerShare": 0,
// "PartnerShareType": "P",
// "PatientShare": 0,
// "PatientShareWithTax": 0,
// "PatientTaxAmount": 0,
// "ProcPrice": 557,
// "ProcedureCategoryID": 2,
// "ProcedureCategoryName": "LABORATORY",
// "ProcedureID": "02013001",
// "ProcedureName": "11-DESOXYCORTISOL (COMPOUND S) - S.O",
// "TaxAmount": 75.19,
// "TaxPct": 15
// },
// {
// "ApprovalLineItemNo": 0,
// "ApprovalNo": 0,
// "ApprovalStatus": "",
// "ApprovalStatusID": 0,
// "CompanyShare": 90,
// "CompanyShareWithTax": 103.5,
// "CompanyTaxAmount": 13.5,
// "DiscountAmount": 10,
// "DiscountCategory": 1,
// "DiscountType": "P",
// "DiscountTypeValue": 10,
// "IsApprovalCreated": false,
// "IsApprovalRequired": true,
// "IsCovered": false,
// "OrderDate": "/Date(1601758800000+0300)/",
// "OrderLineItemNo": 4,
// "OrderNo": 2020000001,
// "PartnerID": 0,
// "PartnerShare": 0,
// "PartnerShareType": "P",
// "PatientShare": 0,
// "PatientShareWithTax": 0,
// "PatientTaxAmount": 0,
// "ProcPrice": 100,
// "ProcedureCategoryID": 2,
// "ProcedureCategoryName": "LABORATORY",
// "ProcedureID": "02014011",
// "ProcedureName": "CBC (COMPLETE BLOOD COUNT PROFILE)",
// "TaxAmount": 13.5,
// "TaxPct": 15
// },
// {
// "ApprovalLineItemNo": 0,
// "ApprovalNo": 0,
// "ApprovalStatus": "",
// "ApprovalStatusID": 0,
// "CompanyShare": 347.76,
// "CompanyShareWithTax": 399.92,
// "CompanyTaxAmount": 52.16,
// "DiscountAmount": 38.64,
// "DiscountCategory": 1,
// "DiscountType": "P",
// "DiscountTypeValue": 10,
// "IsApprovalCreated": false,
// "IsApprovalRequired": false,
// "IsCovered": false,
// "OrderDate": "/Date(1601758800000+0300)/",
// "OrderLineItemNo": 3,
// "OrderNo": 2020000001,
// "PartnerID": 0,
// "PartnerShare": 0,
// "PartnerShareType": "P",
// "PatientShare": 0,
// "PatientShareWithTax": 0,
// "PatientTaxAmount": 0,
// "ProcPrice": 386.4,
// "ProcedureCategoryID": 2,
// "ProcedureCategoryName": "LABORATORY",
// "ProcedureID": "02019302",
// "ProcedureName": "21-HYDROXYLASE ABS - S.O",
// "TaxAmount": 52.16,
// "TaxPct": 15
// },
// {
// "ApprovalLineItemNo": 0,
// "ApprovalNo": 0,
// "ApprovalStatus": "",
// "ApprovalStatusID": 0,
// "CompanyShare": 1323,
// "CompanyShareWithTax": 1521.45,
// "CompanyTaxAmount": 198.45,
// "DiscountAmount": 147,
// "DiscountCategory": 1,
// "DiscountType": "P",
// "DiscountTypeValue": 10,
// "IsApprovalCreated": false,
// "IsApprovalRequired": true,
// "IsCovered": false,
// "OrderDate": "/Date(1601758800000+0300)/",
// "OrderLineItemNo": 5,
// "OrderNo": 2020000001,
// "PartnerID": 0,
// "PartnerShare": 0,
// "PartnerShareType": "P",
// "PatientShare": 0,
// "PatientShareWithTax": 0,
// "PatientTaxAmount": 0,
// "ProcPrice": 1470,
// "ProcedureCategoryID": 3,
// "ProcedureCategoryName": "RADIOLOGY",
// "ProcedureID": "03033065",
// "ProcedureName": "CT SCAN - ABDOMEN (WITH CONTRAST)",
// "TaxAmount": 198.45,
// "TaxPct": 15
// }
// ],
// "AppointmentDate": "/Date(1601499600000+0300)/",
// "AppointmentNo": 2016053756,
// "ClinicID": 1,
// "ClinicName": "INTERNAL MEDICINE CLINIC",
// "CompanyID": 0,
// "CompanyName": "Blood Donation Investigation",
// "DoctorID": 1485,
// "DoctorName": "ANAS ABDULLAH",
// "ErrCode": null,
// "GroupID": 2,
// "InsurancePolicyNo": "45976500",
// "Message": "Success",
// "PatientCardID": "232332323",
// "PatientID": 3072055,
// "PatientName": "MAYA KHALED SADDIQ",
// "PatientType": 1,
// "PolicyID": 2,
// "PolicyName": "Test",
// "ProjectID": 15,
// "SetupID": "010266",
// "StatusCode": 1,
// "SubCategoryID": 2,
// "SubPolicyNo": "234234"
// }
// ];
response['AncillaryOrderProcList'].forEach((item) {
ancillaryProcLists.add(AncillaryOrdersListProcListModel.fromJson(item));

38
lib/models/anicllary-orders/ancillary_order_proc_model.dart
Unescape Escape View File

@ -117,36 +117,36 @@ class AncillaryOrdersListProcListModel {
}
class AncillaryOrderProcDetailsList {
int approvalLineItemNo;
int approvalNo;
dynamic approvalLineItemNo;
dynamic approvalNo;
String approvalStatus;
int approvalStatusID;
int companyShare;
int companyShareWithTax;
int companyTaxAmount;
int discountAmount;
int discountCategory;
dynamic approvalStatusID;
dynamic companyShare;
dynamic companyShareWithTax;
dynamic companyTaxAmount;
dynamic discountAmount;
dynamic discountCategory;
String discountType;
int discountTypeValue;
dynamic discountTypeValue;
bool isApprovalCreated;
bool isApprovalRequired;
bool isCovered;
String orderDate;
int orderLineItemNo;
int orderNo;
int partnerID;
int partnerShare;
dynamic orderLineItemNo;
dynamic orderNo;
dynamic partnerID;
dynamic partnerShare;
String partnerShareType;
int patientShare;
double patientShareWithTax;
double patientTaxAmount;
int procPrice;
int procedureCategoryID;
dynamic patientShare;
dynamic patientShareWithTax;
dynamic patientTaxAmount;
dynamic procPrice;
dynamic procedureCategoryID;
String procedureCategoryName;
String procedureID;
String procedureName;
dynamic taxAmount;
int taxPct;
dynamic taxPct;
AncillaryOrderProcDetailsList(
{this.approvalLineItemNo,

62
lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
Unescape Escape View File

@ -8,6 +8,8 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import "package:collection/collection.dart";
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ancillary-orders/ordersPayment.dart';
class AnicllaryOrdersDetails extends StatefulWidget {
final dynamic appoNo;
@ -66,7 +68,12 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
children: [
Button(
label: TranslationBase.of(context).payNow,
onTap: () {},
backgroundColor: Colors.red[800],
onTap: () {
Navigator.push(context,
FadePage(page: OrdersPayment(),
),);
},
)
],
)
@ -128,7 +135,8 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
children: [
Texts(
TranslationBase.of(context).invoiceNo,
fontWeight: FontWeight.bold,
// fontWeight: FontWeight.bold,
color: Colors.red[500],
),
Texts(" : "),
Texts(
@ -139,8 +147,9 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
Row(
children: [
Texts(
TranslationBase.of(context).date,
fontWeight: FontWeight.bold,
TranslationBase.of(context).invoiceDate,
// fontWeight: FontWeight.bold,
color: Colors.red[500],
),
Texts(" : "),
Texts(
@ -154,8 +163,9 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
Row(
children: [
Texts(
TranslationBase.of(context).date,
fontWeight: FontWeight.bold,
TranslationBase.of(context).doctorName,
// fontWeight: FontWeight.bold,
color: Colors.red[500],
),
Texts(" : "),
Texts(
@ -208,7 +218,43 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
Divider(
color: Colors.red[800],
thickness: 3,
)
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Row(
children: [
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Texts(
TranslationBase.of(context).price,
color: Colors.grey[500],
fontSize: 14,
),
SizedBox(width: 15),
Texts(
TranslationBase.of(context).vat,
color: Colors.grey[500],
fontSize: 14,
),
SizedBox(width: 15),
Texts(
TranslationBase.of(context).total,
color: Colors.grey[500],
fontSize: 14,
),
] ),
],
),
Divider(
color: Colors.black26,
),
],
));
}
@ -279,4 +325,6 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
}).toList(),
);
}
}

20
lib/pages/AlHabibMedicalService/ancillary-orders/ordersPayment.dart
Unescape Escape View File

@ -0,0 +1,20 @@
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
class OrdersPayment extends StatefulWidget {
@override
_OrdersPaymentState createState() => _OrdersPaymentState();
}
class _OrdersPaymentState extends State<OrdersPayment> {
@override
Widget build(BuildContext context) {
return Container();
}
}

1
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -1061,6 +1061,7 @@ class TranslationBase {
localizedValues['offerAndPackages'][locale.languageCode];
String get invoiceNo => localizedValues['InvoiceNo'][locale.languageCode];
String get invoiceDate => localizedValues['InvoiceNo'][locale.languageCode];
String get specialResult =>
localizedValues['SpecialResult'][locale.languageCode];
String get generalResult =>

Write Preview
Loading…
Cancel
Save