Sultan Khan
|
cee04fb71e
|
Merge branch 'flutter_3.16.0_zoom' into update_3.16.0_CR5439_Pharmacy_Intervention
# Conflicts:
# lib/screens/home/home_screen.dart
|
1 year ago |
Sultan khan
|
b8bdee99a6
|
referral click fixed,
|
2 years ago |
Aamir Muhammad
|
d2c26df4d0
|
Android Native Change For Call
|
3 years ago |
Aamir Muhammad
|
79446a20e8
|
Android Native Change For Call
|
3 years ago |
Aamir Muhammad
|
499cdc77d4
|
Null Safety Fixes & Overrides
|
3 years ago |
Aamir Muhammad
|
ea497ff8b1
|
Null Safety Fixes & Overrides
|
3 years ago |
Aamir Muhammad
|
693d352669
|
Null Safety Fixes
|
3 years ago |
Aamir Muhammad
|
3b2ee0ef65
|
Null Safety Fixes
|
3 years ago |
Aamir Muhammad
|
e524151da9
|
Null Safety
|
3 years ago |
Aamir Muhammad
|
cb01308f96
|
Null Safety
|
3 years ago |
Aamir Muhammad
|
d4cb4d7ad3
|
Null Safety
|
3 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
|
3 years ago |
Aamir Muhammad
|
f977dc10a4
|
Fixes
|
3 years ago |
Aamir Muhammad
|
1bc355b2c4
|
Null Safety Updates 3.16
|
3 years ago |
Aamir Muhammad
|
597d5a3498
|
Null Safety Update
|
3 years ago |
haroon amjad
|
e530646c28
|
VidaPlus changes for radiology
|
3 years ago |
haroon amjad
|
5d4aeff350
|
Updates & fixes
|
3 years ago |
RoaaGhali98
|
e61d1e78f6
|
Refactoring
|
4 years ago |
RoaaGhali98
|
c93ea2f285
|
Refactoring
|
4 years ago |
RoaaGhali98
|
240c9aa411
|
Refactoring
|
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
|
228237bf96
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
Conflicts:
lib/widgets/patients/dynamic_elements.dart
|
5 years ago |
RoaaGhali98
|
182f890e92
|
Fix the form in prescription screen
|
5 years ago |
Elham Rababh
|
cb19a5fcfe
|
move models to the core file
|
5 years ago |
Elham Rababh
|
25f902487c
|
small fix in referal
|
5 years ago |
RoaaGhali98
|
83ea30303b
|
fix referred-patient-screen
|
5 years ago |
RoaaGhali98
|
e8b5165953
|
Fix some issues
|
5 years ago |
RoaaGhali98
|
b8076f177b
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
|
5 years ago |
RoaaGhali98
|
db83bec292
|
Fix referred-patient-screen design
|
5 years ago |
Elham Rababh
|
d9b2a618f5
|
small fix
|
5 years ago |
Elham Rababh
|
05b656416d
|
small fix
|
5 years ago |
Elham Rababh
|
ed447f6b17
|
fix issue DAPP-48
|
5 years ago |
Elham Rababh
|
fb610d21b0
|
reformat code
|
5 years ago |
Elham Rababh
|
d37d10639a
|
optimize imports
|
5 years ago |
Elham Rababh
|
558de8ec75
|
fix issues with text fields
|
5 years ago |
Elham Rababh
|
73cc5e4b00
|
fix issues
|
5 years ago |
Elham Ali
|
480017f887
|
Merge branch 'doctor-app-design' into 'development'
Doctor app design
See merge request Cloud_Solution/doctor_app_flutter!929
|
5 years ago |
hussam al-habibeh
|
a4aa695f25
|
TextField & page header design fix
|
5 years ago |
Elham Rababh
|
4dcc20b681
|
fix issues related to card
|
5 years ago |
Elham Rababh
|
3e1ac71a48
|
fix some design issues
|
5 years ago |
Elham Rababh
|
bd133f8f31
|
fix issues on Patient card
|
5 years ago |
Elham Rababh
|
f68c0fe426
|
fix issues on Patient card
|
5 years ago |
Elham Rababh
|
c2fbd99ced
|
small fixes
|
5 years ago |
Elham Ali
|
6375d9fb2d
|
Merge branch 'doctor-app-design' into 'development'
referral screen design fix
See merge request Cloud_Solution/doctor_app_flutter!923
|
5 years ago |
hussam al-habibeh
|
c6635397bb
|
referral screen design fix
|
5 years ago |
Elham Ali
|
bff995ecfa
|
Merge branch 'Dec_fixes' into 'development'
Dec fixes
See merge request Cloud_Solution/doctor_app_flutter!922
|
5 years ago |
hussam al-habibeh
|
c6a77563cc
|
app button color match
|
5 years ago |
Elham Rababh
|
efe25b898d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes
|
5 years ago |