From a359a6cd1a8846f5c7664a70012a9a0fb205a92c Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Mon, 12 Oct 2020 10:58:14 +0300 Subject: [PATCH] fix the loader issue --- .../AlHabibMedicalService/cmc_view_model.dart | 39 +++++++++---------- .../home_health_care_view_model.dart | 24 +++++++----- .../NewCMC/new_cmc_page.dart | 1 - .../ComprehensiveMedicalCheckup/cmc_page.dart | 2 - .../orders_log_details_page.dart | 1 - .../new_home_health_care_page.dart | 2 +- .../HomeHealthCare/home_health_care_page.dart | 2 +- .../orders_log_details_page.dart | 2 +- 8 files changed, 35 insertions(+), 38 deletions(-) diff --git a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart index a37228ad..214514d7 100644 --- a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart @@ -30,7 +30,6 @@ class CMCViewModel extends BaseViewModel { bool get isOrderUpdated => _cMCService.isOrderUpdated; Future getCMCAllServices() async { - setState(ViewState.Busy); await _cMCService .getCMCAllServices(); CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: cmcAllServicesList[0].iD); @@ -44,14 +43,11 @@ class CMCViewModel extends BaseViewModel { } } Future getCheckupItems(CMCGetItemsRequestModel cMCGetItemsRequestModel) async { - setState(ViewState.Busy); await _cMCService .getCheckupItems(cMCGetItemsRequestModel); if (_cMCService.hasError) { error = _cMCService.error; setState(ViewState.Error); - } else { - setState(ViewState.Idle); } } @@ -62,12 +58,15 @@ class CMCViewModel extends BaseViewModel { error = _cMCService.error; setState(ViewState.Error); } else { - var pendingOrder = _cMCService.cmcAllPresOrdersList - .firstWhere((element) => element.status == 1 || element.status == 2, + var pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere( + (element) => element.status == 1 || element.status == 2, orElse: () => null); - if (pendingOrder != null) + if (pendingOrder != null) { await getOrderDetailByOrderID(pendingOrder); - setState(ViewState.Idle); + setState(ViewState.Idle); + } else { + getCMCAllServices(); + } } } @@ -85,18 +84,16 @@ class CMCViewModel extends BaseViewModel { } Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async { - GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = GetOrderDetailByOrderIDRequestModel( - presOrderID: order.iD); - setState(ViewState.Busy); - await _cMCService.getOrderDetailByOrderID( - getOrderDetailByOrderIDRequestModel); - if (_cMCService.hasError) { - error = _cMCService.error; - setState(ViewState.Error); - } else { - setState(ViewState.Idle); - } + GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = + GetOrderDetailByOrderIDRequestModel(presOrderID: order.iD); + // setState(ViewState.Busy); + await _cMCService + .getOrderDetailByOrderID(getOrderDetailByOrderIDRequestModel); + // if (_cMCService.hasError) { + // error = _cMCService.error; + // setState(ViewState.Error); + // } else { + // setState(ViewState.Idle); + // } } - - } \ No newline at end of file diff --git a/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart index 01043596..2ef1de93 100644 --- a/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart @@ -28,7 +28,7 @@ class HomeHealthCareViewModel extends BaseViewModel { Future getHHCAllServices() async { HHCGetAllServicesRequestModel hHCGetAllServicesRequestModel = new HHCGetAllServicesRequestModel(); - setState(ViewState.Busy); + //setState(ViewState.Busy); await _homeHealthCareService .getHHCAllServices(hHCGetAllServicesRequestModel); if (_homeHealthCareService.hasError) { @@ -49,9 +49,13 @@ class HomeHealthCareViewModel extends BaseViewModel { var pendingOrder = _homeHealthCareService.hhcAllPresOrdersList .firstWhere((element) => element.status == 1 || element.status == 2, orElse: () => null); - if (pendingOrder != null) + if (pendingOrder != null) { await getOrderDetailByOrderID(pendingOrder); - setState(ViewState.Idle); + setState(ViewState.Idle); + } else { + getHHCAllServices(); + } + } } @@ -71,15 +75,15 @@ class HomeHealthCareViewModel extends BaseViewModel { Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async { GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = GetOrderDetailByOrderIDRequestModel( presOrderID: order.iD); - setState(ViewState.Busy); + // setState(ViewState.Busy); await _homeHealthCareService.getOrderDetailByOrderID( getOrderDetailByOrderIDRequestModel); - if (_homeHealthCareService.hasError) { - error = _homeHealthCareService.error; - setState(ViewState.Error); - } else { - setState(ViewState.Idle); - } + // if (_homeHealthCareService.hasError) { + // error = _homeHealthCareService.error; + // setState(ViewState.Error); + // } else { + // setState(ViewState.Idle); + // } } diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart index f21aa8f0..494b0920 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart @@ -85,7 +85,6 @@ class _NewCMCPageState extends State } else { AppToast.showSuccessToast(message: "Done Successfully"); await model.getCmcAllPresOrders(); - await model.getCMCAllServices(); } }, )); diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart index 5938ac48..385d0da3 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart @@ -36,8 +36,6 @@ class _CMCPageState extends State Widget build(BuildContext context) { return BaseView( onModelReady: (model){ - - model.getCMCAllServices(); model.getCmcAllPresOrders(); }, builder: (_, model, widget) => AppScaffold( diff --git a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart index 95f16cf2..6c915a4c 100644 --- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart +++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart @@ -37,7 +37,6 @@ class OrdersLogDetailsPage extends StatelessWidget { } else { AppToast.showSuccessToast(message: "Done Successfully"); await model.getCmcAllPresOrders(); - await model.getCMCAllServices(); } }, )); diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart index 6ef860ee..84f59e25 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart @@ -67,7 +67,7 @@ class _NewHomeHealthCarePageState extends State } else { AppToast.showSuccessToast(message: "Done Successfully"); await model.getHHCAllPresOrders(); - await model.getHHCAllServices(); + // await model.getHHCAllServices(); } }, )); diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart index 9bebea72..8f4821f6 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart @@ -37,7 +37,7 @@ class _HomeHealthCarePageState extends State Widget build(BuildContext context) { return BaseView( onModelReady: (model){ - model.getHHCAllServices(); + // model.getHHCAllServices(); model.getHHCAllPresOrders(); }, builder: (_, model, widget) => AppScaffold( diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart index 2a4fedd4..0cfedb41 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart @@ -37,7 +37,7 @@ class OrdersLogDetailsPage extends StatelessWidget { } else { AppToast.showSuccessToast(message: "Done Successfully"); await model.getHHCAllPresOrders(); - await model.getHHCAllServices(); + // await model.getHHCAllServices(); } }, ));