merge-update-with-lab-changes
haroon amjad 4 years ago
parent c253ec3110
commit 30e67bbe3e

@ -10,13 +10,13 @@ class BloodDonationService extends BaseService {
List<CitiesModel> CitiesModelList = List(); List<CitiesModel> CitiesModelList = List();
Map<String, dynamic> body = Map(); Map<String, dynamic> body = Map();
Future getAllCitiesOrders() async { Future getAllCitiesOrders() async {
hasError = false; hasError = false;
body['ListCities'] = false; body['ListCities'] = false;
await baseAppClient.post(GET_CITIES_REQUEST, body["IsPublicRequest"] = true;
onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_CITIES_REQUEST, onSuccess: (dynamic response, int statusCode) {
CitiesModelList.clear(); CitiesModelList.clear();
response['ListCities'].forEach((vital) { response['ListCities'].forEach((vital) {
CitiesModelList.add(CitiesModel.fromJson(vital)); CitiesModelList.add(CitiesModel.fromJson(vital));
}); });
@ -25,11 +25,11 @@ class BloodDonationService extends BaseService {
super.error = error; super.error = error;
}, body: body); }, body: body);
} }
Future bloodDonationSave(request) async { Future bloodDonationSave(request) async {
var localRes; var localRes;
try { try {
await baseAppClient.post(SAVE_BLOOD_REQUEST, await baseAppClient.post(SAVE_BLOOD_REQUEST, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
localRes = error; localRes = error;
@ -44,8 +44,7 @@ class BloodDonationService extends BaseService {
Future getAgreement() async { Future getAgreement() async {
var localRes; var localRes;
try { try {
await baseAppClient.post(GET_BLOOD_AGREEMENT, await baseAppClient.post(GET_BLOOD_AGREEMENT, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
localRes = error; localRes = error;
@ -57,12 +56,10 @@ class BloodDonationService extends BaseService {
} }
} }
Future saveAgreement(request) async { Future saveAgreement(request) async {
var localRes; var localRes;
try { try {
await baseAppClient.post(SAVE_BLOOD_AGREEMENT, await baseAppClient.post(SAVE_BLOOD_AGREEMENT, onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
localRes = response; localRes = response;
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
localRes = error; localRes = error;

@ -81,6 +81,7 @@ class MyBalanceViewModel extends BaseViewModel {
} }
Future getCities() async { Future getCities() async {
if(isLogin) {
setState(ViewState.Busy); setState(ViewState.Busy);
await _bloodDonationService.getAllCitiesOrders(); await _bloodDonationService.getAllCitiesOrders();
if (_bloodDonationService.hasError) { if (_bloodDonationService.hasError) {
@ -89,6 +90,7 @@ class MyBalanceViewModel extends BaseViewModel {
} else } else
setState(ViewState.Idle); setState(ViewState.Idle);
} }
}
Future getBlood() async { Future getBlood() async {
setState(ViewState.Busy); setState(ViewState.Busy);

@ -73,9 +73,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return BaseView<MyBalanceViewModel>( return BaseView<MyBalanceViewModel>(
onModelReady: (model) { onModelReady: (model) => model.getCities().then((value) {
if (projectProvider.isLogin && projectProvider.user != null) {
model.getCities().then((value) {
model.getBlood().then((value) { model.getBlood().then((value) {
if (model.bloodModelList.length > 0) { if (model.bloodModelList.length > 0) {
CitiesModel citiesModel = new CitiesModel(); CitiesModel citiesModel = new CitiesModel();
@ -90,9 +88,27 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
_selectedHospital = model.CitiesModelList[0]; _selectedHospital = model.CitiesModelList[0];
} }
}); });
}); }),
} // {
}, // if (projectProvider.isLogin && projectProvider.user != null) {
// model.getCities().then((value) {
// model.getBlood().then((value) {
// if (model.bloodModelList.length > 0) {
// CitiesModel citiesModel = new CitiesModel();
// citiesModel.iD = getSelectedCityID(model);
// _selectedHospitalIndex = (citiesModel.iD - 1);
// citiesModel.description = model.CitiesModelList[_selectedHospitalIndex].description;
// citiesModel.descriptionN = model.CitiesModelList[_selectedHospitalIndex].descriptionN;
// _selectedHospital = citiesModel;
// _selectedBloodType = model.bloodModelList[0].bloodGroup;
// _selectedBloodTypeIndex = getBloodIndex(_selectedBloodType);
// } else {
// _selectedHospital = model.CitiesModelList[0];
// }
// });
// });
// }
// },
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
showNewAppBar: true, showNewAppBar: true,

Loading…
Cancel
Save