Commit Graph

2091 Commits (142fbb93fd533379857803f1e560cb6280c4f386)

Author SHA1 Message Date
hussam al-habibeh 623f2730e8 Procedure card design update 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 5 years ago
Mohammad Aljammal a525787c19 Merge branch 'live_care' into 'development'
Live care

See merge request Cloud_Solution/doctor_app_flutter!668
5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
5 years ago
mosazaid fa830cf4da changes 5 years ago
Elham Rababah d574dd0b16 return base app client 5 years ago
Elham Rababah 164a7fd2fc fix merge issues 5 years ago
Elham Rababah 56698a82fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into merge_dev_into_auth_refactor
 Conflicts:
	lib/core/service/home/auth_service.dart
	lib/core/viewModel/auth_view_model.dart
	lib/core/viewModel/imei_view_model.dart
	lib/locator.dart
	lib/screens/auth/login_screen.dart
	lib/screens/home/home_screen.dart
	lib/screens/patients/patient_search/patient_search_screen.dart
	lib/widgets/auth/verification_methods.dart
5 years ago
hussam al-habibeh 84a7f44b68 favourite procedure templates 5 years ago
Elham Rababah 14a3ca8695 fix login screen design 5 years ago
Elham Rababah 515955663a add verification 5 years ago
hussam al-habibeh 3b800bcd19 favourite procedure templates 5 years ago
mosazaid 6192d9a84f working on medical-profile 5 years ago
Mohammad Aljammal 1187c3b605 fix authentication provider 5 years ago
Elham Rababah 6933b6577f add session time out. 5 years ago
Elham Rababah 9b34c2c833 first step from live care 5 years ago
Elham Rababah a9bd02a908 first step from user another account 5 years ago
hussam al-habibeh 6b6243232c Procedure template service 5 years ago
Elham Rababah 0d8684481d fix sms error and some design issue 5 years ago
Mohammad Aljammal 8ac040a809 hot fix 5 years ago
Mohammad Aljammal 42275b41fd Merge branch 'load_medical_report' into 'development'
Load medical report

See merge request Cloud_Solution/doctor_app_flutter!665
5 years ago
Mohammad Aljammal 2c43cfcdde Merge branch 'home-refactoring' into 'development'
Home refactoring

See merge request Cloud_Solution/doctor_app_flutter!648
5 years ago
Elham Rababah e0be4ec1be move logout function from helper to authentication view model 5 years ago
Elham Rababah c9e7fb9883 small fix 5 years ago
Elham Rababah 1eeaaa48ca remove comment 5 years ago
Elham Rababah 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Mohammad Aljammal 8399677a0a Fix Dubai user issues 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
mosazaid 0e2b700136 vital sign hot fix 5 years ago
mosazaid 25fb8ea5ae hot fix 5 years ago
Elham Rababah fd9f93a936 do some refactor and change the code to view model 5 years ago
mosazaid 70480cc09e Merge branch 'development' into home-refactoring 5 years ago
mosazaid 50b4b8eb50 dashboard change 5 years ago
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
mosazaid 6280904669 Merge branch 'development' into home-refactoring 5 years ago
mosazaid 27f940b473 home design 5 years ago
Mohammad Aljammal 5c73f3b3b6 Merge branch 'prescription_changes' into 'development'
prescreption hot fix

See merge request Cloud_Solution/doctor_app_flutter!659
5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 72ee88d567 working on dashboard 5 years ago
hussam al-habibeh bf589e703e prescreption hot fix 5 years ago
Mohammad Aljammal 8653d54a0d Merge branch 'zohaib_and_dev' into 'development'
showDailog Migration

See merge request Cloud_Solution/doctor_app_flutter!658
5 years ago
Mohammad Aljammal 8e4321b3da Migration dev to Zohaib branch 5 years ago
Mohammad Aljammal b3ae86db31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ZohaibKambrani
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
	lib/screens/patients/ReferralDischargedPatientDetails.dart
	lib/screens/patients/insurance_approvals_details.dart
	lib/screens/patients/patients_screen.dart
	lib/screens/patients/profile/note/progress_note_screen.dart
	lib/screens/patients/profile/referral/referral_patient_detail_in-paint.dart
	lib/screens/prescription/update_prescription_form.dart
	lib/screens/sick-leave/add-sickleave.dart
	lib/widgets/patients/PatientCard.dart
	pubspec.lock
5 years ago
mosazaid 0bfa74f1c9 ucaf-change 5 years ago
Elham Rababah 7dbd4c9cc6 Merge branch 'auth_refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor
 Conflicts:
	lib/screens/auth/login_screen.dart
5 years ago
Elham Rababah 301972f9b7 small fixes 5 years ago
Mohammad Aljammal 081bfe3f61 add TODO to Elham 5 years ago
mosazaid 2023ce9b55 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh 292bc2a97f prescription changes 5 years ago
mosazaid 95a6893b59 home design 5 years ago
hussam al-habibeh c50a483663 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/core/service/patient_medical_file/prescription/prescription_service.dart
	lib/core/viewModel/prescription_view_model.dart
	lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh cecc1a725d pescription changes 5 years ago
Mohammad Aljammal b871009033 Merge branch 'feature-modeical_profile' into 'development'
Feature modeical profile

See merge request Cloud_Solution/doctor_app_flutter!654
5 years ago
Mohammad Aljammal 74ded739c8 fix imports 5 years ago
Elham Rababah 745545ffc3 add models 5 years ago
hussam al-habibeh bc340693ba project refactoring 5 years ago
hussam al-habibeh 9457e04825 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/screens/patients/PatientsInPatientScreen.dart
	lib/screens/patients/out_patient/out_patient_screen.dart
	lib/screens/patients/patient_search/patient_search_result_screen.dart
	lib/screens/patients/profile/referral/AddReplayOnReferralPatient.dart
	lib/screens/sick-leave/add-sickleave.dart
5 years ago
Elham Rababah 333d1e3f50 first step from models 5 years ago
mosazaid b10fe8112a Merge branch 'development' into home-refactoring 5 years ago
mosazaid fc99023ecc Merge branch 'development' into feature-modeical_profile 5 years ago
mosazaid 444afa464e working on feature medical profile 5 years ago
hussam al-habibeh 6107f88c16 prescription changes 5 years ago
Elham Rababah 7af300d455 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Mohammad Aljammal 8daf3d2abf Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!652
5 years ago
Elham Rababah 32d26c3c4b remove Verification Methods page and move some code to model 5 years ago
Elham Rababah 3ca4ac3632 create method card and remove future builder from verification method widget 5 years ago
mosazaid 1bb299fef4 Merge branch 'development' into home-refactoring 5 years ago
mosazaid 2cf77bac85 fit dashboard design 5 years ago
hussam al-habibeh d2814f610e hot fix 5 years ago
hussam al-habibeh 68e9470273 hot fix 5 years ago
Mohammad Aljammal 137fb560bc Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!651
5 years ago
hussam al-habibeh ed8da38bc9 hot fix 5 years ago
hussam al-habibeh 498e65180b refactoring 5 years ago
Elham Rababah a3caf023e2 Add enum to verification_methods 5 years ago
Mohammad Aljammal 0e2cb9eb9d Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!650
5 years ago
Mohammad Aljammal aab7808468 add medical report page design 5 years ago
hussam al-habibeh ca11da36b3 hot fix 5 years ago
mosazaid 89d2938003 Merge branch 'home-refactoring' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into home-refactoring 5 years ago
mosazaid fa194f5e00 hot fix 5 years ago
Mohammad Aljammal d3769d7452 Merge branch 'prescription_changes' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!649
5 years ago
Mohammad Aljammal f0039b491e fix home page 5 years ago
hussam al-habibeh c17d3d63e0 hot fix 5 years ago
Mohammad Aljammal 06706ad9a6 Fix prescription item 5 years ago
Mohammad Aljammal 00d6a3cead Merge branch 'prescription_changes' into 'development'
add prescription form changes

See merge request Cloud_Solution/doctor_app_flutter!647
5 years ago
mosazaid 4f817810c2 hot fix 5 years ago
mosazaid 34a7c0b148 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
5 years ago
hussam al-habibeh e16d91a1b8 add prescription form changes 5 years ago
Elham Rababah 53791f1028 change imei to authentication 5 years ago
Elham Rababah a5120b473f rename Auth view model to Doctor Profile View Model 5 years ago
mosazaid 4ce9a3c5bf finish home-refactoring 5 years ago
Mohammad Aljammal 086ca517d2 Add Medical Report Page 5 years ago
Mohammad Aljammal eb0fda3555 hot fix 5 years ago
Mohammad Aljammal a74a6b1212 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 16519d0ccf hot fix 5 years ago
hussam al-habibeh a82a3fa38d add prescription changes 5 years ago
Mohammad Aljammal bf86fcc168 fix in note and AddReplayOnReferralPatient 5 years ago
Elham Rababah 15bead5164 add insert IMEI service 5 years ago
hussam al-habibeh f07208586d Add Prescription changes 5 years ago
mosazaid f1babb776b Merge branch 'development' into design-changes 5 years ago
mosazaid 0d86759245 working on dashboard re-factoring 5 years ago
Elham Rababah 9f1f06f2fc refactor verification methods services 5 years ago
Elham Rababah b20d936933 fix hospitals_service 5 years ago
hussam al-habibeh c4a6d9ad6f prescription changes 5 years ago
Elham Rababah 4dcec45603 Merge branches 'auth_refactor' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Sultan Khan 25babcfad3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 302294afad session issue fix 5 years ago
Mohammad Aljammal 5705c02bfd Merge branch 'fix_out_number' into 'development'
fix out patient number

See merge request Cloud_Solution/doctor_app_flutter!639
5 years ago
Elham Rababah 583edfed89 fix out patient number 5 years ago
mosazaid 260c708935 Merge branch 'development' into design-changes 5 years ago
Mohammad Aljammal 09d9f1ce25 Merge branch 'inpatient-hot-fix' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!638
5 years ago
mosazaid 81d518e725 hot fix 5 years ago
mosazaid 916c1266ca refactoring home screen 5 years ago
Sultan Khan f84bc6da9d voice command uodated 5 years ago
Sultan Khan b66d9d1ed6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5a42184716 voice commad updated 5 years ago
Elham Rababah c72ef3f585 finish refactoring login 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 34c58149a0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into auth_refactor 5 years ago
Elham Rababah 1a1757f841 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter 5 years ago
Elham Rababah 663d2a942f first step from refactoring auth part 5 years ago
Mohammad Aljammal d6e621e4ce Merge branch 'design-changes' into 'development'
Design changes

See merge request Cloud_Solution/doctor_app_flutter!635
5 years ago
Mohammad Aljammal a82775fc61 Merge branch 'app_translation' into 'development'
SMS Popup design fix

See merge request Cloud_Solution/doctor_app_flutter!634
5 years ago
mosazaid 802bd83ddd design-changes 5 years ago
hussam al-habibeh 1bcc643fb9 SMS Popup design fix 5 years ago
Elham Rababah 607da6af66 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago
Elham Rababah c3c4b66271 refactor search file name 5 years ago
Elham Rababah 7559ab31c0 fix out patient + fix steper in arabic 5 years ago
mosazaid a61cae4922 Merge branch 'development' into design-changes 5 years ago
mosazaid 6fba03ed69 design fixes 5 years ago
Mohammad Aljammal 866f6cc8ea Merge branch 'add_out_patient_filter' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!630
5 years ago
Elham Rababah 8e4d9d9692 hot fix 5 years ago
mosazaid 3295143840 Merge branch 'development' into design-changes 5 years ago
mosazaid eb74002cf0 hot fix 5 years ago
Mohammad Aljammal c6ac829813 hot fixes in PatientReferralScreen 5 years ago
Mohammad Aljammal 88b8454afe Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/DischargedPatientPage.dart
5 years ago
mosazaid 7eea1bf4a5 Merge branch 'development' into design-changes
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 0d71378400 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Elham Rababah fba71b69ce Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_out_patient_filter
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 6153c81aa4 small fix 5 years ago
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Mohammad Aljammal 82544cb2e7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Mohammad Aljammal 989774a0b3 Fix patient card and add the discharged in Patient referral page 5 years ago
hussam al-habibeh c24bb604d4 DashBoard design fix 5 years ago
Elham Rababah 0b473f630f translate progress_note_screen 5 years ago
Elham Rababah d5d57e7997 fix new design issue 5 years ago
Mohammad Aljammal 2978aeecb2 fix the tab bar 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Mohammad Aljammal 2c81941428 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!622
5 years ago
Elham Rababah eebaf01570 fix diff msg 5 years ago
Elham Rababah 01bd55366a date difference 5 years ago
Elham Rababah f4020af4f8 date fix 5 years ago
Elham Rababah 4d87c6fb75 date fix 5 years ago
Elham Rababah 7337dc4f87 date picker 5 years ago
Mohammad Aljammal b1f1b7e34d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient
 Conflicts:
	lib/screens/patients/profile/lab_result/labs_home_page.dart
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal ed3449bcf4 fix the doctor card in lab result and radiology 5 years ago
Mohammad Aljammal 04be0a7fc6 Merge branch 'add_out_patient_filter' into 'development'
Add out patient filter

See merge request Cloud_Solution/doctor_app_flutter!620
5 years ago
Elham Rababah fe581ae7ce remove button height 5 years ago
hussam al-habibeh 51e9df7401 page translation 5 years ago
hussam al-habibeh b5bebea932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into app_translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh c86a3dabda page translation 5 years ago
Elham Rababah f0457f4e99 finish filter page 5 years ago
Elham Rababah dcdbe76e54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issus_soap
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
5 years ago
Elham Rababah 0f8820fa44 fix profile screen and start the first step from filter page 5 years ago
mosazaid 68f405cb21 design fixes 5 years ago
mosazaid 55895496e1 Merge branch 'design-changes' into development 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 4613de5fe1 Merge branch 'fix_issus_soap' into 'development'
Fix issus soap

See merge request Cloud_Solution/doctor_app_flutter!617
5 years ago
Mohammad Aljammal 16717ede58 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/doctor_app_flutter!616
5 years ago
Elham Rababah 7c2889c5d2 fix height issue 5 years ago
Haroon Amjad 0244334bb5 Update on store 5 years ago
Elham Rababah 8e9687c2ed fix issue on add examination 5 years ago
Elham Rababah 30bc9b4bea fix issue 5 years ago
Mohammad Aljammal f08a91b0b8 Merge branch 'in-patient_re-design' into 'development'
In patient re design

See merge request Cloud_Solution/doctor_app_flutter!608
5 years ago
Haroon Amjad 53a610213c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/home/home_screen.dart
#	lib/widgets/auth/login_form.dart
#	lib/widgets/auth/verfiy_account.dart
5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Elham Rababah bfd36b1c77 fix scrolling step 3 5 years ago
Elham Rababah cfe3056f17 fix scrolling step 2 5 years ago
Elham Rababah 72bf5d2337 fix scrolling in patient screen 5 years ago
Elham Rababah acb1bdbb37 fix 5 years ago
Elham Rababah b6d1c698e2 fix 5 years ago
Elham Rababah d37051ebe0 fix button 5 years ago
Elham Rababah e06771a298 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient 5 years ago
Mohammad Aljammal dc9f75f0ca hot fixes 5 years ago
Elham Rababah cf1d4439f2 fix issue of out SA in case of 3 or 2 project id 5 years ago
mosazaid b91d41428f Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 4f6fec07da vital sign fix bug 5 years ago
Mohammad Aljammal ef70a8f15d Merge branch 'referral_in_patient' into 'development'
Referral in patient

See merge request Cloud_Solution/doctor_app_flutter!607
5 years ago
Mohammad Aljammal a1a500813b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 21fd90ea8c hot fixes 5 years ago
Elham Rababah 4c493d8ea6 fix issue in patients_screen 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Elham Rababah 05a3ca7300 add doctor profile 5 years ago
Mohammad Aljammal 3e2323fbc0 Merge branch 'referral_in_patient' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!605
5 years ago
Mohammad Aljammal debfc02af0 Merge branch 'search_out_patient' into 'development'
Search out patient

See merge request Cloud_Solution/doctor_app_flutter!604
5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Elham Rababah 29831e8207 return code back 5 years ago
Elham Rababah 48471bbc07 fix small 5 years ago