merge-update-with-lab-changes
haroon amjad 4 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,20 +86,22 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
onModelReady: (model) { onModelReady: (model) {
model.getCities().then((value) { if (projectProvider.isLogin) {
model.getBlood().then((value) { model.getCities().then((value) {
if (model.bloodModelList.length > 0) { model.getBlood().then((value) {
CitiesModel citiesModel = new CitiesModel(); if (model.bloodModelList.length > 0) {
citiesModel.iD = getSelectedCityID(model); CitiesModel citiesModel = new CitiesModel();
_selectedHospitalIndex = (citiesModel.iD - 1); citiesModel.iD = getSelectedCityID(model);
citiesModel.description = model.CitiesModelList[_selectedHospitalIndex].description; _selectedHospitalIndex = (citiesModel.iD - 1);
citiesModel.descriptionN = model.CitiesModelList[_selectedHospitalIndex].descriptionN; citiesModel.description = model.CitiesModelList[_selectedHospitalIndex].description;
_selectedHospital = citiesModel; citiesModel.descriptionN = model.CitiesModelList[_selectedHospitalIndex].descriptionN;
} else { _selectedHospital = citiesModel;
_selectedHospital = model.CitiesModelList[0]; } else {
} _selectedHospital = model.CitiesModelList[0];
}
});
}); });
}); }
}, },
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,157 +34,147 @@ 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,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: model.prescriptionsList.length, itemCount: model.prescriptionsList.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return Container( return Container(
padding: EdgeInsets.only(left: 8.0, right: 8.0), padding: EdgeInsets.only(left: 8.0, right: 8.0),
margin: EdgeInsets.only(right: 5.0, left: 5.0), margin: EdgeInsets.only(right: 5.0, left: 5.0),
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Colors.grey, color: Colors.grey,
style: BorderStyle.solid, style: BorderStyle.solid,
width: 1.0, width: 1.0,
),
color: Colors.white,
borderRadius: BorderRadius.circular(10.0)),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Row(
children: <Widget>[
Container(
padding: EdgeInsets.only(
top: 10.0,
left: 10.0,
right: 10.0,
bottom: 10.0,
),
child: CircleAvatar(
radius: 30,
backgroundColor: Colors.transparent,
child: Image.network(
model.prescriptionsList[index].doctorImageURL,
width: 50,
height: 50,
),
),
), ),
color: Colors.white, Column(
borderRadius: BorderRadius.circular(10.0)), children: [
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Row(
children: <Widget>[
Column(children: [
Container( Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(left: 15.0, right: 15.0),
top: 10.0, decoration: BoxDecoration(
left: 10.0, border: Border.all(
right: 10.0,
bottom: 10.0,
),
child: CircleAvatar(
radius: 30,
backgroundColor: Colors.transparent,
child: Image.network(
model.prescriptionsList[index].doctorImageURL,
width: 60,
height: 60,
),
),
),
]),
Column(
children: [
Container(
margin: EdgeInsets.only(left: 1),
padding: EdgeInsets.only(left: 15.0, right: 15.0),
decoration: BoxDecoration(
border: Border.all(
color: Colors.green,
style: BorderStyle.solid,
width: 3.0,
),
color: Colors.green, color: Colors.green,
borderRadius: BorderRadius.circular(30.0)), style: BorderStyle.solid,
child: Text( width: 3.0,
model.languageID == "ar"
? model.prescriptionsList[index].isInOutPatientDescriptionN.toString()
: model.prescriptionsList[index].isInOutPatientDescription.toString(),
style: TextStyle(
color: Colors.white,
fontSize: 15.0,
), ),
)), color: Colors.green,
Row(children: <Widget>[ borderRadius: BorderRadius.circular(30.0)),
Image.asset( child: Text(
'assets/images/Icon-awesome-calendar.png', model.languageID == "ar"
width: 30, ? model.prescriptionsList[index].isInOutPatientDescriptionN.toString()
height: 30, : model.prescriptionsList[index].isInOutPatientDescription.toString(),
),
Text(
DateUtil.convertStringToDate(model.prescriptionsList[index].appointmentDate.toString()).toString().substring(0, 10),
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.white,
fontSize: 15.0, fontSize: 15.0,
), ),
) )),
]), Row(children: <Widget>[
], Image.asset(
), 'assets/images/Icon-awesome-calendar.png',
], width: 30,
), height: 30,
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: Row(children: <Widget>[
Text(
model.prescriptionsList[index].doctorTitle.toString(),
style: TextStyle(
color: Colors.black,
fontSize: 15.0,
fontWeight: FontWeight.bold,
),
), ),
Text( Text(
model.prescriptionsList[index].doctorName.toString(), DateUtil.convertStringToDate(model.prescriptionsList[index].appointmentDate.toString()).toString().substring(0, 10),
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold,
), ),
), )
]), ]),
],
),
],
),
Container(
margin: EdgeInsets.only(left: 5),
child: Row(children: <Widget>[
Text(
model.prescriptionsList[index].doctorTitle.toString(),
style: TextStyle(
color: Colors.black,
fontSize: 15.0,
fontWeight: FontWeight.bold,
), ),
], ),
), Text(
Row( model.prescriptionsList[index].doctorName.toString(),
crossAxisAlignment: CrossAxisAlignment.start, style: TextStyle(
children: <Widget>[ color: Colors.black,
Container( fontSize: 15.0,
margin: EdgeInsets.only(left: 5), fontWeight: FontWeight.bold,
child: Text(
model.prescriptionsList[index].clinicDescription.toString(),
style: TextStyle(
color: Colors.green,
fontSize: 15.0,
// fontWeight: FontWeight.bold,
),
),
),
],
),
Row(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: Align(
alignment: Alignment.topLeft,
child: RatingBar.readOnly(
initialRating: model.prescriptionsList[index].actualDoctorRate.toDouble(),
// initialRating: productRate,
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star,
),
), ),
) ),
]), ]),
),
Container(
margin: EdgeInsets.only(left: 5),
child: Text(
model.prescriptionsList[index].clinicDescription.toString(),
style: TextStyle(
color: Colors.green,
fontSize: 15.0,
),
),
),
Row(children: <Widget>[
Container(
margin: EdgeInsets.only(left: 5),
child: RatingBar.readOnly(
initialRating: model.prescriptionsList[index].actualDoctorRate.toDouble(),
size: 15.0,
filledColor: Colors.yellow[700],
emptyColor: Colors.grey[500],
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: 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