Commit Graph

329 Commits (cc7d64e9d158e6125833a4ffdee19ad41b2bf115)

Author SHA1 Message Date
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
5 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
5 years ago
Elham Rababah febdadc924 fix : DA-264 5 years ago
Elham Rababah 34692b94c2 fix : DA-264 5 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 5 years ago
mosazaid ebc5ba7743 some fixes 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
hussam al-habibeh 38d9881ed2 Prescription date 5 years ago
Elham Rababah bc8a90ef2c first step from fix loader 5 years ago
Elham Rababah 1f2aebde33 fix loader in login 5 years ago
Elham Rababah 90a16676db fix issue related to SOAP 5 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 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
hussam al-habibeh f997561bb8 drug list 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 88ee50f7cb change make referral page loading behaviour 5 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 2f80af6b74 small fix 5 years ago
Elham Rababah 71b50c8404 First step translations 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
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 5 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah 8a6ea1c0c5 Fix SOAP 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
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Elham Rababah cde56a82f2 Finish subjective 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
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
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
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan 8d58348267 dashboard changes 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 46cdd9482c First step from SOAP 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
Sultan Khan cc1a63786f sick leave 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
mosazaid f9ae2559f0 working on referral reply screen 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 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 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
Elham Rababah e37a3e8ce1 Finish dashboard screen design 6 years ago
Sultan Khan 6eb2da3770 voice search 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
hussam al-habibeh 91ffdabd73 Translation stage five 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
Mohammad Aljammal 5062d942c3 Merge branch 'mohammad' into 'development'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!126
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
Elham Rababah 574a951fcf finish clinic exept design 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 d52429564d fix issues in Patient 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 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 6 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 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
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
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
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 6 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 6 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 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
Amjad Amireh 1935b781d6 Localization comment 6 years ago
Mohammad ALjammal afefa0a035 fix vital sign details 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 6a3e8baa86 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 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 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
Elham Rababah bd24b7c196 TimeSeriesChart as widget 6 years ago
Elham Rababah 6ebee5dbf6 first step form chart 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 fff2b32dee ExpandableItem widget 6 years ago
Mohammad ALjammal 7d3bfddd68 update design my schedule and doctor replay 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
Mahmoud Shrouf 394bd514ab My Changes Before Demo 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 1e656af143 handelCatcherrorCase 6 years ago
her_username b07ff8154c update local for doctor replay , my schedule and message screen 6 years ago
Elham Rababah cabbf03eec vital_sign_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 c4c8609f3a fix bottom bar by Elham && mohammad 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 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 12217d21ac add comment to patient profile 6 years ago
Elham Rababah e11f1d511e finish patient profile 6 years ago
unknown f43ec3c39d add route for search and profile 6 years ago
Elham Rababah 04157e7993 fix the app drawer links 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
unknown 8c83166c40 profile screen and extentions class 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
unknown f231228e71 dashboard screen and rounded container widget 6 years ago
Elham Rababah c71fe22248 fix bug 6 years ago
Elham Rababah 70db511ca5 make the doctor name apper from shared pref 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 3aeb84d790 finish patient search form 6 years ago
Elham Rababah d276a19e02 first step from patient search 6 years ago
Elham Rababah 94f53e9a07 Add App drawer 6 years ago