Commit Graph

2813 Commits (development)

Author SHA1 Message Date
Elham Rababh 23e1fed349 fix issues 4 years ago
RoaaGhali98 be40076def Add new function in intervention_medication_service called accepted or rejected 4 years ago
RoaaGhali98 65d04b2d0f fix some issues 4 years ago
Elham Rababh b79eff7f6b fix issues 4 years ago
RoaaGhali98 e165ec5b1d add new service called intervention_medication_history_screen 4 years ago
RoaaGhali98 af9e8dd095 we edit a date format 4 years ago
RoaaGhali98 0d542a862e add new service 4 years ago
RoaaGhali98 6d0ff69386 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice 4 years ago
Elham Rababh d9b2a618f5 small fix 4 years ago
Elham Rababh 05b656416d small fix 4 years ago
Elham Rababh ed447f6b17 fix issue DAPP-48 4 years ago
Elham Rababh 0d61d0febc fix issues 4 years ago
Elham Rababh ed9c77465f fix chart issues 4 years ago
Elham Rababh 1b12354581 DAPP-66: fix date with design improvement 4 years ago
Elham Rababh 26fa1aec62 DAPP-66: fix date with design improvement 4 years ago
RoaaGhali98 79372b86c1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice
 Conflicts:
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
RoaaGhali98 0a0aa6ba77 we add a new service called new_medication_screen 4 years ago
Elham Rababh af1217dd67 finish assessment screen 4 years ago
RoaaGhali98 42feae9a2e add new medication service 4 years ago
RoaaGhali98 406165c348 we fix some issues -in-patient 4 years ago
Elham Rababh 5ed5a266e9 vte assessment fix path 4 years ago
Elham Rababh da63af6db3 vte assessment 4 years ago
Elham Rababh 810cda1f9b fix header 4 years ago
Elham Rababh c8fde6e869 hide registration service 4 years ago
Elham Ali 956afab2b4 Merge branch 'dev_v2.8_roaa' into 'development'
Redesign for my_schedule_screen and make it responsive to any device

See merge request Cloud_Solution/doctor_app_flutter!948
4 years ago
Elham Rababh 294d979255 small fix 4 years ago
Elham Rababh 1755650304 fix add progress note 4 years ago
RoaaGhali98 268c637316 Redesign for my_schedule_screen and make it responsive to any device 4 years ago
Elham Rababh 94b86ee4b9 fix the size of the button inside the app 4 years ago
Elham Rababh 71ce8d22e3 fix the size of the button inside the app 4 years ago
Elham Rababh edbb99e445 small fix 4 years ago
Elham Rababh eb5d2f3def small fixes 4 years ago
Elham Rababh fb610d21b0 reformat code 4 years ago
Elham Rababh d37d10639a optimize imports 4 years ago
RoaaGhali98 17eeaf2cc6 fixed the errorMessage inside many pages 4 years ago
RoaaGhali98 0901a2e39c fixed some issues in localized_values and progress_note_screen 4 years ago
RoaaGhali98 746c2fdddb fixed some issues in localized_values and out_patient_screen 4 years ago
RoaaGhali98 bfeb1ac047 Fixed some issues in patient_sick_leave_screen and vital_sing_chart_blood_pressure 4 years ago
RoaaGhali98 d9d2e40927 we fix some issues in pharmacies_items_request_model, refer-patient-screen and refer-patient-screen-in-patient 4 years ago
Elham Rababh d66bc3ea2a fix issues on html editor 4 years ago
Elham Rababh c54015c5c1 fix button inside our app 4 years ago
Elham Rababh 558de8ec75 fix issues with text fields 4 years ago
Elham Rababh 4dc93f7c31 fix issues with text fields 4 years ago
Elham Rababh 73cc5e4b00 fix issues 4 years ago
Elham Rababh 26e80356e1 first change 4 years ago
Elham Ali 480017f887 Merge branch 'doctor-app-design' into 'development'
Doctor app design

See merge request Cloud_Solution/doctor_app_flutter!929
4 years ago
hussam al-habibeh a4aa695f25 TextField & page header design fix 4 years ago
Elham Rababh a578d92cb7 fix the arabic issues 4 years ago
Elham Rababh 74540f054a fix sms pop up 4 years ago
Elham Rababh 5d20480e9b fix issues in home design 4 years ago
Elham Rababh 3431c353e9 fix issues in design 4 years ago
Elham Rababh 4dcc20b681 fix issues related to card 4 years ago
Elham Rababh 3e1ac71a48 fix some design issues 4 years ago
Elham Rababh 56fbc47835 fix home page 4 years ago
Elham Rababh 34b4484972 fix tabs 4 years ago
Elham Rababh ae5c9170a7 fix patient gird 4 years ago
hussam al-habibeh fca6990938 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 6f1790d71e Insurance Approval design fix 4 years ago
Elham Rababh bd133f8f31 fix issues on Patient card 4 years ago
Elham Rababh f68c0fe426 fix issues on Patient card 4 years ago
Elham Rababh 35279405af Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
Elham Rababh ad1ae99707 fix bottom_nav_bar 4 years ago
hussam al-habibeh 75a10939fb adding appText to the bottom navagation 4 years ago
hussam al-habibeh 4c1ed7f931 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 46ec7d4c99 app drawer design 4 years ago
Elham Rababh c2fbd99ced small fixes 4 years ago
Elham Rababh af10c60a7e fix merge issue in patient_referral_screen.dart 4 years ago
Elham Rababh 3200a7a351 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes
 Conflicts:
	lib/screens/patients/profile/referral/patient_referral_screen.dart
4 years ago
Elham Rababh 70b3776aa7 fix tabs 4 years ago
Elham Ali 6375d9fb2d Merge branch 'doctor-app-design' into 'development'
referral screen design fix

See merge request Cloud_Solution/doctor_app_flutter!923
4 years ago
hussam al-habibeh c6635397bb referral screen design fix 4 years ago
Elham Ali bff995ecfa Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!922
4 years ago
Elham Rababh fb51325188 fix tabs inside doctor replay 4 years ago
Elham Rababh 25e09fa105 fix taps inside in patient 4 years ago
hussam al-habibeh c6a77563cc app button color match 4 years ago
hussam al-habibeh 85e6f63094 app button color fix in multiple screens 4 years ago
Elham Rababh efe25b898d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Dec_fixes 4 years ago
Elham Rababh 9e4a9c4b6a fix in patient 4 years ago
hussam al-habibeh 658a28e558 referal patient card design fix 4 years ago
Elham Rababh f97b0bee14 add gradiant to home page 4 years ago
Elham Rababh 6b0e790cd2 add gradiant to home page 4 years ago
Elham Rababh 753a72b85e add missing code 4 years ago
Elham Rababh fc126caddf first step from patient profile 4 years ago
Elham Rababh 98bc33042f add icons to bottom sheet 4 years ago
Elham Ali f256527302 Merge branch 'Dec_fixes' into 'development'
Dec fixes

See merge request Cloud_Solution/doctor_app_flutter!918
4 years ago
Elham Rababh a02e89febb add verfication svgs 4 years ago
Elham Rababh 6c78fda392 fix in slider 4 years ago
Elham Rababh 47357fe84e bottom nav and dashboard_referral_patient 4 years ago
hussam al-habibeh 2b763e954a bottom_sheet_title design fix 4 years ago
hussam al-habibeh b265210565 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor-app-design 4 years ago
hussam al-habibeh 67a5bcff91 patient header & app drawer desigining 4 years ago
Elham Rababh ecffe99f19 small fixes 4 years ago
Elham Rababh fedb4533c7 second step from home page. 4 years ago
Elham Rababh 5f2e0be78c first step from home page. 4 years ago
Elham Rababh 9e1aeb857f Patient card 4 years ago
Elham Rababh 98f6d63fcd add simibold 4 years ago
Elham Rababh 52bd1511e8 fix patient card 4 years ago
Elham Ali 4760d4ae50 Merge branch 'Dec_fixes' into 'development'
change the green color

See merge request Cloud_Solution/doctor_app_flutter!914
4 years ago
Elham Rababh 3d379b3b84 change the green color 4 years ago
hussam al-habibeh 3bfee08b9d textfiled and app button design change 4 years ago
hussam al-habibeh bd7e683900 textfiled design 4 years ago
Elham Ali fbaeb1b361 Merge branch 'registration' into 'development'
ui fix discharged patient card

See merge request Cloud_Solution/doctor_app_flutter!909
4 years ago
hussam al-habibeh 118d367b4c ui fix discharged patient card 4 years ago
Elham Rababh 72df25d949 fix issue 4 years ago
hussam al-habibeh e2cde9a39f translation and ui fixes 4 years ago
hussam al-habibeh e59220d1b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into registration
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
hussam al-habibeh f16f54fee2 translation and ui fixes 4 years ago
Elham Rababh e31fadc9be small fix 4 years ago
Elham Ali 8e795535b8 Merge branch 'fixes_nov' into 'development'
Fixes nov

See merge request Cloud_Solution/doctor_app_flutter!905
4 years ago
Elham Rababh 92ceb99212 translation for in patient 4 years ago
hussam al-habibeh f3462385fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into registration
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababh 14a43ab53a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fixes_nov 4 years ago
Elham Rababh cce0a8377c small fix 4 years ago
hussam al-habibeh 999c2a920d translation and ui fixes 4 years ago
Elham Ali b3bfda9128 Merge branch 'fixes_nov' into 'development'
fix operation reports

See merge request Cloud_Solution/doctor_app_flutter!903
4 years ago
Elham Rababh c17397bf5e fix operation reports 4 years ago
hussam al-habibeh 1c8d25c95c adding countries to registration 4 years ago
Elham Rababh 6ae4d3a7cd small fixes 4 years ago
Elham Rababh d1060ba27a small fixes 4 years ago
Elham Rababh bfd86f533a small fixes 4 years ago
hussam al-habibeh dfce0d20e2 discharge summary card 4 years ago
hussam al-habibeh 37d4dfffa2 all discharge summary 4 years ago
hussam al-habibeh ff1cffc24d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders 4 years ago
hussam al-habibeh bc92f9b9f5 contries model 4 years ago
Elham Rababh 6ffbf92d43 finish pending discharge summary 4 years ago
Elham Rababh f23607b6e4 first step form discharge summary 4 years ago
Elham Rababh 2e884c4a35 fix issues inside diff pages 4 years ago
Elham Rababh ca854638e5 fix merge issue 4 years ago
Elham Rababh 0bdb15b14e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hijri_calender
 Conflicts:
	lib/screens/patients/register_patient/RegisterSearchPatientPage.dart
4 years ago
Elham Rababh 8d2b6e9b08 finish hijri calender 4 years ago
hussam al-habibeh 132d781eb5 conflect resorved 4 years ago
hussam al-habibeh aaabae5900 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/models/doctor/profile_req_Model.dart
4 years ago
hussam al-habibeh 92d81700e1 adding country option to register page 4 years ago
Elham Rababh 8e85bb239e first step from hijri Calender 4 years ago
hussam al-habibeh 25f65802a5 register search page change 4 years ago
Elham Rababh eb89dc3395 fix navigator issues 4 years ago
Elham Rababh 52ec3fc0e3 fix navigator issues 4 years ago
Elham Rababh 03acd233cf fix version id 4 years ago
Elham Rababh 515297ebf6 finish confirmation page 4 years ago
Elham Rababh cf498de70f finish confirmation page 4 years ago
Elham Rababh 5567b31daf Merge branch 'get_pending_orders' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_services 4 years ago
Elham Rababh ad845b882c finish confirmation page 4 years ago
Elham Rababh 4fe53ef71e add hijri converter 4 years ago
Elham Rababh 3eddf2eab5 first step from service part 4 years ago
hussam al-habibeh 13c42b297a check activation code 4 years ago
hussam al-habibeh 9eadc0f0b1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/viewModel/PatientRegistrationViewModel.dart
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh fd9e8ddb28 actaivation code page 4 years ago
Elham Ali 482feece26 Merge branch 'register_patient_services' into 'development'
mock the calling the second service

See merge request Cloud_Solution/doctor_app_flutter!877
4 years ago
Elham Ali 75e944427c Merge branch 'lap_result_fix' into 'development'
fix lap result special

See merge request Cloud_Solution/doctor_app_flutter!876
4 years ago
Elham Rababh 514fb71c51 mock the calling the second service 4 years ago
hussam al-habibeh 08df479b37 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/screens/patients/register_patient/RegisterPatientPage.dart
4 years ago
hussam al-habibeh d4927873d5 fix lap result special 4 years ago
Elham Rababh 324f515253 first step form register patient service 4 years ago
Elham Rababh f4311b4106 first step form register patient service 4 years ago
Elham Rababh 4f123b0af2 first step form register patient service 4 years ago
hussam al-habibeh 1a35201f27 regstration activtion code 4 years ago
Elham Rababh 3229a1ff99 remove red color 4 years ago
Elham Ali 4d01c74bf8 Merge branch 'rig_page' into 'development'
Rig page

See merge request Cloud_Solution/doctor_app_flutter!874
4 years ago
Elham Rababh cb223be8b3 fix issue in Register Patient Page 4 years ago
Elham Rababh 5e4b2d8202 showModalBottomSheet in confirmation page 4 years ago
Mohammad Aljammal 9de1085b49 Merge branch 'get_pending_orders' into 'development'
admission orders changes

See merge request Cloud_Solution/doctor_app_flutter!872
4 years ago
hussam al-habibeh d0e6532814 admission orders changes 4 years ago
Elham Rababh a9d097da54 fix merge conflict 4 years ago
Elham Rababh 6b09276c93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into operation_details
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal ac1b4d9865 Merge branch 'confirmation_page' into 'development'
first step form confirmation page

See merge request Cloud_Solution/doctor_app_flutter!870
4 years ago
Elham Rababh 04583d8c42 finish operation details report 4 years ago
Elham Rababh 22b424515c finish operation details report 4 years ago
Elham Rababh 97a15bfb35 first step form confirmation page 4 years ago
hussam al-habibeh 2fe475d98a admission orders change 4 years ago
hussam al-habibeh 9270f58615 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/core/service/operation_report_servive.dart
4 years ago
Mohammad Aljammal 6e61bd8c1d Merge branch 'diabetic_chart_values' into 'development'
Diabetic chart values

See merge request Cloud_Solution/doctor_app_flutter!867
4 years ago
Elham Rababh 230ebaf445 operation report 4 years ago
Elham Rababh 93bcfff7a0 fix doctors name 4 years ago
Mohammad Aljammal 331b27c3ec fix merge issue 4 years ago
Mohammad Aljammal 5ad9976c40 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_registration
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
4 years ago
Mohammad Aljammal 9689044be7 Add models and create vm, services for patient registration 4 years ago
mosazaid faa7c08266 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into register_patient_feature
 Conflicts:
	lib/locator.dart
4 years ago
mosazaid 7b8312fe26 make register patient feature 4 years ago
Elham Rababh 9e2b72a7cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into diabetic_chart_values
 Conflicts:
	lib/config/config.dart
	lib/routes.dart
4 years ago
Elham Rababh 514e6c81c7 finish diabetic 4 years ago
hussam al-habibeh 056b0bbd78 admission orders change 4 years ago
hussam al-habibeh 9b87ea8c22 get admission orders 4 years ago
hussam al-habibeh 3f7a839950 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_pending_orders
 Conflicts:
	lib/routes.dart
	lib/screens/patients/profile/operation_report/operation_report.dart
	lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
4 years ago
hussam al-habibeh ae0c588d32 get admission orders 4 years ago
Elham Rababh dd971ffddb first step from get diabetic 4 years ago
Elham Rababh 45f4aa9a22 fix issues related to design 4 years ago
Elham Rababh b21acfd2c6 fix route issues 4 years ago
Mohammad Aljammal 52e5b86f6c Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!862
4 years ago
hussam al-habibeh 64b5652c8d Pending Orders Service 4 years ago
Elham Rababh 35acd1f21f finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 1a3567f917 finish the nursing DiagnosisScreen 4 years ago
Elham Rababh 72c948371a finish the nursing progress_note_screen 4 years ago
Elham Rababh 4ebecc4277 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/viewModel/operation_report_view_model.dart
4 years ago
Elham Rababh a44a207116 finish the operation Reports from our side 4 years ago
Mohammad Aljammal d7b1212b54 Merge branch 'get_operation_report' into 'development'
Get operation report

See merge request Cloud_Solution/doctor_app_flutter!860
4 years ago
hussam al-habibeh ee3d207795 get operation report 4 years ago
Elham Rababh 231614e914 Merge branch 'get_operation_report' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report
 Conflicts:
	lib/core/service/operation_report_servive.dart
	lib/core/viewModel/operation_report_view_model.dart
	lib/screens/patients/profile/operation_report/update_operation_report.dart
4 years ago
Elham Rababh fbf1cd29ee add some fiels 4 years ago
hussam al-habibeh d035f1ba37 opertion report screen 4 years ago
Elham Rababh 7684b65e8a first step from update_operation_report.dart 4 years ago