updates

lib/core/service/blood/blood_donation_service.dart

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

lib/core/viewModels/medical/my_balance_view_model.dart

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

lib/pages/Blood/blood_donation.dart

@@ -73,9 +73,7 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
     projectProvider = Provider.of(context);
 
     return BaseView<MyBalanceViewModel>(
-      onModelReady: (model) {
-        if (projectProvider.isLogin && projectProvider.user != null) {
-          model.getCities().then((value) {
+      onModelReady: (model) => model.getCities().then((value) {
         model.getBlood().then((value) {
           if (model.bloodModelList.length > 0) {
             CitiesModel citiesModel = new CitiesModel();
@@ -90,9 +88,27 @@ class _BloodDonationPageState extends State<BloodDonationPage> {
             _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(
         isShowAppBar: true,
         showNewAppBar: true,