Commit Graph

685 Commits (0db3617737dcbb786a617522d38fe3c53a039bd9)

Author SHA1 Message Date
Aamir Muhammad 0db3617737 Null Safety 2 years ago
Aamir Muhammad e524151da9 Null Safety 2 years ago
Aamir Muhammad dc802e2bda Merge remote-tracking branch 'origin/development-3.3' into update_flutter_3.16.0
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/kotlin/com/hmg/hmgDr/Service/BaseMovingFloatingWidget.kt
#	android/app/src/main/kotlin/com/hmg/hmgDr/ui/fragment/VideoCallFragment.kt
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/client/base_app_client.dart
#	lib/core/model/ER_sign_in/doctor_ER_sign_assessment_req_model.dart
#	lib/core/model/SOAP/assessment/post_assessment_request_model.dart
#	lib/core/model/admissionRequest/admission-request.dart
#	lib/core/model/auth/check_activation_code_for_doctor_app_response_model.dart
#	lib/core/model/doctor/clinic_model.dart
#	lib/core/model/hospitals/get_hospitals_request_model.dart
#	lib/core/model/labs/patient_lab_orders.dart
#	lib/core/model/patient/get_doctor_by_clinic_id_request.dart
#	lib/core/model/patient/vital_sign/patient-vital-sign-data.dart
#	lib/core/model/pharmacy-intervention-model/intervention_medication_history_res_model.dart
#	lib/core/model/radiology/final_radiology.dart
#	lib/core/service/AnalyticsService.dart
#	lib/core/service/VideoCallService.dart
#	lib/core/service/authentication_service.dart
#	lib/core/service/hospitals/hospitals_service.dart
#	lib/core/service/patient_medical_file/ER_signin/ER_signin_service.dart
#	lib/core/service/patient_medical_file/lab_order/labs_service.dart
#	lib/core/service/patient_medical_file/radiology/radiology_service.dart
#	lib/core/service/pending_order_service.dart
#	lib/core/viewModel/ER_sign_in/ER_sign_in_view_model.dart
#	lib/core/viewModel/SOAP_view_model.dart
#	lib/core/viewModel/authentication_view_model.dart
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/core/viewModel/doctor_replay_view_model.dart
#	lib/core/viewModel/patient-ucaf-viewmodel.dart
#	lib/core/viewModel/procedure_View_model.dart
#	lib/core/viewModel/radiology_view_model.dart
#	lib/screens/ER_singin/ER_singin_screen.dart
#	lib/screens/auth/login_screen.dart
#	lib/screens/auth/verification_methods_screen.dart
#	lib/screens/live_care/video_call.dart
#	lib/screens/medical-file/medical_file_details.dart
#	lib/screens/medicine/medicine_search_screen.dart
#	lib/screens/patients/DischargedPatientPage.dart
#	lib/screens/patients/ECGPage.dart
#	lib/screens/patients/out_patient/out_patient_screen.dart
#	lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
#	lib/screens/patients/profile/diabetic_chart/line_chart_for_diabetic.dart
#	lib/screens/patients/profile/lab_result/history/line_chart_curved_lab_history.dart
#	lib/screens/patients/profile/lab_result/laboratory_result/laboratory_result_widget.dart
#	lib/screens/patients/profile/notes/note/progress_note_screen.dart
#	lib/screens/patients/profile/notes/note/update_note.dart
#	lib/screens/patients/profile/operation_report/update_operation_report.dart
#	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
#	lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
#	lib/screens/patients/profile/radiology/radiology_details_page.dart
#	lib/screens/patients/profile/radiology/radiology_home_page.dart
#	lib/screens/patients/profile/referral/refer_details/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/update_objective_page.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/soap_utils.dart
#	lib/screens/patients/profile/soap_update/subjective/allergies/add_allergies.dart
#	lib/screens/patients/profile/soap_update/subjective/allergies/master_key_checkbox_search_allergies_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/vital_sign/line_chart_curved.dart
#	lib/screens/patients/profile/vital_sign/line_chart_curved_blood_pressure.dart
#	lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart
#	lib/screens/patients/profile/vital_sign/vital_sign_item_details_screen.dart
#	lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
#	lib/screens/prescription/add_prescription/prescription_form_widget.dart
#	lib/screens/prescription/old_prescriptions_page.dart
#	lib/screens/prescription/prescription_checkout_screen.dart
#	lib/screens/procedures/add_procedure_page.dart
#	lib/screens/procedures/entity_list_checkbox_search_widget.dart
#	lib/screens/reschedule_leaves/reschedule_leave.dart
#	lib/utils/translations_delegate_base_utils.dart
#	lib/utils/utils.dart
#	lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart
#	lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart
#	lib/widgets/shared/app_scaffold_widget.dart
#	lib/widgets/shared/app_texts_widget.dart
#	lib/widgets/shared/dialogs/dailog-list-select.dart
#	lib/widgets/shared/dialogs/master_key_dailog.dart
#	lib/widgets/shared/dialogs/search-drugs-dailog-list.dart
#	lib/widgets/shared/text_fields/TextFields.dart
#	lib/widgets/shared/text_fields/html_rich_editor.dart
#	pubspec.lock
#	pubspec.yaml
2 years ago
Sultan khan b5851f384d DOCTOR ROTA AND LAB RAD CHANGES 2 years ago
Aamir Muhammad 435567305e Pubspec & Models Null Safety Update 2 years ago
haroon amjad fde016c38b updates 2 years ago
haroon amjad 0d65197b2f updates & fixes 2 years ago
haroon amjad e530646c28 VidaPlus changes for radiology 2 years ago
haroon amjad fc21961807 updates & fixes 2 years ago
Sultan khan 2b13d43757 bug fixes 2 years ago
haroon amjad 0861a0c79f updates 3 years ago
haroon amjad ac74e1e62d updates 3 years ago
haroon amjad 92c665197d SetupID made dynamic 3 years ago
haroon amjad 5d4aeff350 Updates & fixes 3 years ago
Sultan khan ba5f29ee9f updated code for v.3.3 3 years ago
Elham Rababh 3a9c64779e small fix 4 years ago
Elham Rababh bcb1e90ae6 ER Done form our side 4 years ago
Elham Rababh 17f32c4dc8 fixes on procedure 4 years ago
Elham Rababh c30d6bebd8 session management update 4 years ago
Elham Rababh e935014776 add todo 4 years ago
Elham Rababh 7fc52ecad4 finish fix lab result 4 years ago
Elham Rababh 208aa9dd6e ucaf design refactor finished 4 years ago
RoaaGhali98 7812d5081e Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 dceefadc06 Fixing some issues in progress_note_screen and update_note 4 years ago
RoaaGhali98 f3b39906f5 Add DropDownText to add progress note screen 4 years ago
RoaaGhali98 22c26c02de Delete repeated API's 4 years ago
RoaaGhali98 40c1502a9b add translation 4 years ago
Elham Rababh ba62056c4d finish add Prescription 4 years ago
Elham Rababh 954402fe52 show the list of prescription 4 years ago
Elham Rababh 9461d3d4a1 add new prescription 4 years ago
RoaaGhali98 34f658a166 Add Translation to prescription pages 4 years ago
Elham Rababh 6905ed702e first step form redesign pharmacy page 4 years ago
RoaaGhali98 e8b5165953 Fix some issues 4 years ago
Elham Ali 8f1d4f80bd Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959
4 years ago
RoaaGhali98 47a077bd52 Edit some issues in the my_schedule_screen 4 years ago
RoaaGhali98 2ffa745e73 add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen 4 years ago
RoaaGhali98 fde96fbce7 Fix some issues 4 years ago
RoaaGhali98 be40076def Add new function in intervention_medication_service called accepted or rejected 4 years ago
RoaaGhali98 e165ec5b1d add new service called intervention_medication_history_screen 4 years ago
RoaaGhali98 0d542a862e add new service 4 years ago
Elham Rababh af1217dd67 finish assessment screen 4 years ago
RoaaGhali98 406165c348 we fix some issues -in-patient 4 years ago
Elham Rababh da63af6db3 vte assessment 4 years ago
RoaaGhali98 268c637316 Redesign for my_schedule_screen and make it responsive to any device 4 years ago
Elham Rababh 71ce8d22e3 fix the size of the button inside the app 4 years ago
Elham Rababh edbb99e445 small fix 4 years ago
Elham Rababh fb610d21b0 reformat code 4 years ago
RoaaGhali98 0901a2e39c fixed some issues in localized_values and progress_note_screen 4 years ago
RoaaGhali98 746c2fdddb fixed some issues in localized_values and out_patient_screen 4 years ago
Elham Rababh 4dcc20b681 fix issues related to card 4 years ago