updates

1 year ago · df610690d5
parent 9ed454f67a
commit df610690d5
8 changed files with 72 additions and 44 deletions
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@ -1897,4 +1897,5 @@ const Map localizedValues = {
  "invalidInsurance": {"en": "You cannot make online payment because you do not have a valid insurance.", "ar": "لا يمكنك إجراء الدفع عبر الإنترنت لأنه ليس لديك تأمين صالح."},
  "continueCash": {"en": "Continue as cash", "ar": "تواصل نقدا"},
  "updateInsurance": {"en": "Update insurance", "ar": "تحديث التأمين"},
+  "downloadReport": {"en": "Download Report", "ar": "تحميل تقرير المختبر"},
 };
--- a/lib/core/service/client/base_app_client.dart
+++ b/lib/core/service/client/base_app_client.dart
@ -149,7 +149,7 @@ class BaseAppClient {

      // body['IdentificationNo'] = 1023854217;
      // body['MobileNo'] = "531940021";
-      // body['PatientID'] = 4767370; //3844083
+      // body['PatientID'] = 2001273; //3844083
      // body['TokenID'] = "@dm!n";

      // Patient ID: 3027574
--- a/lib/pages/medical/labs/laboratory_result_page.dart
+++ b/lib/pages/medical/labs/laboratory_result_page.dart
@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/pages/base/base_view.dart';
 import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.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/others/app_scaffold_widget.dart';
 import 'package:flutter/cupertino.dart';
@ -37,22 +38,47 @@ class _LaboratoryResultPageState extends State<LaboratoryResultPage> {
        showNewAppBar: true,
        showNewAppBarTitle: true,
        backgroundColor: Color(0xffF8F8F8),
-        body: ListView.builder(
-          physics: BouncingScrollPhysics(),
-          padding: EdgeInsets.only(bottom: 12),
-          itemBuilder: (context, index) => LaboratoryResultWidget(
-            onTap: () async {
-              GifLoaderDialogUtils.showMyDialog(context);
-              await model.sendLabReportEmail(patientLabOrder: widget.patientLabOrders, mes: TranslationBase.of(context).sendSuc, userObj: projectViewModel.user);
-              GifLoaderDialogUtils.hideDialog(context);
-            },
-            billNo: widget.patientLabOrders.invoiceNo,
-            // details: model.patientLabSpecialResult[index].resultDataHTML,
-            details: model.patientLabSpecialResult.isEmpty ? null : getSpecialResults(model),
-            orderNo: widget.patientLabOrders.orderNo,
-            patientLabOrder: widget.patientLabOrders,
+        body: SingleChildScrollView(
+          child: Column(
+            children: [
+              ListView.builder(
+                physics: BouncingScrollPhysics(),
+                shrinkWrap: true,
+                padding: EdgeInsets.only(bottom: 12),
+                itemBuilder: (context, index) => LaboratoryResultWidget(
+                  onTap: () async {
+                    GifLoaderDialogUtils.showMyDialog(context);
+                    await model.sendLabReportEmail(patientLabOrder: widget.patientLabOrders, mes: TranslationBase.of(context).sendSuc, userObj: projectViewModel.user);
+                    GifLoaderDialogUtils.hideDialog(context);
+                  },
+                  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,
        ),
      ),
    );
--- a/lib/pages/paymentService/payment_service.dart
+++ b/lib/pages/paymentService/payment_service.dart
@ -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/core/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart';
@ -95,11 +95,11 @@ class PaymentService extends StatelessWidget {
                ? Positioned(
                    left: 8,
                    top: 4,
-                    child: Badge(
+                    child: badge_import.Badge(
                      toAnimate: false,
                      elevation: 0,
-                      position: BadgePosition.topEnd(),
-                      shape: BadgeShape.circle,
+                      position: badge_import.BadgePosition.topEnd(),
+                      shape: badge_import.BadgeShape.circle,
                      badgeColor: secondaryColor.withOpacity(1.0),
                      borderRadius: BorderRadius.circular(8),
                      badgeContent: Container(
@ -111,11 +111,11 @@ class PaymentService extends StatelessWidget {
                : Positioned(
                    right: 8,
                    top: 4,
-                    child: Badge(
+                    child: badge_import.Badge(
                      toAnimate: false,
                      elevation: 0,
-                      position: BadgePosition.topEnd(),
-                      shape: BadgeShape.circle,
+                      position: badge_import.BadgePosition.topEnd(),
+                      shape: badge_import.BadgeShape.circle,
                      badgeColor: secondaryColor.withOpacity(1.0),
                      borderRadius: BorderRadius.circular(8),
                      badgeContent: Container(
--- a/lib/uitl/translations_delegate_base.dart
+++ b/lib/uitl/translations_delegate_base.dart
@ -2906,6 +2906,7 @@ class TranslationBase {
  String get invalidInsurance => localizedValues["invalidInsurance"][locale.languageCode];
  String get continueCash => localizedValues["continueCash"][locale.languageCode];
  String get updateInsuranceText => localizedValues["updateInsurance"][locale.languageCode];
+  String get downloadReport => localizedValues["downloadReport"][locale.languageCode];

 }

--- a/lib/uitl/utils.dart
+++ b/lib/uitl/utils.dart
@ -4,7 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';

 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:connectivity/connectivity.dart';
 import 'package:crypto/crypto.dart' as crypto;
@ -241,11 +241,11 @@ class Utils {
                      ? Positioned(
                          left: 8,
                          top: 4,
-                          child: Badge(
+                          child: badge_import.Badge(
                            toAnimate: false,
                            elevation: 0,
-                            position: BadgePosition.topEnd(),
-                            shape: BadgeShape.circle,
+                            position: badge_import.BadgePosition.topEnd(),
+                            shape: badge_import.BadgeShape.circle,
                            badgeColor: secondaryColor.withOpacity(1.0),
                            borderRadius: BorderRadius.circular(8),
                            badgeContent: Container(
@ -259,11 +259,11 @@ class Utils {
                      ? Positioned(
                          right: 8,
                          top: 4,
-                          child: Badge(
+                          child: badge_import.Badge(
                            toAnimate: false,
                            elevation: 0,
-                            position: BadgePosition.topEnd(),
-                            shape: BadgeShape.circle,
+                            position: badge_import.BadgePosition.topEnd(),
+                            shape: badge_import.BadgeShape.circle,
                            badgeColor: secondaryColor.withOpacity(1.0),
                            borderRadius: BorderRadius.circular(8),
                            badgeContent: Container(
@ -614,11 +614,11 @@ class Utils {
                      ? Positioned(
                          left: 8,
                          top: 4,
-                          child: Badge(
+                          child: badge_import.Badge(
                            toAnimate: false,
                            elevation: 0,
-                            position: BadgePosition.topEnd(),
-                            shape: BadgeShape.circle,
+                            position: badge_import.BadgePosition.topEnd(),
+                            shape: badge_import.BadgeShape.circle,
                            badgeColor: secondaryColor.withOpacity(1.0),
                            borderRadius: BorderRadius.circular(8),
                            badgeContent: Container(
@ -632,11 +632,11 @@ class Utils {
                      ? Positioned(
                          right: 8,
                          top: 4,
-                          child: Badge(
+                          child: badge_import.Badge(
                            toAnimate: false,
                            elevation: 0,
-                            position: BadgePosition.topEnd(),
-                            shape: BadgeShape.circle,
+                            position: badge_import.BadgePosition.topEnd(),
+                            shape: badge_import.BadgeShape.circle,
                            badgeColor: secondaryColor.withOpacity(1.0),
                            borderRadius: BorderRadius.circular(8),
                            badgeContent: Container(
--- a/lib/widgets/bottom_navigation/bottom_navigation_item.dart
+++ b/lib/widgets/bottom_navigation/bottom_navigation_item.dart
@ -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/viewModels/project_view_model.dart';
 import 'package:diplomaticquarterapp/locator.dart';
@ -106,10 +106,10 @@ class BottomNavigationItem extends StatelessWidget {
                          Positioned(
                            right: 18.0,
                            bottom: 28.0,
-                            child: Badge(
+                            child: badge_import.Badge(
                              toAnimate: false,
-                              position: BadgePosition.topEnd(),
-                              shape: BadgeShape.circle,
+                              position: badge_import.BadgePosition.topEnd(),
+                              shape: badge_import.BadgeShape.circle,
                              badgeColor: secondaryColor.withOpacity(1.0),
                              borderRadius: BorderRadius.circular(8),
                              badgeContent: Container(
--- a/lib/widgets/others/app_scaffold_widget.dart
+++ b/lib/widgets/others/app_scaffold_widget.dart
@ -1,5 +1,5 @@
 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:diplomaticquarterapp/config/config.dart';
 import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
@ -494,7 +494,7 @@ class AppBarWidgetState extends State<AppBarWidget> {
      actions: <Widget>[
        (widget.isPharmacy && widget.showPharmacyCart)
            ? IconButton(
-                icon: Badge(
+                icon: badge_import.Badge(
                    badgeContent: Text(
                      orderPreviewViewModel.cartResponse.quantityCount.toString(),
                      style: TextStyle(color: Colors.white),
@ -507,8 +507,8 @@ class AppBarWidgetState extends State<AppBarWidget> {
            : Container(),
        (widget.isOfferPackages && widget.showOfferPackagesCart)
            ? IconButton(
-                icon: Badge(
-                    position: BadgePosition.topStart(top: -15, start: -10),
+                icon: badge_import.Badge(
+                    position: badge_import.BadgePosition.topStart(top: -15, start: -10),
                    badgeContent: Text(
                      _badgeText,
                      style: TextStyle(fontSize: 9, color: Colors.white, fontWeight: FontWeight.normal),