Commit Graph

630 Commits (b6e698d4e47c329a6a2c73df4b4c92ef2f9b37b4)

Author SHA1 Message Date
Mohammad Aljammal 8350d68397 Merge branch 'progress_note' into 'development'
add condition

See merge request Cloud_Solution/doctor_app_flutter!545
5 years ago
Mohammad Aljammal 414ccdde49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal b37c607813 done the referral service 5 years ago
Sultan Khan 426aa03aa5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan b5503a8411 fixes 5 years ago
Elham Rababah 79037d8fc7 add condition 5 years ago
Mohammad Aljammal 650a949c6a Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!542
5 years ago
Elham Rababah 9d780f72b4 remove commented code 5 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
5 years ago
Mohammad Aljammal ae8882fbae Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!539
5 years ago
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 5 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
5 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 5 years ago
mosazaid 2bf003c100 Merge branch 'development' into in-patient-changes 5 years ago
mosazaid 33545d1180 work on in paitent referral 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Sultan Khan 608198762d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d0a39ca3d4 fixes 5 years ago
Elham Rababah acc3ecdbbe cancel progress_note part 5 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 82285ccf39 show progress_note part 5 years ago
Mohammad Aljammal e4aae762cc Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!536
5 years ago
Sultan Khan feef001323 bug fixes 5 years ago
Elham Rababah f2011301c6 update progress_note 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 5 years ago
Elham Rababah 0909879ccf Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note 5 years ago
Elham Rababah 5199104d7a show progress_note 5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
mosazaid 37edd8cef9 add in-patient cards and header 5 years ago
Elham Rababah f4ce9eb004 Merge branches 'development' and 'radilology' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into radilology 5 years ago
Elham Rababah 67abe2a5e7 first step from radiology 5 years ago
Mohammad Aljammal a95bb8be04 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!529
5 years ago
Sultan Khan 5afb44adfd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 0260b92f24 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!528
5 years ago
Sultan Khan 3aabb1537c in patient 5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
mosazaid 4b3c5b9f37 Merge branch 'development' into app-changes 5 years ago
mosazaid dde8d9aa48 design hot fixes 5 years ago
mosazaid 54482bfb1d hot fix 5 years ago
Sultan Khan 6f52c9a7fd fixe 5 years ago
hussam al-habibeh 89451a3c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/medical-file/medical_file_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
hussam al-habibeh 17c878fa4c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into code_reafactoring
 Conflicts:
	lib/screens/patients/profile/lab_result/lab_orders_screen.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
mosazaid bbe94d2b9b Merge branch 'development' into design-fixes
# Conflicts:
#	lib/screens/patients/profile/UCAF/UCAF-input-screen.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/refer_patient_screen.dart
#	lib/screens/patients/profile/referral/refer-patient-screen.dart
#	lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
#	lib/screens/patients/profile/soap_update/plan/update_plan_page.dart
#	lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart
#	lib/screens/prescription/add_prescription_form.dart
#	lib/screens/prescription/prescription_warnings.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/shared/master_key_checkbox_search_allergies_widget.dart
5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
hussam al-habibeh ebe05226e9 Delteing unused file & refactoring routes page 5 years ago
Elham Rababah 7579a21b83 Merge branches 'development' and 'soap_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_refactor
 Conflicts:
	lib/widgets/auth/login_form.dart
5 years ago
Elham Rababah 8220ef7700 add auto complete search 5 years ago
mosazaid b8f6c35e75 working on buttons widgets 5 years ago
mosazaid 9f61c7eaa0 Merge branch 'design-fixes' into development 5 years ago
mosazaid 65585ab586 add charts to procedures 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Elham Rababah 59ec9d8e56 first step from change text fields 5 years ago
Mohammad Aljammal fac8473f59 Merge branch 'design-fixes' into 'development'
lap result re-design

See merge request Cloud_Solution/doctor_app_flutter!515
5 years ago
Mohammad Aljammal 43c254de05 Merge branch 'soap_refactor' into 'development'
Soap refactor

See merge request Cloud_Solution/doctor_app_flutter!513
5 years ago
mosazaid d543ce0f6f lap result re-design 5 years ago
Sultan Khan 4ed8f716db dashboard changes 5 years ago
Elham Rababah 2fd30ae1be improve exam step 5 years ago
Elham Rababah 042d4b4bfd remove commented code 5 years ago
Elham Rababah 4da72c81af first step form code refactor 5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
mosazaid 368ff27042 vitalsign fix error tet 5 years ago
mosazaid 8950dabf7a Merge branch 'development' into textfield-validation 5 years ago
mosazaid 4b32487540 referral design and service changes 5 years ago
Mohammad Aljammal 85a01edd5e Merge branch 'textfield-validation' into 'development'
make referral changes

See merge request Cloud_Solution/doctor_app_flutter!498
5 years ago
Mohammad Aljammal b1234945e0 Merge branch 'fix-issues' into 'development'
Hot Fixes

See merge request Cloud_Solution/doctor_app_flutter!497
5 years ago
mosazaid 82cbf392af Merge branch 'development' into textfield-validation 5 years ago
mosazaid a701b6e989 make referral changes 5 years ago
hussam al-habibeh 99ef89fa16 Hot Fixes 5 years ago
Sultan Khan 649379d88f bug fix 5 years ago
Sultan Khan 6f9069addc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 8652c30a24 bug fix 5 years ago
Mohammad Aljammal da084d889c hot ECG,add a new button and hot fixes 5 years ago
Sultan Khan 20b31bde92 bug fix 5 years ago
Sultan Khan ffab532e94 bug fix 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
Sultan Khan 148ea967fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 1fb59c17bc bug fix 5 years ago
mosazaid 9f35f53fa2 re-design 5 years ago
mosazaid 604ff24a93 referral design fixes 5 years ago
Sultan Khan 212d1dc05f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0498545e5c no data 5 years ago
Sultan Khan 49a28c302a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 9c54f85782 bug fix 5 years ago
mosazaid 0666940d56 Merge branch 'development' into textfield-validation 5 years ago
mosazaid 38d577e1f7 vital sign fix appbar 5 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 5 years ago
hussam al-habibeh 6f914b3e93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
5 years ago
hussam al-habibeh 3586d226e0 insurance approval & medical file design fix 5 years ago
Mohammad Aljammal f289ae0c44 Merge branch 'textfield-validation' into 'development'
Textfield validation

See merge request Cloud_Solution/doctor_app_flutter!475
5 years ago
mosazaid 0e028c05f5 Merge branch 'development' into textfield-validation 5 years ago
mosazaid 32e10269d4 add validation textfield 5 years ago
Sultan Khan 0080b66c8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 32d1a19248 bug fixes 5 years ago
Mohammad Aljammal 915cf74d3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 5 years ago
Mohammad Aljammal e1c67ad8ce Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!471
5 years ago
hussam al-habibeh 844bd9ba27 add lab & add radiology update 5 years ago
mosazaid 3047b655cf add Validation for customtextfield 5 years ago
mosazaid fea6501b9e design fixes issues 5 years ago
mosazaid 25c3bf1bb1 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid 0128144f83 working onm referral card and update on ucaf design 5 years ago
Mohammad Aljammal 9839ef4a00 Merge branch 'soap-objective-feature-re-design' into 'development'
cahnges on UCaf

See merge request Cloud_Solution/doctor_app_flutter!460
5 years ago
Elham Rababah eb5e5862ec fix bugs 5 years ago
Elham Rababah 3a7faf6b66 fix issues 5 years ago
mosazaid f017e4c280 cahnges on UCaf 5 years ago
Mohammad Aljammal c314bc7db7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_soap_index.dart
5 years ago
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid f8f088fe8c design changes 5 years ago
Mohammad Aljammal 3449567086 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
hussam al-habibeh b83c7835b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/widgets/patients/profile/soap_update/steps_widget.dart
5 years ago
hussam al-habibeh 26672dbb6e Radiology details & assessment fix 5 years ago
Mohammad Aljammal 87560250bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 4bf9650b4f fix the design issues 5 years ago
mosazaid b735a69a4f bug fixes 5 years ago
Mohammad Aljammal 0e4ec6ed31 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!443
5 years ago
Sultan Khan 2aaeaa1a36 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 1fb594617a bug fixes 5 years ago
hussam al-habibeh 1fba6c839c insurance approvals deatils fix 5 years ago
Mohammad Aljammal 2fbf48e676 fix font size 5 years ago
Mohammad Aljammal 63f64356cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Sultan Khan 46daeac487 bug fix 5 years ago
Mohammad Aljammal 0a00413639 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
5 years ago
Sultan Khan 9aa42c71c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan bb29a1ac0f patient arrival 5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Mohammad Aljammal 4fe6652997 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!430
5 years ago
mosazaid 93dba4cbeb vital sign fix bug 5 years ago
Mohammad Aljammal 6ca4797c91 hot fixes 5 years ago
mosazaid f7235504fc fixes 5 years ago
mosazaid c900969496 design bugs 5 years ago
Mohammad Aljammal 98c33d550d Merge branch 'fix-issues' into 'development'
insurance approvals design fix

See merge request Cloud_Solution/doctor_app_flutter!423
5 years ago
hussam al-habibeh 6300d3f0fc insurance approvals design fix 5 years ago
mosazaid 9dc708fd3d Merge branch 'development' into patients-new-design 5 years ago
mosazaid 494f716f05 working on new design on vital sign and referral screens 5 years ago
Mohammad Aljammal 7f7f7611f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!419
5 years ago
hussam al-habibeh daa417a19b Insurance approval new design 5 years ago
hussam al-habibeh 03f39b8bab insurance approval new design 5 years ago
Mohammad Aljammal 3d8a118087 Merge branch 'patient_app_services' into 'development'
change the app icons

See merge request Cloud_Solution/doctor_app_flutter!415
5 years ago
Mohammad Aljammal 17798247c7 change the app icons 5 years ago
mosazaid a454f434d1 hot fixes 5 years ago
Mohammad Aljammal 2cda29a3e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 3a8225e666 hot fix 5 years ago
mosazaid c642d88804 some fixes 5 years ago
mosazaid 46fffe56b6 small changes 5 years ago
mosazaid 914f15462f Merge branch 'development' into patients-new-design 5 years ago
mosazaid cc7c5af1d0 referral details fix bugs 5 years ago
Mohammad Aljammal 3fafa0ab01 add the patient cad as toolbar 5 years ago
mosazaid caff27923b Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
5 years ago