diff --git a/Application.kt b/Application.kt new file mode 100644 index 00000000..0708653a --- /dev/null +++ b/Application.kt @@ -0,0 +1,35 @@ +//package com.cloud.diplomaticquarterapp +package com.ejada.hmg + +import io.flutter.app.FlutterApplication +import io.flutter.plugin.common.PluginRegistry +import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback +import io.flutter.plugins.GeneratedPluginRegistrant +import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService + +class Application : FlutterApplication(), PluginRegistrantCallback { + override fun onCreate() { + super.onCreate() + FlutterFirebaseMessagingService.setPluginRegistrant(this) + } + + override fun registerWith(registry: PluginRegistry) { + io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin")); + } +} + +//import io.flutter.app.FlutterApplication +//import io.flutter.plugin.common.PluginRegistry +//import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback +//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService +// +//class Application : FlutterApplication(), PluginRegistrantCallback { +// override fun onCreate() { +// super.onCreate() +// FlutterFirebaseMessagingService.setPluginRegistrant(this) +// } +// +// override fun registerWith(registry: PluginRegistry?) { +// FirebaseCloudMessagingPluginRegistrant.registerWith(registry) +// } +//} \ No newline at end of file diff --git a/FirebaseCloudMessagingPluginRegistrant.kt b/FirebaseCloudMessagingPluginRegistrant.kt new file mode 100644 index 00000000..9ac064cb --- /dev/null +++ b/FirebaseCloudMessagingPluginRegistrant.kt @@ -0,0 +1,23 @@ +//package com.cloud.diplomaticquarterapp +package com.ejada.hmg + +import io.flutter.plugin.common.PluginRegistry +import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin + +object FirebaseCloudMessagingPluginRegistrant { + fun registerWith(registry: PluginRegistry?) { + if (alreadyRegisteredWith(registry)) { + return + } + FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin")) + } + + private fun alreadyRegisteredWith(registry: PluginRegistry?): Boolean { + val key: String? = FirebaseCloudMessagingPluginRegistrant::class.java.canonicalName + if (registry?.hasPlugin(key)!!) { + return true + } + registry.registrarFor(key) + return false + } +} \ No newline at end of file diff --git a/lib/config/config.dart b/lib/config/config.dart index 41d54fd5..d7ffabcd 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -12,16 +12,16 @@ const PACKAGES_PRODUCTS = '/api/products'; const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_ORDERS = '/api/orders'; - const BASE_URL = 'https://uat.hmgwebservices.com/'; +const BASE_URL = 'https://uat.hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/'; // Pharmacy UAT URLs -const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; -const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +// const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; +// const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/'; // Pharmacy Production URLs -// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; -// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; +const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/'; +const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/'; const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; diff --git a/lib/core/viewModels/er/rrt-view-model.dart b/lib/core/viewModels/er/rrt-view-model.dart index 3bffae6d..d8705ae8 100644 --- a/lib/core/viewModels/er/rrt-view-model.dart +++ b/lib/core/viewModels/er/rrt-view-model.dart @@ -4,13 +4,14 @@ 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/model/prescriptions/prescriptions_order.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart'; 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 {} @@ -25,6 +26,9 @@ class RRTViewModel extends BaseViewModel { var _service = RRTService(); var _pharmacy_service = locator(); var _pharmacy_address_service = locator(); + CustomerAddressesService _customerAddressesService = locator(); + + List get addressesList => _customerAddressesService.addressesList; _RRTServiceData rrtServiceData = _RRTServiceData(); @@ -44,7 +48,6 @@ class RRTViewModel extends BaseViewModel { int requestNo; await _service.baseAppClient.post(PATIENT_ER_INSERT_PRES_ORDER, body: body, onSuccess: (response, statusCode) { - localRes = response; requestNo = response['RequestNo']; }, onFailure: (error, statusCode) { AppToast.showErrorToast(message: error); @@ -124,9 +127,7 @@ class RRTViewModel extends BaseViewModel { return Future.value(success); } - Future getCancelReasons() {} - - Future> getAddresses() async { + Future> getAddresses() async { Object error; try { var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN); @@ -140,4 +141,29 @@ class RRTViewModel extends BaseViewModel { } Future.error(error); } + + Future getCustomerAddresses() async { + setState(ViewState.Busy); + await _customerAddressesService.getCustomerAddresses(); + if (_customerAddressesService.hasError) { + error = _customerAddressesService.error; + setState(ViewState.ErrorLocal); + } else { + setState(ViewState.Idle); + } + } + + Future getCustomerInfo() async { + setState(ViewState.Busy); + await _pharmacy_service.generatePharmacyToken(); + if (_customerAddressesService.hasError) { + error = _customerAddressesService.error; + await _pharmacy_service.createUser(); + await getCustomerAddresses(); + setState(ViewState.ErrorLocal); + } else { + await _customerAddressesService.getCustomerInfo(); + await getCustomerAddresses(); + } + } } diff --git a/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart b/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart index 37b33757..2f2d1467 100644 --- a/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart +++ b/lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart @@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Country.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart'; @@ -9,10 +10,9 @@ import '../../../locator.dart'; import '../base_view_model.dart'; class PharmacyAddressesViewModel extends BaseViewModel { - PharmacyAddressService _pharmacyAddressService = - locator(); + PharmacyAddressService _pharmacyAddressService = locator(); - List get addresses => _pharmacyAddressService.addresses; + List get addresses => _pharmacyAddressService.addresses; int get selectedAddressIndex => _pharmacyAddressService.selectedAddressIndex; @@ -33,13 +33,13 @@ class PharmacyAddressesViewModel extends BaseViewModel { } } - Future addEditAddress(PickResult value, Addresses editedAddress) async { + Future addEditAddress(PickResult value, AddressInfo editedAddress) async { setState(ViewState.Busy); - Addresses sendingAddress; + AddressInfo sendingAddress; if (editedAddress == null) { - sendingAddress = Addresses(); + sendingAddress = AddressInfo(); sendingAddress.id = "0"; sendingAddress.firstName = user.firstName; sendingAddress.lastName = user.lastName; @@ -88,7 +88,7 @@ class PharmacyAddressesViewModel extends BaseViewModel { } } - Future deleteAddresses(Addresses sendingAddress) async { + Future deleteAddresses(AddressInfo sendingAddress) async { setState(ViewState.Busy); await _pharmacyAddressService.deleteCustomerAddress(sendingAddress); if (_pharmacyAddressService.hasError) { @@ -99,7 +99,7 @@ class PharmacyAddressesViewModel extends BaseViewModel { } } - Future saveSelectedAddressLocally(Addresses selectedAddress) async { + Future saveSelectedAddressLocally(AddressInfo selectedAddress) async { await sharedPref.setObject(PHARMACY_SELECTED_ADDRESS, selectedAddress); } } 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 ad950d85..d265bdce 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 @@ -5,6 +5,7 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.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/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -18,8 +19,12 @@ 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: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; @@ -35,32 +40,73 @@ class RRTRequestPickupAddressPageState extends State mapController = Completer(); - CameraPosition mapCameraPosition = CameraPosition( - target: LatLng(24.7114693, 46.67469582), + + static CameraPosition cameraPosition = CameraPosition( + target: LatLng(37.42796133580664, -122.085749655962), zoom: 14.4746, ); - List myAddresses = []; - Addresses selectedAddress; + LatLng currentPostion; + List myAddresses = []; + AddressInfo selectedAddress; StreamController addressStreamController = StreamController(); Stream addressStream; StreamController addressLoadingStreamController = StreamController(); Stream addressLoadingStream; - + AddressInfo _selectedAddress; + double latitude = 0; + double longitude = 0; + AppMap appMap; + bool showCurrentLocation = false; @override void initState() { super.initState(); goToCurrentLocation(); - addressStream = addressStreamController.stream; - addressLoadingStream = addressLoadingStreamController.stream; + // addressStream = addressStreamController.stream; + // addressLoadingStream = addressLoadingStreamController.stream; + } + + setLatitudeAndLongitude({bool isSetState = false, String latLong}) async { + print("latLong " + latLong.toString()); + if (latLong == null) { + if (myAddresses.isEmpty) { + setState(() { + showCurrentLocation = true; + }); + } else { + latLong = myAddresses[myAddresses.length - 1].latLong; + } + } + + if (!showCurrentLocation) { + List latLongArr = latLong.split(','); + + latitude = double.parse(latLongArr[0]); + longitude = double.parse(latLongArr[1]); + print("sssss1 " + latitude.toString()); + print("sssss2 " + longitude.toString()); + currentPostion = LatLng(latitude, longitude); + selectedAddress = AddressInfo(latLong: '${latitude},${longitude}', address1: "", address2: ""); + setMap(); + } + } + + setMap() { + setState(() { + cameraPosition = CameraPosition( + target: currentPostion, + zoom: 14.4746, + ); + appMap.moveTo(cameraPostion: cameraPosition); + }); } void loadAddresses() async { // GifLoaderDialogUtils.showMyDialog(context); - myAddresses = await viewModel.getAddresses(); + await viewModel.getCustomerInfo(); // GifLoaderDialogUtils.hideDialog(context); - if (myAddresses.isNotEmpty) setState(() {}); + if (viewModel.addressesList.isNotEmpty) setState(() {}); } TranslationBase localize; @@ -77,63 +123,164 @@ class RRTRequestPickupAddressPageState extends State AppScaffold( appBarTitle: localize.pickupLocation, isShowAppBar: true, showNewAppBar: true, showNewAppBarTitle: true, + baseViewModel: viewModel, body: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - StreamBuilder( - stream: addressStream, - builder: (context, snapshot) { - return selectAddressField(); - }), - StreamBuilder( - stream: addressLoadingStream, - builder: (context, snapshot) { - return snapshot.hasData - ? LinearProgressIndicator(backgroundColor: Colors.transparent) - : Container( - height: 4, - ); - }), + Card( + margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12), + shape: cardRadius(12), + elevation: 3, + child: Container( + child: InkWell( + onTap: () => confirmSelectLocationDialog(myAddresses), + child: Container( + padding: EdgeInsets.all(8), + width: double.infinity, + // height: 65, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Colors.white, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + getAddressName(), + style: TextStyle( + fontWeight: FontWeight.w600, + fontSize: 12, + letterSpacing: -0.45, + ), + ), + ), + Icon(Icons.arrow_drop_down) + ], + ), + ), + ), + height: 50, + width: double.infinity, + ), + ), + InkWell( + onTap: () async { + Navigator.push( + context, + FadePage( + page: LocationPage( + latitude: latitude, + longitude: longitude, + ), + ), + ); + }, + child: Padding( + padding: EdgeInsets.only(left: 12, right: 12, bottom: 16, top: 8), + child: Row( + children: [ + Icon(Icons.add_circle_outline_sharp), + mWidth(12), + Text( + TranslationBase.of(context).addNewAddress, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w600, + letterSpacing: -0.46, + ), + ), + ], + ), + ), + ), Expanded( - child: PlacePicker( - apiKey: GOOGLE_API_KEY, - enableMyLocationButton: true, - automaticallyImplyAppBarLeading: false, - autocompleteOnTrailingWhitespace: true, - selectInitialPosition: true, - autocompleteLanguage: projectViewModel.currentLanguage, - enableMapTypeButton: true, - searchForInitialValue: false, - selectedPlaceWidgetBuilder: (_, selectedPlace, state, isSearchBarFocused) { - if (state == SearchingState.Idle) { - addressLoadingStreamController.sink.add(null); - if (selectedPlace != null) { - var loc = selectedPlace.geometry.location; - var address1 = selectedPlace.addressComponents.first.longName; - var address2 = ""; - if (selectedPlace.addressComponents.length > 1) address2 = selectedPlace.addressComponents[1].longName; - - selectedAddress = Addresses(latLong: '${loc.lat},${loc.lng}', address1: address1, address2: address2); - addressStreamController.sink.add(0); - } - } else { - addressLoadingStreamController.sink.add(0); - } - return Container(); - }, - initialPosition: LatLng(24.7114693, 46.67469582), - useCurrentLocation: false, + child: Stack( + alignment: Alignment.center, + children: [ + appMap = AppMap(cameraPosition.toMap(), onCameraMove: (camera) { + _updatePosition(camera); + }), + Icon( + Icons.place, + color: CustomColors.accentColor, + size: 50, + ), + ], ), ), - continueButton() + Padding( + padding: const EdgeInsets.only(left: 20, right: 20, top: 14, bottom: 14), + child: continueButton(), + ), ], - ))); + ) + + // Column( + // crossAxisAlignment: CrossAxisAlignment.stretch, + // children: [ + // StreamBuilder( + // stream: addressStream, + // builder: (context, snapshot) { + // return selectAddressField(); + // }), + // StreamBuilder( + // stream: addressLoadingStream, + // builder: (context, snapshot) { + // return snapshot.hasData + // ? LinearProgressIndicator(backgroundColor: Colors.transparent) + // : Container( + // height: 4, + // ); + // }), + // Expanded( + // child: PlacePicker( + // apiKey: GOOGLE_API_KEY, + // enableMyLocationButton: true, + // automaticallyImplyAppBarLeading: false, + // autocompleteOnTrailingWhitespace: true, + // selectInitialPosition: true, + // autocompleteLanguage: projectViewModel.currentLanguage, + // enableMapTypeButton: true, + // searchForInitialValue: false, + // selectedPlaceWidgetBuilder: (_, selectedPlace, state, isSearchBarFocused) { + // if (state == SearchingState.Idle) { + // addressLoadingStreamController.sink.add(null); + // if (selectedPlace != null) { + // var loc = selectedPlace.geometry.location; + // var address1 = selectedPlace.addressComponents.first.longName; + // var address2 = ""; + // if (selectedPlace.addressComponents.length > 1) address2 = selectedPlace.addressComponents[1].longName; + + // selectedAddress = Addresses(latLong: '${loc.lat},${loc.lng}', address1: address1, address2: address2); + // addressStreamController.sink.add(0); + // } + // } else { + // addressLoadingStreamController.sink.add(0); + // } + // return Container(); + // }, + // initialPosition: LatLng(24.7114693, 46.67469582), + // useCurrentLocation: false, + // ), + // ), + // continueButton() + // ], + // ) + + )); + } + + void _updatePosition(CameraPosition _position) { + latitude = _position.target.latitude; + longitude = _position.target.longitude; + selectedAddress = AddressInfo(latLong: '${latitude},${longitude}', address1: "", address2: ""); } Widget centerTargetPoint() { @@ -149,29 +296,29 @@ class RRTRequestPickupAddressPageState extends State 1) { - var cordinates = itm.latLong.split(','); - var latlng = LatLng(double.parse(cordinates.first), double.parse(cordinates.last)); - moveToLocation(latlng); - } else { - AppToast.showErrorToast(message: 'Invalid address coordinates'); - } - }); - }, - ); - }, - separatorBuilder: (ctx, idx) => Container( - height: 0.25, - color: Colors.grey.withOpacity(0.7), - ))); + // openAddressSelectDialog() { + // showMaterialResponsiveDialog( + // hideButtons: true, + // context: context, + // title: localize.selectAddress, + // child: ListView.separated( + // shrinkWrap: true, + // padding: EdgeInsets.all(10), + // itemCount: myAddresses.length, + // itemBuilder: (ctx, idx) { + // var itm = myAddresses[idx]; + // return ListTile( + // title: Text(itm.toString()), + // onTap: () { + // setState(() { + // selectedAddress = itm; + // Navigator.pop(context); + // if (itm.latLong != null && itm.latLong.isNotEmpty && itm.latLong.split(',').length > 1) { + // var cordinates = itm.latLong.split(','); + // var latlng = LatLng(double.parse(cordinates.first), double.parse(cordinates.last)); + // //moveToLocation(latlng); + // } else { + // AppToast.showErrorToast(message: 'Invalid address coordinates'); + // } + // }); + // }, + // ); + // }, + // separatorBuilder: (ctx, idx) => Container( + // height: 0.25, + // color: Colors.grey.withOpacity(0.7), + // ))); + // } + + void confirmSelectLocationDialog(List addresses) { + showDialog( + context: context, + child: SelectLocationDialog( + addresses: addresses, + selectedAddress: _selectedAddress, + onValueSelected: (value) { + showCurrentLocation = false; + setLatitudeAndLongitude(latLong: value.latLong); + + setState(() { + _selectedAddress = value; + }); + }, + ), + ); + } + + String getAddressName() { + if (_selectedAddress != null) + return _selectedAddress.address1; + else + return TranslationBase.of(context).selectAddress; } moveToLocation(LatLng location, {bool animate = true}) async { await Future.delayed(Duration(milliseconds: 200)); - mapCameraPosition = CameraPosition( + cameraPosition = CameraPosition( target: location, zoom: 16.4746, ); if (animate) (await mapController.future).animateCamera( - CameraUpdate.newCameraPosition(mapCameraPosition), + CameraUpdate.newCameraPosition(cameraPosition), ); else (await mapController.future).moveCamera( - CameraUpdate.newCameraPosition(mapCameraPosition), + CameraUpdate.newCameraPosition(cameraPosition), ); } @@ -246,7 +418,8 @@ class RRTRequestPickupAddressPageState extends State { ]; final List measureUnitArList = ["كيلو جرام", "باوند"]; String measureTimeSelectedType; - bool isButtonDisabled = false; + bool isButtonDisabled = true; @override void initState() { @@ -221,8 +221,8 @@ class _AddWeightPageState extends State { child: Button( onTap: () async { if (_weightValueController.text.isNotEmpty) { + GifLoaderDialogUtils.showMyDialog(context); if (widget.isUpdate) { - GifLoaderDialogUtils.showMyDialog(context); widget.model .updateWeightResult( weightDate: '${dayWeightDate.year}-${dayWeightDate.month}-${dayWeightDate.day} ${timeWeightDate.hour}:${timeWeightDate.minute}:00', @@ -253,7 +253,7 @@ class _AddWeightPageState extends State { } }, label: TranslationBase.of(context).save.toUpperCase(), - backgroundColor: Colors.red[900], + backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900], disabled: isButtonDisabled, ), )); @@ -288,11 +288,11 @@ class _AddWeightPageState extends State { void validateForm() { if (_weightValueController.text.length > 0 && measureTimeSelectedType != null) { setState(() { - isButtonDisabled = true; + isButtonDisabled = false; }); } else { setState(() { - isButtonDisabled = false; + isButtonDisabled = true; }); } } diff --git a/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart b/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart index 3661d1fd..1f1dda1c 100644 --- a/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart +++ b/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart @@ -10,7 +10,9 @@ 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:provider/provider.dart'; +import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'AddWeightPage.dart'; import 'WeightMonthlyPage.dart'; import 'WeightWeeklyPage.dart'; @@ -38,6 +40,7 @@ class _WeightHomePageState extends State with SingleTickerProvid @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) => model.getWeight(), builder: (_, model, w) => AppScaffold( @@ -103,29 +106,35 @@ class _WeightHomePageState extends State with SingleTickerProvid ) ], ), - floatingActionButton: InkWell( - onTap: () { - Navigator.push( - context, - FadePage( - page: AddWeightPage( - model: model, - ))); - }, - child: Container( - width: 55, - height: 55, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Theme.of(context).primaryColor, - ), - child: Center( - child: Icon( - Icons.add, - color: Colors.white, - ), - ), - ), + floatingActionButton: Stack( + children: [ + Positioned( + bottom: 80, + right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0, + child: InkWell( + onTap: () { + Navigator.push( + context, + FadePage( + page: AddWeightPage( + model: model, + ))); + }, + child: Container( + width: 55, + height: 55, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Theme.of(context).primaryColor, + ), + child: Center( + child: Icon( + Icons.add, + color: Colors.white, + ), + ), + ))) + ], ), ), ), diff --git a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart index 0ccd8964..4e64bb6f 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart @@ -38,7 +38,7 @@ class _AddBloodPressurePageState extends State { DateTime bloodSugarDate = DateTime.now(); DateTime timeSugarDate = DateTime.now(); int measuredArm = 1; - bool isButtonDisabled = false; + bool isButtonDisabled = true; final List measureTimeEnList = [ 'Left Arm ', 'Right Arm', @@ -119,7 +119,7 @@ class _AddBloodPressurePageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Texts(measureTimeSelectedType), + Texts(projectViewModel.isArabic ? measureTimeArList[0] : measureTimeEnList[0]), Icon( Icons.arrow_drop_down, color: Colors.grey, @@ -254,7 +254,7 @@ class _AddBloodPressurePageState extends State { } }, label: TranslationBase.of(context).save.toUpperCase(), - backgroundColor: Colors.red[900], + backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900], disabled: isButtonDisabled, ), )); @@ -288,13 +288,13 @@ class _AddBloodPressurePageState extends State { void validateForm() { print("_bloodSystolicValueController " + _bloodSystolicValueController.text.length.toString()); - if (measureTimeSelectedType != 'Left Arm' && _bloodSystolicValueController.text.length > 0 && _bloodDiastolicValueController.text.length > 0) { + if (_bloodSystolicValueController.text.length > 0 && _bloodDiastolicValueController.text.length > 0) { setState(() { - isButtonDisabled = true; + isButtonDisabled = false; }); } else { setState(() { - isButtonDisabled = false; + isButtonDisabled = true; }); } // if(measureTimeSelectedType == 'Left Arm'){ diff --git a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart index b0d5613f..7dd4d619 100644 --- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart +++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart @@ -14,7 +14,9 @@ import 'AddBloodPressurePage.dart'; import 'BloodPressureMonthly.dart'; import 'BloodPressureYeaPage.dart'; import 'bloodPressureWeeklyPage.dart'; +import 'package:provider/provider.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; class BloodPressureHomePage extends StatefulWidget { @override @@ -38,6 +40,7 @@ class _BloodPressureHomePageState extends State with Sing @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) => model.getBloodPressure(), builder: (_, model, w) => AppScaffold( @@ -75,7 +78,7 @@ class _BloodPressureHomePageState extends State with Sing floatingActionButton: Stack(children: [ Positioned( bottom: 80, - right: 0, + right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0, child: InkWell( onTap: () { Navigator.push( diff --git a/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart b/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart index 33443e99..65005109 100644 --- a/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart +++ b/lib/pages/medical/my_trackers/blood_suger/AddBloodSugarPage.dart @@ -38,7 +38,7 @@ class _AddBloodSugarPageState extends State { DateTime timeSugarDate = DateTime.now(); String measureUnitSelectedType = 'mg/dlt'; int measuredTime = 1; - bool isButtonDisabled = false; + bool isButtonDisabled = true; final List measureUnitList = ['mg/dlt', 'mol/L']; final List measureTimeEnList = [ 'Before Breakfast', @@ -264,8 +264,8 @@ class _AddBloodSugarPageState extends State { child: Button( onTap: () async { if (_bloodSugarValueController.text.isNotEmpty) { + GifLoaderDialogUtils.showMyDialog(context); if (widget.isUpdate) { - GifLoaderDialogUtils.showMyDialog(context); await widget.bloodSugarViewMode.updateDiabtecResult( month: bloodSugarDate, hour: timeSugarDate, @@ -280,7 +280,6 @@ class _AddBloodSugarPageState extends State { else Navigator.pop(context); } else { - GifLoaderDialogUtils.showMyDialog(context); await widget.bloodSugarViewMode.addDiabtecResult( diabtecUnit: measureUnitSelectedType, measuredTime: measuredTime, @@ -297,7 +296,7 @@ class _AddBloodSugarPageState extends State { } }, label: TranslationBase.of(context).save.toUpperCase(), - backgroundColor: Colors.red[900], + backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900], disabled: isButtonDisabled, ), )); @@ -347,11 +346,11 @@ class _AddBloodSugarPageState extends State { void validateForm() { if (_bloodSugarValueController.text.length > 0) { setState(() { - isButtonDisabled = true; + isButtonDisabled = false; }); } else { setState(() { - isButtonDisabled = false; + isButtonDisabled = true; }); } } diff --git a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart index 1f32f2b8..85500a69 100644 --- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart +++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart @@ -1,4 +1,3 @@ - import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/blood_sugar_view_model.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; @@ -12,10 +11,11 @@ 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:provider/provider.dart'; import 'AddBloodSugarPage.dart'; import 'BloodMonthly.dart'; import 'BloodYeaPage.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'blood_sugar_weekly_page.dart'; class BloodSugarHomePage extends StatefulWidget { @@ -40,6 +40,7 @@ class _BloodSugarHomePageState extends State with SingleTick @override Widget build(BuildContext context) { + ProjectViewModel projectViewModel = Provider.of(context); return BaseView( onModelReady: (model) => model.getBloodSugar(), builder: (_, model, w) => AppScaffold( @@ -84,8 +85,8 @@ class _BloodSugarHomePageState extends State with SingleTick floatingActionButton: Stack( children: [ Positioned( - bottom: 80, - right: 0, + bottom: 130, + right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0, child: InkWell( onTap: () { Navigator.push( diff --git a/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart b/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart index 31dea8ef..54a54322 100644 --- a/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart +++ b/lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; @@ -9,7 +10,7 @@ import 'package:geolocator/geolocator.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart'; class AddAddressPage extends StatefulWidget { - final Addresses editedAddress; + final AddressInfo editedAddress; final Function(PickResult) onPick; AddAddressPage(this.editedAddress, this.onPick); @@ -25,9 +26,7 @@ class _AddAddressPageState extends State { @override void initState() { super.initState(); - if (widget.editedAddress != null && - widget.editedAddress.latLong != null && - widget.editedAddress.latLong != "") { + if (widget.editedAddress != null && widget.editedAddress.latLong != null && widget.editedAddress.latLong != "") { List latLng = widget.editedAddress.latLong.split(","); _latitude = double.parse(latLng[0]); _longitude = double.parse(latLng[1]); @@ -49,9 +48,7 @@ class _AddAddressPageState extends State { @override Widget build(BuildContext context) { final mediaQuery = MediaQuery.of(context); - final height = mediaQuery.size.height - - 60 - - mediaQuery.padding.top; + final height = mediaQuery.size.height - 60 - mediaQuery.padding.top; return BaseView( builder: (_, model, wi) => AppScaffold( diff --git a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart index 56170644..906abd9e 100644 --- a/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart +++ b/lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart @@ -1,4 +1,5 @@ import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart'; @@ -18,8 +19,7 @@ class PharmacyAddressesPage extends StatefulWidget { } class _PharmacyAddressesState extends State { - void navigateToAddressPage( - BuildContext ctx, PharmacyAddressesViewModel model, Addresses address) { + void navigateToAddressPage(BuildContext ctx, PharmacyAddressesViewModel model, AddressInfo address) { Navigator.push( ctx, FadePage( @@ -106,10 +106,8 @@ class _PharmacyAddressesState extends State { fontSize: 14, vPadding: 8, handler: () { - model.saveSelectedAddressLocally( - model.addresses[model.selectedAddressIndex]); - Navigator.pop( - context, model.addresses[model.selectedAddressIndex]); + model.saveSelectedAddressLocally(model.addresses[model.selectedAddressIndex]); + Navigator.pop(context, model.addresses[model.selectedAddressIndex]); }, ), ), @@ -123,13 +121,12 @@ class _PharmacyAddressesState extends State { class AddressItemWidget extends StatelessWidget { final PharmacyAddressesViewModel model; - final Addresses address; + final AddressInfo address; final Function selectAddress; final bool isSelected; - final Function(Addresses) onTabEditAddress; + final Function(AddressInfo) onTabEditAddress; - AddressItemWidget(this.model, this.address, this.selectAddress, - this.isSelected, this.onTabEditAddress); + AddressItemWidget(this.model, this.address, this.selectAddress, this.isSelected, this.onTabEditAddress); @override Widget build(BuildContext context) { @@ -155,18 +152,13 @@ class AddressItemWidget extends StatelessWidget { decoration: new BoxDecoration( color: !isSelected ? Colors.white : Colors.green, shape: BoxShape.circle, - border: Border.all( - color: Colors.grey, - style: BorderStyle.solid, - width: 1.0), + border: Border.all(color: Colors.grey, style: BorderStyle.solid, width: 1.0), ), child: Padding( padding: const EdgeInsets.all(0.0), child: Icon( Icons.check, - color: isSelected - ? Colors.white - : Colors.transparent, + color: isSelected ? Colors.white : Colors.transparent, size: 25, ), ), @@ -179,8 +171,7 @@ class AddressItemWidget extends StatelessWidget { Expanded( child: Container( child: Container( - margin: - EdgeInsets.symmetric(vertical: 12, horizontal: 12), + margin: EdgeInsets.symmetric(vertical: 12, horizontal: 12), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -243,8 +234,7 @@ class AddressItemWidget extends StatelessWidget { ), ), Padding( - padding: - const EdgeInsets.symmetric(horizontal: 8), + padding: const EdgeInsets.symmetric(horizontal: 8), child: SizedBox( child: Container( width: 1, @@ -262,21 +252,13 @@ class AddressItemWidget extends StatelessWidget { ConfirmDialog dialog = new ConfirmDialog( context: context, title: "Are you sure want to delete", - confirmMessage: - "${address.address1} ${address.address2}", - okText: - TranslationBase.of(context).delete, - cancelText: TranslationBase.of(context) - .cancel_nocaps, + confirmMessage: "${address.address1} ${address.address2}", + okText: TranslationBase.of(context).delete, + cancelText: TranslationBase.of(context).cancel_nocaps, okFunction: () => { - model - .deleteAddresses(address) - .then((_) { - ConfirmDialog.closeAlertDialog( - context); - AppToast.showErrorToast( - message: - "Address has been deleted"); + model.deleteAddresses(address).then((_) { + ConfirmDialog.closeAlertDialog(context); + AppToast.showErrorToast(message: "Address has been deleted"); }) }, cancelFunction: () => {}); diff --git a/lib/services/pharmacy_services/pharmacyAddress_service.dart b/lib/services/pharmacy_services/pharmacyAddress_service.dart index e1da6bd3..40d906f3 100644 --- a/lib/services/pharmacy_services/pharmacyAddress_service.dart +++ b/lib/services/pharmacy_services/pharmacyAddress_service.dart @@ -4,15 +4,16 @@ 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/model/pharmacies/Country.dart'; +import 'package:diplomaticquarterapp/core/service/AlHabibMedicalService/customer_addresses_service.dart'; import 'package:diplomaticquarterapp/core/service/base_service.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; class PharmacyAddressService extends BaseService { - List addresses = List(); + List addresses = List(); CountryData country; int selectedAddressIndex = 0; - Future> getAddresses() async { + Future> getAddresses() async { var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); Map queryParams = {'fields': 'addresses'}; hasError = false; @@ -20,17 +21,15 @@ class PharmacyAddressService extends BaseService { try { var completer = Completer(); - await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId", - onSuccess: (dynamic response, int statusCode) async { + await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId", onSuccess: (dynamic response, int statusCode) async { addresses.clear(); - var savedAddress = - await sharedPref.getObject(PHARMACY_SELECTED_ADDRESS); + var savedAddress = await sharedPref.getObject(PHARMACY_SELECTED_ADDRESS); if (savedAddress != null) { selectedAddress = Addresses.fromJson(savedAddress); } int index = 0; response['customers'][0]['addresses'].forEach((item) { - Addresses address = Addresses.fromJson(item); + AddressInfo address = AddressInfo.fromJson(item); if (selectedAddress != null && selectedAddress.id == item["id"]) { selectedAddressIndex = index; } @@ -44,8 +43,7 @@ class PharmacyAddressService extends BaseService { }, queryParams: queryParams); await completer.future; - - } catch (error){ + } catch (error) { throw error; } @@ -55,12 +53,10 @@ class PharmacyAddressService extends BaseService { Future getCountries(String countryName) async { hasError = false; try { - await baseAppClient.getPharmacy("$PHARMACY_GET_COUNTRY", - onSuccess: (dynamic response, int statusCode) { + await baseAppClient.getPharmacy("$PHARMACY_GET_COUNTRY", onSuccess: (dynamic response, int statusCode) { // countries.clear(); response['countries'].forEach((item) { - if (CountryData.fromJson(item).name == countryName || - CountryData.fromJson(item).namen == countryName) { + if (CountryData.fromJson(item).name == countryName || CountryData.fromJson(item).namen == countryName) { country = CountryData.fromJson(item); } // countries.add(CountryData.fromJson(item)); @@ -74,19 +70,19 @@ class PharmacyAddressService extends BaseService { } } - Future addCustomerAddress(Addresses address) async { + Future addCustomerAddress(AddressInfo address) async { makeCustomerAddress(address, ADD_CUSTOMER_ADDRESS); } - Future editCustomerAddress(Addresses address) async { + Future editCustomerAddress(AddressInfo address) async { makeCustomerAddress(address, EDIT_CUSTOMER_ADDRESS); } - Future deleteCustomerAddress(Addresses address) async { + Future deleteCustomerAddress(AddressInfo address) async { makeCustomerAddress(address, DELETE_CUSTOMER_ADDRESS); } - Future makeCustomerAddress(Addresses address, String url) async { + Future makeCustomerAddress(AddressInfo address, String url) async { var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); hasError = false; super.error = ""; @@ -102,7 +98,7 @@ class PharmacyAddressService extends BaseService { await baseAppClient.postPharmacy("$url", onSuccess: (response, statusCode) async { addresses.clear(); response['customers'][0]['addresses'].forEach((item) { - addresses.add(Addresses.fromJson(item)); + addresses.add(AddressInfo.fromJson(item)); }); }, onFailure: (String error, int statusCode) { hasError = true;