From b53d9129968c50188fc4e0067e6a85bbfc2edaf8 Mon Sep 17 00:00:00 2001 From: haroon amjad Date: Wed, 27 Oct 2021 13:44:35 +0300 Subject: [PATCH] Fixes & updates --- .../components/SearchByDoctor.dart | 2 +- .../ChildVaccines/new/child_vaccine_page.dart | 2 +- .../OfferAndPackagesCartPage.dart | 5 ++++- .../medical/LabResult/LabResultWidget.dart | 20 ++++++++++++------- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/pages/BookAppointment/components/SearchByDoctor.dart b/lib/pages/BookAppointment/components/SearchByDoctor.dart index dde431e6..829ac0e2 100644 --- a/lib/pages/BookAppointment/components/SearchByDoctor.dart +++ b/lib/pages/BookAppointment/components/SearchByDoctor.dart @@ -193,7 +193,7 @@ class _SearchByDoctorState extends State { TextField( enabled: isEnable, scrollPadding: EdgeInsets.zero, - keyboardType: TextInputType.number, + keyboardType: TextInputType.text, controller: _controller, onChanged: (value) => {_onDocTextChanged(value)}, style: TextStyle( diff --git a/lib/pages/ChildVaccines/new/child_vaccine_page.dart b/lib/pages/ChildVaccines/new/child_vaccine_page.dart index f847352f..5f55401e 100644 --- a/lib/pages/ChildVaccines/new/child_vaccine_page.dart +++ b/lib/pages/ChildVaccines/new/child_vaccine_page.dart @@ -60,7 +60,7 @@ class _ChildPageState extends State with SingleTickerProviderS borderRadius: BorderRadius.all(Radius.circular(12)), color: Colors.white, gradient: LinearGradient( - colors: model.babyInformationModelList[index].gender == 1 + colors: model.babyInformationModelList[index].gender == 2 ? [ Color(0xFFFDA4B0), Color(0xFFFBC8CC), diff --git a/lib/pages/packages_offers/OfferAndPackagesCartPage.dart b/lib/pages/packages_offers/OfferAndPackagesCartPage.dart index 310e2c35..f122381a 100644 --- a/lib/pages/packages_offers/OfferAndPackagesCartPage.dart +++ b/lib/pages/packages_offers/OfferAndPackagesCartPage.dart @@ -178,7 +178,10 @@ class _PackagesCartPageState extends State ), Padding( padding: const EdgeInsets.only(left: 12.0, right: 12.0), - child: getPaymentMethods(), + // child: getPaymentMethods(), + child: _paymentOptions(context, (paymentMethod) { + setState(() => _selectedPaymentMethod = paymentMethod); + }), ), Container( height: 0.25, diff --git a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart index 4c7656f6..f4081c21 100644 --- a/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart +++ b/lib/widgets/data_display/medical/LabResult/LabResultWidget.dart @@ -1,4 +1,3 @@ -import 'package:auto_size_text/auto_size_text.dart'; import 'package:diplomaticquarterapp/core/model/labs/lab_result.dart'; import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart'; import 'package:diplomaticquarterapp/core/service/medical/labs_service.dart'; @@ -7,6 +6,7 @@ import 'package:diplomaticquarterapp/pages/medical/labs/passport_update_page.dar import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart'; @@ -14,9 +14,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:diplomaticquarterapp/uitl/utils.dart'; -import '../../text.dart'; import 'FlowChartPage.dart'; class LabResultWidget extends StatelessWidget { @@ -81,6 +79,14 @@ class LabResultWidget extends StatelessWidget { ), ) : Container(), + Padding( + padding: const EdgeInsets.only(top: 12.0), + child: Divider( + height: 1, + color: Color(0xff2E303A), + thickness: 1, + ), + ), ], ), ); @@ -152,10 +158,10 @@ class LabResultWidget extends StatelessWidget { tableRow.add( TableRow( children: [ - Utils.tableColumnTitle(TranslationBase.of(context).description), - Utils.tableColumnTitle(TranslationBase.of(context).value), - Utils.tableColumnTitle(TranslationBase.of(context).range), - Utils.tableColumnTitle(""), + Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false), + Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false), + Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false), + Utils.tableColumnTitle("", showDivider: false), ], ), );