tracker services done rrt in progress

merge-update-with-lab-changes
Sultan Khan 5 years ago
parent 1205f93c8a
commit 08933632d3

@ -12,16 +12,16 @@ const PACKAGES_PRODUCTS = '/api/products';
const PACKAGES_CUSTOMER = '/api/customers'; const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items'; const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders'; 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/'; // const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs // Pharmacy UAT URLs
const BASE_PHARMACY_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/'; // const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// Pharmacy Production URLs // Pharmacy Production URLs
// const BASE_PHARMACY_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 PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity'; const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity';

@ -1,68 +1,71 @@
import 'dart:async'; import 'dart:async';
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescriptions_order.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/base_service.dart';
import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart'; import 'package:diplomaticquarterapp/core/service/parmacyModule/parmacy_module_service.dart';
import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/locator.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart'; import 'package:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
class RRTService extends BaseService {}
class RRTService extends BaseService{ class _RRTServiceData {
}
class _RRTServiceData{
List<PrescriptionsOrder> pendingOrders = []; List<PrescriptionsOrder> pendingOrders = [];
List<PrescriptionsOrder> completedOrders = []; List<PrescriptionsOrder> completedOrders = [];
ServicePrice servicePrice; ServicePrice servicePrice;
} }
class RRTViewModel extends BaseViewModel{ class RRTViewModel extends BaseViewModel {
var _service = RRTService(); var _service = RRTService();
var _pharmacy_service = locator<PharmacyModuleService>(); var _pharmacy_service = locator<PharmacyModuleService>();
var _pharmacy_address_service = locator<PharmacyAddressService>(); var _pharmacy_address_service = locator<PharmacyAddressService>();
CustomerAddressesService _customerAddressesService = locator<CustomerAddressesService>();
List<AddressInfo> get addressesList => _customerAddressesService.addressesList;
_RRTServiceData rrtServiceData = _RRTServiceData(); _RRTServiceData rrtServiceData = _RRTServiceData();
Future<_RRTServiceData> loadRequiredData() async{ Future<_RRTServiceData> loadRequiredData() async {
await getServicePrice(); await getServicePrice();
await getAllOrders(); await getAllOrders();
return rrtServiceData; return rrtServiceData;
} }
Future<int> createOrder(Map<String, dynamic> body) async{ Future<int> createOrder(Map<String, dynamic> body) async {
body['IdentificationNo'] = user.patientIdentificationNo; body['IdentificationNo'] = user.patientIdentificationNo;
body['NationalityID'] = user.nationalityID; body['NationalityID'] = user.nationalityID;
body['CreatedBy'] = user.patientIdentificationType; body['CreatedBy'] = user.patientIdentificationType;
body['OrderServiceID'] = 5; body['OrderServiceID'] = 5;
int requestNo; int requestNo;
await _service.baseAppClient.post(PATIENT_ER_INSERT_PRES_ORDER, body: body, onSuccess: (response, statusCode){ await _service.baseAppClient.post(PATIENT_ER_INSERT_PRES_ORDER, body: body, onSuccess: (response, statusCode) {
requestNo = response['RequestNo']; requestNo = response['RequestNo'];
}, onFailure: (error, statusCode){ }, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
}); });
return requestNo; return requestNo;
} }
// Service ID: 4 == RRT // Service ID: 4 == RRT
Future<_RRTServiceData> getAllOrders() async{ Future<_RRTServiceData> getAllOrders() async {
await _service.baseAppClient.post(GET_PRESCRIPTIONS_ALL_ORDERS, body: {}, onSuccess: (response, statusCode){ await _service.baseAppClient.post(GET_PRESCRIPTIONS_ALL_ORDERS, body: {}, onSuccess: (response, statusCode) {
var data = response["PatientER_GetPatientAllPresOrdersList"]; var data = response["PatientER_GetPatientAllPresOrdersList"];
if(data != null && data is List){ if (data != null && data is List) {
data.forEach((json){ data.forEach((json) {
if(json["ServiceID"] == 5){ if (json["ServiceID"] == 5) {
if(json["Status"] == 1){ // Pending if (json["Status"] == 1) {
// Pending
rrtServiceData.pendingOrders.clear(); rrtServiceData.pendingOrders.clear();
rrtServiceData.pendingOrders.add(PrescriptionsOrder.fromJson(json)); rrtServiceData.pendingOrders.add(PrescriptionsOrder.fromJson(json));
}else if (json["Status"] == 3){ // Completed } else if (json["Status"] == 3) {
// Completed
rrtServiceData.completedOrders.clear(); rrtServiceData.completedOrders.clear();
rrtServiceData.completedOrders.add(PrescriptionsOrder.fromJson(json)); rrtServiceData.completedOrders.add(PrescriptionsOrder.fromJson(json));
} }
@ -70,75 +73,93 @@ class RRTViewModel extends BaseViewModel{
return Future.error("404"); return Future.error("404");
}); });
} }
}, onFailure: (error, statusCode){ }, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
}); });
return rrtServiceData; return rrtServiceData;
} }
Future getOrderDetails() async {
Future getOrderDetails() async{
return null; return null;
} }
Future getAllQuestions() async {
Future getAllQuestions() async{ dynamic response_;
dynamic response_; await _service.baseAppClient.post(GET_ALL_RRT_QUESTIONS, body: {}, onSuccess: (response, statusCode) {
await _service.baseAppClient.post(GET_ALL_RRT_QUESTIONS, body: {}, onSuccess: (response, statusCode){
response_ = response; response_ = response;
}, onFailure: (error, statusCode){ }, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
}); });
return response_; return response_;
} }
Future<ServicePrice> getServicePrice() async {
Future<ServicePrice> getServicePrice() async{ Map<String, dynamic> body = {"IdentificationNo": user.patientIdentificationNo};
Map<String,dynamic> body = {"IdentificationNo":user.patientIdentificationNo}; ServicePrice servicePrice;
ServicePrice servicePrice; await _service.baseAppClient.post(GET_RRT_SERVICE_PRICE, body: body, onSuccess: (response, statusCode) {
await _service.baseAppClient.post(GET_RRT_SERVICE_PRICE, body: body, onSuccess: (response, statusCode){
var data = response['PatientE_RealRRT_GetServicePriceList']; var data = response['PatientE_RealRRT_GetServicePriceList'];
if(data != null && data is List){ if (data != null && data is List) {
var priceData = data.first; var priceData = data.first;
if(priceData != null){ if (priceData != null) {
servicePrice = ServicePrice.fromJson(priceData); servicePrice = ServicePrice.fromJson(priceData);
rrtServiceData.servicePrice = servicePrice; rrtServiceData.servicePrice = servicePrice;
} }
} }
}, onFailure: (error, statusCode){ }, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
}); });
return servicePrice; return servicePrice;
} }
Future<bool> cancelOrder(PrescriptionsOrder order, {String reason = ""}) async{ Future<bool> cancelOrder(PrescriptionsOrder order, {String reason = ""}) async {
var body = {"PresOrderID":order.iD, "PresOrderStatus":4,"EditedBy":3,"RejectionReason":reason}; var body = {"PresOrderID": order.iD, "PresOrderStatus": 4, "EditedBy": 3, "RejectionReason": reason};
var success = false; var success = false;
await _service.baseAppClient.post(PATIENT_ER_UPDATE_PRES_ORDER, body: body, onSuccess: (response, statusCode){ await _service.baseAppClient.post(PATIENT_ER_UPDATE_PRES_ORDER, body: body, onSuccess: (response, statusCode) {
success = true; success = true;
}, onFailure: (error, statusCode){ }, onFailure: (error, statusCode) {
AppToast.showErrorToast(message: error); AppToast.showErrorToast(message: error);
success = false; success = false;
}); });
return Future.value(success); return Future.value(success);
} }
Future getCancelReasons(){ Future<List<AddressInfo>> getAddresses() async {
}
Future<List<Addresses>> getAddresses() async{
Object error; Object error;
try{ try {
var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN); var token = await sharedPref.getString(PHARMACY_AUTORZIE_TOKEN);
if(token == null) if (token == null) await _pharmacy_service.generatePharmacyToken();
await _pharmacy_service.generatePharmacyToken();
await _pharmacy_service.makeVerifyCustomer({'PatientID': user.patientID.toString()}); await _pharmacy_service.makeVerifyCustomer({'PatientID': user.patientID.toString()});
await _pharmacy_address_service.getAddresses(); await _pharmacy_address_service.getAddresses();
return _pharmacy_address_service.addresses; return _pharmacy_address_service.addresses;
}catch(e){ } catch (e) {
error = e; error = e;
} }
Future.error(error); 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();
}
}
}

@ -2,6 +2,7 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Country.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:diplomaticquarterapp/services/pharmacy_services/pharmacyAddress_service.dart';
import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
@ -9,10 +10,9 @@ import '../../../locator.dart';
import '../base_view_model.dart'; import '../base_view_model.dart';
class PharmacyAddressesViewModel extends BaseViewModel { class PharmacyAddressesViewModel extends BaseViewModel {
PharmacyAddressService _pharmacyAddressService = PharmacyAddressService _pharmacyAddressService = locator<PharmacyAddressService>();
locator<PharmacyAddressService>();
List<Addresses> get addresses => _pharmacyAddressService.addresses; List<AddressInfo> get addresses => _pharmacyAddressService.addresses;
int get selectedAddressIndex => _pharmacyAddressService.selectedAddressIndex; 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); setState(ViewState.Busy);
Addresses sendingAddress; AddressInfo sendingAddress;
if (editedAddress == null) { if (editedAddress == null) {
sendingAddress = Addresses(); sendingAddress = AddressInfo();
sendingAddress.id = "0"; sendingAddress.id = "0";
sendingAddress.firstName = user.firstName; sendingAddress.firstName = user.firstName;
sendingAddress.lastName = user.lastName; 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); setState(ViewState.Busy);
await _pharmacyAddressService.deleteCustomerAddress(sendingAddress); await _pharmacyAddressService.deleteCustomerAddress(sendingAddress);
if (_pharmacyAddressService.hasError) { 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); await sharedPref.setObject(PHARMACY_SELECTED_ADDRESS, selectedAddress);
} }
} }

@ -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/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.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/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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_flutter/google_maps_flutter.dart';
import 'package:google_maps_place_picker/google_maps_place_picker.dart'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'rrt-place-order.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 { class RRTRequestPickupAddressPage extends StatefulWidget {
final ServicePrice servicePrice; final ServicePrice servicePrice;
@ -35,32 +40,73 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
bool mapIdle = true; bool mapIdle = true;
Completer<GoogleMapController> mapController = Completer(); Completer<GoogleMapController> mapController = Completer();
CameraPosition mapCameraPosition = CameraPosition(
target: LatLng(24.7114693, 46.67469582), static CameraPosition cameraPosition = CameraPosition(
target: LatLng(37.42796133580664, -122.085749655962),
zoom: 14.4746, zoom: 14.4746,
); );
List<Addresses> myAddresses = []; LatLng currentPostion;
Addresses selectedAddress; List<AddressInfo> myAddresses = [];
AddressInfo selectedAddress;
StreamController<int> addressStreamController = StreamController(); StreamController<int> addressStreamController = StreamController();
Stream<int> addressStream; Stream<int> addressStream;
StreamController<int> addressLoadingStreamController = StreamController(); StreamController<int> addressLoadingStreamController = StreamController();
Stream<int> addressLoadingStream; Stream<int> addressLoadingStream;
AddressInfo _selectedAddress;
double latitude = 0;
double longitude = 0;
AppMap appMap;
bool showCurrentLocation = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
goToCurrentLocation(); goToCurrentLocation();
addressStream = addressStreamController.stream; // addressStream = addressStreamController.stream;
addressLoadingStream = addressLoadingStreamController.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 { void loadAddresses() async {
// GifLoaderDialogUtils.showMyDialog(context); // GifLoaderDialogUtils.showMyDialog(context);
myAddresses = await viewModel.getAddresses(); await viewModel.getCustomerInfo();
// GifLoaderDialogUtils.hideDialog(context); // GifLoaderDialogUtils.hideDialog(context);
if (myAddresses.isNotEmpty) setState(() {}); if (viewModel.addressesList.isNotEmpty) setState(() {});
} }
TranslationBase localize; TranslationBase localize;
@ -77,63 +123,164 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
onModelReady: (vm) { onModelReady: (vm) {
viewModel = vm; viewModel = vm;
loadAddresses(); loadAddresses();
myAddresses = viewModel.addressesList;
}, },
builder: (ctx, vm, widget) => AppScaffold( builder: (ctx, vm, widget) => AppScaffold(
appBarTitle: localize.pickupLocation, appBarTitle: localize.pickupLocation,
isShowAppBar: true, isShowAppBar: true,
showNewAppBar: true, showNewAppBar: true,
showNewAppBarTitle: true, showNewAppBarTitle: true,
baseViewModel: viewModel,
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
StreamBuilder<Object>( Card(
stream: addressStream, margin: EdgeInsets.only(left: 12, right: 12, bottom: 12, top: 12),
builder: (context, snapshot) { shape: cardRadius(12),
return selectAddressField(); elevation: 3,
}), child: Container(
StreamBuilder<Object>( child: InkWell(
stream: addressLoadingStream, onTap: () => confirmSelectLocationDialog(myAddresses),
builder: (context, snapshot) { child: Container(
return snapshot.hasData padding: EdgeInsets.all(8),
? LinearProgressIndicator(backgroundColor: Colors.transparent) width: double.infinity,
: Container( // height: 65,
height: 4, 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( Expanded(
child: PlacePicker( child: Stack(
apiKey: GOOGLE_API_KEY, alignment: Alignment.center,
enableMyLocationButton: true, children: [
automaticallyImplyAppBarLeading: false, appMap = AppMap(cameraPosition.toMap(), onCameraMove: (camera) {
autocompleteOnTrailingWhitespace: true, _updatePosition(camera);
selectInitialPosition: true, }),
autocompleteLanguage: projectViewModel.currentLanguage, Icon(
enableMapTypeButton: true, Icons.place,
searchForInitialValue: false, color: CustomColors.accentColor,
selectedPlaceWidgetBuilder: (_, selectedPlace, state, isSearchBarFocused) { size: 50,
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() Padding(
padding: const EdgeInsets.only(left: 20, right: 20, top: 14, bottom: 14),
child: continueButton(),
),
], ],
))); )
// Column(
// crossAxisAlignment: CrossAxisAlignment.stretch,
// children: [
// StreamBuilder<Object>(
// stream: addressStream,
// builder: (context, snapshot) {
// return selectAddressField();
// }),
// StreamBuilder<Object>(
// 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() { Widget centerTargetPoint() {
@ -149,29 +296,29 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
); );
} }
Widget selectAddressField() { // Widget selectAddressField() {
var text = selectedAddress == null ? localize.selectAddress : selectedAddress.toString(); // var text = selectedAddress == null ? localize.selectAddress : selectedAddress.toString();
return Container( // return Container(
margin: EdgeInsets.all(10), // margin: EdgeInsets.all(10),
height: 50, // height: 50,
child: MaterialButton( // child: MaterialButton(
height: 50, // height: 50,
color: Colors.white, // color: Colors.white,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), // shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
onPressed: openAddressSelectDialog, // onPressed: openAddressSelectDialog,
child: Row( // child: Row(
children: [ // children: [
Expanded(child: Text(text, style: TextStyle(color: Colors.grey, fontSize: 13, letterSpacing: 1))), // Expanded(child: Text(text, style: TextStyle(color: Colors.grey, fontSize: 13, letterSpacing: 1))),
Icon( // Icon(
Icons.keyboard_arrow_down, // Icons.keyboard_arrow_down,
size: 20, // size: 20,
color: Colors.grey, // color: Colors.grey,
) // )
], // ],
), // ),
), // ),
); // );
} // }
Widget continueButton() { Widget continueButton() {
return Padding( return Padding(
@ -188,53 +335,78 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
); );
} }
openAddressSelectDialog() { // openAddressSelectDialog() {
showMaterialResponsiveDialog( // showMaterialResponsiveDialog(
hideButtons: true, // hideButtons: true,
context: context, // context: context,
title: localize.selectAddress, // title: localize.selectAddress,
child: ListView.separated( // child: ListView.separated(
shrinkWrap: true, // shrinkWrap: true,
padding: EdgeInsets.all(10), // padding: EdgeInsets.all(10),
itemCount: myAddresses.length, // itemCount: myAddresses.length,
itemBuilder: (ctx, idx) { // itemBuilder: (ctx, idx) {
var itm = myAddresses[idx]; // var itm = myAddresses[idx];
return ListTile( // return ListTile(
title: Text(itm.toString()), // title: Text(itm.toString()),
onTap: () { // onTap: () {
setState(() { // setState(() {
selectedAddress = itm; // selectedAddress = itm;
Navigator.pop(context); // Navigator.pop(context);
if (itm.latLong != null && itm.latLong.isNotEmpty && itm.latLong.split(',').length > 1) { // if (itm.latLong != null && itm.latLong.isNotEmpty && itm.latLong.split(',').length > 1) {
var cordinates = itm.latLong.split(','); // var cordinates = itm.latLong.split(',');
var latlng = LatLng(double.parse(cordinates.first), double.parse(cordinates.last)); // var latlng = LatLng(double.parse(cordinates.first), double.parse(cordinates.last));
moveToLocation(latlng); // //moveToLocation(latlng);
} else { // } else {
AppToast.showErrorToast(message: 'Invalid address coordinates'); // AppToast.showErrorToast(message: 'Invalid address coordinates');
} // }
}); // });
}, // },
); // );
}, // },
separatorBuilder: (ctx, idx) => Container( // separatorBuilder: (ctx, idx) => Container(
height: 0.25, // height: 0.25,
color: Colors.grey.withOpacity(0.7), // color: Colors.grey.withOpacity(0.7),
))); // )));
// }
void confirmSelectLocationDialog(List<AddressInfo> 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 { moveToLocation(LatLng location, {bool animate = true}) async {
await Future.delayed(Duration(milliseconds: 200)); await Future.delayed(Duration(milliseconds: 200));
mapCameraPosition = CameraPosition( cameraPosition = CameraPosition(
target: location, target: location,
zoom: 16.4746, zoom: 16.4746,
); );
if (animate) if (animate)
(await mapController.future).animateCamera( (await mapController.future).animateCamera(
CameraUpdate.newCameraPosition(mapCameraPosition), CameraUpdate.newCameraPosition(cameraPosition),
); );
else else
(await mapController.future).moveCamera( (await mapController.future).moveCamera(
CameraUpdate.newCameraPosition(mapCameraPosition), CameraUpdate.newCameraPosition(cameraPosition),
); );
} }
@ -246,7 +418,8 @@ class RRTRequestPickupAddressPageState extends State<RRTRequestPickupAddressPage
}); });
return; return;
} }
moveToLocation(LatLng(location.latitude, location.longitude), animate: false);
} }
// moveToLocation(LatLng(location.latitude, location.longitude), animate: false);
// }
} }

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.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/er/rrt-view-model.dart';
import 'package:diplomaticquarterapp/models/rrt/service_price.dart'; import 'package:diplomaticquarterapp/models/rrt/service_price.dart';
import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
@ -16,7 +17,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
class RRTPlaceOrderPage extends StatelessWidget { class RRTPlaceOrderPage extends StatelessWidget {
TranslationBase localize; TranslationBase localize;
RRTViewModel viewModel; RRTViewModel viewModel;
Addresses selectedAddress; AddressInfo selectedAddress;
final ServicePrice servicePrice; final ServicePrice servicePrice;
RRTPlaceOrderPage({@required this.selectedAddress, @required this.servicePrice}); RRTPlaceOrderPage({@required this.selectedAddress, @required this.servicePrice});

@ -42,7 +42,7 @@ class _AddWeightPageState extends State<AddWeightPage> {
]; ];
final List<String> measureUnitArList = ["كيلو جرام", "باوند"]; final List<String> measureUnitArList = ["كيلو جرام", "باوند"];
String measureTimeSelectedType; String measureTimeSelectedType;
bool isButtonDisabled = false; bool isButtonDisabled = true;
@override @override
void initState() { void initState() {
@ -221,8 +221,8 @@ class _AddWeightPageState extends State<AddWeightPage> {
child: Button( child: Button(
onTap: () async { onTap: () async {
if (_weightValueController.text.isNotEmpty) { if (_weightValueController.text.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context);
if (widget.isUpdate) { if (widget.isUpdate) {
GifLoaderDialogUtils.showMyDialog(context);
widget.model widget.model
.updateWeightResult( .updateWeightResult(
weightDate: '${dayWeightDate.year}-${dayWeightDate.month}-${dayWeightDate.day} ${timeWeightDate.hour}:${timeWeightDate.minute}:00', weightDate: '${dayWeightDate.year}-${dayWeightDate.month}-${dayWeightDate.day} ${timeWeightDate.hour}:${timeWeightDate.minute}:00',
@ -253,7 +253,7 @@ class _AddWeightPageState extends State<AddWeightPage> {
} }
}, },
label: TranslationBase.of(context).save.toUpperCase(), label: TranslationBase.of(context).save.toUpperCase(),
backgroundColor: Colors.red[900], backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900],
disabled: isButtonDisabled, disabled: isButtonDisabled,
), ),
)); ));
@ -288,11 +288,11 @@ class _AddWeightPageState extends State<AddWeightPage> {
void validateForm() { void validateForm() {
if (_weightValueController.text.length > 0 && measureTimeSelectedType != null) { if (_weightValueController.text.length > 0 && measureTimeSelectedType != null) {
setState(() { setState(() {
isButtonDisabled = true; isButtonDisabled = false;
}); });
} else { } else {
setState(() { setState(() {
isButtonDisabled = false; isButtonDisabled = true;
}); });
} }
} }

@ -10,7 +10,9 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.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 'AddWeightPage.dart';
import 'WeightMonthlyPage.dart'; import 'WeightMonthlyPage.dart';
import 'WeightWeeklyPage.dart'; import 'WeightWeeklyPage.dart';
@ -38,6 +40,7 @@ class _WeightHomePageState extends State<WeightHomePage> with SingleTickerProvid
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<WeightPressureViewModel>( return BaseView<WeightPressureViewModel>(
onModelReady: (model) => model.getWeight(), onModelReady: (model) => model.getWeight(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -103,29 +106,35 @@ class _WeightHomePageState extends State<WeightHomePage> with SingleTickerProvid
) )
], ],
), ),
floatingActionButton: InkWell( floatingActionButton: Stack(
onTap: () { children: [
Navigator.push( Positioned(
context, bottom: 80,
FadePage( right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0,
page: AddWeightPage( child: InkWell(
model: model, onTap: () {
))); Navigator.push(
}, context,
child: Container( FadePage(
width: 55, page: AddWeightPage(
height: 55, model: model,
decoration: BoxDecoration( )));
shape: BoxShape.circle, },
color: Theme.of(context).primaryColor, child: Container(
), width: 55,
child: Center( height: 55,
child: Icon( decoration: BoxDecoration(
Icons.add, shape: BoxShape.circle,
color: Colors.white, color: Theme.of(context).primaryColor,
), ),
), child: Center(
), child: Icon(
Icons.add,
color: Colors.white,
),
),
)))
],
), ),
), ),
), ),

@ -38,7 +38,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
DateTime bloodSugarDate = DateTime.now(); DateTime bloodSugarDate = DateTime.now();
DateTime timeSugarDate = DateTime.now(); DateTime timeSugarDate = DateTime.now();
int measuredArm = 1; int measuredArm = 1;
bool isButtonDisabled = false; bool isButtonDisabled = true;
final List<String> measureTimeEnList = [ final List<String> measureTimeEnList = [
'Left Arm ', 'Left Arm ',
'Right Arm', 'Right Arm',
@ -119,7 +119,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Texts(measureTimeSelectedType), Texts(projectViewModel.isArabic ? measureTimeArList[0] : measureTimeEnList[0]),
Icon( Icon(
Icons.arrow_drop_down, Icons.arrow_drop_down,
color: Colors.grey, color: Colors.grey,
@ -254,7 +254,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
} }
}, },
label: TranslationBase.of(context).save.toUpperCase(), label: TranslationBase.of(context).save.toUpperCase(),
backgroundColor: Colors.red[900], backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900],
disabled: isButtonDisabled, disabled: isButtonDisabled,
), ),
)); ));
@ -288,13 +288,13 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
void validateForm() { void validateForm() {
print("_bloodSystolicValueController " + _bloodSystolicValueController.text.length.toString()); 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(() { setState(() {
isButtonDisabled = true; isButtonDisabled = false;
}); });
} else { } else {
setState(() { setState(() {
isButtonDisabled = false; isButtonDisabled = true;
}); });
} }
// if(measureTimeSelectedType == 'Left Arm'){ // if(measureTimeSelectedType == 'Left Arm'){

@ -14,7 +14,9 @@ import 'AddBloodPressurePage.dart';
import 'BloodPressureMonthly.dart'; import 'BloodPressureMonthly.dart';
import 'BloodPressureYeaPage.dart'; import 'BloodPressureYeaPage.dart';
import 'bloodPressureWeeklyPage.dart'; import 'bloodPressureWeeklyPage.dart';
import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
class BloodPressureHomePage extends StatefulWidget { class BloodPressureHomePage extends StatefulWidget {
@override @override
@ -38,6 +40,7 @@ class _BloodPressureHomePageState extends State<BloodPressureHomePage> with Sing
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<BloodPressureViewMode>( return BaseView<BloodPressureViewMode>(
onModelReady: (model) => model.getBloodPressure(), onModelReady: (model) => model.getBloodPressure(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -75,7 +78,7 @@ class _BloodPressureHomePageState extends State<BloodPressureHomePage> with Sing
floatingActionButton: Stack(children: [ floatingActionButton: Stack(children: [
Positioned( Positioned(
bottom: 80, bottom: 80,
right: 0, right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(

@ -38,7 +38,7 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
DateTime timeSugarDate = DateTime.now(); DateTime timeSugarDate = DateTime.now();
String measureUnitSelectedType = 'mg/dlt'; String measureUnitSelectedType = 'mg/dlt';
int measuredTime = 1; int measuredTime = 1;
bool isButtonDisabled = false; bool isButtonDisabled = true;
final List<String> measureUnitList = ['mg/dlt', 'mol/L']; final List<String> measureUnitList = ['mg/dlt', 'mol/L'];
final List<String> measureTimeEnList = [ final List<String> measureTimeEnList = [
'Before Breakfast', 'Before Breakfast',
@ -264,8 +264,8 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
child: Button( child: Button(
onTap: () async { onTap: () async {
if (_bloodSugarValueController.text.isNotEmpty) { if (_bloodSugarValueController.text.isNotEmpty) {
GifLoaderDialogUtils.showMyDialog(context);
if (widget.isUpdate) { if (widget.isUpdate) {
GifLoaderDialogUtils.showMyDialog(context);
await widget.bloodSugarViewMode.updateDiabtecResult( await widget.bloodSugarViewMode.updateDiabtecResult(
month: bloodSugarDate, month: bloodSugarDate,
hour: timeSugarDate, hour: timeSugarDate,
@ -280,7 +280,6 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
else else
Navigator.pop(context); Navigator.pop(context);
} else { } else {
GifLoaderDialogUtils.showMyDialog(context);
await widget.bloodSugarViewMode.addDiabtecResult( await widget.bloodSugarViewMode.addDiabtecResult(
diabtecUnit: measureUnitSelectedType, diabtecUnit: measureUnitSelectedType,
measuredTime: measuredTime, measuredTime: measuredTime,
@ -297,7 +296,7 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
} }
}, },
label: TranslationBase.of(context).save.toUpperCase(), label: TranslationBase.of(context).save.toUpperCase(),
backgroundColor: Colors.red[900], backgroundColor: isButtonDisabled ? Colors.grey : Colors.red[900],
disabled: isButtonDisabled, disabled: isButtonDisabled,
), ),
)); ));
@ -347,11 +346,11 @@ class _AddBloodSugarPageState extends State<AddBloodSugarPage> {
void validateForm() { void validateForm() {
if (_bloodSugarValueController.text.length > 0) { if (_bloodSugarValueController.text.length > 0) {
setState(() { setState(() {
isButtonDisabled = true; isButtonDisabled = false;
}); });
} else { } else {
setState(() { setState(() {
isButtonDisabled = false; isButtonDisabled = true;
}); });
} }
} }

@ -1,4 +1,3 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/blood_sugar_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/medical/blood_sugar_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.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:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'AddBloodSugarPage.dart'; import 'AddBloodSugarPage.dart';
import 'BloodMonthly.dart'; import 'BloodMonthly.dart';
import 'BloodYeaPage.dart'; import 'BloodYeaPage.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'blood_sugar_weekly_page.dart'; import 'blood_sugar_weekly_page.dart';
class BloodSugarHomePage extends StatefulWidget { class BloodSugarHomePage extends StatefulWidget {
@ -40,6 +40,7 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage> with SingleTick
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return BaseView<BloodSugarViewMode>( return BaseView<BloodSugarViewMode>(
onModelReady: (model) => model.getBloodSugar(), onModelReady: (model) => model.getBloodSugar(),
builder: (_, model, w) => AppScaffold( builder: (_, model, w) => AppScaffold(
@ -84,8 +85,8 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage> with SingleTick
floatingActionButton: Stack( floatingActionButton: Stack(
children: [ children: [
Positioned( Positioned(
bottom: 80, bottom: 130,
right: 0, right: projectViewModel.isArabic ? MediaQuery.of(context).size.width * .85 : 0,
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Navigator.push( Navigator.push(

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; 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/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.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'; import 'package:google_maps_place_picker/google_maps_place_picker.dart';
class AddAddressPage extends StatefulWidget { class AddAddressPage extends StatefulWidget {
final Addresses editedAddress; final AddressInfo editedAddress;
final Function(PickResult) onPick; final Function(PickResult) onPick;
AddAddressPage(this.editedAddress, this.onPick); AddAddressPage(this.editedAddress, this.onPick);
@ -25,9 +26,7 @@ class _AddAddressPageState extends State<AddAddressPage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
if (widget.editedAddress != null && if (widget.editedAddress != null && widget.editedAddress.latLong != null && widget.editedAddress.latLong != "") {
widget.editedAddress.latLong != null &&
widget.editedAddress.latLong != "") {
List<String> latLng = widget.editedAddress.latLong.split(","); List<String> latLng = widget.editedAddress.latLong.split(",");
_latitude = double.parse(latLng[0]); _latitude = double.parse(latLng[0]);
_longitude = double.parse(latLng[1]); _longitude = double.parse(latLng[1]);
@ -49,9 +48,7 @@ class _AddAddressPageState extends State<AddAddressPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final mediaQuery = MediaQuery.of(context); final mediaQuery = MediaQuery.of(context);
final height = mediaQuery.size.height - final height = mediaQuery.size.height - 60 - mediaQuery.padding.top;
60 -
mediaQuery.padding.top;
return BaseView<PharmacyAddressesViewModel>( return BaseView<PharmacyAddressesViewModel>(
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; 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/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart'; import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart'; import 'package:diplomaticquarterapp/pages/pharmacy/pharmacyAddresses/AddAddress.dart';
@ -18,8 +19,7 @@ class PharmacyAddressesPage extends StatefulWidget {
} }
class _PharmacyAddressesState extends State<PharmacyAddressesPage> { class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
void navigateToAddressPage( void navigateToAddressPage(BuildContext ctx, PharmacyAddressesViewModel model, AddressInfo address) {
BuildContext ctx, PharmacyAddressesViewModel model, Addresses address) {
Navigator.push( Navigator.push(
ctx, ctx,
FadePage( FadePage(
@ -106,10 +106,8 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
fontSize: 14, fontSize: 14,
vPadding: 8, vPadding: 8,
handler: () { handler: () {
model.saveSelectedAddressLocally( model.saveSelectedAddressLocally(model.addresses[model.selectedAddressIndex]);
model.addresses[model.selectedAddressIndex]); Navigator.pop(context, model.addresses[model.selectedAddressIndex]);
Navigator.pop(
context, model.addresses[model.selectedAddressIndex]);
}, },
), ),
), ),
@ -123,13 +121,12 @@ class _PharmacyAddressesState extends State<PharmacyAddressesPage> {
class AddressItemWidget extends StatelessWidget { class AddressItemWidget extends StatelessWidget {
final PharmacyAddressesViewModel model; final PharmacyAddressesViewModel model;
final Addresses address; final AddressInfo address;
final Function selectAddress; final Function selectAddress;
final bool isSelected; final bool isSelected;
final Function(Addresses) onTabEditAddress; final Function(AddressInfo) onTabEditAddress;
AddressItemWidget(this.model, this.address, this.selectAddress, AddressItemWidget(this.model, this.address, this.selectAddress, this.isSelected, this.onTabEditAddress);
this.isSelected, this.onTabEditAddress);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -155,18 +152,13 @@ class AddressItemWidget extends StatelessWidget {
decoration: new BoxDecoration( decoration: new BoxDecoration(
color: !isSelected ? Colors.white : Colors.green, color: !isSelected ? Colors.white : Colors.green,
shape: BoxShape.circle, shape: BoxShape.circle,
border: Border.all( border: Border.all(color: Colors.grey, style: BorderStyle.solid, width: 1.0),
color: Colors.grey,
style: BorderStyle.solid,
width: 1.0),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
child: Icon( child: Icon(
Icons.check, Icons.check,
color: isSelected color: isSelected ? Colors.white : Colors.transparent,
? Colors.white
: Colors.transparent,
size: 25, size: 25,
), ),
), ),
@ -179,8 +171,7 @@ class AddressItemWidget extends StatelessWidget {
Expanded( Expanded(
child: Container( child: Container(
child: Container( child: Container(
margin: margin: EdgeInsets.symmetric(vertical: 12, horizontal: 12),
EdgeInsets.symmetric(vertical: 12, horizontal: 12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -243,8 +234,7 @@ class AddressItemWidget extends StatelessWidget {
), ),
), ),
Padding( Padding(
padding: padding: const EdgeInsets.symmetric(horizontal: 8),
const EdgeInsets.symmetric(horizontal: 8),
child: SizedBox( child: SizedBox(
child: Container( child: Container(
width: 1, width: 1,
@ -262,21 +252,13 @@ class AddressItemWidget extends StatelessWidget {
ConfirmDialog dialog = new ConfirmDialog( ConfirmDialog dialog = new ConfirmDialog(
context: context, context: context,
title: "Are you sure want to delete", title: "Are you sure want to delete",
confirmMessage: confirmMessage: "${address.address1} ${address.address2}",
"${address.address1} ${address.address2}", okText: TranslationBase.of(context).delete,
okText: cancelText: TranslationBase.of(context).cancel_nocaps,
TranslationBase.of(context).delete,
cancelText: TranslationBase.of(context)
.cancel_nocaps,
okFunction: () => { okFunction: () => {
model model.deleteAddresses(address).then((_) {
.deleteAddresses(address) ConfirmDialog.closeAlertDialog(context);
.then((_) { AppToast.showErrorToast(message: "Address has been deleted");
ConfirmDialog.closeAlertDialog(
context);
AppToast.showErrorToast(
message:
"Address has been deleted");
}) })
}, },
cancelFunction: () => {}); cancelFunction: () => {});

@ -4,15 +4,16 @@ import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart'; import 'package:diplomaticquarterapp/core/model/pharmacies/Addresses.dart';
import 'package:diplomaticquarterapp/core/model/pharmacies/Country.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/core/service/base_service.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
class PharmacyAddressService extends BaseService { class PharmacyAddressService extends BaseService {
List<Addresses> addresses = List(); List<AddressInfo> addresses = List();
CountryData country; CountryData country;
int selectedAddressIndex = 0; int selectedAddressIndex = 0;
Future<List<Addresses>> getAddresses() async { Future<List<AddressInfo>> getAddresses() async {
var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
Map<String, String> queryParams = {'fields': 'addresses'}; Map<String, String> queryParams = {'fields': 'addresses'};
hasError = false; hasError = false;
@ -20,17 +21,15 @@ class PharmacyAddressService extends BaseService {
try { try {
var completer = Completer(); var completer = Completer();
await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId", await baseAppClient.getPharmacy("$GET_CUSTOMERS_ADDRESSES$customerId", onSuccess: (dynamic response, int statusCode) async {
onSuccess: (dynamic response, int statusCode) async {
addresses.clear(); addresses.clear();
var savedAddress = var savedAddress = await sharedPref.getObject(PHARMACY_SELECTED_ADDRESS);
await sharedPref.getObject(PHARMACY_SELECTED_ADDRESS);
if (savedAddress != null) { if (savedAddress != null) {
selectedAddress = Addresses.fromJson(savedAddress); selectedAddress = Addresses.fromJson(savedAddress);
} }
int index = 0; int index = 0;
response['customers'][0]['addresses'].forEach((item) { response['customers'][0]['addresses'].forEach((item) {
Addresses address = Addresses.fromJson(item); AddressInfo address = AddressInfo.fromJson(item);
if (selectedAddress != null && selectedAddress.id == item["id"]) { if (selectedAddress != null && selectedAddress.id == item["id"]) {
selectedAddressIndex = index; selectedAddressIndex = index;
} }
@ -44,8 +43,7 @@ class PharmacyAddressService extends BaseService {
}, queryParams: queryParams); }, queryParams: queryParams);
await completer.future; await completer.future;
} catch (error) {
} catch (error){
throw error; throw error;
} }
@ -55,12 +53,10 @@ class PharmacyAddressService extends BaseService {
Future getCountries(String countryName) async { Future getCountries(String countryName) async {
hasError = false; hasError = false;
try { try {
await baseAppClient.getPharmacy("$PHARMACY_GET_COUNTRY", await baseAppClient.getPharmacy("$PHARMACY_GET_COUNTRY", onSuccess: (dynamic response, int statusCode) {
onSuccess: (dynamic response, int statusCode) {
// countries.clear(); // countries.clear();
response['countries'].forEach((item) { response['countries'].forEach((item) {
if (CountryData.fromJson(item).name == countryName || if (CountryData.fromJson(item).name == countryName || CountryData.fromJson(item).namen == countryName) {
CountryData.fromJson(item).namen == countryName) {
country = CountryData.fromJson(item); country = CountryData.fromJson(item);
} }
// countries.add(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); makeCustomerAddress(address, ADD_CUSTOMER_ADDRESS);
} }
Future editCustomerAddress(Addresses address) async { Future editCustomerAddress(AddressInfo address) async {
makeCustomerAddress(address, EDIT_CUSTOMER_ADDRESS); makeCustomerAddress(address, EDIT_CUSTOMER_ADDRESS);
} }
Future deleteCustomerAddress(Addresses address) async { Future deleteCustomerAddress(AddressInfo address) async {
makeCustomerAddress(address, DELETE_CUSTOMER_ADDRESS); 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); var customerId = await sharedPref.getString(PHARMACY_CUSTOMER_ID);
hasError = false; hasError = false;
super.error = ""; super.error = "";
@ -102,7 +98,7 @@ class PharmacyAddressService extends BaseService {
await baseAppClient.postPharmacy("$url", onSuccess: (response, statusCode) async { await baseAppClient.postPharmacy("$url", onSuccess: (response, statusCode) async {
addresses.clear(); addresses.clear();
response['customers'][0]['addresses'].forEach((item) { response['customers'][0]['addresses'].forEach((item) {
addresses.add(Addresses.fromJson(item)); addresses.add(AddressInfo.fromJson(item));
}); });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;

Loading…
Cancel
Save