552 Commits (60a15d1a6024182b7482206e1d87cd86901e8420)

Author SHA1 Message Date
Mohammad Aljammal ad036f7133 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into text-form-field
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 281a807ec8 fix live care 5 years ago
mosazaid 41515b311c lab-result-fixes 5 years ago
Mohammad Aljammal e89d5b13ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_cear_services 5 years ago
Mohammad Aljammal 7d423d9457 Merge branch 'prescription_changes' into 'development'
procedure changes

See merge request Cloud_Solution/doctor_app_flutter!691
5 years ago
Mohammad Aljammal ac701c9806 fix live care issues 5 years ago
hussam al-habibeh 764578f28e procedure changes 5 years ago
Elham Rababah fdc23ce932 Merge branches 'development' and 'live_care_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into live_care_patient
 Conflicts:
	lib/core/service/patient/LiveCarePatientServices.dart
	lib/core/viewModel/LiveCarePatientViewModel.dart
	lib/screens/patients/profile/profile_screen/patient_profile_screen.dart
5 years ago
Mohammad Aljammal b9831adeb2 Merge branch 'medical-profile-services' into 'development'
Medical profile services

See merge request Cloud_Solution/doctor_app_flutter!689
5 years ago
Elham Rababah 401516403f first step from show Video call 5 years ago
mosazaid 0cd7fa0cb2 working on livecare 5 years ago
Mohammad Aljammal e313722743 fix bug when logout 5 years ago
mosazaid 8b2c7f1a05 livecare 5 years ago
Elham Rababah 6d989e3fc3 finish new service for live care 5 years ago
Elham Rababah 8e140abee9 make pending service dynamic 5 years ago
Elham Rababah 5778a4a887 view list of Live care patient 5 years ago
Elham Rababah c4b434497a Merge branches 'development' and 'html_editor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into html_editor
 Conflicts:
	lib/screens/home/home_screen.dart
5 years ago
Elham Rababah 33ceb01d67 first step from Live care patient list 5 years ago
mosazaid 70d171a599 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 67e0cac742 add livecare to home 5 years ago
Mohammad Aljammal 40b4a83c6b Fix Expansion Procedure 5 years ago
Mohammad Aljammal 16dac03b24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_home_design
 Conflicts:
	lib/locator.dart
	lib/screens/home/home_screen.dart
5 years ago
Mohammad Aljammal f6539c82a6 add live care card in home page 5 years ago
hussam al-habibeh 3801d7b59a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into prescription_changes
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh e1d00b87ad favourite template Procedure service 5 years ago
mosazaid 9e552668c7 Merge branch 'development' into medical-profile-services 5 years ago
mosazaid 2fabe85b30 Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 1cc55d809c fix authentication service 5 years ago
mosazaid deb126fdd5 meical report changes 5 years ago
Mohammad Aljammal a97a331d87 fix bugs in change the clinic, login page when get the projects and add the special Result 5 years ago
hussam al-habibeh 066acc404a Procedure template service 5 years ago
Mohammad Aljammal 57fcd2cdeb fix home page design 5 years ago
mosazaid 9e80a1879e Merge branch 'development' into medical-profile-services
# Conflicts:
#	lib/locator.dart
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
Elham Rababah 515955663a add verification 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
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 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 0adcfeccce fix auth bug 5 years ago
Elham Rababah 6815e47814 remove doctor profile view model 5 years ago
Elham Rababah 2e71706cab add UNVERIFIED status 5 years ago
mosazaid 0e2b700136 vital sign 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
Mohammad Aljammal 8541ddc0f8 fix LabOrderResult 5 years ago
mosazaid 12bb283a68 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/screens/home/home_screen.dart
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
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
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 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
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
Mohammad Aljammal f0039b491e fix home page 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
Elham Rababah 15bead5164 add insert IMEI service 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
mosazaid 916c1266ca refactoring home screen 5 years ago
hussam al-habibeh 4eba6d9f5a Project refactoring 5 years ago
Elham Rababah 663d2a942f first step from refactoring auth part 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 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 b43b7cafcc working on in-patient screen design 5 years ago
Mohammad Aljammal 27a3dd1eb4 fix the filter page 5 years ago
Elham Rababah 7337dc4f87 date picker 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 55895496e1 Merge branch 'design-changes' into development 5 years ago
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Haroon Amjad 0244334bb5 Update on store 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
Mohammad Aljammal dc9f75f0ca hot fixes 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
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Mohammad Aljammal f4fd4b26d6 Add filter in outpatient 5 years ago
mosazaid 7c8583075a Merge branch 'development' into in-patient_re-design
# Conflicts:
#	lib/core/viewModel/PatientSearchViewModel.dart
5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
mosazaid 9870356e6e Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 286d883c9b in-patient re-design 5 years ago
Elham Rababah cc7d64e9d1 fix merge issue 5 years ago
Elham Rababah 56a5209d92 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient
 Conflicts:
	lib/core/model/PatientSearchRequestModel.dart
	lib/core/viewModel/PatientSearchViewModel.dart
	lib/locator.dart
5 years ago
Elham Rababah 20f7664b4c fix issue 5 years ago
Mohammad Aljammal 54166c0568 Merge branch 'in_patient_services' into 'development'
sick leave service

See merge request Cloud_Solution/doctor_app_flutter!593
5 years ago
hussam al-habibeh 058a6d9e8c sick leave service 5 years ago
mosazaid 40c0f9f4a0 Merge branch 'development' into in-patient_re-design 5 years ago
mosazaid 3e24278d89 in-patient re-design 5 years ago
Mohammad Aljammal 357e01c846 hot fixes 5 years ago
Elham Rababah c062a14cc2 Merge branches 'development' and 'search_out_patient' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_out_patient 5 years ago
Elham Rababah cb67dcc9e1 first step from search 5 years ago
Mohammad Aljammal 55c63c9531 fix Discharged Patient 5 years ago
Mohammad Aljammal 98eec8fcdb Merge branch 'referral_in_patient' into 'development'
add PatientSearchViewModel

See merge request Cloud_Solution/doctor_app_flutter!589
5 years ago
Mohammad Aljammal 2f01fa1b53 add PatientSearchViewModel 5 years ago
mosazaid ddc266416d some functionality and design changes 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
mosazaid 58f1b21ea3 Merge branch 'development' into in-patient-changes 5 years ago
mosazaid a3eb9dbb55 vital sign design 5 years ago
mosazaid 3335147313 vital sign add oxygenation 5 years ago
Mohammad Aljammal b2bcb3dd6d Done Referral Discharged Patient 5 years ago
mosazaid 5003b3a001 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 5 years ago
mosazaid 1b8e3eb895 some fixes 5 years ago
Mohammad Aljammal 460a5293b9 add Discharged Patient 5 years ago
Mohammad Aljammal cd3002b0e4 done the referral 5 years ago
Mohammad Aljammal 9b7bb687c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
mosazaid 3074dfd42e hot fix 5 years ago
mosazaid 42d8fc0207 finish in-patient referral 5 years ago
Mohammad Aljammal 3c224ece41 Add replay on referral patient and add the time on the vital signs 5 years ago
Mohammad Aljammal 7ed64c9007 Merge branch 'referral_in_patient' into 'development'
done first page in ReferralInPatient

See merge request Cloud_Solution/doctor_app_flutter!559
5 years ago
Mohammad Aljammal 018f216658 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referral_in_patient 5 years ago
Mohammad Aljammal 5333c0730b Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!557
5 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 5 years ago
Elham Rababah fceb351b6c fix the progress_note_screen 5 years ago
mosazaid 9d00440789 referral -re design 5 years ago
Mohammad Aljammal 8a63d8bb83 hot fixes 5 years ago
mosazaid 596f518525 Merge branch 'development' into release-hot-fix
# Conflicts:
#	lib/screens/patients/profile/patient_profile_screen.dart
#	lib/widgets/patients/profile/PatientProfileButton.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid bf9ce4694f fix logic 5 years ago
Elham Rababah d4ddfa21e5 add the new logic 5 years ago
Mohammad Aljammal b37c607813 done the referral service 5 years ago
Mohammad Aljammal 650a949c6a Merge branch 'progress_note' into 'development'
Progress note

See merge request Cloud_Solution/doctor_app_flutter!542
5 years ago
Mohammad Aljammal ae8882fbae Merge branch 'in-patient-changes' into 'development'
In patient changes

See merge request Cloud_Solution/doctor_app_flutter!539
5 years ago
Elham Rababah 8d7fef3db9 fix some issue on progress_note_screen 5 years ago
hussam al-habibeh e3102b3f5e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart
5 years ago
hussam al-habibeh 94e598c5f2 Insurance Approval In Patient 5 years ago
mosazaid 2bf003c100 Merge branch 'development' into in-patient-changes 5 years ago
mosazaid 33545d1180 work on in paitent referral 5 years ago
Elham Rababah 4a263dda8a Merge branches 'development' and 'progress_note' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into progress_note
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah 82285ccf39 show progress_note part 5 years ago
mosazaid 34e9a3797c Merge branch 'development' into in-patient-changes 5 years ago
Mohammad Aljammal bb8ad61b95 Merge branch 'in_patient_services' into 'development'
Prescriptions for in patient

See merge request Cloud_Solution/doctor_app_flutter!534
5 years ago
hussam al-habibeh 3e0f87527f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into in_patient_services 5 years ago
hussam al-habibeh 017074ba56 Prescriptions for in patient 5 years ago
Elham Rababah f2011301c6 update progress_note 5 years ago
mosazaid 9aecc6fbdb add lap results to inpatient and some changes on patient profile 5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Sultan Khan f6e0e1b0cd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan fda75c721d bug fixes 5 years ago
Haroon Amjad 6fc72328b7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 5 years ago
Haroon Amjad 27b4450dac versionID changed to 5.5 5 years ago
Elham Rababah 76d411b79a move soap folder to the correct place 5 years ago
Mohammad Aljammal d450affa37 Merge branch 'Stepper_header' into 'development'
add doctor replay

See merge request Cloud_Solution/doctor_app_flutter!502
5 years ago
Elham Rababah 4ecf9fe4b9 add doctor replay 5 years ago
mosazaid 4b32487540 referral design and service changes 5 years ago
mosazaid 82cbf392af Merge branch 'development' into textfield-validation 5 years ago
mosazaid a701b6e989 make referral changes 5 years ago
Sultan Khan 91a499090b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 649379d88f bug fix 5 years ago
Mohammad Aljammal b6941d9f63 Merge branch 'Stepper_header' into 'development'
small fixes in soap and in all app.

See merge request Cloud_Solution/doctor_app_flutter!495
5 years ago
Elham Rababah 2aba9e79f1 small fixes in soap and in all app. 5 years ago
Sultan Khan 9268b13312 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 8ed9b3c023 Merge branch 'Stepper_header' into 'development'
Stepper header

See merge request Cloud_Solution/doctor_app_flutter!484
5 years ago
Sultan Khan 148ea967fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 14cf5a5a1c finish fix the assessment 5 years ago
hussam al-habibeh 9645791164 changeing add prescription behovior 5 years ago
Sultan Khan 0498545e5c no data 5 years ago
Mohammad Aljammal b812ac4b06 add no data image in all pages 5 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 5 years ago
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid f8f088fe8c design changes 5 years ago
hussam al-habibeh 136c839c93 hot fixes 5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Elham Rababah fc98e75ec3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into doctor_replay
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 04f39315b5 finish doctor replay design 5 years ago
mosazaid c642d88804 some fixes 5 years ago
mosazaid cc7c5af1d0 referral details fix bugs 5 years ago
Mohammad Aljammal e038ec4333 Merge branch 'patient_app_services' into 'development'
Create procedure card

See merge request Cloud_Solution/doctor_app_flutter!400
5 years ago
Mohammad Aljammal 328bb25496 Create procedure card 5 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 5 years ago
Mohammad Aljammal 7facc70a4c Merge branch 'patient_app_services' into 'development'
Change the font type in the app and Prescription

See merge request Cloud_Solution/doctor_app_flutter!395
5 years ago
Mohammad Aljammal d45b8a9cc5 change the font type in the app and Prescription 5 years ago
Sultan Khan c3f19d5ccf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5256c9633f leave reschedule change 5 years ago
hussam al-habibeh 2a1426ecd9 adding lab form and radiology 5 years ago
Mohammad Aljammal ba13ea7140 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!389
5 years ago
Mohammad Aljammal 920ec14bc2 add new design for Lab Result and Radiology Results 5 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago