Commit Graph

1068 Commits (8a332b4d83f4001f2d06fbc81e576b2f2b5ea25c)

Author SHA1 Message Date
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

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

See merge request Cloud_Solution/doctor_app_flutter!277
5 years ago
mosazaid 2273808333 translation 5 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d34744e168 bug fix 5 years ago
mosazaid ebc5ba7743 some fixes 5 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
5 years ago
Mohammad Aljammal 6d473be371 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!273
5 years ago
hussam al-habibeh 35bc8c03a4 bug fixing 5 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Elham Rababah fd17fc4608 enforce user to add date in case referral 5 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 5 years ago
Elham Rababah 913ffc3052 Fix DA-260,DA-267 5 years ago
Elham Rababah 905818b532 add admission no to orders 5 years ago
Elham Rababah b9eaee1887 fix design 5 years ago
Elham Rababah 13c879654b DA-250: fix age 5 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
5 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
5 years ago
hussam al-habibeh fb8381ea61 bugs fix 5 years ago
Elham Rababah 68d27a451d fix general issue 5 years ago
Sultan Khan b92bc85e8f bug fixes 5 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 63e8ee8dd0 sick leave 5 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh 7c800bdab4 medical file fix 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 years ago
Elham Rababah cbf850da2f fix DA-201 5 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
5 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 5 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 5 years ago
hussam al-habibeh bada160cf5 Search Medacation 5 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
5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
hussam al-habibeh 38d9881ed2 Prescription date 5 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
5 years ago
Elham Rababah ba263ada44 fix DA-201 5 years ago
mosazaid 5440fd1ef9 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 3be693337a some fixes 5 years ago
Elham Rababah 4e4e6a3600 fix DA-151 5 years ago
Elham Rababah a7ca7fb271 fix DA-151 5 years ago
hussam al-habibeh ced4edebde patinet profile update 5 years ago
Elham Rababah 03fa9de901 fix DA-198 5 years ago
Elham Rababah 53e88620ec fix DA-230 5 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 5af6210785 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!263
5 years ago
Mohammad Aljammal 574e1525d9 Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix

See merge request Cloud_Solution/doctor_app_flutter!262
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 5 years ago
Sultan Khan 896078507f gub fixes 5 years ago
hussam al-habibeh e133a014e8 Prescription & medical file fix 5 years ago
Elham Rababah e32c360f85 fix DA-154,DA-150 5 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
Elham Rababah 8360179050 fix DA-195 5 years ago
Elham Rababah c11f195e72 fix DA-192 5 years ago
Elham Rababah d53493aa52 fix DA-237 5 years ago
Elham Rababah c6156921e8 fix DA-197 5 years ago
Elham Rababah e95638bd99 fix DA-157 5 years ago
Elham Rababah e9de8a72e9 fix DA-152 5 years ago
Elham Rababah 855ed0ac12 fix 145 5 years ago
Elham Rababah 02167afa6b fix 143,144 5 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
5 years ago
Elham Rababah eb90fc0161 fix bug in assessment 5 years ago
Sultan Khan 40cfad7f7b login 5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan a99b3847ac login completed 5 years ago
Elham Rababah 763d6bb49f finish add loader 5 years ago
hussam al-habibeh 5150f9b93d Prescription & procedure body update 5 years ago
Elham Rababah bc8a90ef2c first step from fix loader 5 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
5 years ago
Mohammad Aljammal 9147cde86e Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation

See merge request Cloud_Solution/doctor_app_flutter!256
5 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 5 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
5 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 5 years ago
mosazaid d9d4e22531 Merge branch 'development' into feature-ucaf 5 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
5 years ago
hussam alhababieh d87aeb290f Merge branch 'development' into 'procedure-fix'
# Conflicts:
#   lib/landing_page.dart
5 years ago
hussam al-habibeh b0410dc744 Procedure updates 5 years ago
hussam al-habibeh debcad3a3d prescription 5 years ago
hussam al-habibeh 4b54ca7d47 prescription 5 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
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
5 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
5 years ago
hussam al-habibeh dd53a9bd4d post Procedure 5 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
Mohammad Aljammal cc14448d48 Merge branch 'soap_update' into 'development'
fix loader in login

See merge request Cloud_Solution/doctor_app_flutter!247
5 years ago
Elham Rababah 1f2aebde33 fix loader in login 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid db502b7f0d Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 421cee49c7 Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 748802af1d Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!245
5 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
5 years ago
Elham Rababah 3c1b51eb94 fix issue related to landing page 5 years ago
Elham Rababah 90a16676db fix issue related to SOAP 5 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
5 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 5 years ago
Elham Rababah 0147e7e49b do translation, fix some bugs 5 years ago
Elham Rababah 175ba545e7 finish create episode 5 years ago
hussam al-habibeh 5253c28469 prescription form fix 5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
mosazaid 289cf9b479 Merge branch 'development' into feature-ucaf 5 years ago
Mohammad Aljammal e60cc5ec4a Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!240
5 years ago
mosazaid ca9f1a022b Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
hussam al-habibeh f767467a67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file 5 years ago
hussam al-habibeh bcbd091dae ss 5 years ago
Elham 8494f6e0f4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!241
5 years ago
Elham Rababah caddbdb53c small fixes in progress note 5 years ago
Elham Rababah 34b7b4564c assessment work fine now 5 years ago
hussam al-habibeh a3fa8ef839 medical file fix 5 years ago
mosazaid ff906338bf Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 5 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 5 years ago
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
Sultan Khan 71c4d48cca Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan c4cae6fb38 doctor leave bug fix 5 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
5 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 5 years ago
Sultan Khan 87d90a394b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 044ad7b51a offtime leave 5 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 5 years ago
mosazaid e75e7801aa working on UCAF get data 5 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
5 years ago
Elham Rababah 9aa5ab4228 small changes 5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
Elham Rababah 1be8ea7dcb Fix conflict 5 years ago
Elham Rababah ffe7e7c57f 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
5 years ago
Elham Rababah c3bb408787 add some translations 5 years ago
Mohammad Aljammal 699c565427 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!232
5 years ago
Mohammad Aljammal d20604aaaf Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!231
5 years ago
Sultan Khan d67b531865 bug fix 5 years ago
Sultan Khan 31d6ca5593 Doctor ID updated 5 years ago
mosazaid 4f1c70a3f4 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 5 years ago
Mohammad Aljammal ff9eaeb09f Merge branch 'sultan' into 'development'
reschdule leave

See merge request Cloud_Solution/doctor_app_flutter!230
5 years ago
Sultan Khan ad48415038 reschdule leave 5 years ago
mosazaid a51239447b Merge branch 'development' into feature-ucaf 5 years ago
Mohammad Aljammal dc9a9ad4f6 Merge branch 'medical-file' into 'development'
medical file

See merge request Cloud_Solution/doctor_app_flutter!229
5 years ago
mosazaid 7983f998bd Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh 76cc4d11f8 medical file 5 years ago
Sultan Khan ad967e8aae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah bbcd218a94 history delete is fixed 5 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
Elham Rababah 3dffd33728 hot fix 5 years ago
Sultan Khan 68cfbf8fc7 doctor leave 5 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
5 years ago
Elham Rababah 9194d8a44b delete Allergy 5 years ago
mosazaid 3b471aebdc Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
Elham b291572767 Merge branch 'soap_update' into 'development'
Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
5 years ago
Elham Rababah 8284f1d475 Fix profile widget 5 years ago
mosazaid b5a102add3 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
hussam al-habibeh eef5d57d2f Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post 5 years ago
hussam al-habibeh 16b949461d prescription post 5 years ago
Mohammad Aljammal 812fe10db8 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!219
5 years ago
Elham Rababah e054c28234 hide text 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 5 years ago
mosazaid 4b5bec8c50 working on UCAF design 5 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
5 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 6a8c37e0d7 doctor leave 5 years ago
Elham Rababah 7d550ca15f prevent null 5 years ago
Elham Rababah cece85cda7 small fix remove todo 5 years ago
Elham Rababah 2f80af6b74 small fix 5 years ago
Elham Rababah 71b50c8404 First step translations 5 years ago
Sultan Khan 6c894c3d3b sick leave 5 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
5 years ago
Elham Rababah e65740761a add improvement on create episode 5 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 9bf07d7117 reschedule leave 5 years ago
hussam al-habibeh e72ef46efb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 5 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
5 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e23bb7ce94 reschedule leave 5 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
5 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
5 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
5 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh d1a261c847 procedure update 5 years ago
Elham Rababah 856777c648 finish updating functions 5 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 5 years ago
mosazaid b60bac6d6e working on UCAF design 5 years ago
Elham Rababah f8b195e368 parseHtmlString now working :) 5 years ago
Elham Rababah 3cadd532d8 finish Updating 5 years ago
Sultan Khan 70d11bfe9e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 93c0bdf32a return login 5 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 3c968f0de1 doctor leave 5 years ago
Elham Rababah 6a7f0e605f Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 4caf40a2ab finish plan page 5 years ago
Mohammad Aljammal 1af5f1040f add search in soap update 5 years ago
Mohammad Aljammal d5bde6228a add search in update assessment page 5 years ago
hussam al-habibeh b3567df020 medical file model 5 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 311bee5136 try to fix get 5 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 5 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 5 years ago
mosazaid e9ffbf06a6 Merge branch 'development' into feature_admission_request 5 years ago
hussam al-habibeh 9210600e15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
mosazaid 3578c82f62 solve hacking patient screen 5 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
mosazaid cb4ee05b40 working on ucaf 5 years ago
hussam al-habibeh ce0303fbce Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh adb8033138 update prescription 5 years ago
Mohammad Aljammal a723ecbf1d fix merger 5 years ago
Mohammad Aljammal 5669021add Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/widgets/patients/profile/SOAP/assessment_page.dart
	lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
	lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
5 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 5 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 5 years ago
Mohammad Aljammal 45edddb49f Add search in Procedure Screen 5 years ago
Mohammad Aljammal b60b45ab53 Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/screens/patients/patient_search_screen.dart
5 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 5 years ago
Elham Rababah f0fd5d30e1 First step from update process 5 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 5 years ago
mosazaid 5142b5b6c7 finish admission request design 5 years ago
hussam al-habibeh b3345a86ef post prescription 5 years ago
Elham Rababah ea4bf159c6 commit issue 5 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 49e9ecfa4a doctor leave 5 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Elham Rababah 49f7dab008 Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 61209663f3 Finish arrived 5 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 5 years ago
Mohammad Aljammal 806682b921 hack login 5 years ago
Elham Rababah dccf474e70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/core/service/patient_service.dart
	lib/core/viewModel/patient_view_model.dart
	lib/lookups/patient_lookup.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/patients/patients_screen.dart
5 years ago