Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/doctor_app_flutter!187
merge-requests/390/merge
Mohammad Aljammal 5 years ago
commit a12ae0e0d1

@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/Text.dart'; import 'package:doctor_app_flutter/widgets/shared/Text.dart';
import 'package:doctor_app_flutter/widgets/shared/app_button.dart'; import 'package:doctor_app_flutter/widgets/shared/app_button.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -35,12 +35,26 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CardWithBgWidgetNew( return Container(
widget: Container( width: double.infinity,
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 10),
padding: EdgeInsets.only(left: 0, top: 8, right: 0, bottom: 0),
decoration: BoxDecoration(
shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(8),
border: Border.fromBorderSide(BorderSide(
color: Color(0xffCCCCCC),
width: 2,
)),
color: Color(0xffffffff),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( HeaderBodyExpandableNotifier(
headerWidget: Container(
margin: EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
AppText( AppText(
@ -54,16 +68,17 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
_showDetails = !_showDetails; _showDetails = !_showDetails;
}); });
}, },
child: Icon(_showDetails child: Image.asset(
? Icons.keyboard_arrow_up "assets/images/ic_circle_arrow.png",
: Icons.keyboard_arrow_down)), width: 25,
height: 25,
color: Colors.black,
),
),
], ],
), ),
!_showDetails ),
? Container() bodyWidget: Column(
: AnimatedContainer(
duration: Duration(milliseconds: 200),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Column( Column(
@ -87,19 +102,16 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
decoration: BoxDecoration(), decoration: BoxDecoration(),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).fileNo, TranslationBase.of(context).fileNo,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
'${widget.myReferredPatientModel.patientId}', '${widget.myReferredPatientModel.patientId}',
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
@ -107,19 +119,14 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4, top: 2.5, right: 2.5, bottom: 2.5),
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).referralDoctor, TranslationBase.of(context).referralDoctor,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
Texts( Texts(
@ -138,19 +145,16 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).referringClinic, TranslationBase.of(context).referringClinic,
fontSize: 1.7 * fontSize: 1.7 * SizeConfig.textMultiplier,
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
'${widget.myReferredPatientModel.referralClinicDescription}', '${widget.myReferredPatientModel.referralClinicDescription}',
fontSize: 1.7 * fontSize: 1.7 * SizeConfig.textMultiplier,
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
@ -158,26 +162,20 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4, top: 2.5, right: 2.5, bottom: 2.5),
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).frequency, TranslationBase.of(context).frequency,
fontSize: 1.7 * fontSize: 1.7 * SizeConfig.textMultiplier,
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
widget.myReferredPatientModel widget.myReferredPatientModel
.frequencyDescription, .frequencyDescription,
fontSize: 1.7 * fontSize: 1.7 * SizeConfig.textMultiplier,
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
@ -190,19 +188,16 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).priority, TranslationBase.of(context).priority,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
'${widget.myReferredPatientModel.priorityDescription}', '${widget.myReferredPatientModel.priorityDescription}',
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
@ -210,27 +205,20 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4, top: 2.5, right: 2.5, bottom: 2.5),
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.start,
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).maxResponseTime, TranslationBase.of(context).maxResponseTime,
fontSize: fontSize: 1.7 * SizeConfig.textMultiplier,
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
AppText( AppText(
Helpers.getDateFormatted(widget Helpers.getDateFormatted(widget
.myReferredPatientModel .myReferredPatientModel.maxResponseTime),
.maxResponseTime), fontSize: 1.7 * SizeConfig.textMultiplier,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300, fontWeight: FontWeight.w300,
) )
], ],
@ -246,6 +234,11 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
SizedBox( SizedBox(
height: 5, height: 5,
), ),
Container(
margin: EdgeInsets.all(10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText( AppText(
TranslationBase.of(context).clinicDetailsandRemarks, TranslationBase.of(context).clinicDetailsandRemarks,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
@ -279,21 +272,25 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
readMore: true, readMore: true,
textAlign: TextAlign.start, textAlign: TextAlign.start,
maxLength: 100), maxLength: 100),
],
),
),
SizedBox( SizedBox(
height: 5, height: 5,
), ),
SizedBox(height: 10.0), SizedBox(height: 10.0),
Container( Container(
margin: EdgeInsets.all(10),
width: double.infinity, width: double.infinity,
child: Button( child: Button(
onTap: () async { onTap: () async {
try { try {
await widget.model
.verify(widget.myReferredPatientModel);
await widget.model.verify(widget.myReferredPatientModel); DrAppToastMsg.showSuccesToast(
'Verify Successfully');
DrAppToastMsg.showSuccesToast('Verify Successfully');
} catch (e) { } catch (e) {
DrAppToastMsg.showErrorToast(e); DrAppToastMsg.showErrorToast(e);
} }
}, },
@ -305,10 +302,10 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
) )
], ],
), ),
isExpand: _showDetails,
) )
], ],
), ),
),
); );
} }
} }

Loading…
Cancel
Save