From 4eba6d9f5a0b606c2046f70949a282de3afa82f6 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Mon, 3 May 2021 17:12:49 +0300 Subject: [PATCH 1/4] Project refactoring --- .../post_prescrition_req_model.dart | 0 .../prescription_model.dart | 0 .../prescription_req_model.dart | 0 lib/core/model/{ => auth}/imei_details.dart | 0 .../model/{ => auth}/insert_imei_model.dart | 0 .../{ => insurance}/insurance_approval.dart | 0 .../insurance_approval_in_patient_model.dart | 0 .../medical_file_model.dart | 0 .../medical_file_request_model.dart | 0 .../PatientMuseResultsModel.dart | 0 .../PatientSearchRequestModel.dart | 0 .../DischargeReferralPatient.dart | 0 .../MyReferralPatientModel.dart | 0 .../model/{ => referral}/ReferralRequest.dart | 0 .../get_medication_response_model.dart | 0 .../item_by_medicine_model.dart | 0 .../item_by_medicine_request_model.dart | 0 .../{ => search_drug}/search_drug_model.dart | 0 .../search_drug_request_model.dart | 0 .../sick_leave_patient_model.dart | 0 .../sick_leave_patient_request_model.dart | 0 lib/core/service/PatientMuseService.dart | 29 -- lib/core/service/{ => home}/auth_service.dart | 2 +- .../service/{ => home}/dasboard_service.dart | 0 .../{ => home}/doctor_reply_service.dart | 0 .../service/{ => home}/schedule_service.dart | 0 .../DischargedPatientService.dart | 24 +- .../MyReferralPatientService.dart | 18 +- .../service/patient/PatientMuseService.dart | 25 ++ .../{ => patient}/ReferralService.dart | 3 +- .../service/patient/out_patient_service.dart | 10 +- .../patient-doctor-referral-service.dart | 54 ++-- .../patientInPatientService.dart | 4 +- .../{ => patient}/patient_service.dart | 0 .../referral_patient_service.dart | 0 .../referred_patient_service.dart | 0 .../patient-admission-request-service.dart | 0 .../insurance}/InsuranceCardService.dart | 4 +- .../lab_order}/labs_service.dart | 22 +- .../medical_report}/medical_file_service.dart | 4 +- .../prescription}/medicine_service.dart | 0 .../prescription}/prescription_service.dart | 14 +- .../prescription}/prescriptions_service.dart | 2 +- .../procedure}/procedure_service.dart | 0 .../radiology/radiology_service.dart | 57 ++++ .../sick_leave}/sickleave_service.dart | 11 +- .../soap}/SOAP_service.dart | 224 +++++++------- .../ucaf}/patient-ucaf-service.dart | 102 +++--- .../patient-vital-signs-service.dart | 0 lib/core/service/radiology_service.dart | 59 ---- .../viewModel/DischargedPatientViewModel.dart | 9 +- lib/core/viewModel/InsuranceViewModel.dart | 6 +- lib/core/viewModel/PatientMuseViewModel.dart | 8 +- .../viewModel/PatientSearchViewModel.dart | 90 +++--- lib/core/viewModel/SOAP_view_model.dart | 95 +++--- lib/core/viewModel/auth_view_model.dart | 4 +- lib/core/viewModel/dashboard_view_model.dart | 2 +- .../viewModel/doctor_replay_view_model.dart | 8 +- lib/core/viewModel/imei_view_model.dart | 4 +- lib/core/viewModel/labs_view_model.dart | 10 +- .../viewModel/medical_file_view_model.dart | 4 +- lib/core/viewModel/medicine_view_model.dart | 6 +- .../patient-admission-request-viewmodel.dart | 37 ++- .../viewModel/patient-referral-viewmodel.dart | 24 +- .../viewModel/patient-ucaf-viewmodel.dart | 6 +- .../patient-vital-sign-viewmodel.dart | 8 +- lib/core/viewModel/patient_view_model.dart | 15 +- .../viewModel/prescription_view_model.dart | 10 +- .../viewModel/prescriptions_view_model.dart | 39 +-- lib/core/viewModel/procedure_View_model.dart | 28 +- lib/core/viewModel/radiology_view_model.dart | 8 +- lib/core/viewModel/referral_view_model.dart | 11 +- lib/core/viewModel/referred_view_model.dart | 9 +- lib/core/viewModel/schedule_view_model.dart | 5 +- lib/core/viewModel/sick_leave_view_model.dart | 2 +- lib/locator.dart | 52 ++-- lib/screens/auth/login_screen.dart | 2 +- lib/screens/home/home_screen.dart | 2 +- .../medicine/medicine_search_screen.dart | 2 +- .../patients/PatientsInPatientScreen.dart | 109 ++++--- .../ReferralDischargedPatientDetails.dart | 141 ++++----- .../out_patient/filter_date_page.dart | 140 +++------ .../out_patient/out_patient_screen.dart | 292 +++++++++--------- .../patient_search_screen_new.dart | 44 ++- .../patient_search/patients_screen_new.dart | 248 ++++++++------- .../patients/patient_search/time_bar.dart | 40 ++- .../profile/UCAF/UCAF-detail-screen.dart | 2 +- .../referral/AddReplayOnReferralPatient.dart | 25 +- .../referral_patient_detail_in-paint.dart | 41 ++- .../subjective/medication/add_medication.dart | 2 +- .../prescription/add_prescription_form.dart | 4 +- .../update_prescription_form.dart | 6 +- lib/screens/sick-leave/add-sickleave.dart | 15 +- lib/widgets/auth/verification_methods.dart | 2 +- lib/widgets/otp/sms-popup.dart | 2 +- 95 files changed, 1145 insertions(+), 1142 deletions(-) rename lib/core/model/{ => Prescriptions}/post_prescrition_req_model.dart (100%) rename lib/core/model/{ => Prescriptions}/prescription_model.dart (100%) rename lib/core/model/{ => Prescriptions}/prescription_req_model.dart (100%) rename lib/core/model/{ => auth}/imei_details.dart (100%) rename lib/core/model/{ => auth}/insert_imei_model.dart (100%) rename lib/core/model/{ => insurance}/insurance_approval.dart (100%) rename lib/core/model/{ => insurance}/insurance_approval_in_patient_model.dart (100%) rename lib/core/model/{ => medical_report}/medical_file_model.dart (100%) rename lib/core/model/{ => medical_report}/medical_file_request_model.dart (100%) rename lib/core/model/{ => patient_muse}/PatientMuseResultsModel.dart (100%) rename lib/core/model/{ => patient_muse}/PatientSearchRequestModel.dart (100%) rename lib/core/model/{ => referral}/DischargeReferralPatient.dart (100%) rename lib/core/model/{ => referral}/MyReferralPatientModel.dart (100%) rename lib/core/model/{ => referral}/ReferralRequest.dart (100%) rename lib/core/model/{ => search_drug}/get_medication_response_model.dart (100%) rename lib/core/model/{ => search_drug}/item_by_medicine_model.dart (100%) rename lib/core/model/{ => search_drug}/item_by_medicine_request_model.dart (100%) rename lib/core/model/{ => search_drug}/search_drug_model.dart (100%) rename lib/core/model/{ => search_drug}/search_drug_request_model.dart (100%) rename lib/core/model/{ => sick_leave}/sick_leave_patient_model.dart (100%) rename lib/core/model/{ => sick_leave}/sick_leave_patient_request_model.dart (100%) delete mode 100644 lib/core/service/PatientMuseService.dart rename lib/core/service/{ => home}/auth_service.dart (94%) rename lib/core/service/{ => home}/dasboard_service.dart (100%) rename lib/core/service/{ => home}/doctor_reply_service.dart (100%) rename lib/core/service/{ => home}/schedule_service.dart (100%) rename lib/core/service/{ => patient}/DischargedPatientService.dart (81%) rename lib/core/service/{ => patient}/MyReferralPatientService.dart (81%) create mode 100644 lib/core/service/patient/PatientMuseService.dart rename lib/core/service/{ => patient}/ReferralService.dart (93%) rename lib/core/service/{ => patient}/patient-doctor-referral-service.dart (89%) rename lib/core/service/{ => patient}/patientInPatientService.dart (87%) rename lib/core/service/{ => patient}/patient_service.dart (100%) rename lib/core/service/{ => patient}/referral_patient_service.dart (100%) rename lib/core/service/{ => patient}/referred_patient_service.dart (100%) rename lib/core/service/{ => patient_medical_file/admission_request}/patient-admission-request-service.dart (100%) rename lib/core/service/{ => patient_medical_file/insurance}/InsuranceCardService.dart (91%) rename lib/core/service/{ => patient_medical_file/lab_order}/labs_service.dart (94%) rename lib/core/service/{ => patient_medical_file/medical_report}/medical_file_service.dart (87%) rename lib/core/service/{ => patient_medical_file/prescription}/medicine_service.dart (100%) rename lib/core/service/{ => patient_medical_file/prescription}/prescription_service.dart (91%) rename lib/core/service/{ => patient_medical_file/prescription}/prescriptions_service.dart (99%) rename lib/core/service/{ => patient_medical_file/procedure}/procedure_service.dart (100%) create mode 100644 lib/core/service/patient_medical_file/radiology/radiology_service.dart rename lib/core/service/{ => patient_medical_file/sick_leave}/sickleave_service.dart (95%) rename lib/core/service/{ => patient_medical_file/soap}/SOAP_service.dart (61%) rename lib/core/service/{ => patient_medical_file/ucaf}/patient-ucaf-service.dart (67%) rename lib/core/service/{ => patient_medical_file/vital_sign}/patient-vital-signs-service.dart (100%) delete mode 100644 lib/core/service/radiology_service.dart diff --git a/lib/core/model/post_prescrition_req_model.dart b/lib/core/model/Prescriptions/post_prescrition_req_model.dart similarity index 100% rename from lib/core/model/post_prescrition_req_model.dart rename to lib/core/model/Prescriptions/post_prescrition_req_model.dart diff --git a/lib/core/model/prescription_model.dart b/lib/core/model/Prescriptions/prescription_model.dart similarity index 100% rename from lib/core/model/prescription_model.dart rename to lib/core/model/Prescriptions/prescription_model.dart diff --git a/lib/core/model/prescription_req_model.dart b/lib/core/model/Prescriptions/prescription_req_model.dart similarity index 100% rename from lib/core/model/prescription_req_model.dart rename to lib/core/model/Prescriptions/prescription_req_model.dart diff --git a/lib/core/model/imei_details.dart b/lib/core/model/auth/imei_details.dart similarity index 100% rename from lib/core/model/imei_details.dart rename to lib/core/model/auth/imei_details.dart diff --git a/lib/core/model/insert_imei_model.dart b/lib/core/model/auth/insert_imei_model.dart similarity index 100% rename from lib/core/model/insert_imei_model.dart rename to lib/core/model/auth/insert_imei_model.dart diff --git a/lib/core/model/insurance_approval.dart b/lib/core/model/insurance/insurance_approval.dart similarity index 100% rename from lib/core/model/insurance_approval.dart rename to lib/core/model/insurance/insurance_approval.dart diff --git a/lib/core/model/insurance_approval_in_patient_model.dart b/lib/core/model/insurance/insurance_approval_in_patient_model.dart similarity index 100% rename from lib/core/model/insurance_approval_in_patient_model.dart rename to lib/core/model/insurance/insurance_approval_in_patient_model.dart diff --git a/lib/core/model/medical_file_model.dart b/lib/core/model/medical_report/medical_file_model.dart similarity index 100% rename from lib/core/model/medical_file_model.dart rename to lib/core/model/medical_report/medical_file_model.dart diff --git a/lib/core/model/medical_file_request_model.dart b/lib/core/model/medical_report/medical_file_request_model.dart similarity index 100% rename from lib/core/model/medical_file_request_model.dart rename to lib/core/model/medical_report/medical_file_request_model.dart diff --git a/lib/core/model/PatientMuseResultsModel.dart b/lib/core/model/patient_muse/PatientMuseResultsModel.dart similarity index 100% rename from lib/core/model/PatientMuseResultsModel.dart rename to lib/core/model/patient_muse/PatientMuseResultsModel.dart diff --git a/lib/core/model/PatientSearchRequestModel.dart b/lib/core/model/patient_muse/PatientSearchRequestModel.dart similarity index 100% rename from lib/core/model/PatientSearchRequestModel.dart rename to lib/core/model/patient_muse/PatientSearchRequestModel.dart diff --git a/lib/core/model/DischargeReferralPatient.dart b/lib/core/model/referral/DischargeReferralPatient.dart similarity index 100% rename from lib/core/model/DischargeReferralPatient.dart rename to lib/core/model/referral/DischargeReferralPatient.dart diff --git a/lib/core/model/MyReferralPatientModel.dart b/lib/core/model/referral/MyReferralPatientModel.dart similarity index 100% rename from lib/core/model/MyReferralPatientModel.dart rename to lib/core/model/referral/MyReferralPatientModel.dart diff --git a/lib/core/model/ReferralRequest.dart b/lib/core/model/referral/ReferralRequest.dart similarity index 100% rename from lib/core/model/ReferralRequest.dart rename to lib/core/model/referral/ReferralRequest.dart diff --git a/lib/core/model/get_medication_response_model.dart b/lib/core/model/search_drug/get_medication_response_model.dart similarity index 100% rename from lib/core/model/get_medication_response_model.dart rename to lib/core/model/search_drug/get_medication_response_model.dart diff --git a/lib/core/model/item_by_medicine_model.dart b/lib/core/model/search_drug/item_by_medicine_model.dart similarity index 100% rename from lib/core/model/item_by_medicine_model.dart rename to lib/core/model/search_drug/item_by_medicine_model.dart diff --git a/lib/core/model/item_by_medicine_request_model.dart b/lib/core/model/search_drug/item_by_medicine_request_model.dart similarity index 100% rename from lib/core/model/item_by_medicine_request_model.dart rename to lib/core/model/search_drug/item_by_medicine_request_model.dart diff --git a/lib/core/model/search_drug_model.dart b/lib/core/model/search_drug/search_drug_model.dart similarity index 100% rename from lib/core/model/search_drug_model.dart rename to lib/core/model/search_drug/search_drug_model.dart diff --git a/lib/core/model/search_drug_request_model.dart b/lib/core/model/search_drug/search_drug_request_model.dart similarity index 100% rename from lib/core/model/search_drug_request_model.dart rename to lib/core/model/search_drug/search_drug_request_model.dart diff --git a/lib/core/model/sick_leave_patient_model.dart b/lib/core/model/sick_leave/sick_leave_patient_model.dart similarity index 100% rename from lib/core/model/sick_leave_patient_model.dart rename to lib/core/model/sick_leave/sick_leave_patient_model.dart diff --git a/lib/core/model/sick_leave_patient_request_model.dart b/lib/core/model/sick_leave/sick_leave_patient_request_model.dart similarity index 100% rename from lib/core/model/sick_leave_patient_request_model.dart rename to lib/core/model/sick_leave/sick_leave_patient_request_model.dart diff --git a/lib/core/service/PatientMuseService.dart b/lib/core/service/PatientMuseService.dart deleted file mode 100644 index 35e5fe7b..00000000 --- a/lib/core/service/PatientMuseService.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/PatientMuseResultsModel.dart'; -import 'package:doctor_app_flutter/core/service/base/base_service.dart'; - -class PatientMuseService extends BaseService { - List patientMuseResultsModelList = List(); - - getECGPatient({int patientType, int patientOutSA,int patientID}) async { - Map body = Map(); - body['PatientType'] = patientType==7 ? 1: patientType; - body['PatientOutSA'] = patientOutSA; - body['PatientID'] = patientID; - hasError = false; - await baseAppClient.post( - GET_ECG, - onSuccess: (dynamic response, int statusCode) { - patientMuseResultsModelList.clear(); - response['HIS_GetPatientMuseResultsList'].forEach((v) { - patientMuseResultsModelList.add(PatientMuseResultsModel.fromJson(v)); - }); - }, - onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, - body: body - ); - } -} diff --git a/lib/core/service/auth_service.dart b/lib/core/service/home/auth_service.dart similarity index 94% rename from lib/core/service/auth_service.dart rename to lib/core/service/home/auth_service.dart index adb2d646..1aa9a88e 100644 --- a/lib/core/service/auth_service.dart +++ b/lib/core/service/home/auth_service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/imei_details.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; diff --git a/lib/core/service/dasboard_service.dart b/lib/core/service/home/dasboard_service.dart similarity index 100% rename from lib/core/service/dasboard_service.dart rename to lib/core/service/home/dasboard_service.dart diff --git a/lib/core/service/doctor_reply_service.dart b/lib/core/service/home/doctor_reply_service.dart similarity index 100% rename from lib/core/service/doctor_reply_service.dart rename to lib/core/service/home/doctor_reply_service.dart diff --git a/lib/core/service/schedule_service.dart b/lib/core/service/home/schedule_service.dart similarity index 100% rename from lib/core/service/schedule_service.dart rename to lib/core/service/home/schedule_service.dart diff --git a/lib/core/service/DischargedPatientService.dart b/lib/core/service/patient/DischargedPatientService.dart similarity index 81% rename from lib/core/service/DischargedPatientService.dart rename to lib/core/service/patient/DischargedPatientService.dart index 2d43afc6..ca595045 100644 --- a/lib/core/service/DischargedPatientService.dart +++ b/lib/core/service/patient/DischargedPatientService.dart @@ -1,14 +1,14 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/DischargeReferralPatient.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; class DischargedPatientService extends BaseService { List myDischargedPatients = List(); - + List myDischargeReferralPatients = List(); - Future getDischargedPatient() async { + Future getDischargedPatient() async { hasError = false; Map body = Map(); await getDoctorProfile(isGetProfile: true); @@ -63,14 +63,14 @@ class DischargedPatientService extends BaseService { myDischargeReferralPatients.clear(); await baseAppClient.post(GET_MY_DISCHARGE_PATIENT, onSuccess: (dynamic response, int statusCode) { - if (response['List_MyDischargeReferralPatient'] != null) { - response['List_MyDischargeReferralPatient'].forEach((v) { - myDischargeReferralPatients.add(DischargeReferralPatient.fromJson(v)); - }); - } - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + if (response['List_MyDischargeReferralPatient'] != null) { + response['List_MyDischargeReferralPatient'].forEach((v) { + myDischargeReferralPatients.add(DischargeReferralPatient.fromJson(v)); + }); + } + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } } diff --git a/lib/core/service/MyReferralPatientService.dart b/lib/core/service/patient/MyReferralPatientService.dart similarity index 81% rename from lib/core/service/MyReferralPatientService.dart rename to lib/core/service/patient/MyReferralPatientService.dart index f58cea48..ffa982b0 100644 --- a/lib/core/service/MyReferralPatientService.dart +++ b/lib/core/service/patient/MyReferralPatientService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/MyReferralPatientModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart'; @@ -42,23 +42,25 @@ class MyReferralInPatientService extends BaseService { ); } - Future replay(String referredDoctorRemarks, MyReferralPatientModel referral) async { + Future replay( + String referredDoctorRemarks, MyReferralPatientModel referral) async { hasError = false; await getDoctorProfile(); - RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = RequestAddReferredDoctorRemarks(); + RequestAddReferredDoctorRemarks _requestAddReferredDoctorRemarks = + RequestAddReferredDoctorRemarks(); _requestAddReferredDoctorRemarks.projectID = referral.projectID; - _requestAddReferredDoctorRemarks.admissionNo = referral.admissionNo.toString(); + _requestAddReferredDoctorRemarks.admissionNo = + referral.admissionNo.toString(); _requestAddReferredDoctorRemarks.lineItemNo = referral.lineItemNo; - _requestAddReferredDoctorRemarks.referredDoctorRemarks = referredDoctorRemarks; + _requestAddReferredDoctorRemarks.referredDoctorRemarks = + referredDoctorRemarks; _requestAddReferredDoctorRemarks.editedBy = doctorProfile.doctorID; _requestAddReferredDoctorRemarks.patientID = referral.patientID; _requestAddReferredDoctorRemarks.referringDoctor = referral.referringDoctor; await baseAppClient.post( ADD_REFERRED_DOCTOR_REMARKS, body: _requestAddReferredDoctorRemarks.toJson(), - onSuccess: (dynamic body, int statusCode) { - - }, + onSuccess: (dynamic body, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/core/service/patient/PatientMuseService.dart b/lib/core/service/patient/PatientMuseService.dart new file mode 100644 index 00000000..8c821104 --- /dev/null +++ b/lib/core/service/patient/PatientMuseService.dart @@ -0,0 +1,25 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientMuseResultsModel.dart'; +import 'package:doctor_app_flutter/core/service/base/base_service.dart'; + +class PatientMuseService extends BaseService { + List patientMuseResultsModelList = List(); + + getECGPatient({int patientType, int patientOutSA, int patientID}) async { + Map body = Map(); + body['PatientType'] = patientType == 7 ? 1 : patientType; + body['PatientOutSA'] = patientOutSA; + body['PatientID'] = patientID; + hasError = false; + await baseAppClient.post(GET_ECG, + onSuccess: (dynamic response, int statusCode) { + patientMuseResultsModelList.clear(); + response['HIS_GetPatientMuseResultsList'].forEach((v) { + patientMuseResultsModelList.add(PatientMuseResultsModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } +} diff --git a/lib/core/service/ReferralService.dart b/lib/core/service/patient/ReferralService.dart similarity index 93% rename from lib/core/service/ReferralService.dart rename to lib/core/service/patient/ReferralService.dart index 2887abde..64f473d9 100644 --- a/lib/core/service/ReferralService.dart +++ b/lib/core/service/patient/ReferralService.dart @@ -1,9 +1,8 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/ReferralRequest.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/ReferralRequest.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; class ReferralService extends BaseService { - Future referralPatient( {int admissionNo, String roomID, diff --git a/lib/core/service/patient/out_patient_service.dart b/lib/core/service/patient/out_patient_service.dart index 606bfc5d..339f6a93 100644 --- a/lib/core/service/patient/out_patient_service.dart +++ b/lib/core/service/patient/out_patient_service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -7,8 +7,8 @@ class OutPatientService extends BaseService { List _patientList = []; List get patientList => _patientList; - - Future getOutPatient(PatientSearchRequestModel patientSearchRequestModel) async { + Future getOutPatient( + PatientSearchRequestModel patientSearchRequestModel) async { hasError = false; await baseAppClient.post( GET_MY_OUT_PATIENT, @@ -25,7 +25,9 @@ class OutPatientService extends BaseService { body: patientSearchRequestModel.toJson(), ); } - Future getPatientFileInformation(PatientSearchRequestModel patientSearchRequestModel) async { + + Future getPatientFileInformation( + PatientSearchRequestModel patientSearchRequestModel) async { hasError = false; await baseAppClient.post( PRM_SEARCH_PATIENT, diff --git a/lib/core/service/patient-doctor-referral-service.dart b/lib/core/service/patient/patient-doctor-referral-service.dart similarity index 89% rename from lib/core/service/patient-doctor-referral-service.dart rename to lib/core/service/patient/patient-doctor-referral-service.dart index 680adada..c83c74c9 100644 --- a/lib/core/service/patient-doctor-referral-service.dart +++ b/lib/core/service/patient/patient-doctor-referral-service.dart @@ -9,7 +9,7 @@ import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patien import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/request_my_referral_patient_model.dart'; -import 'base/lookup-service.dart'; +import '../base/lookup-service.dart'; class PatientReferralService extends LookupService { List projectsList = []; @@ -56,7 +56,8 @@ class PatientReferralService extends LookupService { Map body = Map(); body['isSameBranch'] = false; - await baseAppClient.post(GET_REFERRAL_FACILITIES, onSuccess: (response, statusCode) async { + await baseAppClient.post(GET_REFERRAL_FACILITIES, + onSuccess: (response, statusCode) async { projectsList = response['ProjectInfo']; }, onFailure: (String error, int statusCode) { hasError = true; @@ -102,7 +103,8 @@ class PatientReferralService extends LookupService { ); } - Future getDoctorsList(PatiantInformtion patient ,int clinicId, int branchId) async { + Future getDoctorsList( + PatiantInformtion patient, int clinicId, int branchId) async { hasError = false; DoctorsByClinicIdRequest _doctorsByClinicIdRequest = DoctorsByClinicIdRequest(); @@ -112,22 +114,16 @@ class PatientReferralService extends LookupService { _doctorsByClinicIdRequest.patientID = patient.patientId; _doctorsByClinicIdRequest.gender = patient.gender; - - await baseAppClient.postPatient( - PATIENT_GET_DOCTOR_BY_CLINIC_Hospital, - onSuccess: (dynamic response, int statusCode) { - doctorsList.clear(); - response['DoctorList'].forEach((v) { - doctorsList.add(ClinicDoctor.fromJson(v)); - }); - }, - onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, - body: _doctorsByClinicIdRequest.toJson(), - patient: patient - ); + await baseAppClient.postPatient(PATIENT_GET_DOCTOR_BY_CLINIC_Hospital, + onSuccess: (dynamic response, int statusCode) { + doctorsList.clear(); + response['DoctorList'].forEach((v) { + doctorsList.add(ClinicDoctor.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: _doctorsByClinicIdRequest.toJson(), patient: patient); } Future getMyReferredPatient() async { @@ -215,7 +211,8 @@ class PatientReferralService extends LookupService { ); } - Future responseReferral(PendingReferral pendingReferral, bool isAccepted) async { + Future responseReferral( + PendingReferral pendingReferral, bool isAccepted) async { hasError = false; DoctorProfileModel doctorProfile = await getDoctorProfile(); @@ -242,13 +239,8 @@ class PatientReferralService extends LookupService { ); } - Future makeReferral( - PatiantInformtion patient, - String isoStringDate, - int projectID, - int clinicID, - int doctorID, - String remarks) async { + Future makeReferral(PatiantInformtion patient, String isoStringDate, + int projectID, int clinicID, int doctorID, String remarks) async { hasError = false; Map body = Map(); @@ -304,8 +296,8 @@ class PatientReferralService extends LookupService { ); } - - Future verifyReferralDoctorRemarks(MyReferredPatientModel referredPatient) async { + Future verifyReferralDoctorRemarks( + MyReferredPatientModel referredPatient) async { hasError = false; Map body = Map(); @@ -315,9 +307,7 @@ class PatientReferralService extends LookupService { await baseAppClient.post( Verify_Referral_Doctor_Remarks, - onSuccess: (dynamic response, int statusCode) { - - }, + onSuccess: (dynamic response, int statusCode) {}, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/core/service/patientInPatientService.dart b/lib/core/service/patient/patientInPatientService.dart similarity index 87% rename from lib/core/service/patientInPatientService.dart rename to lib/core/service/patient/patientInPatientService.dart index 3e0ba4a4..c06cc6b7 100644 --- a/lib/core/service/patientInPatientService.dart +++ b/lib/core/service/patient/patientInPatientService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -13,7 +13,7 @@ class PatientInPatientService extends BaseService { if (isMyInpatient) { requestModel.doctorID = doctorProfile.doctorID; - }else { + } else { requestModel.doctorID = 0; } diff --git a/lib/core/service/patient_service.dart b/lib/core/service/patient/patient_service.dart similarity index 100% rename from lib/core/service/patient_service.dart rename to lib/core/service/patient/patient_service.dart diff --git a/lib/core/service/referral_patient_service.dart b/lib/core/service/patient/referral_patient_service.dart similarity index 100% rename from lib/core/service/referral_patient_service.dart rename to lib/core/service/patient/referral_patient_service.dart diff --git a/lib/core/service/referred_patient_service.dart b/lib/core/service/patient/referred_patient_service.dart similarity index 100% rename from lib/core/service/referred_patient_service.dart rename to lib/core/service/patient/referred_patient_service.dart diff --git a/lib/core/service/patient-admission-request-service.dart b/lib/core/service/patient_medical_file/admission_request/patient-admission-request-service.dart similarity index 100% rename from lib/core/service/patient-admission-request-service.dart rename to lib/core/service/patient_medical_file/admission_request/patient-admission-request-service.dart diff --git a/lib/core/service/InsuranceCardService.dart b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart similarity index 91% rename from lib/core/service/InsuranceCardService.dart rename to lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart index b736c34f..6bdf5f79 100644 --- a/lib/core/service/InsuranceCardService.dart +++ b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/insurance_approval_request_model.dart'; -import 'package:doctor_app_flutter/core/model/insurance_approval.dart'; -import 'package:doctor_app_flutter/core/model/insurance_approval_in_patient_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval_in_patient_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/service/labs_service.dart b/lib/core/service/patient_medical_file/lab_order/labs_service.dart similarity index 94% rename from lib/core/service/labs_service.dart rename to lib/core/service/patient_medical_file/lab_order/labs_service.dart index 8af2121f..4eee522a 100644 --- a/lib/core/service/labs_service.dart +++ b/lib/core/service/patient_medical_file/lab_order/labs_service.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/model/labs/request_patient_lab_special_r import 'package:doctor_app_flutter/core/model/labs/request_send_lab_report_email.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'base/base_service.dart'; +import '../../base/base_service.dart'; class LabsService extends BaseService { List patientLabOrdersList = List(); @@ -25,16 +25,16 @@ class LabsService extends BaseService { body['isDentalAllowedBackend'] = false; url = GET_Patient_LAB_ORDERS; } - patientLabOrdersList=[]; + patientLabOrdersList = []; patientLabOrdersList.clear(); await baseAppClient.postPatient(url, patient: patient, onSuccess: (dynamic response, int statusCode) { - patientLabOrdersList=[]; + patientLabOrdersList = []; if (!isInpatient) { response['ListPLO'].forEach((hospital) { patientLabOrdersList.add(PatientLabOrders.fromJson(hospital)); }); - var asd=""; + var asd = ""; } else { response['List_GetLabOreders'].forEach((hospital) { patientLabOrdersList.add(PatientLabOrders.fromJson(hospital)); @@ -69,14 +69,13 @@ class LabsService extends BaseService { _requestPatientLabSpecialResult.orderNo = orderNo; body = _requestPatientLabSpecialResult.toJson(); - await baseAppClient.postPatient(GET_Patient_LAB_SPECIAL_RESULT, patient: patient, - onSuccess: (dynamic response, int statusCode) { + await baseAppClient.postPatient(GET_Patient_LAB_SPECIAL_RESULT, + patient: patient, onSuccess: (dynamic response, int statusCode) { patientLabSpecialResult.clear(); response['ListPLSR'].forEach((hospital) { patientLabSpecialResult.add(PatientLabSpecialResult.fromJson(hospital)); }); - }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -84,7 +83,9 @@ class LabsService extends BaseService { } Future getPatientLabResult( - {PatientLabOrders patientLabOrder, PatiantInformtion patient, bool isInpatient}) async { + {PatientLabOrders patientLabOrder, + PatiantInformtion patient, + bool isInpatient}) async { hasError = false; String url = ""; @@ -107,16 +108,15 @@ class LabsService extends BaseService { patientLabSpecialResult.clear(); labResultList.clear(); - if(isInpatient){ + if (isInpatient) { response['List_GetLabNormal'].forEach((hospital) { labResultList.add(LabResult.fromJson(hospital)); }); - }else { + } else { response['ListPLR'].forEach((lab) { labResultList.add(LabResult.fromJson(lab)); }); } - }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; diff --git a/lib/core/service/medical_file_service.dart b/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart similarity index 87% rename from lib/core/service/medical_file_service.dart rename to lib/core/service/patient_medical_file/medical_report/medical_file_service.dart index 75fade97..d80b89fa 100644 --- a/lib/core/service/medical_file_service.dart +++ b/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/medical_file_model.dart'; -import 'package:doctor_app_flutter/core/model/medical_file_request_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; class MedicalFileService extends BaseService { diff --git a/lib/core/service/medicine_service.dart b/lib/core/service/patient_medical_file/prescription/medicine_service.dart similarity index 100% rename from lib/core/service/medicine_service.dart rename to lib/core/service/patient_medical_file/prescription/medicine_service.dart diff --git a/lib/core/service/prescription_service.dart b/lib/core/service/patient_medical_file/prescription/prescription_service.dart similarity index 91% rename from lib/core/service/prescription_service.dart rename to lib/core/service/patient_medical_file/prescription/prescription_service.dart index dc74901e..7df9d38b 100644 --- a/lib/core/service/prescription_service.dart +++ b/lib/core/service/patient_medical_file/prescription/prescription_service.dart @@ -1,12 +1,12 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; import 'package:doctor_app_flutter/core/model/calculate_box_request_model.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/model/item_by_medicine_request_model.dart'; -import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart'; -import 'package:doctor_app_flutter/core/model/prescription_req_model.dart'; -import 'package:doctor_app_flutter/core/model/search_drug_model.dart'; -import 'package:doctor_app_flutter/core/model/search_drug_request_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/item_by_medicine_request_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_req_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/search_drug_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/search_drug_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentReqModel.dart'; @@ -109,7 +109,7 @@ class PrescriptionService extends LookupService { }, body: _drugRequestModel.toJson()); } - Future getMedicationList({String drug =''}) async { + Future getMedicationList({String drug = ''}) async { hasError = false; _drugRequestModel.search = ["$drug"]; await baseAppClient.post(SEARCH_DRUG, diff --git a/lib/core/service/prescriptions_service.dart b/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart similarity index 99% rename from lib/core/service/prescriptions_service.dart rename to lib/core/service/patient_medical_file/prescription/prescriptions_service.dart index 90d65de9..eb860141 100644 --- a/lib/core/service/prescriptions_service.dart +++ b/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart @@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:flutter/cupertino.dart'; -import 'base/base_service.dart'; +import '../../base/base_service.dart'; class PrescriptionsService extends BaseService { List prescriptionsList = List(); diff --git a/lib/core/service/procedure_service.dart b/lib/core/service/patient_medical_file/procedure/procedure_service.dart similarity index 100% rename from lib/core/service/procedure_service.dart rename to lib/core/service/patient_medical_file/procedure/procedure_service.dart diff --git a/lib/core/service/patient_medical_file/radiology/radiology_service.dart b/lib/core/service/patient_medical_file/radiology/radiology_service.dart new file mode 100644 index 00000000..7cf17753 --- /dev/null +++ b/lib/core/service/patient_medical_file/radiology/radiology_service.dart @@ -0,0 +1,57 @@ +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; +import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; +import 'package:flutter/cupertino.dart'; + +import '../../base/base_service.dart'; + +class RadiologyService extends BaseService { + List finalRadiologyList = List(); + String url = ''; + + Future getRadImageURL( + {int invoiceNo, + int lineItem, + int projectId, + @required PatiantInformtion patient}) async { + hasError = false; + final Map body = new Map(); + body['InvoiceNo'] = invoiceNo; + body['LineItemNo'] = lineItem; + body['ProjectID'] = projectId; + + await baseAppClient.postPatient(GET_RAD_IMAGE_URL, patient: patient, + onSuccess: (dynamic response, int statusCode) { + url = response['Data']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } + + Future getPatientRadOrders(PatiantInformtion patient, + {isInPatient = false}) async { + String url = GET_PATIENT_ORDERS; + final Map body = new Map(); + if (isInPatient) { + url = GET_IN_PATIENT_ORDERS; + body['ProjectID'] = patient.projectId; + } + + hasError = false; + await baseAppClient.postPatient(url, patient: patient, + onSuccess: (dynamic response, int statusCode) { + finalRadiologyList = []; + String label = "ListRAD"; + if (isInPatient) { + label = "List_GetRadOreders"; + } + response[label].forEach((radiology) { + finalRadiologyList.add(FinalRadiology.fromJson(radiology)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); + } +} diff --git a/lib/core/service/sickleave_service.dart b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart similarity index 95% rename from lib/core/service/sickleave_service.dart rename to lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart index 1bfb8df8..c16a2d31 100644 --- a/lib/core/service/sickleave_service.dart +++ b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/sick_leave_patient_model.dart'; -import 'package:doctor_app_flutter/core/model/sick_leave_patient_request_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/viewModel/leave_rechdule_response.dart'; import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart'; @@ -31,7 +31,6 @@ class SickLeaveService extends BaseService { dynamic get sickLeaveResponse => _sickLeaveResponse; dynamic _sickLeaveResponse; - List getAllSickLeavePatient = List(); SickLeavePatientRequestModel _sickLeavePatientRequestModel = @@ -101,8 +100,8 @@ class SickLeaveService extends BaseService { await baseAppClient.postPatient( GET_SICK_LEAVE, onSuccess: (dynamic response, int statusCode) { - // Future.value(response); - getAllSickLeavePatient=[]; + // Future.value(response); + getAllSickLeavePatient = []; response['List_SickLeave'].forEach((v) { getAllSickLeavePatient.add(SickLeavePatientModel.fromJson(v)); }); @@ -119,7 +118,7 @@ class SickLeaveService extends BaseService { _sickLeavePatientRequestModel = SickLeavePatientRequestModel( patientID: patientMRN, patientTypeID: 2, patientType: 1); hasError = false; - getAllSickLeavePatient =[]; + getAllSickLeavePatient = []; getAllSickLeavePatient.clear(); await baseAppClient.postPatient( GET_SICK_LEAVE_PATIENT, diff --git a/lib/core/service/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart similarity index 61% rename from lib/core/service/SOAP_service.dart rename to lib/core/service/patient_medical_file/soap/SOAP_service.dart index 901445bf..b2e0d603 100644 --- a/lib/core/service/SOAP_service.dart +++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart @@ -22,15 +22,15 @@ import 'package:doctor_app_flutter/models/SOAP/post_histories_request_model.dart import 'package:doctor_app_flutter/models/SOAP/post_physical_exam_request_model.dart'; import 'package:doctor_app_flutter/models/SOAP/post_progress_note_request_model.dart'; -import 'base/lookup-service.dart'; +import '../../base/lookup-service.dart'; class SOAPService extends LookupService { - List patientChiefComplaintList = []; - List patientAllergiesList = []; - List patientHistoryList = []; - List patientPhysicalExamList = []; - List patientProgressNoteList = []; - List patientAssessmentList = []; + List patientChiefComplaintList = []; + List patientAllergiesList = []; + List patientHistoryList = []; + List patientPhysicalExamList = []; + List patientProgressNoteList = []; + List patientAssessmentList = []; int episodeID; Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async { @@ -55,13 +55,12 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_EPISODE, onSuccess: (dynamic response, int statusCode) { - - print("Success"); - episodeID = response['EpisodeID']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postEpisodeReqModel.toJson()); + print("Success"); + episodeID = response['EpisodeID']; + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postEpisodeReqModel.toJson()); } Future postAllergy(PostAllergyRequestModel postAllergyRequestModel) async { @@ -69,11 +68,11 @@ class SOAPService extends LookupService { await baseAppClient.post(POST_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postAllergyRequestModel.toJson()); } Future postHistories( @@ -81,11 +80,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: postHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: postHistoriesRequestModel.toJson()); } Future postChiefComplaint( @@ -93,7 +92,7 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(POST_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); + print("Success"); }, onFailure: (String error, int statusCode) { hasError = true; super.error = error; @@ -136,18 +135,16 @@ class SOAPService extends LookupService { }, body: postAssessmentRequestModel.toJson()); } - - Future patchAllergy(PostAllergyRequestModel patchAllergyRequestModel) async { hasError = false; await baseAppClient.post(PATCH_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchAllergyRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchAllergyRequestModel.toJson()); } Future patchHistories( @@ -155,11 +152,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_HISTORY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchHistoriesRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchHistoriesRequestModel.toJson()); } Future patchChiefComplaint( @@ -167,11 +164,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchChiefComplaintRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchChiefComplaintRequestModel.toJson()); } Future patchPhysicalExam( @@ -179,11 +176,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchPhysicalExamRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchPhysicalExamRequestModel.toJson()); } Future patchProgressNote( @@ -191,11 +188,11 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchProgressNoteRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchProgressNoteRequestModel.toJson()); } Future patchAssessment( @@ -203,111 +200,106 @@ class SOAPService extends LookupService { hasError = false; await baseAppClient.post(PATCH_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: patchAssessmentRequestModel.toJson()); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: patchAssessmentRequestModel.toJson()); } - - Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async { hasError = false; - await baseAppClient.post (GET_ALLERGY, + await baseAppClient.post(GET_ALLERGY, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAllergiesList.clear(); + print("Success"); + patientAllergiesList.clear(); - response['List_Allergies']['entityList'].forEach((v) { - patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: generalGetReqForSOAP.toJson()); + response['List_Allergies']['entityList'].forEach((v) { + patientAllergiesList.add(GetAllergiesResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: generalGetReqForSOAP.toJson()); } - Future getPatientHistories( - GetHistoryReqModel getHistoryReqModel, {bool isFirst = false}) async { + Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, + {bool isFirst = false}) async { hasError = false; await baseAppClient.post(GET_HISTORY, onSuccess: (dynamic response, int statusCode) { print("Success"); - if (isFirst) - patientHistoryList.clear(); + if (isFirst) patientHistoryList.clear(); response['List_History']['entityList'].forEach((v) { patientHistoryList.add(GetHistoryResModel.fromJson(v)); }); }, onFailure: (String error, int statusCode) { hasError = true; - super.error = error; - }, body: getHistoryReqModel.toJson()); + super.error = error; + }, body: getHistoryReqModel.toJson()); } Future getPatientChiefComplaint( GetChiefComplaintReqModel getChiefComplaintReqModel) async { hasError = false; - await baseAppClient.post (GET_CHIEF_COMPLAINT, + await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientChiefComplaintList.clear(); - response['List_ChiefComplaint']['entityList'].forEach((v) { - patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getChiefComplaintReqModel.toJson()); + print("Success"); + patientChiefComplaintList.clear(); + response['List_ChiefComplaint']['entityList'].forEach((v) { + patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getChiefComplaintReqModel.toJson()); } Future getPatientPhysicalExam( GetPhysicalExamReqModel getPhysicalExamReqModel) async { hasError = false; - await baseAppClient.post (GET_PHYSICAL_EXAM, + await baseAppClient.post(GET_PHYSICAL_EXAM, onSuccess: (dynamic response, int statusCode) { - patientPhysicalExamList.clear(); - response['PhysicalExamList']['entityList'].forEach((v) { - patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); - }); - - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getPhysicalExamReqModel.toJson()); + patientPhysicalExamList.clear(); + response['PhysicalExamList']['entityList'].forEach((v) { + patientPhysicalExamList.add(GetPhysicalExamResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getPhysicalExamReqModel.toJson()); } Future getPatientProgressNote( GetGetProgressNoteReqModel getGetProgressNoteReqModel) async { hasError = false; - await baseAppClient.post (GET_PROGRESS_NOTE, + await baseAppClient.post(GET_PROGRESS_NOTE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientProgressNoteList.clear(); - response['ProgressNoteList']['entityList'].forEach((v) { - patientProgressNoteList.add(GetPatientProgressNoteResModel.fromJson(v)); - }); - - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getGetProgressNoteReqModel.toJson()); + print("Success"); + patientProgressNoteList.clear(); + response['ProgressNoteList']['entityList'].forEach((v) { + patientProgressNoteList.add(GetPatientProgressNoteResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getGetProgressNoteReqModel.toJson()); } Future getPatientAssessment( GetAssessmentReqModel getAssessmentReqModel) async { hasError = false; - await baseAppClient.post (GET_ASSESSMENT, + await baseAppClient.post(GET_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAssessmentList.clear(); - response['AssessmentList']['entityList'].forEach((v) { - patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: getAssessmentReqModel.toJson()); + print("Success"); + patientAssessmentList.clear(); + response['AssessmentList']['entityList'].forEach((v) { + patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: getAssessmentReqModel.toJson()); } } diff --git a/lib/core/service/patient-ucaf-service.dart b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart similarity index 67% rename from lib/core/service/patient-ucaf-service.dart rename to lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart index e53df1d0..478d48f3 100644 --- a/lib/core/service/patient-ucaf-service.dart +++ b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/prescription_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; @@ -8,11 +8,10 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-history.dart'; class UcafService extends LookupService { - - List patientChiefComplaintList = []; + List patientChiefComplaintList = []; List patientVitalSignsHistory = []; - List patientAssessmentList = []; - List orderProcedureList = []; + List patientAssessmentList = []; + List orderProcedureList = []; PrescriptionModel prescriptionList; Future getPatientChiefComplaint(PatiantInformtion patient) async { @@ -23,27 +22,28 @@ class UcafService extends LookupService { body['EpisodeID'] = patient.episodeNo; body['DoctorID'] = ""; - await baseAppClient.post (GET_CHIEF_COMPLAINT, + await baseAppClient.post(GET_CHIEF_COMPLAINT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientChiefComplaintList.clear(); - response['List_ChiefComplaint']['entityList'].forEach((v) { - patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + print("Success"); + patientChiefComplaintList.clear(); + response['List_ChiefComplaint']['entityList'].forEach((v) { + patientChiefComplaintList.add(GetChiefComplaintResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - Future getInPatientVitalSignHistory(PatiantInformtion patient, bool isInPatient) async { + Future getInPatientVitalSignHistory( + PatiantInformtion patient, bool isInPatient) async { hasError = false; Map body = Map(); body['PatientID'] = patient.patientId; body['PatientTypeID'] = 1; - if(isInPatient){ + if (isInPatient) { body['InOutPatientType'] = 1; - }else { + } else { body['InOutPatientType'] = 2; } @@ -104,17 +104,17 @@ class UcafService extends LookupService { body['AppointmentNo'] = patient.appointmentNo; body['EpisodeID'] = patient.episodeNo; - await baseAppClient.post (GET_ASSESSMENT, + await baseAppClient.post(GET_ASSESSMENT, onSuccess: (dynamic response, int statusCode) { - print("Success"); - patientAssessmentList.clear(); - response['AssessmentList']['entityList'].forEach((v) { - patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + print("Success"); + patientAssessmentList.clear(); + response['AssessmentList']['entityList'].forEach((v) { + patientAssessmentList.add(GetAssessmentResModel.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } Future getPrescription(PatiantInformtion patient) async { @@ -129,11 +129,12 @@ class UcafService extends LookupService { prescriptionList = null; await baseAppClient.post(GET_PRESCRIPTION_LIST, onSuccess: (dynamic response, int statusCode) { - prescriptionList = PrescriptionModel.fromJson(response['PrescriptionList']); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + prescriptionList = + PrescriptionModel.fromJson(response['PrescriptionList']); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } Future getOrderProcedures(PatiantInformtion patient) async { @@ -143,17 +144,17 @@ class UcafService extends LookupService { body['AppointmentNo'] = patient.appointmentNo; body['EpisodeID'] = patient.episodeNo; - await baseAppClient.post (GET_ORDER_PROCEDURE, + await baseAppClient.post(GET_ORDER_PROCEDURE, onSuccess: (dynamic response, int statusCode) { - print("Success"); - orderProcedureList.clear(); - response['OrderedProcedureList']['entityList'].forEach((v) { - orderProcedureList.add(OrderProcedure.fromJson(v)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + print("Success"); + orderProcedureList.clear(); + response['OrderedProcedureList']['entityList'].forEach((v) { + orderProcedureList.add(OrderProcedure.fromJson(v)); + }); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } Future postUCAF(PatiantInformtion patient) async { @@ -162,13 +163,12 @@ class UcafService extends LookupService { body['PatientMRN'] = patient.patientMRN; body['AppointmentNo'] = patient.appointmentNo; - await baseAppClient.post (POST_UCAF, + await baseAppClient.post(POST_UCAF, onSuccess: (dynamic response, int statusCode) { - print("Success"); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); + print("Success"); + }, onFailure: (String error, int statusCode) { + hasError = true; + super.error = error; + }, body: body); } - -} \ No newline at end of file +} diff --git a/lib/core/service/patient-vital-signs-service.dart b/lib/core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart similarity index 100% rename from lib/core/service/patient-vital-signs-service.dart rename to lib/core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart diff --git a/lib/core/service/radiology_service.dart b/lib/core/service/radiology_service.dart deleted file mode 100644 index 42a79098..00000000 --- a/lib/core/service/radiology_service.dart +++ /dev/null @@ -1,59 +0,0 @@ -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; -import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; -import 'package:flutter/cupertino.dart'; - -import 'base/base_service.dart'; - -class RadiologyService extends BaseService { - List finalRadiologyList = List(); - String url = ''; - - Future getRadImageURL({int invoiceNo, int lineItem, int projectId,@required PatiantInformtion patient}) async { - hasError = false; - final Map body = new Map(); - body['InvoiceNo'] = invoiceNo; - body['LineItemNo'] = lineItem; - body['ProjectID'] = projectId; - - await baseAppClient.postPatient(GET_RAD_IMAGE_URL, - patient: patient, - onSuccess: (dynamic response, int statusCode) { - url = response['Data']; - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: body); - } - - Future getPatientRadOrders(PatiantInformtion patient , {isInPatient = false}) async { - String url = GET_PATIENT_ORDERS; - final Map body = new Map(); - if(isInPatient) { - url = GET_IN_PATIENT_ORDERS; - body['ProjectID'] = patient.projectId; - } - - - hasError = false; - await baseAppClient.postPatient(url, - patient: patient, - onSuccess: (dynamic response, int statusCode) { - finalRadiologyList = []; - String label = "ListRAD"; - if(isInPatient) { - label ="List_GetRadOreders"; - } - response[label].forEach((radiology) { - finalRadiologyList.add(FinalRadiology.fromJson(radiology)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body:body); - } - - - - -} diff --git a/lib/core/viewModel/DischargedPatientViewModel.dart b/lib/core/viewModel/DischargedPatientViewModel.dart index 1c1ed4d1..6e130abe 100644 --- a/lib/core/viewModel/DischargedPatientViewModel.dart +++ b/lib/core/viewModel/DischargedPatientViewModel.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/DischargedPatientService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/DischargedPatientService.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import '../../locator.dart'; @@ -12,7 +12,6 @@ class DischargedPatientViewModel extends BaseViewModel { List get myDischargedPatient => _dischargedPatientService.myDischargedPatients; - List filterData = []; searchData(String str) { @@ -39,16 +38,16 @@ class DischargedPatientViewModel extends BaseViewModel { } } - Future getDischargedPatient() async { setState(ViewState.Busy); await _dischargedPatientService.getDischargedPatient(); if (_dischargedPatientService.hasError) { error = _dischargedPatientService.error; setState(ViewState.Error); - } else{ + } else { filterData = myDischargedPatient; - setState(ViewState.Idle);} + setState(ViewState.Idle); + } } Future gtMyDischargeReferralPatient() async { diff --git a/lib/core/viewModel/InsuranceViewModel.dart b/lib/core/viewModel/InsuranceViewModel.dart index 54e61635..e41d68bd 100644 --- a/lib/core/viewModel/InsuranceViewModel.dart +++ b/lib/core/viewModel/InsuranceViewModel.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/insurance_approval.dart'; -import 'package:doctor_app_flutter/core/model/insurance_approval_in_patient_model.dart'; -import 'package:doctor_app_flutter/core/service/InsuranceCardService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval_in_patient_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/viewModel/PatientMuseViewModel.dart b/lib/core/viewModel/PatientMuseViewModel.dart index 890b24d6..68826e04 100644 --- a/lib/core/viewModel/PatientMuseViewModel.dart +++ b/lib/core/viewModel/PatientMuseViewModel.dart @@ -1,15 +1,15 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/PatientMuseResultsModel.dart'; -import 'package:doctor_app_flutter/core/service/PatientMuseService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientMuseResultsModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/PatientMuseService.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import '../../locator.dart'; class PatientMuseViewModel extends BaseViewModel { - PatientMuseService _patientMuseService = locator(); - List get patientMuseResultsModelList => _patientMuseService.patientMuseResultsModelList; + List get patientMuseResultsModelList => + _patientMuseService.patientMuseResultsModelList; getECGPatient({int patientType, int patientOutSA, int patientID}) async { setState(ViewState.Busy); diff --git a/lib/core/viewModel/PatientSearchViewModel.dart b/lib/core/viewModel/PatientSearchViewModel.dart index 8192b1a8..ce33c5f5 100644 --- a/lib/core/viewModel/PatientSearchViewModel.dart +++ b/lib/core/viewModel/PatientSearchViewModel.dart @@ -1,15 +1,15 @@ import 'package:doctor_app_flutter/core/enum/patient_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/patient/out_patient_service.dart'; -import 'package:doctor_app_flutter/core/service/patientInPatientService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patientInPatientService.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; import '../../locator.dart'; import 'base_view_model.dart'; -class PatientSearchViewModel extends BaseViewModel{ +class PatientSearchViewModel extends BaseViewModel { OutPatientService _outPatientService = locator(); List get patientList => _outPatientService.patientList; @@ -24,10 +24,14 @@ class PatientSearchViewModel extends BaseViewModel{ if (strExist) { filterData = []; for (var i = 0; i < _outPatientService.patientList.length; i++) { - String firstName = _outPatientService.patientList[i].firstName.toUpperCase(); - String lastName = _outPatientService.patientList[i].lastName.toUpperCase(); - String mobile = _outPatientService.patientList[i].mobileNumber.toUpperCase(); - String patientID = _outPatientService.patientList[i].patientId.toString(); + String firstName = + _outPatientService.patientList[i].firstName.toUpperCase(); + String lastName = + _outPatientService.patientList[i].lastName.toUpperCase(); + String mobile = + _outPatientService.patientList[i].mobileNumber.toUpperCase(); + String patientID = + _outPatientService.patientList[i].patientId.toString(); if (firstName.contains(str.toUpperCase()) || lastName.contains(str.toUpperCase()) || @@ -43,19 +47,19 @@ class PatientSearchViewModel extends BaseViewModel{ } } - getOutPatient(PatientSearchRequestModel patientSearchRequestModel , {bool isLocalBusy = false}) async { - if(isLocalBusy) { + getOutPatient(PatientSearchRequestModel patientSearchRequestModel, + {bool isLocalBusy = false}) async { + if (isLocalBusy) { setState(ViewState.BusyLocal); } else { setState(ViewState.Busy); } - await getDoctorProfile(isGetProfile: true); + await getDoctorProfile(isGetProfile: true); patientSearchRequestModel.doctorID = doctorProfile.doctorID; - await _outPatientService.getOutPatient( - patientSearchRequestModel); + await _outPatientService.getOutPatient(patientSearchRequestModel); if (_outPatientService.hasError) { error = _outPatientService.error; - if(isLocalBusy) { + if (isLocalBusy) { setState(ViewState.ErrorLocal); } else { setState(ViewState.Error); @@ -66,10 +70,11 @@ class PatientSearchViewModel extends BaseViewModel{ } } - getPatientFileInformation(PatientSearchRequestModel patientSearchRequestModel, {bool isLocalBusy = false}) async { + getPatientFileInformation(PatientSearchRequestModel patientSearchRequestModel, + {bool isLocalBusy = false}) async { setState(ViewState.Busy); - await _outPatientService.getPatientFileInformation( - patientSearchRequestModel); + await _outPatientService + .getPatientFileInformation(patientSearchRequestModel); if (_outPatientService.hasError) { error = _outPatientService.error; setState(ViewState.Error); @@ -79,30 +84,21 @@ class PatientSearchViewModel extends BaseViewModel{ } } - - - getPatientBasedOnDate ( - {item, PatientSearchRequestModel patientSearchRequestModel, PatientType selectedPatientType, - bool isSearchWithKeyInfo })async { + getPatientBasedOnDate( + {item, + PatientSearchRequestModel patientSearchRequestModel, + PatientType selectedPatientType, + bool isSearchWithKeyInfo}) async { String dateTo; String dateFrom; if (item == 'Previous') { - - selectedFromDate = DateTime(DateTime.now().year, DateTime.now().month-1, - DateTime.now().day); - selectedToDate = DateTime(DateTime.now().year, DateTime.now().month, - DateTime.now().day-1); - dateTo = DateUtils.convertDateToFormat( - selectedToDate, - 'yyyy-MM-dd'); - dateFrom = DateUtils.convertDateToFormat( - selectedFromDate, - 'yyyy-MM-dd'); - - + selectedFromDate = DateTime( + DateTime.now().year, DateTime.now().month - 1, DateTime.now().day); + selectedToDate = DateTime( + DateTime.now().year, DateTime.now().month, DateTime.now().day - 1); + dateTo = DateUtils.convertDateToFormat(selectedToDate, 'yyyy-MM-dd'); + dateFrom = DateUtils.convertDateToFormat(selectedFromDate, 'yyyy-MM-dd'); } else if (item == 'Next Week') { - - dateTo = DateUtils.convertDateToFormat( DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 6), @@ -117,35 +113,32 @@ class PatientSearchViewModel extends BaseViewModel{ DateTime( DateTime.now().year, DateTime.now().month, DateTime.now().day), 'yyyy-MM-dd'); - dateTo= DateUtils.convertDateToFormat( + dateTo = DateUtils.convertDateToFormat( DateTime( DateTime.now().year, DateTime.now().month, DateTime.now().day), 'yyyy-MM-dd'); } PatientSearchRequestModel currentModel = PatientSearchRequestModel(); - currentModel.patientID = patientSearchRequestModel.patientID; - currentModel.firstName = patientSearchRequestModel.firstName; - currentModel.lastName = patientSearchRequestModel.lastName; + currentModel.patientID = patientSearchRequestModel.patientID; + currentModel.firstName = patientSearchRequestModel.firstName; + currentModel.lastName = patientSearchRequestModel.lastName; currentModel.middleName = patientSearchRequestModel.middleName; currentModel.doctorID = patientSearchRequestModel.doctorID; currentModel.from = dateFrom; currentModel.to = dateTo; await getOutPatient(currentModel, isLocalBusy: true); filterData = _outPatientService.patientList; - } - - PatientInPatientService _inPatientService = - locator(); + locator(); List get _inPatientList => _inPatientService.inPatientList; List filteredInPatientItems = List(); Future getInPatientList(PatientSearchRequestModel requestModel, {bool isMyInpatient = false, bool isFirstTime = true}) async { - await getDoctorProfile(); + await getDoctorProfile(); if (isFirstTime) setState(ViewState.Busy); else @@ -181,12 +174,9 @@ class PatientSearchViewModel extends BaseViewModel{ } notifyListeners(); } else { - if (_inPatientList.length > 0) - filteredInPatientItems.clear(); - filteredInPatientItems.addAll(_inPatientList); + if (_inPatientList.length > 0) filteredInPatientItems.clear(); + filteredInPatientItems.addAll(_inPatientList); notifyListeners(); } } - - } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index 274c983f..d73a6ab7 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/service/SOAP_service.dart'; -import 'package:doctor_app_flutter/core/service/prescription_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/soap/SOAP_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart'; @@ -39,10 +39,10 @@ class SOAPViewModel extends BaseViewModel { List get allergySeverityList => _SOAPService.allergySeverityList; - List get historyFamilyList => _SOAPService.historyFamilyList; - List get historyMedicalList => _SOAPService.historyMedicalList; + List get historyMedicalList => + _SOAPService.historyMedicalList; List get historySportList => _SOAPService.historySportList; @@ -82,8 +82,7 @@ class SOAPViewModel extends BaseViewModel { List get patientAssessmentList => _SOAPService.patientAssessmentList; - int get episodeID => - _SOAPService.episodeID; + int get episodeID => _SOAPService.episodeID; get medicationStrengthList => _SOAPService.medicationStrengthListWithModel; get medicationDoseTimeList => _SOAPService.medicationDoseTimeListWithModel; @@ -102,11 +101,12 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getMasterLookup(MasterKeysService masterKeys, {bool isBusyLocal = false}) async { - if(isBusyLocal){ + Future getMasterLookup(MasterKeysService masterKeys, + {bool isBusyLocal = false}) async { + if (isBusyLocal) { + setState(ViewState.Busy); + } else setState(ViewState.Busy); - }else - setState(ViewState.Busy); await _SOAPService.getMasterLookup(masterKeys); if (_SOAPService.hasError) { error = _SOAPService.error; @@ -115,7 +115,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async { setState(ViewState.BusyLocal); await _SOAPService.postEpisode(postEpisodeReqModel); @@ -136,7 +135,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postHistories(PostHistoriesRequestModel postHistoriesRequestModel) async { + Future postHistories( + PostHistoriesRequestModel postHistoriesRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postHistories(postHistoriesRequestModel); if (_SOAPService.hasError) { @@ -146,7 +146,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postChiefComplaint(PostChiefComplaintRequestModel postChiefComplaintRequestModel) async { + Future postChiefComplaint( + PostChiefComplaintRequestModel postChiefComplaintRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postChiefComplaint(postChiefComplaintRequestModel); if (_SOAPService.hasError) { @@ -156,7 +157,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postPhysicalExam(PostPhysicalExamRequestModel postPhysicalExamRequestModel) async { + Future postPhysicalExam( + PostPhysicalExamRequestModel postPhysicalExamRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postPhysicalExam(postPhysicalExamRequestModel); if (_SOAPService.hasError) { @@ -166,7 +168,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postProgressNote(PostProgressNoteRequestModel postProgressNoteRequestModel) async { + Future postProgressNote( + PostProgressNoteRequestModel postProgressNoteRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postProgressNote(postProgressNoteRequestModel); if (_SOAPService.hasError) { @@ -176,7 +179,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future postAssessment(PostAssessmentRequestModel postAssessmentRequestModel) async { + Future postAssessment( + PostAssessmentRequestModel postAssessmentRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.postAssessment(postAssessmentRequestModel); if (_SOAPService.hasError) { @@ -186,7 +190,6 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchAllergy(PostAllergyRequestModel patchAllergyRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchAllergy(patchAllergyRequestModel); @@ -197,7 +200,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchHistories(PostHistoriesRequestModel patchHistoriesRequestModel) async { + Future patchHistories( + PostHistoriesRequestModel patchHistoriesRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchHistories(patchHistoriesRequestModel); if (_SOAPService.hasError) { @@ -207,7 +211,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchChiefComplaint(PostChiefComplaintRequestModel patchChiefComplaintRequestModel) async { + Future patchChiefComplaint( + PostChiefComplaintRequestModel patchChiefComplaintRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchChiefComplaint(patchChiefComplaintRequestModel); if (_SOAPService.hasError) { @@ -217,7 +222,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchPhysicalExam(PostPhysicalExamRequestModel patchPhysicalExamRequestModel) async { + Future patchPhysicalExam( + PostPhysicalExamRequestModel patchPhysicalExamRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchPhysicalExam(patchPhysicalExamRequestModel); if (_SOAPService.hasError) { @@ -227,7 +233,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchProgressNote(PostProgressNoteRequestModel patchProgressNoteRequestModel) async { + Future patchProgressNote( + PostProgressNoteRequestModel patchProgressNoteRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchProgressNote(patchProgressNoteRequestModel); if (_SOAPService.hasError) { @@ -237,7 +244,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future patchAssessment(PatchAssessmentReqModel patchAssessmentRequestModel) async { + Future patchAssessment( + PatchAssessmentReqModel patchAssessmentRequestModel) async { setState(ViewState.BusyLocal); await _SOAPService.patchAssessment(patchAssessmentRequestModel); if (_SOAPService.hasError) { @@ -259,7 +267,7 @@ class SOAPViewModel extends BaseViewModel { if (isLocalBusy) { setState(ViewState.ErrorLocal); } else - setState(ViewState.Error); + setState(ViewState.Error); } else setState(ViewState.Idle); } @@ -271,16 +279,19 @@ class SOAPViewModel extends BaseViewModel { masterKeys: MasterKeysService.Allergies, id: element.allergyDiseaseId, typeId: element.allergyDiseaseType); - if(selectedAllergy != null && element.isChecked) - allergiesString += - (isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn )+ ' , '; + if (selectedAllergy != null && element.isChecked) + allergiesString += + (isArabic ? selectedAllergy.nameAr : selectedAllergy.nameEn) + + ' , '; }); return allergiesString; } - Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, {bool isFirst = false}) async { + Future getPatientHistories(GetHistoryReqModel getHistoryReqModel, + {bool isFirst = false}) async { setState(ViewState.Busy); - await _SOAPService.getPatientHistories(getHistoryReqModel, isFirst: isFirst); + await _SOAPService.getPatientHistories(getHistoryReqModel, + isFirst: isFirst); if (_SOAPService.hasError) { error = _SOAPService.error; setState(ViewState.Error); @@ -299,7 +310,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientPhysicalExam(GetPhysicalExamReqModel getPhysicalExamReqModel) async { + Future getPatientPhysicalExam( + GetPhysicalExamReqModel getPhysicalExamReqModel) async { setState(ViewState.Busy); await _SOAPService.getPatientPhysicalExam(getPhysicalExamReqModel); if (_SOAPService.hasError) { @@ -309,7 +321,8 @@ class SOAPViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future getPatientProgressNote(GetGetProgressNoteReqModel getGetProgressNoteReqModel) async { + Future getPatientProgressNote( + GetGetProgressNoteReqModel getGetProgressNoteReqModel) async { setState(ViewState.Busy); await _SOAPService.getPatientProgressNote(getGetProgressNoteReqModel); if (_SOAPService.hasError) { @@ -339,6 +352,7 @@ class SOAPViewModel extends BaseViewModel { } else setState(ViewState.Idle); } + // ignore: missing_return MasterKeyModel getOneMasterKey( {@required MasterKeysService masterKeys, dynamic id, int typeId}) { @@ -391,7 +405,8 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.HistorySurgical: List result = historySurgicalList.where((element) { - return element.id == id;}).toList(); + return element.id == id; + }).toList(); if (result.isNotEmpty) { return result.first; } @@ -414,12 +429,12 @@ class SOAPViewModel extends BaseViewModel { return result.first; } break; - // case MasterKeysService.physiotherapyGoals: - // listOfPhysiotherapyGoals.clear(); - // entryList.forEach((v) { - // listOfPhysiotherapyGoals.add(MasterKeyModel.fromJson(v)); - // }); - // break; + // case MasterKeysService.physiotherapyGoals: + // listOfPhysiotherapyGoals.clear(); + // entryList.forEach((v) { + // listOfPhysiotherapyGoals.add(MasterKeyModel.fromJson(v)); + // }); + // break; case MasterKeysService.DiagnosisType: List result = listOfDiagnosisType.where((element) { @@ -441,7 +456,7 @@ class SOAPViewModel extends BaseViewModel { break; case MasterKeysService.ICD10: List result = listOfICD10.where((element) { - return element.code == id ; + return element.code == id; }).toList(); if (result.isNotEmpty) { return result.first; @@ -450,6 +465,4 @@ class SOAPViewModel extends BaseViewModel { break; } } - - } diff --git a/lib/core/viewModel/auth_view_model.dart b/lib/core/viewModel/auth_view_model.dart index 4e40fe31..1b79b051 100644 --- a/lib/core/viewModel/auth_view_model.dart +++ b/lib/core/viewModel/auth_view_model.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/core/model/imei_details.dart'; -import 'package:doctor_app_flutter/core/model/insert_imei_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/insert_imei_model.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index fede0793..178713c5 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/dasboard_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/dasboard_service.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index 6da7d904..e0c63a76 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/doctor_reply_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; @@ -8,7 +8,8 @@ import 'base_view_model.dart'; class DoctorReplayViewModel extends BaseViewModel { DoctorReplyService _doctorReplyService = locator(); - List get listDoctorWorkingHoursTable => _doctorReplyService.listDoctorWorkingHoursTable; + List get listDoctorWorkingHoursTable => + _doctorReplyService.listDoctorWorkingHoursTable; Future getDoctorReply() async { setState(ViewState.Busy); @@ -20,7 +21,8 @@ class DoctorReplayViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future replay(String referredDoctorRemarks, ListGtMyPatientsQuestions model) async { + Future replay( + String referredDoctorRemarks, ListGtMyPatientsQuestions model) async { setState(ViewState.BusyLocal); await _doctorReplyService.replay(referredDoctorRemarks, model); if (_doctorReplyService.hasError) { diff --git a/lib/core/viewModel/imei_view_model.dart b/lib/core/viewModel/imei_view_model.dart index c2d16206..63b26e98 100644 --- a/lib/core/viewModel/imei_view_model.dart +++ b/lib/core/viewModel/imei_view_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/imei_details.dart'; -import 'package:doctor_app_flutter/core/service/auth_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 020a6184..071ebad6 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_special_result.dart'; -import 'package:doctor_app_flutter/core/service/labs_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/lab_order/labs_service.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; @@ -116,10 +116,14 @@ class LabsViewModel extends BaseViewModel { } getPatientLabResult( - {PatientLabOrders patientLabOrder, PatiantInformtion patient, bool isInpatient}) async { + {PatientLabOrders patientLabOrder, + PatiantInformtion patient, + bool isInpatient}) async { setState(ViewState.Busy); await _labsService.getPatientLabResult( - patientLabOrder: patientLabOrder, patient: patient, isInpatient: isInpatient); + patientLabOrder: patientLabOrder, + patient: patient, + isInpatient: isInpatient); if (_labsService.hasError) { error = _labsService.error; setState(ViewState.Error); diff --git a/lib/core/viewModel/medical_file_view_model.dart b/lib/core/viewModel/medical_file_view_model.dart index 194e8323..0e2c724f 100644 --- a/lib/core/viewModel/medical_file_view_model.dart +++ b/lib/core/viewModel/medical_file_view_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/medical_file_model.dart'; -import 'package:doctor_app_flutter/core/service/medical_file_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index c318d401..b57b2ad5 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/service/medicine_service.dart'; -import 'package:doctor_app_flutter/core/service/prescription_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/medicine_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; diff --git a/lib/core/viewModel/patient-admission-request-viewmodel.dart b/lib/core/viewModel/patient-admission-request-viewmodel.dart index 9d43ec48..61334494 100644 --- a/lib/core/viewModel/patient-admission-request-viewmodel.dart +++ b/lib/core/viewModel/patient-admission-request-viewmodel.dart @@ -1,38 +1,43 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart'; -import 'package:doctor_app_flutter/core/service/patient-admission-request-service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/admission_request/patient-admission-request-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import '../../locator.dart'; -class AdmissionRequestViewModel extends BaseViewModel{ - - AdmissionRequestService _admissionRequestService = locator(); +class AdmissionRequestViewModel extends BaseViewModel { + AdmissionRequestService _admissionRequestService = + locator(); List get clinicList => _admissionRequestService.clinicList; List get doctorsList => _admissionRequestService.doctorsList; - List get speciality => _admissionRequestService.specialityList; + List get speciality => _admissionRequestService.specialityList; - List get floorList => _admissionRequestService.floorList; + List get floorList => _admissionRequestService.floorList; - List get wardList => _admissionRequestService.wardList; + List get wardList => _admissionRequestService.wardList; - List get roomCategoryList => _admissionRequestService.roomCategoryList; + List get roomCategoryList => + _admissionRequestService.roomCategoryList; - List get admissionTypeList => _admissionRequestService.listOfAdmissionType; + List get admissionTypeList => + _admissionRequestService.listOfAdmissionType; - List get diagnosisTypesList => _admissionRequestService.diagnosisTypesList; + List get diagnosisTypesList => + _admissionRequestService.diagnosisTypesList; - List get allergiesList => _admissionRequestService.allergiesLookupList; + List get allergiesList => + _admissionRequestService.allergiesLookupList; - List get dietTypesList => _admissionRequestService.dietTypesList; + List get dietTypesList => _admissionRequestService.dietTypesList; - List get icdCodes => _admissionRequestService.icdCodes; + List get icdCodes => _admissionRequestService.icdCodes; - List get listOfDiagnosisSelectionTypes => _admissionRequestService.listOfDiagnosisSelectionTypes; + List get listOfDiagnosisSelectionTypes => + _admissionRequestService.listOfDiagnosisSelectionTypes; AdmissionRequest admissionRequestData; @@ -131,7 +136,7 @@ class AdmissionRequestViewModel extends BaseViewModel{ setState(ViewState.Idle); } - Future makeAdmissionRequest() async{ + Future makeAdmissionRequest() async { setState(ViewState.Busy); await _admissionRequestService.makeAdmissionRequest(admissionRequestData); if (_admissionRequestService.hasError) { @@ -151,4 +156,4 @@ class AdmissionRequestViewModel extends BaseViewModel{ setState(ViewState.Idle); } } -} \ No newline at end of file +} diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index aaa0d35e..67544e6f 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -1,11 +1,11 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/DischargeReferralPatient.dart'; -import 'package:doctor_app_flutter/core/model/MyReferralPatientModel.dart'; -import 'package:doctor_app_flutter/core/service/DischargedPatientService.dart'; -import 'package:doctor_app_flutter/core/service/MyReferralPatientService.dart'; -import 'package:doctor_app_flutter/core/service/ReferralService.dart'; -import 'package:doctor_app_flutter/core/service/patient-doctor-referral-service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/DischargedPatientService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/MyReferralPatientService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/ReferralService.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient-doctor-referral-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; @@ -26,7 +26,8 @@ class PatientReferralViewModel extends BaseViewModel { MyReferralInPatientService _myReferralService = locator(); - DischargedPatientService _dischargedPatientService = locator(); + DischargedPatientService _dischargedPatientService = + locator(); List get myDischargeReferralPatient => _dischargedPatientService.myDischargeReferralPatients; @@ -165,9 +166,11 @@ class PatientReferralViewModel extends BaseViewModel { } else setState(ViewState.Idle); } - Future replay(String referredDoctorRemarks, MyReferralPatientModel referral) async{ + + Future replay( + String referredDoctorRemarks, MyReferralPatientModel referral) async { setState(ViewState.Busy); - await _myReferralService.replay(referredDoctorRemarks,referral); + await _myReferralService.replay(referredDoctorRemarks, referral); if (_myReferralService.hasError) { error = _myReferralService.error; setState(ViewState.ErrorLocal); @@ -366,7 +369,8 @@ class PatientReferralViewModel extends BaseViewModel { patient.roomId = referredPatient.roomID; patient.bedId = referredPatient.bedID; patient.nationalityName = referredPatient.nationalityName; - patient.nationalityFlagURL = '';// TODO from backend referredPatient.nationalityFlagURL; + patient.nationalityFlagURL = + ''; // TODO from backend referredPatient.nationalityFlagURL; patient.age = referredPatient.age; patient.clinicDescription = referredPatient.clinicDescription; return patient; diff --git a/lib/core/viewModel/patient-ucaf-viewmodel.dart b/lib/core/viewModel/patient-ucaf-viewmodel.dart index dc76884d..301902a6 100644 --- a/lib/core/viewModel/patient-ucaf-viewmodel.dart +++ b/lib/core/viewModel/patient-ucaf-viewmodel.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/prescription_model.dart'; -import 'package:doctor_app_flutter/core/service/patient-ucaf-service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; @@ -45,7 +45,7 @@ class UcafViewModel extends BaseViewModel { String respirationBeatPerMinute = "0"; String bloodPressure = "0 / 0"; - resetDataInFirst(){ + resetDataInFirst() { _ucafService.patientAssessmentList = []; _ucafService.orderProcedureList = []; _ucafService.prescriptionList = null; diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index 59b13fe8..bb8367a6 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/patient-vital-signs-service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart'; @@ -52,12 +52,10 @@ class VitalSignsViewModel extends BaseViewModel { to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); } - if (isInPatient) { await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); } else { - await _vitalSignService.getOutPatientVitalSignHistory(patient, from, to); - + await _vitalSignService.getOutPatientVitalSignHistory(patient, from, to); } if (_vitalSignService.hasError) { @@ -97,7 +95,7 @@ class VitalSignsViewModel extends BaseViewModel { oxygenation == null || oxygenation == 'null') { oxygenation = - "${element.sAO2.toString()}";/* - ${element.fIO2.toString()}*/ + "${element.sAO2.toString()}"; /* - ${element.fIO2.toString()}*/ } if (painScore == null || painScore == "-") { painScore = element.painScore.toString() != 'null' diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index 3a45036e..ce34e566 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/note/CreateNoteModel.dart'; import 'package:doctor_app_flutter/core/model/note/note_model.dart'; import 'package:doctor_app_flutter/core/model/note/update_note_model.dart'; -import 'package:doctor_app_flutter/core/service/patient_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient_service.dart'; import 'package:doctor_app_flutter/models/patient/lab_orders/lab_orders_res_model.dart'; import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; import 'package:doctor_app_flutter/models/patient/prescription/prescription_report.dart'; @@ -42,7 +42,8 @@ class PatientViewModel extends BaseViewModel { get insuranceApporvalsList => _patientService.insuranceApporvalsList; - List get patientProgressNoteList => _patientService.patientProgressNoteList; + List get patientProgressNoteList => + _patientService.patientProgressNoteList; List get clinicsList => _patientService.clinicsList; @@ -65,7 +66,7 @@ class PatientViewModel extends BaseViewModel { if (_patientService.hasError) { error = _patientService.error; setState(ViewState.Error); - } else{ + } else { setState(ViewState.Idle); } return localRes; @@ -142,18 +143,18 @@ class PatientViewModel extends BaseViewModel { } Future getPatientProgressNote(patient, {bool isLocalBusy = false}) async { - if(isLocalBusy) { + if (isLocalBusy) { setState(ViewState.BusyLocal); - }else{ + } else { setState(ViewState.Busy); } await _patientService.getPatientProgressNote(patient); if (_patientService.hasError) { error = _patientService.error; - if(isLocalBusy) { + if (isLocalBusy) { setState(ViewState.ErrorLocal); - }else{ + } else { setState(ViewState.Error); } } else diff --git a/lib/core/viewModel/prescription_view_model.dart b/lib/core/viewModel/prescription_view_model.dart index c549b2b0..2e959a3d 100644 --- a/lib/core/viewModel/prescription_view_model.dart +++ b/lib/core/viewModel/prescription_view_model.dart @@ -7,10 +7,10 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_in_pati import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart'; -import 'package:doctor_app_flutter/core/service/prescription_service.dart'; -import 'package:doctor_app_flutter/core/service/prescriptions_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart'; @@ -59,7 +59,7 @@ class PrescriptionViewModel extends BaseViewModel { getPrescriptionsInPatient(PatiantInformtion patient) async { setState(ViewState.Busy); - error=""; + error = ""; await _prescriptionsService.getPrescriptionInPatient( mrn: patient.patientId, adn: patient.admissionNo); if (_prescriptionsService.hasError) { diff --git a/lib/core/viewModel/prescriptions_view_model.dart b/lib/core/viewModel/prescriptions_view_model.dart index 916a6563..4554a48d 100644 --- a/lib/core/viewModel/prescriptions_view_model.dart +++ b/lib/core/viewModel/prescriptions_view_model.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/perscription_pharmac import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart'; -import 'package:doctor_app_flutter/core/service/prescriptions_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:flutter/material.dart'; @@ -19,16 +19,16 @@ class PrescriptionsViewModel extends BaseViewModel { List _prescriptionsOrderListClinic = List(); List _prescriptionsOrderListHospital = List(); - List get prescriptionReportList => _prescriptionsService.prescriptionReportList; List get prescriptionsList => _prescriptionsService.prescriptionsList; - List get pharmacyPrescriptionsList => _prescriptionsService.pharmacyPrescriptionsList ; - List get prescriptionReportEnhList => _prescriptionsService.prescriptionReportEnhList; - + List get pharmacyPrescriptionsList => + _prescriptionsService.pharmacyPrescriptionsList; + List get prescriptionReportEnhList => + _prescriptionsService.prescriptionReportEnhList; List get prescriptionsOrderList => filterType == FilterType.Clinic @@ -48,6 +48,7 @@ class PrescriptionsViewModel extends BaseViewModel { setState(ViewState.Idle); } } + _getPrescriptionsOrders() async { await _prescriptionsService.getPrescriptionsOrders(); if (_prescriptionsService.hasError) { @@ -97,15 +98,17 @@ class PrescriptionsViewModel extends BaseViewModel { }); } - setFilterType(FilterType filterType) { this.filterType = filterType; notifyListeners(); } - getPrescriptionReport({Prescriptions prescriptions,@required PatiantInformtion patient}) async { + getPrescriptionReport( + {Prescriptions prescriptions, + @required PatiantInformtion patient}) async { setState(ViewState.Busy); - await _prescriptionsService.getPrescriptionReport(prescriptions: prescriptions,patient: patient); + await _prescriptionsService.getPrescriptionReport( + prescriptions: prescriptions, patient: patient); if (_prescriptionsService.hasError) { error = _prescriptionsService.error; setState(ViewState.ErrorLocal); @@ -114,11 +117,11 @@ class PrescriptionsViewModel extends BaseViewModel { } } - - - getListPharmacyForPrescriptions({int itemId,@required PatiantInformtion patient}) async { + getListPharmacyForPrescriptions( + {int itemId, @required PatiantInformtion patient}) async { setState(ViewState.Busy); - await _prescriptionsService.getListPharmacyForPrescriptions(itemId: itemId,patient: patient); + await _prescriptionsService.getListPharmacyForPrescriptions( + itemId: itemId, patient: patient); if (_prescriptionsService.hasError) { error = _prescriptionsService.error; setState(ViewState.Error); @@ -127,11 +130,12 @@ class PrescriptionsViewModel extends BaseViewModel { } } - - - getPrescriptionReportEnh({PrescriptionsOrder prescriptionsOrder,@required PatiantInformtion patient}) async { + getPrescriptionReportEnh( + {PrescriptionsOrder prescriptionsOrder, + @required PatiantInformtion patient}) async { setState(ViewState.Busy); - await _prescriptionsService.getPrescriptionReportEnh(prescriptionsOrder: prescriptionsOrder,patient: patient); + await _prescriptionsService.getPrescriptionReportEnh( + prescriptionsOrder: prescriptionsOrder, patient: patient); if (_prescriptionsService.hasError) { error = _prescriptionsService.error; setState(ViewState.Error); @@ -139,7 +143,4 @@ class PrescriptionsViewModel extends BaseViewModel { setState(ViewState.Idle); } } - - - } diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 8717c84b..1cd0be2f 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -11,9 +11,9 @@ import 'package:doctor_app_flutter/core/model/procedure/procedure_valadate_model import 'package:doctor_app_flutter/core/model/procedure/procedure_valadate_request_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request_model.dart'; import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; -import 'package:doctor_app_flutter/core/service/labs_service.dart'; -import 'package:doctor_app_flutter/core/service/procedure_service.dart'; -import 'package:doctor_app_flutter/core/service/radiology_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/lab_order/labs_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/procedure/procedure_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/radiology/radiology_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -43,7 +43,8 @@ class ProcedureViewModel extends BaseViewModel { List get radiologyList => _radiologyService.finalRadiologyList; - List get patientLabOrdersList => _labsService.patientLabOrdersList; + List get patientLabOrdersList => + _labsService.patientLabOrdersList; List get labOrdersResultsList => _labsService.labOrdersResultsList; @@ -51,16 +52,14 @@ class ProcedureViewModel extends BaseViewModel { List _patientLabOrdersListClinic = List(); List _patientLabOrdersListHospital = List(); - - - Future getProcedure({int mrn,String patientType}) async { + Future getProcedure({int mrn, String patientType}) async { hasError = false; //_insuranceCardService.clearInsuranceCard(); setState(ViewState.Busy); await _procedureService.getProcedure(mrn: mrn); if (_procedureService.hasError) { error = _procedureService.error; - if(patientType=="7") + if (patientType == "7") setState(ViewState.ErrorLocal); else setState(ViewState.Error); @@ -135,15 +134,16 @@ class ProcedureViewModel extends BaseViewModel { } else setState(ViewState.Idle); //await getProcedure(mrn: mrn); - } - void getPatientRadOrders(PatiantInformtion patient,{String patientType, bool isInPatient = false}) async { + void getPatientRadOrders(PatiantInformtion patient, + {String patientType, bool isInPatient = false}) async { setState(ViewState.Busy); - await _radiologyService.getPatientRadOrders(patient, isInPatient:isInPatient); + await _radiologyService.getPatientRadOrders(patient, + isInPatient: isInPatient); if (_radiologyService.hasError) { error = _radiologyService.error; - if(patientType=="7") + if (patientType == "7") setState(ViewState.ErrorLocal); else setState(ViewState.ErrorLocal); @@ -221,8 +221,6 @@ class ProcedureViewModel extends BaseViewModel { List labResultLists = List(); - - List get labResultListsCoustom { return labResultLists; } @@ -232,7 +230,7 @@ class ProcedureViewModel extends BaseViewModel { await _labsService.getPatientLabOrdersList(patient, isInpatient); if (_labsService.hasError) { error = _labsService.error; - setState(ViewState.Error); + setState(ViewState.Error); } else { setState(ViewState.Idle); } diff --git a/lib/core/viewModel/radiology_view_model.dart b/lib/core/viewModel/radiology_view_model.dart index 4e3768dc..92d4c344 100644 --- a/lib/core/viewModel/radiology_view_model.dart +++ b/lib/core/viewModel/radiology_view_model.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; -import 'package:doctor_app_flutter/core/service/radiology_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/radiology/radiology_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:flutter/foundation.dart'; @@ -20,9 +20,11 @@ class RadiologyViewModel extends BaseViewModel { ? _finalRadiologyListClinic : _finalRadiologyListHospital; - void getPatientRadOrders(PatiantInformtion patient, {isInPatient = false}) async { + void getPatientRadOrders(PatiantInformtion patient, + {isInPatient = false}) async { setState(ViewState.Busy); - await _radiologyService.getPatientRadOrders(patient, isInPatient:isInPatient); + await _radiologyService.getPatientRadOrders(patient, + isInPatient: isInPatient); if (_radiologyService.hasError) { error = _radiologyService.error; setState(ViewState.Error); diff --git a/lib/core/viewModel/referral_view_model.dart b/lib/core/viewModel/referral_view_model.dart index 2e99cc3a..6c2b2858 100644 --- a/lib/core/viewModel/referral_view_model.dart +++ b/lib/core/viewModel/referral_view_model.dart @@ -1,14 +1,16 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/referral_patient_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/referral_patient_service.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; class ReferralPatientViewModel extends BaseViewModel { - ReferralPatientService _referralPatientService = locator(); + ReferralPatientService _referralPatientService = + locator(); - List get listMyReferralPatientModel => _referralPatientService.listMyReferralPatientModel; + List get listMyReferralPatientModel => + _referralPatientService.listMyReferralPatientModel; Future getMyReferralPatient() async { setState(ViewState.Busy); @@ -20,7 +22,8 @@ class ReferralPatientViewModel extends BaseViewModel { setState(ViewState.Idle); } - Future replay(String referredDoctorRemarks, MyReferralPatientModel model) async { + Future replay( + String referredDoctorRemarks, MyReferralPatientModel model) async { setState(ViewState.BusyLocal); await _referralPatientService.replay(referredDoctorRemarks, model); if (_referralPatientService.hasError) { diff --git a/lib/core/viewModel/referred_view_model.dart b/lib/core/viewModel/referred_view_model.dart index 2aa996f6..f77ea922 100644 --- a/lib/core/viewModel/referred_view_model.dart +++ b/lib/core/viewModel/referred_view_model.dart @@ -1,14 +1,16 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/referred_patient_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/referred_patient_service.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; class ReferredPatientViewModel extends BaseViewModel { - ReferredPatientService _referralPatientService = locator(); + ReferredPatientService _referralPatientService = + locator(); - List get listMyReferredPatientModel => _referralPatientService.listMyReferredPatientModel; + List get listMyReferredPatientModel => + _referralPatientService.listMyReferredPatientModel; Future getMyReferredPatient() async { setState(ViewState.Busy); @@ -19,5 +21,4 @@ class ReferredPatientViewModel extends BaseViewModel { } else setState(ViewState.Idle); } - } diff --git a/lib/core/viewModel/schedule_view_model.dart b/lib/core/viewModel/schedule_view_model.dart index 8aebc4cb..d0e58535 100644 --- a/lib/core/viewModel/schedule_view_model.dart +++ b/lib/core/viewModel/schedule_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/schedule_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; import '../../locator.dart'; @@ -8,7 +8,8 @@ import 'base_view_model.dart'; class ScheduleViewModel extends BaseViewModel { ScheduleService _scheduleService = locator(); - List get listDoctorWorkingHoursTable => _scheduleService.listDoctorWorkingHoursTable; + List get listDoctorWorkingHoursTable => + _scheduleService.listDoctorWorkingHoursTable; Future getDoctorSchedule() async { setState(ViewState.Busy); diff --git a/lib/core/viewModel/sick_leave_view_model.dart b/lib/core/viewModel/sick_leave_view_model.dart index bc80744f..e69eb5bf 100644 --- a/lib/core/viewModel/sick_leave_view_model.dart +++ b/lib/core/viewModel/sick_leave_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/service/sickleave_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart'; import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; diff --git a/lib/locator.dart b/lib/locator.dart index 13b51d95..9f22685a 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,10 +1,10 @@ -import 'package:doctor_app_flutter/core/service/auth_service.dart'; -import 'package:doctor_app_flutter/core/service/dasboard_service.dart'; -import 'package:doctor_app_flutter/core/service/medical_file_service.dart'; -import 'package:doctor_app_flutter/core/service/patient_service.dart'; -import 'package:doctor_app_flutter/core/service/prescription_service.dart'; -import 'package:doctor_app_flutter/core/service/procedure_service.dart'; -import 'package:doctor_app_flutter/core/service/sickleave_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/dasboard_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/procedure/procedure_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; @@ -14,26 +14,26 @@ import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:get_it/get_it.dart'; -import 'core/service/DischargedPatientService.dart'; -import 'core/service/InsuranceCardService.dart'; -import 'core/service/MyReferralPatientService.dart'; -import 'core/service/PatientMuseService.dart'; -import 'core/service/ReferralService.dart'; -import 'core/service/SOAP_service.dart'; -import 'core/service/doctor_reply_service.dart'; -import 'core/service/labs_service.dart'; -import 'core/service/medicine_service.dart'; -import 'core/service/patient-admission-request-service.dart'; -import 'core/service/patient-doctor-referral-service.dart'; -import 'core/service/patient-ucaf-service.dart'; -import 'core/service/patient-vital-signs-service.dart'; +import 'core/service/patient/DischargedPatientService.dart'; +import 'core/service/patient_medical_file/insurance/InsuranceCardService.dart'; +import 'core/service/patient/MyReferralPatientService.dart'; +import 'core/service/patient/PatientMuseService.dart'; +import 'core/service/patient/ReferralService.dart'; +import 'core/service/patient_medical_file/soap/SOAP_service.dart'; +import 'core/service/home/doctor_reply_service.dart'; +import 'core/service/patient_medical_file/lab_order/labs_service.dart'; +import 'core/service/patient_medical_file/prescription/medicine_service.dart'; +import 'core/service/patient_medical_file/admission_request/patient-admission-request-service.dart'; +import 'core/service/patient/patient-doctor-referral-service.dart'; +import 'core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; +import 'core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart'; import 'core/service/patient/out_patient_service.dart'; -import 'core/service/patientInPatientService.dart'; -import 'core/service/prescriptions_service.dart'; -import 'core/service/radiology_service.dart'; -import 'core/service/referral_patient_service.dart'; -import 'core/service/referred_patient_service.dart'; -import 'core/service/schedule_service.dart'; +import 'core/service/patient/patientInPatientService.dart'; +import 'core/service/patient_medical_file/prescription/prescriptions_service.dart'; +import 'core/service/patient_medical_file/radiology/radiology_service.dart'; +import 'core/service/patient/referral_patient_service.dart'; +import 'core/service/patient/referred_patient_service.dart'; +import 'core/service/home/schedule_service.dart'; import 'core/viewModel/DischargedPatientViewModel.dart'; import 'core/viewModel/InsuranceViewModel.dart'; import 'core/viewModel/PatientMuseViewModel.dart'; diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index fbba6360..a8e9dddc 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/core/service/auth_service.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart'; diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 36f86c85..5af5540f 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -3,7 +3,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index 3ce5c1be..34497b4f 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/medicine/pharmacies_list_screen.dart'; diff --git a/lib/screens/patients/PatientsInPatientScreen.dart b/lib/screens/patients/PatientsInPatientScreen.dart index 7d41b3cb..f2ea0f23 100644 --- a/lib/screens/patients/PatientsInPatientScreen.dart +++ b/lib/screens/patients/PatientsInPatientScreen.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; @@ -75,8 +75,7 @@ class _PatientInPatientScreenState extends State { Container( margin: EdgeInsets.all(16.0), child: AppTextFieldCustom( - hintText: TranslationBase.of(context) - .searchPatientName, + hintText: TranslationBase.of(context).searchPatientName, isTextFieldHasSuffix: true, suffixIcon: IconButton( icon: Icon( @@ -101,72 +100,94 @@ class _PatientInPatientScreenState extends State { // const SizedBox( // height: 16, // ), - ...List.generate(model.filteredInPatientItems.length, (index) { - if(_activeTab == 0) + ...List.generate( + model.filteredInPatientItems.length, (index) { + if (_activeTab == 0) return PatientCard( - patientInfo: model.filteredInPatientItems[index], + patientInfo: + model.filteredInPatientItems[index], patientType: "1", arrivalType: "1", isInpatient: true, - isMyPatient: model.filteredInPatientItems[index].doctorId==model.doctorProfile.doctorID, + isMyPatient: model + .filteredInPatientItems[index] + .doctorId == + model.doctorProfile.doctorID, onTap: () { - FocusScopeNode currentFocus = FocusScope.of(context); + FocusScopeNode currentFocus = + FocusScope.of(context); if (!currentFocus.hasPrimaryFocus) { currentFocus.unfocus(); } - Navigator.of(context) - .pushNamed(PATIENTS_PROFILE, arguments: { - "patient": model.filteredInPatientItems[index], - "patientType": "1", - "from": "0", - "to": "0", - "isSearch": false, - "isInpatient": true, - "arrivalType": "1", - }); + Navigator.of(context).pushNamed( + PATIENTS_PROFILE, + arguments: { + "patient": model + .filteredInPatientItems[index], + "patientType": "1", + "from": "0", + "to": "0", + "isSearch": false, + "isInpatient": true, + "arrivalType": "1", + }); }, ); - else if(model.filteredInPatientItems[index].doctorId==model.doctorProfile.doctorID && _activeTab==1) + else if (model.filteredInPatientItems[index] + .doctorId == + model.doctorProfile.doctorID && + _activeTab == 1) return PatientCard( - patientInfo: model.filteredInPatientItems[index], + patientInfo: + model.filteredInPatientItems[index], patientType: "1", arrivalType: "1", isInpatient: true, - isMyPatient: model.filteredInPatientItems[index].doctorId==model.doctorProfile.doctorID, + isMyPatient: model + .filteredInPatientItems[index] + .doctorId == + model.doctorProfile.doctorID, onTap: () { - FocusScopeNode currentFocus = FocusScope.of(context); + FocusScopeNode currentFocus = + FocusScope.of(context); if (!currentFocus.hasPrimaryFocus) { currentFocus.unfocus(); } - Navigator.of(context) - .pushNamed(PATIENTS_PROFILE, arguments: { - "patient": model.filteredInPatientItems[index], - "patientType": "1", - "from": "0", - "to": "0", - "isSearch": false, - "isInpatient": true, - "arrivalType": "1", - }); + Navigator.of(context).pushNamed( + PATIENTS_PROFILE, + arguments: { + "patient": model + .filteredInPatientItems[index], + "patientType": "1", + "from": "0", + "to": "0", + "isSearch": false, + "isInpatient": true, + "arrivalType": "1", + }); }, ); - else return SizedBox(); + else + return SizedBox(); }), - SizedBox(height: 15,) + SizedBox( + height: 15, + ) ], ), ), ), ) : Expanded( - child: SingleChildScrollView( - child: Container( - child: ErrorMessage( - error: TranslationBase.of(context).noDataAvailable)), + child: SingleChildScrollView( + child: Container( + child: ErrorMessage( + error: + TranslationBase.of(context).noDataAvailable)), + ), ), - ), ], ), ), @@ -201,13 +222,11 @@ class _PatientInPatientScreenState extends State { if (!currentFocus.hasPrimaryFocus) { currentFocus.unfocus(); } - if (_activeTab==0) { - GifLoaderDialogUtils.showMyDialog( - context); + if (_activeTab == 0) { + GifLoaderDialogUtils.showMyDialog(context); await model.getInPatientList(requestModel, - isMyInpatient: _activeTab == 1, isFirstTime: false); - GifLoaderDialogUtils.hideDialog( - context); + isMyInpatient: _activeTab == 1, isFirstTime: false); + GifLoaderDialogUtils.hideDialog(context); } }, child: Center( diff --git a/lib/screens/patients/ReferralDischargedPatientDetails.dart b/lib/screens/patients/ReferralDischargedPatientDetails.dart index 0b664d4b..e27b3033 100644 --- a/lib/screens/patients/ReferralDischargedPatientDetails.dart +++ b/lib/screens/patients/ReferralDischargedPatientDetails.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/DischargeReferralPatient.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -13,12 +13,12 @@ import 'package:flutter/material.dart'; import '../../routes.dart'; - - class ReferralDischargedPatientDetails extends StatelessWidget { final DischargeReferralPatient referredPatient; - ReferralDischargedPatientDetails(this.referredPatient,); + ReferralDischargedPatientDetails( + this.referredPatient, + ); @override Widget build(BuildContext context) { @@ -68,16 +68,19 @@ class ReferralDischargedPatientDetails extends StatelessWidget { InkWell( onTap: () { PatiantInformtion patient = - model.getPatientFromDischargeReferralPatient(referredPatient); + model.getPatientFromDischargeReferralPatient( + referredPatient); Navigator.of(context) .pushNamed(PATIENTS_PROFILE, arguments: { "patient": patient, "patientType": "1", "isInpatient": true, "arrivalType": "1", - "isDischargedPatient":true, - "from": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), - "to": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), + "isDischargedPatient": true, + "from": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), + "to": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), }); }, child: Icon( @@ -87,7 +90,6 @@ class ReferralDischargedPatientDetails extends StatelessWidget { ) ]), ), - Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -124,7 +126,9 @@ class ReferralDischargedPatientDetails extends StatelessWidget { : Colors.red[700], ), AppText( - DateUtils.getDayMonthYearDateFormatted(referredPatient.referralDate,), + DateUtils.getDayMonthYearDateFormatted( + referredPatient.referralDate, + ), fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 2.0 * SizeConfig.textMultiplier, @@ -132,7 +136,6 @@ class ReferralDischargedPatientDetails extends StatelessWidget { ) ], ), - Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -152,7 +155,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), @@ -177,7 +180,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), @@ -196,11 +199,11 @@ class ReferralDischargedPatientDetails extends StatelessWidget { ), Expanded( child: AppText( - "${DateUtils.convertStringToDate(referredPatient.dischargeDate).difference(DateUtils.convertStringToDate(referredPatient.admissionDate)).inDays+1}", + "${DateUtils.convertStringToDate(referredPatient.dischargeDate).difference(DateUtils.convertStringToDate(referredPatient.admissionDate)).inDays + 1}", fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), @@ -223,20 +226,19 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), ], ), - Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, children: [ Row( mainAxisAlignment: - MainAxisAlignment.start, + MainAxisAlignment.start, children: [ AppText( TranslationBase.of(context) @@ -244,7 +246,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: - 1.7 * SizeConfig.textMultiplier, + 1.7 * SizeConfig.textMultiplier, color: Color(0XFF575757), ), AppText( @@ -252,17 +254,16 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ], ), - ], ), Row( mainAxisAlignment: - MainAxisAlignment.spaceBetween, + MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded( @@ -270,7 +271,7 @@ class ReferralDischargedPatientDetails extends StatelessWidget { children: [ Row( mainAxisAlignment: - MainAxisAlignment.start, + MainAxisAlignment.start, children: [ AppText( "${TranslationBase.of(context).refClinic}: ", @@ -293,13 +294,13 @@ class ReferralDischargedPatientDetails extends StatelessWidget { ), Row( mainAxisAlignment: - MainAxisAlignment.start, + MainAxisAlignment.start, crossAxisAlignment: - CrossAxisAlignment.start, + CrossAxisAlignment.start, children: [ AppText( TranslationBase.of(context) - .frequency + + .frequency + ": ", fontFamily: 'Poppins', fontWeight: FontWeight.w600, @@ -343,13 +344,12 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), ], ), - Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -363,11 +363,12 @@ class ReferralDischargedPatientDetails extends StatelessWidget { ), Expanded( child: AppText( - referredPatient.referringClinicDescription, + referredPatient + .referringClinicDescription, fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), @@ -390,13 +391,12 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), ], ), - Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -414,15 +414,12 @@ class ReferralDischargedPatientDetails extends StatelessWidget { fontFamily: 'Poppins', fontWeight: FontWeight.w700, fontSize: - 1.8 * SizeConfig.textMultiplier, + 1.8 * SizeConfig.textMultiplier, color: Color(0XFF2E303A), ), ), ], ), - - - Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -462,40 +459,40 @@ class ReferralDischargedPatientDetails extends StatelessWidget { width: 30, ), ), - //TODO from backend - // Container( - // margin: EdgeInsets.only( - // left: 0, - // top: 25, - // right: 0, - // bottom: 0), - // padding: EdgeInsets.only( - // left: 4.0, right: 4.0), - // child: referredPatient.doctorImageURL != - // null - // ? ClipRRect( - // borderRadius: - // BorderRadius.circular(20.0), - // child: Image.network( - // referredPatient.doctorImageURL, - // height: 25, - // width: 30, - // errorBuilder: - // (BuildContext context, - // Object exception, - // StackTrace stackTrace) { - // return Text('No Image'); - // }, - // )) - // : Container( - // child: Image.asset( - // referredPatient.gender == 1 - // ? 'assets/images/male_avatar.png' - // : 'assets/images/female_avatar.png', - // fit: BoxFit.cover, - // ), - // ), - // ), + //TODO from backend + // Container( + // margin: EdgeInsets.only( + // left: 0, + // top: 25, + // right: 0, + // bottom: 0), + // padding: EdgeInsets.only( + // left: 4.0, right: 4.0), + // child: referredPatient.doctorImageURL != + // null + // ? ClipRRect( + // borderRadius: + // BorderRadius.circular(20.0), + // child: Image.network( + // referredPatient.doctorImageURL, + // height: 25, + // width: 30, + // errorBuilder: + // (BuildContext context, + // Object exception, + // StackTrace stackTrace) { + // return Text('No Image'); + // }, + // )) + // : Container( + // child: Image.asset( + // referredPatient.gender == 1 + // ? 'assets/images/male_avatar.png' + // : 'assets/images/female_avatar.png', + // fit: BoxFit.cover, + // ), + // ), + // ), Expanded( flex: 4, child: Container( @@ -575,13 +572,11 @@ class ReferralDischargedPatientDetails extends StatelessWidget { SizedBox( height: 8, ), - ], ), ), ), ), - ], ), ), diff --git a/lib/screens/patients/out_patient/filter_date_page.dart b/lib/screens/patients/out_patient/filter_date_page.dart index e4f28ac7..0f64fcad 100644 --- a/lib/screens/patients/out_patient/filter_date_page.dart +++ b/lib/screens/patients/out_patient/filter_date_page.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; @@ -16,7 +16,6 @@ class FilterDatePage extends StatefulWidget { final OutPatientFilterType outPatientFilterType; final PatientSearchViewModel patientSearchViewModel; - const FilterDatePage( {Key key, this.outPatientFilterType, this.patientSearchViewModel}) : super(key: key); @@ -34,19 +33,13 @@ class _FilterDatePageState extends State { @override Widget build(BuildContext context) { - var screenSize; return AppScaffold( isShowAppBar: false, - backgroundColor: Theme - .of(context) - .scaffoldBackgroundColor, + backgroundColor: Theme.of(context).scaffoldBackgroundColor, body: SingleChildScrollView( child: Container( - height: MediaQuery - .of(context) - .size - .height * 1.0, + height: MediaQuery.of(context).size.height * 1.0, child: Padding( padding: EdgeInsets.all(0.0), child: Column( @@ -54,7 +47,7 @@ class _FilterDatePageState extends State { children: [ BottomSheetTitle( title: (OutPatientFilterType.Previous == - widget.outPatientFilterType) + widget.outPatientFilterType) ? " Filter Previous Out Patient" : "Filter Nextweek Out Patient", ), @@ -69,24 +62,18 @@ class _FilterDatePageState extends State { Container( color: Colors.white, child: InkWell( - onTap: () => - selectDate( - context, firstDate: getFirstDate( - widget.outPatientFilterType), - lastDate: getLastDate( - widget.outPatientFilterType)), + onTap: () => selectDate(context, + firstDate: + getFirstDate(widget.outPatientFilterType), + lastDate: + getLastDate(widget.outPatientFilterType)), child: TextField( - decoration: - textFieldSelectorDecoration( - TranslationBase - .of( - context) - .fromDate, - widget.patientSearchViewModel.selectedFromDate != null - ? "${DateUtils - .convertStringToDateFormat( - widget.patientSearchViewModel.selectedFromDate.toString(), - "yyyy-MM-dd")}" + decoration: textFieldSelectorDecoration( + TranslationBase.of(context).fromDate, + widget.patientSearchViewModel + .selectedFromDate != + null + ? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedFromDate.toString(), "yyyy-MM-dd")}" : null, true, suffixIcon: Icon( @@ -97,29 +84,25 @@ class _FilterDatePageState extends State { ), ), ), - SizedBox(height: 10,), + SizedBox( + height: 10, + ), Container( color: Colors.white, child: InkWell( - onTap: () => - selectDate( - context, isFromDate: false, - firstDate: getFirstDate( - widget.outPatientFilterType), - lastDate: getLastDate( - widget.outPatientFilterType)), + onTap: () => selectDate(context, + isFromDate: false, + firstDate: + getFirstDate(widget.outPatientFilterType), + lastDate: + getLastDate(widget.outPatientFilterType)), child: TextField( - decoration: - textFieldSelectorDecoration( - TranslationBase - .of( - context) - .toDate, - widget.patientSearchViewModel.selectedToDate != null - ? "${DateUtils - .convertStringToDateFormat( - widget.patientSearchViewModel.selectedToDate.toString(), - "yyyy-MM-dd")}" + decoration: textFieldSelectorDecoration( + TranslationBase.of(context).toDate, + widget.patientSearchViewModel + .selectedToDate != + null + ? "${DateUtils.convertStringToDateFormat(widget.patientSearchViewModel.selectedToDate.toString(), "yyyy-MM-dd")}" : null, true, suffixIcon: Icon( @@ -147,10 +130,7 @@ class _FilterDatePageState extends State { ), border: Border.all(color: HexColor('#707070'), width: 0), ), - height: MediaQuery - .of(context) - .size - .height * 0.1, + height: MediaQuery.of(context).size.height * 0.1, width: double.infinity, child: Column( children: [ @@ -162,10 +142,7 @@ class _FilterDatePageState extends State { widthFactor: .80, child: Center( child: AppButton( - title: - TranslationBase - .of(context) - .search, + title: TranslationBase.of(context).search, padding: 10, color: Color(0xFF359846), onPressed: () async { @@ -178,8 +155,8 @@ class _FilterDatePageState extends State { } else { Duration difference = widget .patientSearchViewModel.selectedToDate - .difference( - widget.patientSearchViewModel.selectedFromDate); + .difference(widget + .patientSearchViewModel.selectedFromDate); if (difference.inDays > 90) { Helpers.showErrorToast( "The difference between from date and end date must be less than 3 months"); @@ -219,8 +196,7 @@ class _FilterDatePageState extends State { ), ], ), - ) - ); + )); } selectDate(BuildContext context, @@ -241,9 +217,9 @@ class _FilterDatePageState extends State { setState(() { this.widget.patientSearchViewModel.selectedFromDate = picked; var date = picked.add(Duration(days: 30)); - if(date.isBefore(lastDate)){ + if (date.isBefore(lastDate)) { this.widget.patientSearchViewModel.selectedToDate = date; - }else + } else this.widget.patientSearchViewModel.selectedToDate = lastDate; }); } else { @@ -257,43 +233,25 @@ class _FilterDatePageState extends State { getFirstDate(OutPatientFilterType outPatientFilterType) { if (outPatientFilterType == OutPatientFilterType.Previous) { return DateTime( - DateTime - .now() - .year -20, DateTime - .now() - .month, DateTime - .now() - .day); + DateTime.now().year - 20, DateTime.now().month, DateTime.now().day); } else { return DateTime( - DateTime - .now() - .year, DateTime - .now() - .month, DateTime - .now() - .day + 1); + DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); } } getLastDate(OutPatientFilterType outPatientFilterType) { if (outPatientFilterType == OutPatientFilterType.Previous) { - return DateTime(DateTime.now().year, DateTime.now().month, - DateTime.now().day-1); + return DateTime( + DateTime.now().year, DateTime.now().month, DateTime.now().day - 1); } else { return DateTime( - DateTime - .now() - .year, DateTime - .now() - .month, DateTime - .now() - .day + 7); + DateTime.now().year, DateTime.now().month, DateTime.now().day + 7); } } - InputDecoration textFieldSelectorDecoration(String hintText, - String selectedText, bool isDropDown, + InputDecoration textFieldSelectorDecoration( + String hintText, String selectedText, bool isDropDown, {Icon suffixIcon}) { return InputDecoration( focusedBorder: OutlineInputBorder( @@ -311,11 +269,11 @@ class _FilterDatePageState extends State { hintText: selectedText != null ? selectedText : hintText, suffixIcon: isDropDown ? suffixIcon != null - ? suffixIcon - : Icon( - Icons.keyboard_arrow_down_sharp, - color: Color(0xff2E303A), - ) + ? suffixIcon + : Icon( + Icons.keyboard_arrow_down_sharp, + color: Color(0xff2E303A), + ) : null, hintStyle: TextStyle( fontSize: 13, diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 4d0ce94a..eb6f5909 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -40,18 +40,19 @@ class OutPatientsScreen extends StatefulWidget { final bool isSearchAndOut; final String searchKey; - OutPatientsScreen( {this.patientSearchForm, - this.selectedType, - this.isAppbar = true, - this.arrivalType, - this.isView, - this.selectedPatientType, - this.patientSearchRequestModel, - this.isSearchWithKeyInfo = true, - this.isSearch = false, - this.isInpatient = false, this.searchKey, this.isSearchAndOut=false}); + this.selectedType, + this.isAppbar = true, + this.arrivalType, + this.isView, + this.selectedPatientType, + this.patientSearchRequestModel, + this.isSearchWithKeyInfo = true, + this.isSearch = false, + this.isInpatient = false, + this.searchKey, + this.isSearchAndOut = false}); @override _OutPatientsScreenState createState() => _OutPatientsScreenState(); @@ -80,20 +81,11 @@ class _OutPatientsScreenState extends State { Widget build(BuildContext context) { authProvider = Provider.of(context); _times = [ - TranslationBase - .of(context) - .previous, - TranslationBase - .of(context) - .today, - TranslationBase - .of(context) - .nextWeek, + TranslationBase.of(context).previous, + TranslationBase.of(context).today, + TranslationBase.of(context).nextWeek, ]; - final screenSize = MediaQuery - .of(context) - .size; - + final screenSize = MediaQuery.of(context).size; return BaseView( onModelReady: (model) async { @@ -104,120 +96,124 @@ class _OutPatientsScreenState extends State { isShowAppBar: true, appBar: HeaderInSearch( title: "My Out patient", - ), baseViewModel: model, body: Column( children: [ - Container( - // color: Colors.red, - height: screenSize.height * 0.070, - decoration: TextFieldsUtils - .containerBorderDecoration( - Color(0Xffffffff), - Color(0xFFCCCCCC), - borderRadius: 4, - borderWidth: 0), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: _times.map((item) { - bool _isActive = _times[_activeLocation] == item - ? true - : false; + Container( + // color: Colors.red, + height: screenSize.height * 0.070, + decoration: TextFieldsUtils.containerBorderDecoration( + Color(0Xffffffff), Color(0xFFCCCCCC), + borderRadius: 4, borderWidth: 0), + child: Row( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: _times.map((item) { + bool _isActive = + _times[_activeLocation] == item ? true : false; - return Expanded( - child: InkWell( - onTap: () async { - setState(() { - _activeLocation = _times.indexOf(item); - outPatientFilterType= _activeLocation==0?OutPatientFilterType.Previous:_activeLocation==0?OutPatientFilterType.Today:OutPatientFilterType.NextWeek; - _controller.text=""; - }); - model.searchData(""); - FocusScope.of(context).requestFocus(new FocusNode()); - GifLoaderDialogUtils.showMyDialog(context); - await model.getPatientBasedOnDate(item: item, - selectedPatientType: widget.selectedPatientType, - patientSearchRequestModel: widget - .patientSearchRequestModel, - isSearchWithKeyInfo: widget.isSearchWithKeyInfo); - GifLoaderDialogUtils.hideDialog(context); - }, - child: Center( - child: Container( - height: screenSize.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - _isActive - ? Color(0xFFD02127 /*B8382B*/) - : Color(0xFFEAEAEA), - _isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - item, - fontSize: SizeConfig.textMultiplier * 1.8, - color: _isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), + return Expanded( + child: InkWell( + onTap: () async { + setState(() { + _activeLocation = _times.indexOf(item); + outPatientFilterType = _activeLocation == 0 + ? OutPatientFilterType.Previous + : _activeLocation == 0 + ? OutPatientFilterType.Today + : OutPatientFilterType.NextWeek; + _controller.text = ""; + }); + model.searchData(""); + FocusScope.of(context).requestFocus(new FocusNode()); + GifLoaderDialogUtils.showMyDialog(context); + await model.getPatientBasedOnDate( + item: item, + selectedPatientType: widget.selectedPatientType, + patientSearchRequestModel: + widget.patientSearchRequestModel, + isSearchWithKeyInfo: widget.isSearchWithKeyInfo); + GifLoaderDialogUtils.hideDialog(context); + }, + child: Center( + child: Container( + height: screenSize.height * 0.070, + decoration: + TextFieldsUtils.containerBorderDecoration( + _isActive + ? Color(0xFFD02127 /*B8382B*/) + : Color(0xFFEAEAEA), + _isActive + ? Color(0xFFD02127) + : Color(0xFFEAEAEA), + borderRadius: 4, + borderWidth: 0), + child: Center( + child: AppText( + item, + fontSize: SizeConfig.textMultiplier * 1.8, + color: _isActive + ? Colors.white + : Color(0xFF2B353E), + fontWeight: FontWeight.w700, ), ), ), ), - ); - }).toList(), - ), + ), + ); + }).toList(), ), - + ), SizedBox(height: 18.5), Container( width: SizeConfig.screenWidth * 0.9, height: 75, decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(6.0)), + borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( width: 1.0, color: HexColor("#CCCCCC"), ), color: Colors.white), child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: EdgeInsets.only( - left: 10, top: 10), + padding: EdgeInsets.only(left: 10, top: 10), child: AppText( - TranslationBase.of( - context) - .searchPatientName, + TranslationBase.of(context).searchPatientName, fontSize: 13, )), AppTextFormField( - // focusNode: focusProject, + // focusNode: focusProject, controller: _controller, - borderColor: Colors.white - , + borderColor: Colors.white, prefix: IconButton( icon: Icon( - _activeLocation !=0 + _activeLocation != 0 ? DoctorApp.filter_1 : FontAwesomeIcons.slidersH, color: Colors.black, ), iconSize: 20, - padding: - EdgeInsets.only( - bottom: 30), - onPressed: _activeLocation !=0 ? null : () { - Navigator.push(context, MaterialPageRoute( - builder: (BuildContext context) => - FilterDatePage(outPatientFilterType: outPatientFilterType,patientSearchViewModel: model,))); - }, + padding: EdgeInsets.only(bottom: 30), + onPressed: _activeLocation != 0 + ? null + : () { + Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) => + FilterDatePage( + outPatientFilterType: + outPatientFilterType, + patientSearchViewModel: + model, + ))); + }, ), - onChanged: (String str) { model.searchData(str); }), @@ -225,58 +221,60 @@ class _OutPatientsScreenState extends State { SizedBox( height: 10.0, ), - Expanded( child: Container( child: model.filterData.isEmpty ? Center( - child: ErrorMessage( - error: TranslationBase.of(context) - .youDontHaveAnyPatient, - ), - ) - : ListView.builder( - scrollDirection: Axis.vertical, - shrinkWrap: true, - itemCount: model.filterData.length, - itemBuilder: (BuildContext ctxt, int index) { - if(_activeLocation !=0 || (model.filterData[index].patientStatusType !=null && model.filterData[index].patientStatusType==43)) - return - Padding( - padding: EdgeInsets.all(8.0), - child: PatientCard( - patientInfo: model.filterData[index], - patientType: patientType, - arrivalType: arrivalType, - isFromSearch:widget.isSearchAndOut, - isInpatient: widget.isInpatient, - onTap: () { - // TODO change the parameter to daynamic - Navigator.of(context).pushNamed( - PATIENTS_PROFILE, - arguments: { - "patient": model.filterData[index], - "patientType": "1", - "from": widget - .patientSearchRequestModel.from, - "to": widget - .patientSearchRequestModel.from, - "isSearch": false, - "isInpatient": false, - "arrivalType": "7", - "isSearchAndOut": false, - }); - }, - // isFromSearch: widget.isSearch, + child: ErrorMessage( + error: TranslationBase.of(context) + .youDontHaveAnyPatient, ), - ); - else - return SizedBox(); - })), + ) + : ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + itemCount: model.filterData.length, + itemBuilder: (BuildContext ctxt, int index) { + if (_activeLocation != 0 || + (model.filterData[index].patientStatusType != + null && + model.filterData[index] + .patientStatusType == + 43)) + return Padding( + padding: EdgeInsets.all(8.0), + child: PatientCard( + patientInfo: model.filterData[index], + patientType: patientType, + arrivalType: arrivalType, + isFromSearch: widget.isSearchAndOut, + isInpatient: widget.isInpatient, + onTap: () { + // TODO change the parameter to daynamic + Navigator.of(context).pushNamed( + PATIENTS_PROFILE, + arguments: { + "patient": model.filterData[index], + "patientType": "1", + "from": widget + .patientSearchRequestModel.from, + "to": widget + .patientSearchRequestModel.from, + "isSearch": false, + "isInpatient": false, + "arrivalType": "7", + "isSearchAndOut": false, + }); + }, + // isFromSearch: widget.isSearch, + ), + ); + else + return SizedBox(); + })), ), ], - ) - ), + )), ); } } diff --git a/lib/screens/patients/patient_search/patient_search_screen_new.dart b/lib/screens/patients/patient_search/patient_search_screen_new.dart index 5270511d..32166197 100644 --- a/lib/screens/patients/patient_search/patient_search_screen_new.dart +++ b/lib/screens/patients/patient_search/patient_search_screen_new.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; @@ -34,7 +34,7 @@ class _PatientSearchScreenNewState extends State { @override Widget build(BuildContext context) { - authProvider =Provider.of(context); + authProvider = Provider.of(context); return BaseView( onModelReady: (model) async {}, builder: (_, model, w) => AppScaffold( @@ -109,23 +109,23 @@ class _PatientSearchScreenNewState extends State { isTextFieldHasSuffix: false, maxLines: 1, minLines: 1, - inputType:TextInputType.number, + inputType: TextInputType.number, hasBorder: true, controller: patientFileInfoController, inputFormatters: [ FilteringTextInputFormatter.allow( RegExp(ONLY_NUMBERS)) ], - onChanged: (_){}, - validationError: (isFormSubmitted && ( - patientFileInfoController + onChanged: (_) {}, + validationError: (isFormSubmitted && + (patientFileInfoController .text.isEmpty && - firstNameInfoController - .text.isEmpty && - middleNameInfoController - .text.isEmpty && - lastNameFileInfoController - .text.isEmpty)) + firstNameInfoController + .text.isEmpty && + middleNameInfoController + .text.isEmpty && + lastNameFileInfoController + .text.isEmpty)) ? TranslationBase.of(context).emptyMessage : null, ), @@ -260,11 +260,21 @@ class _PatientSearchScreenNewState extends State { isFormSubmitted = true; }); PatientSearchRequestModel patientSearchRequestModel = - PatientSearchRequestModel(doctorID: authProvider.doctorProfile.doctorID); + PatientSearchRequestModel( + doctorID: authProvider.doctorProfile.doctorID); if (showOther) { - patientSearchRequestModel.firstName = firstNameInfoController.text.trim().isEmpty?"0":firstNameInfoController.text.trim(); - patientSearchRequestModel.middleName = middleNameInfoController.text.trim().isEmpty?"0":middleNameInfoController.text.trim(); - patientSearchRequestModel.lastName = lastNameFileInfoController.text.isEmpty?"0":lastNameFileInfoController.text.trim(); + patientSearchRequestModel.firstName = + firstNameInfoController.text.trim().isEmpty + ? "0" + : firstNameInfoController.text.trim(); + patientSearchRequestModel.middleName = + middleNameInfoController.text.trim().isEmpty + ? "0" + : middleNameInfoController.text.trim(); + patientSearchRequestModel.lastName = + lastNameFileInfoController.text.isEmpty + ? "0" + : lastNameFileInfoController.text.trim(); } if (patientFileInfoController.text.isNotEmpty) { @@ -307,7 +317,7 @@ class _PatientSearchScreenNewState extends State { isSearchWithKeyInfo: patientFileInfoController.text.isNotEmpty ? true : false, isSearch: true, - isSearchAndOut:true, + isSearchAndOut: true, searchKey: patientFileInfoController.text, isInpatient: false, ), diff --git a/lib/screens/patients/patient_search/patients_screen_new.dart b/lib/screens/patients/patient_search/patients_screen_new.dart index 7074bda9..b997bbdd 100644 --- a/lib/screens/patients/patient_search/patients_screen_new.dart +++ b/lib/screens/patients/patient_search/patients_screen_new.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -36,7 +36,6 @@ class PatientsScreenNew extends StatefulWidget { final bool isSearchAndOut; final String searchKey; - PatientsScreenNew( {this.patientSearchForm, this.selectedType, @@ -47,7 +46,9 @@ class PatientsScreenNew extends StatefulWidget { this.patientSearchRequestModel, this.isSearchWithKeyInfo = true, this.isSearch = false, - this.isInpatient = false, this.searchKey, this.isSearchAndOut=false}); + this.isInpatient = false, + this.searchKey, + this.isSearchAndOut = false}); @override _PatientsScreenNewState createState() => _PatientsScreenNewState(); @@ -70,7 +71,6 @@ class _PatientsScreenNewState extends State { PatientModel patient; - @override Widget build(BuildContext context) { authProvider = Provider.of(context); @@ -81,134 +81,130 @@ class _PatientsScreenNewState extends State { ]; final screenSize = MediaQuery.of(context).size; - return BaseView( onModelReady: (model) async { - if(!widget.isSearchWithKeyInfo && widget.selectedPatientType == PatientType.OutPatient) { + if (!widget.isSearchWithKeyInfo && + widget.selectedPatientType == PatientType.OutPatient) { await model.getOutPatient(widget.patientSearchRequestModel); - } else { - await model.getPatientFileInformation(widget.patientSearchRequestModel); - + await model + .getPatientFileInformation(widget.patientSearchRequestModel); } }, builder: (_, model, w) => AppScaffold( - appBarTitle: "Search Patient", - isShowAppBar: true, - appBar: !widget.isSearch && !widget.isInpatient?HeaderInSearch( - title: "My Out patient", - ):HeaderInSearch( - title: "Search for ${widget.searchKey}", - ), - baseViewModel: model, - body: Column( - children: [ - if(!widget.isInpatient && !widget.isSearch) - Container( - // color: Colors.red, - height: screenSize.height * 0.070, - decoration: TextFieldsUtils - .containerBorderDecoration( - Color(0Xffffffff), - Color(0xFFCCCCCC), - borderRadius: 4, - borderWidth: 0), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: _locations.map((item) { - bool _isActive = _locations[_activeLocation] == item - ? true - : false; - - return Expanded( - child: InkWell( - onTap: () async { - setState(() { - _activeLocation = _locations.indexOf(item); - }); - GifLoaderDialogUtils.showMyDialog(context); - await model.getPatientBasedOnDate(item: item, - selectedPatientType: widget.selectedPatientType, - patientSearchRequestModel: widget - .patientSearchRequestModel, - isSearchWithKeyInfo: widget.isSearchWithKeyInfo); - GifLoaderDialogUtils.hideDialog(context); - }, - child: Center( - child: Container( - height: screenSize.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - _isActive - ? Color(0xFFD02127 /*B8382B*/) - : Color(0xFFEAEAEA), - _isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - item, - fontSize: SizeConfig.textMultiplier * 1.8, - color: _isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, + appBarTitle: "Search Patient", + isShowAppBar: true, + appBar: !widget.isSearch && !widget.isInpatient + ? HeaderInSearch( + title: "My Out patient", + ) + : HeaderInSearch( + title: "Search for ${widget.searchKey}", + ), + baseViewModel: model, + body: Column( + children: [ + if (!widget.isInpatient && !widget.isSearch) + Container( + // color: Colors.red, + height: screenSize.height * 0.070, + decoration: TextFieldsUtils.containerBorderDecoration( + Color(0Xffffffff), Color(0xFFCCCCCC), + borderRadius: 4, borderWidth: 0), + child: Row( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: _locations.map((item) { + bool _isActive = + _locations[_activeLocation] == item ? true : false; + + return Expanded( + child: InkWell( + onTap: () async { + setState(() { + _activeLocation = _locations.indexOf(item); + }); + GifLoaderDialogUtils.showMyDialog(context); + await model.getPatientBasedOnDate( + item: item, + selectedPatientType: widget.selectedPatientType, + patientSearchRequestModel: + widget.patientSearchRequestModel, + isSearchWithKeyInfo: + widget.isSearchWithKeyInfo); + GifLoaderDialogUtils.hideDialog(context); + }, + child: Center( + child: Container( + height: screenSize.height * 0.070, + decoration: + TextFieldsUtils.containerBorderDecoration( + _isActive + ? Color(0xFFD02127 /*B8382B*/) + : Color(0xFFEAEAEA), + _isActive + ? Color(0xFFD02127) + : Color(0xFFEAEAEA), + borderRadius: 4, + borderWidth: 0), + child: Center( + child: AppText( + item, + fontSize: SizeConfig.textMultiplier * 1.8, + color: _isActive + ? Colors.white + : Color(0xFF2B353E), + fontWeight: FontWeight.w700, + ), ), ), ), ), - ), - ); - }).toList(), + ); + }).toList(), + ), ), - ), - - SizedBox(height: 18.5), - Container( - width: SizeConfig.screenWidth * 0.9, - height: 75, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(6.0)), - border: Border.all( - width: 1.0, - color: HexColor("#CCCCCC"), - ), - color: Colors.white), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only( - left: 10, top: 10), - child: AppText( - TranslationBase.of( - context) - .searchPatientName, - fontSize: 13, - )), - AppTextFormField( - // focusNode: focusProject, - controller: _controller, - borderColor: Colors.white, - prefix: IconButton( - icon: Icon( - DoctorApp.filter_1, - color: Colors.black, + SizedBox(height: 18.5), + Container( + width: SizeConfig.screenWidth * 0.9, + height: 75, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6.0)), + border: Border.all( + width: 1.0, + color: HexColor("#CCCCCC"), + ), + color: Colors.white), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(left: 10, top: 10), + child: AppText( + TranslationBase.of(context).searchPatientName, + fontSize: 13, + )), + AppTextFormField( + // focusNode: focusProject, + controller: _controller, + borderColor: Colors.white, + prefix: IconButton( + icon: Icon( + DoctorApp.filter_1, + color: Colors.black, + ), + iconSize: 20, + padding: EdgeInsets.only(bottom: 30), ), - iconSize: 20, - padding: - EdgeInsets.only( - bottom: 30), - ), - onChanged: (String str) { - model.searchData(str); - }), - ])), - SizedBox( - height: 10.0, - ), - Expanded( - child: Container( + onChanged: (String str) { + model.searchData(str); + }), + ])), + SizedBox( + height: 10.0, + ), + Expanded( + child: Container( child: model.filterData.isEmpty ? Center( child: ErrorMessage( @@ -227,8 +223,8 @@ class _PatientsScreenNewState extends State { patientInfo: model.filterData[index], patientType: patientType, arrivalType: arrivalType, - isFromSearch:widget.isSearchAndOut, - isInpatient: widget.isInpatient, + isFromSearch: widget.isSearchAndOut, + isInpatient: widget.isInpatient, onTap: () { // TODO change the parameter to daynamic Navigator.of(context).pushNamed( @@ -243,17 +239,17 @@ class _PatientsScreenNewState extends State { "isSearch": widget.isSearch, "isInpatient": widget.isInpatient, "arrivalType": "7", - "isSearchAndOut": widget.isSearchAndOut, + "isSearchAndOut": + widget.isSearchAndOut, }); }, - // isFromSearch: widget.isSearch, + // isFromSearch: widget.isSearch, ), ); })), ), - ], - ) - ), + ], + )), ); } } diff --git a/lib/screens/patients/patient_search/time_bar.dart b/lib/screens/patients/patient_search/time_bar.dart index 0d376b02..a5f694e9 100644 --- a/lib/screens/patients/patient_search/time_bar.dart +++ b/lib/screens/patients/patient_search/time_bar.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; @@ -13,15 +13,18 @@ class TimeBar extends StatefulWidget { final PatientSearchRequestModel patientSearchRequestModel; final bool isSearchWithKeyInfo; - - const TimeBar({Key key, this.model, this.selectedPatientType, this.patientSearchRequestModel, this.isSearchWithKeyInfo}) : super(key: key); + const TimeBar( + {Key key, + this.model, + this.selectedPatientType, + this.patientSearchRequestModel, + this.isSearchWithKeyInfo}) + : super(key: key); @override _TimeBarState createState() => _TimeBarState(); } class _TimeBarState extends State { - - @override Widget build(BuildContext context) { List _locations = [ @@ -74,25 +77,30 @@ class _TimeBarState extends State { ), )), ), - onTap: () async{ + onTap: () async { setState(() { _activeLocation = _locations.indexOf(item); }); GifLoaderDialogUtils.showMyDialog(context); - await widget.model.getPatientBasedOnDate(item:item,selectedPatientType:widget.selectedPatientType, patientSearchRequestModel:widget.patientSearchRequestModel, isSearchWithKeyInfo:widget.isSearchWithKeyInfo); + await widget.model.getPatientBasedOnDate( + item: item, + selectedPatientType: widget.selectedPatientType, + patientSearchRequestModel: + widget.patientSearchRequestModel, + isSearchWithKeyInfo: widget.isSearchWithKeyInfo); GifLoaderDialogUtils.hideDialog(context); }), _isActive ? Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.only( - bottomRight: Radius.circular(10), - topRight: Radius.circular(10)), - color: Colors.white), - alignment: Alignment.center, - height: 1, - width: SizeConfig.screenWidth * 0.23, - ) + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(10), + topRight: Radius.circular(10)), + color: Colors.white), + alignment: Alignment.center, + height: 1, + width: SizeConfig.screenWidth * 0.23, + ) : Container() ]); }).toList(), diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index 16486b49..7db245fe 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/prescription_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; diff --git a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart index fd5ec6bb..afc5b8b4 100644 --- a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/MyReferralPatientModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; @@ -19,7 +19,6 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:speech_to_text/speech_recognition_error.dart'; import 'package:speech_to_text/speech_to_text.dart' as stt; - class AddReplayOnReferralPatient extends StatefulWidget { final PatientReferralViewModel patientReferralViewModel; final MyReferralPatientModel myReferralInPatientModel; @@ -33,8 +32,8 @@ class AddReplayOnReferralPatient extends StatefulWidget { _AddReplayOnReferralPatientState(); } -class _AddReplayOnReferralPatientState extends State { - +class _AddReplayOnReferralPatientState + extends State { bool isSubmitted = false; stt.SpeechToText speech = stt.SpeechToText(); var reconizedWord; @@ -46,7 +45,6 @@ class _AddReplayOnReferralPatientState extends State super.initState(); } - @override Widget build(BuildContext context) { return AppScaffold( @@ -84,7 +82,7 @@ class _AddReplayOnReferralPatientState extends State : null, ), Positioned( - top: 0,//MediaQuery.of(context).size.height * 0, + top: 0, //MediaQuery.of(context).size.height * 0, right: 15, child: IconButton( icon: Icon( @@ -122,16 +120,21 @@ class _AddReplayOnReferralPatientState extends State }); if (progressNoteController.text.isNotEmpty) { GifLoaderDialogUtils.showMyDialog(context); - await widget.patientReferralViewModel.replay(progressNoteController.text.trim(), widget.myReferralInPatientModel); - if (widget.patientReferralViewModel.state == ViewState.ErrorLocal) { - Helpers.showErrorToast(widget.patientReferralViewModel.error); + await widget.patientReferralViewModel.replay( + progressNoteController.text.trim(), + widget.myReferralInPatientModel); + if (widget.patientReferralViewModel.state == + ViewState.ErrorLocal) { + Helpers.showErrorToast( + widget.patientReferralViewModel.error); } else { GifLoaderDialogUtils.hideDialog(context); - DrAppToastMsg.showSuccesToast("Your Replay Added Successfully"); + DrAppToastMsg.showSuccesToast( + "Your Replay Added Successfully"); Navigator.of(context).pop(); Navigator.of(context).pop(); } - }else { + } else { Helpers.showErrorToast("You can't add empty replay"); setState(() { isSubmitted = false; diff --git a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart index cc2c7136..df2bbece 100644 --- a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/MyReferralPatientModel.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -19,7 +19,8 @@ import 'AddReplayOnReferralPatient.dart'; class ReferralPatientDetailScreen extends StatelessWidget { final MyReferralPatientModel referredPatient; final PatientReferralViewModel patientReferralViewModel; - ReferralPatientDetailScreen(this.referredPatient, this.patientReferralViewModel); + ReferralPatientDetailScreen( + this.referredPatient, this.patientReferralViewModel); @override Widget build(BuildContext context) { @@ -68,16 +69,18 @@ class ReferralPatientDetailScreen extends StatelessWidget { ), InkWell( onTap: () { - PatiantInformtion patient = - model.getPatientFromReferralO(referredPatient); + PatiantInformtion patient = model + .getPatientFromReferralO(referredPatient); Navigator.of(context) .pushNamed(PATIENTS_PROFILE, arguments: { "patient": patient, "patientType": "1", "isInpatient": true, "arrivalType": "1", - "from": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), - "to": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), + "from": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), + "to": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), }); }, child: Icon( @@ -94,16 +97,18 @@ class ReferralPatientDetailScreen extends StatelessWidget { children: [ InkWell( onTap: () { - PatiantInformtion patient = - model.getPatientFromReferralO(referredPatient); + PatiantInformtion patient = model + .getPatientFromReferralO(referredPatient); Navigator.of(context) .pushNamed(PATIENTS_PROFILE, arguments: { "patient": patient, "patientType": "1", "isInpatient": true, "arrivalType": "1", - "from": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), - "to": DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'), + "from": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), + "to": DateUtils.convertDateToFormat( + DateTime.now(), 'yyyy-MM-dd'), }); }, child: Padding( @@ -153,7 +158,9 @@ class ReferralPatientDetailScreen extends StatelessWidget { : Colors.red[700], ), AppText( - DateUtils.getDayMonthYearDateFormatted(referredPatient.referralDate,), + DateUtils.getDayMonthYearDateFormatted( + referredPatient.referralDate, + ), fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 2.0 * SizeConfig.textMultiplier, @@ -189,7 +196,9 @@ class ReferralPatientDetailScreen extends StatelessWidget { ], ), AppText( - DateUtils.getTimeHHMMA(referredPatient.referralDate,), + DateUtils.getTimeHHMMA( + referredPatient.referralDate, + ), fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 1.8 * SizeConfig.textMultiplier, @@ -469,7 +478,6 @@ class ReferralPatientDetailScreen extends StatelessWidget { SizedBox( height: 8, ), - ], ), ), @@ -489,7 +497,12 @@ class ReferralPatientDetailScreen extends StatelessWidget { Navigator.push( context, SlideUpPageRoute( - widget: AddReplayOnReferralPatient(patientReferralViewModel: patientReferralViewModel,myReferralInPatientModel: referredPatient,),),); + widget: AddReplayOnReferralPatient( + patientReferralViewModel: patientReferralViewModel, + myReferralInPatientModel: referredPatient, + ), + ), + ); }, ), ), diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index 667bbb4b..c7b54423 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -1,7 +1,7 @@ // ignore: must_be_immutable import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 07bf9d81..11e248af 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -3,8 +3,8 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; diff --git a/lib/screens/prescription/update_prescription_form.dart b/lib/screens/prescription/update_prescription_form.dart index 378909ad..6cb4d70d 100644 --- a/lib/screens/prescription/update_prescription_form.dart +++ b/lib/screens/prescription/update_prescription_form.dart @@ -1,8 +1,8 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/get_medication_response_model.dart'; -import 'package:doctor_app_flutter/core/model/post_prescrition_req_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -664,7 +664,7 @@ class _UpdatePrescriptionFormState extends State { child: TextField( decoration: Helpers .textFieldSelectorDecoration( - DateUtils.getDateFormatted( + DateUtils.getDateFormatted( DateTime.parse( widget.startDate)), selectedDate != null diff --git a/lib/screens/sick-leave/add-sickleave.dart b/lib/screens/sick-leave/add-sickleave.dart index 6ee37745..fbc2e516 100644 --- a/lib/screens/sick-leave/add-sickleave.dart +++ b/lib/screens/sick-leave/add-sickleave.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/core/model/sick_leave_patient_model.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; @@ -190,9 +190,10 @@ class AddSickLeavScreen extends StatelessWidget { ), Flexible( child: AppText( - DateUtils.getDayMonthYearDateFormatted(DateUtils - .convertStringToDate( - item.startDate)), + DateUtils.getDayMonthYearDateFormatted( + DateUtils + .convertStringToDate( + item.startDate)), fontWeight: FontWeight.bold, ), @@ -209,8 +210,10 @@ class AddSickLeavScreen extends StatelessWidget { ), Flexible( child: AppText( - DateUtils.getDayMonthYearDateFormatted(DateUtils - .convertStringToDate( + DateUtils + .getDayMonthYearDateFormatted( + DateUtils + .convertStringToDate( item.endDate, )), fontWeight: diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 48d93f54..e393c11a 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -1,7 +1,7 @@ import 'dart:io' show Platform; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'package:doctor_app_flutter/core/model/imei_details.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; diff --git a/lib/widgets/otp/sms-popup.dart b/lib/widgets/otp/sms-popup.dart index fca0d689..0c34e67d 100644 --- a/lib/widgets/otp/sms-popup.dart +++ b/lib/widgets/otp/sms-popup.dart @@ -77,7 +77,7 @@ class SMSOTP { crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: EdgeInsets.all(12), + padding: EdgeInsets.all(13), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ From 498e65180b1d937e7215981bc6e1ced1338b302f Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Wed, 5 May 2021 14:59:33 +0300 Subject: [PATCH 2/4] refactoring --- lib/landing_page.dart | 2 +- lib/screens/{ => qr_reader}/QR_reader_screen.dart | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename lib/screens/{ => qr_reader}/QR_reader_screen.dart (98%) diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 99e1694f..db43daa9 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/screens/QR_reader_screen.dart'; +import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/screens/qr_reader/QR_reader_screen.dart'; import 'package:doctor_app_flutter/screens/doctor/doctor_reply_screen.dart'; import 'package:doctor_app_flutter/screens/doctor/my_schedule_screen.dart'; import 'package:doctor_app_flutter/screens/home/home_screen.dart'; diff --git a/lib/screens/QR_reader_screen.dart b/lib/screens/qr_reader/QR_reader_screen.dart similarity index 98% rename from lib/screens/QR_reader_screen.dart rename to lib/screens/qr_reader/QR_reader_screen.dart index 6b37efbe..57e6cc11 100644 --- a/lib/screens/QR_reader_screen.dart +++ b/lib/screens/qr_reader/QR_reader_screen.dart @@ -15,8 +15,8 @@ import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dar import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import '../routes.dart'; -import 'base/base_view.dart'; +import '../../routes.dart'; +import '../base/base_view.dart'; Helpers helpers = Helpers(); @@ -94,7 +94,7 @@ class _QrReaderScreenState extends State { height: 35, ), AppButton( - title : TranslationBase.of(context).scanQr, + title: TranslationBase.of(context).scanQr, onPressed: () { _scanQrAndGetPatient(context, model); }, From bc340693baab146305e87c7af11d86e35c6558e2 Mon Sep 17 00:00:00 2001 From: hussam al-habibeh Date: Thu, 6 May 2021 14:12:32 +0300 Subject: [PATCH 3/4] project refactoring --- .../prescription/prescription_service.dart | 16 +- .../viewModel/PatientSearchViewModel.dart | 30 +- lib/core/viewModel/SOAP_view_model.dart | 7 +- lib/core/viewModel/medicine_view_model.dart | 7 +- .../viewModel/prescription_view_model.dart | 12 +- lib/screens/home/home_screen.dart | 7 +- .../patients/PatientsInPatientScreen.dart | 33 +- .../out_patient/out_patient_screen.dart | 352 +++++++++--------- .../patient_search_result_screen.dart | 125 +++---- .../referral/AddReplayOnReferralPatient.dart | 7 +- .../subjective/medication/add_medication.dart | 2 +- .../prescription/add_prescription_form.dart | 7 +- .../update_prescription_form.dart | 5 +- lib/screens/sick-leave/add-sickleave.dart | 27 +- 14 files changed, 321 insertions(+), 316 deletions(-) diff --git a/lib/core/service/patient_medical_file/prescription/prescription_service.dart b/lib/core/service/patient_medical_file/prescription/prescription_service.dart index 7df9d38b..daca52b9 100644 --- a/lib/core/service/patient_medical_file/prescription/prescription_service.dart +++ b/lib/core/service/patient_medical_file/prescription/prescription_service.dart @@ -1,12 +1,14 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_req_model.dart'; + import 'package:doctor_app_flutter/core/model/calculate_box_request_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/item_by_medicine_request_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_req_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/search_drug_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/search_drug_request_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/item_by_medicine_request_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/search_drug_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/search_drug_request_model.dart'; + import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentReqModel.dart'; diff --git a/lib/core/viewModel/PatientSearchViewModel.dart b/lib/core/viewModel/PatientSearchViewModel.dart index 418cae3a..c9dede3e 100644 --- a/lib/core/viewModel/PatientSearchViewModel.dart +++ b/lib/core/viewModel/PatientSearchViewModel.dart @@ -71,10 +71,11 @@ class PatientSearchViewModel extends BaseViewModel { } } - getPatientFileInformation(PatientSearchRequestModel patientSearchRequestModel, {bool isLocalBusy = false}) async { + getPatientFileInformation(PatientSearchRequestModel patientSearchRequestModel, + {bool isLocalBusy = false}) async { setState(ViewState.Busy); - await _outPatientService.getPatientFileInformation( - patientSearchRequestModel); + await _outPatientService + .getPatientFileInformation(patientSearchRequestModel); if (_outPatientService.hasError) { error = _outPatientService.error; setState(ViewState.Error); @@ -84,11 +85,12 @@ class PatientSearchViewModel extends BaseViewModel { } } - - - getPatientBasedOnDate ( - {item, PatientSearchRequestModel patientSearchRequestModel, PatientType selectedPatientType, - bool isSearchWithKeyInfo,OutPatientFilterType outPatientFilterType })async { + getPatientBasedOnDate( + {item, + PatientSearchRequestModel patientSearchRequestModel, + PatientType selectedPatientType, + bool isSearchWithKeyInfo, + OutPatientFilterType outPatientFilterType}) async { String dateTo; String dateFrom; if (OutPatientFilterType.Previous == outPatientFilterType) { @@ -128,11 +130,8 @@ class PatientSearchViewModel extends BaseViewModel { currentModel.to = dateTo; await getOutPatient(currentModel, isLocalBusy: true); filterData = _outPatientService.patientList; - } - - PatientInPatientService _inPatientService = locator(); @@ -146,7 +145,7 @@ class PatientSearchViewModel extends BaseViewModel { Future getInPatientList(PatientSearchRequestModel requestModel, {bool isMyInpatient = false}) async { await getDoctorProfile(); - setState(ViewState.Busy); + setState(ViewState.Busy); if (inPatientList.length == 0) await _inPatientService.getInPatientList(requestModel, false); @@ -163,12 +162,11 @@ class PatientSearchViewModel extends BaseViewModel { setState(ViewState.BusyLocal); await getDoctorProfile(); filteredInPatientItems.clear(); - if (inPatientList.length > 0) - filteredInPatientItems.addAll(inPatientList); + if (inPatientList.length > 0) filteredInPatientItems.addAll(inPatientList); setState(ViewState.Idle); } - void clearPatientList(){ + void clearPatientList() { _inPatientService.inPatientList = []; _inPatientService.myInPatientList = []; } @@ -197,6 +195,4 @@ class PatientSearchViewModel extends BaseViewModel { notifyListeners(); } } - - } diff --git a/lib/core/viewModel/SOAP_view_model.dart b/lib/core/viewModel/SOAP_view_model.dart index d73a6ab7..8b789cbc 100644 --- a/lib/core/viewModel/SOAP_view_model.dart +++ b/lib/core/viewModel/SOAP_view_model.dart @@ -1,8 +1,9 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/soap/SOAP_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/soap/SOAP_service.dart'; + import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GeneralGetReqForSOAP.dart'; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index b57b2ad5..d49b8cc3 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,8 +1,9 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/medicine_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/medicine_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; + import 'package:doctor_app_flutter/models/SOAP/GetAssessmentReqModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; diff --git a/lib/core/viewModel/prescription_view_model.dart b/lib/core/viewModel/prescription_view_model.dart index 2e959a3d..89c7c182 100644 --- a/lib/core/viewModel/prescription_view_model.dart +++ b/lib/core/viewModel/prescription_view_model.dart @@ -1,16 +1,18 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; + import 'package:doctor_app_flutter/core/model/Prescriptions/Prescriptions.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/perscription_pharmacy.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/post_prescrition_req_model.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_in_patient.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescriptions_service.dart'; + import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAllergiesResModel.dart'; diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index ffb6d00b..fcb74718 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -3,7 +3,8 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; + import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; @@ -503,7 +504,9 @@ class _HomeScreenState extends State { Container( padding: EdgeInsets.all(10), child: AppText( - "My\n"+TranslationBase.of(context).inPatient, + "My\n" + + TranslationBase.of(context) + .inPatient, color: Colors.white, textAlign: TextAlign.start, fontSize: 15, diff --git a/lib/screens/patients/PatientsInPatientScreen.dart b/lib/screens/patients/PatientsInPatientScreen.dart index 796485da..cff3b8ee 100644 --- a/lib/screens/patients/PatientsInPatientScreen.dart +++ b/lib/screens/patients/PatientsInPatientScreen.dart @@ -16,8 +16,8 @@ class PatientInPatientScreen extends StatefulWidget { _PatientInPatientScreenState createState() => _PatientInPatientScreenState(); } -class _PatientInPatientScreenState extends State with SingleTickerProviderStateMixin{ - +class _PatientInPatientScreenState extends State + with SingleTickerProviderStateMixin { TabController _tabController; int _activeTab = 0; @@ -85,7 +85,8 @@ class _PatientInPatientScreenState extends State with Si child: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( - preferredSize: Size.fromHeight(MediaQuery.of(context).size.height * 0.070), + preferredSize: Size.fromHeight( + MediaQuery.of(context).size.height * 0.070), child: Container( height: MediaQuery.of(context).size.height * 0.070, decoration: BoxDecoration( @@ -103,12 +104,18 @@ class _PatientInPatientScreenState extends State with Si indicatorWeight: 1.0, indicatorSize: TabBarIndicatorSize.tab, labelColor: Theme.of(context).primaryColor, - labelPadding: EdgeInsets.only(top: 0, left:0, right: 0,bottom: 0), + labelPadding: EdgeInsets.only( + top: 0, left: 0, right: 0, bottom: 0), unselectedLabelColor: Colors.grey[800], tabs: [ - tabWidget(screenSize, _activeTab == 0, TranslationBase.of(context).inPatientAll, counter: model.inPatientList.length), - tabWidget(screenSize, _activeTab == 1, "My InPatients", counter: model.myIinPatientList.length), - tabWidget(screenSize, _activeTab == 2, TranslationBase.of(context).discharged), + tabWidget(screenSize, _activeTab == 0, + TranslationBase.of(context).inPatientAll, + counter: model.inPatientList.length), + tabWidget( + screenSize, _activeTab == 1, "My InPatients", + counter: model.myIinPatientList.length), + tabWidget(screenSize, _activeTab == 2, + TranslationBase.of(context).discharged), ], ), ), @@ -137,15 +144,13 @@ class _PatientInPatientScreenState extends State with Si ); } - Widget tabWidget(Size screenSize, bool isActive, String title, {int counter = -1}){ - + Widget tabWidget(Size screenSize, bool isActive, String title, + {int counter = -1}) { return Center( child: Container( height: screenSize.height * 0.070, decoration: TextFieldsUtils.containerBorderDecoration( - isActive - ? Color(0xFFD02127 /*B8382B*/) - : Color(0xFFEAEAEA), + isActive ? Color(0xFFD02127 /*B8382B*/) : Color(0xFFEAEAEA), isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), borderRadius: 4, borderWidth: 0), @@ -164,9 +169,7 @@ class _PatientInPatientScreenState extends State with Si width: 15, height: 15, decoration: BoxDecoration( - color: isActive - ? Colors.white - : Color(0xFFD02127), + color: isActive ? Colors.white : Color(0xFFD02127), shape: BoxShape.circle, ), child: Center( diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 3968a2b6..c8b547b7 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -1,9 +1,10 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; + import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; + import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; @@ -42,18 +43,19 @@ class OutPatientsScreen extends StatefulWidget { final bool isSearchAndOut; final String searchKey; - OutPatientsScreen( {this.patientSearchForm, - this.selectedType, - this.isAppbar = true, - this.arrivalType, - this.isView, - this.selectedPatientType, - this.patientSearchRequestModel, - this.isSearchWithKeyInfo = true, - this.isSearch = false, - this.isInpatient = false, this.searchKey, this.isSearchAndOut=false}); + this.selectedType, + this.isAppbar = true, + this.arrivalType, + this.isView, + this.selectedPatientType, + this.patientSearchRequestModel, + this.isSearchWithKeyInfo = true, + this.isSearch = false, + this.isInpatient = false, + this.searchKey, + this.isSearchAndOut = false}); @override _OutPatientsScreenState createState() => _OutPatientsScreenState(); @@ -82,20 +84,11 @@ class _OutPatientsScreenState extends State { Widget build(BuildContext context) { authProvider = Provider.of(context); _times = [ - TranslationBase - .of(context) - .previous, - TranslationBase - .of(context) - .today, - TranslationBase - .of(context) - .nextWeek, + TranslationBase.of(context).previous, + TranslationBase.of(context).today, + TranslationBase.of(context).nextWeek, ]; - final screenSize = MediaQuery - .of(context) - .size; - + final screenSize = MediaQuery.of(context).size; return BaseView( onModelReady: (model) async { @@ -106,148 +99,155 @@ class _OutPatientsScreenState extends State { isShowAppBar: true, appBar: PatientSearchHeader( title: "My Out patient", - ), baseViewModel: model, body: Column( children: [ Container( - // color: Colors.red, - height: screenSize.height * 0.070, - decoration: TextFieldsUtils - .containerBorderDecoration( - Color(0Xffffffff), - Color(0xFFCCCCCC), - borderRadius: 4, - borderWidth: 0), - child: Row( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.center, - children: _times.map((item) { - bool _isActive = _times[_activeLocation] == item - ? true - : false; + // color: Colors.red, + height: screenSize.height * 0.070, + decoration: TextFieldsUtils.containerBorderDecoration( + Color(0Xffffffff), Color(0xFFCCCCCC), + borderRadius: 4, borderWidth: 0), + child: Row( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.center, + children: _times.map((item) { + bool _isActive = + _times[_activeLocation] == item ? true : false; - return Expanded( - child: InkWell( - onTap: () async { - setState(() { - _activeLocation = _times.indexOf(item); - outPatientFilterType= _activeLocation==0?OutPatientFilterType.Previous:_activeLocation==1?OutPatientFilterType.Today:OutPatientFilterType.NextWeek; - _controller.text=""; - }); - model.searchData(""); - FocusScope.of(context).requestFocus(new FocusNode()); - GifLoaderDialogUtils.showMyDialog(context); - await model.getPatientBasedOnDate(item: item, - selectedPatientType: widget.selectedPatientType, - patientSearchRequestModel: widget - .patientSearchRequestModel, - isSearchWithKeyInfo: widget.isSearchWithKeyInfo, outPatientFilterType: outPatientFilterType); - GifLoaderDialogUtils.hideDialog(context); - }, - child: Center( - child: Container( - height: screenSize.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - _isActive - ? Color(0xFFD02127 /*B8382B*/) - : Color(0xFFEAEAEA), - _isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - AppText( - item, - fontSize: SizeConfig.textMultiplier * 1.8, - color: _isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), - _isActive&&_activeLocation!=0&&model.state == ViewState.Idle ?Container( - padding: EdgeInsets.all(2), - margin: EdgeInsets.symmetric(horizontal: 5), - decoration: - new BoxDecoration( - color: Colors.white, - borderRadius: - BorderRadius.circular( - 50), - ), - constraints: BoxConstraints( - minWidth: 20, - minHeight: 20, - ), - child: new Text( - model.filterData.length.toString(), - style: new TextStyle( - color: Colors.red, - fontSize: 10 - ), - textAlign: - TextAlign.center, - ), - ):Container(), - ], - ), + return Expanded( + child: InkWell( + onTap: () async { + setState(() { + _activeLocation = _times.indexOf(item); + outPatientFilterType = _activeLocation == 0 + ? OutPatientFilterType.Previous + : _activeLocation == 1 + ? OutPatientFilterType.Today + : OutPatientFilterType.NextWeek; + _controller.text = ""; + }); + model.searchData(""); + FocusScope.of(context).requestFocus(new FocusNode()); + GifLoaderDialogUtils.showMyDialog(context); + await model.getPatientBasedOnDate( + item: item, + selectedPatientType: widget.selectedPatientType, + patientSearchRequestModel: + widget.patientSearchRequestModel, + isSearchWithKeyInfo: widget.isSearchWithKeyInfo, + outPatientFilterType: outPatientFilterType); + GifLoaderDialogUtils.hideDialog(context); + }, + child: Center( + child: Container( + height: screenSize.height * 0.070, + decoration: + TextFieldsUtils.containerBorderDecoration( + _isActive + ? Color(0xFFD02127 /*B8382B*/) + : Color(0xFFEAEAEA), + _isActive + ? Color(0xFFD02127) + : Color(0xFFEAEAEA), + borderRadius: 4, + borderWidth: 0), + child: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + AppText( + item, + fontSize: SizeConfig.textMultiplier * 1.8, + color: _isActive + ? Colors.white + : Color(0xFF2B353E), + fontWeight: FontWeight.w700, + ), + _isActive && + _activeLocation != 0 && + model.state == ViewState.Idle + ? Container( + padding: EdgeInsets.all(2), + margin: EdgeInsets.symmetric( + horizontal: 5), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: + BorderRadius.circular(50), + ), + constraints: BoxConstraints( + minWidth: 20, + minHeight: 20, + ), + child: new Text( + model.filterData.length.toString(), + style: new TextStyle( + color: Colors.red, + fontSize: 10), + textAlign: TextAlign.center, + ), + ) + : Container(), + ], ), ), ), ), - ); - }).toList(), - ), + ), + ); + }).toList(), ), + ), SizedBox(height: 18.5), Container( width: SizeConfig.screenWidth * 0.9, height: 75, decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(6.0)), + borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( width: 1.0, color: HexColor("#CCCCCC"), ), color: Colors.white), child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Padding( - padding: EdgeInsets.only( - left: 10, top: 10), + padding: EdgeInsets.only(left: 10, top: 10), child: AppText( - TranslationBase.of( - context) - .searchPatientName, + TranslationBase.of(context).searchPatientName, fontSize: 13, )), AppTextFormField( - // focusNode: focusProject, + // focusNode: focusProject, controller: _controller, - borderColor: Colors.white - , + borderColor: Colors.white, prefix: IconButton( icon: Icon( - _activeLocation !=0 + _activeLocation != 0 ? DoctorApp.filter_1 : FontAwesomeIcons.slidersH, color: Colors.black, ), iconSize: 20, - padding: - EdgeInsets.only( - bottom: 30), - onPressed: _activeLocation !=0 ? null : () { - Navigator.push(context, MaterialPageRoute( - builder: (BuildContext context) => - FilterDatePage(outPatientFilterType: outPatientFilterType,patientSearchViewModel: model,))); - }, + padding: EdgeInsets.only(bottom: 30), + onPressed: _activeLocation != 0 + ? null + : () { + Navigator.push( + context, + MaterialPageRoute( + builder: (BuildContext context) => + FilterDatePage( + outPatientFilterType: + outPatientFilterType, + patientSearchViewModel: + model, + ))); + }, ), - onChanged: (String str) { model.searchData(str); }), @@ -255,58 +255,60 @@ class _OutPatientsScreenState extends State { SizedBox( height: 10.0, ), - Expanded( child: Container( child: model.filterData.isEmpty ? Center( - child: ErrorMessage( - error: TranslationBase.of(context) - .youDontHaveAnyPatient, - ), - ) - : ListView.builder( - scrollDirection: Axis.vertical, - shrinkWrap: true, - itemCount: model.filterData.length, - itemBuilder: (BuildContext ctxt, int index) { - if(_activeLocation !=0 || (model.filterData[index].patientStatusType !=null && model.filterData[index].patientStatusType==43)) - return - Padding( - padding: EdgeInsets.all(8.0), - child: PatientCard( - patientInfo: model.filterData[index], - patientType: patientType, - arrivalType: arrivalType, - isFromSearch:widget.isSearchAndOut, - isInpatient: widget.isInpatient, - onTap: () { - // TODO change the parameter to daynamic - Navigator.of(context).pushNamed( - PATIENTS_PROFILE, - arguments: { - "patient": model.filterData[index], - "patientType": "1", - "from": widget - .patientSearchRequestModel.from, - "to": widget - .patientSearchRequestModel.from, - "isSearch": false, - "isInpatient": false, - "arrivalType": "7", - "isSearchAndOut": false, - }); - }, - // isFromSearch: widget.isSearch, + child: ErrorMessage( + error: TranslationBase.of(context) + .youDontHaveAnyPatient, ), - ); - else - return SizedBox(); - })), + ) + : ListView.builder( + scrollDirection: Axis.vertical, + shrinkWrap: true, + itemCount: model.filterData.length, + itemBuilder: (BuildContext ctxt, int index) { + if (_activeLocation != 0 || + (model.filterData[index].patientStatusType != + null && + model.filterData[index] + .patientStatusType == + 43)) + return Padding( + padding: EdgeInsets.all(8.0), + child: PatientCard( + patientInfo: model.filterData[index], + patientType: patientType, + arrivalType: arrivalType, + isFromSearch: widget.isSearchAndOut, + isInpatient: widget.isInpatient, + onTap: () { + // TODO change the parameter to daynamic + Navigator.of(context).pushNamed( + PATIENTS_PROFILE, + arguments: { + "patient": model.filterData[index], + "patientType": "1", + "from": widget + .patientSearchRequestModel.from, + "to": widget + .patientSearchRequestModel.from, + "isSearch": false, + "isInpatient": false, + "arrivalType": "7", + "isSearchAndOut": false, + }); + }, + // isFromSearch: widget.isSearch, + ), + ); + else + return SizedBox(); + })), ), ], - ) - ), + )), ); } } diff --git a/lib/screens/patients/patient_search/patient_search_result_screen.dart b/lib/screens/patients/patient_search/patient_search_result_screen.dart index 9fd92aba..32e7627b 100644 --- a/lib/screens/patients/patient_search/patient_search_result_screen.dart +++ b/lib/screens/patients/patient_search/patient_search_result_screen.dart @@ -31,10 +31,8 @@ class PatientsSearchResultScreen extends StatefulWidget { final bool isSearchAndOut; final String searchKey; - PatientsSearchResultScreen( - { - this.selectedPatientType, + {this.selectedPatientType, this.patientSearchRequestModel, this.isSearchWithKeyInfo = true, this.isSearch = false, @@ -52,7 +50,6 @@ class _PatientsSearchResultScreenState int clinicId; AuthViewModel authProvider; - String patientType; String patientTypeTitle; var selectedFilter = 1; @@ -63,77 +60,69 @@ class _PatientsSearchResultScreenState PatientModel patient; - @override Widget build(BuildContext context) { authProvider = Provider.of(context); return BaseView( onModelReady: (model) async { - if(!widget.isSearchWithKeyInfo && widget.selectedPatientType == PatientType.OutPatient) { + if (!widget.isSearchWithKeyInfo && + widget.selectedPatientType == PatientType.OutPatient) { await model.getOutPatient(widget.patientSearchRequestModel); - } else { - await model.getPatientFileInformation(widget.patientSearchRequestModel); - + await model + .getPatientFileInformation(widget.patientSearchRequestModel); } }, builder: (_, model, w) => AppScaffold( - appBarTitle: "Search Patient", - isShowAppBar: true, + appBarTitle: "Search Patient", + isShowAppBar: true, appBar: PatientSearchHeader( title: "Search for ${widget.searchKey}", ), - baseViewModel: model, - body: Column( - children: [ - SizedBox(height: 18.5), - Container( - width: SizeConfig.screenWidth * 0.9, - height: 75, - decoration: BoxDecoration( - borderRadius: BorderRadius.all( - Radius.circular(6.0)), - border: Border.all( - width: 1.0, - color: HexColor("#CCCCCC"), - ), - color: Colors.white), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only( - left: 10, top: 10), - child: AppText( - TranslationBase.of( - context) - .searchPatientName, - fontSize: 13, - )), - AppTextFormField( - // focusNode: focusProject, - controller: _controller, - borderColor: Colors.white, - prefix: IconButton( - icon: Icon( - DoctorApp.filter_1, - color: Colors.black, + baseViewModel: model, + body: Column( + children: [ + SizedBox(height: 18.5), + Container( + width: SizeConfig.screenWidth * 0.9, + height: 75, + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(6.0)), + border: Border.all( + width: 1.0, + color: HexColor("#CCCCCC"), + ), + color: Colors.white), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(left: 10, top: 10), + child: AppText( + TranslationBase.of(context).searchPatientName, + fontSize: 13, + )), + AppTextFormField( + // focusNode: focusProject, + controller: _controller, + borderColor: Colors.white, + prefix: IconButton( + icon: Icon( + DoctorApp.filter_1, + color: Colors.black, + ), + iconSize: 20, + padding: EdgeInsets.only(bottom: 30), ), - iconSize: 20, - padding: - EdgeInsets.only( - bottom: 30), - ), - onChanged: (String str) { - model.searchData(str); - }), - ])), - SizedBox( - height: 10.0, - ), - Expanded( - child: Container( + onChanged: (String str) { + model.searchData(str); + }), + ])), + SizedBox( + height: 10.0, + ), + Expanded( + child: Container( child: model.filterData.isEmpty ? Center( child: ErrorMessage( @@ -152,8 +141,8 @@ class _PatientsSearchResultScreenState patientInfo: model.filterData[index], patientType: patientType, arrivalType: arrivalType, - isFromSearch:widget.isSearchAndOut, - isInpatient: widget.isInpatient, + isFromSearch: widget.isSearchAndOut, + isInpatient: widget.isInpatient, onTap: () { // TODO change the parameter to daynamic Navigator.of(context).pushNamed( @@ -168,17 +157,17 @@ class _PatientsSearchResultScreenState "isSearch": widget.isSearch, "isInpatient": widget.isInpatient, "arrivalType": "7", - "isSearchAndOut": widget.isSearchAndOut, + "isSearchAndOut": + widget.isSearchAndOut, }); }, - // isFromSearch: widget.isSearch, + // isFromSearch: widget.isSearch, ), ); })), ), - ], - ) - ), + ], + )), ); } } diff --git a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart index 1cec9092..a2ea0ebb 100644 --- a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart @@ -32,8 +32,8 @@ class AddReplayOnReferralPatient extends StatefulWidget { _AddReplayOnReferralPatientState(); } -class _AddReplayOnReferralPatientState extends State { - +class _AddReplayOnReferralPatientState + extends State { bool isSubmitted = false; stt.SpeechToText speech = stt.SpeechToText(); var reconizedWord; @@ -45,7 +45,6 @@ class _AddReplayOnReferralPatientState extends State super.initState(); } - @override Widget build(BuildContext context) { return AppScaffold( @@ -108,7 +107,7 @@ class _AddReplayOnReferralPatientState extends State ), ), bottomSheet: Container( - height: replayOnReferralController.text.isNotEmpty? 130:70, + height: replayOnReferralController.text.isNotEmpty ? 130 : 70, margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5), child: Column( children: [ diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index c7b54423..69475926 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -1,7 +1,7 @@ // ignore: must_be_immutable import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/SOAP_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; diff --git a/lib/screens/prescription/add_prescription_form.dart b/lib/screens/prescription/add_prescription_form.dart index 9282182a..aabf7b2f 100644 --- a/lib/screens/prescription/add_prescription_form.dart +++ b/lib/screens/prescription/add_prescription_form.dart @@ -2,9 +2,10 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/Prescription_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; + import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; diff --git a/lib/screens/prescription/update_prescription_form.dart b/lib/screens/prescription/update_prescription_form.dart index 6cb4d70d..5d4c6a5b 100644 --- a/lib/screens/prescription/update_prescription_form.dart +++ b/lib/screens/prescription/update_prescription_form.dart @@ -1,8 +1,9 @@ import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/post_prescrition_req_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; + import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/screens/sick-leave/add-sickleave.dart b/lib/screens/sick-leave/add-sickleave.dart index 7f63f4d3..c7f6d993 100644 --- a/lib/screens/sick-leave/add-sickleave.dart +++ b/lib/screens/sick-leave/add-sickleave.dart @@ -1,5 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_model.dart'; +import 'package:doctor_app_flutter/core/model/sick_leave/sick_leave_patient_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; + import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; @@ -50,11 +52,11 @@ class AddSickLeavScreen extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - if(!projectsProvider.isArabic) - AppText( - TranslationBase.of(context).patient, - fontWeight: FontWeight.bold, - ), + if (!projectsProvider.isArabic) + AppText( + TranslationBase.of(context).patient, + fontWeight: FontWeight.bold, + ), AppText( TranslationBase.of(context).sickLeave, fontSize: 24, @@ -193,9 +195,10 @@ class AddSickLeavScreen extends StatelessWidget { ), Flexible( child: AppText( - DateUtils.getDayMonthYearDateFormatted(DateUtils - .convertStringToDate( - item.startDate)), + DateUtils.getDayMonthYearDateFormatted( + DateUtils + .convertStringToDate( + item.startDate)), fontWeight: FontWeight.bold, ), @@ -212,8 +215,10 @@ class AddSickLeavScreen extends StatelessWidget { ), Flexible( child: AppText( - DateUtils.getDayMonthYearDateFormatted(DateUtils - .convertStringToDate( + DateUtils + .getDayMonthYearDateFormatted( + DateUtils + .convertStringToDate( item.endDate, )), fontWeight: From 74ded739c8c7ff32996f1b8adc3354b9adada4e2 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 6 May 2021 15:03:57 +0300 Subject: [PATCH 4/4] fix imports --- lib/core/service/home/auth_service.dart | 2 +- .../service/patient/DischargedPatientService.dart | 2 +- .../service/patient/MyReferralPatientService.dart | 2 +- lib/core/service/patient/PatientMuseService.dart | 2 +- lib/core/service/patient/ReferralService.dart | 2 +- lib/core/service/patient/out_patient_service.dart | 2 +- .../service/patient/patientInPatientService.dart | 2 +- .../insurance/InsuranceCardService.dart | 4 ++-- .../medical_report/medical_file_service.dart | 4 ++-- .../sick_leave/sickleave_service.dart | 5 ++--- .../ucaf/patient-ucaf-service.dart | 2 +- lib/core/viewModel/DischargedPatientViewModel.dart | 2 +- lib/core/viewModel/InsuranceViewModel.dart | 6 +++--- lib/core/viewModel/PatientMuseViewModel.dart | 4 ++-- lib/core/viewModel/PatientSearchViewModel.dart | 4 ++-- lib/core/viewModel/auth_view_model.dart | 4 ++-- lib/core/viewModel/dashboard_view_model.dart | 3 +-- lib/core/viewModel/doctor_replay_view_model.dart | 2 +- lib/core/viewModel/imei_view_model.dart | 4 ++-- lib/core/viewModel/labs_view_model.dart | 2 +- lib/core/viewModel/medical_file_view_model.dart | 4 ++-- .../patient-admission-request-viewmodel.dart | 2 +- lib/core/viewModel/patient-referral-viewmodel.dart | 12 ++++++------ lib/core/viewModel/patient-ucaf-viewmodel.dart | 4 ++-- .../viewModel/patient-vital-sign-viewmodel.dart | 2 +- lib/core/viewModel/patient_view_model.dart | 2 +- lib/core/viewModel/prescriptions_view_model.dart | 2 +- lib/core/viewModel/procedure_View_model.dart | 6 +++--- lib/core/viewModel/radiology_view_model.dart | 2 +- lib/core/viewModel/referral_view_model.dart | 2 +- lib/core/viewModel/referred_view_model.dart | 2 +- lib/core/viewModel/schedule_view_model.dart | 2 +- lib/core/viewModel/sick_leave_view_model.dart | 2 +- lib/landing_page.dart | 2 +- lib/locator.dart | 14 +++++++------- lib/screens/auth/login_screen.dart | 2 +- lib/screens/medicine/medicine_search_screen.dart | 2 +- lib/screens/patients/PatientsInPatientScreen.dart | 2 +- .../patients/ReferralDischargedPatientDetails.dart | 2 +- .../patients/out_patient/filter_date_page.dart | 2 +- .../patient_search_result_screen.dart | 2 +- .../patient_search/patient_search_screen.dart | 2 +- lib/screens/patients/patient_search/time_bar.dart | 2 +- .../patients/profile/UCAF/UCAF-detail-screen.dart | 2 +- .../referral/AddReplayOnReferralPatient.dart | 2 +- .../referral/referral_patient_detail_in-paint.dart | 2 +- lib/widgets/auth/verification_methods.dart | 2 +- pubspec.lock | 6 +++--- 48 files changed, 74 insertions(+), 76 deletions(-) diff --git a/lib/core/service/home/auth_service.dart b/lib/core/service/home/auth_service.dart index 1aa9a88e..b5435a59 100644 --- a/lib/core/service/home/auth_service.dart +++ b/lib/core/service/home/auth_service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; +import 'package:doctor_app_flutter/core/model/auth/imei_details.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; diff --git a/lib/core/service/patient/DischargedPatientService.dart b/lib/core/service/patient/DischargedPatientService.dart index a31837ad..2b353016 100644 --- a/lib/core/service/patient/DischargedPatientService.dart +++ b/lib/core/service/patient/DischargedPatientService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; +import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/service/patient/MyReferralPatientService.dart b/lib/core/service/patient/MyReferralPatientService.dart index ffa982b0..536e68a7 100644 --- a/lib/core/service/patient/MyReferralPatientService.dart +++ b/lib/core/service/patient/MyReferralPatientService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; +import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/doctor/request_add_referred_doctor_remarks.dart'; diff --git a/lib/core/service/patient/PatientMuseService.dart b/lib/core/service/patient/PatientMuseService.dart index 8c821104..c34de9e0 100644 --- a/lib/core/service/patient/PatientMuseService.dart +++ b/lib/core/service/patient/PatientMuseService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientMuseResultsModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientMuseResultsModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; class PatientMuseService extends BaseService { diff --git a/lib/core/service/patient/ReferralService.dart b/lib/core/service/patient/ReferralService.dart index 64f473d9..69e2a810 100644 --- a/lib/core/service/patient/ReferralService.dart +++ b/lib/core/service/patient/ReferralService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/ReferralRequest.dart'; +import 'package:doctor_app_flutter/core/model/referral/ReferralRequest.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; class ReferralService extends BaseService { diff --git a/lib/core/service/patient/out_patient_service.dart b/lib/core/service/patient/out_patient_service.dart index 339f6a93..004bb59f 100644 --- a/lib/core/service/patient/out_patient_service.dart +++ b/lib/core/service/patient/out_patient_service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/service/patient/patientInPatientService.dart b/lib/core/service/patient/patientInPatientService.dart index 32de0ead..e0bc94a3 100644 --- a/lib/core/service/patient/patientInPatientService.dart +++ b/lib/core/service/patient/patientInPatientService.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart index 6bdf5f79..2bb9dac7 100644 --- a/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart +++ b/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/insurance_approval_request_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval_in_patient_model.dart'; +import 'package:doctor_app_flutter/core/model/insurance/insurance_approval.dart'; +import 'package:doctor_app_flutter/core/model/insurance/insurance_approval_in_patient_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart b/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart index d80b89fa..42cdafc6 100644 --- a/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart +++ b/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_request_model.dart'; +import 'package:doctor_app_flutter/core/model/medical_report/medical_file_model.dart'; +import 'package:doctor_app_flutter/core/model/medical_report/medical_file_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; class MedicalFileService extends BaseService { diff --git a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart index c16a2d31..8113c9a7 100644 --- a/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart +++ b/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart @@ -1,13 +1,12 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/sick_leave/sick_leave_patient_request_model.dart'; +import 'package:doctor_app_flutter/core/model/sick_leave/sick_leave_patient_model.dart'; +import 'package:doctor_app_flutter/core/model/sick_leave/sick_leave_patient_request_model.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; import 'package:doctor_app_flutter/core/viewModel/leave_rechdule_response.dart'; import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart'; import 'package:doctor_app_flutter/models/sickleave/extend_sick_leave_request.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; -// import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart'; class SickLeaveService extends BaseService { Map get sickLeavestatisitics => _statistics; diff --git a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart index 478d48f3..db2deb13 100644 --- a/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart +++ b/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/service/base/lookup-service.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; diff --git a/lib/core/viewModel/DischargedPatientViewModel.dart b/lib/core/viewModel/DischargedPatientViewModel.dart index 6e130abe..9df347e2 100644 --- a/lib/core/viewModel/DischargedPatientViewModel.dart +++ b/lib/core/viewModel/DischargedPatientViewModel.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/DischargedPatientService.dart'; +import 'package:doctor_app_flutter/core/service/patient/DischargedPatientService.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/InsuranceViewModel.dart b/lib/core/viewModel/InsuranceViewModel.dart index e41d68bd..46f48d35 100644 --- a/lib/core/viewModel/InsuranceViewModel.dart +++ b/lib/core/viewModel/InsuranceViewModel.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/insurance/insurance_approval_in_patient_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart'; +import 'package:doctor_app_flutter/core/model/insurance/insurance_approval.dart'; +import 'package:doctor_app_flutter/core/model/insurance/insurance_approval_in_patient_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/insurance/InsuranceCardService.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/viewModel/PatientMuseViewModel.dart b/lib/core/viewModel/PatientMuseViewModel.dart index 68826e04..312d6ebb 100644 --- a/lib/core/viewModel/PatientMuseViewModel.dart +++ b/lib/core/viewModel/PatientMuseViewModel.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientMuseResultsModel.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/PatientMuseService.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientMuseResultsModel.dart'; +import 'package:doctor_app_flutter/core/service/patient/PatientMuseService.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/PatientSearchViewModel.dart b/lib/core/viewModel/PatientSearchViewModel.dart index c9dede3e..7a145fff 100644 --- a/lib/core/viewModel/PatientSearchViewModel.dart +++ b/lib/core/viewModel/PatientSearchViewModel.dart @@ -1,9 +1,9 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/patient/out_patient_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patientInPatientService.dart'; +import 'package:doctor_app_flutter/core/service/patient/patientInPatientService.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; diff --git a/lib/core/viewModel/auth_view_model.dart b/lib/core/viewModel/auth_view_model.dart index 1b79b051..bb4fd305 100644 --- a/lib/core/viewModel/auth_view_model.dart +++ b/lib/core/viewModel/auth_view_model.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/insert_imei_model.dart'; +import 'package:doctor_app_flutter/core/model/auth/imei_details.dart'; +import 'package:doctor_app_flutter/core/model/auth/insert_imei_model.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart index 178713c5..1205699b 100644 --- a/lib/core/viewModel/dashboard_view_model.dart +++ b/lib/core/viewModel/dashboard_view_model.dart @@ -1,6 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/dasboard_service.dart'; - +import 'package:doctor_app_flutter/core/service/home/dasboard_service.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index e0c63a76..18f1a9f5 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/doctor_reply_service.dart'; +import 'package:doctor_app_flutter/core/service/home/doctor_reply_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/imei_view_model.dart b/lib/core/viewModel/imei_view_model.dart index 63b26e98..f8c45762 100644 --- a/lib/core/viewModel/imei_view_model.dart +++ b/lib/core/viewModel/imei_view_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; +import 'package:doctor_app_flutter/core/model/auth/imei_details.dart'; +import 'package:doctor_app_flutter/core/service/home/auth_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; diff --git a/lib/core/viewModel/labs_view_model.dart b/lib/core/viewModel/labs_view_model.dart index 071ebad6..e5a2f9f1 100644 --- a/lib/core/viewModel/labs_view_model.dart +++ b/lib/core/viewModel/labs_view_model.dart @@ -4,7 +4,7 @@ import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart'; import 'package:doctor_app_flutter/core/model/labs/lab_result.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart'; import 'package:doctor_app_flutter/core/model/labs/patient_lab_special_result.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/lab_order/labs_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/lab_order/labs_service.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; diff --git a/lib/core/viewModel/medical_file_view_model.dart b/lib/core/viewModel/medical_file_view_model.dart index 0e2c724f..08e8ce90 100644 --- a/lib/core/viewModel/medical_file_view_model.dart +++ b/lib/core/viewModel/medical_file_view_model.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/medical_report/medical_file_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart'; +import 'package:doctor_app_flutter/core/model/medical_report/medical_file_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/medical_report/medical_file_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; diff --git a/lib/core/viewModel/patient-admission-request-viewmodel.dart b/lib/core/viewModel/patient-admission-request-viewmodel.dart index 61334494..0868b601 100644 --- a/lib/core/viewModel/patient-admission-request-viewmodel.dart +++ b/lib/core/viewModel/patient-admission-request-viewmodel.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/admission_request/patient-admission-request-service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/admission_request/patient-admission-request-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart index 67544e6f..a414c200 100644 --- a/lib/core/viewModel/patient-referral-viewmodel.dart +++ b/lib/core/viewModel/patient-referral-viewmodel.dart @@ -1,11 +1,11 @@ import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/DischargedPatientService.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/MyReferralPatientService.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/ReferralService.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient-doctor-referral-service.dart'; +import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart'; +import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; +import 'package:doctor_app_flutter/core/service/patient/DischargedPatientService.dart'; +import 'package:doctor_app_flutter/core/service/patient/MyReferralPatientService.dart'; +import 'package:doctor_app_flutter/core/service/patient/ReferralService.dart'; +import 'package:doctor_app_flutter/core/service/patient/patient-doctor-referral-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/PendingReferral.dart'; diff --git a/lib/core/viewModel/patient-ucaf-viewmodel.dart b/lib/core/viewModel/patient-ucaf-viewmodel.dart index 301902a6..cada20f6 100644 --- a/lib/core/viewModel/patient-ucaf-viewmodel.dart +++ b/lib/core/viewModel/patient-ucaf-viewmodel.dart @@ -1,8 +1,8 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index bb8367a6..98b45c41 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/vital_sign/patient-vital-signs-service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/vital_sign/patient-vital-sign-data.dart'; diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index ce34e566..de40afde 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -2,7 +2,7 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/note/CreateNoteModel.dart'; import 'package:doctor_app_flutter/core/model/note/note_model.dart'; import 'package:doctor_app_flutter/core/model/note/update_note_model.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient_service.dart'; +import 'package:doctor_app_flutter/core/service/patient/patient_service.dart'; import 'package:doctor_app_flutter/models/patient/lab_orders/lab_orders_res_model.dart'; import 'package:doctor_app_flutter/models/patient/lab_result/lab_result.dart'; import 'package:doctor_app_flutter/models/patient/prescription/prescription_report.dart'; diff --git a/lib/core/viewModel/prescriptions_view_model.dart b/lib/core/viewModel/prescriptions_view_model.dart index 4554a48d..b5916bac 100644 --- a/lib/core/viewModel/prescriptions_view_model.dart +++ b/lib/core/viewModel/prescriptions_view_model.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/perscription_pharmac import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart'; import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescriptions_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescriptions_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:flutter/material.dart'; diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart index 1cd0be2f..32a40e7e 100644 --- a/lib/core/viewModel/procedure_View_model.dart +++ b/lib/core/viewModel/procedure_View_model.dart @@ -11,9 +11,9 @@ import 'package:doctor_app_flutter/core/model/procedure/procedure_valadate_model import 'package:doctor_app_flutter/core/model/procedure/procedure_valadate_request_model.dart'; import 'package:doctor_app_flutter/core/model/procedure/update_procedure_request_model.dart'; import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/lab_order/labs_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/procedure/procedure_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/radiology/radiology_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/lab_order/labs_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/procedure/procedure_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/radiology/radiology_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/core/viewModel/radiology_view_model.dart b/lib/core/viewModel/radiology_view_model.dart index 92d4c344..d656de6c 100644 --- a/lib/core/viewModel/radiology_view_model.dart +++ b/lib/core/viewModel/radiology_view_model.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/radiology/radiology_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/radiology/radiology_service.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/core/viewModel/referral_view_model.dart b/lib/core/viewModel/referral_view_model.dart index 6c2b2858..892284e2 100644 --- a/lib/core/viewModel/referral_view_model.dart +++ b/lib/core/viewModel/referral_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/referral_patient_service.dart'; +import 'package:doctor_app_flutter/core/service/patient/referral_patient_service.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/referred_view_model.dart b/lib/core/viewModel/referred_view_model.dart index f77ea922..173aa60a 100644 --- a/lib/core/viewModel/referred_view_model.dart +++ b/lib/core/viewModel/referred_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/referred_patient_service.dart'; +import 'package:doctor_app_flutter/core/service/patient/referred_patient_service.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/schedule_view_model.dart b/lib/core/viewModel/schedule_view_model.dart index d0e58535..3ee64c9b 100644 --- a/lib/core/viewModel/schedule_view_model.dart +++ b/lib/core/viewModel/schedule_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/schedule_service.dart'; +import 'package:doctor_app_flutter/core/service/home/schedule_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/sick_leave_view_model.dart b/lib/core/viewModel/sick_leave_view_model.dart index e69eb5bf..b768cc9d 100644 --- a/lib/core/viewModel/sick_leave_view_model.dart +++ b/lib/core/viewModel/sick_leave_view_model.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart'; +import 'package:doctor_app_flutter/core/service/patient_medical_file/sick_leave/sickleave_service.dart'; import 'package:doctor_app_flutter/models/sickleave/add_sickleave_request.dart'; import 'package:doctor_app_flutter/models/sickleave/get_all_sickleave_response.dart'; diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 99c37e83..0e1e2c48 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -1,7 +1,7 @@ -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/screens/qr_reader/QR_reader_screen.dart'; import 'package:doctor_app_flutter/screens/doctor/doctor_reply_screen.dart'; import 'package:doctor_app_flutter/screens/doctor/my_schedule_screen.dart'; import 'package:doctor_app_flutter/screens/home/home_screen.dart'; +import 'package:doctor_app_flutter/screens/qr_reader/QR_reader_screen.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_drawer_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/bottom_nav_bar.dart'; diff --git a/lib/locator.dart b/lib/locator.dart index 9f22685a..321b3ffa 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,10 +1,3 @@ -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/dasboard_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/medical_report/medical_file_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient/patient_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/prescription/prescription_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/procedure/procedure_service.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; @@ -14,11 +7,18 @@ import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart'; import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart'; import 'package:get_it/get_it.dart'; +import 'core/service/home/auth_service.dart'; +import 'core/service/home/dasboard_service.dart'; import 'core/service/patient/DischargedPatientService.dart'; +import 'core/service/patient/patient_service.dart'; import 'core/service/patient_medical_file/insurance/InsuranceCardService.dart'; import 'core/service/patient/MyReferralPatientService.dart'; import 'core/service/patient/PatientMuseService.dart'; import 'core/service/patient/ReferralService.dart'; +import 'core/service/patient_medical_file/medical_report/medical_file_service.dart'; +import 'core/service/patient_medical_file/prescription/prescription_service.dart'; +import 'core/service/patient_medical_file/procedure/procedure_service.dart'; +import 'core/service/patient_medical_file/sick_leave/sickleave_service.dart'; import 'core/service/patient_medical_file/soap/SOAP_service.dart'; import 'core/service/home/doctor_reply_service.dart'; import 'core/service/patient_medical_file/lab_order/labs_service.dart'; diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index a8e9dddc..77d35bfd 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/service/home/auth_service.dart'; +import 'package:doctor_app_flutter/core/service/home/auth_service.dart'; import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart'; diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index 34497b4f..41ccd59e 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:autocomplete_textfield/autocomplete_textfield.dart'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/search_drug/get_medication_response_model.dart'; +import 'package:doctor_app_flutter/core/model/search_drug/get_medication_response_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/medicine/pharmacies_list_screen.dart'; diff --git a/lib/screens/patients/PatientsInPatientScreen.dart b/lib/screens/patients/PatientsInPatientScreen.dart index cff3b8ee..60446887 100644 --- a/lib/screens/patients/PatientsInPatientScreen.dart +++ b/lib/screens/patients/PatientsInPatientScreen.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; diff --git a/lib/screens/patients/ReferralDischargedPatientDetails.dart b/lib/screens/patients/ReferralDischargedPatientDetails.dart index 70db59f1..9cdd8615 100644 --- a/lib/screens/patients/ReferralDischargedPatientDetails.dart +++ b/lib/screens/patients/ReferralDischargedPatientDetails.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/DischargeReferralPatient.dart'; +import 'package:doctor_app_flutter/core/model/referral/DischargeReferralPatient.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/screens/patients/out_patient/filter_date_page.dart b/lib/screens/patients/out_patient/filter_date_page.dart index 0f64fcad..c00d362a 100644 --- a/lib/screens/patients/out_patient/filter_date_page.dart +++ b/lib/screens/patients/out_patient/filter_date_page.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/core/enum/filter_type.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart'; import 'package:doctor_app_flutter/util/date-utils.dart'; diff --git a/lib/screens/patients/patient_search/patient_search_result_screen.dart b/lib/screens/patients/patient_search/patient_search_result_screen.dart index 32e7627b..3395ead8 100644 --- a/lib/screens/patients/patient_search/patient_search_result_screen.dart +++ b/lib/screens/patients/patient_search/patient_search_result_screen.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; diff --git a/lib/screens/patients/patient_search/patient_search_screen.dart b/lib/screens/patients/patient_search/patient_search_screen.dart index 115c89e8..b6f9cae8 100644 --- a/lib/screens/patients/patient_search/patient_search_screen.dart +++ b/lib/screens/patients/patient_search/patient_search_screen.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; diff --git a/lib/screens/patients/patient_search/time_bar.dart b/lib/screens/patients/patient_search/time_bar.dart index a5f694e9..a1ee2cab 100644 --- a/lib/screens/patients/patient_search/time_bar.dart +++ b/lib/screens/patients/patient_search/time_bar.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/patient_type.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/patient_muse/PatientSearchRequestModel.dart'; +import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; diff --git a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart index 7db245fe..6890d74f 100644 --- a/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart +++ b/lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/Prescriptions/prescription_model.dart'; +import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart'; import 'package:doctor_app_flutter/models/SOAP/GetAssessmentResModel.dart'; import 'package:doctor_app_flutter/models/SOAP/master_key_model.dart'; diff --git a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart index a2ea0ebb..f54a18ac 100644 --- a/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart +++ b/lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; +import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/provider/robot_provider.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; diff --git a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart index c6745059..a7a6677d 100644 --- a/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/referral/MyReferralPatientModel.dart'; +import 'package:doctor_app_flutter/core/model/referral/MyReferralPatientModel.dart'; import 'package:doctor_app_flutter/core/viewModel/patient-referral-viewmodel.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index e393c11a..8162d4ba 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -1,7 +1,7 @@ import 'dart:io' show Platform; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -import 'file:///C:/Users/admin/AndroidStudioProjects/doctor_app_flutter/lib/core/model/auth/imei_details.dart'; +import 'package:doctor_app_flutter/core/model/auth/imei_details.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; diff --git a/pubspec.lock b/pubspec.lock index 1a572a0a..825db695 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -615,7 +615,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -907,7 +907,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.10.0-nullsafety.1" sticky_headers: dependency: "direct main" description: @@ -1098,5 +1098,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <=2.11.0-213.1.beta" + dart: ">=2.10.0 <2.11.0" flutter: ">=1.22.0 <2.0.0"