Commit Graph

822 Commits (29d24ed68f0af737ced57372ecb7da8cd063b372)

Author SHA1 Message Date
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
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 4 years ago
Sultan Khan 68cfbf8fc7 doctor leave 4 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 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
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
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
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
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
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 4 years ago
mosazaid b60bac6d6e working on UCAF design 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
hussam al-habibeh b3567df020 medical file model 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 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
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
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 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
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
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
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 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
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
4 years ago
hussam al-habibeh c7bfe24207 post procedure 4 years ago
mosazaid a71da8e4ef working on vital signs 4 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
4 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
4 years ago
Sultan Khan 1da12873c7 dashboard 4 years ago
mosazaid aafcd89222 working on vitalSigns feature 4 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
4 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 4 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
4 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 4 years ago
mosazaid 7cefbb4dbd add referral pages 4 years ago
Sultan Khan 8d58348267 dashboard changes 4 years ago
Elham Rababah c15300125e First step objective_page.dart 4 years ago
Sultan Khan e61f3f0281 add sick leave 4 years ago
Elham Rababah 518c30bdeb Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 44779e6ee7 patient screen 4 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 4 years ago
Sultan Khan 4f96cff585 sick leave 4 years ago
Sultan Khan e5d542f1d0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Elham Rababah 46cdd9482c First step from SOAP 4 years ago
Sultan Khan ba2697c917 sick leave 4 years ago
Elham Rababah 4eee5cd9d8 new login type 4 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 4 years ago
Sultan Khan 900264bc26 sick leave 4 years ago
Sultan Khan 76e10459e0 sick leave 4 years ago
Sultan Khan cc1a63786f sick leave 4 years ago
hussam al-habibeh cbb8937b1d '12/14' 4 years ago
hussam al-habibeh 7de6a8e99f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/landing_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
4 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 4 years ago
Elham Rababah 9f19b2566f finish refactor provider 4 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 4 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
4 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
4 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 4 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 4 years ago
Elham Rababah 6ab73916eb first step from patient provider 4 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid f9ae2559f0 working on referral reply screen 4 years ago
Elham 664d2b5c2b Merge branch 'design-updates' into 'development'
patients out and patients in screens design updates

See merge request Cloud_Solution/doctor_app_flutter!177
4 years ago
mosazaid a55b605a6c Merge branch 'development' into replay-design 4 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 4 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 4 years ago
Elham Rababah 58de54997a refactor search medicine Service 4 years ago
Elham Rababah 7863f13b0e Merge branches 'development' and 'refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refactor 4 years ago
Elham Rababah 45cde2cb72 refactor Referred Patient Service 4 years ago
Elham f641698d6c Merge branch 'refactor' into 'development'
refactor  Referral Patient Service

See merge request Cloud_Solution/doctor_app_flutter!174
4 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 4 years ago
Elham Rababah df9d151f46 refactor Referral Patient Service 4 years ago
Elham Rababah 6e461f7212 refactor Schedule service 4 years ago
Elham Rababah 0c7c4d7dae refactor doctor replay service 4 years ago
Mohammad Aljammal 3cedf3c927 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_mvvm
 Conflicts:
	lib/providers/medicine_provider.dart
4 years ago
Mohammad Aljammal e6edd5449f Add MVVM 4 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 4 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 4 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 4 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 4 years ago
Elham Rababah 9a18c405c7 comment code not working in good way until we fixed 4 years ago
Elham Rababah 1ad3652913 Fix issue related to pharmacies_list_screen.dart 4 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 4 years ago
Elham Rababah 8980fc03aa Finish Patient search design 4 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 4 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
4 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 4 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
4 years ago
Elham Rababah d28d2ecdeb add improvement dashboard screen design 4 years ago
Elham Rababah dff6c25031 add improvement dashboard screen design 4 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 4 years ago
Sultan Khan 6eb2da3770 voice search 4 years ago
hussam al-habibeh efc5db9f5b versionID update 4 years ago
hussam al-habibeh ba72d40deb Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam al-habibeh b6d2cdb1db fixing clinic name in app reopening 4 years ago
Sultan Khan 3f7ef48fd5 live care chages 4 years ago
hussam al-habibeh d449086f9a Fixing Clinic name in app reopening 4 years ago
Mohammad ALjammal d4b3e42070 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
Elham Rababah 287bb20d12 fix issues ios 4 years ago
Mohammad ALjammal d5825ccb85 fix issues 4 years ago
Mohammad ALjammal d22ce32cdb add call back android 4 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 4 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 4 years ago
hussam al-habibeh 629ccbeda8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh d866d8b9de get clinic list 4 years ago
Mohammad Aljammal 9dc1c27334 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!143
4 years ago
Sultan Khan 8a9d20990b Video call page updated 4 years ago
Sultan Khan cad6892c8b Video call page updated 4 years ago
ibrahim albitar 98950890a0 Add User Guid Module 4 years ago
Sultan Khan b66eebfd10 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 4 years ago
Mohammad ALjammal c671059a03 fix issues in video call 4 years ago
Mohammad ALjammal 270d7ffa6d Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/main.dart
4 years ago
Mohammad ALjammal 7cc1c36ab4 change Medicine Provider to use BaseAppClient 4 years ago
Sultan Khan dd3154a498 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan bde86ef829 live care features added. 4 years ago
Mohammad ALjammal 42a639f8b8 integration with opentok ios 4 years ago
Mohammad ALjammal 990d36d804 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 868b118243 integration with OpenTok android 4 years ago
Elham 7fe2a96065 Merge branch 'hussam' into 'development'
translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
4 years ago
hussam al-habibeh 000315ac0e translation 'updates' 4 years ago
ibrahim albitar c07f84ff78 fixing and enhancments 4 years ago
Sultan Khan f052ffc8f3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 93936c3c55 video call screen added 4 years ago
Elham c35c6f7444 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!134
4 years ago
Elham Rababah 89241460da change clinic name 4 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 4 years ago
hussam al-habibeh fb6d54faaf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh 054933b280 Translation stage four 4 years ago
Elham Rababah bd3ce0a4d4 refactor models 4 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 4 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 4 years ago
Mohammad ALjammal 63dd8262da Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
hussam al-habibeh ea78db6a75 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/dashboard_screen.dart
#	lib/util/translations_delegate_base.dart
4 years ago
hussam al-habibeh b63d8906bc Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/profile_screen.dart
4 years ago
Sultan Khan 79c2de3f96 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	fonts/DoctorApp.ttf
#	lib/presentation/doctor_app_icons.dart
4 years ago
hussam alhababieh a02fe9c83d translation stage two 4 years ago
ibrahim albitar fc1d4c9a9b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 57708de8e4 pharmacies screen scrollview 4 years ago
amjad nabil amireh 640829f454 Merge branch 'Amjad_search' into 'development'
Modify patiant screen icon avatar

See merge request Cloud_Solution/doctor_app_flutter!121
4 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 4 years ago
Elham 69b02e29c5 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!120
4 years ago
Elham Rababah 574a951fcf finish clinic exept design 4 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 4 years ago
Elham Rababah 165d697e33 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 5779fb9ad7 change profile based on change clinic 4 years ago
Amjad Amireh 230bdb2430 Modify Dr profile data dynamic size 4 years ago
Elham Rababah ef8dfc5b5f first step form change clinic 4 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 6fd43a281d fixing 4 years ago
Mohammad Aljammal f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
4 years ago
Mohammad ALjammal d52429564d fix issues in Patient 4 years ago
hussam alhababieh dcbf1312b7 translate dashboard/patient search 4 years ago
hussam alhababieh 097d8df8c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b178f08278 translate dashboard and patient search 4 years ago
Mohammad ALjammal b758ae8196 fix issues 4 years ago
Mohammad ALjammal c7f1c6d174 Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/screens/auth/login_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 4 years ago
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal edd25ff437 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 4 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 4 years ago
Mohammad ALjammal ed857d8d54 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/dashboard_screen.dart
4 years ago
Mohammad ALjammal fc2297394e Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal 06f2aaef4b Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev-elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/auth/login_screen.dart
	lib/widgets/auth/login_form.dart
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad ALjammal 5294948a58 fix issues 4 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 4 years ago
Amjad Amireh 68031519e2 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
4 years ago
Amjad Amireh e0b841a4c1 change font size 4 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 4 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!107
4 years ago
Elham 25d42c4a26 Revert "Merge branch 'elham' into 'master'"
This reverts merge request !105
4 years ago
Elham 73fd8932d4 Merge branch 'elham' into 'master'
Elham

See merge request Cloud_Solution/doctor_app_flutter!105
4 years ago
Elham Rababah 395a7947c3 improve auth app 4 years ago
Amjad Amireh 3410d691f8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 4 years ago
ibrahim albitar 4638ba56a2 jira fixes 4 years ago
Salman Afzal 11f10f1eea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
ibrahim albitar 937f8ecd6a fix 4 years ago
ibrahim albitar 480c64d25a complete refer patient 4 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah a42f06c9ff modify hospital provider to make it call app base 4 years ago
Mohammad ALjammal 4a8b97b189 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
4 years ago
Mohammad ALjammal 0c94188405 Done Prescription Details Screen 4 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
ibrahim albitar 14527e19b1 fix issues 4 years ago
unknown ce5ee4a21e Merge branch 'develop' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 4 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Salman Afzal a914ff9367 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/presentation/doctor_app_icons.dart
4 years ago
unknown 39cc4fa4bf refere to doctor 4 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 4 years ago
Amjad Amireh d136537b44 Modify Patiant screen List style 4 years ago
Mohammad ALjammal 2ad96dad88 create Prescription In and Out Patient 4 years ago
Mohammad ALjammal 33b59514a0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal c16c8897be Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
Elham Rababah 6e5c2aca4d Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 1e507cca3e finish resend code 4 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 4 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 4 years ago
Amjad Amireh 49f8da4a05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Mohammad ALjammal c8b2604110 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/widgets/doctor/my_referred_patient_widget.dart
4 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Mohammad ALjammal 644cfac790 change design prescription and add new services 4 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 4 years ago
Salman Afzal 5f6e9104d0 scroll change 4 years ago
Amjad Amireh 0ed3481b42 Localization comment 4 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
4 years ago
Mohammad ALjammal c7ad16cbcd update design Radiology Screen and create Radiology Report Screen 4 years ago
Salman Afzal 4239124f1a dashboard icon updated 4 years ago
Amjad Amireh 86d0d52f05 SVG female 4 years ago
Mohammad ALjammal b3befa12db Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Mohammad ALjammal 5d7937c08d add arrow back in PatientProfileScreen , PatientSearchScreen and PatientsScreen 4 years ago
Salman Afzal ac612f0eda dashboard and patient app 4 years ago
Mohammad ALjammal 6319af97f2 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Elham Rababah 55a4bfba83 hot fix 4 years ago
Mohammad ALjammal 6a3e8baa86 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 9b5658c00e change design My Referral and My Referral Patient 4 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 4 years ago
Elham Rababah 10877ac658 improve vital sign item details 4 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 61674bec47 new pages 4 years ago
Mohammad ALjammal 73f0cd7795 marge with master 4 years ago
Mohammad ALjammal 4f0059d092 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/doctor/my_referred_patient_screen.dart
4 years ago
Mohammad ALjammal 627bac340d marge with master 4 years ago
Mohammad ALjammal 540d902236 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/providers/patients_provider.dart
4 years ago
Amjad Amireh b8e5ab9a46 design 4 years ago
Mohammad ALjammal c6bbc1c2f5 fix patient profile details 4 years ago
Mohammad ALjammal 14edbff8b4 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/patients/profile/vital_sign/body_measurements_screen.dart
4 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 4 years ago
Elham Rababah 0d30fd6212 vitalsign details 4 years ago
Amjad Amireh 29239fddde modify search 4 years ago
Amjad Amireh 505b3383ff patient screen Modify 4 years ago
Amjad Amireh 3c3d85c255 My Referred Patient 4 years ago
ibrahim albitar d9f7f586f8 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!79
4 years ago
unknown 6b12a8a689 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 0c112ebca5 finished new screens 4 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 4 years ago
Elham Rababah 1347198928 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 92dd877042 chart works 4 years ago
Mohammad ALjammal ef48a995eb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Elham Rababah 6ebee5dbf6 first step form chart 4 years ago
Amjad Amireh d3c2efc45d svg avatar Icon and library 4 years ago
unknown 8c46c93e86 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 9f4802c225 progress note 4 years ago
Amjad Amireh 317742b55a Svg component 4 years ago
Mohammad ALjammal 2349a596ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	pubspec.lock
	pubspec.yaml
4 years ago
Elham f9e2fd58ab Merge branch 'elham' into 'master'
add login logic with silent options

See merge request Cloud_Solution/doctor_app_flutter!75
4 years ago
Elham Rababah c5bbb0495a add login logic with silent options 4 years ago
Mohammad ALjammal 9ce7d3267b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 4 years ago
Amjad Amireh fff2b32dee ExpandableItem widget 4 years ago
Amjad Amireh be60383916 ListItem Expand 4 years ago
Amjad Amireh ae064cc14a Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Amjad Amireh 8f860ab4cf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Amjad Amireh 9aae4b8650 amjad modified to expand list 4 years ago
Mohammad ALjammal 7d3bfddd68 update design my schedule and doctor replay 4 years ago
ibrahim albitar 7f5831335b Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!70
4 years ago
unknown 7d1cfb7b4e add new screens 4 years ago
amjad nabil amireh 72cea26787 Merge branch 'Amjad_search' into 'master'
New Design from Mahmoud

See merge request Cloud_Solution/doctor_app_flutter!69
4 years ago
Amjad Amireh bb606e6a1d New Design from Mahmoud 5 years ago
Mahmoud Shrouf 0670360af8 Merge branch 'Mahmoud' into 'master'
My Changes Before Demo

See merge request Cloud_Solution/doctor_app_flutter!67
5 years ago
Mahmoud Shrouf 394bd514ab My Changes Before Demo 5 years ago
her_username 80fdd81ae0 change name in Doctor Reply 5 years ago
unknown 3653c90665 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
her_username f3102ef99f edit doctor reply provider and schedule provider 5 years ago
her_username 5fdf34b917 done qr code 5 years ago
her_username c1ddff2994 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
her_username 312a4741a0 edit patient search 5 years ago
Amjad Amireh c7fccbf708 verify clinic id 5 years ago
unknown b94011af47 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
her_username 111d90d56f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/models/patient/patiant_info_model.dart
	pubspec.lock
5 years ago
her_username 7d3856f2b2 done QR reader 5 years ago
Elham Rababah 146e913113 add choose clinic to login process 5 years ago
unknown 0c44c57c2f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
unknown 35205b7024 patient medical info 5 years ago
Amjad Amireh 2f0c400328 Modify time and date 5 years ago
Amjad Amireh ce1a502d32 Doctor id dynamic 5 years ago
Amjad Amireh aa72674805 Modify Error validation 5 years ago
Elham Rababah 0748a569ac Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 5 years ago
Elham Rababah 1e656af143 handelCatcherrorCase 5 years ago
amjad nabil amireh a520e159e2 Merge branch 'Amjad_search' into 'master'
modify search patient

See merge request Cloud_Solution/doctor_app_flutter!58
5 years ago
Amjad Amireh f9346c3fef modify search patiant 5 years ago
Elham 54d1881ac0 Merge branch 'elham' into 'master'
add doctor profile to shaerd pref

See merge request Cloud_Solution/doctor_app_flutter!56
5 years ago
Elham Rababah bc395c3fcc add doctor profile to shaerd pref 5 years ago
amjad nabil amireh 6134347e8e Merge branch 'Amjad_search' into 'master'
Amjad search

See merge request Cloud_Solution/doctor_app_flutter!55
5 years ago
Amjad Amireh ac4489c452 patiant model modify 5 years ago
her_username b07ff8154c update local for doctor replay , my schedule and message screen 5 years ago
Elham Rababah 16832129c3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 5 years ago
Elham Rababah 142c8d97e3 first step from body measurements 5 years ago
her_username 216374aed2 change class name and change init route 5 years ago
her_username f098520a80 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 5 years ago
her_username 3fbc2dabef remove i18n package, change the location localized values,
change provider name and create new provider
5 years ago
Elham Rababah cabbf03eec vital_sign_details 5 years ago
Elham Rababah 51835c231a improtant fix in SliverGrid 5 years ago
Elham Rababah 00bce3403e first step from the vital details 5 years ago
her_username cc929ba4a5 update Localizations 5 years ago
Elham Rababah 8594f1a498 change the color desing in profile 5 years ago
Elham Rababah 7c291f8d63 add comment and fix some pugs 5 years ago
amjad nabil amireh f4e82f9fd9 Merge branch 'Amjad_search' into 'master'
Filter search in outpatient and format time

See merge request Cloud_Solution/doctor_app_flutter!51
5 years ago
Amjad Amireh c09c1599fc Filter search in outPatiant and format time 5 years ago
ibrahim albitar 211a40c706 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!50
5 years ago
unknown 80b6716091 call phramicies 5 years ago
Elham Rababah 7a370c29dc use ProfileImageWidget in patient profile 5 years ago
unknown f26df864ee Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
unknown 3c03647392 out of stuk 5 years ago
Elham Rababah ce8fa791e9 return values to daynmic 5 years ago
Elham Rababah d09ba4632e Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 5 years ago
Elham Rababah 1a98e37a7f add prescription add radiology 5 years ago
Amjad Amireh 8457cbd5c3 Search filter name 5 years ago
Elham Rababah 4309a2141a small fix on desing and create model 5 years ago
Elham Rababah 49f9841079 add patient route 5 years ago
unknown 734b7b2c99 refactoring code 5 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 5 years ago
unknown 22a21faff7 pharmacies screen 5 years ago
Elham d0e35d0c9d Merge branch 'elham' into 'master'
fix bottom bar by Elham && mohammad

See merge request Cloud_Solution/doctor_app_flutter!43
5 years ago
Elham Rababah c4c8609f3a fix bottom bar by Elham && mohammad 5 years ago
Amjad Amireh 3e25f2c0f4 Patiant search dropdown design 5 years ago
Elham a7807a7e6d Revert "Merge branch 'Amjad_search' into 'master'"
This reverts merge request !39
5 years ago
amjad nabil amireh aafde2c311 Merge branch 'master' into 'Amjad_search'
# Conflicts:
#   lib/screens/patients/patient_search_screen.dart
5 years ago
Amjad Amireh ef0726422b Modify Patiant Search DEsign 5 years ago
Amjad Amireh 3f821e0c05 update pataintDesign 5 years ago
Elham f0201cfcbe Merge branch 'elham' into 'master'
finsih vital sign desing

See merge request Cloud_Solution/doctor_app_flutter!36
5 years ago
Elham Rababah 5e6722dde0 finsih vital sign desing 5 years ago
Amjad Amireh 50b8d543be Patiant search filter design 5 years ago
Amjad Amireh d341da6b54 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 5 years ago
Amjad Amireh 35412fb0a5 patient screen header 5 years ago
Elham Rababah b8da09a4f4 small fix 5 years ago
Elham Rababah 34c4dd8e06 important fix for the merge 5 years ago
Elham Rababah 7e154e47c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 5 years ago
Elham Rababah 9f87e5daf2 fix bug in vital sign model 5 years ago
her_username 35f8c14b9a fix the design issues after merge 5 years ago
her_username 84ebdb98ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/routes.dart
	lib/screens/patients/patients_screen.dart
5 years ago
her_username ce9530fdae DA-84 Apply Service on Dr reply List
update app scaffold -- Add arrow back
update card with bg widget -- set size changeable
5 years ago
Elham Rababah 19558e13ac create VitalSignResModel 5 years ago
Elham Rababah bcf2b2aea6 read update card from the service and make the value static 5 years ago
Elham Rababah de683cb11c finish patient provider 5 years ago
unknown c30fcbc2b5 pharmacies list 5 years ago
unknown a59a2d5ad3 pharmacy web services 5 years ago
Elham Rababah 5e7526f2c7 vital sign screen 5 years ago
Elham Rababah 691e7dbac6 first step in vital sign and fix some thing in master 5 years ago
amjad nabil amireh 8ca37c6b34 Merge branch 'Amjad_search' into 'master'
Patient search

See merge request Cloud_Solution/doctor_app_flutter!30
5 years ago
Amjad Amireh d7b7cc998e Patiant search 5 years ago
her_username e387820fe1 add some comment 5 years ago
her_username 06486f578c done Dr Schedule 5 years ago
her_username ae8a5740f3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 5 years ago