Commit Graph

1079 Commits (06fdee2d2da93a7e514b9cf918b59c82ed9d9b55)

Author SHA1 Message Date
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
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
Elham Rababah df4eb94042 work with patient model 5 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 5 years ago
mosazaid f35eff1220 working with admission request 5 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh 9d8514c83b post prescription 5 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
5 years ago
Mohammad Aljammal 04ed76069c hack login 5 years ago
Elham Rababah fc82665f1b add ICD10 5 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah 4e8de52efe add commented code 5 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 5 years ago
Elham Rababah 14955201a9 fix things 5 years ago
Elham Rababah efee00c79e finish add assessment 5 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
5 years ago
Elham Rababah a47e9b69f5 add CDI service 5 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
5 years ago
Elham Rababah 8a6ea1c0c5 Fix SOAP 5 years ago
hussam al-habibeh 0c18d96ba2 post procedure 5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 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
5 years ago
hussam al-habibeh c7bfe24207 post procedure 5 years ago
Mohammad Aljammal df83883139 fix base app client 5 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 5 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 5 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
5 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 5 years ago
Elham Rababah f97d11183d progress Note 5 years ago
mosazaid a71da8e4ef working on vital signs 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 5 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
5 years ago
Elham Rababah 1491a04b39 PostPhysicalExam works 5 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah e6af5a3e39 remove is Auth for test target 5 years ago
Elham Rababah cd46b4317c fix error null thing 5 years ago
Elham Rababah a362901da8 improve code inside my eam 5 years ago
Elham Rababah 4df3b1fb40 First step from examination 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
Sultan Khan 1da12873c7 dashboard 5 years ago
mosazaid aafcd89222 working on vitalSigns feature 5 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
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 18d58e7037 remove is Auth for test target 5 years ago
Sultan Khan 384c7cd58a code merged 5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Elham Rababah 26a25f44e0 fix error null thing 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 4560706d55 improve code inside my eam 5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
mosazaid f6ddf7a9eb make logout button close all screen stack and push to login 5 years ago
Elham Rababah abbe891673 improve code quality 5 years ago
Elham Rababah 2658694b70 remove static value 5 years ago
Elham Rababah 9a614b25b5 Finish the login 5 years ago
Elham Rababah e96d38454c First step from examination 5 years ago
Elham Rababah bb651478a0 Finish subjective 5 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
5 years ago
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
mosazaid 8ffb372573 rename llokup file 5 years ago
mosazaid 25063b9590 adding lookup service 5 years ago
mosazaid d2550df08c adding shared lockup service 5 years ago
mosazaid cb80ce7785 isAuthunticated behaviour 5 years ago
Elham Rababah 9bb396c309 fix error in base app 5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Elham Rababah 52554d1aef add and remove allergy 5 years ago
Sultan Khan 989c06ae33 prescription changes 5 years ago
Elham Rababah 405ad731c7 history list ready 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Elham Rababah ef6b1bc50e add master lookups 5 years ago
Elham Rababah 16e6221b9e Finish plan page design 5 years ago
Elham Rababah 7910e6a9e9 Finish step objective_page.dart + assessment_page.dart page 5 years ago
Elham Rababah c15300125e First step objective_page.dart 5 years ago
Sultan Khan e61f3f0281 add sick leave 5 years ago
Elham Rababah dcba85c7b9 Finish first step subjective_page.dart 5 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
5 years ago
Elham Rababah 44779e6ee7 patient screen 5 years ago
mosazaid 94093e775e add vital-sign files 5 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 5 years ago
Sultan Khan 4f96cff585 sick leave 5 years ago
Sultan Khan e5d542f1d0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 81352c2b0e small fix. 5 years ago
Elham Rababah af77d35ce3 ass some changes to SOAP 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
Sultan Khan 900264bc26 sick leave 5 years ago
Sultan Khan 76e10459e0 sick leave 5 years ago
Sultan Khan 97d915ef99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan cc1a63786f sick leave 5 years ago
hussam al-habibeh dfca3aa0e5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh cbb8937b1d '12/14' 5 years ago
Elham Rababah 89729e4537 fix my referred widget 5 years ago
Elham Rababah 5905311d12 small fixes in patient profile 5 years ago
Elham 97a1a56f1f Merge branch 'replay-design' into 'development'
re-design in-patient detail page

See merge request Cloud_Solution/doctor_app_flutter!182
5 years ago
Sultan Khan 06f71a22fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
mosazaid 16821c17fc re-design in-patient detail page 5 years ago
Sultan Khan ac747e7519 dashboard 5 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
5 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 5 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

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

See merge request Cloud_Solution/doctor_app_flutter!179
5 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 5 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 5 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid f9ae2559f0 working on referral reply screen 5 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
5 years ago
mosazaid a55b605a6c Merge branch 'development' into replay-design 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
Elham Rababah b9bf315199 fast fix 5 years ago
Elham Rababah 58de54997a refactor search medicine Service 5 years ago
Elham Rababah 7863f13b0e Merge branches 'development' and 'refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refactor 5 years ago
Elham Rababah 45cde2cb72 refactor Referred Patient Service 5 years ago
Elham f641698d6c Merge branch 'refactor' into 'development'
refactor  Referral Patient Service

See merge request Cloud_Solution/doctor_app_flutter!174
5 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 5 years ago
Elham Rababah df9d151f46 refactor Referral Patient Service 5 years ago
Elham Rababah 6e461f7212 refactor Schedule service 5 years ago
Elham Rababah 0c7c4d7dae refactor doctor replay service 5 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
5 years ago
Mohammad Aljammal e6edd5449f Add MVVM 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah 716cb28bf1 fix issue on vital_sign_res_model.dart 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
Elham Rababah 9a18c405c7 comment code not working in good way until we fixed 5 years ago
Elham Rababah 1ad3652913 Fix issue related to pharmacies_list_screen.dart 5 years ago
Elham Rababah 51206c1164 fix auth with mohammad help 5 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 6 years ago
Elham Rababah 8980fc03aa Finish Patient search design 6 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 6 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
6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad Aljammal 5eae2f9519 fix merge issues 6 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
6 years ago
Elham Rababah d28d2ecdeb add improvement dashboard screen design 6 years ago
Elham Rababah dff6c25031 add improvement dashboard screen design 6 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
hussam al-habibeh ba72d40deb Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam al-habibeh b6d2cdb1db fixing clinic name in app reopening 6 years ago
hussam al-habibeh 0444d6803c verification Screen Fixed 6 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
hussam al-habibeh d449086f9a Fixing Clinic name in app reopening 6 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
6 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 6 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
6 years ago
Elham Rababah 287bb20d12 fix issues ios 6 years ago
Elham Rababah 28ffcb12a2 Merge branch 'open_tok_call_back' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 6ea72f5ffa make things daynamic 6 years ago
Mohammad ALjammal d5825ccb85 fix issues 6 years ago
Mohammad ALjammal d22ce32cdb add call back android 6 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 6 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 6 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
6 years ago
hussam al-habibeh d866d8b9de get clinic list 6 years ago
Mohammad Aljammal 9dc1c27334 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!143
6 years ago
Sultan Khan 8a9d20990b Video call page updated 6 years ago
Sultan Khan cad6892c8b Video call page updated 6 years ago
ibrahim albitar 98950890a0 Add User Guid Module 6 years ago
Sultan Khan b66eebfd10 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 6 years ago
Mohammad ALjammal eb2995ea25 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/auth_provider.dart
	lib/util/helpers.dart
6 years ago
Elham 8bff0e1504 Merge branch 'elham' into 'development'
fix lang in clinic name & get profile

See merge request Cloud_Solution/doctor_app_flutter!141
6 years ago
Elham Rababah ec4a784b9b fix lang in clinic name & get profile 6 years ago
Mohammad ALjammal c671059a03 fix issues in video call 6 years ago
Mohammad ALjammal 270d7ffa6d Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/main.dart
6 years ago
Mohammad ALjammal a51a312eb4 fix base app client 6 years ago
Mohammad ALjammal 7cc1c36ab4 change Medicine Provider to use BaseAppClient 6 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
6 years ago
Sultan Khan bde86ef829 live care features added. 6 years ago
Mohammad ALjammal 42a639f8b8 integration with opentok ios 6 years ago
hussam al-habibeh 0e471aaa63 language setup on logout 6 years ago
hussam al-habibeh 420cc0622c Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam al-habibeh 5172703a32 setup language on logout 6 years ago
Mohammad ALjammal 990d36d804 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal 868b118243 integration with OpenTok android 6 years ago
Elham 7fe2a96065 Merge branch 'hussam' into 'development'
translation 'updates'

See merge request Cloud_Solution/doctor_app_flutter!136
6 years ago
hussam al-habibeh 3ef9ca1a04 Json data translation 6 years ago
hussam al-habibeh 000315ac0e translation 'updates' 6 years ago
ibrahim albitar c07f84ff78 fixing and enhancments 6 years ago
ibrahim albitar 339c8dfb00 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim 6 years ago
Sultan Khan f052ffc8f3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 93936c3c55 video call screen added 6 years ago
ibrahim albitar ee8d481504 live care web service 6 years ago
Elham c35c6f7444 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!134
6 years ago
Elham Rababah 89241460da change clinic name 6 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 6 years ago
Elham Rababah c62340e834 modify IMEI 6 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
6 years ago
hussam al-habibeh 054933b280 Translation stage four 6 years ago
Elham Rababah bd3ce0a4d4 refactor models 6 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 6 years ago
hussam al-habibeh 1476c151e2 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
6 years ago
hussam al-habibeh 8f04edb450 Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/landing_page.dart
6 years ago
Mohammad Aljammal 5062d942c3 Merge branch 'mohammad' into 'development'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!126
6 years ago
Mohammad ALjammal aff8f87a2f fix merge issues 6 years ago
hussam al-habibeh c486d7f357 translation stage three 6 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
6 years ago
Mohammad ALjammal f22eec909b create internet connection page Mohammad & Elham 6 years ago
Sultan Khan b26e750abb drawer design updated 6 years ago
Mohammad Aljammal 934236ac82 Merge branch 'mohammad' into 'development'
fix issues in login

See merge request Cloud_Solution/doctor_app_flutter!123
6 years ago
Mohammad ALjammal 6747495ea8 fix issues in login 6 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
6 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
6 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
6 years ago
hussam alhababieh a02fe9c83d translation stage two 6 years ago
ibrahim albitar fc1d4c9a9b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
ibrahim albitar 57708de8e4 pharmacies screen scrollview 6 years ago
Sultan Khan e71b315d75 icon updated 6 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
6 years ago
Amjad Amireh 4e62947df2 Modify patiant screen icon avatar 6 years ago
Elham 69b02e29c5 Merge branch 'elham' into 'development'
Elham

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

See merge request Cloud_Solution/doctor_app_flutter!117
6 years ago
Mohammad ALjammal 94dbecca4a fix issues in login 6 years ago
ibrahim albitar 73844dd4f2 Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
ibrahim albitar 8da67db69f fix patient type dropdown 6 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 years ago
ibrahim albitar 6fd43a281d fixing 6 years ago
Mohammad ALjammal 0dad77bfa2 fix issues in login 6 years ago
Mohammad ALjammal 69173e8c46 fix issues in login focus 6 years ago
amjad nabil amireh 67c0531fe1 Merge branch 'Amjad_search' into 'development'
Modify date in time in search patient

See merge request Cloud_Solution/doctor_app_flutter!116
6 years ago
Amjad Amireh 66627534a9 Modify date in time in search patiant 6 years ago
Mohammad Aljammal f6aec27788 Merge branch 'mohammad' into 'development'
fix issues in Patient

See merge request Cloud_Solution/doctor_app_flutter!115
6 years ago
Mohammad ALjammal d52429564d fix issues in Patient 6 years ago
hussam alhababieh dcbf1312b7 translate dashboard/patient search 6 years ago
hussam alhababieh 097d8df8c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam alhababieh b178f08278 translate dashboard and patient search 6 years ago
Mohammad ALjammal b758ae8196 fix issues 6 years ago
Mohammad ALjammal fa9e1a344a fix issues 6 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
6 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 6 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
6 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
6 years ago
Mohammad ALjammal 2877aa171e Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/widgets/auth/verfiy_account.dart
6 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 6 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
Mohammad ALjammal 2b1391a6bb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 6 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
6 years ago
Mohammad ALjammal e545d4992c fix issues in dev 6 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
6 years ago
Mohammad ALjammal c8a3beb530 fix issues in dev 6 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
6 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad ALjammal 5294948a58 fix issues 6 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 6 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
6 years ago
Elham Rababah 3d8f8680b3 DA-115:add Authentication Type to verfiy account screen 6 years ago
Amjad Amireh e0b841a4c1 change font size 6 years ago
Amjad Amireh 3eeac2734b Modify Patiant screen List style 6 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

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

See merge request Cloud_Solution/doctor_app_flutter!105
6 years ago
Elham Rababah 395a7947c3 improve auth app 6 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
6 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
6 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 6 years ago
ibrahim albitar 4638ba56a2 jira fixes 6 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
6 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 6 years ago
ibrahim albitar 937f8ecd6a fix 6 years ago
Elham Rababah a37a5ccd86 DA-114:Reduce the font size for the project list 6 years ago
Elham Rababah be6c77f81b AD-113: Remove Remember Me 6 years ago
Elham Rababah 3e05a58dd7 delete app client 6 years ago
Elham Rababah d44dabd485 Merge branch 'base_app_client_one' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into base_app_client 6 years ago
Elham Rababah e6b99adc80 change calling serivce to base app client 6 years ago