Merge branch 'app_changes' into 'development'

App changes

See merge request Cloud_Solution/doctor_app_flutter!344
merge-requests/345/merge
Mohammad Aljammal 5 years ago
commit 982e075e41

@ -60,32 +60,41 @@ class MyReferralPatientScreen extends StatelessWidget {
), ),
...List.generate( ...List.generate(
model.pendingReferral.length, model.pendingReferral.length,
(index) => PatientReferralItemWidget( (index) => InkWell(
"${model.pendingReferral[index].patientID}", onTap: () {
patientName: model.pendingReferral[index].patientName, Navigator.of(context).pushNamed(MY_REFERRAL_DETAIL,
referralStatus: null, arguments: {
isReferredTo: false, 'referral': model.pendingReferral[index]
isSameBranch: model.pendingReferral[index] });
.isReferralDoctorSameBranch, },
referralDoctorName: child: PatientReferralItemWidget(
model.pendingReferral[index].referredByDoctorInfo, "${model.pendingReferral[index].patientID}",
clinicDescription: null, patientName:
remark: model.pendingReferral[index].patientName,
model.pendingReferral[index].remarksFromSource, referralStatus: null,
referredOn: model.pendingReferral[index].referredOn, isReferredTo: false,
answerFromTarget: isSameBranch: model.pendingReferral[index]
model.pendingReferral[index].answerFromTarget, .isReferralDoctorSameBranch,
infoIcon: InkWell( referralDoctorName: model
onTap: () { .pendingReferral[index].referredByDoctorInfo,
Navigator.of(context) clinicDescription: null,
.pushNamed(MY_REFERRAL_DETAIL, arguments: { remark:
'referral': model.pendingReferral[index] model.pendingReferral[index].remarksFromSource,
}); referredOn: model.pendingReferral[index].referredOn,
}, answerFromTarget:
child: Icon( model.pendingReferral[index].answerFromTarget,
Icons.info_outline, infoIcon: InkWell(
color: Colors.black, onTap: () {
size: 30, Navigator.of(context)
.pushNamed(MY_REFERRAL_DETAIL, arguments: {
'referral': model.pendingReferral[index]
});
},
child: Icon(
Icons.info_outline,
color: Colors.black,
size: 30,
),
), ),
), ),
), ),

@ -6,49 +6,52 @@ class AppExpandableNotifier extends StatelessWidget {
final Widget bodyWid; final Widget bodyWid;
AppExpandableNotifier({this.headerWid, this.bodyWid}); AppExpandableNotifier({this.headerWid, this.bodyWid});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ExpandableNotifier( return ExpandableNotifier(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10), padding: const EdgeInsets.all(10),
child: Card( child: Card(
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
child: headerWid, child: headerWid,
), ),
ScrollOnExpand( ScrollOnExpand(
scrollOnExpand: true, scrollOnExpand: true,
scrollOnCollapse: false, scrollOnCollapse: false,
child: ExpandablePanel( child: ExpandablePanel(
theme: const ExpandableThemeData( theme: const ExpandableThemeData(
headerAlignment: ExpandablePanelHeaderAlignment.center, headerAlignment: ExpandablePanelHeaderAlignment.center,
tapBodyToCollapse: true, tapBodyToCollapse: true,
),
header: Padding(
padding: EdgeInsets.all(10),
child: Text(
"See Graph Details",
style: TextStyle(fontWeight: FontWeight.bold),
)),
collapsed: Text(''),
expanded: bodyWid,
builder: (_, collapsed, expanded) {
return Padding(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
child: Expandable(
collapsed: collapsed,
expanded: expanded,
theme: const ExpandableThemeData(crossFadePoint: 0),
),
);
},
), ),
header: Padding(
padding: EdgeInsets.all(10),
child: Text(
"See Graph Details",
style: TextStyle(fontWeight: FontWeight.bold),
)),
collapsed: Text(''),
expanded: bodyWid,
builder: (_, collapsed, expanded) {
return Padding(
padding: EdgeInsets.only(left: 10, right: 10, bottom: 10),
child: Expandable(
collapsed: collapsed,
expanded: expanded,
theme: const ExpandableThemeData(crossFadePoint: 0),
),
);
},
), ),
), ],
], ),
), ),
), ),
)); initialExpanded: true,
);
} }
} }

Loading…
Cancel
Save