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,279 +35,276 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CardWithBgWidgetNew( return Container(
widget: Container( width: double.infinity,
child: Column( margin: EdgeInsets.symmetric(horizontal: 16, vertical: 10),
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.only(left: 0, top: 8, right: 0, bottom: 0),
children: <Widget>[ decoration: BoxDecoration(
Row( shape: BoxShape.rectangle,
mainAxisAlignment: MainAxisAlignment.spaceBetween, borderRadius: BorderRadius.circular(8),
children: <Widget>[ border: Border.fromBorderSide(BorderSide(
AppText( color: Color(0xffCCCCCC),
'${widget.myReferredPatientModel.firstName} ${widget.myReferredPatientModel.lastName}', width: 2,
fontSize: 2.5 * SizeConfig.textMultiplier, )),
fontWeight: FontWeight.bold, color: Color(0xffffffff),
), ),
InkWell( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
HeaderBodyExpandableNotifier(
headerWidget: Container(
margin: EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
AppText(
'${widget.myReferredPatientModel.firstName} ${widget.myReferredPatientModel.lastName}',
fontSize: 2.5 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
InkWell(
onTap: () { onTap: () {
setState(() { setState(() {
_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 bodyWidget: Column(
? Container() crossAxisAlignment: CrossAxisAlignment.start,
: AnimatedContainer( children: <Widget>[
duration: Duration(milliseconds: 200), Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ SizedBox(
Column( height: 5,
crossAxisAlignment: CrossAxisAlignment.start, ),
children: <Widget>[ Divider(
SizedBox( color: Color(0xFF000000),
height: 5, height: 0.5,
), ),
Divider( Table(
color: Color(0xFF000000), border: TableBorder.symmetric(
height: 0.5, inside: BorderSide(width: 0.5),
), ),
Table( children: [
border: TableBorder.symmetric( TableRow(children: [
inside: BorderSide(width: 0.5), Container(
), margin: EdgeInsets.all(2.5),
children: [ padding: EdgeInsets.all(5),
TableRow(children: [ decoration: BoxDecoration(),
Container( child: Column(
margin: EdgeInsets.all(2.5), crossAxisAlignment: CrossAxisAlignment.start,
padding: EdgeInsets.all(5), children: <Widget>[
decoration: BoxDecoration(), AppText(
child: Column( TranslationBase.of(context).fileNo,
crossAxisAlignment: fontSize: 1.7 * SizeConfig.textMultiplier,
CrossAxisAlignment.start, fontWeight: FontWeight.bold,
children: <Widget>[
AppText(
TranslationBase.of(context).fileNo,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.patientId}',
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
Container(
margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).referralDoctor,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
Texts(
widget.myReferredPatientModel
.referralDoctorName,
maxLength: 80,
readMore: true,
),
],
),
),
]),
TableRow(
children: [
Container(
margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).referringClinic,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.referralClinicDescription}',
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
Container(
margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).frequency,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
widget.myReferredPatientModel
.frequencyDescription,
fontSize: 1.7 *
SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
)
],
), ),
TableRow(children: [ AppText(
Container( '${widget.myReferredPatientModel.patientId}',
margin: EdgeInsets.all(2.5), fontSize: 1.7 * SizeConfig.textMultiplier,
padding: EdgeInsets.all(5), fontWeight: FontWeight.w300,
child: Column( )
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).priority,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.priorityDescription}',
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
Container(
margin: EdgeInsets.only(
left: 4,
top: 2.5,
right: 2.5,
bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).maxResponseTime,
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
Helpers.getDateFormatted(widget
.myReferredPatientModel
.maxResponseTime),
fontSize:
1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
)
])
], ],
), ),
Divider( ),
color: Color(0xFF000000), Container(
height: 0.5, margin: EdgeInsets.only(
), left: 4, top: 2.5, right: 2.5, bottom: 2.5),
SizedBox( padding: EdgeInsets.all(5),
height: 5, child: Column(
), crossAxisAlignment: CrossAxisAlignment.start,
AppText( children: <Widget>[
TranslationBase.of(context).clinicDetailsandRemarks, AppText(
fontSize: 1.7 * SizeConfig.textMultiplier, TranslationBase.of(context).referralDoctor,
fontWeight: FontWeight.bold, fontSize: 1.7 * SizeConfig.textMultiplier,
textAlign: TextAlign.start, fontWeight: FontWeight.bold,
), ),
SizedBox( Texts(
height: 5, widget.myReferredPatientModel
), .referralDoctorName,
Texts( maxLength: 80,
'${widget.myReferredPatientModel.referringDoctorRemarks}', readMore: true,
style: "bodyText1", ),
readMore: true, ],
textAlign: TextAlign.start,
maxLength: 100),
SizedBox(
height: 5,
),
AppText(
TranslationBase.of(context).answerSuggestions,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
textAlign: TextAlign.start,
),
SizedBox(
height: 5,
), ),
Texts( ),
'${widget.myReferredPatientModel.referredDoctorRemarks}', ]),
style: "bodyText1", TableRow(
readMore: true, children: [
textAlign: TextAlign.start, Container(
maxLength: 100), margin: EdgeInsets.all(2.5),
SizedBox( padding: EdgeInsets.all(5),
height: 5, child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).referringClinic,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.referralClinicDescription}',
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
), ),
SizedBox(height: 10.0),
Container( Container(
width: double.infinity, margin: EdgeInsets.only(
child: Button( left: 4, top: 2.5, right: 2.5, bottom: 2.5),
onTap: () async { padding: EdgeInsets.all(5),
try { child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
await widget.model.verify(widget.myReferredPatientModel); children: <Widget>[
AppText(
DrAppToastMsg.showSuccesToast('Verify Successfully'); TranslationBase.of(context).frequency,
} catch (e) { fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
DrAppToastMsg.showErrorToast(e); ),
} AppText(
}, widget.myReferredPatientModel
title: TranslationBase.of(context).verify, .frequencyDescription,
loading: widget.model.state == ViewState.BusyLocal, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
), ),
) )
], ],
) ),
TableRow(children: [
Container(
margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).priority,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
'${widget.myReferredPatientModel.priorityDescription}',
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
),
Container(
margin: EdgeInsets.only(
left: 4, top: 2.5, right: 2.5, bottom: 2.5),
padding: EdgeInsets.all(5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(
TranslationBase.of(context).maxResponseTime,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
),
AppText(
Helpers.getDateFormatted(widget
.myReferredPatientModel.maxResponseTime),
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.w300,
)
],
),
)
])
], ],
), ),
) Divider(
], color: Color(0xFF000000),
), height: 0.5,
),
SizedBox(
height: 5,
),
Container(
margin: EdgeInsets.all(10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppText(
TranslationBase.of(context).clinicDetailsandRemarks,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
textAlign: TextAlign.start,
),
SizedBox(
height: 5,
),
Texts(
'${widget.myReferredPatientModel.referringDoctorRemarks}',
style: "bodyText1",
readMore: true,
textAlign: TextAlign.start,
maxLength: 100),
SizedBox(
height: 5,
),
AppText(
TranslationBase.of(context).answerSuggestions,
fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold,
textAlign: TextAlign.start,
),
SizedBox(
height: 5,
),
Texts(
'${widget.myReferredPatientModel.referredDoctorRemarks}',
style: "bodyText1",
readMore: true,
textAlign: TextAlign.start,
maxLength: 100),
],
),
),
SizedBox(
height: 5,
),
SizedBox(height: 10.0),
Container(
margin: EdgeInsets.all(10),
width: double.infinity,
child: Button(
onTap: () async {
try {
await widget.model
.verify(widget.myReferredPatientModel);
DrAppToastMsg.showSuccesToast(
'Verify Successfully');
} catch (e) {
DrAppToastMsg.showErrorToast(e);
}
},
title: TranslationBase.of(context).verify,
loading: widget.model.state == ViewState.BusyLocal,
),
)
],
)
],
),
isExpand: _showDetails,
)
],
), ),
); );
} }

Loading…
Cancel
Save