Conflicts:
	lib/screens/doctor/my_referred_patient_screen.dart
merge-requests/86/head
Mohammad ALjammal 6 years ago
commit 4f0059d092

@ -24,45 +24,45 @@ class MyReferredPatient extends StatelessWidget {
body: referredPatientProvider.isLoading body: referredPatientProvider.isLoading
? DrAppCircularProgressIndeicator() ? DrAppCircularProgressIndeicator()
: referredPatientProvider.isError : referredPatientProvider.isError
? Center( ? Center(
child: AppText( child: AppText(
referredPatientProvider.error, referredPatientProvider.error,
color: Theme.of(context).errorColor, color: Theme.of(context).errorColor,
),
)
: referredPatientProvider.listMyReferredPatientModel.length == 0
? Center(
child: AppText(
TranslationBase.of(context).errorNoSchedule,
color: Theme.of(context).errorColor,
),
)
: Container(
padding: EdgeInsetsDirectional.fromSTEB(20, 0, 20, 0),
child: ListView(
children: <Widget>[
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 10,
),
Container(
child: Column(
//children: referredPatientProvider.listMyReferralPatientModel.map((item) {
children: referredPatientProvider.listMyReferredPatientModel.map((item) {
return MyReferredPatientWidget(
myReferredPatientModel: item,
);
}).toList(),
), ),
), )
],
), : referredPatientProvider.listMyReferredPatientModel.length == 0
], ? Center(
), child: AppText(
), TranslationBase.of(context).errorNoSchedule,
color: Theme.of(context).errorColor,
),
)
: Container(
padding: EdgeInsetsDirectional.fromSTEB(20, 0, 20, 0),
child: ListView(
children: <Widget>[
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
SizedBox(
height: 10,
),
Container(
child: Column(
children: referredPatientProvider.listMyReferralPatientModel.map((item) {
return MyReferredPatientWidget(
myReferredPatientModel: item,
);
}).toList(),
),
),
],
),
],
),
),
); );
} }
} }

@ -57,7 +57,8 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'${widget.myReferredPatientModel.firstName} ${widget.myReferredPatientModel.lastName}', '${widget.myReferredPatientModel.firstName} ${widget.myReferredPatientModel.lastName}',
@ -85,7 +86,12 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Divider(color: Colors.grey), Divider(color: Colors.grey),
// VerticalDivider(color: Colors.black,
// thickness: 2, width: 20,
// indent: 200,
// endIndent: 200,),
Row( Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
@ -109,7 +115,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
Container( Container(
height: SizeConfig.realScreenWidth * 0.1, height: SizeConfig.realScreenWidth * .1,//0.1,
width: 0.8, width: 0.8,
color: Colors.grey, color: Colors.grey,
margin: EdgeInsets.only(left: 15, right: 15), margin: EdgeInsets.only(left: 15, right: 15),

Loading…
Cancel
Save