Commit Graph

2282 Commits (528e16c3dcd2c4e17da4e6f4390639ca77e4a682)

Author SHA1 Message Date
Mohammad Aljammal 3f3f8da0f6 Merge branch 'soap-objective-feature-re-design' into 'development'
fix referral card and UCAF design

See merge request Cloud_Solution/doctor_app_flutter!467
5 years ago
Mohammad Aljammal 6f11c365d3 Merge branch 'allergyies' into 'development'
add medication almost done

See merge request Cloud_Solution/doctor_app_flutter!466
5 years ago
hussam al-habibeh 8dca476898 add lab & add radiology design update 5 years ago
mosazaid 25c3bf1bb1 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid 0128144f83 working onm referral card and update on ucaf design 5 years ago
Elham Rababah e47e7c0a00 add medication almost done 5 years ago
Sultan Khan 7f557adeae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 90ad95bd63 login fixes 5 years ago
Mohammad Aljammal 57d0243878 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 77b4e0fdbe Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!464
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 0dc6bbca34 finish the new design on the progress note (SOAP) 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
Mohammad Aljammal 3a734f4718 finish the new design on the progress note (SOAP) 5 years ago
Sultan Khan 44baa02cfc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d77bd19450 login screen updated 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 88d664776e Merge branch 'fix-issues' into 'development'
add prescription & add lab test changes

See merge request Cloud_Solution/doctor_app_flutter!461
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
hussam al-habibeh c72d612646 add prescription & add lab test changes 5 years ago
Elham Rababah eb5e5862ec fix bugs 5 years ago
Elham Rababah 3a7faf6b66 fix issues 5 years ago
mosazaid f017e4c280 cahnges on UCaf 5 years ago
Sultan Khan e46d7c34ad Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 64fb4cb7e6 bug fix 5 years ago
Mohammad Aljammal 327e058fbd fix design issues and merge conflict 5 years ago
Mohammad Aljammal c314bc7db7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/soap_update/update_soap_index.dart
5 years ago
Mohammad Aljammal bdc2be8782 fix issues 5 years ago
Mohammad Aljammal c87f235cd2 fix the design issues 5 years ago
Mohammad Aljammal d105e0ef5d fix the design issues 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
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
mosazaid f0f4613960 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid f8f088fe8c design changes 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 a768dd63cf fix steps 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 e6f2ed5197 change the add item box 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 19d8b9170d update allergies fixes 5 years ago
Mohammad Aljammal 3449567086 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
hussam al-habibeh 3795381e3b assessment fix 5 years ago
hussam al-habibeh b83c7835b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/widgets/patients/profile/soap_update/steps_widget.dart
5 years ago
Mohammad Aljammal 7aadeb1a74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
hussam al-habibeh 26672dbb6e Radiology details & assessment fix 5 years ago
mosazaid 9c09023e96 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid 7f440a2d8a fix soap screen height 5 years ago
Elham Rababah df3b51b957 update allergies 5 years ago
Mohammad Aljammal cb424d7896 Merge branch 'soap-objective-feature-re-design' into 'development'
hot fix

See merge request Cloud_Solution/doctor_app_flutter!449
5 years ago
Mohammad Aljammal 87560250bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
mosazaid e7fdf984f5 hot fix 5 years ago
Mohammad Aljammal c9b39a4154 Merge branch 'fix-issues' into 'development'
Procedure screen changes

See merge request Cloud_Solution/doctor_app_flutter!448
5 years ago
Mohammad Aljammal 4bf9650b4f fix the design issues 5 years ago
mosazaid 583e06c5f2 re-design 5 years ago
hussam al-habibeh f89eb0f76b Procedure screen changes 5 years ago
mosazaid 14b76c9302 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid b735a69a4f bug fixes 5 years ago
Mohammad Aljammal 887eac5401 Merge branch 'sultan' into 'development'
bug fix

See merge request Cloud_Solution/doctor_app_flutter!446
5 years ago
Sultan Khan 3ca9f33df4 bug fix 5 years ago
mosazaid 8b6b7fe2e6 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid ef64c39a5f hot fix 5 years ago
mosazaid aeecc12cbe fix bug 5 years ago
Elham Rababah 7da729841e fix small issue in file path 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 0e4ec6ed31 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!443
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
Sultan Khan 2aaeaa1a36 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 1fb594617a bug fixes 5 years ago
mosazaid 5f245b8c27 Merge branch 'development' into soap-objective-feature-re-design 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
hussam al-habibeh 11f2c30c64 Fix vist date im medical file 5 years ago
Elham Rababah 0d42163034 finish on history design 5 years ago
hussam al-habibeh 9adf55710e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh 1d6f959342 assessment (SOAP) new design 5 years ago
Elham Rababah b70e41a558 Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 5 years ago
Elham Rababah c8b44936f8 fix on history design 5 years ago
Mohammad Aljammal 70a0104750 hot fix 5 years ago
Mohammad Aljammal 2fbf48e676 fix font size 5 years ago
Mohammad Aljammal 63f64356cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Sultan Khan 4091589b7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 46daeac487 bug fix 5 years ago
Mohammad Aljammal 0a00413639 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
5 years ago
Mohammad Aljammal 2bd57bec05 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!434
5 years ago
Sultan Khan 9aa42c71c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan bb29a1ac0f patient arrival 5 years ago
mosazaid 3c696b6367 Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid c69a64ea8a fix bug 5 years ago
Elham Rababah ee6288e26a Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 5 years ago
Elham Rababah d2bd3b68e1 small fix on history 5 years ago
Mohammad Aljammal a6f104c352 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
5 years ago
Mohammad Aljammal ecccb2d068 fix font size 5 years ago
Mohammad Aljammal 3bca803715 Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!432
5 years ago
Mohammad Aljammal 105ec683a4 Merge branch 'soap_new_design' into 'development'
Soap new design

See merge request Cloud_Solution/doctor_app_flutter!431
5 years ago
mosazaid 6826f8539c Merge branch 'development' into soap-objective-feature-re-design 5 years ago
mosazaid 0528323e15 fix patient card appbare bugs 5 years ago
Elham Rababah 654955fc76 fix label issue 5 years ago
Elham Rababah 2af1b6470a remove commented code 5 years ago
Elham Rababah da0f932024 update Text Fields 5 years ago
Elham Rababah 8fd318548a finish chief complaint design 5 years ago
Mohammad Aljammal 4fe6652997 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!430
5 years ago
Mohammad Aljammal e6cad64cf0 fix PatientArrivalList 5 years ago
Elham Rababah 9559265a2d update chief complaint design 5 years ago
Elham Rababah d8cce04b8a fix replay design 5 years ago
Mohammad Aljammal c52866c596 Merge branch 'fix-issues' into 'development'
add new lab form small design fix

See merge request Cloud_Solution/doctor_app_flutter!429
5 years ago
mosazaid 00975a2ddd fix arrival patient problem 5 years ago
hussam al-habibeh 3dcc586a6f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
Elham Rababah 5f482663dd fix the stepper 5 years ago
hussam al-habibeh 83a98a3d58 add new lab form small design fix 5 years ago
Elham Rababah e4f9d1f155 Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 5 years ago
mosazaid 6006976040 Merge branch 'development' into patients-new-design 5 years ago
mosazaid 93dba4cbeb vital sign fix bug 5 years ago
Mohammad Aljammal c00e38ae99 Merge branch 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal be55597771 Merge branch 'fix-issues' into 'development'
adding Doctor image in medical file & adding DoctorApp new Icons

See merge request Cloud_Solution/doctor_app_flutter!426
5 years ago
Mohammad Aljammal 6ca4797c91 hot fixes 5 years ago
Elham Rababah 4f8047f751 fix small thing on design in schedule 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
hussam al-habibeh 92d33abac0 adding Doctor image in medical file & adding DoctorApp new Icons 5 years ago
mosazaid f7235504fc fixes 5 years ago
mosazaid ab514588e7 Merge branch 'development' into patients-new-design 5 years ago
mosazaid c900969496 design bugs 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 c66357a4ce Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 765554d5e1 Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!422
5 years ago
Mohammad Aljammal f6e41c3a9b Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!421
5 years ago
Mohammad Aljammal 1df3c1b2c2 Merge branch 'soap_new_design' into 'development'
first step from design of subject page and ExpandableSOAPWidget

See merge request Cloud_Solution/doctor_app_flutter!420
5 years ago
Sultan Khan 66b81d1a27 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5309ace62e sick leave 5 years ago
Elham Rababah 5dcc875a0a first step from design of subject page and ExpandableSOAPWidget 5 years ago
mosazaid 9dc708fd3d Merge branch 'development' into patients-new-design 5 years ago
mosazaid 494f716f05 working on new design on vital sign and referral screens 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
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
Mohammad Aljammal c7fdec144f Merge branch 'doctor_replay' into 'development'
Doctor replay

See merge request Cloud_Solution/doctor_app_flutter!418
5 years ago
Elham Rababah e041538fb8 small fix on schedule 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
Sultan Khan bf32a3523e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 6b9bf1d752 dashboard overflow change 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 3d8a118087 Merge branch 'patient_app_services' into 'development'
change the app icons

See merge request Cloud_Solution/doctor_app_flutter!415
5 years ago
Mohammad Aljammal 17798247c7 change the app icons 5 years ago
mosazaid a454f434d1 hot fixes 5 years ago
Mohammad Aljammal fa1a5c7099 hot fix 5 years ago
Mohammad Aljammal 0d1b8d5208 Merge branch 'fix-issues' into 'development'
small design fix in medical file

See merge request Cloud_Solution/doctor_app_flutter!412
5 years ago
hussam al-habibeh 3baf4e2d55 small design fix in medical file 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 2cda29a3e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal c0bba0c21a Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!409
5 years ago
Mohammad Aljammal 3a8225e666 hot fix 5 years ago
mosazaid dd6e4f82cc Merge branch 'development' into patients-new-design 5 years ago
mosazaid c642d88804 some fixes 5 years ago
Sultan Khan 2a7ad6bfc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan cd10076b03 dashboard change 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 4b1ace52ad Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!407
5 years ago
Mohammad Aljammal 4d29cf1c71 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!406
5 years ago
Mohammad Aljammal 2cfd62098a Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!405
5 years ago
mosazaid 46fffe56b6 small changes 5 years ago
hussam al-habibeh b1ec91b20a Design Fixes 5 years ago
mosazaid 19ca735560 Merge branch 'development' into patients-new-design 5 years ago
hussam al-habibeh 29029a7dea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh 709c11d103 Design Fixes 5 years ago
Mohammad Aljammal 6cd04996ec hot fix 5 years ago
mosazaid 914f15462f Merge branch 'development' into patients-new-design 5 years ago
mosazaid cc7c5af1d0 referral details fix bugs 5 years ago
Mohammad Aljammal 3fafa0ab01 add the patient cad as toolbar 5 years ago
Elham Rababah 3f342d8ce1 fix doctor replay 5 years ago
Elham Rababah 2ab012d503 fix drawer issue 5 years ago
mosazaid c73efe3681 Merge branch 'development' into patients-new-design 5 years ago
mosazaid f7e0e89bce working on referral card 5 years ago
hussam al-habibeh ef2de6eb56 adding add procedure & update procedure forms 5 years ago
mosazaid caff27923b Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
5 years ago
mosazaid f57a5bbcef working on referral page 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 f62938076b Merge branch 'fix-issues' into 'development'
Removing old prescription screen

See merge request Cloud_Solution/doctor_app_flutter!398
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
hussam al-habibeh 578cd58daa Removing old prescription screen 5 years ago
hussam al-habibeh d1a6c2a703 adding add prescription form 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 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
mosazaid f280ed731d finish Admission request new design 5 years ago
Elham Rababah 5714ed9540 small fix on replay page 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
Mohammad Aljammal 2bd505290d fix design 5 years ago
hussam al-habibeh 0f3f3f8f55 adding lab form and radiology 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
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
Mohammad Aljammal 130d1442ea Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!386
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 83762fbd6e change the lab result design 5 years ago
Mohammad Aljammal 64f23187b6 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!385
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
Sultan Khan 9c111b07dd design updates 5 years ago
Sultan Khan ee2e3fbbd6 sick leave 5 years ago
hussam al-habibeh 672535fc94 add Lab Order Form & Radiology 5 years ago
Sultan Khan e14e004700 page updated 5 years ago
hussam al-habibeh e4bfdd198b Add Prescription Form New Design 5 years ago
Elham Rababah f74fdc80f6 fix doctor replay 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 5a9cf7c8c2 Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!382
5 years ago
Mohammad Aljammal 2d1528e30e Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!381
5 years ago
Elham Rababah 51191a560c Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 5 years ago
Elham Rababah 8beab7d84f finish drawer 5 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 5 years ago
hussam al-habibeh 79fe067fe2 Medical Report New Design 5 years ago
Mohammad Aljammal f0c65bb70b change color and font for ESG service 5 years ago
Mohammad Aljammal cdf923803e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 5 years ago
Mohammad Aljammal 019553ba51 new design for ESG service 5 years ago
Elham Rababah f78f178fd8 Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 5 years ago
mosazaid 8237270e73 fix navigation problem to patient profile cards 5 years ago
hussam al-habibeh a1b0872cc1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh ebb130af09 Medical Report New Design 5 years ago
mosazaid c97b395810 send patient type to patient profile cards 5 years ago
mosazaid 61a0e42afa paient and referral screens new design 5 years ago
hussam al-habibeh db2c086ffd Medical Report New Design 5 years ago
Elham Rababah c1868d98a4 small fix 5 years ago
Elham Rababah f8c14a88ee fix schedule 5 years ago
Mohammad Aljammal 4877bc8f6d Merge branch 'patient_app_services' into 'development'
hot fixes

See merge request Cloud_Solution/doctor_app_flutter!378
5 years ago
Mohammad Aljammal 6267d805f0 hot fixes 5 years ago
mosazaid 7117540a24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patients-new-design 5 years ago
mosazaid 27ff179750 working on referral screen bugs 5 years ago
Mohammad Aljammal d62df0052b Merge branch 'patient_app_services' into 'development'
Add new services to arrival patient

See merge request Cloud_Solution/doctor_app_flutter!376
5 years ago
Mohammad Aljammal 08b7b6263c Add new services to arrival patient 5 years ago
mosazaid b3b2beef70 Merge branch 'refferal_card' into patients-new-design 5 years ago
mosazaid ed104a4562 working on referral card 5 years ago
Sultan Khan b19c3092a6 bug fixes 5 years ago
mosazaid ffd77528a2 patient profile new design 5 years ago
Elham Rababah 4f558dc41d fix referral card 5 years ago
mosazaid 0ea66bd1e1 add the new design for the search patient 5 years ago
mosazaid 56f2b5f63a Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/screens/patients/patients_screen.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
mosazaid 0e05b90c6b finish patient profile screen 5 years ago
Sultan Khan a491eee7f7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e640bcf975 search updated 5 years ago
Mohammad Aljammal f29c2c2223 Merge branch 'patient_app_services' into 'development'
Add prescriptions and radiology from the patient app

See merge request Cloud_Solution/doctor_app_flutter!372
5 years ago
Mohammad Aljammal 55d4ff1436 Merge branch 'patient_type_fix' into 'development'
fix issue

See merge request Cloud_Solution/doctor_app_flutter!370
5 years ago
Mohammad Aljammal a167db7651 Fix prescription items 5 years ago
Mohammad Aljammal de48ae2bff Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 5 years ago
Sultan Khan 091234ad77 bug fix 5 years ago
Elham Rababah 56d3f6a9bb fix issue 5 years ago
mosazaid 69ff3450c4 Merge branch 'development' into patients-new-design 5 years ago
mosazaid 96d285daa6 patient profile new design 5 years ago
Sultan Khan 10ef8f7954 bug fixes 5 years ago
Sultan Khan 1ac94d9ec8 bug fixes 5 years ago
Sultan Khan 5ca71f8fc0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 12dc637163 bug fixes 5 years ago
mosazaid a13dd07734 Merge branch 'development' into patients-new-design
# Conflicts:
#	pubspec.lock
5 years ago
mosazaid 7702495e69 fix referral detail screen bug 5 years ago
Sultan Khan d38c5ccd6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan c16b7ffca0 arrival page updated 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
Sultan Khan 495898f8c8 patient card 5 years ago
Sultan Khan 075ae0dcaa Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5903fdd8b8 tab bar changes 5 years ago
Mohammad Aljammal f8fba85150 Merge branch 'fix-issues' into 'development'
get Prescription history fix

See merge request Cloud_Solution/doctor_app_flutter!363
5 years ago
Elham Rababah d0d8d81ae4 fix small issue in on search 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
hussam al-habibeh 3928165570 get Prescription history fix 5 years ago
Mohammad Aljammal 770767ebb6 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!361
5 years ago
Sultan Khan 93caeb3876 search screen updated 5 years ago
Mohammad Aljammal f74eadd987 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!360
5 years ago
Sultan Khan bbb1a8ff74 arrival list updated 5 years ago
Elham Rababah 96d07e7a59 fix small issue in radiology 5 years ago
Elham Rababah 7ebf36f98f add radiology open image 5 years ago
hussam al-habibeh 06fdee2d2d hussam 5 years ago
Elham Rababah 234cc57a2a return search medicine 5 years ago
mosazaid 6f3977d186 lab orders ui enhancements 5 years ago
hussam al-habibeh 53f45adf69 hussam 5 years ago
Sultan Khan 4d4d3b460d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 27bbb9ac59 changes updated 5 years ago
Mohammad Aljammal 23b0b65df7 Merge branch 'clinic_list' into 'development'
Clinic list

See merge request Cloud_Solution/doctor_app_flutter!357
5 years ago
Elham Rababah 98c02be9a3 add progress note 5 years ago
Elham Rababah ed25195593 add lab result 5 years ago
Elham Rababah c10a0cf88e hot fix profile_medical_info_widget_search 5 years ago
Mohammad Aljammal 6b28f294d6 Merge branch 'clinic_list' into 'development'
hot fix with search

See merge request Cloud_Solution/doctor_app_flutter!356
5 years ago
Elham Rababah 8a332b4d83 hot fix with search 5 years ago
Sultan Khan 94f0a7a448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 5861d159ac bug fixes 5 years ago
Elham Rababah 7d85c8b692 return back the condition 5 years ago
Elham Rababah 51c6329517 return back my code 5 years ago
Elham Rababah e7d1a6c805 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Mohammad Aljammal 22fc45ce16 Merge branch 'ecg_services' into 'development'
Ecg services

See merge request Cloud_Solution/doctor_app_flutter!353
5 years ago
Mohammad Aljammal 1af6115365 add ECG and Show sick leave 5 years ago
Elham Rababah 42666e2200 move clinic list to its own file 5 years ago
Sultan Khan 704d2484cf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal ee25102c2d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ecg_services
 Conflicts:
	lib/screens/patients/profile/patient_profile_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Mohammad Aljammal e7e4aad962 add ECG service 5 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 5 years ago
Elham Rababah e2e92c1c59 Clinic List widget 5 years ago
hussam al-habibeh 15774e5b05 hussam 5 years ago
Elham Rababah 64c7dae97c Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Elham Rababah a40bec844b Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service
 Conflicts:
	lib/screens/patients/patients_screen.dart
5 years ago
Elham Rababah 340bfd0a1c add clinic to arrival search patient 5 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 92e60bd3fd Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 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
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 5 years ago
Mohammad Aljammal 893fc05449 Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service

See merge request Cloud_Solution/doctor_app_flutter!345
5 years ago
Elham Rababah a329c447a2 fix allergic in header 5 years ago
Elham Rababah 4190f32cdb return radiology and insurance approval 5 years ago
Mohammad Aljammal 982e075e41 Merge branch 'app_changes' into 'development'
App changes

See merge request Cloud_Solution/doctor_app_flutter!344
5 years ago
Elham Rababah 1843acbcb1 Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service 5 years ago
Elham Rababah 4d6795fcc0 show all services for all type of patient. 5 years ago
mosazaid 7c5d88f169 Merge branch 'development' into app_changes 5 years ago
mosazaid 9b02bdc541 inhancements 5 years ago
Sultan Khan 8039460a38 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 1536632cd4 dashboard updated 5 years ago
Mohammad Aljammal 929a515a7c Merge branch 'fix-issues' into 'development'
Medical Report & update Prescription form update

See merge request Cloud_Solution/doctor_app_flutter!342
5 years ago
hussam al-habibeh bcf25d7b95 Medical Report & update Prescription form update 5 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 5 years ago
Sultan Khan 05ef7a4b25 dashboard page updated 5 years ago
Mohammad Aljammal c00d4107b9 Merge branch 'fix-issues' into 'development'
hussam

See merge request Cloud_Solution/doctor_app_flutter!339
5 years ago
hussam al-habibeh 53d22a8d6d hussam 5 years ago
Mohammad Aljammal 7f91978d29 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!338
5 years ago
hussam al-habibeh d099ac9b57 hussam 5 years ago
hussam al-habibeh cf44e6f77a hussam 5 years ago
hussam al-habibeh 0597cc4b00 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/core/model/get_medication_response_model.dart
	lib/core/service/prescription_service.dart
5 years ago
hussam al-habibeh b64a388a1d update procedure without entering any data 5 years ago
Sultan Khan be832bfd4b dashboard design 5 years ago
hussam al-habibeh 8d8aa78ccb Claculate Box Quantity while adding prescrption 5 years ago
hussam al-habibeh aa7b18dbb0 Claculate Box Quantity while adding prescrption 5 years ago
hussam al-habibeh c239dbc620 Claculate Box Quantity while adding prescrption 5 years ago
Sultan Khan 817718f897 drug to drug intraction 5 years ago
Sultan Khan 12f936d045 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 531e7f497b drug to drug intraction 5 years ago
Mohammad Aljammal 780599a8b2 Merge branch 'fix-issues' into 'development'
categories that can update

See merge request Cloud_Solution/doctor_app_flutter!335
5 years ago
hussam al-habibeh 0411462360 update procedure for agreed categorise 5 years ago
hussam al-habibeh 46b5f2a5f3 update procedure for agreed categories 5 years ago
hussam al-habibeh b00b739e79 categories that can update 5 years ago
Mohammad Aljammal 68dc39eb94 Merge branch 'fix-issues' into 'development'
Procedure update valdation

See merge request Cloud_Solution/doctor_app_flutter!334
5 years ago
hussam al-habibeh 24d13b06c5 Procedure update valdation 5 years ago
Mohammad Aljammal 5a4b084446 Merge branch 'fix-issues' into 'development'
procedure updates

See merge request Cloud_Solution/doctor_app_flutter!333
5 years ago
hussam al-habibeh 6ae8cf8048 procedure updates 5 years ago
Mohammad Aljammal 3a703da5d5 Merge branch 'fix-issues' into 'development'
Prescription update filters

See merge request Cloud_Solution/doctor_app_flutter!332
5 years ago
hussam al-habibeh 4e01bcb758 Prescription update filters 5 years ago
Mohammad Aljammal 4235ecda81 Merge branch 'fix-issues' into 'development'
update prescription

See merge request Cloud_Solution/doctor_app_flutter!331
5 years ago
hussam al-habibeh 8aeb749596 prescription update 5 years ago
hussam al-habibeh 7063e924de update prescription 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 e03d2c6ab6 Merge branch 'fix-issues' into 'development'
jira bug

See merge request Cloud_Solution/doctor_app_flutter!329
5 years ago
hussam al-habibeh dc941b709f DA-396 5 years ago
hussam al-habibeh eb88bea880 jira bug 5 years ago
Elham Rababah bedf6e7bbe fix DA-346 5 years ago
Elham Rababah 74e408f2d1 Merge branches 'add_medication_details' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details 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
hussam al-habibeh 3250f33b43 jira bugs fix 5 years ago
Sultan Khan 332caaae2f dashboard issue 5 years ago
Mohammad Aljammal 9ffe1eabd2 revert the code 5 years ago
Mohammad Aljammal 63db56a66b fix issue 5 years ago
Elham Rababah 12b78d0a3b fix DA-391: return back my comment code in base app client 5 years ago
Elham Rababah 8238e9569a fix DA-391: return back my comment code in dashboard 5 years ago
Elham Rababah 219ab8d4ac fix DA-391 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
Mohammad Aljammal d3ffa31261 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!322
5 years ago
Elham Rababah f819e6353e fix DA-350 5 years ago
Mohammad Aljammal 68462b04d8 Merge branch 'fix-issues' into 'development'
updating prescription after backend fix

See merge request Cloud_Solution/doctor_app_flutter!321
5 years ago
Sultan Khan 63d73b60e1 ios faceid issue 5 years ago
hussam al-habibeh f32d25b007 updating prescription after backend fix 5 years ago
Sultan Khan 449540504c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 214dfecb3c DA-422 5 years ago
Mohammad Aljammal 3c090ecdaf Merge branch 'fix-issues' into 'development'
design inhancment

See merge request Cloud_Solution/doctor_app_flutter!319
5 years ago
hussam al-habibeh ae17998e0a Design inhancment 5 years ago
hussam al-habibeh 0f15732728 design inhancment 5 years ago
hussam al-habibeh 54ad8bde0b design inhancment 5 years ago
Mohammad Aljammal 1424941f94 Merge branch 'fix-issues' into 'development'
new changes

See merge request Cloud_Solution/doctor_app_flutter!317
5 years ago
Sultan Khan 8c6a29669a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 9ed5a294ab dashboard changes 5 years ago
hussam al-habibeh 2ee2429c70 Date Formate change 5 years ago
hussam al-habibeh 57aea2ba4f pharmacy remarks 5 years ago
hussam al-habibeh 963fe42cd8 new changes 5 years ago
Mohammad Aljammal 98bc5f7812 Merge branch 'fix-issues' into 'development'
DA-355

See merge request Cloud_Solution/doctor_app_flutter!316
5 years ago
Sultan Khan 958a341c3b sick leave 5 years ago
hussam al-habibeh d115564cc1 DA-355 5 years ago
Sultan Khan 6bdd4e06a1 dashboard changes 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
Mohammad Aljammal cd6a31f0d5 Merge branch 'fix_issue_feb' into 'development'
Fix issue feb

See merge request Cloud_Solution/doctor_app_flutter!314
5 years ago
hussam al-habibeh 2563b10216 DA-367 5 years ago
Elham Rababah 07edbc4fe5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issue_feb 5 years ago
Elham Rababah 083b49aa0a fix DA-341 5 years ago
Elham Rababah 344d70793c fix DA-421 5 years ago
hussam al-habibeh cb8b7a4ec4 jira bug fixing 5 years ago
hussam al-habibeh 925d21f29a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/prescription/update_prescription_form.dart
5 years ago
hussam al-habibeh 39d2fe879c jira bug fixing 5 years ago
Mohammad Aljammal 21ead3b219 Merge branch 'referral-facilities-changes' into 'development'
add referral get facilties

See merge request Cloud_Solution/doctor_app_flutter!310
5 years ago
Mohammad Aljammal d8d2e7f1d6 fix ios issues 5 years ago
mosazaid a047255f2c add referral get facilties 5 years ago
hussam al-habibeh d20e83faa5 bug fixing 5 years ago
hussam al-habibeh 8bf578082b bug fixing 5 years ago
hussam al-habibeh bd69219a86 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh cd94b835b5 bug fixing 5 years ago
Mohammad Aljammal ba8ecf04bf Merge branch 'done_button_keyboard' into 'development'
hide the keyboard when the user click on background

See merge request Cloud_Solution/doctor_app_flutter!308
5 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 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
hussam al-habibeh 28370e7492 fix bugs 5 years ago
hussam al-habibeh 255f36598b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 5 years ago
hussam al-habibeh d4ea901906 bugs fix 5 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

See merge request Cloud_Solution/doctor_app_flutter!304
5 years ago
Mohammad Aljammal bf747d5427 Merge branch 'fix-issues' into 'development'
bug fixing

See merge request Cloud_Solution/doctor_app_flutter!302
5 years ago
Elham Rababah c8e5a7eeef fix PatientCard 5 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 5 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 5 years ago
hussam al-habibeh 3d60813146 bug fixing 5 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
5 years ago
Sultan Khan f0539860c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 400f8e25f6 bug xis 5 years ago
hussam al-habibeh 5bde14813a fixing bugs 5 years ago
mosazaid 87f67ea2e8 DA-273 solve 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 ff33afd124 fix DA-149 5 years ago
Mohammad Aljammal 2f877b6257 Merge branch 'DA-284-DA-285' into 'development'
bug fixes for DA-284-DA-285

See merge request Cloud_Solution/doctor_app_flutter!297
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
Mohammad Aljammal 2e19af335e Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!296
5 years ago
Mohammad Aljammal 63878281b3 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!295
5 years ago
Mohammad Aljammal 0c6ba54680 Merge branch 'fix-issues' into 'development'
jira bugs fix

See merge request Cloud_Solution/doctor_app_flutter!294
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
hussam al-habibeh 9ec78763dc update prescription 5 years ago
hussam al-habibeh 539f7facc7 jira bugs fix 5 years ago
Mohammad Aljammal 05ed1202fe Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!293
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
Sultan Khan efc4cf9443 reschedule issue fixed 5 years ago
Elham Rababah 98609b464b fix DA-279 5 years ago
Elham Rababah 1e84b73cf0 fix DA-279 5 years ago
Elham Rababah 34d5ac7d43 add label on assessment and fix DA-333 5 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 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 9f04ef8066 Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!290
5 years ago
hussam al-habibeh d78aa2321d bug fix 5 years ago
hussam al-habibeh 546b520d7b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/core/enum/master_lookup_key.dart
	lib/core/service/base/lookup-service.dart
5 years ago
hussam al-habibeh 15dd0f7c1a bug fix 5 years ago
hussam al-habibeh d66811546f refactoring my code 5 years ago
Elham Rababah 7505a6b6b0 fix  allergy 5 years ago
mosazaid a71bf160e7 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 5b5954c6f3 working on Admission request feature adding lookup 5 years ago
Elham Rababah 6a5e134527 fix  remark and step widget 5 years ago
hussam al-habibeh 23c826b37f bug fix 5 years ago
Elham Rababah cfb9ea30cb fix : DA-335 5 years ago
Mohammad Aljammal 8f9e799070 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!287
5 years ago
Elham Rababah 2b07d16f00 fix : DA-303 5 years ago
Elham Rababah f84902b73b fix : DA-333 5 years ago
Elham Rababah e652752729 fix : DA-334 5 years ago
Mohammad Aljammal 8916b4a1f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!286
5 years ago
mosazaid e74de0b475 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid b63c7aff25 Fix DA-331 vital signs uncorrect temperature value 5 years ago
hussam al-habibeh 29de472c66 bug fix 5 years ago
hussam al-habibeh 9b5899d4e6 bug fix 5 years ago
hussam al-habibeh deca96f62e 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 494479f1d9 fix : DA-264 fix merge error 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 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
hussam al-habibeh b267342c03 fixing issues 5 years ago
mosazaid a64088320f DA-259 translation bug 5 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 5 years ago
mosazaid c2df291029 DA - 286 Fix 5 years ago
Mohammad Aljammal cb767e4d4c Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!282
5 years ago
hussam al-habibeh 6b0e87ce55 bugs fix 5 years ago
Mohammad Aljammal abcd7e9833 Merge branch 'fix_issues' into 'development'
remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280
5 years ago
Elham Rababah 6820e2d097 remark fix in allergies 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
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
5 years ago
Mohammad Aljammal 3cfb88b313 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!277
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
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan d34744e168 bug fix 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 fd17fc4608 enforce user to add date in case referral 5 years ago
Elham Rababah c065dbbdb3 Fixed DA:266 5 years ago
Elham Rababah 913ffc3052 Fix DA-260,DA-267 5 years ago
Elham Rababah 905818b532 add admission no to orders 5 years ago
Elham Rababah b9eaee1887 fix design 5 years ago
Elham Rababah 13c879654b DA-250: fix age 5 years ago
Mohammad Aljammal 81fdcb2d8d Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!271
5 years ago
Mohammad Aljammal fbd509d6ec Merge branch 'fix-issues' into 'development'
bugs fix

See merge request Cloud_Solution/doctor_app_flutter!272
5 years ago
hussam al-habibeh fb8381ea61 bugs fix 5 years ago
Elham Rababah 68d27a451d fix general issue 5 years ago
Sultan Khan b92bc85e8f bug fixes 5 years ago
Elham Rababah a5bccddf55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 5 years ago
Elham Rababah 9ddfbd3e66 fix issue on app drawer 5 years ago
Sultan Khan d5d7ea6c49 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 63e8ee8dd0 sick leave 5 years ago
hussam alhababieh 3c55af7adc Merge branch 'development' into 'tasks-translation'
# Conflicts:
#   lib/screens/prescription/add_prescription_form.dart
5 years ago
hussam al-habibeh 7c800bdab4 medical file fix 5 years ago
Elham Rababah 00543a759a fix remarks in allergies 5 years ago
Elham Rababah 8c9ffc2e62 fix multiple issue 5 years ago
Elham Rababah cbf850da2f fix DA-201 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
Mohammad Aljammal b89af8a5ab Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!266
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 f0cd33ae43 fix issue on assessment design 5 years ago
Elham Rababah 1de25aae2f fix issue on assessment design 5 years ago
hussam al-habibeh bada160cf5 Search Medacation 5 years ago
hussam al-habibeh d9fcf89c19 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/core/viewModel/medicine_view_model.dart
5 years ago
hussam al-habibeh 4a4cd03f63 Prescription date 5 years ago
hussam al-habibeh 38d9881ed2 Prescription date 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 ba263ada44 fix DA-201 5 years ago
mosazaid 5440fd1ef9 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 3be693337a some fixes 5 years ago
Elham Rababah 4e4e6a3600 fix DA-151 5 years ago
Elham Rababah a7ca7fb271 fix DA-151 5 years ago
hussam al-habibeh ced4edebde patinet profile update 5 years ago
Elham Rababah 03fa9de901 fix DA-198 5 years ago
Elham Rababah 53e88620ec fix DA-230 5 years ago
Sultan Khan d55ce4c1ec Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 5af6210785 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!263
5 years ago
Mohammad Aljammal 574e1525d9 Merge branch 'tasks-translation' into 'development'
Prescription & medical file fix

See merge request Cloud_Solution/doctor_app_flutter!262
5 years ago
mosazaid cd95a581f0 simple changes 5 years ago
Elham Rababah cc92fe56c6 fix DA-154,DA-150 5 years ago
Sultan Khan 896078507f gub fixes 5 years ago
hussam al-habibeh e133a014e8 Prescription & medical file fix 5 years ago
Elham Rababah e32c360f85 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 8360179050 fix DA-195 5 years ago
Elham Rababah c11f195e72 fix DA-192 5 years ago
Elham Rababah d53493aa52 fix DA-237 5 years ago
Elham Rababah c6156921e8 fix DA-197 5 years ago
Elham Rababah e95638bd99 fix DA-157 5 years ago
Elham Rababah e9de8a72e9 fix DA-152 5 years ago
Elham Rababah 855ed0ac12 fix 145 5 years ago
Elham Rababah 02167afa6b fix 143,144 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 eb90fc0161 fix bug in assessment 5 years ago
Sultan Khan 40cfad7f7b login 5 years ago
Elham Rababah 9674eb89d9 add modification on so 5 years ago
Sultan Khan 417ca9401b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan a99b3847ac login completed 5 years ago
Elham Rababah 763d6bb49f finish add loader 5 years ago
hussam al-habibeh 5150f9b93d Prescription & procedure body update 5 years ago
Elham Rababah bc8a90ef2c first step from fix loader 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
Mohammad Aljammal 9147cde86e Merge branch 'tasks-translation' into 'development'
medical dile & Order Procedure translation

See merge request Cloud_Solution/doctor_app_flutter!256
5 years ago
hussam al-habibeh 1fa52e0394 medical dile & Order Procedure translation 5 years ago
hussam al-habibeh 015c3b53c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into tasks-translation
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
hussam al-habibeh e67233bb21 medical dile & Order Procedure translation 5 years ago
mosazaid eae0bb443f solve problem with vital signs charts depend on date 5 years ago
mosazaid d9d4e22531 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid dcb71e5c22 Add charts to patient vital signs feature
&
Merge branch 'development' into feature-ucaf

# Conflicts:
#	lib/util/translations_delegate_base.dart
#	pubspec.yaml
5 years ago
hussam alhababieh d87aeb290f Merge branch 'development' into 'procedure-fix'
# Conflicts:
#   lib/landing_page.dart
5 years ago
hussam al-habibeh b0410dc744 Procedure updates 5 years ago
hussam al-habibeh debcad3a3d prescription 5 years ago
hussam al-habibeh 4b54ca7d47 prescription 5 years ago
Elham Rababah 23fb2e7297 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into referralPatient
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah 6bab2e0b2d fix referral patient issue 5 years ago
mosazaid 8424e92c4b working on vital Sign feature with Charts 5 years ago
Sultan Khan 722e1a5c41 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan ad99cebf02 login and drug to drug 5 years ago
Mohammad Aljammal 307463865b Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!249
5 years ago
Mohammad Aljammal 3306d6f400 Merge branch 'medical-file' into 'development'
post Procedure

See merge request Cloud_Solution/doctor_app_flutter!248
5 years ago
hussam al-habibeh dd53a9bd4d post Procedure 5 years ago
mosazaid 306d484837 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 8726653ffb working on Referral feature 5 years ago
Mohammad Aljammal cc14448d48 Merge branch 'soap_update' into 'development'
fix loader in login

See merge request Cloud_Solution/doctor_app_flutter!247
5 years ago
Elham Rababah 1f2aebde33 fix loader in login 5 years ago
Sultan Khan 909940a6d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 40e9ab864a login changes 5 years ago
mosazaid 2f17167e2f some design enhancments 5 years ago
mosazaid db502b7f0d Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 421cee49c7 Merge branch 'feature-ucaf' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 97d05c72c2 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 748802af1d Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!245
5 years ago
Mohammad Aljammal 21114fc88f Merge branch 'development' into 'feature-ucaf'
# Conflicts:
#   lib/config/localized_values.dart
#   lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 70cfc4668b Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!243
5 years ago
Elham Rababah 3c1b51eb94 fix issue related to landing page 5 years ago
Elham Rababah 90a16676db fix issue related to SOAP 5 years ago
Elham 9e7a7210c4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!244
5 years ago
Elham Rababah fb035cd4c9 fix patient_search_screen.dart 5 years ago
Elham Rababah 0147e7e49b do translation, fix some bugs 5 years ago
Elham Rababah 175ba545e7 finish create episode 5 years ago
hussam al-habibeh 5253c28469 prescription form fix 5 years ago
Elham Rababah 4f1a892be4 first step form create episode 5 years ago
mosazaid 289cf9b479 Merge branch 'development' into feature-ucaf 5 years ago
Mohammad Aljammal e60cc5ec4a Merge branch 'medical-file' into 'development'
Medical file

See merge request Cloud_Solution/doctor_app_flutter!240
5 years ago
mosazaid ca9f1a022b Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid fd2a86dca4 some changes in patientArrivalList And make action when click on vitalSign widget inside pendingReferral 5 years ago
hussam al-habibeh f767467a67 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medical-file 5 years ago
hussam al-habibeh bcbd091dae ss 5 years ago
Elham 8494f6e0f4 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!241
5 years ago
Elham Rababah caddbdb53c small fixes in progress note 5 years ago
Elham Rababah 34b7b4564c assessment work fine now 5 years ago
hussam al-habibeh a3fa8ef839 medical file fix 5 years ago
mosazaid ff906338bf Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 9a5cafaaf5 working on UCAF detail screen , and some cahgnes on referral list 5 years ago
Elham Rababah a46a61c5cf fix get and post issue to make it works with vida 5 years ago
mosazaid e14df2855a Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 50d7f733b6 working on UCAF datails and add patient procedure list and diagnosis 5 years ago
Sultan Khan 71c4d48cca Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan c4cae6fb38 doctor leave bug fix 5 years ago
Elham Rababah 7ce1d2dd55 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Mohammad Aljammal eb5a3a59ff hot fixing 5 years ago
Sultan Khan 87d90a394b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 044ad7b51a offtime leave 5 years ago
mosazaid b67fd55aac Merge branch 'development' into feature-ucaf 5 years ago
mosazaid e75e7801aa working on UCAF get data 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
Elham Rababah 9aa5ab4228 small changes 5 years ago
hussam al-habibeh f997561bb8 drug list 5 years ago
Elham Rababah 1be8ea7dcb Fix conflict 5 years ago
Elham Rababah ffe7e7c57f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
Elham Rababah c3bb408787 add some translations 5 years ago
Mohammad Aljammal 699c565427 Merge branch 'feature-ucaf' into 'development'
Feature ucaf

See merge request Cloud_Solution/doctor_app_flutter!232
5 years ago
Mohammad Aljammal d20604aaaf Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!231
5 years ago
Sultan Khan d67b531865 bug fix 5 years ago
Sultan Khan 31d6ca5593 Doctor ID updated 5 years ago
mosazaid 4f1c70a3f4 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid c9aac6e2e9 vital signs solve overflow of the width 5 years ago
Mohammad Aljammal ff9eaeb09f Merge branch 'sultan' into 'development'
reschdule leave

See merge request Cloud_Solution/doctor_app_flutter!230
5 years ago
Sultan Khan ad48415038 reschdule leave 5 years ago
mosazaid a51239447b Merge branch 'development' into feature-ucaf 5 years ago
Mohammad Aljammal dc9a9ad4f6 Merge branch 'medical-file' into 'development'
medical file

See merge request Cloud_Solution/doctor_app_flutter!229
5 years ago
mosazaid 7983f998bd Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh 76cc4d11f8 medical file 5 years ago
Sultan Khan ad967e8aae Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah bbcd218a94 history delete is fixed 5 years ago
mosazaid 2f9d4a1034 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ceb0cde34c finish UCAF design and solve problem on vital signs response 5 years ago
Elham Rababah 3dffd33728 hot fix 5 years ago
Sultan Khan 68cfbf8fc7 doctor leave 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 3b471aebdc Merge branch 'development' into feature-ucaf 5 years ago
mosazaid 88ee50f7cb change make referral page loading behaviour 5 years ago
Elham b291572767 Merge branch 'soap_update' into 'development'
Fix profile widget

See merge request Cloud_Solution/doctor_app_flutter!223
5 years ago
Elham Rababah 8284f1d475 Fix profile widget 5 years ago
mosazaid b5a102add3 Merge branch 'development' into feature-ucaf 5 years ago
mosazaid ee9ca72057 change empty referral message 5 years ago
hussam al-habibeh eef5d57d2f Merge branches 'development' and 'pesrcription-post' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into pesrcription-post 5 years ago
hussam al-habibeh 16b949461d prescription post 5 years ago
Mohammad Aljammal 812fe10db8 Merge branch 'soap_update' into 'development'
Soap update

See merge request Cloud_Solution/doctor_app_flutter!219
5 years ago
Elham Rababah e054c28234 hide text 5 years ago
mosazaid ce164c3cb6 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
5 years ago
mosazaid 0c39dc6693 change on vital signs for uncoment the service 5 years ago
mosazaid 4b5bec8c50 working on UCAF design 5 years ago
Mohammad Aljammal f0f98280b4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart
5 years ago
Sultan Khan 9adc5ddd8e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 6a8c37e0d7 doctor leave 5 years ago
Elham Rababah 7d550ca15f prevent null 5 years ago
Elham Rababah cece85cda7 small fix remove todo 5 years ago
Elham Rababah 2f80af6b74 small fix 5 years ago
Elham Rababah 71b50c8404 First step translations 5 years ago
Sultan Khan 6c894c3d3b sick leave 5 years ago
Elham Rababah ba14d23c05 Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/widgets/patients/profile/profile_medical_info_widget.dart
5 years ago
Elham Rababah e65740761a add improvement on create episode 5 years ago
Sultan Khan 43a1e56a8b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 9bf07d7117 reschedule leave 5 years ago
hussam al-habibeh e72ef46efb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh 4ffeb31181 update procedure fixes 5 years ago
Mohammad Aljammal d975fb021c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
	lib/util/helpers.dart
5 years ago
Sultan Khan 4587fdda59 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan e23bb7ce94 reschedule leave 5 years ago
Elham Rababah 423bd49aee Merge branches 'development' and 'soap_update' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_update
 Conflicts:
	lib/routes.dart
5 years ago
mosazaid b4f813fc2d Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/locator.dart
#	lib/routes.dart
5 years ago
Mohammad Aljammal 3cb96f35ca Merge branch 'design-updates' into 'development'
Design updates

See merge request Cloud_Solution/doctor_app_flutter!211
5 years ago
hussam al-habibeh 75eda8832d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh d1a261c847 procedure update 5 years ago
Elham Rababah 856777c648 finish updating functions 5 years ago
mosazaid 0e645c2b1f Merge branch 'development' into feature_admission_request 5 years ago
mosazaid b60bac6d6e working on UCAF design 5 years ago
Elham Rababah f8b195e368 parseHtmlString now working :) 5 years ago
Elham Rababah 3cadd532d8 finish Updating 5 years ago
Sultan Khan 70d11bfe9e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Mohammad Aljammal 93c0bdf32a return login 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
Elham Rababah 6a7f0e605f Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 4caf40a2ab finish plan page 5 years ago
Mohammad Aljammal 1af5f1040f add search in soap update 5 years ago
Mohammad Aljammal d5bde6228a add search in update assessment page 5 years ago
hussam al-habibeh b3567df020 medical file model 5 years ago
Elham Rababah d8ac550357 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 311bee5136 try to fix get 5 years ago
Elham Rababah 46043efb42 Finish Update objective code Page 5 years ago
Elham Rababah c92a848851 Finish Update Subjective Page 5 years ago
mosazaid e9ffbf06a6 Merge branch 'development' into feature_admission_request 5 years ago
hussam al-habibeh 9210600e15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
mosazaid 3578c82f62 solve hacking patient screen 5 years ago
mosazaid 095a915a89 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
mosazaid cb4ee05b40 working on ucaf 5 years ago
hussam al-habibeh ce0303fbce Merge branch 'search_in_soap' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/config.dart
5 years ago
hussam al-habibeh adb8033138 update prescription 5 years ago
Mohammad Aljammal a723ecbf1d fix merger 5 years ago
Mohammad Aljammal 5669021add Merge branch 'SOAP' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/widgets/patients/profile/SOAP/assessment_page.dart
	lib/widgets/patients/profile/SOAP/subjective/add_allergies_widget.dart
	lib/widgets/patients/profile/SOAP/subjective/subjective_page.dart
5 years ago
Mohammad Aljammal 9bf08e81da Add search button name and hint search text in MasterKeyCheckboxSearchWidget 5 years ago
Elham Rababah 39970fe1a8 get update_subjective_page.dart 5 years ago
Mohammad Aljammal 45edddb49f Add search in Procedure Screen 5 years ago
Mohammad Aljammal b60b45ab53 Merge branch 'design-updates' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into search_in_soap
 Conflicts:
	lib/screens/patients/patient_search_screen.dart
5 years ago
Mohammad Aljammal 93bece09d7 add search in SOAP 5 years ago
Elham Rababah f0fd5d30e1 First step from update process 5 years ago
mosazaid ae6cd0e5f8 Merge branch 'development' into feature_admission_request 5 years ago
mosazaid 5142b5b6c7 finish admission request design 5 years ago
hussam al-habibeh b3345a86ef post prescription 5 years ago
Elham Rababah ea4bf159c6 commit issue 5 years ago
Sultan Khan 669655307a Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan 49e9ecfa4a doctor leave 5 years ago
Elham 88c2c04d68 Merge branch 'design-updates' into 'development'
post prescription

See merge request Cloud_Solution/doctor_app_flutter!203
5 years ago
Elham Rababah 05e7762533 fix obj page 5 years ago
Elham Rababah 49f7dab008 Merge branches 'SOAP' and 'patient_arrival_ist' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP 5 years ago
Elham Rababah 61209663f3 Finish arrived 5 years ago
mosazaid 4d44d54806 Merge branch 'development' into feature_admission_request 5 years ago
Mohammad Aljammal 806682b921 hack login 5 years ago
Elham Rababah dccf474e70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_arrival_ist
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/core/service/patient_service.dart
	lib/core/viewModel/patient_view_model.dart
	lib/lookups/patient_lookup.dart
	lib/models/patient/patiant_info_model.dart
	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid 873ee67eb7 Merge branch 'development' into feature_admission_request
# Conflicts:
#	lib/routes.dart
5 years ago
Elham Rababah df4eb94042 work with patient model 5 years ago
mosazaid 433b2933c4 working with admission request and some changes in vital signs 5 years ago
mosazaid f35eff1220 working with admission request 5 years ago
hussam al-habibeh 17079a1bd9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates 5 years ago
hussam al-habibeh 9d8514c83b post prescription 5 years ago
Mohammad Aljammal 6f2e764deb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hack_login
 Conflicts:
	lib/client/base_app_client.dart
	lib/routes.dart
5 years ago
Mohammad Aljammal 04ed76069c hack login 5 years ago
Elham Rababah fc82665f1b add ICD10 5 years ago
Mohammad Aljammal 21252c6ae9 Merge branch 'feature-vital-sign' into 'development'
Feature vital sign

See merge request Cloud_Solution/doctor_app_flutter!201
5 years ago
Elham Rababah 2f273dcde8 add ICD10 5 years ago
Elham Rababah 4e8de52efe add commented code 5 years ago
mosazaid 78e2c662c8 finish vital sign feature, and adding makeReferralResponse 5 years ago
Elham Rababah 14955201a9 fix things 5 years ago
Elham Rababah efee00c79e finish add assessment 5 years ago
Elham Rababah 72886ccaa7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah a47e9b69f5 add CDI service 5 years ago
mosazaid 25d884c774 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/routes.dart
#	lib/util/helpers.dart
#	lib/util/translations_delegate_base.dart
#	lib/widgets/patients/profile/SOAP/add_SOAP_index.dart
#	pubspec.lock
5 years ago
Elham Rababah 8a6ea1c0c5 Fix SOAP 5 years ago
hussam al-habibeh 0c18d96ba2 post procedure 5 years ago
mosazaid b5c937bd86 Working on vitalSigns,
Merge branch 'development' into feature-vital-sign

# Conflicts:
#	lib/routes.dart
5 years ago
hussam al-habibeh b2aade9b2b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
5 years ago
hussam al-habibeh c7bfe24207 post procedure 5 years ago
Mohammad Aljammal df83883139 fix base app client 5 years ago
Mohammad Aljammal 7c4e0d929f fix base app client 5 years ago
Elham Rababah ab9740ccdd remove Vida Auth from config 5 years ago
Elham Rababah edef444534 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/config/config.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 1672d9a3a0 add assessment_page code 5 years ago
Elham Rababah dc4250a4de Post progress Note 5 years ago
Elham Rababah b22fd3f7ba fix listHisProgNotePhysicalExaminationVM 5 years ago
Elham Rababah f97d11183d progress Note 5 years ago
mosazaid a71da8e4ef working on vital signs 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
Elham Rababah 1491a04b39 PostPhysicalExam works 5 years ago
hussam al-habibeh 697f17f2cd prescription and procedure 5 years ago
Sultan Khan e45220829f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah e6af5a3e39 remove is Auth for test target 5 years ago
Elham Rababah cd46b4317c fix error null thing 5 years ago
Elham Rababah a362901da8 improve code inside my eam 5 years ago
Elham Rababah 4df3b1fb40 First step from examination 5 years ago
Elham Rababah cde56a82f2 Finish subjective 5 years ago
mosazaid d11a8e6209 Merge branch 'development' into feature-vital-sign
# Conflicts:
#	lib/core/service/base/base_service.dart
#	lib/locator.dart
5 years ago
Sultan Khan 1da12873c7 dashboard 5 years ago
mosazaid aafcd89222 working on vitalSigns feature 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
Elham Rababah d4a1dcfc81 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
	lib/core/service/base/lookup-service.dart
5 years ago
Elham Rababah 18d58e7037 remove is Auth for test target 5 years ago
Sultan Khan 384c7cd58a code merged 5 years ago
hussam al-habibeh 749e870ea2 get procedures get prescription 5 years ago
Elham Rababah 26a25f44e0 fix error null thing 5 years ago
Sultan Khan 5dcc03cfa8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Elham Rababah 74d315b887 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into SOAP
 Conflicts:
	lib/client/base_app_client.dart
5 years ago
Elham Rababah 4560706d55 improve code inside my eam 5 years ago
mosazaid 47e9d2a558 Merge branch 'development' into feature--patient-referral
# Conflicts:
#	lib/client/base_app_client.dart
5 years ago
mosazaid f6ddf7a9eb make logout button close all screen stack and push to login 5 years ago
Elham Rababah abbe891673 improve code quality 5 years ago
Elham Rababah 2658694b70 remove static value 5 years ago
Elham Rababah 9a614b25b5 Finish the login 5 years ago
Elham Rababah e96d38454c First step from examination 5 years ago
Elham Rababah bb651478a0 Finish subjective 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
Elham Rababah 9b0731d5c8 check activation code 5 years ago
Elham Rababah 7001940d0d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into login_new 5 years ago
mosazaid 8ffb372573 rename llokup file 5 years ago
mosazaid 25063b9590 adding lookup service 5 years ago
mosazaid d2550df08c adding shared lockup service 5 years ago
mosazaid cb80ce7785 isAuthunticated behaviour 5 years ago
Elham Rababah 9bb396c309 fix error in base app 5 years ago
mosazaid 7cefbb4dbd add referral pages 5 years ago
Elham Rababah a3dff8c9f8 Post Allergies service 5 years ago
Elham Rababah 52554d1aef add and remove allergy 5 years ago
Sultan Khan 989c06ae33 prescription changes 5 years ago
Elham Rababah 405ad731c7 history list ready 5 years ago
Elham Rababah df68e912b5 first step from calling history 5 years ago
Sultan Khan 8d58348267 dashboard changes 5 years ago
Elham Rababah ef6b1bc50e add master lookups 5 years ago
Elham Rababah 16e6221b9e Finish plan page design 5 years ago
Elham Rababah 7910e6a9e9 Finish step objective_page.dart + assessment_page.dart page 5 years ago
Elham Rababah c15300125e First step objective_page.dart 5 years ago
Sultan Khan e61f3f0281 add sick leave 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
Elham Rababah 44779e6ee7 patient screen 5 years ago
mosazaid 94093e775e add vital-sign files 5 years ago
Elham Rababah 9c018d3c55 first step from patient arrival 5 years ago
Sultan Khan 4f96cff585 sick leave 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 81352c2b0e small fix. 5 years ago
Elham Rababah af77d35ce3 ass some changes to SOAP 5 years ago
Elham Rababah 46cdd9482c First step from SOAP 5 years ago
Sultan Khan ba2697c917 sick leave 5 years ago
Elham Rababah 4eee5cd9d8 new login type 5 years ago
mosazaid bb1f101e94 finish re-design refer-patient screen 5 years ago
Sultan Khan 900264bc26 sick leave 5 years ago
Sultan Khan 76e10459e0 sick leave 5 years ago
Sultan Khan 97d915ef99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
Sultan Khan cc1a63786f sick leave 5 years ago
hussam al-habibeh dfca3aa0e5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
5 years ago
hussam al-habibeh cbb8937b1d '12/14' 5 years ago
Elham Rababah 89729e4537 fix my referred widget 5 years ago
Elham Rababah 5905311d12 small fixes in patient profile 5 years ago
Elham 97a1a56f1f Merge branch 'replay-design' into 'development'
re-design in-patient detail page

See merge request Cloud_Solution/doctor_app_flutter!182
5 years ago
Sultan Khan 06f71a22fb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 5 years ago
mosazaid 16821c17fc re-design in-patient detail page 5 years ago
Sultan Khan ac747e7519 dashboard 5 years ago
hussam al-habibeh 7de6a8e99f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into design-updates
 Conflicts:
	lib/config/localized_values.dart
	lib/landing_page.dart
	lib/screens/patients/profile/refer_patient_screen.dart
5 years ago
hussam al-habibeh c581638e00 refer_patient_screen 'not finshed' 5 years ago
Elham Rababah 9f19b2566f finish refactor provider 5 years ago
Elham Rababah 64dbcce06f finish and remove patient provider 5 years ago
Elham 6057e6a266 Merge branch 'refactor' into 'development'
Refactor

See merge request Cloud_Solution/doctor_app_flutter!180
5 years ago
Elham 746765f4d7 Merge branch 'design-updates' into 'development'
patients_screen design update

See merge request Cloud_Solution/doctor_app_flutter!179
5 years ago
Elham Rababah 1b1e8f0712 second step from patient provider 5 years ago
hussam al-habibeh 6f90c31f9f patients_screen design update 5 years ago
Elham Rababah 6ab73916eb first step from patient provider 5 years ago
mosazaid e5341e3031 Merge branch 'development' into replay-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/screens/patients/patients_screen.dart
5 years ago
mosazaid f9ae2559f0 working on referral reply screen 5 years ago
Elham 664d2b5c2b Merge branch 'design-updates' into 'development'
patients out and patients in screens design updates

See merge request Cloud_Solution/doctor_app_flutter!177
5 years ago
mosazaid a55b605a6c Merge branch 'development' into replay-design 5 years ago
mosazaid 5ed9aea5a7 fix HexColor library error 5 years ago
hussam al-habibeh 6bbc629060 patients out and patients in screens design updates 5 years ago
Elham Rababah b9bf315199 fast fix 5 years ago
Elham Rababah 58de54997a refactor search medicine Service 5 years ago
Elham Rababah 7863f13b0e Merge branches 'development' and 'refactor' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into refactor 5 years ago
Elham Rababah 45cde2cb72 refactor Referred Patient Service 5 years ago
Elham f641698d6c Merge branch 'refactor' into 'development'
refactor  Referral Patient Service

See merge request Cloud_Solution/doctor_app_flutter!174
5 years ago
hussam al-habibeh 911921e0b8 in-patient && out-patient 5 years ago
Elham Rababah df9d151f46 refactor Referral Patient Service 5 years ago
Elham Rababah 6e461f7212 refactor Schedule service 5 years ago
Elham Rababah 0c7c4d7dae refactor doctor replay service 5 years ago
Mohammad Aljammal 3cedf3c927 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_mvvm
 Conflicts:
	lib/providers/medicine_provider.dart
5 years ago
Mohammad Aljammal e6edd5449f Add MVVM 5 years ago
Elham Rababah 91cc76a9cf medicine search fix bugs = 5 years ago
Elham Rababah ec3b69f0cb The Patient services Names the words should be in separate line. 5 years ago
Elham Rababah 53862ec1b3 fix bugs in patient search 5 years ago
Elham Rababah 716cb28bf1 fix issue on vital_sign_res_model.dart 5 years ago
Elham Rababah f1721b686d fix loader inside pharmacies_list 5 years ago
Elham Rababah 9a18c405c7 comment code not working in good way until we fixed 5 years ago
Elham Rababah 1ad3652913 Fix issue related to pharmacies_list_screen.dart 5 years ago
Elham Rababah 51206c1164 fix auth with mohammad help 5 years ago
Elham Rababah b308dc5826 change doctor app icons and optimization 6 years ago
Elham Rababah 8980fc03aa Finish Patient search design 6 years ago
Elham Rababah 0d8455faa7 Finish medicine search design 6 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad Aljammal 5eae2f9519 fix merge issues 6 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
6 years ago
Elham Rababah d28d2ecdeb add improvement dashboard screen design 6 years ago
Elham Rababah dff6c25031 add improvement dashboard screen design 6 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
hussam al-habibeh ba72d40deb Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
hussam al-habibeh b6d2cdb1db fixing clinic name in app reopening 6 years ago
hussam al-habibeh 0444d6803c verification Screen Fixed 6 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
hussam al-habibeh d449086f9a Fixing Clinic name in app reopening 6 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
6 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 6 years ago
Mohammad ALjammal d4b3e42070 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
Elham Rababah 287bb20d12 fix issues ios 6 years ago
Elham Rababah 28ffcb12a2 Merge branch 'open_tok_call_back' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 6ea72f5ffa make things daynamic 6 years ago
Mohammad ALjammal d5825ccb85 fix issues 6 years ago
Mohammad ALjammal d22ce32cdb add call back android 6 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 6 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 6 years ago
hussam al-habibeh 629ccbeda8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
hussam al-habibeh d866d8b9de get clinic list 6 years ago
Mohammad Aljammal 9dc1c27334 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!143
6 years ago
Sultan Khan 8a9d20990b Video call page updated 6 years ago
Sultan Khan cad6892c8b Video call page updated 6 years ago
ibrahim albitar 98950890a0 Add User Guid Module 6 years ago
Sultan Khan b66eebfd10 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3b0aff2efa overflow issue and model mapped 6 years ago
Mohammad ALjammal eb2995ea25 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/auth_provider.dart
	lib/util/helpers.dart
6 years ago
Elham 8bff0e1504 Merge branch 'elham' into 'development'
fix lang in clinic name & get profile

See merge request Cloud_Solution/doctor_app_flutter!141
6 years ago
Elham Rababah ec4a784b9b fix lang in clinic name & get profile 6 years ago
Mohammad ALjammal c671059a03 fix issues in video call 6 years ago
Mohammad ALjammal 270d7ffa6d Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/main.dart
6 years ago
Mohammad ALjammal a51a312eb4 fix base app client 6 years ago
Mohammad ALjammal 7cc1c36ab4 change Medicine Provider to use BaseAppClient 6 years ago
Sultan Khan dd3154a498 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
6 years ago