merge-requests/483/head
haroon amjad 5 years ago
parent 8d6278a59b
commit 5943522163

@ -38,9 +38,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
TextEditingController _notesTextController = TextEditingController(); TextEditingController _notesTextController = TextEditingController();
BeneficiaryType beneficiaryType = BeneficiaryType.NON; BeneficiaryType beneficiaryType = BeneficiaryType.NON;
// Gender gender = Gender.Male; //Gender.NON;
// Blood blood = Blood.Aminus; //Blood.NON;
//HospitalsModel _selectedHospital;
CitiesModel _selectedHospital; CitiesModel _selectedHospital;
int _selectedHospitalIndex = 0; int _selectedHospitalIndex = 0;
@ -80,7 +77,6 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
cityID = element.iD; cityID = element.iD;
} }
}); });
return cityID; return cityID;
} }
@ -90,6 +86,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
onModelReady: (model) { onModelReady: (model) {
if (projectProvider.isLogin) {
model.getCities().then((value) { model.getCities().then((value) {
model.getBlood().then((value) { model.getBlood().then((value) {
if (model.bloodModelList.length > 0) { if (model.bloodModelList.length > 0) {
@ -104,6 +101,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
} }
}); });
}); });
}
}, },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
@ -130,12 +128,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
), ),
SizedBox(height: 12), SizedBox(height: 12),
if (projectProvider.isLogin && model.state != ViewState.Busy) if (projectProvider.isLogin && model.state != ViewState.Busy)
CommonDropDownView( CommonDropDownView(TranslationBase.of(context).city, projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description, () {
TranslationBase.of(context).city,
// (model.bloodModelList.isNotEmpty && model.CitiesModelList.isNotEmpty)
// ? model.bloodModelList[0].city
// :
projectProvider.isArabic ? _selectedHospital.descriptionN : _selectedHospital.description, () {
List<RadioSelectionDialogModel> list = [ List<RadioSelectionDialogModel> list = [
for (int i = 0; i < model.CitiesModelList.length; i++) for (int i = 0; i < model.CitiesModelList.length; i++)
RadioSelectionDialogModel(projectProvider.isArabic ? model.CitiesModelList[i].descriptionN : model.CitiesModelList[i].description, i), RadioSelectionDialogModel(projectProvider.isArabic ? model.CitiesModelList[i].descriptionN : model.CitiesModelList[i].description, i),

@ -13,9 +13,7 @@ import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart'; import 'package:rating_bar/rating_bar.dart';
class PrescriptionsWidget extends StatelessWidget { class PrescriptionsWidget extends StatelessWidget {
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
AuthenticatedUserObject authenticatedUserObject =
locator<AuthenticatedUserObject>();
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -36,7 +34,7 @@ class PrescriptionsWidget extends StatelessWidget {
ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()), ViewAllHomeWidget(TranslationBase.of(context).myPrescription, HomePrescriptionsPage()),
Container( Container(
margin: EdgeInsets.only(right: 10.0, left: 10.0), margin: EdgeInsets.only(right: 10.0, left: 10.0),
height: MediaQuery.of(context).size.height * 0.18, height: MediaQuery.of(context).size.height * 0.2,
child: ListView.builder( child: ListView.builder(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
shrinkWrap: true, shrinkWrap: true,
@ -57,7 +55,6 @@ class PrescriptionsWidget extends StatelessWidget {
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
Column(children: [
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10.0, top: 10.0,
@ -70,16 +67,14 @@ class PrescriptionsWidget extends StatelessWidget {
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
child: Image.network( child: Image.network(
model.prescriptionsList[index].doctorImageURL, model.prescriptionsList[index].doctorImageURL,
width: 60, width: 50,
height: 60, height: 50,
), ),
), ),
), ),
]),
Column( Column(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(left: 1),
padding: EdgeInsets.only(left: 15.0, right: 15.0), padding: EdgeInsets.only(left: 15.0, right: 15.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
@ -116,9 +111,6 @@ class PrescriptionsWidget extends StatelessWidget {
), ),
], ],
), ),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
child: Row(children: <Widget>[ child: Row(children: <Widget>[
@ -140,11 +132,6 @@ class PrescriptionsWidget extends StatelessWidget {
), ),
]), ]),
), ),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
child: Text( child: Text(
@ -152,20 +139,14 @@ class PrescriptionsWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: Colors.green, color: Colors.green,
fontSize: 15.0, fontSize: 15.0,
// fontWeight: FontWeight.bold,
),
), ),
), ),
],
), ),
Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[ Row(children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 5), margin: EdgeInsets.only(left: 5),
child: Align(
alignment: Alignment.topLeft,
child: RatingBar.readOnly( child: RatingBar.readOnly(
initialRating: model.prescriptionsList[index].actualDoctorRate.toDouble(), initialRating: model.prescriptionsList[index].actualDoctorRate.toDouble(),
// initialRating: productRate,
size: 15.0, size: 15.0,
filledColor: Colors.yellow[700], filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500], emptyColor: Colors.grey[500],
@ -175,18 +156,25 @@ class PrescriptionsWidget extends StatelessWidget {
emptyIcon: Icons.star, emptyIcon: Icons.star,
), ),
), ),
) SizedBox(
width: 100.0,
),
Container(
child: Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
)),
]), ]),
]), ]),
); );
}), },
),
), ),
], ],
), ),
), ),
) )
: Container( : Container(),
),
); );
} }
} }

@ -96,7 +96,7 @@ class BottomNavPharmacyItem extends StatelessWidget {
fontWeight: currentIndex == index fontWeight: currentIndex == index
? FontWeight.normal ? FontWeight.normal
: FontWeight.w400, : FontWeight.w400,
fontSize: currentIndex == index ? 13 : 11, fontSize: currentIndex == index ? 11 : 9,
), ),
], ],
), ),

Loading…
Cancel
Save