Commit Graph

708 Commits (zik-webrtc)

Author SHA1 Message Date
Mohammad Aljammal 88b8454afe Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
5 years ago
mosazaid 7eea1bf4a5 Merge branch 'development' into design-changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Mohammad Aljammal b1f1b7e34d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal ed3449bcf4 fix the doctor card in lab result and radiology 5 years ago
Elham Rababah dcdbe76e54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
5 years ago
Elham Rababah 0f8820fa44 fix profile screen and start the first step from filter page 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 5 years ago
Elham Rababah acb1bdbb37 fix 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Mohammad Aljammal 85288cc014 Add filter in outpatient 5 years ago
Mohammad Aljammal 3af47304b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 8d652372ff Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!598
5 years ago
Mohammad Aljammal 3927c40d7e Fix Patient Profile 5 years ago
Elham Rababah 403fece008 commit things 5 years ago
Mohammad Aljammal cab9cddef0 Merge branch 'in_patient_services' into 'development'
Search Profile Patient update

See merge request Cloud_Solution/doctor_app_flutter!596
5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
hussam al-habibeh 975260df2a Search Profile Patient update 5 years ago
Elham Rababah cb67dcc9e1 first step from search 5 years ago
mosazaid ddc266416d some functionality and design changes 5 years ago
Mohammad Aljammal f708689d00 hot fixes 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 5 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 5 years ago
Mohammad Aljammal cf4d2c6cb7 Merge branch 'progress_note' into 'development'
fix radiology_service

See merge request Cloud_Solution/doctor_app_flutter!565
5 years ago
Mohammad Aljammal 0ab78827e3 Merge branch 'fridayf-fix-bug' into 'development'
finish in-patient referral

See merge request Cloud_Solution/doctor_app_flutter!563
5 years ago
Elham Rababah 723b4326ca add sick leave to inpatient 5 years ago
Sultan Khan acf74ab9fc bug fix 5 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 42d8fc0207 finish in-patient referral 5 years ago
Sultan Khan 94806c3601 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 19f0d7ede9 voice feature added 5 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 5 years ago
mosazaid 9d00440789 referral -re design 5 years ago
Sultan Khan dad5aeb262 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan c9150ef088 bug fixes 5 years ago
Mohammad Aljammal 1d2ee1284e fix issues on Referral 5 years ago
mosazaid 596f518525 Merge branch 'development' into release-hot-fix
# Conflicts:
#	lib/screens/patients/profile/patient_profile_screen.dart
#	lib/widgets/patients/profile/PatientProfileButton.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid bf9ce4694f fix logic 5 years ago
Elham Rababah b2a2884586 Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
hussam al-habibeh 1d09bcf251 hot fixes 5 years ago
Elham Rababah d4ddfa21e5 add the new logic 5 years ago
Mohammad Aljammal c924ea667f hot fixes 5 years ago
Sultan Khan c5f12ca307 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e83032e725 patient card 5 years ago
Mohammad Aljammal 349c63f4ce Merge branch 'in-patient-changes' into 'development'
hoh design fixes

See merge request Cloud_Solution/doctor_app_flutter!543
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
mosazaid 09f87a6cbd Merge branch 'development' into in-patient-changes
# Conflicts:
#	lib/screens/patients/profile/lab_result/LabResultWidget.dart
5 years ago
mosazaid d78a3e168e hoh design fixes 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
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 0e65b743e3 Insurance Approval In Patient 5 years ago
mosazaid 78f2ab5ae3 design fixes 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 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
mosazaid 34e9a3797c Merge branch 'development' into in-patient-changes 5 years ago
Sultan Khan feef001323 bug fixes 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 5 years ago
Sultan Khan e445b5bb60 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan b52ba524a3 updated 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 351c9b5e5c Merge branch 'development' into in-patient-changes
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/home/home_screen.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
mosazaid 37edd8cef9 add in-patient cards and header 5 years ago
Sultan Khan bf812a77de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 360b4d22cf in patient change 5 years ago
Elham Rababah e1eaab6a8e fix medical profile_medical_info 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 3aabb1537c in patient 5 years ago
Elham Rababah bd01624f5a create New order widget 5 years ago
mosazaid 72bb64b460 finish working on app text widget 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Elham Rababah e73ca8af71 first step from change text fields 5 years ago
Elham Rababah 042d4b4bfd remove commented code 5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
hussam al-habibeh 369a5789a3 hot Fixe 5 years ago
Mohammad Aljammal b6941d9f63 Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.

See merge request Cloud_Solution/doctor_app_flutter!495
5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Mohammad Aljammal da084d889c hot ECG,add a new button and hot fixes 5 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
Mohammad Aljammal 8ed9b3c023 Merge branch 'Stepper_header' into 'development'
Stepper header

See merge request Cloud_Solution/doctor_app_flutter!484
5 years ago
Sultan Khan 148ea967fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 5 years ago
Sultan Khan 1fb59c17bc bug fix 5 years ago
mosazaid 9f35f53fa2 re-design 5 years ago
Elham Rababah 1716c0925d add soap items as widget 5 years ago
mosazaid 906930532b Merge branch 'development' into textfield-validation 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
Mohammad Aljammal 6a8fbdaedf Merge branch 'patient_app_services' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!480
5 years ago
Mohammad Aljammal 16bc4adcd7 hot fixes 5 years ago
Elham Rababah b178bc418e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header 5 years ago
Elham Rababah 4cb15d68a3 delete commented code. 5 years ago
Elham Rababah 5caa2da6f3 fix issue on soap design 5 years ago
mosazaid 9a0555b715 design fixes 5 years ago
Elham Rababah bd08e00567 fix issue on expandable_SOAP_widget 5 years ago
Elham Rababah 6a6087e5ba fix small bug in allergies 5 years ago
Mohammad Aljammal 26f90214b2 Merge branch 'Stepper_header' into 'development'
Stepper header

See merge request Cloud_Solution/doctor_app_flutter!477
5 years ago
Elham Rababah e668fd3334 fix overflow in allergies 5 years ago
hussam al-habibeh 0578bb5ed3 insurance approval & medical file design fix 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
Elham Rababah 344ca9c55a refactor code in subjective step2 5 years ago
Elham Rababah 3e7bf817f3 refactor code in subjective 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
Elham Rababah 9a8ca00eec Merge branches 'Stepper_header' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_plan_page.dart
5 years ago
Elham Rababah 440d714045 bottom sheet fix 5 years ago
Elham Rababah e9d04527a6 add stepper in all soap steps 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
Elham Rababah ff157b417e fix add medication and soap index 5 years ago
mosazaid 81841125f2 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid fea6501b9e design fixes issues 5 years ago
Mohammad Aljammal 3f3f8da0f6 Merge branch 'soap-objective-feature-re-design' into 'development'
fix referral card and UCAF design

See merge request Cloud_Solution/doctor_app_flutter!467
5 years ago
Mohammad Aljammal 6f11c365d3 Merge branch 'allergyies' into 'development'
add medication almost done

See merge request Cloud_Solution/doctor_app_flutter!466
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
Elham Rababah e47e7c0a00 add medication almost done 5 years ago
Mohammad Aljammal 77b4e0fdbe Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!464
5 years ago
Mohammad Aljammal 3a734f4718 finish the new design on the progress note (SOAP) 5 years ago
Sultan Khan 44baa02cfc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d77bd19450 login screen updated 5 years ago
Mohammad Aljammal 7e33130ec7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 0745d2d56e update the design on the progress note (SOAP) 5 years ago
Elham Rababah 3a7faf6b66 fix issues 5 years ago
Mohammad Aljammal 327e058fbd fix design issues and merge conflict 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
Mohammad Aljammal bdc2be8782 fix issues 5 years ago
Mohammad Aljammal c87f235cd2 fix the design issues 5 years ago
Mohammad Aljammal d105e0ef5d fix the design issues 5 years ago
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid f8f088fe8c design changes 5 years ago
Elham Rababah a768dd63cf fix steps 5 years ago
Elham Rababah d987859865 make allergies as expandable widget 5 years ago
Elham Rababah e6f2ed5197 change the add item box 5 years ago
Elham Rababah c1adb9eeff fix issues 5 years ago
Elham Rababah ff2c31ee35 allergies fixes 5 years ago
Elham Rababah 1ac67a7bc1 Merge branches 'allergyies' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into allergyies 5 years ago
Elham Rababah 19d8b9170d update allergies fixes 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 3795381e3b assessment fix 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
Mohammad Aljammal 7aadeb1a74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
hussam al-habibeh 26672dbb6e Radiology details & assessment fix 5 years ago
mosazaid 7f440a2d8a fix soap screen height 5 years ago
Elham Rababah df3b51b957 update allergies 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
mosazaid e7fdf984f5 hot fix 5 years ago
Mohammad Aljammal 4bf9650b4f fix the design issues 5 years ago
mosazaid 583e06c5f2 re-design 5 years ago
mosazaid b735a69a4f bug fixes 5 years ago
mosazaid 8b6b7fe2e6 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid ef64c39a5f hot fix 5 years ago
mosazaid aeecc12cbe fix bug 5 years ago
Elham Rababah 7da729841e fix small issue in file path 5 years ago
Elham Rababah 08a22d949c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 1330d680ab fix allergies 5 years ago
Mohammad Aljammal 283f07ec8a Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!442
5 years ago
mosazaid 5f245b8c27 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid 6e96dda6cd finish soap objective new design 5 years ago
hussam al-habibeh 1fba6c839c insurance approvals deatils fix 5 years ago
Elham Rababah 0d42163034 finish on history design 5 years ago
Mohammad Aljammal 3925255239 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!439
5 years ago
hussam al-habibeh 9adf55710e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh 1d6f959342 assessment (SOAP) new design 5 years ago
Elham Rababah b70e41a558 Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 5 years ago
Elham Rababah c8b44936f8 fix on history design 5 years ago
Mohammad Aljammal 2fbf48e676 fix font size 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
mosazaid 3c696b6367 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid c69a64ea8a fix bug 5 years ago
Elham Rababah ee6288e26a Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 5 years ago
Elham Rababah d2bd3b68e1 small fix on history 5 years ago
Mohammad Aljammal a6f104c352 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
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Mohammad Aljammal 3bca803715 Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!432
5 years ago
mosazaid 0528323e15 fix patient card appbare bugs 5 years ago
Elham Rababah 654955fc76 fix label issue 5 years ago