Commit Graph

375 Commits (e4a7f4e1059e84a5463c8480c3e9dd4e97adbcac)

Author SHA1 Message Date
hussam al-habibeh 6f914b3e93 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/procedures/ProcedureCard.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
5 years ago
hussam al-habibeh 3586d226e0 insurance approval & medical file design fix 5 years ago
Elham Rababah 344ca9c55a refactor code in subjective step2 5 years ago
Elham Rababah 9a8ca00eec Merge branches 'Stepper_header' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Stepper_header
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_plan_page.dart
5 years ago
Mohammad Aljammal 915cf74d3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/screens/patients/profile/radiology/radiology_home_page.dart
5 years ago
Mohammad Aljammal 8055fa17eb add the branch in all doctors card and add no data image 5 years ago
mosazaid 3047b655cf add Validation for customtextfield 5 years ago
mosazaid 118cadd71b Merge branch 'development' into soap-objective-feature-re-design 5 years ago
Mohammad Aljammal 7dfe9f843f hot fix in the expandable widget 5 years ago
mosazaid fea6501b9e design fixes issues 5 years ago
Elham Rababah 9d4584097d fix flag on slider 5 years ago
Mohammad Aljammal f21d838a85 Merge branch 'patient_app_services' into 'development'
change progress note design in SOAP

See merge request Cloud_Solution/doctor_app_flutter!463
5 years ago
Mohammad Aljammal 50642bc9ef Merge branch 'fix-issues' into 'development'
insurance aprovals changes

See merge request Cloud_Solution/doctor_app_flutter!462
5 years ago
hussam al-habibeh ab20be2ea1 insurance aprovals changes 5 years ago
Mohammad Aljammal 7e33130ec7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 0745d2d56e update the design on the progress note (SOAP) 5 years ago
Mohammad Aljammal 9839ef4a00 Merge branch 'soap-objective-feature-re-design' into 'development'
cahnges on UCaf

See merge request Cloud_Solution/doctor_app_flutter!460
5 years ago
Elham Rababah eb5e5862ec fix bugs 5 years ago
mosazaid f017e4c280 cahnges on UCaf 5 years ago
Mohammad Aljammal be07ed4679 Merge branch 'allergyies' into 'development'
add my code to sideMnue

See merge request Cloud_Solution/doctor_app_flutter!455
5 years ago
Sultan Khan c60e0dc54b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 8654109500 login design updated 5 years ago
Elham Rababah b8b3ae5c7f add my code to sideMnue 5 years ago
Mohammad Aljammal 27e469eb71 Merge branch 'fix-issues' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!453
5 years ago
Elham Rababah ed02bbc1f0 fix allergy 5 years ago
hussam al-habibeh 136c839c93 hot fixes 5 years ago
Elham Rababah d987859865 make allergies as expandable widget 5 years ago
Elham Rababah c1adb9eeff fix issues 5 years ago
Elham Rababah ff2c31ee35 allergies fixes 5 years ago
Elham Rababah 1ac67a7bc1 Merge branches 'allergyies' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into allergyies 5 years ago
Elham Rababah df3b51b957 update allergies 5 years ago
Elham Rababah 518b09454b fix small bug 5 years ago
Elham Rababah 08a22d949c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 1330d680ab fix allergies 5 years ago
Mohammad Aljammal 283f07ec8a Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!442
5 years ago
mosazaid 6e96dda6cd finish soap objective new design 5 years ago
hussam al-habibeh 1fba6c839c insurance approvals deatils fix 5 years ago
Elham Rababah fe39a22481 fix master key word 5 years ago
Elham Rababah 0d42163034 finish on history design 5 years ago
Elham Rababah c8b44936f8 fix on history design 5 years ago
Elham Rababah da0f932024 update Text Fields 5 years ago
Elham Rababah 8fd318548a finish chief complaint design 5 years ago
Elham Rababah 9559265a2d update chief complaint design 5 years ago
Elham Rababah d8cce04b8a fix replay design 5 years ago
Mohammad Aljammal 282337c923 Merge branch 'soap_new_design' into 'development'
fix steps widget

See merge request Cloud_Solution/doctor_app_flutter!427
5 years ago
Elham Rababah 6ba0576ee8 fix steps widget 5 years ago
Mohammad Aljammal 0ddc349eda Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card_insurance.dart
5 years ago
Mohammad Aljammal e84dd573fe fix the Procedure Card 5 years ago
Mohammad Aljammal 98c33d550d Merge branch 'fix-issues' into 'development'
insurance approvals design fix

See merge request Cloud_Solution/doctor_app_flutter!423
5 years ago
hussam al-habibeh 6300d3f0fc insurance approvals design fix 5 years ago
Mohammad Aljammal 7f7f7611f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!419
5 years ago
hussam al-habibeh daa417a19b Insurance approval new design 5 years ago
hussam al-habibeh 03f39b8bab insurance approval new design 5 years ago
Mohammad Aljammal da370fc60a change the font size in patient card, fix the Drawer issue and change the app name in android 5 years ago
Mohammad Aljammal 0562d7f3cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 36ef342a75 Merge branch 'fix-issues' into 'development'
AppBar Design update&Design Fixes

See merge request Cloud_Solution/doctor_app_flutter!410
5 years ago
hussam al-habibeh 5342d26c86 AppBar Design update&Design Fixes 5 years ago
Mohammad Aljammal e978bd0df3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 16f285fa63 add the image dialog 5 years ago
Mohammad Aljammal 2cfd62098a Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!405
5 years ago
Mohammad Aljammal 3fafa0ab01 add the patient cad as toolbar 5 years ago
Elham Rababah 2ab012d503 fix drawer issue 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
Mohammad Aljammal d45b8a9cc5 change the font type in the app and Prescription 5 years ago
mosazaid f280ed731d finish Admission request new design 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
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
Mohammad Aljammal 6fbd2076d4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 7c9163bc48 Merge branch 'fix-issues' into 'development'
Add Prescription Form New Design

See merge request Cloud_Solution/doctor_app_flutter!384
5 years ago
hussam al-habibeh e4bfdd198b Add Prescription Form New Design 5 years ago
Elham Rababah 8beab7d84f finish drawer 5 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 5 years ago
Mohammad Aljammal 019553ba51 new design for ESG service 5 years ago
Elham Rababah c1868d98a4 small fix 5 years ago
Elham Rababah f8c14a88ee fix schedule 5 years ago
Elham Rababah 4f558dc41d fix referral card 5 years ago
mosazaid 0e05b90c6b finish patient profile screen 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 5861d159ac bug fixes 5 years ago
Sultan Khan a8ef4a98a5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 376653a344 dashboard changes 5 years ago
mosazaid 7c5d88f169 Merge branch 'development' into app_changes 5 years ago
mosazaid 9b02bdc541 inhancements 5 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 5 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 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
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
5 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
5 years ago
Elham Rababah febdadc924 fix : DA-264 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 ebc5ba7743 some fixes 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Elham Rababah 484c737836 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Mohammad Aljammal 35a9f34b18 Merge branch 'development' into 'sultan'
# Conflicts:
#   lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Sultan Khan 735698ce90 bug fixes 5 years ago
Elham Rababah f0cd33ae43 fix issue on assessment design 5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
hussam al-habibeh 38d9881ed2 Prescription date 5 years ago
Elham Rababah bc8a90ef2c first step from fix loader 5 years ago
Elham Rababah 1f2aebde33 fix loader in login 5 years ago
Elham Rababah 90a16676db fix issue related to SOAP 5 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 5 years ago
Mohammad Aljammal d7b8e29455 Merge branch 'medical-file' into 'development'
drug list

See merge request Cloud_Solution/doctor_app_flutter!234
5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
Elham Rababah 1cda486268 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
5 years ago
Elham Rababah 9194d8a44b delete Allergy 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 2f80af6b74 small fix 5 years ago
Elham Rababah 71b50c8404 First step translations 5 years ago
Sultan Khan b2aef274bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 3c968f0de1 doctor leave 5 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 5 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah 8a6ea1c0c5 Fix SOAP 5 years ago
hussam al-habibeh 47a350a811 prscription and procedure 5 years ago
hussam al-habibeh d3bf97fdd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_buttons_widget.dart
	lib/widgets/shared/app_text_form_field.dart
	lib/widgets/shared/app_texts_widget.dart
5 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
hussam al-habibeh 1ce6571668 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/routes.dart
	lib/screens/patients/profile/refer_patient_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
	lib/widgets/shared/TextFields.dart
	lib/widgets/shared/app_text_form_field.dart
5 years ago
Sultan Khan 5585274b18 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
mosazaid 4ac8fe4681 finish refferal module except accept/reject referral
&
Merge branch 'development' into feature--patient-referral

# Conflicts:
#	lib/client/base_app_client.dart
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Elham Rababah c15300125e First step objective_page.dart 5 years ago
Elham Rababah dcba85c7b9 Finish first step subjective_page.dart 5 years ago
Elham Rababah 518c30bdeb Merge branches 'SOAP' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Sultan Khan e5d542f1d0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
Sultan Khan cc1a63786f sick leave 5 years ago