Commit Graph

3014 Commits (0f202bbf0dc7889dacec8ecc78ad5fe637d9b3cb)

Author SHA1 Message Date
RoaaGhali98 ce978db2dd Fix add medication button 4 years ago
RoaaGhali98 d5e3a79f85 Fix add medication button 4 years ago
RoaaGhali98 5b8211eec4 Refactor add_prescription_form 4 years ago
RoaaGhali98 c1956aee9b Refactor add_prescription_form 4 years ago
RoaaGhali98 2b38293d61 Refactor add_prescription_form 4 years ago
RoaaGhali98 113fb42d68 refactor some files in prescription screen 4 years ago
RoaaGhali98 3f25acda8f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 f769189bee Refactor add_prescription_form 4 years ago
RoaaGhali98 7afe24c2bc Refactor add_prescription_form 4 years ago
Elham Rababh 65e9840418 fix issues in lab order 4 years ago
RoaaGhali98 228237bf96 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design
 Conflicts:
	lib/widgets/patients/dynamic_elements.dart
4 years ago
RoaaGhali98 182f890e92 Fix the form in prescription screen 4 years ago
Elham Rababh cb19a5fcfe move models to the core file 4 years ago
Elham Rababh f8371f71a1 fix intervention_medication 4 years ago
RoaaGhali98 0257bb1f16 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
Elham Rababh 1789eb8c5b first step form redesign pharmacy page 4 years ago
RoaaGhali98 994b43a590 Fix the form in prescription screen 4 years ago
Elham Rababh 6905ed702e first step form redesign pharmacy page 4 years ago
Elham Rababh 25f902487c small fix in referal 4 years ago
RoaaGhali98 83ea30303b fix referred-patient-screen 4 years ago
RoaaGhali98 e8b5165953 Fix some issues 4 years ago
RoaaGhali98 b8076f177b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa_schedule_design 4 years ago
RoaaGhali98 db83bec292 Fix referred-patient-screen design 4 years ago
Elham Rababh 5ed3084130 fix clinic name 4 years ago
Elham Rababh 45f30a8d61 small fixes 4 years ago
Elham Rababh bbdc243f0f fix main issues 4 years ago
RoaaGhali98 06b2e7f194 Fixing the height in my_schedule_widget 4 years ago
Elham Ali 8f1d4f80bd Merge branch 'roaa_schedule_design' into 'development'
Roaa schedule design

See merge request Cloud_Solution/doctor_app_flutter!959
4 years ago
RoaaGhali98 47a077bd52 Edit some issues in the my_schedule_screen 4 years ago
RoaaGhali98 b1a65425c5 Edit the my_schedule_screen design 4 years ago
Elham Ali e6e5d8e03b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
add translations to pharmacy_intervention_screen, intervention_medication and...

See merge request Cloud_Solution/doctor_app_flutter!958
4 years ago
RoaaGhali98 af72810b26 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 2ffa745e73 add translations to pharmacy_intervention_screen, intervention_medication and intervention_medication_history_screen 4 years ago
Elham Ali c6a091ae32 Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Wrapping the Row cards with CustomRow in intervention_medication.dart and...

See merge request Cloud_Solution/doctor_app_flutter!957
4 years ago
Elham Rababh 90c74c2f06 small fix issues 4 years ago
RoaaGhali98 f7e509d967 Merge remote-tracking branch 'origin/roaa2.8_addnewmedicationservice' into roaa2.8_addnewmedicationservice 4 years ago
RoaaGhali98 8464c70f35 Replace static data 4 years ago
RoaaGhali98 4ef41e0c5a Replace static data 4 years ago
Elham Rababh fdc39f28e3 small change 4 years ago
RoaaGhali98 19d981d9e0 Wrapping the Row cards with CustomRow in intervention_medication.dart and intervention_medication_history_screen.dart and fix the accept or reject issue, fix the lable in intervention_medication_history_screen.dart and edit the initial date in pharmacy_intervention_screen.dart 4 years ago
Elham Ali 63e94e0d7b Merge branch 'roaa2.8_addnewmedicationservice' into 'development'
Roaa2.8 addnewmedicationservice

See merge request Cloud_Solution/doctor_app_flutter!953
4 years ago
Elham Rababh a829532717 call service after accept or reject 4 years ago
RoaaGhali98 211990518f Editing the accept_or_reject_req_model 4 years ago
RoaaGhali98 9f77d080c0 Editing the schedule page 4 years ago
Elham Rababh 694be7315b fix issue on loading 4 years ago
RoaaGhali98 fec899ebb7 Add static data 4 years ago
RoaaGhali98 d3f0f1a141 Fix the date format in intervention_medication_view_model 4 years ago
Elham Rababh 0895a80d16 fix issues with date 4 years ago
RoaaGhali98 fde96fbce7 Fix some issues 4 years ago
Elham Rababh ad8d0f32b6 plan for refactor prescriptions 4 years ago
Elham Rababh 37928c1757 fix issues 4 years ago
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
Elham Rababh 469556758b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into get_operation_report 4 years ago
hussam al-habibeh d4363aeefb opertion report screen 4 years ago
hussam al-habibeh 318560b1d7 opertion report screen 4 years ago
mosazaid efbe6ae76b home page design fix 4 years ago
Mohammad Aljammal 6003df7f63 Merge branch 'special_clinic_fixes' into 'development'
fix special clinic issue

See merge request Cloud_Solution/doctor_app_flutter!858
4 years ago
Elham Rababh 93da7b8118 fix special clinic issue 4 years ago
Mohammad Aljammal 4e52155342 Merge branch 'all_special_lab_result' into 'development'
fix in-patient prescription

See merge request Cloud_Solution/doctor_app_flutter!857
4 years ago
Mohammad Aljammal 54f1bbf184 Merge branch 'refer-hot-fix' into 'development'
refer inpatient hot fix

See merge request Cloud_Solution/doctor_app_flutter!856
4 years ago
mosazaid bb8ffbf63b refer inpatient hot fix 4 years ago
Elham Rababh 96cfc3d659 fix specialClinic it suppose to be fixed 4 years ago
hussam al-habibeh 2f65546ff6 fix in-patient prescription 4 years ago
Elham Rababh 9c6cebcffd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave 4 years ago
Elham Rababh a4654e9bce add isCopyable on progress note 4 years ago
Mohammad Aljammal 7436cdb5be Merge branch 'all_special_lab_result' into 'development'
adding slide up to prescription and procedure

See merge request Cloud_Solution/doctor_app_flutter!854
4 years ago
hussam al-habibeh 7d4f6d5264 adding slide up to prescription and procedure 4 years ago
Mohammad Aljammal 96ee21b15f change server url 4 years ago
Mohammad Aljammal 35bfa85a1a Merge branch 'all_special_lab_result' into 'development'
fix reschedule

See merge request Cloud_Solution/doctor_app_flutter!851
4 years ago
hussam al-habibeh 6dd8f62b2a fix reschedule 4 years ago
Mohammad Aljammal b9ebde0ec8 Merge branch 'sick_leave' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!850
4 years ago
Elham Rababh 17ee942de1 fix issue 4 years ago
Mohammad Aljammal 65f8f061db Merge branch 'fix_inpatient' into 'development'
Fix inpatient

See merge request Cloud_Solution/doctor_app_flutter!849
4 years ago
Elham Rababh d1ccb3c433 fix last 4 years ago
Elham Rababh 8be6bd257d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sick_leave
 Conflicts:
	pubspec.lock
4 years ago
Elham Rababh b23fe5ee1b add selected date 4 years ago
Elham Rababh 87b70ff905 fix last issue 4 years ago
Mohammad Aljammal dd4eb2f76d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!846
4 years ago
Elham Rababh 9a5eff8c8b sick leave fixes 4 years ago
mosazaid 495c8fb3b0 change lab result design 4 years ago
Elham Rababh 4711b6264c rename files 4 years ago
Elham Rababh 8a0e94c854 match the design as xd 4 years ago
Elham Rababh f05455fddf finish sick leave design 4 years ago
Elham Rababh ff07686bf7 fix sick leave design 4 years ago
mosazaid 2274affd9a design fixes 4 years ago
Elham Rababh 29336a9ef3 fix the design of all sick leave 4 years ago
Mohammad Aljammal cec3a78d94 Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!845
4 years ago
hussam al-habibeh b86bc33266 fix scroll in special lab result 4 years ago
hussam al-habibeh fe5456db2a fix prescription 4 years ago
Mohammad Aljammal 640dc239b0 Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!844
4 years ago
Elham Rababh 71463dc459 remove margin top form DischargedPatient 4 years ago
Elham Rababh aaca94e93c first step form sick leave 4 years ago
Mohammad Aljammal 3cd4973eab Merge branch 'design-fixes' into 'development'
design fixes for lab result

See merge request Cloud_Solution/doctor_app_flutter!843
4 years ago
mosazaid 62ee6dff3a design fixes for lab result 4 years ago
Mohammad Aljammal f095da8943 fix inpatient issue 4 years ago
Mohammad Aljammal 771d94ff4c Merge branch 'search_text_fields' into 'development'
Search text fields

See merge request Cloud_Solution/doctor_app_flutter!842
4 years ago
Elham Rababh 0ab0570bc6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_text_fields 4 years ago
Elham Rababh dac8f90a8a rename file related to custom search 4 years ago
Mohammad Aljammal faf8c8ede7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
Elham Rababh b27cc6ae9a serach-text_fields 4 years ago
Mohammad Aljammal 6002e22d6d Merge branch 'design-fixes' into 'development'
design fixes

See merge request Cloud_Solution/doctor_app_flutter!841
4 years ago
Mohammad Aljammal 1a7fd766d5 Merge branch 'all_special_lab_result' into 'development'
All special lab result

See merge request Cloud_Solution/doctor_app_flutter!839
4 years ago
mosazaid 136313ac72 design fixes for lab result 4 years ago
mosazaid 4663a65fd6 design fixes 4 years ago
Elham Rababh 47df7e5919 fix in patient issues 4 years ago
hussam al-habibeh 7be6ef6ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into all_special_lab_result
 Conflicts:
	pubspec.lock
4 years ago
hussam al-habibeh 288bef5a5f fix all special result 4 years ago
Mohammad Aljammal f56a23aad9 fix lab issue 4 years ago
Mohammad Aljammal b2ce970195 Merge branch 'replay_taps' into 'development'
fix cashing issue

See merge request Cloud_Solution/doctor_app_flutter!838
4 years ago
Elham Rababh 4923b66065 fix cashing issue 4 years ago
Mohammad Aljammal 57d34425ba Merge branch 'replay_taps' into 'development'
Replay taps

See merge request Cloud_Solution/doctor_app_flutter!837
4 years ago
Elham Rababh b119590e39 Doctor replay add info status 99 4 years ago
Mohammad Aljammal 6b7fc1bf56 Merge branch 'in-patient-medication' into 'development'
favorite prescription hot fix

See merge request Cloud_Solution/doctor_app_flutter!836
4 years ago
Mohammad Aljammal 8a07dfda15 Merge branch 'inpatient_scroll' into 'development'
remove create episode in case of in patinet

See merge request Cloud_Solution/doctor_app_flutter!834
4 years ago
hussam al-habibeh 8d8200ab9b favorite prescription hot fix 4 years ago
Elham Rababh 28140b6ca4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into replay_taps 4 years ago
Mohammad Aljammal 942bcd1bd3 Merge branch 'episode_inpatient_changes' into 'development'
fix login issue

See merge request Cloud_Solution/doctor_app_flutter!835
4 years ago
Mohammad Aljammal 777bdb8a0d fix login issue 4 years ago
Elham Rababh 5a821e3d64 remove create episode in case of in patinet 4 years ago
Mohammad Aljammal 8383ce17bd Merge branch 'in-patient-medication' into 'development'
Medication for in-patient hot fix

See merge request Cloud_Solution/doctor_app_flutter!833
4 years ago
hussam al-habibeh a731851a92 Medication for in-patient hot fix 4 years ago
mosazaid 702bb5b8da fix design 4 years ago
mosazaid d70ad7f2c3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hot_fix_bugs 4 years ago
mosazaid 6ca3baf7cb solve lab results design issue 4 years ago
Elham Rababh c74dca1404 fix select clinic 4 years ago
Elham Rababh 5e90f14a89 add translation 4 years ago
Elham Rababh 99868a058c fix in patient issues 4 years ago
Mohammad Aljammal c1103f26fa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
Mohammad Aljammal 02109a40e1 Merge branch 'in-patient-medication' into 'development'
In patient medication

See merge request Cloud_Solution/doctor_app_flutter!830
4 years ago
hussam al-habibeh 6eecb4a614 adding cashed network image 4 years ago
Elham Rababh f2dbfaf2be fix issue after merge the dev 4 years ago
Elham Rababh de5621a629 fix issue after merge the dev 4 years ago
Elham Rababh cdc3b36174 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/In_patient/in_patient_list_page.dart
4 years ago
Elham Rababh ce199f7d98 separate in patient and my in patient to 2 files 4 years ago
Mohammad Aljammal 3d7f8b5997 Merge branch 'app_bug_fixes' into 'development'
fix bug sick leave

See merge request Cloud_Solution/doctor_app_flutter!828
4 years ago
mosazaid 9598c09ea2 scroll problem 4 years ago
hussam al-habibeh 696b8b89ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in-patient-medication
 Conflicts:
	lib/widgets/patients/patient_card/PatientCard.dart
4 years ago
hussam al-habibeh ba275eaed4 adding cashed network image 4 years ago
Elham Rababh 37cd34f568 move no data widget to separate file 4 years ago
mosazaid 6a96a9cb28 fix bug sick leave 4 years ago
Elham Rababh a1f9729091 in patient list improve performace 4 years ago
Mohammad Aljammal 0ff08801f1 Merge branch 'in-patient-medication' into 'development'
adding missing fields for medication

See merge request Cloud_Solution/doctor_app_flutter!827
4 years ago
hussam al-habibeh 763686fc76 adding missing fields for medication 4 years ago
Elham Rababh 9317173c05 add filtration on level of clinic 4 years ago
Mohammad Aljammal 09c8d9c09e Merge branch 'procedure_changes' into 'development'
dilog list & procedure changes

See merge request Cloud_Solution/doctor_app_flutter!826
4 years ago
hussam al-habibeh c5eac79522 dilog list & procedure changes 4 years ago
Elham Rababh 8fc4b1596b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into episode_inpatient_changes
 Conflicts:
	lib/screens/patients/InPatientPage.dart
4 years ago
Elham Rababh e9e86e4d8c add filter on in patient screen by clinic and by all clinic 4 years ago
Mohammad Aljammal 680ba27bbc Merge branch 'list-performance' into 'development'
re-design UCAF to pager

See merge request Cloud_Solution/doctor_app_flutter!824
4 years ago
mosazaid 96ad55b552 re-design UCAF to pager 4 years ago
Elham Rababh 1fd192e4bc add pagination on in patient 4 years ago