Commit Graph

937 Commits (3d36c8b7a048acf5d3a2302b9fc9b1f2338ad0a0)

Author SHA1 Message Date
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 eae0bb443f solve problem with vital signs charts depend on date 4 years ago
mosazaid d9d4e22531 Merge branch 'development' into feature-ucaf 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
hussam alhababieh d87aeb290f Merge branch 'development' into 'procedure-fix'
# Conflicts:
#   lib/landing_page.dart
4 years ago
hussam al-habibeh b0410dc744 Procedure updates 4 years ago
hussam al-habibeh debcad3a3d prescription 4 years ago
hussam al-habibeh 4b54ca7d47 prescription 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
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

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

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

See merge request Cloud_Solution/doctor_app_flutter!247
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
mosazaid 2f17167e2f some design enhancments 4 years ago
mosazaid db502b7f0d Merge branch 'development' into feature-ucaf 4 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
4 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
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
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
4 years ago
Elham Rababah 3c1b51eb94 fix issue related to landing page 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
hussam al-habibeh 5253c28469 prescription form fix 4 years ago
Elham Rababah 4f1a892be4 first step form create episode 4 years ago
mosazaid 289cf9b479 Merge branch 'development' into feature-ucaf 4 years ago
Mohammad Aljammal e60cc5ec4a Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!240
4 years ago
mosazaid ca9f1a022b Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 4 years ago
hussam al-habibeh f767467a67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file 4 years ago
hussam al-habibeh bcbd091dae ss 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
hussam al-habibeh a3fa8ef839 medical file fix 4 years ago
mosazaid ff906338bf Merge branch 'development' into feature-ucaf 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
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 4 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 4 years ago
Sultan Khan 71c4d48cca Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan c4cae6fb38 doctor leave bug fix 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
Sultan Khan 87d90a394b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 044ad7b51a offtime leave 4 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 4 years ago
mosazaid e75e7801aa working on UCAF get data 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 1be8ea7dcb Fix conflict 4 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
4 years ago
Elham Rababah c3bb408787 add some translations 4 years ago
Mohammad Aljammal 699c565427 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

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

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

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

See merge request Cloud_Solution/doctor_app_flutter!229
4 years ago
mosazaid 7983f998bd Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
hussam al-habibeh 76cc4d11f8 medical file 4 years ago
Sultan Khan ad967e8aae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah bbcd218a94 history delete is fixed 4 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 4 years ago
Elham Rababah 3dffd33728 hot fix 4 years ago
Sultan Khan 68cfbf8fc7 doctor leave 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
mosazaid b5a102add3 Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ee9ca72057 change empty referral message 4 years ago
hussam al-habibeh eef5d57d2f Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post 4 years ago
hussam al-habibeh 16b949461d prescription post 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 0c39dc6693 change on vital signs for uncoment the service 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
Sultan Khan 6a8c37e0d7 doctor leave 4 years ago
Elham Rababah 7d550ca15f prevent null 4 years ago
Elham Rababah cece85cda7 small fix remove todo 4 years ago
Elham Rababah 2f80af6b74 small fix 4 years ago
Elham Rababah 71b50c8404 First step translations 4 years ago
Sultan Khan 6c894c3d3b sick leave 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
Sultan Khan 9bf07d7117 reschedule leave 4 years ago
hussam al-habibeh e72ef46efb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 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
Sultan Khan e23bb7ce94 reschedule leave 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
mosazaid b60bac6d6e working on UCAF design 4 years ago
Elham Rababah f8b195e368 parseHtmlString now working :) 4 years ago
Elham Rababah 3cadd532d8 finish Updating 4 years ago
Sultan Khan 70d11bfe9e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Mohammad Aljammal 93c0bdf32a return login 4 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 3c968f0de1 doctor leave 4 years ago
Elham Rababah 6a7f0e605f Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 4 years ago
Elham Rababah 4caf40a2ab finish plan page 4 years ago
Mohammad Aljammal 1af5f1040f add search in soap update 4 years ago
Mohammad Aljammal d5bde6228a add search in update assessment page 4 years ago
hussam al-habibeh b3567df020 medical file model 4 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 4 years ago
Elham Rababah 311bee5136 try to fix get 4 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 4 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 4 years ago
mosazaid e9ffbf06a6 Merge branch 'development' into feature_admission_request 4 years ago
hussam al-habibeh 9210600e15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 4 years ago
mosazaid 3578c82f62 solve hacking patient screen 4 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
4 years ago
mosazaid cb4ee05b40 working on ucaf 4 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
4 years ago
hussam al-habibeh adb8033138 update prescription 4 years ago
Mohammad Aljammal a723ecbf1d fix merger 4 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
4 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 4 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 4 years ago
Mohammad Aljammal 45edddb49f Add search in Procedure Screen 4 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
4 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 4 years ago
Elham Rababah f0fd5d30e1 First step from update process 4 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 4 years ago
mosazaid 5142b5b6c7 finish admission request design 4 years ago
hussam al-habibeh b3345a86ef post prescription 4 years ago
Elham Rababah ea4bf159c6 commit issue 4 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 49e9ecfa4a doctor leave 4 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
4 years ago
Elham Rababah 05e7762533 fix obj page 4 years ago
Elham Rababah 49f7dab008 Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 4 years ago
Elham Rababah 61209663f3 Finish arrived 4 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 4 years ago
Mohammad Aljammal 806682b921 hack login 4 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
4 years ago
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
4 years ago
Elham Rababah df4eb94042 work with patient model 4 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 4 years ago
mosazaid f35eff1220 working with admission request 4 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 4 years ago
hussam al-habibeh 9d8514c83b post prescription 4 years ago
Mohammad Aljammal 6f2e764deb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
 Conflicts:
	lib/client/base_app_client.dart
	lib/routes.dart
4 years ago
Mohammad Aljammal 04ed76069c hack login 4 years ago
Elham Rababah fc82665f1b add ICD10 4 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
4 years ago
Elham Rababah 2f273dcde8 add ICD10 4 years ago
Elham Rababah 4e8de52efe add commented code 4 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 4 years ago
Elham Rababah 14955201a9 fix things 4 years ago
Elham Rababah efee00c79e finish add assessment 4 years ago
Elham Rababah 72886ccaa7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
4 years ago
Elham Rababah a47e9b69f5 add CDI service 4 years ago
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
4 years ago
Elham Rababah 8a6ea1c0c5 Fix SOAP 4 years ago
hussam al-habibeh 0c18d96ba2 post procedure 4 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
4 years ago
hussam al-habibeh b2aade9b2b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
4 years ago
hussam al-habibeh c7bfe24207 post procedure 4 years ago
Mohammad Aljammal df83883139 fix base app client 4 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 4 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 4 years ago
Elham Rababah edef444534 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/config.dart
	lib/core/service/base/lookup-service.dart
4 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 4 years ago
Elham Rababah dc4250a4de Post progress Note 4 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 4 years ago
Elham Rababah f97d11183d progress Note 4 years ago