Elham Ali
|
81ae0b04d3
|
Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
|
3 years ago |
hussam al-habibeh
|
24618e5232
|
flutter 2 models
|
3 years ago |
|
Elham Rababh
|
47437c8637
|
some fixes to go flutter 2
|
3 years ago |
|
Elham Rababh
|
a6153db2f9
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
Conflicts:
lib/client/base_app_client.dart
lib/config/localized_values.dart
lib/config/size_config.dart
lib/core/model/Prescriptions/prescription_report.dart
lib/core/model/Prescriptions/prescription_report_enh.dart
lib/core/model/auth/activation_Code_req_model.dart
lib/core/model/auth/activation_code_for_verification_screen_model.dart
lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
lib/core/model/auth/check_activation_code_request_model.dart
lib/core/model/labs/lab_result.dart
lib/core/model/patient_muse/PatientSearchRequestModel.dart
lib/core/model/procedure/get_ordered_procedure_request_model.dart
lib/core/model/referral/MyReferralPatientModel.dart
lib/core/model/sick_leave/sick_leave_patient_model.dart
lib/core/model/sick_leave/sick_leave_patient_request_model.dart
lib/core/service/VideoCallService.dart
lib/core/service/base/base_service.dart
lib/core/service/home/scan_qr_service.dart
lib/core/service/patient/LiveCarePatientServices.dart
lib/core/service/patient/MyReferralPatientService.dart
lib/core/service/patient/patient-doctor-referral-service.dart
lib/core/service/patient_medical_file/lab_order/labs_service.dart
lib/core/service/patient_medical_file/medical_report/PatientMedicalReportService.dart
lib/core/service/patient_medical_file/prescription/prescriptions_service.dart
lib/core/service/patient_medical_file/procedure/procedure_service.dart
lib/core/service/patient_medical_file/radiology/radiology_service.dart
lib/core/service/patient_medical_file/sick_leave/sickleave_service.dart
lib/core/service/patient_medical_file/soap/SOAP_service.dart
lib/core/service/patient_medical_file/ucaf/patient-ucaf-service.dart
lib/core/viewModel/PatientSearchViewModel.dart
lib/core/viewModel/SOAP_view_model.dart
lib/core/viewModel/authentication_view_model.dart
lib/core/viewModel/base_view_model.dart
lib/core/viewModel/dashboard_view_model.dart
lib/core/viewModel/doctor_replay_view_model.dart
lib/core/viewModel/labs_view_model.dart
lib/core/viewModel/patient-referral-viewmodel.dart
lib/core/viewModel/patient-ucaf-viewmodel.dart
lib/core/viewModel/prescription_view_model.dart
lib/core/viewModel/prescriptions_view_model.dart
lib/core/viewModel/procedure_View_model.dart
lib/core/viewModel/sick_leave_view_model.dart
lib/models/SOAP/ChiefComplaint/GetChiefComplaintReqModel.dart
lib/models/SOAP/GetPhysicalExamReqModel.dart
lib/models/SOAP/my_selected_allergy.dart
lib/models/SOAP/my_selected_assement.dart
lib/models/SOAP/my_selected_examination.dart
lib/models/SOAP/my_selected_history.dart
lib/models/SOAP/post_chief_complaint_request_model.dart
lib/models/SOAP/post_physical_exam_request_model.dart
lib/models/doctor/list_gt_my_patients_question_model.dart
lib/models/doctor/profile_req_Model.dart
lib/models/doctor/replay/request_doctor_reply.dart
lib/models/livecare/start_call_res.dart
lib/models/patient/patiant_info_model.dart
lib/models/patient/progress_note_request.dart
lib/models/patient/vital_sign/vital_sign_req_model.dart
lib/models/pharmacies/pharmacies_items_request_model.dart
lib/screens/auth/verification_methods_screen.dart
lib/screens/doctor/doctor_repaly_chat.dart
lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
lib/screens/doctor/doctor_reply_screen.dart
lib/screens/doctor/my_referral_patient_screen.dart
lib/screens/home/dashboard_swipe_widget.dart
lib/screens/home/home_patient_card.dart
lib/screens/home/home_screen.dart
lib/screens/live_care/end_call_screen.dart
lib/screens/live_care/live_care_patient_screen.dart
lib/screens/live_care/video_call.dart
lib/screens/medical-file/health_summary_page.dart
lib/screens/medicine/medicine_search_screen.dart
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/InPatientPage.dart
lib/screens/patients/PatientsInPatientScreen.dart
lib/screens/patients/insurance_approval_screen_patient.dart
lib/screens/patients/out_patient/out_patient_screen.dart
lib/screens/patients/patient_search/patient_search_header.dart
lib/screens/patients/patient_search/patient_search_result_screen.dart
lib/screens/patients/patient_search/patient_search_screen.dart
lib/screens/patients/profile/UCAF/UCAF-detail-screen.dart
lib/screens/patients/profile/UCAF/UCAF-input-screen.dart
lib/screens/patients/profile/UCAF/page-stepper-widget.dart
lib/screens/patients/profile/admission-request/admission-request-first-screen.dart
lib/screens/patients/profile/admission-request/admission-request-third-screen.dart
lib/screens/patients/profile/admission-request/admission-request_second-screen.dart
lib/screens/patients/profile/lab_result/FlowChartPage.dart
lib/screens/patients/profile/lab_result/LabResultWidget.dart
lib/screens/patients/profile/lab_result/laboratory_result_page.dart
lib/screens/patients/profile/lab_result/laboratory_result_widget.dart
lib/screens/patients/profile/lab_result/labs_home_page.dart
lib/screens/patients/profile/medical_report/AddVerifyMedicalReport.dart
lib/screens/patients/profile/medical_report/MedicalReportPage.dart
lib/screens/patients/profile/notes/note/progress_note_screen.dart
lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
lib/screens/patients/profile/radiology/radiology_details_page.dart
lib/screens/patients/profile/radiology/radiology_home_page.dart
lib/screens/patients/profile/referral/my-referral-detail-screen.dart
lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart
lib/screens/patients/profile/referral/refer-patient-screen-in-patient.dart
lib/screens/patients/profile/referral/refer-patient-screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/patients/profile/referral/referred-patient-screen.dart
lib/screens/patients/profile/referral/referred_patient_detail_in-paint.dart
lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart
lib/screens/patients/profile/soap_update/objective/add_examination_page.dart
lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
lib/screens/patients/profile/soap_update/objective/examination_item_card.dart
lib/screens/patients/profile/soap_update/objective/examinations_list_search_widget.dart
lib/screens/patients/profile/soap_update/objective/update_objective_page.dart
lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_open_items.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/SOAP_step_header.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/bottom_sheet_title.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart
lib/screens/patients/profile/soap_update/shared_soap_widgets/steps_widget.dart
lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
lib/screens/patients/profile/soap_update/subjective/allergies/update_allergies_widget.dart
lib/screens/patients/profile/soap_update/subjective/history/add_history_dialog.dart
lib/screens/patients/profile/soap_update/subjective/history/priority_bar.dart
lib/screens/patients/profile/soap_update/subjective/history/update_history_widget.dart
lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
lib/screens/patients/profile/soap_update/update_soap_index.dart
lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
lib/screens/prescription/add_prescription_form.dart
lib/screens/prescription/prescription_item_in_patient_page.dart
lib/screens/prescription/prescription_text_filed.dart
lib/screens/prescription/prescriptions_page.dart
lib/screens/procedures/ProcedureCard.dart
lib/screens/procedures/add-favourite-procedure.dart
lib/screens/procedures/procedure_checkout_screen.dart
lib/screens/procedures/procedure_screen.dart
lib/screens/reschedule-leaves/add-rescheduleleave.dart
lib/screens/reschedule-leaves/reschedule_leave.dart
lib/screens/sick-leave/add-sickleave.dart
lib/screens/sick-leave/show-sickleave.dart
lib/screens/sick-leave/sick_leave.dart
lib/util/VideoChannel.dart
lib/util/date-utils.dart
lib/util/translations_delegate_base.dart
lib/widgets/patients/patient-referral-item-widget.dart
lib/widgets/patients/patient_card/PatientCard.dart
lib/widgets/patients/profile/PatientProfileButton.dart
lib/widgets/patients/profile/patient-profile-app-bar.dart
lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
lib/widgets/patients/profile/profile-welcome-widget.dart
lib/widgets/patients/profile/profile_medical_info_widget.dart
lib/widgets/patients/profile/profile_medical_info_widget_search.dart
lib/widgets/patients/profile/profile_status_info_widget.dart
lib/widgets/shared/app_texts_widget.dart
lib/widgets/shared/bottom_nav_bar.dart
lib/widgets/shared/bottom_navigation_item.dart
lib/widgets/shared/buttons/app_buttons_widget.dart
lib/widgets/shared/card_with_bg_widget.dart
lib/widgets/shared/dialogs/dailog-list-select.dart
lib/widgets/shared/dialogs/master_key_dailog.dart
lib/widgets/shared/doctor_card.dart
lib/widgets/shared/doctor_card_insurance.dart
lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
lib/widgets/shared/master_key_checkbox_search_widget.dart
lib/widgets/shared/rounded_container_widget.dart
lib/widgets/shared/text_fields/app-textfield-custom.dart
lib/widgets/shared/text_fields/text_fields_utils.dart
lib/widgets/shared/user-guid/custom_validation_error.dart
lib/widgets/transitions/fade_page.dart
lib/widgets/transitions/slide_up_page.dart
pubspec.lock
pubspec.yaml
|
3 years ago |
|
hussam al-habibeh
|
132d781eb5
|
conflect resorved
|
3 years ago |
|
Elham Rababh
|
52ec3fc0e3
|
fix navigator issues
|
3 years ago |
|
Elham Rababh
|
03acd233cf
|
fix version id
|
3 years ago |
|
Elham Rababh
|
b119590e39
|
Doctor replay add info status 99
|
3 years ago |
|
Elham Rababh
|
1f3d1f68fb
|
change the status of replay
|
3 years ago |
Mohammad Aljammal
|
d5cff77743
|
fix login issue and add new localizedValues
|
3 years ago |
|
Elham Rababh
|
943463b1d9
|
add pagination to doctor replay
|
3 years ago |
|
Elham Rababh
|
c31db4890b
|
finish doctor response
|
3 years ago |
|
Elham Rababh
|
854f42ce96
|
Create Doctor Response working fine
|
3 years ago |
|
hussam al-habibeh
|
110a1983c7
|
flutter vervion 2 migration
|
3 years ago |
|
hussam al-habibeh
|
6e6a7deba5
|
migration Services to flutter 2
|
3 years ago |
|
Mohammad Aljammal
|
d784310c82
|
Migrate models to flutter 2
|
3 years ago |
|
hussam al-habibeh
|
2a44840666
|
hot fix
|
3 years ago |
|
Mohammad Aljammal
|
b3ae86db31
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
Conflicts:
lib/screens/patients/DischargedPatientPage.dart
lib/screens/patients/ReferralDischargedPatientDetails.dart
lib/screens/patients/insurance_approvals_details.dart
lib/screens/patients/patients_screen.dart
lib/screens/patients/profile/note/progress_note_screen.dart
lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
lib/screens/prescription/update_prescription_form.dart
lib/screens/sick-leave/add-sickleave.dart
lib/widgets/patients/PatientCard.dart
pubspec.lock
|
4 years ago |
Haroon Amjad
|
53a610213c
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
# lib/screens/home/home_screen.dart
# lib/widgets/auth/login_form.dart
# lib/widgets/auth/verfiy_account.dart
|
4 years ago |
Zohaib Iqbal Kambrani
|
4b7688d620
|
showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
|
4 years ago |
|
Mohammad Aljammal
|
29e2d962bc
|
Optimize imports
|
4 years ago |
|
Elham Rababah
|
7b7ce4e037
|
refactor utils folder
|
4 years ago |
|
Haroon Amjad
|
27b4450dac
|
versionID changed to 5.5
|
4 years ago |
|
Mohammad Aljammal
|
f4d1aac5e6
|
hot fixes on doctor replay and schedule
|
4 years ago |
|
Elham Rababah
|
4ecf9fe4b9
|
add doctor replay
|
4 years ago |
|
Elham Rababah
|
083b49aa0a
|
fix DA-341
|
4 years ago |
|
hussam al-habibeh
|
749e870ea2
|
get procedures get prescription
|
4 years ago |
|
hussam al-habibeh
|
d3bb85129c
|
LogIn function refactoring
|
4 years ago |
ibrahim albitar
|
ee8d481504
|
live care web service
|
4 years ago |
Elham Rababah
|
bd3ce0a4d4
|
refactor models
|
4 years ago |