Sultan khan
|
9cd330bad0
|
Merge branch 'update_flutter_3.16.0' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
|
2 years ago |
Sultan khan
|
e4b891bf68
|
Merge branch 'development-3.3' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
# Conflicts:
# ios/Runner.xcodeproj/project.pbxproj
# lib/core/model/SOAP/assessment/patch_assessment_req_model.dart
# lib/core/service/patient_medical_file/soap/SOAP_service.dart
# lib/core/viewModel/SOAP_view_model.dart
# lib/core/viewModel/dashboard_view_model.dart
# lib/core/viewModel/prescription/prescription_view_model.dart
# lib/core/viewModel/procedure_View_model.dart
# lib/screens/doctor_schedule/doctor_schedule.dart
# lib/screens/home/home_screen.dart
# lib/screens/patients/insurance_approvals_details.dart
# lib/screens/patients/profile/lab_result/labs_home_page.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/prescription/add_prescription/add_drug/add_drug_widget.dart
# lib/screens/prescription/add_prescription/prescription_form_widget.dart
# lib/screens/prescription/new_prescriptions_page.dart
# lib/screens/procedures/add_procedure_page.dart
# lib/screens/procedures/procedure_screen.dart
# lib/utils/translations_delegate_base_utils.dart
# lib/widgets/shared/speech-text-popup.dart
# pubspec.lock
# pubspec.yaml
|
2 years ago |
Sultan khan
|
60bc8a39fd
|
Merge branch 'update_flutter_3.16.0' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
|
2 years ago |
haroon amjad
|
ee86db3778
|
Radiology Critical finding CR Implemented
|
2 years ago |
haroon amjad
|
519b7cfc2e
|
Update to stores for ICD 10 code changes & other improvements
|
2 years ago |
haroon amjad
|
ad1f1e133c
|
updates
|
2 years ago |
Sultan khan
|
ea547b1f71
|
ICD10 CR changes
|
2 years ago |
Sultan khan
|
dd396e50f2
|
bug fixes for latest version
|
2 years ago |
Aamir Muhammad
|
c47c93b2d9
|
Android Native Change For Call
|
2 years ago |
Aamir Muhammad
|
79446a20e8
|
Android Native Change For Call
|
2 years ago |
Aamir Muhammad
|
7e4792d8cd
|
Merge remote-tracking branch 'origin/update_flutter_3.16.0' into update_flutter_3.16.0
|
2 years ago |
Aamir Muhammad
|
499cdc77d4
|
Null Safety Fixes & Overrides
|
2 years ago |
Sultan khan
|
0f2593f56d
|
Merge branch 'update_flutter_3.16.0' of http://34.17.52.79/Haroon6138/doctor_app_flutter into update_flutter_3.16.0
# Conflicts:
# lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
|
2 years ago |
Aamir Muhammad
|
ea497ff8b1
|
Null Safety Fixes & Overrides
|
2 years ago |
Aamir Muhammad
|
693d352669
|
Null Safety Fixes
|
2 years ago |
Sultan khan
|
38d00243d8
|
updates
|
2 years ago |
Aamir Muhammad
|
e1604b09f8
|
Null Safety Fixes
|
2 years ago |
Aamir Muhammad
|
3b2ee0ef65
|
Null Safety Fixes
|
2 years ago |
Sultan khan
|
9e122748e9
|
updated
|
2 years ago |
Sultan khan
|
aee83ce930
|
spacing added
|
2 years ago |
Aamir Muhammad
|
941134da49
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
0db3617737
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
6d18dbbac0
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
e524151da9
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
cb01308f96
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
c3ff456645
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
5194cab7ec
|
Merge remote-tracking branch 'origin/development-3.3' into update_flutter_3.16.0
# Conflicts:
# lib/core/model/dashboard/doctor_schedule.dart
# lib/screens/doctor_schedule/doctor_schedule.dart
|
2 years ago |
Aamir Muhammad
|
307a11c36f
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
7e92348cb5
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
0bcea41cc5
|
Null Safety
|
2 years ago |
Aamir Muhammad
|
d4cb4d7ad3
|
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
|
08c0c0abc1
|
doctor rota
|
2 years ago |
Aamir Muhammad
|
f977dc10a4
|
Fixes
|
2 years ago |
Sultan khan
|
b5851f384d
|
DOCTOR ROTA AND LAB RAD CHANGES
|
2 years ago |
Aamir Muhammad
|
b83c48abe5
|
Updates
|
2 years ago |
Aamir Muhammad
|
bb86949f65
|
Null Safety Updates 3.16
|
2 years ago |
Aamir Muhammad
|
1bc355b2c4
|
Null Safety Updates 3.16
|
2 years ago |
Aamir Muhammad
|
ea7744254b
|
Null Safety Update
|
2 years ago |
Aamir Muhammad
|
76f8b37d1e
|
Null Safety Update
|
2 years ago |
Aamir Muhammad
|
597d5a3498
|
Null Safety Update
|
2 years ago |
Sultan khan
|
320af7d9e0
|
patch allergies updated.
|
2 years ago |
Sultan khan
|
bee21f1123
|
scroll added on add assessment
|
2 years ago |
haroon amjad
|
fde016c38b
|
updates
|
2 years ago |
Sultan khan
|
8b515ee14d
|
progress not updated
|
2 years ago |
Sultan khan
|
8428c2f632
|
Merge branch 'development-3.3' of http://34.17.52.79/Haroon6138/doctor_app_flutter into development-3.3
# Conflicts:
# lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
|
2 years ago |
Sultan khan
|
324792d957
|
post assessment fix
|
2 years ago |
haroon amjad
|
f0204fcbb0
|
updates & fixes
|
2 years ago |
haroon amjad
|
793f9ff905
|
add assessment updated
|
2 years ago |
Sultan khan
|
5e63db7ea6
|
bug fixes and updates
|
2 years ago |
haroon amjad
|
d2a16f5357
|
updates & fixes
|
2 years ago |
haroon amjad
|
e530646c28
|
VidaPlus changes for radiology
|
2 years ago |
haroon amjad
|
1a67129a85
|
radiology fixes
|
2 years ago |
haroon amjad
|
fc21961807
|
updates & fixes
|
2 years ago |
haroon amjad
|
c50100613a
|
updates
|
2 years ago |
Sultan khan
|
2b13d43757
|
bug fixes
|
2 years ago |
haroon amjad
|
90382a1b27
|
Create Episode fixes
|
3 years ago |
haroon amjad
|
ac74e1e62d
|
updates
|
3 years ago |
haroon amjad
|
92c665197d
|
SetupID made dynamic
|
3 years ago |
haroon amjad
|
3b3e911af3
|
Search medicine bug fixed
|
3 years ago |
haroon amjad
|
73ce9d02b8
|
chart fixes
|
3 years ago |
haroon amjad
|
5d4aeff350
|
Updates & fixes
|
3 years ago |
Sultan khan
|
b2773aa320
|
ios fixed for speech to text
|
3 years ago |
Sultan khan
|
ba5f29ee9f
|
updated code for v.3.3
|
3 years ago |
Elham Ali
|
bc7f3e9f35
|
Merge branch 'Er_signin' into 'development'
Er signin
See merge request Cloud_Solution/doctor_app_flutter!999
|
4 years ago |
Elham Rababh
|
3a9c64779e
|
small fix
|
4 years ago |
Elham Ali
|
4fe2a4444d
|
Merge branch 'add_doctor_id' into 'development'
Add doctor
See merge request Cloud_Solution/doctor_app_flutter!997
|
4 years ago |
Elham Rababh
|
bcb1e90ae6
|
ER Done form our side
|
4 years ago |
Elham Rababh
|
092cfbc891
|
fix some issue in prescription
|
4 years ago |
Elham Rababh
|
8b79b0041c
|
design issue
|
4 years ago |
Elham Rababh
|
5f7b52a529
|
fix issue
|
4 years ago |
Elham Rababh
|
17f32c4dc8
|
fixes on procedure
|
4 years ago |
Elham Rababh
|
d717d9e0cf
|
fix in patient_service
|
4 years ago |
Elham Ali
|
6c1425ad5a
|
Merge branch 'procedures_refactoring' into 'add_doctor_id'
Procedures refactoring
See merge request Cloud_Solution/doctor_app_flutter!994
|
4 years ago |
Elham Rababh
|
5422472ccc
|
update procedure
|
4 years ago |
Elham Rababh
|
33b8d6d78d
|
update procedure
|
4 years ago |
Elham Rababh
|
1a3ad32aa5
|
Fix issue on procedure_card.dart
|
4 years ago |
Elham Rababh
|
70573d190a
|
first step from procedures
|
4 years ago |
RoaaGhali98
|
379bfd5bb3
|
Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
|
4 years ago |
RoaaGhali98
|
041c652b86
|
Fixing some issues in procedure pages
|
4 years ago |
RoaaGhali98
|
9ecfe896f9
|
DAPP-9: remove 25 letter validation
|
4 years ago |
RoaaGhali98
|
f84ae8b4e7
|
Delete add-procedure-page.dart
|
4 years ago |
RoaaGhali98
|
447ca6d4dc
|
Merge branch 'procedures_refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into procedures_refactoring
Conflicts:
lib/screens/procedures/add-procedure-page.dart
lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
|
4 years ago |
Elham Ali
|
4b7b4fda7f
|
Merge branch 'hot_fix' into 'development'
hot fix the progress_note_screen.dart
See merge request Cloud_Solution/doctor_app_flutter!993
|
4 years ago |
Elham Rababh
|
e242aa19bc
|
hot fix the progress_note_screen.dart
|
4 years ago |
RoaaGhali98
|
9f7cdba8b7
|
Refactoring procedure pages
|
4 years ago |
Elham Rababh
|
8c93d5c450
|
fix the keyborad issue on real device
|
4 years ago |
RoaaGhali98
|
28defc2582
|
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
|
4 years ago |
RoaaGhali98
|
f1dd50d7bf
|
Doing some refactoring
|
4 years ago |
Elham Rababh
|
5ec07bb931
|
DAPP-100 : renames file
|
4 years ago |
Elham Rababh
|
077cad7df5
|
refactor names
|
4 years ago |
Elham Rababh
|
a019319589
|
some fixes
|
4 years ago |
Elham Rababh
|
e73271cb29
|
episode refactor names part 2
|
4 years ago |
RoaaGhali98
|
1ac24bee90
|
Refactoring some issues in procedures screen
|
4 years ago |
RoaaGhali98
|
e85a32274a
|
Refactoring some issues in procedures screen
|
4 years ago |
Elham Rababh
|
47352ae77d
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into DAPP_99_soap_model
Conflicts:
lib/config/config.dart
|
4 years ago |
Elham Rababh
|
1ca7b28590
|
first step from refactor soap
|
4 years ago |
RoaaGhali98
|
d743c2c99c
|
Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons
|
4 years ago |
RoaaGhali98
|
e1c635a911
|
Rename to bottom_sheet_dialog_button and two_bottom_sheet_dialog_buttons
|
4 years ago |
Elham Rababh
|
7fc52ecad4
|
finish fix lab result
|
4 years ago |
RoaaGhali98
|
31cf229763
|
Fixing the comments
|
4 years ago |
Elham Rababh
|
286dbe0a3f
|
refactor the lab result structure
|
4 years ago |
RoaaGhali98
|
dfc792ce64
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
b7892fc18e
|
Rename to files name of admission request screens to match our standard
|
4 years ago |
RoaaGhali98
|
3f41ff267a
|
Fix some design issue in admission request screens and make new component called two_bottom_sheet_dialog_buttons and use it in admission-request_second-screen.dart and admission-request-third-screen
|
4 years ago |
Elham Rababh
|
c96939e6b0
|
refactor some name and add todos
|
4 years ago |
RoaaGhali98
|
fcdec6dbf7
|
Fix some design issue in admission request screens
|
4 years ago |
RoaaGhali98
|
4d820728e8
|
Fixing small design issues in admission-request-first-screen
|
4 years ago |
RoaaGhali98
|
41e79d5e00
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
7962d9b1be
|
fix the remark validation, make the bottomSheet show after loading and edit the order numbers of priority refer-patient-screen-in-patient
|
4 years ago |
RoaaGhali98
|
8980f6f440
|
replace the TabBar in refer-patient-screen-in-patient with our dropDownList
|
4 years ago |
RoaaGhali98
|
39c64779aa
|
Merge branch 'fix_refere_desgin' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
Elham Rababh
|
95321a9305
|
fix the bug
|
4 years ago |
Elham Rababh
|
ed6af7f26e
|
change the file structure
|
4 years ago |
RoaaGhali98
|
505c3f470f
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_refere_desgin
|
4 years ago |
RoaaGhali98
|
dc37e2e559
|
replace the TabBar in refer-patient-screen-in-patient with our dropDownList
|
4 years ago |
Elham Rababh
|
47dd2ecf56
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_prescription
Conflicts:
lib/screens/patients/profile/notes/note/update_note.dart
|
4 years ago |
Elham Rababh
|
208aa9dd6e
|
ucaf design refactor finished
|
4 years ago |
RoaaGhali98
|
4c7db58489
|
replace the TabBar in refer-patient-screen-in-patient with our custom TabBar in tab_utils
|
4 years ago |
RoaaGhali98
|
e61d1e78f6
|
Refactoring
|
4 years ago |
RoaaGhali98
|
c93ea2f285
|
Refactoring
|
4 years ago |
RoaaGhali98
|
240c9aa411
|
Refactoring
|
4 years ago |
RoaaGhali98
|
81d3aa5ad1
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
177a2e8bc4
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
01cd91ef93
|
Fixing some design issues in refer-patient-screen-in-patient and refer-patient-screen
|
4 years ago |
RoaaGhali98
|
c4f2543471
|
Fixing some design issues
|
4 years ago |
Elham Rababh
|
70fa365377
|
hot fix
hot fix
|
4 years ago |
RoaaGhali98
|
9f7dbf5ec7
|
Fixing update in update_note
|
4 years ago |
RoaaGhali98
|
17a6ec5795
|
Fixing update in 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
|
40c1502a9b
|
add translation
|
4 years ago |
Elham Rababh
|
b1ddd9935c
|
finish add Prescription
|
4 years ago |
Elham Rababh
|
ada10f595a
|
finish add Prescription
|
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 |
Elham Rababh
|
1f770793fd
|
fix issue
|
4 years ago |
RoaaGhali98
|
85a6f4965f
|
Fix some issues in prescription pages
|
4 years ago |
RoaaGhali98
|
cdc0d2f4a9
|
Finish prescription refactoring
|
4 years ago |
RoaaGhali98
|
34f658a166
|
Add Translation to prescription pages
|
4 years ago |
RoaaGhali98
|
f266f54be0
|
Fix the prescriptions pages
|
4 years ago |
RoaaGhali98
|
c76900a868
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
8cb5171bc9
|
Refactor add_prescription_form
|
4 years ago |
RoaaGhali98
|
0147481c27
|
Fix the drug to drug page
|
4 years ago |
RoaaGhali98
|
5f3f509b8c
|
fix the DOCTYPE html error in getPrescription service
|
4 years ago |
RoaaGhali98
|
e10c07f6a4
|
fix loader in prescriptions_page
|
4 years ago |
RoaaGhali98
|
ce978db2dd
|
Fix add medication button
|
4 years ago |
RoaaGhali98
|
d5e3a79f85
|
Fix add medication button
|
4 years ago |
RoaaGhali98
|
5b8211eec4
|
Refactor add_prescription_form
|
4 years ago |