Fixes & updates

merge-update-with-lab-changes
haroon amjad 4 years ago
parent df7d8a8603
commit b53d912996

@ -193,7 +193,7 @@ class _SearchByDoctorState extends State<SearchByDoctor> {
TextField( TextField(
enabled: isEnable, enabled: isEnable,
scrollPadding: EdgeInsets.zero, scrollPadding: EdgeInsets.zero,
keyboardType: TextInputType.number, keyboardType: TextInputType.text,
controller: _controller, controller: _controller,
onChanged: (value) => {_onDocTextChanged(value)}, onChanged: (value) => {_onDocTextChanged(value)},
style: TextStyle( style: TextStyle(

@ -60,7 +60,7 @@ class _ChildPageState extends State<ChildVaccinePage> with SingleTickerProviderS
borderRadius: BorderRadius.all(Radius.circular(12)), borderRadius: BorderRadius.all(Radius.circular(12)),
color: Colors.white, color: Colors.white,
gradient: LinearGradient( gradient: LinearGradient(
colors: model.babyInformationModelList[index].gender == 1 colors: model.babyInformationModelList[index].gender == 2
? [ ? [
Color(0xFFFDA4B0), Color(0xFFFDA4B0),
Color(0xFFFBC8CC), Color(0xFFFBC8CC),

@ -178,7 +178,10 @@ class _PackagesCartPageState extends State<PackagesCartPage>
), ),
Padding( Padding(
padding: const EdgeInsets.only(left: 12.0, right: 12.0), padding: const EdgeInsets.only(left: 12.0, right: 12.0),
child: getPaymentMethods(), // child: getPaymentMethods(),
child: _paymentOptions(context, (paymentMethod) {
setState(() => _selectedPaymentMethod = paymentMethod);
}),
), ),
Container( Container(
height: 0.25, height: 0.25,

@ -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/lab_result.dart';
import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart'; import 'package:diplomaticquarterapp/core/model/labs/patient_lab_orders.dart';
import 'package:diplomaticquarterapp/core/service/medical/labs_service.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/app_toast.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/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_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/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import '../../text.dart';
import 'FlowChartPage.dart'; import 'FlowChartPage.dart';
class LabResultWidget extends StatelessWidget { class LabResultWidget extends StatelessWidget {
@ -81,6 +79,14 @@ class LabResultWidget extends StatelessWidget {
), ),
) )
: Container(), : 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.add(
TableRow( TableRow(
children: [ children: [
Utils.tableColumnTitle(TranslationBase.of(context).description), Utils.tableColumnTitle(TranslationBase.of(context).description, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).value), Utils.tableColumnTitle(TranslationBase.of(context).value, showDivider: false),
Utils.tableColumnTitle(TranslationBase.of(context).range), Utils.tableColumnTitle(TranslationBase.of(context).range, showDivider: false),
Utils.tableColumnTitle(""), Utils.tableColumnTitle("", showDivider: false),
], ],
), ),
); );

Loading…
Cancel
Save