Dev_3.3_MedicalReportCR
haroon amjad 3 years ago
parent 9ed454f67a
commit df610690d5

@ -1897,4 +1897,5 @@ const Map localizedValues = {
"invalidInsurance": {"en": "You cannot make online payment because you do not have a valid insurance.", "ar": "لا يمكنك إجراء الدفع عبر الإنترنت لأنه ليس لديك تأمين صالح."}, "invalidInsurance": {"en": "You cannot make online payment because you do not have a valid insurance.", "ar": "لا يمكنك إجراء الدفع عبر الإنترنت لأنه ليس لديك تأمين صالح."},
"continueCash": {"en": "Continue as cash", "ar": "تواصل نقدا"}, "continueCash": {"en": "Continue as cash", "ar": "تواصل نقدا"},
"updateInsurance": {"en": "Update insurance", "ar": "تحديث التأمين"}, "updateInsurance": {"en": "Update insurance", "ar": "تحديث التأمين"},
"downloadReport": {"en": "Download Report", "ar": "تحميل تقرير المختبر"},
}; };

@ -149,7 +149,7 @@ class BaseAppClient {
// body['IdentificationNo'] = 1023854217; // body['IdentificationNo'] = 1023854217;
// body['MobileNo'] = "531940021"; // body['MobileNo'] = "531940021";
// body['PatientID'] = 4767370; //3844083 // body['PatientID'] = 2001273; //3844083
// body['TokenID'] = "@dm!n"; // body['TokenID'] = "@dm!n";
// Patient ID: 3027574 // Patient ID: 3027574

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/LabResult/laboratory_result_widget.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/LabResult/laboratory_result_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -37,22 +38,47 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
backgroundColor: Color(0xffF8F8F8), backgroundColor: Color(0xffF8F8F8),
body: ListView.builder( body: SingleChildScrollView(
physics: BouncingScrollPhysics(), child: Column(
padding: EdgeInsets.only(bottom: 12), children: [
itemBuilder: (context, index) => LaboratoryResultWidget( ListView.builder(
onTap: () async { physics: BouncingScrollPhysics(),
GifLoaderDialogUtils.showMyDialog(context); shrinkWrap: true,
await model.sendLabReportEmail(patientLabOrder: widget.patientLabOrders, mes: TranslationBase.of(context).sendSuc, userObj: projectViewModel.user); padding: EdgeInsets.only(bottom: 12),
GifLoaderDialogUtils.hideDialog(context); itemBuilder: (context, index) => LaboratoryResultWidget(
}, onTap: () async {
billNo: widget.patientLabOrders.invoiceNo, GifLoaderDialogUtils.showMyDialog(context);
// details: model.patientLabSpecialResult[index].resultDataHTML, await model.sendLabReportEmail(patientLabOrder: widget.patientLabOrders, mes: TranslationBase.of(context).sendSuc, userObj: projectViewModel.user);
details: model.patientLabSpecialResult.isEmpty ? null : getSpecialResults(model), GifLoaderDialogUtils.hideDialog(context);
orderNo: widget.patientLabOrders.orderNo, },
patientLabOrder: widget.patientLabOrders, billNo: widget.patientLabOrders.invoiceNo,
// details: model.patientLabSpecialResult[index].resultDataHTML,
details: model.patientLabSpecialResult.isEmpty ? null : getSpecialResults(model),
orderNo: widget.patientLabOrders.orderNo,
patientLabOrder: widget.patientLabOrders,
),
itemCount: 1,
),
],
),
),
bottomSheet: Container(
color: Colors.white,
height: MediaQuery.of(context).size.height * 0.08,
width: double.infinity,
padding: EdgeInsets.all(12.0),
child: Column(
children: <Widget>[
Container(
width: MediaQuery.of(context).size.width * 0.9,
child: DefaultButton(
TranslationBase.of(context).downloadReport,
() => {},
textColor: Colors.white,
),
),
],
), ),
itemCount: 1,
), ),
), ),
); );

@ -1,4 +1,4 @@
import 'package:badges/badges.dart'; import 'package:badges/badges.dart' as badge_import;
import 'package:diplomaticquarterapp/Constants.dart'; import 'package:diplomaticquarterapp/Constants.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@ -95,11 +95,11 @@ class PaymentService extends StatelessWidget {
? Positioned( ? Positioned(
left: 8, left: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(
@ -111,11 +111,11 @@ class PaymentService extends StatelessWidget {
: Positioned( : Positioned(
right: 8, right: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(

@ -2906,6 +2906,7 @@ class TranslationBase {
String get invalidInsurance => localizedValues["invalidInsurance"][locale.languageCode]; String get invalidInsurance => localizedValues["invalidInsurance"][locale.languageCode];
String get continueCash => localizedValues["continueCash"][locale.languageCode]; String get continueCash => localizedValues["continueCash"][locale.languageCode];
String get updateInsuranceText => localizedValues["updateInsurance"][locale.languageCode]; String get updateInsuranceText => localizedValues["updateInsurance"][locale.languageCode];
String get downloadReport => localizedValues["downloadReport"][locale.languageCode];
} }

@ -4,7 +4,7 @@ import 'dart:io';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:auto_size_text/auto_size_text.dart'; import 'package:auto_size_text/auto_size_text.dart';
import 'package:badges/badges.dart'; import 'package:badges/badges.dart' as badge_import;
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:connectivity/connectivity.dart'; import 'package:connectivity/connectivity.dart';
import 'package:crypto/crypto.dart' as crypto; import 'package:crypto/crypto.dart' as crypto;
@ -241,11 +241,11 @@ class Utils {
? Positioned( ? Positioned(
left: 8, left: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(
@ -259,11 +259,11 @@ class Utils {
? Positioned( ? Positioned(
right: 8, right: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(
@ -614,11 +614,11 @@ class Utils {
? Positioned( ? Positioned(
left: 8, left: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(
@ -632,11 +632,11 @@ class Utils {
? Positioned( ? Positioned(
right: 8, right: 8,
top: 4, top: 4,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
elevation: 0, elevation: 0,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(

@ -1,4 +1,4 @@
import 'package:badges/badges.dart'; import 'package:badges/badges.dart' as badge_import;
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
@ -106,10 +106,10 @@ class BottomNavigationItem extends StatelessWidget {
Positioned( Positioned(
right: 18.0, right: 18.0,
bottom: 28.0, bottom: 28.0,
child: Badge( child: badge_import.Badge(
toAnimate: false, toAnimate: false,
position: BadgePosition.topEnd(), position: badge_import.BadgePosition.topEnd(),
shape: BadgeShape.circle, shape: badge_import.BadgeShape.circle,
badgeColor: secondaryColor.withOpacity(1.0), badgeColor: secondaryColor.withOpacity(1.0),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
badgeContent: Container( badgeContent: Container(

@ -1,5 +1,5 @@
import 'package:auto_size_text/auto_size_text.dart'; import 'package:auto_size_text/auto_size_text.dart';
import 'package:badges/badges.dart'; import 'package:badges/badges.dart' as badge_import;
import 'package:barcode_scan2/barcode_scan2.dart'; import 'package:barcode_scan2/barcode_scan2.dart';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
@ -494,7 +494,7 @@ class AppBarWidgetState extends State<AppBarWidget> {
actions: <Widget>[ actions: <Widget>[
(widget.isPharmacy && widget.showPharmacyCart) (widget.isPharmacy && widget.showPharmacyCart)
? IconButton( ? IconButton(
icon: Badge( icon: badge_import.Badge(
badgeContent: Text( badgeContent: Text(
orderPreviewViewModel.cartResponse.quantityCount.toString(), orderPreviewViewModel.cartResponse.quantityCount.toString(),
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
@ -507,8 +507,8 @@ class AppBarWidgetState extends State<AppBarWidget> {
: Container(), : Container(),
(widget.isOfferPackages && widget.showOfferPackagesCart) (widget.isOfferPackages && widget.showOfferPackagesCart)
? IconButton( ? IconButton(
icon: Badge( icon: badge_import.Badge(
position: BadgePosition.topStart(top: -15, start: -10), position: badge_import.BadgePosition.topStart(top: -15, start: -10),
badgeContent: Text( badgeContent: Text(
_badgeText, _badgeText,
style: TextStyle(fontSize: 9, color: Colors.white, fontWeight: FontWeight.normal), style: TextStyle(fontSize: 9, color: Colors.white, fontWeight: FontWeight.normal),

Loading…
Cancel
Save