Inpatient medical report fixes

Dev_3.3_MedicalReportCR
haroon amjad 2 years ago
parent 38661621e3
commit 4dd16bde59

@ -104,40 +104,39 @@ class _HomeReportPageState extends State<HomeReportPage> with SingleTickerProvid
), ),
if (model.user != null) if (model.user != null)
Expanded( Expanded(
child: child: TabBarView(
TabBarView( physics: BouncingScrollPhysics(),
physics: BouncingScrollPhysics(), controller: _tabController_new,
controller: _tabController_new, children: <Widget>[
children: <Widget>[
Container( Container(
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsets.all(21), padding: EdgeInsets.all(21),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
myRadioButton(TranslationBase.of(context).requested, 0), myRadioButton(TranslationBase.of(context).requested, 0),
myRadioButton(TranslationBase.of(context).ready, 1), myRadioButton(TranslationBase.of(context).ready, 1),
myRadioButton(TranslationBase.of(context).cancelled, 2), myRadioButton(TranslationBase.of(context).cancelled, 2),
], ],
), ),
),
Expanded(
child: IndexedStack(
index: _currentPage,
children: [
ReportListWidget(reportList: model.reportsOrderRequestList, emailAddress: model.user.emailAddress),
ReportListWidget(reportList: model.reportsOrderReadyList, emailAddress: model.user.emailAddress),
ReportListWidget(reportList: model.reportsOrderCanceledList, emailAddress: model.user.emailAddress),
],
),
)
],
), ),
Expanded( ),
child: IndexedStack( // InPatient Medical Reports
index: _currentPage, Container(
children: [
ReportListWidget(reportList: model.reportsOrderRequestList, emailAddress: model.user.emailAddress),
ReportListWidget(reportList: model.reportsOrderReadyList, emailAddress: model.user.emailAddress),
ReportListWidget(reportList: model.reportsOrderCanceledList, emailAddress: model.user.emailAddress),
],
),
)
],
),
),
// InPatient Medical Reports
Container(
child: model.admissionsMedicalReportList.isNotEmpty child: model.admissionsMedicalReportList.isNotEmpty
? Column( ? Column(
children: [ children: [
@ -249,20 +248,21 @@ class _HomeReportPageState extends State<HomeReportPage> with SingleTickerProvid
if (projectViewModel.havePrivilege(21) if (projectViewModel.havePrivilege(21)
// && _tabController_new.index == 0 // && _tabController_new.index == 0
) )
Padding( if (_tabController_new.index == 0)
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21), Padding(
child: DefaultButton( padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
TranslationBase.of(context).requestMedicalReport.toLowerCase().capitalizeFirstofEach, child: DefaultButton(
() => Navigator.push( TranslationBase.of(context).requestMedicalReport.toLowerCase().capitalizeFirstofEach,
context, () => Navigator.push(
FadePage( context,
page: MedicalReports(), FadePage(
), page: MedicalReports(),
).then((value) { ),
model.getReports(); ).then((value) {
}), model.getReports();
), }),
) ),
)
], ],
), ),
), ),

Loading…
Cancel
Save