Commit Graph

851 Commits (9f61c7eaa08c37e71fc8ed57346f2c628405bda3)

Author SHA1 Message Date
Elham Rababah 5714ed9540 small fix on replay page 4 years ago
Mohammad Aljammal 2bd505290d fix design 4 years ago
Mohammad Aljammal ba13ea7140 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!389
4 years ago
Mohammad Aljammal 920ec14bc2 add new design for Lab Result and Radiology Results 4 years ago
Mohammad Aljammal 1068eea248 Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!387
4 years ago
Mohammad Aljammal 5763970d23 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!388
4 years ago
mosazaid 1f70498982 Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad Aljammal 130d1442ea Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!386
4 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 4 years ago
Mohammad Aljammal 6fbd2076d4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 83762fbd6e change the lab result design 4 years ago
Mohammad Aljammal 7c9163bc48 Merge branch 'fix-issues' into 'development'
Add Prescription Form New Design

See merge request Cloud_Solution/doctor_app_flutter!384
4 years ago
hussam al-habibeh e4bfdd198b Add Prescription Form New Design 4 years ago
Elham Rababah f74fdc80f6 fix doctor replay 4 years ago
Sultan Khan 3c1a65f310 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan eadfe2d6bc bug fixes 4 years ago
Mohammad Aljammal 5a9cf7c8c2 Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!382
4 years ago
Elham Rababah 51191a560c Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 4 years ago
Elham Rababah 8beab7d84f finish drawer 4 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 4 years ago
Mohammad Aljammal cdf923803e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 019553ba51 new design for ESG service 4 years ago
Elham Rababah f78f178fd8 Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 4 years ago
mosazaid 8237270e73 fix navigation problem to patient profile cards 4 years ago
mosazaid c97b395810 send patient type to patient profile cards 4 years ago
mosazaid 61a0e42afa paient and referral screens new design 4 years ago
Elham Rababah c1868d98a4 small fix 4 years ago
Elham Rababah f8c14a88ee fix schedule 4 years ago
mosazaid 7117540a24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patients-new-design 4 years ago
mosazaid 27ff179750 working on referral screen bugs 4 years ago
Mohammad Aljammal d62df0052b Merge branch 'patient_app_services' into 'development'
Add new services to arrival patient

See merge request Cloud_Solution/doctor_app_flutter!376
4 years ago
Mohammad Aljammal 08b7b6263c Add new services to arrival patient 4 years ago
mosazaid b3b2beef70 Merge branch 'refferal_card' into patients-new-design 4 years ago
mosazaid ed104a4562 working on referral card 4 years ago
Sultan Khan b19c3092a6 bug fixes 4 years ago
mosazaid ffd77528a2 patient profile new design 4 years ago
Elham Rababah 4f558dc41d fix referral card 4 years ago
mosazaid 0ea66bd1e1 add the new design for the search patient 4 years ago
mosazaid 56f2b5f63a Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/screens/patients/patients_screen.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
mosazaid 0e05b90c6b finish patient profile screen 4 years ago
Mohammad Aljammal a167db7651 Fix prescription items 4 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 4 years ago
Sultan Khan 10ef8f7954 bug fixes 4 years ago
Sultan Khan 12dc637163 bug fixes 4 years ago
Sultan Khan d38c5ccd6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan c16b7ffca0 arrival page updated 4 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 4 years ago
Mohammad Aljammal e515265f11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 0742d64428 add lab result services 4 years ago
Sultan Khan 495898f8c8 patient card 4 years ago
Mohammad Aljammal f8fba85150 Merge branch 'fix-issues' into 'development'
get Prescription history fix

See merge request Cloud_Solution/doctor_app_flutter!363
4 years ago
Elham Rababah 103a1bc6fc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
hussam al-habibeh 3928165570 get Prescription history fix 4 years ago
Mohammad Aljammal 770767ebb6 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!361
4 years ago
Mohammad Aljammal f74eadd987 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!360
4 years ago
Sultan Khan bbb1a8ff74 arrival list updated 4 years ago
Elham Rababah 7ebf36f98f add radiology open image 4 years ago
mosazaid 6f3977d186 lab orders ui enhancements 4 years ago
hussam al-habibeh 53f45adf69 hussam 4 years ago
Sultan Khan 4d4d3b460d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 27bbb9ac59 changes updated 4 years ago
Mohammad Aljammal 23b0b65df7 Merge branch 'clinic_list' into 'development'
Clinic list

See merge request Cloud_Solution/doctor_app_flutter!357
4 years ago
Elham Rababah 98c02be9a3 add progress note 4 years ago
Elham Rababah ed25195593 add lab result 4 years ago
Elham Rababah c10a0cf88e hot fix profile_medical_info_widget_search 4 years ago
Sultan Khan 94f0a7a448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 5861d159ac bug fixes 4 years ago
Elham Rababah 7d85c8b692 return back the condition 4 years ago
Elham Rababah e7d1a6c805 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/screens/patients/patients_screen.dart
4 years ago
Mohammad Aljammal 22fc45ce16 Merge branch 'ecg_services' into 'development'
Ecg services

See merge request Cloud_Solution/doctor_app_flutter!353
4 years ago
Mohammad Aljammal 1af6115365 add ECG and Show sick leave 4 years ago
Elham Rababah 42666e2200 move clinic list to its own file 4 years ago
Sultan Khan 704d2484cf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 4 years ago
hussam al-habibeh 15774e5b05 hussam 4 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 4 years ago
Sultan Khan a8ef4a98a5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 376653a344 dashboard changes 4 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 4 years ago
Mohammad Aljammal 893fc05449 Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service

See merge request Cloud_Solution/doctor_app_flutter!345
4 years ago
Elham Rababah a329c447a2 fix allergic in header 4 years ago
Elham Rababah 4190f32cdb return radiology and insurance approval 4 years ago
Elham Rababah 1843acbcb1 Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service 4 years ago
Elham Rababah 4d6795fcc0 show all services for all type of patient. 4 years ago
mosazaid 7c5d88f169 Merge branch 'development' into app_changes 4 years ago
mosazaid 9b02bdc541 inhancements 4 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 4 years ago
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah f3220be735 fix DA-350 4 years ago
Elham Rababah f819e6353e fix DA-350 4 years ago
Sultan Khan 63d73b60e1 ios faceid issue 4 years ago
Sultan Khan 9ed5a294ab dashboard changes 4 years ago
Sultan Khan 388c095d7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a309acbf46 dashboard changes 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
Mohammad Aljammal d8d2e7f1d6 fix ios issues 4 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 4 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 4 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

See merge request Cloud_Solution/doctor_app_flutter!304
4 years ago
Elham Rababah c8e5a7eeef fix PatientCard 4 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 4 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 4 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
4 years ago
Sultan Khan f0539860c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 400f8e25f6 bug xis 4 years ago
hussam al-habibeh 5bde14813a fixing bugs 4 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 248367fbe9 fix DA-220 4 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 4 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 4 years ago
Mohammad Aljammal 05ed1202fe Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!293
4 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
4 years ago
Elham Rababah 34d5ac7d43 add label on assessment and fix DA-333 4 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 4 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 6a23c2a137 bug fix 4 years ago
Elham Rababah 7505a6b6b0 fix  allergy 4 years ago
Elham Rababah 6a5e134527 fix  remark and step widget 4 years ago
Elham Rababah cfb9ea30cb fix : DA-335 4 years ago
Elham Rababah e652752729 fix : DA-334 4 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
4 years ago
Elham Rababah 437ae3dfb5 Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah febdadc924 fix : DA-264 4 years ago
Elham Rababah 34692b94c2 fix : DA-264 4 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 4 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 4 years ago
mosazaid c2df291029 DA - 286 Fix 4 years ago
Mohammad Aljammal abcd7e9833 Merge branch 'fix_issues' into 'development'
remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280
4 years ago
Elham Rababah 6820e2d097 remark fix in allergies 4 years ago
Mohammad Aljammal 6253e2c9a3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 75efcde0bc fix ios 4 years ago
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
4 years ago
Mohammad Aljammal 3cfb88b313 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!277
4 years ago
mosazaid 2273808333 translation 4 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan d34744e168 bug fix 4 years ago
mosazaid ebc5ba7743 some fixes 4 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 4 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 4 years ago
Elham Rababah 913ffc3052 Fix DA-260,DA-267 4 years ago
Elham Rababah 13c879654b DA-250: fix age 4 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
4 years ago
Elham Rababah 68d27a451d fix general issue 4 years ago
Sultan Khan b92bc85e8f bug fixes 4 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 4 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 63e8ee8dd0 sick leave 4 years ago
Elham Rababah 00543a759a fix remarks in allergies 4 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 4 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
4 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 735698ce90 bug fixes 4 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 4 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 4 years ago
hussam al-habibeh d9fcf89c19 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/core/viewModel/medicine_view_model.dart
4 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 4 years ago
hussam al-habibeh 38d9881ed2 Prescription date 4 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 3be693337a some fixes 4 years ago
Elham Rababah 4e4e6a3600 fix DA-151 4 years ago
Elham Rababah a7ca7fb271 fix DA-151 4 years ago
hussam al-habibeh ced4edebde patinet profile update 4 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
mosazaid cd95a581f0 simple changes 4 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 4 years ago
Sultan Khan 896078507f gub fixes 4 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 4 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 88f1dc637f some fixes 4 years ago
Elham Rababah e95638bd99 fix DA-157 4 years ago
Elham Rababah 855ed0ac12 fix 145 4 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah eb90fc0161 fix bug in assessment 4 years ago
Sultan Khan 40cfad7f7b login 4 years ago
Elham Rababah 9674eb89d9 add modification on so 4 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a99b3847ac login completed 4 years ago
Elham Rababah bc8a90ef2c first step from fix loader 4 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 4 years ago
hussam al-habibeh 015c3b53c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 4 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 4 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 4 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan ad99cebf02 login and drug to drug 4 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 8726653ffb working on Referral feature 4 years ago
Elham Rababah 1f2aebde33 fix loader in login 4 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 40e9ab864a login changes 4 years ago
Mohammad Aljammal 748802af1d Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!245
4 years ago
Elham Rababah 90a16676db fix issue related to SOAP 4 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
4 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 4 years ago
Elham Rababah 0147e7e49b do translation, fix some bugs 4 years ago
Elham Rababah 175ba545e7 finish create episode 4 years ago
Elham Rababah 4f1a892be4 first step form create episode 4 years ago
Elham 8494f6e0f4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!241
4 years ago
Elham Rababah caddbdb53c small fixes in progress note 4 years ago
Elham Rababah 34b7b4564c assessment work fine now 4 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 4 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 4 years ago
Elham Rababah 7ce1d2dd55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 4 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
4 years ago
Elham Rababah 9aa5ab4228 small changes 4 years ago
hussam al-habibeh f997561bb8 drug list 4 years ago
Elham Rababah c3bb408787 add some translations 4 years ago
Elham Rababah bbcd218a94 history delete is fixed 4 years ago
Elham Rababah 3dffd33728 hot fix 4 years ago
Elham Rababah 1cda486268 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
4 years ago
Elham Rababah 9194d8a44b delete Allergy 4 years ago
mosazaid 3b471aebdc Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 4 years ago
Elham b291572767 Merge branch 'soap_update' into 'development'
Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
4 years ago
Elham Rababah 8284f1d475 Fix profile widget 4 years ago
Mohammad Aljammal 812fe10db8 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!219
4 years ago
Elham Rababah e054c28234 hide text 4 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 4b5bec8c50 working on UCAF design 4 years ago
Mohammad Aljammal f0f98280b4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
4 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah 7d550ca15f prevent null 4 years ago
Elham Rababah 2f80af6b74 small fix 4 years ago
Elham Rababah 71b50c8404 First step translations 4 years ago
Elham Rababah ba14d23c05 Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Elham Rababah e65740761a add improvement on create episode 4 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 4 years ago
Mohammad Aljammal d975fb021c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
	lib/util/helpers.dart
4 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah 423bd49aee Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
4 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
4 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
4 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 4 years ago
hussam al-habibeh d1a261c847 procedure update 4 years ago
Elham Rababah 856777c648 finish updating functions 4 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 4 years ago