Updates & fixes

merge-requests/447/head
haroon amjad 4 years ago
parent 8001c0140c
commit 494b1f221d

@ -1368,7 +1368,7 @@ const Map localizedValues = {
"ar": "تتيح لك هذه الخدمة إجراء استشارة عبر مكالمة فيديو مباشرة مع الطبيب من أي مكان وفي أي وقت" "ar": "تتيح لك هذه الخدمة إجراء استشارة عبر مكالمة فيديو مباشرة مع الطبيب من أي مكان وفي أي وقت"
}, },
"my-invoice": {"en": "List", "ar": "فواتيري"}, "my-invoice": {"en": "List", "ar": "فواتيري"},
"invoice-list": {"en": "My Invoice", "ar": "فائمة"}, "invoice-list": {"en": "My Invoice", "ar": "قائمة"},
"thisItemIsNotAvailable": {"en": "This item is not available", "ar": "هذا العنصر غير متوفر"}, "thisItemIsNotAvailable": {"en": "This item is not available", "ar": "هذا العنصر غير متوفر"},
"beforeAfterImages": {"en": "Before & After Images", "ar": "الصور قبل وبعد"}, "beforeAfterImages": {"en": "Before & After Images", "ar": "الصور قبل وبعد"},
"clinic-accept-livecare": { "clinic-accept-livecare": {

@ -5,8 +5,8 @@ class GetCMCAllOrdersResponseModel {
bool isOutPatient; bool isOutPatient;
int projectId; int projectId;
int nearestProjectId; int nearestProjectId;
double longitude; dynamic longitude;
double latitude; dynamic latitude;
dynamic appointmentNo; dynamic appointmentNo;
dynamic dischargeId; dynamic dischargeId;
int statusId; int statusId;
@ -27,7 +27,7 @@ class GetCMCAllOrdersResponseModel {
dynamic paymentStatusText; dynamic paymentStatusText;
String projectName; String projectName;
String nearestProjectName; String nearestProjectName;
int paymentAmount; dynamic paymentAmount;
WFOrder wFOrder; WFOrder wFOrder;
String serviceText; String serviceText;
bool isSentForApproval; bool isSentForApproval;
@ -43,8 +43,7 @@ class GetCMCAllOrdersResponseModel {
dynamic approvalStatus; dynamic approvalStatus;
bool isActive; bool isActive;
int clickButton; int clickButton;
Null orderHistory; List<dynamic> procedures;
List<Null> procedures;
dynamic pickupLocation; dynamic pickupLocation;
dynamic dropOffLocation; dynamic dropOffLocation;
dynamic clinicName; dynamic clinicName;
@ -98,7 +97,6 @@ class GetCMCAllOrdersResponseModel {
this.approvalStatus, this.approvalStatus,
this.isActive, this.isActive,
this.clickButton, this.clickButton,
this.orderHistory,
this.procedures, this.procedures,
this.pickupLocation, this.pickupLocation,
this.dropOffLocation, this.dropOffLocation,
@ -157,7 +155,6 @@ class GetCMCAllOrdersResponseModel {
approvalStatus = json['ApprovalStatus']; approvalStatus = json['ApprovalStatus'];
isActive = json['isActive']; isActive = json['isActive'];
clickButton = json['ClickButton']; clickButton = json['ClickButton'];
orderHistory = json['OrderHistory'];
pickupLocation = json['PickupLocation']; pickupLocation = json['PickupLocation'];
dropOffLocation = json['DropOffLocation']; dropOffLocation = json['DropOffLocation'];
clinicName = json['clinicName']; clinicName = json['clinicName'];
@ -218,7 +215,6 @@ class GetCMCAllOrdersResponseModel {
data['ApprovalStatus'] = this.approvalStatus; data['ApprovalStatus'] = this.approvalStatus;
data['isActive'] = this.isActive; data['isActive'] = this.isActive;
data['ClickButton'] = this.clickButton; data['ClickButton'] = this.clickButton;
data['OrderHistory'] = this.orderHistory;
data['PickupLocation'] = this.pickupLocation; data['PickupLocation'] = this.pickupLocation;
data['DropOffLocation'] = this.dropOffLocation; data['DropOffLocation'] = this.dropOffLocation;
data['clinicName'] = this.clinicName; data['clinicName'] = this.clinicName;
@ -234,7 +230,7 @@ class Orderpayment {
int iD; int iD;
int orderId; int orderId;
dynamic clientRequestId; dynamic clientRequestId;
int totalAmount; dynamic totalAmount;
int paymentStatus; int paymentStatus;
dynamic order; dynamic order;
String created; String created;

@ -71,7 +71,8 @@ class UpdatePresOrderRequestModel {
data['TokenID'] = this.tokenID; data['TokenID'] = this.tokenID;
data['PatientTypeID'] = this.patientTypeID; data['PatientTypeID'] = this.patientTypeID;
data['PatientType'] = this.patientType; data['PatientType'] = this.patientType;
data['PresOrderID'] = this.presOrderID; data['Id'] = this.presOrderID;
data['ClickButton'] = 14;
data['PresOrderStatus'] = this.presOrderStatus; data['PresOrderStatus'] = this.presOrderStatus;
data['EditedBy'] = this.editedBy; data['EditedBy'] = this.editedBy;
data['RejectionReason'] = this.rejectionReason; data['RejectionReason'] = this.rejectionReason;

@ -7,7 +7,6 @@ import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/Comprehens
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/get_cmc_service_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
@ -56,14 +55,9 @@ class CMCService extends BaseService {
await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_PATIENT_ALL_PRES_ORDERS, onSuccess: (dynamic response, int statusCode) {
cmcAllPresOrdersList.clear(); cmcAllPresOrdersList.clear();
cmcAllOrderDetail.clear(); cmcAllOrderDetail.clear();
response['response'].forEach((data) { response['response'].forEach((data) {
if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data)); if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
}); });
// response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
// if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
// });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;
@ -77,6 +71,10 @@ class CMCService extends BaseService {
cmcAllPresOrdersList.clear(); cmcAllPresOrdersList.clear();
cmcAllOrderDetail.clear(); cmcAllOrderDetail.clear();
response['response'].forEach((data) {
cmcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
});
// response['PatientER_GetPatientAllPresOrdersList'].forEach((data) { // response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
// if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data)); // if (data['ServiceID'] == OrderService.Comprehensive_Medical_Checkup.getIdOrderService()) cmcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
// }); // });
@ -122,12 +120,22 @@ class CMCService extends BaseService {
}, body: updatePresOrderRequestModel.toJson()); }, body: updatePresOrderRequestModel.toJson());
} }
Future updateCmcPresOrderRC(UpdatePresOrderRequestModel updatePresOrderRequestModel) async {
hasError = false;
await baseAppClient.post(UPDATE_CMC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
isOrderUpdated = true;
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: updatePresOrderRequestModel.toJson());
}
Future<String> insertCMCOrderRC({CMCInsertPresOrderRequestModel order}) async { Future<String> insertCMCOrderRC({CMCInsertPresOrderRequestModel order}) async {
hasError = false; hasError = false;
String reqId = ""; String reqId = "";
await baseAppClient.post(ADD_CMC_ORDER_RC, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(ADD_CMC_ORDER_RC, onSuccess: (dynamic response, int statusCode) {
isOrderUpdated = true; isOrderUpdated = true;
reqId = response['RequestNo'].toString(); reqId = response['response'].toString();
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/config/config.dart'; import 'package:diplomaticquarterapp/config/config.dart';
import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/enum/OrderService.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hHC_all_pres_orders_request_model.dart';
@ -13,7 +14,7 @@ import '../base_service.dart';
class HomeHealthCareService extends BaseService { class HomeHealthCareService extends BaseService {
List<HHCGetAllServicesResponseModel> hhcAllServicesList = List(); List<HHCGetAllServicesResponseModel> hhcAllServicesList = List();
List<GetHHCAllPresOrdersResponseModel> hhcAllPresOrdersList = List(); List<GetCMCAllOrdersResponseModel> hhcAllPresOrdersList = List();
List<GetOrderDetailByOrderIDResponseModel> hhcAllOrderDetail = List(); List<GetOrderDetailByOrderIDResponseModel> hhcAllOrderDetail = List();
List<AddressInfo> addressesList = List(); List<AddressInfo> addressesList = List();
@ -48,14 +49,29 @@ class HomeHealthCareService extends BaseService {
}, body: hHCGetAllServicesRequestModel.toJson()); }, body: hHCGetAllServicesRequestModel.toJson());
} }
Future getHHCAllPresOrdersRC() async {
GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel();
hasError = false;
await baseAppClient.post(GET_ALL_HHC_ORDERS_RC, onSuccess: (dynamic response, int statusCode) {
hhcAllPresOrdersList.clear();
hhcAllOrderDetail.clear();
response['response'].forEach((data) {
hhcAllPresOrdersList.add(GetCMCAllOrdersResponseModel.fromJson(data));
});
}, onFailure: (String error, int statusCode) {
hasError = true;
super.error = error;
}, body: getHHCAllPresOrdersRequestModel.toJson());
}
Future getHHCAllPresOrders() async { Future getHHCAllPresOrders() async {
GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel(); GetHHCAllPresOrdersRequestModel getHHCAllPresOrdersRequestModel = GetHHCAllPresOrdersRequestModel();
hasError = false; hasError = false;
await baseAppClient.post(GET_PATIENT_ALL_PRES_ORD, onSuccess: (dynamic response, int statusCode) { await baseAppClient.post(GET_PATIENT_ALL_PRES_ORD, onSuccess: (dynamic response, int statusCode) {
hhcAllPresOrdersList.clear(); hhcAllPresOrdersList.clear();
response['PatientER_GetPatientAllPresOrdersList'].forEach((data) { // response['PatientER_GetPatientAllPresOrdersList'].forEach((data) {
if (data['ServiceID'] == OrderService.HOME_HEALTH_CARE.getIdOrderService()) hhcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data)); // if (data['ServiceID'] == OrderService.HOME_HEALTH_CARE.getIdOrderService()) hhcAllPresOrdersList.add(GetHHCAllPresOrdersResponseModel.fromJson(data));
}); // });
}, onFailure: (String error, int statusCode) { }, onFailure: (String error, int statusCode) {
hasError = true; hasError = true;
super.error = error; super.error = error;

@ -67,7 +67,7 @@ class CMCViewModel extends BaseViewModel {
} else { } else {
pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere((element) => element.statusId == 1 || element.statusId == 2, orElse: () => null); pendingOrder = _cMCService.cmcAllPresOrdersList.firstWhere((element) => element.statusId == 1 || element.statusId == 2, orElse: () => null);
if (pendingOrder != null) { if (pendingOrder != null) {
await getOrderDetailByOrderID(pendingOrder); // await getOrderDetailByOrderID(pendingOrder);
setState(ViewState.Idle); setState(ViewState.Idle);
} else { } else {
getCMCAllServices(); getCMCAllServices();
@ -77,7 +77,8 @@ class CMCViewModel extends BaseViewModel {
Future updateCmcPresOrder(UpdatePresOrderRequestModel updatePresOrderRequestModel) async { Future updateCmcPresOrder(UpdatePresOrderRequestModel updatePresOrderRequestModel) async {
setState(ViewState.BusyLocal); setState(ViewState.BusyLocal);
await _cMCService.updateCmcPresOrder(updatePresOrderRequestModel); // await _cMCService.updateCmcPresOrder(updatePresOrderRequestModel);
await _cMCService.updateCmcPresOrderRC(updatePresOrderRequestModel);
if (_cMCService.hasError) { if (_cMCService.hasError) {
error = _cMCService.error; error = _cMCService.error;
setState(ViewState.ErrorLocal); setState(ViewState.ErrorLocal);

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/enum/OrderService.dart'; import 'package:diplomaticquarterapp/core/enum/OrderService.dart';
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_request_modle.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/HHC_get_all_services_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/PatientERHHCInsertServicesList.dart';
@ -24,7 +25,7 @@ class HomeHealthCareViewModel extends BaseViewModel {
List<AddressInfo> get addressesList => _customerAddressesService.addressesList; List<AddressInfo> get addressesList => _customerAddressesService.addressesList;
List<GetHHCAllPresOrdersResponseModel> get hhcAllPresOrders => _homeHealthCareService.hhcAllPresOrdersList; List<GetCMCAllOrdersResponseModel> get hhcAllPresOrders => _homeHealthCareService.hhcAllPresOrdersList;
List<GetOrderDetailByOrderIDResponseModel> get hhcAllOrderDetail => _homeHealthCareService.hhcAllOrderDetail; List<GetOrderDetailByOrderIDResponseModel> get hhcAllOrderDetail => _homeHealthCareService.hhcAllOrderDetail;
@ -33,7 +34,7 @@ class HomeHealthCareViewModel extends BaseViewModel {
bool get isOrderUpdated => _homeHealthCareService.isOrderUpdated; bool get isOrderUpdated => _homeHealthCareService.isOrderUpdated;
int get orderId => _homeHealthCareService.requestNo; int get orderId => _homeHealthCareService.requestNo;
GetHHCAllPresOrdersResponseModel pendingOrder; GetCMCAllOrdersResponseModel pendingOrder;
List<PatientERHHCInsertServicesList> patientERHHCInsertServicesList = List(); List<PatientERHHCInsertServicesList> patientERHHCInsertServicesList = List();
dynamic get hhcResponse => _homeHealthCareService.hhcResponse; dynamic get hhcResponse => _homeHealthCareService.hhcResponse;
@ -53,14 +54,14 @@ class HomeHealthCareViewModel extends BaseViewModel {
Future getHHCAllPresOrders() async { Future getHHCAllPresOrders() async {
pendingOrder = null; pendingOrder = null;
setState(ViewState.Busy); setState(ViewState.Busy);
await _homeHealthCareService.getHHCAllPresOrders(); await _homeHealthCareService.getHHCAllPresOrdersRC();
if (_homeHealthCareService.hasError) { if (_homeHealthCareService.hasError) {
error = _homeHealthCareService.error; error = _homeHealthCareService.error;
setState(ViewState.Error); setState(ViewState.Error);
} else { } else {
pendingOrder = _homeHealthCareService.hhcAllPresOrdersList.firstWhere((element) => element.status == 1 || element.status == 2, orElse: () => null); pendingOrder = _homeHealthCareService.hhcAllPresOrdersList.firstWhere((element) => element.statusId == 1 || element.statusId == 2, orElse: () => null);
if (pendingOrder != null) { if (pendingOrder != null) {
await _homeHealthCareService.getOrderDetailByOrderID(pendingOrder.iD); // await _homeHealthCareService.getOrderDetailByOrderID(pendingOrder.iD);
setState(ViewState.Idle); setState(ViewState.Idle);
} else { } else {
getHHCAllServices(); getHHCAllServices();

@ -39,9 +39,10 @@ class BloodPressureViewMode extends BaseViewModel {
}); });
for (int index = 0; index < bloodPressureService.monthDiabtectResultAverageList.length; index++) { for (int index = 0; index < bloodPressureService.monthDiabtectResultAverageList.length; index++) {
weighMonthTimeSeriesDataTop.add(TimeSeriesSales3(index, bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble())); // weighMonthTimeSeriesDataTop.add(TimeSeriesSales3("Week " + (index + 1).toString(), bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble()));
// weighMonthTimeSeriesDataLow.add(TimeSeriesSales3("Week " + (index + 1).toString(), bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble()));
weighMonthTimeSeriesDataLow.add(TimeSeriesSales3(index, bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble())); weighMonthTimeSeriesDataTop.add(TimeSeriesSales3(bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekDiastolicPressureAverageResult.toDouble()));
weighMonthTimeSeriesDataLow.add(TimeSeriesSales3(bloodPressureService.monthDiabtectResultAverageList[index].weekDesc, bloodPressureService.monthDiabtectResultAverageList[index].weekSystolicePressureAverageResult.toDouble()));
} }
bloodPressureService.yearDiabtecResultAverageList.forEach((element) { bloodPressureService.yearDiabtecResultAverageList.forEach((element) {

@ -90,9 +90,9 @@ class _MyApp extends State<MyApp> {
], ],
child: Consumer<ProjectViewModel>( child: Consumer<ProjectViewModel>(
builder: (context, projectProvider, child) => MaterialApp( builder: (context, projectProvider, child) => MaterialApp(
navigatorObservers: [ // navigatorObservers: [
GAnalytics.shared.navObserver() // GAnalytics.shared.navObserver()
], // ],
navigatorKey: locator<NavigationService>().navigatorKey, navigatorKey: locator<NavigationService>().navigatorKey,
showSemanticsDebugger: false, showSemanticsDebugger: false,
title: 'Diplomatic Quarter App', title: 'Diplomatic Quarter App',

@ -1,6 +1,6 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_insert_pres_order_request_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_order_detail_by_order_iD_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/cmc_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -10,8 +10,7 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart'; import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/dialogs/ConfirmWithMessageDialog.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -85,13 +84,13 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
_context = context; _context = context;
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
void showConfirmMessage(CMCViewModel model, GetOrderDetailByOrderIDResponseModel order) { void showConfirmMessage(CMCViewModel model, GetCMCAllOrdersResponseModel order) {
showDialog( showDialog(
context: context, context: context,
child: ConfirmCancelOrderDialog( child: ConfirmWithMessageDialog(
model: model, message: TranslationBase.of(context).cancelOrderMsg,
onTap: () async { onTap: () async {
UpdatePresOrderRequestModel updatePresOrderRequestModel = UpdatePresOrderRequestModel(presOrderID: order.presOrderID, rejectionReason: "", presOrderStatus: 4, editedBy: 3); UpdatePresOrderRequestModel updatePresOrderRequestModel = UpdatePresOrderRequestModel(presOrderID: order.iD, rejectionReason: "", presOrderStatus: 4, editedBy: 3);
Future.delayed(new Duration(milliseconds: 300)).then((value) async { Future.delayed(new Duration(milliseconds: 300)).then((value) async {
GifLoaderDialogUtils.showMyDialog(_context); GifLoaderDialogUtils.showMyDialog(_context);
await model.updateCmcPresOrder(updatePresOrderRequestModel); await model.updateCmcPresOrder(updatePresOrderRequestModel);
@ -108,39 +107,62 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
)); ));
} }
// ' ' + int status = widget.model.pendingOrder != null ? widget.model.pendingOrder.statusId : 0;
String _statusDisp = widget.model.pendingOrder != null ? widget.model.pendingOrder.statusText : "";
Color _color;
if (status == 1) {
//pending
_color = Color(0xffCC9B14);
} else if (status == 2) {
//processing
_color = Color(0xff2E303A);
} else if (status == 3) {
//completed
_color = Color(0xff359846);
} else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected
_color = Color(0xffD02127);
}
return Scaffold( return Scaffold(
body: SafeArea( body: SafeArea(
child: Container( child: Container(
child: widget.model.cmcAllOrderDetail.length != 0 && widget.model.pendingOrder != null child: widget.model.pendingOrder != null
? Column( ? Column(
children: [ children: [
Container( Padding(
width: double.infinity, padding: const EdgeInsets.all(21.0),
padding: EdgeInsets.only(left: 12, right: 12, top: 12), child: Container(
child: Card( decoration: BoxDecoration(
shape: cardRadius(12), color: _color,
elevation: 2, borderRadius: BorderRadius.all(
margin: EdgeInsets.zero, Radius.circular(10.0),
color: Color(0xffcd9e1b), ),
clipBehavior: Clip.antiAlias, boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
blurRadius: 27,
offset: Offset(0, -3),
),
],
),
child: Container( child: Container(
// decoration: containerColorRadiusLeft(Colors.white, 12), // decoration: containerColorRadiusLeft(Colors.white, 12),
margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 8, right: projectViewModel.isArabic ? 8 : 0), margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 6, right: projectViewModel.isArabic ? 6 : 0),
padding: EdgeInsets.all(12), padding: EdgeInsets.symmetric(vertical: 14, horizontal: 12),
// color: Colors.white,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.rectangle,
color: Colors.white, color: Colors.white,
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: projectViewModel.isArabic ? Radius.zero : Radius.circular(12.0), bottomRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
topRight: projectViewModel.isArabic ? Radius.circular(12.0) : Radius.zero, topRight: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(10.0),
bottomLeft: projectViewModel.isArabic ? Radius.zero : Radius.circular(12.0), bottomLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
bottomRight: projectViewModel.isArabic ? Radius.circular(12.0) : Radius.zero, topLeft: projectViewModel.isArabic ? Radius.circular(10.0) : Radius.circular(0),
), ),
), ),
// clipBehavior: Clip.antiAlias, // clipBehavior: Clip.antiAlias,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
child: Column( child: Column(
@ -148,69 +170,82 @@ class _NewCMCPageState extends State<NewCMCPage> with TickerProviderStateMixin {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
// TranslationBase.of(context).OrderStatus + _statusDisp,
widget.model.pendingOrder.statusText, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: _color, letterSpacing: -0.4, height: 16 / 10),
style: TextStyle(
fontSize: 12,
letterSpacing: -0.48,
color: Color(0xffcd9e1b),
fontWeight: FontWeight.w700,
),
), ),
mHeight(12), SizedBox(height: 6),
Text( Text(
TranslationBase.of(context).requestID + ' ' + widget.model.pendingOrder.iD.toString(), '${TranslationBase.of(context).requestID}: ${widget.model.pendingOrder.iD}',
style: TextStyle( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
fontSize: 16,
letterSpacing: -0.48,
fontWeight: FontWeight.w700,
),
), ),
Text( Row(
TranslationBase.of(context).serviceName, crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle( children: [
fontSize: 12, Text(
letterSpacing: -0.48, TranslationBase.of(context).hospital + ": ",
fontWeight: FontWeight.w500, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
), ),
Expanded(
child: Text(
// !projectViewModel.isArabic ? order.nearestProjectDescription.trim().toString() : order.nearestProjectDescriptionN.toString(),
widget.model.pendingOrder.projectName.trim().toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
),
),
],
), ),
Text( Row(
!projectViewModel.isArabic ? widget.model.cmcAllOrderDetail[0].description.toString() : widget.model.cmcAllOrderDetail[0].descriptionN.toString(), crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle( children: [
fontSize: 12, Text(
letterSpacing: -0.48, TranslationBase.of(context).serviceName + ": ",
fontWeight: FontWeight.w700, style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff575757), letterSpacing: -0.4, height: 16 / 10),
), ),
Expanded(
child: Text(
widget.model.pendingOrder.serviceText.trim().toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
),
),
],
), ),
], ],
), ),
), ),
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text( Text(
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(widget.model.cmcAllOrderDetail[0].createdOn)), DateUtil.getDayMonthYearDateFormatted(DateTime.tryParse(widget.model.pendingOrder.created)),
style: TextStyle( style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
fontSize: 12,
letterSpacing: -0.48,
fontWeight: FontWeight.w700,
),
), ),
mHeight(8), SizedBox(height: 12),
SecondaryButton( if (widget.model.pendingOrder.statusId == 1 || widget.model.pendingOrder.statusId == 2)
onTap: () { InkWell(
showConfirmMessage(widget.model, widget.model.cmcAllOrderDetail[0]); onTap: () {
}, showConfirmMessage(widget.model, widget.model.pendingOrder);
label: TranslationBase.of(context).cancel, },
color: Colors.red[900], child: Container(
small: true, padding: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
) decoration: BoxDecoration(
color: Color(0xffD02127),
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.circular(10),
),
child: Text(
TranslationBase.of(context).cancel_nocaps,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.4),
),
),
),
], ],
), ),
], ],
), ),
), ),
), ),
), )
], ],
) )
: Container( : Container(

@ -104,7 +104,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
} else if (status == 3) { } else if (status == 3) {
//completed //completed
_color = Color(0xff359846); _color = Color(0xff359846);
} else if (status == 4) { } else if (status == 4 || status == 6 || status == 7) {
//cancel // Rejected //cancel // Rejected
_color = Color(0xffD02127); _color = Color(0xffD02127);
} }
@ -178,7 +178,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text( Text(
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.created)), DateUtil.getDayMonthYearDateFormatted(DateTime.tryParse(order.created)),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
), ),
SizedBox(height: 12), SizedBox(height: 12),

@ -44,57 +44,58 @@ class _NewHomeHealthCareStepOnePageState extends State<NewHomeHealthCareStepOneP
baseViewModel: widget.model, baseViewModel: widget.model,
body: Column( body: Column(
children: [ children: [
ListView.separated( Expanded(
physics: BouncingScrollPhysics(), child: ListView.separated(
shrinkWrap: true, physics: BouncingScrollPhysics(),
padding: EdgeInsets.only(left: 21, right: 21, top: 12, bottom: 12), shrinkWrap: true,
itemBuilder: (context, index) { padding: EdgeInsets.only(left: 21, right: 21, top: 12, bottom: 12),
HHCGetAllServicesResponseModel service = widget.model.hhcAllServicesList[index]; itemBuilder: (context, index) {
HHCGetAllServicesResponseModel service = widget.model.hhcAllServicesList[index];
return Padding( return Padding(
padding: const EdgeInsets.only(top: 4, bottom: 4), padding: const EdgeInsets.only(top: 4, bottom: 4),
child: Row( child: Row(
children: [ children: [
Checkbox( Checkbox(
value: isServiceSelected(num.tryParse(service.serviceID)), value: isServiceSelected(num.tryParse(service.serviceID)),
activeColor: Color(0xffD02127), activeColor: Color(0xffD02127),
tristate: false, tristate: false,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (bool newValue) { onChanged: (bool newValue) {
setState(() { setState(() {
if (!isServiceSelected(num.tryParse(service.serviceID))) if (!isServiceSelected(num.tryParse(service.serviceID)))
widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.add(PatientERHHCInsertServicesList( widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.add(PatientERHHCInsertServicesList(
recordID: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length, recordID: widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length,
serviceID: num.tryParse(service.serviceID), serviceID: num.tryParse(service.serviceID),
serviceName: projectViewModel.isArabic ? service.textN : service.text)); serviceName: projectViewModel.isArabic ? service.textN : service.text));
else else
removeSelected(num.tryParse(service.serviceID)); removeSelected(num.tryParse(service.serviceID));
// widget.patientERInsertPresOrderRequestModel // widget.patientERInsertPresOrderRequestModel
// isPatientInsured = newValue; // isPatientInsured = newValue;
}); });
}), }),
SizedBox(width: 6), SizedBox(width: 6),
Expanded( Expanded(
child: Text( child: Text(
projectViewModel.isArabic ? service.textN : service.text.toLowerCase()?.capitalize(), projectViewModel.isArabic ? service.textN : service.text.toLowerCase()?.capitalize(),
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64),
),
), ),
), ],
], ),
), );
); },
}, separatorBuilder: (context, index) => Divider(
separatorBuilder: (context, index) => Divider( height: 1,
height: 1, color: Color(0xffE5E5E5),
color: Color(0xffE5E5E5), ),
), itemCount: widget.model.hhcAllServicesList.length),
itemCount: widget.model.hhcAllServicesList.length), ),
Container( Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only(top: 0, bottom: 16, right: 21, left: 21), padding: EdgeInsets.only(top: 0, bottom: 16, right: 21, left: 21),
margin: EdgeInsets.only(top: 50.0), margin: EdgeInsets.only(bottom: 50.0),
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).next, TranslationBase.of(context).next,
(this.widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0 || widget.model.state == ViewState.BusyLocal) (this.widget.patientERInsertPresOrderRequestModel.patientERHHCInsertServicesList.length == 0 || widget.model.state == ViewState.BusyLocal)

@ -147,7 +147,7 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage> with Tick
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
(projectViewModel.isArabic ? widget.model.pendingOrder.descriptionN : widget.model.pendingOrder.description), widget.model.pendingOrder.statusText,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffCC9B14), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xffCC9B14), letterSpacing: -0.4, height: 16 / 10),
), ),
SizedBox(height: 6), SizedBox(height: 6),
@ -188,11 +188,11 @@ class _NewHomeHealthCarePageState extends State<NewHomeHealthCarePage> with Tick
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text( Text(
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(widget.model.pendingOrder.createdOn)), DateUtil.getDayMonthYearDateFormatted(DateTime.tryParse(widget.model.pendingOrder.created)),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
), ),
SizedBox(height: 12), SizedBox(height: 12),
if (widget.model.pendingOrder.status == 1 || widget.model.pendingOrder.status == 2) if (widget.model.pendingOrder.statusId == 1 || widget.model.pendingOrder.statusId == 2)
InkWell( InkWell(
onTap: () { onTap: () {
showConfirmMessage(widget.model, widget.model.hhcAllOrderDetail[0]); showConfirmMessage(widget.model, widget.model.hhcAllOrderDetail[0]);

@ -1,4 +1,5 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/ComprehensiveMedicalCheckup/GetCMCAllOrdersResponseModel.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/get_hhc_all_pres_orders_response_model.dart';
import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart'; import 'package:diplomaticquarterapp/core/model/AlHabibMedicalService/HomeHealthCare/update_pres_oreder_request_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/AlHabibMedicalService/home_health_care_view_model.dart';
@ -24,7 +25,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context); ProjectViewModel projectViewModel = Provider.of(context);
void showConfirmMessage(HomeHealthCareViewModel model, GetHHCAllPresOrdersResponseModel order) { void showConfirmMessage(HomeHealthCareViewModel model, GetCMCAllOrdersResponseModel order) {
showDialog( showDialog(
context: context, context: context,
child: ConfirmWithMessageDialog( child: ConfirmWithMessageDialog(
@ -75,10 +76,10 @@ class OrdersLogDetailsPage extends StatelessWidget {
padding: EdgeInsets.all(21), padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
itemBuilder: (context, index) { itemBuilder: (context, index) {
GetHHCAllPresOrdersResponseModel order = model.hhcAllPresOrders[index]; GetCMCAllOrdersResponseModel order = model.hhcAllPresOrders[index];
int status = order.status; int status = order.statusId;
String _statusDisp = projectViewModel.isArabic ? order.descriptionN : order.description; String _statusDisp = order.statusText;
Color _color; Color _color;
if (status == 1) { if (status == 1) {
//pending //pending
@ -148,7 +149,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
), ),
Expanded( Expanded(
child: Text( child: Text(
!projectViewModel.isArabic ? order.nearestProjectDescription.trim().toString() : order.nearestProjectDescriptionN.toString(), order.nearestProjectName.trim().toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56), style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.56),
), ),
), ),
@ -162,11 +163,11 @@ class OrdersLogDetailsPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Text( Text(
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(order.createdOn)), DateUtil.getDayMonthYearDateFormatted(DateTime.tryParse(order.created)),
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10), style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.4, height: 16 / 10),
), ),
SizedBox(height: 12), SizedBox(height: 12),
if (order.status == 1 || order.status == 2) if (order.statusId == 1 || order.statusId == 2)
InkWell( InkWell(
onTap: () { onTap: () {
showConfirmMessage(model, order); showConfirmMessage(model, order);

@ -224,7 +224,7 @@ class _TodayPageState extends State<TodayPage> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
TranslationBase.of(context).amount, TranslationBase.of(context).amount_,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -27,12 +27,13 @@ class BloodPressureMonthlyPage extends StatelessWidget {
Container( Container(
margin: EdgeInsets.only(top: 12, left: 8, right: 8), margin: EdgeInsets.only(top: 12, left: 8, right: 8),
color: Colors.white, color: Colors.white,
child: MonthCurvedChartBloodPressure( child:
MonthCurvedChartBloodPressure(
horizontalInterval: 20.0, horizontalInterval: 20.0,
title: TranslationBase.of(context).bloodPressure, title: TranslationBase.of(context).bloodPressure,
timeSeries1: model.weighMonthTimeSeriesDataTop.isEmpty ? [TimeSeriesSales3(0, 0.0)] : model.weighMonthTimeSeriesDataTop, timeSeries1: model.weighMonthTimeSeriesDataTop.isEmpty ? [TimeSeriesSales3(0, 0.0)] : model.weighMonthTimeSeriesDataTop,
timeSeries2: model.weighMonthTimeSeriesDataLow.isEmpty ? [TimeSeriesSales3(0, 0.0)] : model.weighMonthTimeSeriesDataLow, timeSeries2: model.weighMonthTimeSeriesDataLow.isEmpty ? [TimeSeriesSales3(0, 0.0)] : model.weighMonthTimeSeriesDataLow,
indexes: model.weightWeekTimeSeriesDataLow.length ~/ 5.5, indexes: model.weighMonthTimeSeriesDataLow.length ~/ 5.5,
), ),
), ),
SizedBox( SizedBox(

@ -12,8 +12,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
final int indexes; final int indexes;
final double horizontalInterval; final double horizontalInterval;
MonthCurvedChartBloodPressure( MonthCurvedChartBloodPressure({this.title, this.timeSeries1, this.indexes, this.timeSeries2, this.horizontalInterval = 20.0});
{this.title, this.timeSeries1, this.indexes, this.timeSeries2, this.horizontalInterval = 20.0});
List<int> xAxixs = List(); List<int> xAxixs = List();
List<double> yAxixs = List(); List<double> yAxixs = List();
@ -38,8 +37,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
), ),
Text( Text(
title, title,
style: TextStyle( style: TextStyle(color: Colors.black, fontSize: 15, letterSpacing: 2),
color: Colors.black, fontSize: 15, letterSpacing: 2),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
SizedBox( SizedBox(
@ -47,8 +45,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
), ),
Expanded( Expanded(
child: Padding( child: Padding(
padding: padding: const EdgeInsets.only(right: 18.0, left: 16.0, top: 15),
const EdgeInsets.only(right: 18.0, left: 16.0, top: 15),
child: LineChart( child: LineChart(
sampleData1(context), sampleData1(context),
swapAnimationDuration: const Duration(milliseconds: 250), swapAnimationDuration: const Duration(milliseconds: 250),
@ -67,9 +64,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
Container( Container(
width: 20, width: 20,
height: 20, height: 20,
decoration: BoxDecoration( decoration: BoxDecoration(shape: BoxShape.rectangle, color: Theme.of(context).primaryColor),
shape: BoxShape.rectangle,
color: Theme.of(context).primaryColor),
), ),
SizedBox( SizedBox(
width: 5, width: 5,
@ -85,8 +80,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
Container( Container(
width: 20, width: 20,
height: 20, height: 20,
decoration: BoxDecoration( decoration: BoxDecoration(shape: BoxShape.rectangle, color: secondaryColor),
shape: BoxShape.rectangle, color: secondaryColor),
), ),
SizedBox( SizedBox(
width: 5, width: 5,
@ -122,8 +116,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
touchCallback: (LineTouchResponse touchResponse) {}, touchCallback: (LineTouchResponse touchResponse) {},
handleBuiltInTouches: true, handleBuiltInTouches: true,
), ),
gridData: FlGridData( gridData: FlGridData(show: true, drawVerticalLine: true, drawHorizontalLine: true, horizontalInterval: 14, verticalInterval: 14),
show: true, drawVerticalLine: true, drawHorizontalLine: true),
titlesData: FlTitlesData( titlesData: FlTitlesData(
bottomTitles: SideTitles( bottomTitles: SideTitles(
showTitles: true, showTitles: true,
@ -133,12 +126,17 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
), ),
margin: 22, margin: 22,
getTitles: (value) { getTitles: (value) {
return ''; return timeSeries1[value.toInt()].time;
// return '';
}, },
), ),
leftTitles: SideTitles( leftTitles: SideTitles(
showTitles: true, showTitles: true,
interval:getMaxY() - getMinY() <=500?50:getMaxY() - getMinY() <=1000?100:200, interval: getMaxY() - getMinY() <= 500
? 10
: getMaxY() - getMinY() <= 1000
? 30
: 40,
getTextStyles: (value) => const TextStyle( getTextStyles: (value) => const TextStyle(
color: Colors.black, color: Colors.black,
@ -227,7 +225,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
spots: spots, spots: spots,
isCurved: true, isCurved: true,
colors: [Colors.red], colors: [Colors.red],
barWidth: 5, barWidth: 1.5,
isStrokeCapRound: true, isStrokeCapRound: true,
dotData: FlDotData( dotData: FlDotData(
show: false, show: false,
@ -240,7 +238,7 @@ class MonthCurvedChartBloodPressure extends StatelessWidget {
spots: spots2, spots: spots2,
isCurved: true, isCurved: true,
colors: [Theme.of(context).primaryColor], colors: [Theme.of(context).primaryColor],
barWidth: 5, barWidth: 1.5,
isStrokeCapRound: true, isStrokeCapRound: true,
dotData: FlDotData( dotData: FlDotData(
show: false, show: false,

@ -70,7 +70,7 @@ class TimeSeriesSales2 {
TimeSeriesSales2(this.time, this.sales); TimeSeriesSales2(this.time, this.sales);
} }
class TimeSeriesSales3 { class TimeSeriesSales3 {
final int time; final dynamic time;
final double sales; final double sales;
TimeSeriesSales3(this.time, this.sales); TimeSeriesSales3(this.time, this.sales);

@ -229,46 +229,49 @@ class _MobileNo extends State<MobileNo> {
), ),
], ],
), ),
Container( Directionality(
padding: EdgeInsets.all(5), textDirection: TextDirection.ltr,
decoration: BoxDecoration(color: Colors.white, border: Border.all(color: Colors.grey), borderRadius: BorderRadius.circular(10)), child: Container(
child: Row(children: <Widget>[ padding: EdgeInsets.all(5),
Expanded( decoration: BoxDecoration(color: Colors.white, border: Border.all(color: Colors.grey), borderRadius: BorderRadius.circular(10)),
flex: 1, child: Row(children: <Widget>[
child: Icon( Expanded(
Icons.phone, flex: 1,
color: secondaryColor, child: Icon(
Icons.phone,
color: secondaryColor,
),
), ),
), Expanded(
Expanded( flex: 1,
flex: 1, child: Text(
child: Text( countryCode,
countryCode, overflow: TextOverflow.clip,
overflow: TextOverflow.clip, ),
), ),
), Expanded(
Expanded( flex: 4,
flex: 4, child: Container(
child: Container( margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft),
margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft), child: TextField(
child: TextField( controller: widget.controller,
controller: widget.controller, keyboardType: TextInputType.number,
keyboardType: TextInputType.number, maxLength: 10,
maxLength: 10, inputFormatters: <TextInputFormatter>[
inputFormatters: <TextInputFormatter>[ FilteringTextInputFormatter.allow(RegExp("[0-9]")),
FilteringTextInputFormatter.allow(RegExp("[0-9]")), ],
], // maxLengthEnforced: true,
// maxLengthEnforced: true, // onChanged: (value) {
// onChanged: (value) { // widget.controller.text = countryCode;
// widget.controller.text = countryCode; // },
// }, onChanged: (value) => widget.onNumberChange(value),
onChanged: (value) => widget.onNumberChange(value),
decoration: InputDecoration(counterText: "", border: InputBorder.none, hintText: '5xxxxxxxx'), decoration: InputDecoration(counterText: "", border: InputBorder.none, hintText: '5xxxxxxxx'),
),
), ),
), )
) ]),
]), ),
) )
]), ]),
); );

Loading…
Cancel
Save