Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring

 Conflicts:

	lib/screens/patients/profile/lab_result/labs_home_page.dart

lib/config/config.dart

@@ -434,7 +434,7 @@ const TRANSACTION_NO = 0;
 const LANGUAGE_ID = 2;
 const STAMP = '2020-04-27T12:17:17.721Z';
 const IP_ADDRESS = '9.9.9.9';
-const VERSION_ID = 6.8;
+const VERSION_ID = 6.7;
 const CHANNEL = 9;
 const SESSION_ID = 'BlUSkYymTt';
 const IS_LOGIN_FOR_DOCTOR_APP = true;

lib/config/localized_values.dart

@@ -789,7 +789,7 @@ const Map<String, Map<String, String>> localizedValues = {
   },
   "SpecialResult": {"en": "Special Result", "ar": "نتيجة خاصة"},
   "noDataAvailable": {
-    "en": "No data available",
+    "en": "Sorry, no data is available",
     "ar": " لا يوجد بيانات متاحة "
   },
   "show-more-btn": {"en": "Flowchart", "ar": "النتائج التراكمية"},

lib/core/enum/PatientType.dart

@@ -2,3 +2,5 @@ enum PatientType {
   IN_PATIENT,
   OUT_PATIENT,
 }
+
+///TODO Elham* Merge the  patient type.

lib/core/model/SOAP/Allergy_model.dart

@@ -1,60 +0,0 @@
-class AllergyModel {
-  int allergyDiseaseId;
-  String allergyDiseaseName;
-  int allergyDiseaseType;
-  int appointmentNo;
-  int createdBy;
-  String createdByName;
-  String createdOn;
-  int episodeID;
-  bool isChecked;
-  bool isUpdatedByNurse;
-  int severity;
-  String severityName;
-
-  AllergyModel(
-      {this.allergyDiseaseId,
-      this.allergyDiseaseName,
-      this.allergyDiseaseType,
-      this.appointmentNo,
-      this.createdBy,
-      this.createdByName,
-      this.createdOn,
-      this.episodeID,
-      this.isChecked,
-      this.isUpdatedByNurse,
-      this.severity,
-      this.severityName});
-
-  AllergyModel.fromJson(Map<String, dynamic> json) {
-    allergyDiseaseId = json['allergyDiseaseId'];
-    allergyDiseaseName = json['allergyDiseaseName'];
-    allergyDiseaseType = json['allergyDiseaseType'];
-    appointmentNo = json['appointmentNo'];
-    createdBy = json['createdBy'];
-    createdByName = json['createdByName'];
-    createdOn = json['createdOn'];
-    episodeID = json['episodeID'];
-    isChecked = json['isChecked'];
-    isUpdatedByNurse = json['isUpdatedByNurse'];
-    severity = json['severity'];
-    severityName = json['severityName'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['allergyDiseaseId'] = this.allergyDiseaseId;
-    data['allergyDiseaseName'] = this.allergyDiseaseName;
-    data['allergyDiseaseType'] = this.allergyDiseaseType;
-    data['appointmentNo'] = this.appointmentNo;
-    data['createdBy'] = this.createdBy;
-    data['createdByName'] = this.createdByName;
-    data['createdOn'] = this.createdOn;
-    data['episodeID'] = this.episodeID;
-    data['isChecked'] = this.isChecked;
-    data['isUpdatedByNurse'] = this.isUpdatedByNurse;
-    data['severity'] = this.severity;
-    data['severityName'] = this.severityName;
-    return data;
-  }
-}

lib/core/model/SOAP/progress_note/get_progress_note_req_model.dart

@@ -1,4 +1,4 @@
-class GetGetProgressNoteReqModel {
+class GetProgressNoteReqModel {
   int patientMRN;
   int appointmentNo;
   String episodeID;
@@ -8,7 +8,7 @@ class GetGetProgressNoteReqModel {
   dynamic doctorID;
   dynamic editedBy;
 
-  GetGetProgressNoteReqModel(
+  GetProgressNoteReqModel(
       {this.patientMRN,
       this.appointmentNo,
       this.episodeID,
@@ -18,7 +18,7 @@ class GetGetProgressNoteReqModel {
       this.editedBy,
       this.doctorID});
 
-  GetGetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
+  GetProgressNoteReqModel.fromJson(Map<String, dynamic> json) {
     patientMRN = json['PatientMRN'];
     appointmentNo = json['AppointmentNo'];
     episodeID = json['EpisodeID'];

lib/core/model/charts/app_time_series_chart.dart

@@ -0,0 +1,19 @@
+import 'package:charts_flutter/flutter.dart' as charts;
+import 'package:charts_flutter/flutter.dart';
+import 'package:doctor_app_flutter/config/size_config.dart';
+import 'package:doctor_app_flutter/widgets/data_display/list/flexible_container.dart';
+import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
+import 'package:flutter/material.dart';
+class TimeSeriesSales {
+  final DateTime time;
+  final int sales;
+
+  TimeSeriesSales(this.time, this.sales);
+}
+
+class TimeSeriesSales2 {
+  final DateTime time;
+  final double sales;
+
+  TimeSeriesSales2(this.time, this.sales);
+}

lib/core/model/countries_model.dart

@@ -1,20 +1,3 @@
-// final List<Countries> countries = [
-//   new Countries(
-//       name: "Saudi Arabia", name_ar: "المملكة العربية السعودية", code: '966'),
-//   new Countries(
-//       name: "United Arab Emirates",
-//       name_ar: "الإمارات العربية المتحدة",
-//       code: '971'),
-// ];
-
-// class Countries {
-//   final String name;
-//   final String name_ar;
-//   final String code;
-
-//   Countries({this.name, this.name_ar, this.code});
-// }
-
 class Countries {
   String name;
   String nameAr;

lib/core/model/labs/request_patient_lab_orders.dart

@@ -1,64 +0,0 @@
-class RequestPatientLabOrders {
-  double versionID;
-  int channel;
-  int languageID;
-  String iPAdress;
-  String generalid;
-  int patientOutSA;
-  String sessionID;
-  bool isDentalAllowedBackend;
-  int deviceTypeID;
-  int patientID;
-  String tokenID;
-  int patientTypeID;
-  int patientType;
-
-  RequestPatientLabOrders(
-      {this.versionID,
-      this.channel,
-      this.languageID,
-      this.iPAdress,
-      this.generalid,
-      this.patientOutSA,
-      this.sessionID,
-      this.isDentalAllowedBackend,
-      this.deviceTypeID,
-      this.patientID,
-      this.tokenID,
-      this.patientTypeID,
-      this.patientType});
-
-  RequestPatientLabOrders.fromJson(Map<String, dynamic> json) {
-    versionID = json['VersionID'];
-    channel = json['Channel'];
-    languageID = json['LanguageID'];
-    iPAdress = json['IPAdress'];
-    generalid = json['generalid'];
-    patientOutSA = json['PatientOutSA'];
-    sessionID = json['SessionID'];
-    isDentalAllowedBackend = json['isDentalAllowedBackend'];
-    deviceTypeID = json['DeviceTypeID'];
-    patientID = json['PatientID'];
-    tokenID = json['TokenID'];
-    patientTypeID = json['PatientTypeID'];
-    patientType = json['PatientType'];
-  }
-
-  Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['VersionID'] = this.versionID;
-    data['Channel'] = this.channel;
-    data['LanguageID'] = this.languageID;
-    data['IPAdress'] = this.iPAdress;
-    data['generalid'] = this.generalid;
-    data['PatientOutSA'] = this.patientOutSA;
-    data['SessionID'] = this.sessionID;
-    data['isDentalAllowedBackend'] = this.isDentalAllowedBackend;
-    data['DeviceTypeID'] = this.deviceTypeID;
-    data['PatientID'] = this.patientID;
-    data['TokenID'] = this.tokenID;
-    data['PatientTypeID'] = this.patientTypeID;
-    data['PatientType'] = this.patientType;
-    return data;
-  }
-}

lib/core/service/base/lookup-service.dart

@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/core/enum/master_lookup_key.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 
 import 'base_service.dart';

lib/core/service/home/scan_qr_service.dart

@@ -11,12 +11,7 @@ class ScanQrService extends BaseService {
       PatientSearchRequestModel requestModel, bool isMyInpatient) async {
     hasError = false;
     await getDoctorProfile();
-
-    // if (isMyInpatient) {
-    //   requestModel.doctorID = doctorProfile.doctorID;
-    // } else {
     requestModel.doctorID = 0;
-    //}
 
     await baseAppClient.post(
       GET_PATIENT_IN_PATIENT_LIST,

lib/core/service/patient_medical_file/insurance/InsuranceCardService.dart

@@ -1,5 +1,5 @@
 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_request_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';

lib/core/service/patient_medical_file/lab_order/labs_service.dart

@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/model/labs/LabOrderResult.dart';
-import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart';
+import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart';
+import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart';
 import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart';
 import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_request.dart';
 import 'package:doctor_app_flutter/core/model/labs/lab_result.dart';

lib/core/service/patient_medical_file/prescription/medicine_service.dart

@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/service/base/base_service.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
 import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_List_request_model.dart';
 import 'package:doctor_app_flutter/core/model/pharmacies/pharmacies_items_request_model.dart';
 

lib/core/service/patient_medical_file/prescription/prescription_service.dart

@@ -14,15 +14,15 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.
 import 'package:doctor_app_flutter/core/model/Prescriptions/request_get_list_pharmacy_for_prescriptions.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/request_prescription_report_enh.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/model/calculate_box_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/core/model/SOAP/GetAllergiesResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';

lib/core/service/patient_medical_file/soap/SOAP_service.dart

@@ -1,28 +1,26 @@
 import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.dart';
 
 import '../../base/lookup-service.dart';
 
@@ -36,23 +34,6 @@ class SOAPService extends LookupService {
 
   int episodeID;
 
-  Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
-    await baseAppClient.post(
-      GET_ALLERGIES,
-      onSuccess: (dynamic response, int statusCode) {
-        allergiesList.clear();
-        response['List_Allergies']['entityList'].forEach((v) {
-          allergiesList.add(MasterKeyModel.fromJson(v));
-        });
-      },
-      onFailure: (String error, int statusCode) {
-        hasError = true;
-        super.error = error;
-      },
-      body: getAllergiesRequestModel.toJson(),
-    );
-  }
-
   Future postEpisode(PostEpisodeReqModel postEpisodeReqModel) async {
     hasError = false;
 
@@ -229,6 +210,7 @@ class SOAPService extends LookupService {
   Future getPatientAllergy(GeneralGetReqForSOAP generalGetReqForSOAP) async {
     hasError = false;
 
+    ///TODO Elham* change the url constant to get getPatientAllergy
     await baseAppClient.post(GET_ALLERGIES,
         onSuccess: (dynamic response, int statusCode) {
       print("Success");
@@ -291,7 +273,7 @@ class SOAPService extends LookupService {
   }
 
   Future getPatientProgressNote(
-      GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
+      GetProgressNoteReqModel getGetProgressNoteReqModel) async {
     hasError = false;
     await baseAppClient.post(GET_PROGRESS_NOTE,
         onSuccess: (dynamic response, int statusCode) {

lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart

@@ -1,9 +1,9 @@
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart';
 import 'package:doctor_app_flutter/core/service/base/lookup-service.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart';
+import 'package:doctor_app_flutter/core/model/procedure/order-procedure.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart';
 

lib/core/viewModel/DischargedPatientViewModel.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient/DischargedPatientService.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 

lib/core/viewModel/InsuranceViewModel.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.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';

lib/core/viewModel/LiveCarePatientViewModel.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/live_care/AlternativeServicesList.dart';
 import 'package:doctor_app_flutter/core/model/live_care/PendingPatientERForDoctorAppRequestModel.dart';
 import 'package:doctor_app_flutter/core/model/live_care/live_care_login_reguest_model.dart';

lib/core/viewModel/PatientMedicalReportViewModel.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/MedicalReport/MedicalReportTemplate.dart';

lib/core/viewModel/PatientMuseViewModel.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.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';

lib/core/viewModel/PatientRegistrationViewModel.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/PatientRegistration/CheckActivationCodeModel.dart';
 import 'package:doctor_app_flutter/core/model/PatientRegistration/CheckPatientForRegistrationModel.dart';
 import 'package:doctor_app_flutter/core/model/PatientRegistration/GetPatientInfoRequestModel.dart';

lib/core/viewModel/PatientSearchViewModel.dart

@@ -1,6 +1,6 @@
 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 'package:doctor_app_flutter/core/enum/view_state.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 'package:doctor_app_flutter/core/service/patient/patientInPatientService.dart';

lib/core/viewModel/SOAP_view_model.dart

@@ -1,32 +1,31 @@
 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/enum/view_state.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/post_chief_complaint_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/get_history_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_list_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/get_physical_exam_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/physical_exam/post_physical_exam_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/GetGetProgressNoteResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/get_progress_note_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/progress_note/post_progress_note_request_model.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/core/model/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GeneralGetReqForSOAP.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetGetProgressNoteResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetHistoryResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamListResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetPhysicalExamReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/PatchAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/PostEpisodeReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/get_Allergies_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/in_patient/GetEpisodeForInpatientReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/in_patient/PostEpisodeForInpatientRequestModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/general_get_req_for_SOAP.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/patch_assessment_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/post_episode_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/in_patient/get_episode_for_inpatient_req_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/in_patient/post_episode_for_Inpatient_request_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_allergy_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_assessment_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_chief_complaint_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_histories_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_physical_exam_request_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/post_progress_note_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/post_allergy_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/post_assessment_request_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/history/post_histories_request_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_allergy.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_examination.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/selected_items/my_selected_history.dart';
@@ -152,17 +151,6 @@ class SOAPViewModel extends BaseViewModel {
   nextOnPlanPage(model) {
     planCallBack.nextFunction(model);
   }
-
-  Future getAllergies(GetAllergiesRequestModel getAllergiesRequestModel) async {
-    setState(ViewState.Busy);
-    await _SOAPService.getAllergies(getAllergiesRequestModel);
-    if (_SOAPService.hasError) {
-      error = _SOAPService.error;
-      setState(ViewState.Error);
-    } else
-      setState(ViewState.Idle);
-  }
-
   Future getMasterLookup(MasterKeysService masterKeys,
       {bool isBusyLocal = false}) async {
     if (isBusyLocal) {
@@ -326,7 +314,7 @@ class SOAPViewModel extends BaseViewModel {
   }
 
   Future getPatientProgressNote(
-      GetGetProgressNoteReqModel getGetProgressNoteReqModel) async {
+      GetProgressNoteReqModel getGetProgressNoteReqModel) async {
     setState(ViewState.Busy);
     await _SOAPService.getPatientProgressNote(getGetProgressNoteReqModel);
     if (_SOAPService.hasError) {
@@ -336,16 +324,6 @@ class SOAPViewModel extends BaseViewModel {
       setState(ViewState.Idle);
   }
 
-  Future getPatientAssessment(
-      GetAssessmentReqModel getAssessmentReqModel) async {
-    setState(ViewState.Busy);
-    await _SOAPService.getPatientAssessment(getAssessmentReqModel);
-    if (_SOAPService.hasError) {
-      error = _SOAPService.error;
-      setState(ViewState.Error);
-    } else
-      setState(ViewState.Idle);
-  }
 
   Future getMedicationList() async {
     setState(ViewState.Busy);
@@ -450,13 +428,6 @@ class SOAPViewModel extends BaseViewModel {
           return result.first;
         }
         break;
-      // case MasterKeysService.physiotherapyGoals:
-      //   listOfPhysiotherapyGoals.clear();
-      //   entryList.forEach((v) {
-      //     listOfPhysiotherapyGoals.add(MasterKeyModel.fromJson(v));
-      //   });
-      //   break;
-
       case MasterKeysService.DiagnosisType:
         List<MasterKeyModel> result = listOfDiagnosisType.where((element) {
           return element.id == id &&

lib/core/viewModel/authentication_view_model.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/core/enum/auth_method_types.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/auth/activation_Code_req_model.dart';
 import 'package:doctor_app_flutter/core/model/auth/activation_code_for_verification_screen_model.dart';
 import 'package:doctor_app_flutter/core/model/auth/check_activation_code_for_doctor_app_response_model.dart';

lib/core/viewModel/base_view_model.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/doctor/doctor_profile_model.dart';
 import 'package:doctor_app_flutter/utils/dr_app_shared_pref.dart';
 import 'package:flutter/material.dart';

lib/core/viewModel/dashboard_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/home/dasboard_service.dart';
 import 'package:doctor_app_flutter/core/service/home/doctor_reply_service.dart';
 import 'package:doctor_app_flutter/core/service/special_clinics/special_clinic_service.dart';

lib/core/viewModel/doctor_replay_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/home/doctor_reply_service.dart';
 import 'package:doctor_app_flutter/core/model/doctor/list_gt_my_patients_question_model.dart';
 import 'package:doctor_app_flutter/core/model/doctor/replay/request_create_doctor_response.dart';

lib/core/viewModel/hospitals_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_request_model.dart';
 import 'package:doctor_app_flutter/core/service/hospitals/hospitals_service.dart';
 

lib/core/viewModel/labs_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/labs/LabOrderResult.dart';
-import 'package:doctor_app_flutter/core/model/labs/LabResultHistory.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
+import 'package:doctor_app_flutter/core/model/labs/lab_order_result.dart';
+import 'package:doctor_app_flutter/core/model/labs/lab_result_history.dart';
 import 'package:doctor_app_flutter/core/model/labs/all_special_lab_result_model.dart';
 import 'package:doctor_app_flutter/core/model/labs/lab_result.dart';
 import 'package:doctor_app_flutter/core/model/labs/patient_lab_orders.dart';
@@ -96,10 +96,6 @@ class LabsViewModel extends BaseViewModel {
 
   List<LabResultList> labResultLists = List();
 
-  List<LabResultList> get labResultListsCoustom {
-    return labResultLists;
-  }
-
   getLaboratoryResult(
       {String projectID,
       int clinicID,

lib/core/viewModel/medical_file_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.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';

lib/core/viewModel/medicine_view_model.dart

@@ -1,13 +1,13 @@
 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/enum/view_state.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/procedure/procedure_template_details_model.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/core/service/patient_medical_file/procedure/procedure_service.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentReqModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_req_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/prescription/prescription_view_model.dart';
 import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_container.dart';
 import 'package:flutter/cupertino.dart';

lib/core/viewModel/patient-admission-request-viewmodel.dart

@@ -1,5 +1,5 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.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';

lib/core/viewModel/patient-referral-viewmodel.dart

@@ -1,5 +1,5 @@
 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/enum/view_state.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';

lib/core/viewModel/patient-ucaf-viewmodel.dart

@@ -1,13 +1,13 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/chief_complaint/get_chief_complaint_res_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/core/model/SOAP/ChiefComplaint/GetChiefComplaintResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart';
+import 'package:doctor_app_flutter/core/model/procedure/order-procedure.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-history.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';

lib/core/viewModel/patient-vital-sign-viewmodel.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.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/core/model/patient/patiant_info_model.dart';

lib/core/viewModel/patient_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/diabetic_chart/GetDiabeticChartValuesRequestModel.dart';
 import 'package:doctor_app_flutter/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart';
 import 'package:doctor_app_flutter/core/model/diagnosis/GetDiagnosisForInPatientRequestModel.dart';

lib/core/viewModel/pednding_orders_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/pending_order_service.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/locator.dart';

lib/core/viewModel/prescription/prescription_view_model.dart

@@ -1,5 +1,5 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/Prescriptions.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/get_medication_for_inpatient_model.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/perscription_pharmacy.dart';
@@ -8,8 +8,8 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_
 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/SOAP/GetAllergiesResModel.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Allergy/get_allergies_res_model.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/model/patient/vital_sign/patient-vital-sign-data.dart';
 import 'package:doctor_app_flutter/core/service/patient_medical_file/prescription/prescription_service.dart';

lib/core/viewModel/procedure_View_model.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/labs/LabOrderResult.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
+import 'package:doctor_app_flutter/core/model/labs/lab_order_result.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';

lib/core/viewModel/profile/discharge_summary_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient/profile/discharge_summary_servive.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/locator.dart';

lib/core/viewModel/profile/intervention_medication_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/dashboard/get_special_clinical_care_mapping_List_Respose_Model.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/locator.dart';

lib/core/viewModel/profile/operation_report_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient/profile/operation_report_servive.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
 import 'package:doctor_app_flutter/locator.dart';

lib/core/viewModel/profile/vte_assessment_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_req_model.dart';
 import 'package:doctor_app_flutter/core/model/vte_assessment/vte_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/service/patient/profile/discharge_summary_servive.dart';

lib/core/viewModel/radiology_view_model.dart

@@ -1,5 +1,5 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/radiology/final_radiology.dart';
 import 'package:doctor_app_flutter/core/service/patient_medical_file/radiology/radiology_service.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';

lib/core/viewModel/referral_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient/referral_patient_service.dart';
 import 'package:doctor_app_flutter/core/model/patient/my_referral/my_referral_patient_model.dart';
 

lib/core/viewModel/scan_qr_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
 import 'package:doctor_app_flutter/core/service/home/scan_qr_service.dart';
 import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart';
@@ -21,7 +21,6 @@ class ScanQrViewModel extends BaseViewModel {
 
       setState(ViewState.ErrorLocal);
     } else {
-      // setDefaultInPatientList();
       setState(ViewState.Idle);
     }
   }

lib/core/viewModel/schedule_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/home/schedule_service.dart';
 import 'package:doctor_app_flutter/core/model/doctor/list_doctor_working_hours_table_model.dart';
 

lib/core/viewModel/sick_leave_view_model.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/service/patient/patient_service.dart';
 import 'package:doctor_app_flutter/core/service/patient_medical_file/sick_leave/sickleave_service.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';

lib/lookups/auth_lookup.dart

@@ -1,7 +0,0 @@
-enum loginType {
-  knownUser,
-  unknownUser,
-  changePassword,
-  verifyPassword,
-  verificationMethods
-}

lib/routes.dart

@@ -12,7 +12,7 @@ import 'package:doctor_app_flutter/screens/patients/profile/admission_request/ad
 import 'package:doctor_app_flutter/screens/patients/profile/diabetic_chart/diabetic_chart.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/diagnosis/diagnosis_screen.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/discharge_summary/discharge_summary.dart';
-import 'package:doctor_app_flutter/screens/patients/profile/lab_result/all_lab_special_result_page.dart';
+import 'package:doctor_app_flutter/screens/patients/profile/lab_result/special_result/all_lab_special_result_page.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/lab_result/labs_home_page.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart';
 import 'package:doctor_app_flutter/screens/patients/profile/medical_report/MedicalReportDetailPage.dart';

lib/screens/auth/login_screen.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';

lib/screens/auth/verification_methods_screen.dart

@@ -3,7 +3,7 @@ import 'dart:io' show Platform;
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
 import 'package:doctor_app_flutter/core/enum/auth_method_types.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/utils/date-utils.dart';

lib/screens/doctor/doctor_replay/all_doctor_questions.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_widget.dart';

lib/screens/doctor/doctor_replay/doctor_repaly_chat.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
 import 'package:doctor_app_flutter/core/model/doctor/list_gt_my_patients_question_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
@@ -8,7 +8,7 @@ import 'package:doctor_app_flutter/utils/date-utils.dart';
 import 'package:doctor_app_flutter/utils/dr_app_toast_msg.dart';
 import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
-import 'package:doctor_app_flutter/widgets/shared/TextFields.dart';
+import 'package:doctor_app_flutter/widgets/shared/text_fields/TextFields.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart';

lib/screens/doctor/doctor_replay/not_replaied_doctor_questions.dart

@@ -1,11 +1,10 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
 import 'package:doctor_app_flutter/screens/doctor/doctor_replay/doctor_reply_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
-import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:flutter/material.dart';
 

lib/screens/home/home_screen.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart';
 import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart';

lib/screens/live_care/end_call_screen.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/core/model/livecare/session_status_model.dart';

lib/screens/live_care/live-care_transfer_to_admin.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/provider/robot_provider.dart';
 import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';

lib/screens/live_care/live_care_patient_screen.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/LiveCarePatientViewModel.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';

lib/screens/patient-sick-leave/add_patient_sick_leave_screen.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/sick_leave_view_model.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';

lib/screens/patients/In_patient/in_patient_list_page.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/viewModel/PatientSearchViewModel.dart';
 import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';

lib/screens/patients/In_patient/in_patient_screen.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.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/project_view_model.dart';

lib/screens/patients/out_patient/filter_date_page.dart

@@ -1,5 +1,5 @@
 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/enum/view_state.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';

lib/screens/patients/out_patient/out_patient_screen.dart

@@ -1,6 +1,6 @@
 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 'package:doctor_app_flutter/core/enum/view_state.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/authentication_view_model.dart';

lib/screens/patients/profile/UCAF/ucaf_detail_screen.dart

@@ -1,4 +1,4 @@
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';

lib/screens/patients/profile/UCAF/widgets/diagnosis_widget.dart

@@ -1,6 +1,6 @@
 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/model/SOAP/GetAssessmentResModel.dart';
+import 'package:doctor_app_flutter/core/model/SOAP/Assessment/get_assessment_res_model.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/master_key_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';

lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart

@@ -1,6 +1,6 @@
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/core/model/SOAP/order-procedure.dart';
+import 'package:doctor_app_flutter/core/model/procedure/order-procedure.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-ucaf-viewmodel.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
 import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';

lib/screens/patients/profile/admission-orders/admission_orders_screen.dart

@@ -9,7 +9,6 @@ import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-prof
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/card_with_bg_widget.dart';
-import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
 import 'package:doctor_app_flutter/widgets/shared/errors/error_message.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';

lib/screens/patients/profile/admission_request/admission_request_first_screen.dart

@@ -1,5 +1,5 @@
 import 'package:doctor_app_flutter/config/size_config.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart';
 import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-admission-request-viewmodel.dart';

lib/screens/patients/profile/admission_request/admission_request_second_screen.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/master_lookup_key.dart';
-import 'package:doctor_app_flutter/core/enum/viewstate.dart';
+import 'package:doctor_app_flutter/core/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart';
 import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-admission-request-viewmodel.dart';

lib/screens/patients/profile/admission_request/admission_request_third_screen.dart

@@ -1,6 +1,6 @@
 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/enum/view_state.dart';
 import 'package:doctor_app_flutter/core/model/admissionRequest/admission-request.dart';
 import 'package:doctor_app_flutter/core/service/AnalyticsService.dart';
 import 'package:doctor_app_flutter/core/viewModel/patient-admission-request-viewmodel.dart';