From c6ac82981332272b2ff0c8b792a5b8e2d8194210 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 2 May 2021 17:38:57 +0300 Subject: [PATCH] hot fixes in PatientReferralScreen --- lib/screens/home/home_screen.dart | 78 ------------------- .../patients/DischargedPatientPage.dart | 13 ++-- .../ReferralDischargedPatientPage.dart | 2 +- .../referral/patient_referral_screen.dart | 4 +- 4 files changed, 10 insertions(+), 87 deletions(-) diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 36f86c85..e95f1d1e 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -655,84 +655,6 @@ class _HomeScreenState extends State { ); }, ), - // HomePageCard( - // color: Colors.red[800], - // margin: EdgeInsets.all(5), - // child: Column( - // mainAxisAlignment: - // MainAxisAlignment.center, - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // Padding( - // padding: EdgeInsets.only( - // top: 10, left: 10, right: 0), - // child: Icon( - // DoctorApp.discharge_patients, - // size: 35, - // color: Colors.white, - // )), - // Container( - // padding: EdgeInsets.all(10), - // child: AppText( - // 'Discharged Patients', - // color: Colors.white, - // textAlign: TextAlign.start, - // fontSize: 15, - // )) - // ], - // ), - // hasBorder: false, - // onTap: () { - // Navigator.push( - // context, - // MaterialPageRoute( - // builder: (context) => - // DischargedPatient(), - // // MyReferredPatient(), - // ), - // ); - // }, - // ), - // HomePageCard( - // color: Colors.grey[300], - // margin: EdgeInsets.all(5), - // child: Column( - // mainAxisAlignment: - // MainAxisAlignment.center, - // crossAxisAlignment: - // CrossAxisAlignment.start, - // children: [ - // Padding( - // padding: EdgeInsets.only( - // top: 10, left: 10, right: 0), - // child: Icon( - // DoctorApp.referral_discharge, - // size: 35, - // color: Colors.black, - // )), - // Container( - // padding: EdgeInsets.all(10), - // child: AppText( - // 'Referral Discharged', - // color: Colors.black, - // textAlign: TextAlign.start, - // fontSize: 15, - // )) - // ], - // ), - // hasBorder: false, - // onTap: () { - // Navigator.push( - // context, - // MaterialPageRoute( - // builder: (context) => - // ReferralDischargedPatientPage(), - // // MyReferredPatient(), - // ), - // ); - // }, - // ), HomePageCard( color: Color(0xffD02127), margin: EdgeInsets.all(5), diff --git a/lib/screens/patients/DischargedPatientPage.dart b/lib/screens/patients/DischargedPatientPage.dart index 0d0682dc..e4138305 100644 --- a/lib/screens/patients/DischargedPatientPage.dart +++ b/lib/screens/patients/DischargedPatientPage.dart @@ -103,10 +103,10 @@ class _DischargedPatientState extends State { }), ])), SizedBox(height: 5,), - Expanded( - child: ListView.builder( - itemCount: model.filterData.length, - itemBuilder: (context,index)=>InkWell( + Expanded(child: SingleChildScrollView( + child: Column( + children: [ + ...List.generate(model.filterData.length, (index) => InkWell( onTap: () { Navigator.of(context) .pushNamed( @@ -330,8 +330,9 @@ class _DischargedPatientState extends State { ), ), )), - ), - + ], + ), + )) ], ), ), diff --git a/lib/screens/patients/ReferralDischargedPatientPage.dart b/lib/screens/patients/ReferralDischargedPatientPage.dart index 6da969d1..b9860af8 100644 --- a/lib/screens/patients/ReferralDischargedPatientPage.dart +++ b/lib/screens/patients/ReferralDischargedPatientPage.dart @@ -25,7 +25,7 @@ class _ReferralDischargedPatientPageState extends State AppScaffold( appBarTitle: 'Referral Discharged ', backgroundColor: Colors.grey[200], - isShowAppBar: true, + isShowAppBar: false, baseViewModel: model, body: model.myDischargeReferralPatient.isEmpty?Center( child: Column( diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index de106524..c5aaed7a 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/widgets/shared/text_fields/text_fields_utils. import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../../DischargedPatientPage.dart'; +import '../../ReferralDischargedPatientPage.dart'; import 'my-referral-inpatient-screen.dart'; class PatientReferralScreen extends StatefulWidget { @@ -171,7 +171,7 @@ class _PatientReferralScreen extends State with SingleTic children: [ ReferredPatientScreen(), MyReferralInPatientScreen(), - DischargedPatient() + ReferralDischargedPatientPage() // MyReferredPatient(), ], ),