Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix the loader issue

Browse Source
er_location
Elham Rababah 4 years ago
parent 83ab1b4d61
commit a359a6cd1a
8 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File

37
lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart
Unescape Escape View File

@ -30,7 +30,6 @@ class CMCViewModel extends BaseViewModel {
bool get isOrderUpdated => _cMCService.isOrderUpdated; bool get isOrderUpdated => _cMCService.isOrderUpdated;
Future getCMCAllServices() async { Future getCMCAllServices() async {
setState(ViewState.Busy);
await _cMCService await _cMCService
.getCMCAllServices(); .getCMCAllServices();
CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: cmcAllServicesList[0].iD); CMCGetItemsRequestModel cMCGetItemsRequestModel = new CMCGetItemsRequestModel(checkupType: cmcAllServicesList[0].iD);
@ -44,14 +43,11 @@ class CMCViewModel extends BaseViewModel {
} }
} }
Future getCheckupItems(CMCGetItemsRequestModel cMCGetItemsRequestModel) async { Future getCheckupItems(CMCGetItemsRequestModel cMCGetItemsRequestModel) async {
setState(ViewState.Busy);
await _cMCService await _cMCService
.getCheckupItems(cMCGetItemsRequestModel); .getCheckupItems(cMCGetItemsRequestModel);
if (_cMCService.hasError) { if (_cMCService.hasError) {
error = _cMCService.error; error = _cMCService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else {
setState(ViewState.Idle);
} }
} }
@ -62,12 +58,15 @@ class CMCViewModel extends BaseViewModel {
error = _cMCService.error; error = _cMCService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
var pendingOrder = _cMCService.cmcAllPresOrdersList var pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere(
.firstWhere((element) => element.status == 1 || element.status == 2, (element) => element.status == 1 || element.status == 2,
orElse: () => null); orElse: () => null);
if (pendingOrder != null) if (pendingOrder != null) {
await getOrderDetailByOrderID(pendingOrder); await getOrderDetailByOrderID(pendingOrder);
setState(ViewState.Idle); setState(ViewState.Idle);
} else {
getCMCAllServices();
}
} }
} }
@ -85,18 +84,16 @@ class CMCViewModel extends BaseViewModel {
} }
Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async { Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async {
GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = GetOrderDetailByOrderIDRequestModel( GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel =
presOrderID: order.iD); GetOrderDetailByOrderIDRequestModel(presOrderID: order.iD);
setState(ViewState.Busy); // setState(ViewState.Busy);
await _cMCService.getOrderDetailByOrderID( await _cMCService
getOrderDetailByOrderIDRequestModel); .getOrderDetailByOrderID(getOrderDetailByOrderIDRequestModel);
if (_cMCService.hasError) { // if (_cMCService.hasError) {
error = _cMCService.error; // error = _cMCService.error;
setState(ViewState.Error); // setState(ViewState.Error);
} else { // } else {
setState(ViewState.Idle); // setState(ViewState.Idle);
} // }
} }
} }

22
lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart
Unescape Escape View File

@ -28,7 +28,7 @@ class HomeHealthCareViewModel extends BaseViewModel {
Future getHHCAllServices() async { Future getHHCAllServices() async {
HHCGetAllServicesRequestModel hHCGetAllServicesRequestModel = HHCGetAllServicesRequestModel hHCGetAllServicesRequestModel =
new HHCGetAllServicesRequestModel(); new HHCGetAllServicesRequestModel();
setState(ViewState.Busy); //setState(ViewState.Busy);
await _homeHealthCareService await _homeHealthCareService
.getHHCAllServices(hHCGetAllServicesRequestModel); .getHHCAllServices(hHCGetAllServicesRequestModel);
if (_homeHealthCareService.hasError) { if (_homeHealthCareService.hasError) {
@ -49,9 +49,13 @@ class HomeHealthCareViewModel extends BaseViewModel {
var pendingOrder = _homeHealthCareService.hhcAllPresOrdersList var pendingOrder = _homeHealthCareService.hhcAllPresOrdersList
.firstWhere((element) => element.status == 1 || element.status == 2, .firstWhere((element) => element.status == 1 || element.status == 2,
orElse: () => null); orElse: () => null);
if (pendingOrder != null) if (pendingOrder != null) {
await getOrderDetailByOrderID(pendingOrder); await getOrderDetailByOrderID(pendingOrder);
setState(ViewState.Idle); setState(ViewState.Idle);
} else {
getHHCAllServices();
}
} }
} }
@ -71,15 +75,15 @@ class HomeHealthCareViewModel extends BaseViewModel {
Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async { Future getOrderDetailByOrderID(GetHHCAllPresOrdersResponseModel order) async {
GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = GetOrderDetailByOrderIDRequestModel( GetOrderDetailByOrderIDRequestModel getOrderDetailByOrderIDRequestModel = GetOrderDetailByOrderIDRequestModel(
presOrderID: order.iD); presOrderID: order.iD);
setState(ViewState.Busy); // setState(ViewState.Busy);
await _homeHealthCareService.getOrderDetailByOrderID( await _homeHealthCareService.getOrderDetailByOrderID(
getOrderDetailByOrderIDRequestModel); getOrderDetailByOrderIDRequestModel);
if (_homeHealthCareService.hasError) { // if (_homeHealthCareService.hasError) {
error = _homeHealthCareService.error; // error = _homeHealthCareService.error;
setState(ViewState.Error); // setState(ViewState.Error);
} else { // } else {
setState(ViewState.Idle); // setState(ViewState.Idle);
} // }
} }

1
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
Unescape Escape View File

@ -85,7 +85,6 @@ class _NewCMCPageState extends State<NewCMCPage>
} else { } else {
AppToast.showSuccessToast(message: "Done Successfully"); AppToast.showSuccessToast(message: "Done Successfully");
await model.getCmcAllPresOrders(); await model.getCmcAllPresOrders();
await model.getCMCAllServices();
} }
}, },
)); ));

2
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
Unescape Escape View File

@ -36,8 +36,6 @@ class _CMCPageState extends State<CMCPage>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<CMCViewModel>( return BaseView<CMCViewModel>(
onModelReady: (model){ onModelReady: (model){
model.getCMCAllServices();
model.getCmcAllPresOrders(); model.getCmcAllPresOrders();
}, },
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(

1
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
Unescape Escape View File

@ -37,7 +37,6 @@ class OrdersLogDetailsPage extends StatelessWidget {
} else { } else {
AppToast.showSuccessToast(message: "Done Successfully"); AppToast.showSuccessToast(message: "Done Successfully");
await model.getCmcAllPresOrders(); await model.getCmcAllPresOrders();
await model.getCMCAllServices();
} }
}, },
)); ));

2
lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
Unescape Escape View File

@ -67,7 +67,7 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage>
} else { } else {
AppToast.showSuccessToast(message: "Done Successfully"); AppToast.showSuccessToast(message: "Done Successfully");
await model.getHHCAllPresOrders(); await model.getHHCAllPresOrders();
await model.getHHCAllServices(); // await model.getHHCAllServices();
} }
}, },
)); ));

2
lib/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart
Unescape Escape View File

@ -37,7 +37,7 @@ class _HomeHealthCarePageState extends State<HomeHealthCarePage>
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<HomeHealthCareViewModel>( return BaseView<HomeHealthCareViewModel>(
onModelReady: (model){ onModelReady: (model){
model.getHHCAllServices(); // model.getHHCAllServices();
model.getHHCAllPresOrders(); model.getHHCAllPresOrders();
}, },
builder: (_, model, widget) => AppScaffold( builder: (_, model, widget) => AppScaffold(

2
lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
Unescape Escape View File

@ -37,7 +37,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
} else { } else {
AppToast.showSuccessToast(message: "Done Successfully"); AppToast.showSuccessToast(message: "Done Successfully");
await model.getHHCAllPresOrders(); await model.getHHCAllPresOrders();
await model.getHHCAllServices(); // await model.getHHCAllServices();
} }
}, },
)); ));

Write Preview
Loading…
Cancel
Save