Commit Graph

401 Commits (e732f9e61cf9f0b700f314e70fed367bb37e872c)

Author SHA1 Message Date
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 2023ce9b55 Merge branch 'development' into home-refactoring
# Conflicts:
#	lib/core/viewModel/dashboard_view_model.dart
#	lib/screens/home/home_screen.dart
5 years ago
mosazaid 444afa464e working on feature medical profile 5 years ago
mosazaid 4f817810c2 hot fix 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 302294afad session issue fix 5 years ago
Sultan Khan 5a42184716 voice commad updated 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 663d2a942f first step from refactoring auth part 5 years ago
mosazaid 802bd83ddd design-changes 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
Elham Rababah 7bc897bf39 fix profile issue 5 years ago
Elham Rababah 0b473f630f translate progress_note_screen 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
mosazaid 3d6b55681a fix arabic and font style 5 years ago
Mohammad Aljammal 1dd668ed70 hot fixes 5 years ago
Mohammad Aljammal 21fd90ea8c hot fixes 5 years ago
Mohammad Aljammal 60eb7adab1 hot fixes 5 years ago
Mohammad Aljammal c3ac50a859 hot fixes 5 years ago
Zohaib Iqbal Kambrani 4b7688d620 showDailog Migration
DateUtils Conflict with Material (DateUtils -> AppDateUtils)
5 years ago
mosazaid 3e24278d89 in-patient re-design 5 years ago
mosazaid ddc266416d some functionality and design changes 5 years ago
Mohammad Aljammal f708689d00 hot fixes 5 years ago
Sultan Khan bbdbc3cc25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 045584bb28 voice feature added 5 years ago
Mohammad Aljammal 29e2d962bc Optimize imports 5 years ago
mosazaid 1b8e3eb895 some fixes 5 years ago
mosazaid a34db1b00c Merge branch 'development' into fridayf-fix-bug
# Conflicts:
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 42d8fc0207 finish in-patient referral 5 years ago
Sultan Khan 94806c3601 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 19f0d7ede9 voice feature added 5 years ago
Mohammad Aljammal 6d530301b6 done first page in ReferralInPatient 5 years ago
Mohammad Aljammal 36189adf94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card.dart
5 years ago
mosazaid 33545d1180 work on in paitent referral 5 years ago
Mohammad Aljammal fd790978c4 add new referral service 5 years ago
Sultan Khan e445b5bb60 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan b52ba524a3 updated 5 years ago
mosazaid 351c9b5e5c Merge branch 'development' into in-patient-changes
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/home/home_screen.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid b6a6f16b31 add vital sign inPatient 5 years ago
mosazaid 37edd8cef9 add in-patient cards and header 5 years ago
Sultan Khan 360b4d22cf in patient change 5 years ago
mosazaid 8ae0a91c05 working on text widget 5 years ago
Elham Rababah 7b7ce4e037 refactor utils folder 5 years ago
Sultan Khan 4ed8f716db dashboard changes 5 years ago
Mohammad Aljammal 2d7b2003bd hot fixes 5 years ago
Mohammad Aljammal f55bb4e60e add update page 5 years ago
Sultan Khan 5c4aee849e bug fixes 5 years ago
Sultan Khan 1fb59c17bc bug fix 5 years ago
mosazaid 3047b655cf add Validation for customtextfield 5 years ago
Elham Rababah eb5e5862ec fix bugs 5 years ago
Mohammad Aljammal 7fe7b9bd71 Merge branch 'development' into 'soap-objective-feature-re-design'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan 8654109500 login design updated 5 years ago
mosazaid f8f088fe8c design changes 5 years ago
mosazaid 6e96dda6cd finish soap objective new design 5 years ago
Mohammad Aljammal ca28fa77bd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 5e85af35c2 fix radiology image 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
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
Sultan Khan f09692de31 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal bb2b64179b Merge branch 'schedule' into 'development'
small fix on replay page

See merge request Cloud_Solution/doctor_app_flutter!397
5 years ago
Sultan Khan 4ec8bcaa81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 96daecee99 bug fix 5 years ago
Mohammad Aljammal 34c0b0c119 Merge branch 'patients-new-design' into 'development'
finish Admission request new design

See merge request Cloud_Solution/doctor_app_flutter!394
5 years ago
mosazaid f280ed731d finish Admission request new design 5 years ago
Elham Rababah 5714ed9540 small fix on replay page 5 years ago
Mohammad Aljammal 1068eea248 Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!387
5 years ago
Mohammad Aljammal 5763970d23 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!388
5 years ago
mosazaid 1f70498982 Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 5 years ago
Sultan Khan 9c111b07dd design updates 5 years ago
Sultan Khan e14e004700 page updated 5 years ago
Sultan Khan 3c1a65f310 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan eadfe2d6bc bug fixes 5 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 5 years ago
Mohammad Aljammal f0c65bb70b change color and font for ESG service 5 years ago
Mohammad Aljammal 019553ba51 new design for ESG service 5 years ago
Elham Rababah f8c14a88ee fix schedule 5 years ago
Mohammad Aljammal 6267d805f0 hot fixes 5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Sultan Khan 12dc637163 bug fixes 5 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 5 years ago
Mohammad Aljammal e515265f11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 0742d64428 add lab result services 5 years ago
Elham Rababah 103a1bc6fc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
Sultan Khan bbb1a8ff74 arrival list updated 5 years ago
Elham Rababah 7ebf36f98f add radiology open image 5 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 5 years ago
Sultan Khan 376653a344 dashboard changes 5 years ago
Sultan Khan 05ef7a4b25 dashboard page updated 5 years ago
Mohammad Aljammal 6f46e89346 Merge branch 'fix-issues' into 'development'
DA-185

See merge request Cloud_Solution/doctor_app_flutter!330
5 years ago
hussam al-habibeh bfe73ebe1d DA-185 5 years ago
Mohammad Aljammal 88a5750d22 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!327
5 years ago
hussam al-habibeh 066ac94d4a jira bugs 5 years ago
Sultan Khan 332caaae2f dashboard issue 5 years ago
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah f3220be735 fix DA-350 5 years ago
Sultan Khan 214dfecb3c DA-422 5 years ago
Sultan Khan 388c095d7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan a309acbf46 dashboard changes 5 years ago
Elham Rababah 083b49aa0a fix DA-341 5 years ago
Sultan Khan fa80d62e7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 0dc25a4a03 bug fixes 5 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 5 years ago
mosazaid 1207339b01 Merge branch 'development' into admission-request 5 years ago
mosazaid 8d154239bb finish admission request feature 5 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Elham Rababah 248367fbe9 fix DA-220 5 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah a5a7425a09 fix DA-149 5 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 5 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 5 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 6a23c2a137 bug fix 5 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
5 years ago
Elham Rababah 437ae3dfb5 Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
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 a64088320f DA-259 translation bug 5 years ago
mosazaid c2df291029 DA - 286 Fix 5 years ago
Mohammad Aljammal 6253e2c9a3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
 Conflicts:
	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 75efcde0bc fix ios 5 years ago
mosazaid 2273808333 translation 5 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid ebc5ba7743 some fixes 5 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 6d473be371 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!273
5 years ago
hussam al-habibeh 35bc8c03a4 bug fixing 5 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 5 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 5 years ago
Elham Rababah 13c879654b DA-250: fix age 5 years ago
hussam al-habibeh fb8381ea61 bugs fix 5 years ago
Sultan Khan 135c852e8c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Elham Rababah 537f53c3de Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 5 years ago
mosazaid e808d48035 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 88f1dc637f some fixes 5 years ago
Elham Rababah c11f195e72 fix DA-192 5 years ago
Elham Rababah 855ed0ac12 fix 145 5 years ago
Elham Rababah 4a3175830d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_loader
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/dashboard_screen.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 years ago
Mohammad Aljammal f75ab83981 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago