diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index 12acdbd..89323a1 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_secure_storage","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.1.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_darwin","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_darwin-1.6.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_ios-1.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.2/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.4/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_plugin_android_lifecycle","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.30/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_android","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_android-7.0.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_android","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_android-1.0.52/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"],"dev_dependency":false},{"name":"open_file_android","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_android-1.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_android-2.2.18/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.12/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.20/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_secure_storage_macos","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.1.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_darwin","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_darwin-1.6.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_mac","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_mac-1.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.2/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.3/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_linux-0.0.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_windows-1.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_windows-0.0.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.4/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","dependencies":[],"dev_dependency":false},{"name":"firebase_app_check_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check_web-0.2.0+16/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"firebase_auth_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth_web-6.0.2/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"firebase_core_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core_web-3.1.0/","dependencies":[],"dev_dependency":false},{"name":"firebase_messaging_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging_web-4.0.1/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"flutter_secure_storage_web","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1/","dependencies":[],"dev_dependency":false},{"name":"google_sign_in_web","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_web-1.0.0/","dependencies":[],"dev_dependency":false},{"name":"open_file_web","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_web-0.0.4/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","dependencies":[],"dev_dependency":false},{"name":"shared_preferences_web","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.1/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_app_check","dependencies":["firebase_app_check_web","firebase_core"]},{"name":"firebase_app_check_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":["path_provider"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"local_auth","dependencies":["local_auth_android","local_auth_darwin","local_auth_windows"]},{"name":"local_auth_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"local_auth_darwin","dependencies":[]},{"name":"local_auth_windows","dependencies":[]},{"name":"open_file","dependencies":["open_file_android","open_file_web","open_file_ios","open_file_mac","open_file_windows","open_file_linux"]},{"name":"open_file_android","dependencies":[]},{"name":"open_file_ios","dependencies":[]},{"name":"open_file_linux","dependencies":[]},{"name":"open_file_mac","dependencies":[]},{"name":"open_file_web","dependencies":[]},{"name":"open_file_windows","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2025-10-25 15:59:36.526728","version":"3.32.1","swift_package_manager_enabled":{"ios":false,"macos":false}}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_secure_storage","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.1.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_darwin","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_darwin-1.6.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_ios-1.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.2/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_ios-6.3.4/","native_build":true,"dependencies":[],"dev_dependency":false}],"android":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_plugin_android_lifecycle","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.30/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage-9.2.4/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_android","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_android-7.0.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_android","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_android-1.0.52/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"],"dev_dependency":false},{"name":"open_file_android","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_android-1.0.6/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_android","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_android-2.2.18/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_android","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_android-2.4.12/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_android","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_android-6.3.20/","native_build":true,"dependencies":[],"dev_dependency":false}],"macos":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_app_check","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check-0.4.0+1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"firebase_messaging","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging-16.0.1/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"flutter_secure_storage_macos","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_macos-3.1.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"google_sign_in_ios","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_ios-6.1.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_darwin","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_darwin-1.6.0/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_mac","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_mac-1.0.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"path_provider_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_foundation-2.4.2/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_foundation","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_foundation-2.5.4/","shared_darwin_source":true,"native_build":true,"dependencies":[],"dev_dependency":false},{"name":"url_launcher_macos","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_macos-3.2.3/","native_build":true,"dependencies":[],"dev_dependency":false}],"linux":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_linux-0.0.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/","native_build":false,"dependencies":["path_provider_linux"],"dev_dependency":false},{"name":"url_launcher_linux","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.1/","native_build":true,"dependencies":[],"dev_dependency":false}],"windows":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"firebase_auth","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth-6.0.2/","native_build":true,"dependencies":["firebase_core"],"dev_dependency":false},{"name":"firebase_core","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core-4.1.0/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"flutter_secure_storage_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_windows-3.1.2/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"local_auth_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/local_auth_windows-1.0.11/","native_build":true,"dependencies":[],"dev_dependency":false},{"name":"open_file_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_windows-0.0.3/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"path_provider_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/path_provider_windows-2.3.0/","native_build":false,"dependencies":[],"dev_dependency":false},{"name":"shared_preferences_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.4.1/","native_build":false,"dependencies":["path_provider_windows"],"dev_dependency":false},{"name":"url_launcher_windows","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_windows-3.1.4/","native_build":true,"dependencies":[],"dev_dependency":false}],"web":[{"name":"connectivity_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/connectivity_plus-6.1.5/","dependencies":[],"dev_dependency":false},{"name":"file_picker","path":"/home/venba/.pub-cache/hosted/pub.dev/file_picker-10.3.3/","dependencies":[],"dev_dependency":false},{"name":"firebase_app_check_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_app_check_web-0.2.0+16/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"firebase_auth_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_auth_web-6.0.2/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"firebase_core_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_core_web-3.1.0/","dependencies":[],"dev_dependency":false},{"name":"firebase_messaging_web","path":"/home/venba/.pub-cache/hosted/pub.dev/firebase_messaging_web-4.0.1/","dependencies":["firebase_core_web"],"dev_dependency":false},{"name":"flutter_secure_storage_web","path":"/home/venba/.pub-cache/hosted/pub.dev/flutter_secure_storage_web-1.2.1/","dependencies":[],"dev_dependency":false},{"name":"google_sign_in_web","path":"/home/venba/.pub-cache/hosted/pub.dev/google_sign_in_web-1.0.0/","dependencies":[],"dev_dependency":false},{"name":"open_file_web","path":"/home/venba/.pub-cache/hosted/pub.dev/open_file_web-0.0.4/","dependencies":[],"dev_dependency":false},{"name":"package_info_plus","path":"/home/venba/.pub-cache/hosted/pub.dev/package_info_plus-8.3.1/","dependencies":[],"dev_dependency":false},{"name":"shared_preferences_web","path":"/home/venba/.pub-cache/hosted/pub.dev/shared_preferences_web-2.4.3/","dependencies":[],"dev_dependency":false},{"name":"url_launcher_web","path":"/home/venba/.pub-cache/hosted/pub.dev/url_launcher_web-2.4.1/","dependencies":[],"dev_dependency":false}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"firebase_app_check","dependencies":["firebase_app_check_web","firebase_core"]},{"name":"firebase_app_check_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":["path_provider"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"local_auth","dependencies":["local_auth_android","local_auth_darwin","local_auth_windows"]},{"name":"local_auth_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"local_auth_darwin","dependencies":[]},{"name":"local_auth_windows","dependencies":[]},{"name":"open_file","dependencies":["open_file_android","open_file_web","open_file_ios","open_file_mac","open_file_windows","open_file_linux"]},{"name":"open_file_android","dependencies":[]},{"name":"open_file_ios","dependencies":[]},{"name":"open_file_linux","dependencies":[]},{"name":"open_file_mac","dependencies":[]},{"name":"open_file_web","dependencies":[]},{"name":"open_file_windows","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_foundation","path_provider_linux","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_foundation","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_android","url_launcher_ios","url_launcher_linux","url_launcher_macos","url_launcher_web","url_launcher_windows"]},{"name":"url_launcher_android","dependencies":[]},{"name":"url_launcher_ios","dependencies":[]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2025-10-25 18:38:36.948788","version":"3.32.1","swift_package_manager_enabled":{"ios":false,"macos":false}}
\ No newline at end of file
diff --git a/lib/core/services/api_service.dart b/lib/core/services/api_service.dart
index c1fbe1e..498065d 100644
--- a/lib/core/services/api_service.dart
+++ b/lib/core/services/api_service.dart
@@ -764,9 +764,15 @@ class ApiService {
     //   '${Env.apiUrl}enquiry/enquiryList?$query&from_date=${fromDate ?? ''}&to_date=${toDate ?? ''}',
     // );
 
-    url = Uri.parse(
-      '${Env.apiUrl}enquiry/enquiryList?$query&from_date=${fromDate ?? ''}&to_date=${toDate ?? ''}&status=$selectedStatus&staff_id=$selectedStaffId',
-    );
+    if (role == 'staff') {
+      url = Uri.parse(
+        '${Env.apiUrl}enquiry/enquiryList?$query&from_date=${fromDate ?? ''}&to_date=${toDate ?? ''}&status=$selectedStatus',
+      );
+    } else {
+      url = Uri.parse(
+        '${Env.apiUrl}enquiry/enquiryList?$query&from_date=${fromDate ?? ''}&to_date=${toDate ?? ''}&status=$selectedStatus&staff_id=$selectedStaffId',
+      );
+    }
 
     // if (role == 'manager') {
     //   url = Uri.parse('${Env.apiUrl}enquiry/enquiryList?manager_id=$id');
diff --git a/lib/presentation/screens/Enquiry/enquiryList.dart b/lib/presentation/screens/Enquiry/enquiryList.dart
index abdb23d..09549f0 100644
--- a/lib/presentation/screens/Enquiry/enquiryList.dart
+++ b/lib/presentation/screens/Enquiry/enquiryList.dart
@@ -111,18 +111,25 @@ class EnquiryListState extends ConsumerState<EnquiryList> {
     getStaffList(userId, roleId);
   }
 
-  void refrshfilterDateRange() {
-    setState(() {
-      SelectedStatus = '';
-      SelectedStaffId = null;
-      controllers['startDate']!.clear();
-      controllers['endDate']!.clear();
+  Future<void> refrshfilterDateRange() async {
+    // setState(() async {
+    final prefs = await SharedPreferences.getInstance();
 
-      controllers['startDate']?.text = '';
-      controllers['endDate']?.text = '';
-      // Reset the FormField validation
-      _formKey.currentState?.reset();
-    });
+    // ✅ Clear any old data
+    await prefs.remove('dashboardKeyProvider');
+    await prefs.remove('dashboardStatusProvider');
+    await prefs.remove('dashboardStaffIdProvider');
+    SelectedStatus = '';
+    SelectedStaffId = null;
+
+    controllers['startDate']!.clear();
+    controllers['endDate']!.clear();
+
+    controllers['startDate']?.text = '';
+    controllers['endDate']?.text = '';
+    // Reset the FormField validation
+    _formKey.currentState?.reset();
+    // });
     getStaffList(userId, roleId);
   }
 
@@ -184,12 +191,32 @@ class EnquiryListState extends ConsumerState<EnquiryList> {
       isLoading = true;
     });
 
+    dynamic fromDt;
+    dynamic toDt;
+
+    final fromDateVal = controllers['startDate']?.text ?? '';
+    final toDateVal = controllers['endDate']?.text ?? '';
+    final dateFormat = DateFormat('dd-MM-yyyy');
+
+    if (fromDateVal == '' && toDateVal == '') {
+      print("ENQ LIST PAGE");
+
+      final today = DateTime.now();
+      fromDt = dateFormat.format(today.subtract(Duration(days: 15)));
+      toDt = dateFormat.format(today);
+
+      print('Enq FROM TO - $fromDt - $toDt');
+    } else {
+      fromDt = fromDateVal;
+      toDt = toDateVal;
+    }
+
     try {
       final response = await apiService.fetchEnquiryList(
         managerId,
         role,
-        fromDate: controllers['startDate']?.text ?? '',
-        toDate: controllers['endDate']?.text ?? '',
+        fromDate: fromDt,
+        toDate: toDt,
         selectedStatus: SelectedStatus != null ? SelectedStatus : '',
         selectedStaffId: SelectedStaffId ?? '',
       );
diff --git a/lib/presentation/screens/UserManagement/Staff/staff.dart b/lib/presentation/screens/UserManagement/Staff/staff.dart
index f190420..27fae6d 100644
--- a/lib/presentation/screens/UserManagement/Staff/staff.dart
+++ b/lib/presentation/screens/UserManagement/Staff/staff.dart
@@ -548,6 +548,9 @@ class StaffState extends ConsumerState<Staff> {
     } else {
       showHandler = false;
     }
+
+    final isReadOnly = widget.id != null;
+
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
@@ -562,81 +565,88 @@ class StaffState extends ConsumerState<Staff> {
               ? null
               : MediaQuery.of(context).size.width * 0.26,
           // height: 40,
-          child: DropdownSearch<Map<String, dynamic>>(
-            key: dropDownKey,
-            selectedItem: selectedroleVal.isNotEmpty ? selectedroleVal : null,
-            items: (filter, infiniteScrollProps) {
-              return filteredRolesData;
-            },
+          child: AbsorbPointer(
+            absorbing: isReadOnly,
+            child: DropdownSearch<Map<String, dynamic>>(
+              key: dropDownKey,
+              selectedItem: selectedroleVal.isNotEmpty ? selectedroleVal : null,
+              items: (filter, infiniteScrollProps) {
+                return filteredRolesData;
+              },
 
-            itemAsString: (val) => val['role'].toString(), // what to show
-            compareFn: (item, selectedItem) =>
-                item['id'] == selectedItem['id'], // ✅ compare by id
-            validator: (val) {
-              if (val == null) {
-                return "Required"; // ✅ error message
-              }
-              return null;
-            },
-            decoratorProps: DropDownDecoratorProps(
-              decoration:
-                  AppInputDecorations.dropdownDecoration(
-                    label: "Select Role",
-                  ).copyWith(
-                    filled: true,
-                    fillColor:
-                        Colors.white, // 👈 makes the dropdown input white
-                  ),
-            ),
-
-            popupProps: PopupProps.menu(
-              fit: FlexFit.loose,
-              constraints: BoxConstraints(maxHeight: 250),
-              menuProps: MenuProps(
-                backgroundColor:
-                    Colors.white, // 👈 sets dropdown background to white
+              itemAsString: (val) => val['role'].toString(), // what to show
+              compareFn: (item, selectedItem) =>
+                  item['id'] == selectedItem['id'], // ✅ compare by id
+              validator: (val) {
+                if (val == null) {
+                  return "Required"; // ✅ error message
+                }
+                return null;
+              },
+              decoratorProps: DropDownDecoratorProps(
+                decoration:
+                    AppInputDecorations.dropdownDecoration(
+                      label: "Select Role",
+                    ).copyWith(
+                      filled: true,
+                      fillColor:
+                          Colors.white, // 👈 makes the dropdown input white
+                    ),
               ),
-              showSearchBox: true,
-              searchFieldProps: TextFieldProps(
-                decoration: InputDecoration(
-                  filled: true,
-                  fillColor: Colors.white,
-                  hintText: "Search Role...",
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                      color: Colors.white,
-                    ), // 👈 Normal border
-                  ),
-                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                      color: Colors.white,
-                      width: 1.5,
-                    ), // 👈 Focused border
+
+              popupProps: PopupProps.menu(
+                fit: FlexFit.loose,
+                constraints: BoxConstraints(maxHeight: 250),
+                menuProps: MenuProps(
+                  backgroundColor:
+                      Colors.white, // 👈 sets dropdown background to white
+                ),
+                showSearchBox: true,
+
+                searchFieldProps: TextFieldProps(
+                  decoration: InputDecoration(
+                    filled: true,
+                    fillColor: Colors.white,
+                    hintText: "Search Role...",
+                    enabledBorder: OutlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.white,
+                      ), // 👈 Normal border
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.white,
+                        width: 1.5,
+                      ), // 👈 Focused border
+                    ),
+                    enabled: widget.id == null,
                   ),
                 ),
+                // constraints: BoxConstraints(),
               ),
-              // constraints: BoxConstraints(),
+
+              onChanged: widget.id != null
+                  ? null
+                  : (val) {
+                      if (val != null) {
+                        print("Selected Role : ${val['role']}");
+                        print("Id: ${val['id']}");
+                        selectedRole = val['id'];
+                        if (val['role'] == 'Staff') {
+                          setState(() {
+                            showHandler = true;
+                          });
+                        } else {
+                          setState(() {
+                            showHandler = false;
+                          });
+                        }
+
+                        // controllers['agentId']?.text = val['agent_code'];
+                        // agentId = agent['id'];
+                      }
+                    },
             ),
-
-            onChanged: (val) {
-              if (val != null) {
-                print("Selected Role : ${val['role']}");
-                print("Id: ${val['id']}");
-                selectedRole = val['id'];
-                if (val['role'] == 'Staff') {
-                  setState(() {
-                    showHandler = true;
-                  });
-                } else {
-                  setState(() {
-                    showHandler = false;
-                  });
-                }
-
-                // controllers['agentId']?.text = val['agent_code'];
-                // agentId = agent['id'];
-              }
-            },
           ),
         ),
       ],
@@ -648,6 +658,7 @@ class StaffState extends ConsumerState<Staff> {
       (item) => item['id'].toString() == selectedHandler,
       orElse: () => {},
     );
+    final isReadOnly = widget.id != null;
 
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -663,73 +674,76 @@ class StaffState extends ConsumerState<Staff> {
               ? null
               : MediaQuery.of(context).size.width * 0.26,
           // height: 40,
-          child: DropdownSearch<Map<String, dynamic>>(
-            key: dropDownKeyHandler,
-            selectedItem: selectedHandlered.isNotEmpty
-                ? selectedHandlered
-                : null,
-            items: (filter, infiniteScrollProps) {
-              return filteredHandlersData;
-            },
+          child: AbsorbPointer(
+            absorbing: isReadOnly,
+            child: DropdownSearch<Map<String, dynamic>>(
+              key: dropDownKeyHandler,
+              selectedItem: selectedHandlered.isNotEmpty
+                  ? selectedHandlered
+                  : null,
+              items: (filter, infiniteScrollProps) {
+                return filteredHandlersData;
+              },
 
-            itemAsString: (val) => val['name'].toString(), // what to show
-            compareFn: (item, selectedItem) =>
-                item['id'] == selectedItem['id'], // ✅ compare by id
-            validator: (val) {
-              if (val == null) {
-                return "Required"; // ✅ error message
-              }
-              return null;
-            },
-            decoratorProps: DropDownDecoratorProps(
-              decoration:
-                  AppInputDecorations.dropdownDecoration(
-                    label: "Select Handler",
-                  ).copyWith(
-                    filled: true,
-                    fillColor:
-                        Colors.white, // 👈 makes the dropdown input white
-                  ),
-            ),
-
-            popupProps: PopupProps.menu(
-              fit: FlexFit.loose,
-              constraints: BoxConstraints(maxHeight: 250),
-              menuProps: MenuProps(
-                backgroundColor:
-                    Colors.white, // 👈 sets dropdown background to white
+              itemAsString: (val) => val['name'].toString(), // what to show
+              compareFn: (item, selectedItem) =>
+                  item['id'] == selectedItem['id'], // ✅ compare by id
+              validator: (val) {
+                if (val == null) {
+                  return "Required"; // ✅ error message
+                }
+                return null;
+              },
+              decoratorProps: DropDownDecoratorProps(
+                decoration:
+                    AppInputDecorations.dropdownDecoration(
+                      label: "Select Handler",
+                    ).copyWith(
+                      filled: true,
+                      fillColor:
+                          Colors.white, // 👈 makes the dropdown input white
+                    ),
               ),
-              showSearchBox: true,
-              searchFieldProps: TextFieldProps(
-                decoration: InputDecoration(
-                  filled: true,
-                  fillColor: Colors.white,
-                  hintText: "Search Handler...",
-                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                      color: Colors.white,
-                    ), // 👈 Normal border
-                  ),
-                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(
-                      color: Colors.white,
-                      width: 1.5,
-                    ), // 👈 Focused border
+
+              popupProps: PopupProps.menu(
+                fit: FlexFit.loose,
+                constraints: BoxConstraints(maxHeight: 250),
+                menuProps: MenuProps(
+                  backgroundColor:
+                      Colors.white, // 👈 sets dropdown background to white
+                ),
+                showSearchBox: true,
+                searchFieldProps: TextFieldProps(
+                  decoration: InputDecoration(
+                    filled: true,
+                    fillColor: Colors.white,
+                    hintText: "Search Handler...",
+                    enabledBorder: OutlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.white,
+                      ), // 👈 Normal border
+                    ),
+                    focusedBorder: OutlineInputBorder(
+                      borderSide: BorderSide(
+                        color: Colors.white,
+                        width: 1.5,
+                      ), // 👈 Focused border
+                    ),
                   ),
                 ),
+                // constraints: BoxConstraints(),
               ),
-              // constraints: BoxConstraints(),
-            ),
 
-            onChanged: (val) {
-              if (val != null) {
-                print("Selected Handler : ${val['name']}");
-                print("Id: ${val['id']}");
-                selectedHandler = val['id'];
-                // controllers['agentId']?.text = val['agent_code'];
-                // agentId = agent['id'];
-              }
-            },
+              onChanged: (val) {
+                if (val != null) {
+                  print("Selected Handler : ${val['name']}");
+                  print("Id: ${val['id']}");
+                  selectedHandler = val['id'];
+                  // controllers['agentId']?.text = val['agent_code'];
+                  // agentId = agent['id'];
+                }
+              },
+            ),
           ),
         ),
       ],
diff --git a/lib/presentation/screens/dashboard/dashboard.dart b/lib/presentation/screens/dashboard/dashboard.dart
index b90923c..64d7ea0 100644
--- a/lib/presentation/screens/dashboard/dashboard.dart
+++ b/lib/presentation/screens/dashboard/dashboard.dart
@@ -1353,7 +1353,7 @@ class othersPendings extends StatelessWidget {
                               handleDashboardNavigation(
                                 context,
                                 status: "Awaiting Proposal",
-                                staffId: row['staff_id'],
+                                staffId: row['staff_id'] ?? '',
                                 role: role,
                               );
                             },
@@ -1375,7 +1375,7 @@ class othersPendings extends StatelessWidget {
                               handleDashboardNavigation(
                                 context,
                                 status: "Proposal Created",
-                                staffId: row['staff_id'],
+                                staffId: row['staff_id'] ?? '',
                                 role: role,
                               );
                             },
@@ -1398,7 +1398,7 @@ class othersPendings extends StatelessWidget {
                               handleDashboardNavigation(
                                 context,
                                 status: "Proposal Accepted",
-                                staffId: row['staff_id'],
+                                staffId: row['staff_id'] ?? '',
                                 role: role,
                               );
                             },
@@ -1928,7 +1928,7 @@ class UnassignedEnq extends StatelessWidget {
 Future<void> handleDashboardNavigation(
   BuildContext context, {
   required String status,
-  required String staffId,
+  String? staffId,
   required String role,
 }) async {
   print('Dashboard Tap => Status: $status | Staff: $staffId');
@@ -1943,7 +1943,7 @@ Future<void> handleDashboardNavigation(
   // ✅ Save new values
   await prefs.setString('dashboardKeyProvider', 'fromDashboard');
   await prefs.setString('dashboardStatusProvider', status);
-  await prefs.setString('dashboardStaffIdProvider', staffId);
+  await prefs.setString('dashboardStaffIdProvider', staffId!);
 
   // ✅ Navigate
   if (role == 'manager') {
diff --git a/lib/presentation/screens/handler/enquiryList.dart b/lib/presentation/screens/handler/enquiryList.dart
index 493b52c..d006f99 100644
--- a/lib/presentation/screens/handler/enquiryList.dart
+++ b/lib/presentation/screens/handler/enquiryList.dart
@@ -89,7 +89,6 @@ class EnquiryHandlerState extends ConsumerState<EnquiryHandler> {
 
       if (managerId != null &&
           dashboardKey != null &&
-          dashboardKey == 'fromDashboard' &&
           dashboardStatus != null &&
           dashboardStaffId != null) {
         print("DASHBOARD STATus-$dashboardStatus -- $dashboardStaffId -");
@@ -143,11 +142,22 @@ class EnquiryHandlerState extends ConsumerState<EnquiryHandler> {
     // }
 
     // ✅ Call your API
-    getStaffList(managerId, roleId);
+    getStaffList(
+      managerId,
+      roleId,
+      SelectedStatus: SelectedStatus ?? '',
+      SelectedStaffId: SelectedStaffId ?? '',
+    );
   }
 
   void refrshfilterDateRange() {
-    setState(() {
+    setState(() async {
+      final prefs = await SharedPreferences.getInstance();
+
+      // ✅ Clear any old data
+      await prefs.remove('dashboardKeyProvider');
+      await prefs.remove('dashboardStatusProvider');
+      await prefs.remove('dashboardStaffIdProvider');
       SelectedStatus = '';
       SelectedStaffId = null;
       controllers['startDate']!.clear();
@@ -174,12 +184,34 @@ class EnquiryHandlerState extends ConsumerState<EnquiryHandler> {
       isLoading = true;
     });
 
+    dynamic fromDt;
+    dynamic toDt;
+
+    final fromDateVal = controllers['startDate']?.text ?? '';
+    final toDateVal = controllers['endDate']?.text ?? '';
+    final dateFormat = DateFormat('dd-MM-yyyy');
+
+    if (dashboardKey != 'fromDashboard' &&
+        fromDateVal == '' &&
+        toDateVal == '') {
+      print("ENQ LIST PAGE");
+
+      final today = DateTime.now();
+      fromDt = dateFormat.format(today.subtract(Duration(days: 15)));
+      toDt = dateFormat.format(today);
+
+      print('Enq FROM TO - $fromDt - $toDt');
+    } else {
+      fromDt = fromDateVal;
+      toDt = toDateVal;
+    }
+
     try {
       final response = await apiService.fetchEnquiryList(
         managerId,
         role,
-        fromDate: controllers['startDate']?.text ?? '',
-        toDate: controllers['endDate']?.text ?? '',
+        fromDate: fromDt,
+        toDate: toDt,
         selectedStatus: SelectedStatus != null ? SelectedStatus : '',
         selectedStaffId: SelectedStaffId ?? '',
       );
diff --git a/lib/presentation/screens/staff/Enquiry/enquiry_list.dart b/lib/presentation/screens/staff/Enquiry/enquiry_list.dart
index 9077ec8..ebda11a 100644
--- a/lib/presentation/screens/staff/Enquiry/enquiry_list.dart
+++ b/lib/presentation/screens/staff/Enquiry/enquiry_list.dart
@@ -63,6 +63,7 @@ class EnquiryStaffState extends ConsumerState<EnquiryStaff> {
   List<Map<String, dynamic>> filteredData = [];
   bool isLoading = false;
   dynamic roleId;
+  dynamic dashboardKey;
 
   Map<String, TextEditingController> controllers = {};
   List<String> tabHeader = ['startDate', 'endDate'];
@@ -77,15 +78,49 @@ class EnquiryStaffState extends ConsumerState<EnquiryStaff> {
       controllers[field] = TextEditingController();
     }
 
-    Future.microtask(() {
+    Future.microtask(() async {
       final id = ref.read(managerIdProvider);
       roleId = ref.read(userRoleProvider);
       userId = ref.read(userIdProvider);
 
       print("C72 => r : $roleId | mId: $id | uId: $userId ");
-      if (userId != null) {
-        getStaffList(userId, roleId);
+
+      final prefs = await SharedPreferences.getInstance();
+      dashboardKey = prefs.getString('dashboardKeyProvider');
+      final dashboardStatus = prefs.getString('dashboardStatusProvider');
+      final dashboardStaffId = prefs.getString('dashboardStaffIdProvider');
+      // handlerId = ref.read(handlerIdProvider);
+
+      print('dashboardKey - $dashboardKey');
+      print('dashboardStatus - $dashboardStatus');
+      print('dashboardStaffId - $dashboardStaffId');
+
+      if (userId != null &&
+          dashboardKey != null &&
+          dashboardKey == 'fromDashboard' &&
+          dashboardStatus != null &&
+          dashboardStaffId != null) {
+        print("DASHBOARD STATus-$dashboardStatus -- $dashboardStaffId -");
+        SelectedStatus = dashboardStatus;
+        SelectedStaffId = dashboardStaffId;
+        getStaffList(
+          userId,
+          roleId,
+          SelectedStatus: dashboardStatus,
+          SelectedStaffId: dashboardStaffId,
+        );
+      } else {
+        print('ELSE');
+        getStaffList(
+          userId,
+          roleId,
+          SelectedStatus: SelectedStatus ?? '',
+          SelectedStaffId: SelectedStaffId ?? '',
+        );
       }
+      // if (userId != null) {
+      //   getStaffList(userId, roleId);
+      // }
     });
   }
 
@@ -96,7 +131,12 @@ class EnquiryStaffState extends ConsumerState<EnquiryStaff> {
 
     print("C82 => r : $roleId | mId: $id | uId: $userId ");
     if (userId != null) {
-      getStaffList(userId, roleId);
+      getStaffList(
+        userId,
+        roleId,
+        SelectedStatus: SelectedStatus ?? '',
+        SelectedStaffId: SelectedStaffId ?? '',
+      );
     }
   }
 
@@ -148,26 +188,47 @@ class EnquiryStaffState extends ConsumerState<EnquiryStaff> {
     //   return;
     // }
     // ✅ Call your API
-    getStaffList(userId, roleId);
+    getStaffList(
+      userId,
+      roleId,
+      SelectedStatus: SelectedStatus ?? '',
+      SelectedStaffId: SelectedStaffId ?? '',
+    );
   }
 
-  void refrshfilterDateRange() {
+  Future<void> refrshfilterDateRange() async {
     print('refrshfilterDateRange--1');
-    setState(() {
-      SelectedStatus = '';
-      SelectedStaffId = null;
+    // setState(() async {
+    final prefs = await SharedPreferences.getInstance();
 
-      print('refrshselectedStaff - $SelectedStaffId');
-      print('refrshfilterDateRange--1 - $SelectedStatus');
-      controllers['startDate']!.clear();
-      controllers['endDate']!.clear();
+    // ✅ Clear any old data
+    await prefs.remove('dashboardKeyProvider');
+    await prefs.remove('dashboardStatusProvider');
+    await prefs.remove('dashboardStaffIdProvider');
+    SelectedStatus = '';
+    SelectedStaffId = null;
 
-      controllers['startDate']?.text = '';
-      controllers['endDate']?.text = '';
-      // Reset the FormField validation
-      _formKey.currentState?.reset();
-    });
-    getStaffList(userId, roleId);
+    print('refrshselectedStaff - $SelectedStaffId');
+    print('refrshfilterDateRange--1 - $SelectedStatus');
+    controllers['startDate']!.clear();
+    print('1');
+    controllers['endDate']!.clear();
+    print('2');
+    controllers['startDate']?.text = '';
+    print('3');
+    controllers['endDate']?.text = '';
+    print('4');
+    // Reset the FormField validation
+    _formKey.currentState?.reset();
+    print('5');
+    // });
+    print('6');
+    getStaffList(
+      userId,
+      roleId,
+      SelectedStatus: SelectedStatus ?? '',
+      SelectedStaffId: SelectedStaffId ?? '',
+    );
   }
 
   Future<void> getStaffList(
@@ -175,18 +236,44 @@ class EnquiryStaffState extends ConsumerState<EnquiryStaff> {
     role, {
     String fromDate = '',
     String toDate = '',
+    String SelectedStatus = '',
+    String SelectedStaffId = '',
   }) async {
     print('C89 => Fns called => $managerId | $role');
     setState(() {
       isLoading = true;
     });
 
+    dynamic fromDt;
+    dynamic toDt;
+
+    final fromDateVal = controllers['startDate']?.text ?? '';
+    final toDateVal = controllers['endDate']?.text ?? '';
+    final dateFormat = DateFormat('dd-MM-yyyy');
+
+    if (dashboardKey != 'fromDashboard' &&
+        fromDateVal == '' &&
+        toDateVal == '') {
+      print("ENQ LIST PAGE");
+
+      final today = DateTime.now();
+      fromDt = dateFormat.format(today.subtract(Duration(days: 15)));
+      toDt = dateFormat.format(today);
+
+      print('Enq FROM TO - $fromDt - $toDt');
+    } else {
+      fromDt = fromDateVal;
+      toDt = toDateVal;
+    }
+
     try {
       final response = await apiService.fetchPolicyList(
         managerId,
         role,
-        fromDate: controllers['startDate']?.text ?? '',
-        toDate: controllers['endDate']?.text ?? '',
+        fromDate: fromDt,
+        toDate: toDt,
+        // fromDate: controllers['startDate']?.text ?? '',
+        // toDate: controllers['endDate']?.text ?? '',
         selectedStatus: SelectedStatus ?? '',
         selectedStaffId: SelectedStaffId ?? '',
       );
diff --git a/lib/presentation/screens/staff/Enquiry/tabs/policyTab.dart b/lib/presentation/screens/staff/Enquiry/tabs/policyTab.dart
index dc0f57c..4fca4fc 100644
--- a/lib/presentation/screens/staff/Enquiry/tabs/policyTab.dart
+++ b/lib/presentation/screens/staff/Enquiry/tabs/policyTab.dart
@@ -1,5 +1,6 @@
 // import 'dart:io' as html;
 import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
 import 'package:http/http.dart' as http;
 import 'package:dropdown_search/dropdown_search.dart';
 import 'package:flutter/cupertino.dart';
@@ -8,6 +9,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:intl/intl.dart';
+import 'package:nhance_partner/presentation/providers/userRoleProvider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'package:toastification/toastification.dart';
@@ -94,6 +96,8 @@ class PolicyStaffTabState extends ConsumerState<PolicyStaffTab> {
   dynamic acceptedQuotationId;
   dynamic choosedPolcyId;
 
+  dynamic roleId;
+
   List<Map<String, dynamic>> getVehicleTypeData = [];
   List<Map<String, dynamic>> filteredVechicleData = [];
 
@@ -152,6 +156,7 @@ class PolicyStaffTabState extends ConsumerState<PolicyStaffTab> {
     Future.microtask(() {
       managerId = ref.read(managerIdProvider); // ✅ use read
       userId = ref.read(userIdProvider); // ✅ use read
+      roleId = ref.read(userRoleProvider); // ✅ use read
       print('QmanagerId - $managerId');
       print('QuserId - $userId');
       enqQuotation = ref.read(quotationStaffIdProvider); // ✅ use read
@@ -541,7 +546,7 @@ class PolicyStaffTabState extends ConsumerState<PolicyStaffTab> {
                   // const SizedBox(height: 20),
 
                   //confirm button
-                  if (!hasPolicyData) ...[
+                  if (!hasPolicyData && roleId != 'manager') ...[
                     Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
@@ -1010,6 +1015,9 @@ class PolicyStaffTabState extends ConsumerState<PolicyStaffTab> {
         ThemedFormField(
           controller: controllers['policyNumber']!,
           validator: (value) => Validators.requiredField(value, "policyNumber"),
+          inputFormatters: [
+            FilteringTextInputFormatter.allow(RegExp(r'[a-zA-Z 0-9]')),
+          ],
           txtwidth: ResponsiveLayout.isMobile(context)
               ? null
               : MediaQuery.of(context).size.width * 0.26,
diff --git a/lib/presentation/screens/staff/Enquiry/tabs/quotationTab.dart b/lib/presentation/screens/staff/Enquiry/tabs/quotationTab.dart
index c4bd15b..3e3a5f5 100644
--- a/lib/presentation/screens/staff/Enquiry/tabs/quotationTab.dart
+++ b/lib/presentation/screens/staff/Enquiry/tabs/quotationTab.dart
@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:nhance_partner/presentation/providers/userRoleProvider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../../../../../core/routing/routes.dart';
@@ -69,6 +70,7 @@ class QuotationStaffTabState extends ConsumerState<QuotationStaffTab> {
   Map<String, TextEditingController> controllers = {};
   String? _token;
   dynamic userId;
+  dynamic roleId;
   dynamic selectedEnquiryId;
   dynamic managerId;
   dynamic enqQuotation;
@@ -134,9 +136,11 @@ class QuotationStaffTabState extends ConsumerState<QuotationStaffTab> {
     Future.microtask(() {
       managerId = ref.read(managerIdProvider); // ✅ use read
       userId = ref.read(userIdProvider); // ✅ use read
+      roleId = ref.read(userRoleProvider); // ✅ use read
 
       print('QmanagerId - $managerId');
       print('QuserId - $userId');
+      print('QroleId - $roleId');
       enqQuotation = ref.read(quotationStaffIdProvider); // ✅ use read
       print('QenqQuotation - $enqQuotation');
       if (enqQuotation != null) {
@@ -262,7 +266,7 @@ class QuotationStaffTabState extends ConsumerState<QuotationStaffTab> {
       //   scrollDirection: Axis.vertical,
       child: Column(
         children: [
-          if (!blockKey) ...[
+          if (!blockKey && roleId != 'manager') ...[
             CreateQuotationForm(
               key: ValueKey(selectedQuotationFrmListId ?? "new"),
               userId: userId,