 taha.alam@cloudsolutions.com.sa
|
412afbb532
|
ipd issues resolved.
|
7 months ago |
|
taha.alam@cloudsolutions.com.sa
|
5426aae0dc
|
IPD changes
|
7 months 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
|
597d5a3498
|
Null Safety Update
|
3 years ago |
Sultan khan
|
2b13d43757
|
bug fixes
|
3 years ago |
Elham Rababh
|
077cad7df5
|
refactor names
|
4 years ago |
RoaaGhali98
|
240c9aa411
|
Refactoring
|
4 years ago |
|
Elham Rababh
|
cb19a5fcfe
|
move models to the core file
|
5 years ago |
|
Elham Rababh
|
f8371f71a1
|
fix intervention_medication
|
5 years ago |
|
Elham Rababh
|
90c74c2f06
|
small fix issues
|
5 years ago |
|
RoaaGhali98
|
8464c70f35
|
Replace static data
|
5 years ago |
|
RoaaGhali98
|
4ef41e0c5a
|
Replace static data
|
5 years ago |
|
RoaaGhali98
|
19d981d9e0
|
Wrapping the Row cards with CustomRow in intervention_medication.dart and intervention_medication_history_screen.dart and fix the accept or reject issue, fix the lable in intervention_medication_history_screen.dart and edit the initial date in pharmacy_intervention_screen.dart
|
5 years ago |
|
Elham Rababh
|
a829532717
|
call service after accept or reject
|
5 years ago |
|
RoaaGhali98
|
211990518f
|
Editing the accept_or_reject_req_model
|
5 years ago |
|
Elham Rababh
|
694be7315b
|
fix issue on loading
|
5 years ago |
|
RoaaGhali98
|
fec899ebb7
|
Add static data
|
5 years ago |
|
RoaaGhali98
|
d3f0f1a141
|
Fix the date format in intervention_medication_view_model
|
5 years ago |
|
RoaaGhali98
|
fde96fbce7
|
Fix some issues
|
5 years ago |
|
Elham Rababh
|
37928c1757
|
fix issues
|
5 years ago |
|
RoaaGhali98
|
be40076def
|
Add new function in intervention_medication_service called accepted or rejected
|
5 years ago |
|
RoaaGhali98
|
65d04b2d0f
|
fix some issues
|
5 years ago |
|
RoaaGhali98
|
e165ec5b1d
|
add new service called intervention_medication_history_screen
|
5 years ago |
|
RoaaGhali98
|
0d542a862e
|
add new service
|
5 years ago |
|
RoaaGhali98
|
79372b86c1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
Conflicts:
lib/locator.dart
lib/routes.dart
lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
|
5 years ago |
|
RoaaGhali98
|
0a0aa6ba77
|
we add a new service called new_medication_screen
|
5 years ago |
|
Elham Rababh
|
af1217dd67
|
finish assessment screen
|
5 years ago |
|
RoaaGhali98
|
406165c348
|
we fix some issues -in-patient
|
5 years ago |
|
Elham Rababh
|
da63af6db3
|
vte assessment
|
5 years ago |
|
Elham Rababh
|
fb610d21b0
|
reformat code
|
5 years ago |
|
Elham Rababh
|
d37d10639a
|
optimize imports
|
5 years ago |
|
Elham Ali
|
81ae0b04d3
|
Revert "Merge branch 'hussam_flutter_2' into 'development'"
This reverts merge request !893
|
5 years ago |
hussam al-habibeh
|
1146f613df
|
flutter 2 models
|
5 years ago |
|
Elham Rababh
|
f4a9ab14c8
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into flutter_vervion_2_by_elham
Conflicts:
lib/core/service/patient/profile/discharge_summary_servive.dart
lib/core/viewModel/profile/discharge_summary_view_model.dart
lib/screens/patients/profile/discharge_summary/all_discharge_summary.dart
lib/screens/patients/profile/discharge_summary/discharge_summary.dart
lib/screens/patients/profile/discharge_summary/pending_discharge_summary.dart
|
5 years ago |
|
Elham Rababh
|
dc0f3e7235
|
fix utils && widget
|
5 years ago |
|
Elham Rababh
|
7f9969b6cf
|
some fixes to go flutter 2
|
5 years ago |
|
hussam al-habibeh
|
37d4dfffa2
|
all discharge summary
|
5 years ago |
|
Elham Rababh
|
6ffbf92d43
|
finish pending discharge summary
|
5 years ago |