Commit Graph

867 Commits (51234b80591bd3473e2acee795d2ffa1af8dabce)

Author SHA1 Message Date
Elham Rababah 7d550ca15f prevent null 5 years ago
Elham Rababah 2f80af6b74 small fix 5 years ago
Elham Rababah 71b50c8404 First step translations 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
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
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
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 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
mosazaid cb4ee05b40 working on ucaf 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 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
hussam al-habibeh b3345a86ef post prescription 5 years ago
Elham Rababah ea4bf159c6 commit issue 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
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 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
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah 4e8de52efe add commented code 5 years ago
Elham Rababah 14955201a9 fix things 5 years ago
Elham Rababah efee00c79e finish add assessment 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
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
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
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
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
hussam al-habibeh 749e870ea2 get procedures get prescription 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
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
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
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
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 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
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
mosazaid f9ae2559f0 working on referral reply screen 5 years ago
mosazaid a55b605a6c Merge branch 'development' into replay-design 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 5 years ago
Elham Rababah 45cde2cb72 refactor Referred Patient Service 5 years ago
Elham Rababah df9d151f46 refactor Referral Patient Service 5 years ago
Elham Rababah 6e461f7212 refactor Schedule 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 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 9a18c405c7 comment code not working in good way until we fixed 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 e37a3e8ce1 Finish dashboard screen design 6 years ago
Sultan Khan 6eb2da3770 voice search 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
hussam al-habibeh d3bb85129c LogIn function refactoring 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
ibrahim albitar 98950890a0 Add User Guid Module 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
ibrahim albitar c07f84ff78 fixing and enhancments 6 years ago
Elham c35c6f7444 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!134
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 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
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 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
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 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 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 d52429564d fix issues in Patient 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
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
Elham Rababah be6c77f81b AD-113: Remove Remember Me 6 years ago
Elham Rababah e6b99adc80 change calling serivce to base app client 6 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah a42f06c9ff modify hospital provider to make it call app base 6 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
6 years ago
ibrahim albitar d3818bd3b3 fix 6 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Elham Rababah 57cba4e786 fix verfiy account 6 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 6 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 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
6 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 6 years ago
Mohammad ALjammal 3495e6bc9b Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal 2ad96dad88 create Prescription In and Out Patient 6 years ago
Elham Rababah 5ff65fc1a1 improve login form 6 years ago
Mohammad ALjammal 33b59514a0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 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
6 years ago
Elham Rababah 6e5c2aca4d Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 1e507cca3e finish resend code 6 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 6 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 6 years ago
Mohammad ALjammal 05525fd87c fix issues in My Referred Patient widget 6 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
6 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 6 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 6 years ago
Salman Afzal 5f6e9104d0 scroll change 6 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
6 years ago
Mohammad ALjammal c7ad16cbcd update design Radiology Screen and create Radiology Report Screen 6 years ago
Amjad Amireh 1935b781d6 Localization comment 6 years ago
Salman Afzal 4239124f1a dashboard icon updated 6 years ago
Elham Rababah dc73f7bfd8 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Mohammad ALjammal afefa0a035 fix vital sign details 6 years ago
Elham Rababah fe66dfe571 fix table cell 6 years ago
Mohammad ALjammal b3befa12db Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal ac612f0eda dashboard and patient app 6 years ago
Mohammad ALjammal ec85a0ea18 change design VitalSignDetailsWidget 6 years ago
Mohammad ALjammal 6a3e8baa86 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal 9b5658c00e change design My Referral and My Referral Patient 6 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 6 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 6 years ago
Salman Afzal bde30d93ec Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal 494a44148d patient profile 6 years ago
Elham Rababah 10877ac658 improve vital sign item details 6 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 61674bec47 new pages 6 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
6 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
6 years ago
Amjad Amireh b8e5ab9a46 design 6 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
6 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 6 years ago
Elham Rababah 0d30fd6212 vitalsign details 6 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 6 years ago
Amjad Amireh 3c3d85c255 My Referred Patient 6 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 6 years ago
Mohammad ALjammal bf094136ab create vital sign details 6 years ago
Mohammad ALjammal ef48a995eb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal 33fe5e8263 create vital sign details 6 years ago
Elham Rababah 6ebee5dbf6 first step form chart 6 years ago
Mohammad ALjammal 2349a596ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	pubspec.lock
	pubspec.yaml
6 years ago
Elham f9e2fd58ab Merge branch 'elham' into 'master'
add login logic with silent options

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

See merge request Cloud_Solution/doctor_app_flutter!70
6 years ago
unknown 7d1cfb7b4e add new screens 6 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
6 years ago
Amjad Amireh bb606e6a1d New Design from Mahmoud 6 years ago
Elham Rababah f4b62a6158 add focus to input and fix cupertino picker 6 years ago
Mahmoud Shrouf 394bd514ab My Changes Before Demo 6 years ago
unknown 3653c90665 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown b94011af47 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 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
6 years ago
her_username 7d3856f2b2 done QR reader 6 years ago
Elham Rababah 146e913113 add choose clinic to login process 6 years ago
unknown 0c44c57c2f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 35205b7024 patient medical info 6 years ago
Elham Rababah de6f814f56 change client to AppClient 6 years ago
Amjad Amireh aa72674805 Modify Error validation 6 years ago
Elham Rababah 1e656af143 handelCatcherrorCase 6 years ago
Elham Rababah bc395c3fcc add doctor profile to shaerd pref 6 years ago
her_username b07ff8154c update local for doctor replay , my schedule and message screen 6 years ago
her_username f098520a80 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
her_username 3fbc2dabef remove i18n package, change the location localized values,
change provider name and create new provider
6 years ago
Elham Rababah cabbf03eec vital_sign_details 6 years ago
Elham Rababah 00bce3403e first step from the vital details 6 years ago
ibrahim albitar 211a40c706 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!50
6 years ago
unknown 80b6716091 call phramicies 6 years ago
Elham Rababah 7a370c29dc use ProfileImageWidget in patient profile 6 years ago
Elham Rababah 1a98e37a7f add prescription add radiology 6 years ago
Elham Rababah 49f9841079 add patient route 6 years ago
unknown ae524100f7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 22a21faff7 pharmacies screen 6 years ago
Elham d0e35d0c9d Merge branch 'elham' into 'master'
fix bottom bar by Elham && mohammad

See merge request Cloud_Solution/doctor_app_flutter!43
6 years ago
Elham Rababah c4c8609f3a fix bottom bar by Elham && mohammad 6 years ago
Elham f0201cfcbe Merge branch 'elham' into 'master'
finsih vital sign desing

See merge request Cloud_Solution/doctor_app_flutter!36
6 years ago
Elham Rababah 5e6722dde0 finsih vital sign desing 6 years ago
Elham ee13dad30e Merge branch 'elham' into 'master'
fix login issue by making project id dynamic

See merge request Cloud_Solution/doctor_app_flutter!35
6 years ago
Elham Rababah 5a49f83e36 fix login issue by making project id dynamic 6 years ago
Amjad Amireh 50b8d543be Patiant search filter design 6 years ago
Elham Rababah 7e154e47c0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 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
6 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
6 years ago
Elham Rababah 19558e13ac create VitalSignResModel 6 years ago
Elham Rababah 5e7526f2c7 vital sign screen 6 years ago
Elham Rababah 691e7dbac6 first step in vital sign and fix some thing in master 6 years ago
her_username e387820fe1 add some comment 6 years ago
her_username ae8a5740f3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
her_username a886731109 done Dr Schedule 6 years ago
unknown a5c62323b0 date picker issue 6 years ago
Elham Rababah c38af9da48 add base url and change the mobile number to mine 6 years ago
Elham Rababah 12217d21ac add comment to patient profile 6 years ago
Elham Rababah e11f1d511e finish patient profile 6 years ago
Elham Rababah 37ae0097a8 fix verify account service 6 years ago
Elham Rababah 3222f377c9 return the number dynamic back 6 years ago
unknown f43ec3c39d add route for search and profile 6 years ago
unknown 80562b66f0 fix data picker issue ub search form 6 years ago
Elham Rababah cbd9314691 token Id finally in works 6 years ago
Elham Rababah 404e4c4651 first step form add patient profile 6 years ago
Elham Rababah 04157e7993 fix the app drawer links 6 years ago
ibrahim albitar 2ba1db3486 Merge branch 'develop' into 'master'
fast fix

See merge request Cloud_Solution/doctor_app_flutter!15
6 years ago
unknown 6bb6344b9a fast fix 6 years ago
ibrahim albitar 70f238e498 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!14
6 years ago
unknown 4b55176b9d text validation and AppTextField 6 years ago
Elham Rababah 93e7499a52 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah a7d79b2ea4 add loader to verify account 6 years ago
Elham Rababah c41669ec4e First step form implement loading 6 years ago
unknown f3c9fb4db9 patient search screen design 6 years ago
Elham Rababah 4390e96270 DoctorApplicati on_SendActivationCodebyOTPNotificationType fainlay works 6 years ago
unknown 8c83166c40 profile screen and extentions class 6 years ago
Elham Rababah 4dece11a43 add services related to auth 6 years ago
unknown 2cc929fa88 fast fix 6 years ago
unknown ac4fb8d508 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
Elham 1c5db0f4d3 Merge branch 'elham' into 'master'
add curve background to all screen and patient page as a first step

See merge request Cloud_Solution/doctor_app_flutter!9
6 years ago
Elham Rababah f3164f693e add curve background to all screen 6 years ago
Elham Rababah 709d75a310 first step from patient list 6 years ago
unknown ad05ad34ec drawer menu 6 years ago
Elham Rababah 7564e1b496 first step form curve and patients page 6 years ago
Elham Rababah d3e27eab6f finish my schedule 6 years ago
unknown f277ef576e app texts widget 6 years ago
Elham Rababah 711f39a151 first step from schedule screen 6 years ago
Elham Rababah a14e1489fe optimize Scaffold widget and make options customized 6 years ago
Elham Rababah 973d40135a fix scaffold canvas color 6 years ago
ibrahim albitar 31c4692594 Merge branch 'master' into 'develop'
# Conflicts:
#   lib/routes.dart
6 years ago
unknown f231228e71 dashboard screen and rounded container widget 6 years ago
Elham Rababah 0c23520318 move dropdwon list to cupertino picker 6 years ago
Elham Rababah 2a8f8eb1f0 hot fix for change API 6 years ago
Elham Rababah 4195afc7be Finish verification methods page 6 years ago
Elham Rababah 28e770061e improve Auth header 6 years ago
Elham Rababah 82b95843c7 finish verify account 6 years ago
Elham Rababah 6090816dc3 fix project id 6 years ago
Elham Rababah 6737e457b5 first step from handeling token in interceptor 6 years ago
Elham Rababah 969bee73e1 change password UI 6 years ago
Elham Rababah f75c6376b5 add size config in order to help dev build responsive desing 6 years ago
Elham Rababah 47a897a2c9 first step form size config 6 years ago
Elham Rababah 60a3b12719 improve design + add local auth ios 6 years ago
Elham Rababah 5bee9d1984 handel fingerprint auth error 6 years ago
Elham Rababah c71fe22248 fix bug 6 years ago
Elham Rababah 969cdce55c wait for 2 future 6 years ago
Elham Rababah cfa0162109 implement basic verifecation type 6 years ago
Elham Rababah 5bdae16684 fingerprint Working now on android 6 years ago
Elham Rababah 52fe4057bb first step form auth by fingerprint 6 years ago
Elham Rababah 70db511ca5 make the doctor name apper from shared pref 6 years ago
Elham Rababah 1050b02140 create shaerd pref service 6 years ago
Elham Rababah b157c4a98b add close button and test tablet devices 6 years ago
Elham Rababah 468fbe358e first step from known_user_login 6 years ago
Elham Rababah ed14157e76 first step from user login 6 years ago
Elham Rababah 24c87dc2b1 improve the auth header 6 years ago
Elham Rababah 1abdf8e721 improve dropdown design in login page 6 years ago
Elham Rababah c0168cb8fb add DrAppToastMsg and handle error in the login page 6 years ago
Elham Rababah cc19d425a5 IMei Works finaly 6 years ago
Elham Rababah 32dc9012c4 add hospital dropdown with daynamic value 6 years ago
Elham Rababah d080b5e1c4 first step from IMEI 6 years ago
Elham Rababah 7227c71393 first step form real login and calling Api 6 years ago
Elham Rababah da3cc456ba first step from dealing with shared preferences 6 years ago
Elham Rababah 36fa0c5a2f first step form translation 6 years ago
Elham Rababah 85f65551cb fix routing 6 years ago
Elham Rababah ca0fa7163e add all routes for home page 6 years ago
Elham Rababah 7c3efab7a7 fix home sreen items 6 years ago
Elham Rababah 3b87f35405 fix home page item list 6 years ago
Elham Rababah 37880b2630 show and hide form based on patient type 6 years ago
Elham Rababah 79055145c6 add patient lookup 6 years ago
Elham Rababah 3aeb84d790 finish patient search form 6 years ago
Elham Rababah 688da88236 add secure login 6 years ago
Elham Rababah d276a19e02 first step from patient search 6 years ago
Elham Rababah 94f53e9a07 Add App drawer 6 years ago
Elham Rababah dd7996cb0e fix hit font size 6 years ago
Elham Rababah 76c83b86fa fix tablet and font size 6 years ago
Elham Rababah 23b8c93201 add font family and fix button and add checkbox 6 years ago
Elham Rababah 47134da6ff Improve login page structure 6 years ago
Elham Rababah bd30843bfb set project structure 6 years ago