diff --git a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart index 0ec33532..d7e290d0 100644 --- a/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/cmc_view_model.dart @@ -121,13 +121,17 @@ class CMCViewModel extends BaseViewModel { Future getCustomerInfo() async { setState(ViewState.Busy); - await _pharmacyModuleService.generatePharmacyToken().then((value) async { - await _customerAddressesService.getCustomerInfo(); - }); + await _pharmacyModuleService.generatePharmacyToken(); + // await _pharmacyModuleService.createUser(); + if (_customerAddressesService.hasError) { error = _customerAddressesService.error; + await _pharmacyModuleService.createUser(); + // await _customerAddressesService.getCustomerInfo(); setState(ViewState.ErrorLocal); } else { + await _pharmacyModuleService.createUser(); + // await _customerAddressesService.getCustomerInfo(); await getCustomerAddresses(); } } 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 a326d7eb..0957ceb1 100644 --- a/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart +++ b/lib/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart @@ -109,11 +109,11 @@ class HomeHealthCareViewModel extends BaseViewModel { if (_customerAddressesService.hasError) { error = _customerAddressesService.error; await _pharmacyModuleService.createUser(); - await _customerAddressesService.getCustomerInfo(); + // await _customerAddressesService.getCustomerInfo(); setState(ViewState.ErrorLocal); } else { await _pharmacyModuleService.createUser(); - await _customerAddressesService.getCustomerInfo(); + // await _customerAddressesService.getCustomerInfo(); await getCustomerAddresses(); } } diff --git a/lib/core/viewModels/er/rrt-view-model.dart b/lib/core/viewModels/er/rrt-view-model.dart index d8705ae8..dcd1f5c1 100644 --- a/lib/core/viewModels/er/rrt-view-model.dart +++ b/lib/core/viewModels/er/rrt-view-model.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; -import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; +import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; @@ -11,7 +11,7 @@ import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; -import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; + import '../base_view_model.dart'; class RRTService extends BaseService {} @@ -68,13 +68,8 @@ class RRTViewModel extends BaseViewModel { // Pending rrtServiceData.pendingOrders.add(PrescriptionsOrder.fromJson(json)); } - // else if (json["Status"] == 3) { - // // Completed - // rrtServiceData.completedOrders.add(PrescriptionsOrder.fromJson(json)); - // } rrtServiceData.completedOrders.add(PrescriptionsOrder.fromJson(json)); } - return Future.error("404"); }); } }, onFailure: (error, statusCode) { diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart index c41ab952..4e4342f4 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart @@ -104,9 +104,9 @@ class _NewHomeHealthCareStepOnePageState extends State[ - Container( - width: MediaQuery.of(context).size.width * 0.9, - child: SecondaryButton( - label: TranslationBase.of(context).confirm, - disabled: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0, - color: Colors.grey[800], - onTap: () async { - widget.model.setState(ViewState.Busy); - widget.model.insertPresPresOrder(order: widget.patientERInsertPresOrderRequestModel).then((value) => { - widget.model.setState(ViewState.Idle), - Navigator.push( - context, - FadePage( - page: HomeHealthCarePage(), - ), - ) - }); - }, - textColor: Theme.of(context).backgroundColor), - ), - ], + child: Padding( + padding: const EdgeInsets.all(12.0), + child: DefaultButton( + TranslationBase.of(context).confirm, + () { + widget.model.setState(ViewState.Busy); + widget.model.insertPresPresOrder(order: widget.patientERInsertPresOrderRequestModel).then((value) => { + widget.model.setState(ViewState.Idle), + Navigator.push( + context, + FadePage( + page: HomeHealthCarePage(), + ), + ) + }); + }, + color: CustomColors.green, + ), ), + + // SecondaryButton( + // label: TranslationBase.of(context).confirm, + // disabled: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0, + // color: Colors.grey[800], + // onTap: () async { + // widget.model.setState(ViewState.Busy); + // widget.model.insertPresPresOrder(order: widget.patientERInsertPresOrderRequestModel).then((value) => { + // widget.model.setState(ViewState.Idle), + // Navigator.push( + // context, + // FadePage( + // page: HomeHealthCarePage(), + // ), + // ) + // }); + // }, + // textColor: Theme.of(context).backgroundColor), ), ); } diff --git a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart index da7adec2..696af81b 100644 --- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart +++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart @@ -1,11 +1,14 @@ import 'dart:async'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/patient_er_insert_pres_order_request_model.dart'; import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/reminder_dialog.dart'; import 'package:diplomaticquarterapp/theme/colors.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; @@ -16,6 +19,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; import 'package:diplomaticquarterapp/widgets/app_map/google_huawei_map.dart'; import 'location_page.dart'; @@ -42,6 +46,7 @@ class _NewHomeHealthCareStepTowPageState extends State markers = new Set(); AppMap appMap; + AppSharedPreferences sharedPref = AppSharedPreferences(); static CameraPosition _kGooglePlex = CameraPosition( target: LatLng(37.42796133580664, -122.085749655962), zoom: 14.4746, @@ -56,34 +61,45 @@ class _NewHomeHealthCareStepTowPageState extends State { GifLoaderDialogUtils.showMyDialog(context); var success = await viewModel.cancelOrder(order); GifLoaderDialogUtils.hideDialog(context); - if (success) + if (success) { setState(() { widget.orders.remove(order); }); + } + await viewModel.getAllOrders(); } } diff --git a/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart b/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart index 78f46185..656d47e0 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart @@ -90,7 +90,7 @@ class RRTLogListItem extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - TranslationBase.of(context).location + ": ", + TranslationBase.of(context).locationa + ": ", style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10), ), Expanded( @@ -124,7 +124,7 @@ class RRTLogListItem extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.end, children: [ Text( - DateUtil.formatDateToDate(order.createdOn, projectViewModel.isArabic), + DateUtil.getDayMonthYearDateFormattedLang(order.createdOn, projectViewModel.isArabic), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10), ), SizedBox(height: 12), diff --git a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart index c19f20a0..7a82ecff 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-pickup-address-page.dart @@ -1,30 +1,30 @@ import 'dart:async'; -import 'package:diplomaticquarterapp/config/config.dart'; -import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; +import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/er/rrt-view-model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/location_page.dart'; +import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/reminder_dialog.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; -import 'package:diplomaticquarterapp/uitl/app_toast.dart'; +import 'package:diplomaticquarterapp/theme/colors.dart'; +import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:diplomaticquarterapp/uitl/utils_new.dart'; +import 'package:diplomaticquarterapp/widgets/app_map/google_huawei_map.dart'; import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart'; +import 'package:diplomaticquarterapp/widgets/dialogs/select_location_dialog.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_material_pickers/flutter_material_pickers.dart'; import 'package:geolocator/geolocator.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:google_maps_place_picker/google_maps_place_picker.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; -import 'package:diplomaticquarterapp/uitl/utils_new.dart'; + import 'rrt-place-order.dart'; -import 'package:diplomaticquarterapp/widgets/app_map/google_huawei_map.dart'; -import 'package:diplomaticquarterapp/theme/colors.dart'; -import 'package:diplomaticquarterapp/widgets/dialogs/select_location_dialog.dart'; -import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; class RRTRequestPickupAddressPage extends StatefulWidget { final ServicePrice servicePrice; @@ -48,16 +48,19 @@ class RRTRequestPickupAddressPageState extends State myAddresses = []; - AddressInfo selectedAddress; + AddressInfo selectedAddress = new AddressInfo(); StreamController addressStreamController = StreamController(); Stream addressStream; StreamController addressLoadingStreamController = StreamController(); Stream addressLoadingStream; + // AddressInfo _selectedAddress; double latitude = 0; double longitude = 0; AppMap appMap; bool showCurrentLocation = false; + AppSharedPreferences sharedPref = AppSharedPreferences(); + @override void initState() { super.initState(); @@ -68,7 +71,8 @@ class RRTRequestPickupAddressPageState extends State placeOrder(), + color: CustomColors.green, ), ), ); diff --git a/lib/pages/ErService/rapid-response-team/rrt-request-page.dart b/lib/pages/ErService/rapid-response-team/rrt-request-page.dart index b9bec92f..c6e56c34 100644 --- a/lib/pages/ErService/rapid-response-team/rrt-request-page.dart +++ b/lib/pages/ErService/rapid-response-team/rrt-request-page.dart @@ -214,5 +214,6 @@ class RRTRequestPageState extends State { setState(() { widget.pendingOrders.remove(order); }); + await viewModel.getAllOrders(); } }