From 11f910bb1cd1adc05d8eab0ac30723f11f8dc883 Mon Sep 17 00:00:00 2001 From: Odein Date: Thu, 26 Oct 2023 15:04:34 +0430 Subject: [PATCH] beta commit --- .gitignore | 74 +- .metadata | 24 +- .vscode/launch.json | 24 +- README.md | 32 +- analysis_options.yaml | 27 + android/.gitignore | 14 +- android/app/build.gradle | 135 +- android/app/lint-baseline.xml | 15 + android/app/src/debug/AndroidManifest.xml | 14 +- android/app/src/main/AndroidManifest.xml | 62 +- .../kotlin/com/example/cssd/MainActivity.kt | 24 +- .../main/res/drawable/launch_background.xml | 24 +- android/app/src/main/res/values/styles.xml | 16 +- android/app/src/profile/AndroidManifest.xml | 14 +- android/build.gradle | 6 +- android/gradle.properties | 8 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 30 +- android/settings_aar.gradle | 2 +- assets/Icons/cable.svg | 126 +- assets/Icons/calendar.svg | 224 +-- ios/.gitignore | 64 +- ios/Flutter/AppFrameworkInfo.plist | 52 +- ios/Flutter/Debug.xcconfig | 3 +- ios/Flutter/Release.xcconfig | 3 +- ios/Podfile | 44 + ios/Runner.xcodeproj/project.pbxproj | 1036 ++++++------ .../contents.xcworkspacedata | 14 +- .../xcshareddata/xcschemes/Runner.xcscheme | 182 +- .../contents.xcworkspacedata | 14 +- ios/Runner/AppDelegate.swift | 26 +- .../AppIcon.appiconset/Contents.json | 244 +-- .../LaunchImage.imageset/Contents.json | 46 +- .../LaunchImage.imageset/README.md | 8 +- ios/Runner/Base.lproj/LaunchScreen.storyboard | 74 +- ios/Runner/Base.lproj/Main.storyboard | 52 +- ios/Runner/Info.plist | 90 +- lib/config/colors.dart | 14 + lib/config/routes.dart | 77 +- lib/config/urls.dart | 247 ++- lib/config/user.dart | 22 +- lib/main.dart | 348 ++-- lib/models/connection_model.dart | 5 - lib/models/cycles_models.dart | 142 +- lib/models/item_model.dart | 111 ++ lib/models/label_models.dart | 144 +- lib/models/my_item_model.dart | 62 + lib/models/my_package_model.dart | 53 + lib/models/package_model.dart | 87 + lib/models/test_result_models.dart | 115 +- lib/models/users_model.dart | 24 + lib/pages/CyclePages/cycle_add_screen.dart | 343 ++++ .../{ => CyclePages}/cycle_detail_screen.dart | 173 +- lib/pages/CyclePages/cycle_filter_screen.dart | 351 ++++ lib/pages/CyclePages/cycle_result_screen.dart | 295 ++++ lib/pages/CyclePages/cycle_scan_screen.dart | 197 +++ lib/pages/CyclePages/cycle_update_screen.dart | 281 ++++ lib/pages/ItemPages/item_add_screen.dart | 342 ++++ lib/pages/ItemPages/item_detail_screen.dart | 90 + lib/pages/ItemPages/item_filter_screen.dart | 409 +++++ lib/pages/ItemPages/item_result_screen.dart | 294 ++++ lib/pages/ItemPages/item_scan_screen.dart | 195 +++ lib/pages/ItemPages/item_update_screen.dart | 316 ++++ lib/pages/LabelPages/label_add_screen.dart | 353 ++++ .../{ => LabelPages}/label_detail_screen.dart | 173 +- lib/pages/LabelPages/label_filter_screen.dart | 332 ++++ lib/pages/LabelPages/label_result_screen.dart | 195 +++ lib/pages/LabelPages/label_scan_screen.dart | 96 ++ lib/pages/LabelPages/label_update_screen.dart | 309 ++++ .../forget_pass_screen.dart | 394 +++-- .../LoginRegisterPages/login_screen.dart | 289 ++++ .../rePass_screen.dart | 482 +++--- .../{ => LoginRegisterPages}/register.dart | 760 ++++----- .../verify_pass_screen.dart | 390 +++-- .../Result/my_items_mine_screen.dart | 257 +++ .../Result/my_items_requests_screen.dart | 154 ++ .../Result/my_items_result_screen.dart | 75 + .../MyItemsPages/my_items_detail_screen.dart | 101 ++ .../MyItemsPages/my_items_filter_screen.dart | 359 ++++ .../MyItemsPages/my_items_history_screen.dart | 168 ++ .../my_items_transfer_screen.dart | 341 ++++ .../Result/my_packages_mine_screen.dart | 232 +++ .../Result/my_packages_requests_screen.dart | 155 ++ .../Result/my_packages_result_screen.dart | 75 + .../my_packages_detail_screen.dart | 101 ++ .../my_packages_filter_screen.dart | 253 +++ .../my_packages_history_screen.dart | 170 ++ .../my_packages_transfer_screen.dart | 343 ++++ .../PackagePages/package_add_screen.dart | 281 ++++ .../PackagePages/package_detail_screen.dart | 90 + .../PackagePages/package_filter_screen.dart | 296 ++++ .../PackagePages/package_result_screen.dart | 269 +++ .../PackagePages/package_scan_screen.dart | 195 +++ .../PackagePages/package_update_screen.dart | 240 +++ lib/pages/TestPages/test_add_screen.dart | 292 ++++ .../{ => TestPages}/test_detail_screen.dart | 153 +- lib/pages/TestPages/test_filter_screen.dart | 431 +++++ lib/pages/{ => TestPages}/test_form_page.dart | 399 ++--- lib/pages/TestPages/test_result_screen.dart | 449 +++++ lib/pages/TestPages/test_scan_screen.dart | 187 +++ .../{ => TestPages}/test_verify_screen.dart | 981 ++++++----- lib/pages/cycle_add_screen.dart | 291 ---- lib/pages/cycle_filter_screen.dart | 330 ---- lib/pages/cycle_result_screen.dart | 264 --- lib/pages/cycle_scan_screen.dart | 220 --- lib/pages/home_screen.dart | 946 +++++------ lib/pages/label_add_screen.dart | 281 ---- lib/pages/label_filter_screen.dart | 316 ---- lib/pages/label_result_screen.dart | 217 --- lib/pages/label_scan_screen.dart | 93 -- lib/pages/label_update_screen.dart | 305 ---- lib/pages/login_screen.dart | 297 ---- lib/pages/my_info_screen.dart | 369 +++-- lib/pages/test_add_screen.dart | 283 ---- lib/pages/test_filter_screen.dart | 423 ----- lib/pages/test_result_screen.dart | 454 ----- lib/pages/test_scan_screen.dart | 216 --- lib/providers/auth.dart | 504 +++--- lib/providers/connectivity.dart | 63 +- lib/providers/cycles.dart | 575 ++++--- lib/providers/input.dart | 256 ++- lib/providers/items.dart | 346 ++++ lib/providers/labels.dart | 561 ++++--- lib/providers/my_info.dart | 117 +- lib/providers/my_items.dart | 274 +++ lib/providers/my_packages.dart | 245 +++ lib/providers/packages.dart | 295 ++++ lib/providers/test_result_old.dart | 38 - lib/providers/test_results.dart | 748 +++++---- lib/providers/users.dart | 85 + lib/utils/scan.dart | 26 + .../CycleScreens/Add/add_label_box.dart | 463 +++--- .../CycleScreens/Add/cycle_update_button.dart | 94 ++ lib/widgets/CycleScreens/Add/date_picker.dart | 156 +- lib/widgets/CycleScreens/Add/save_button.dart | 183 +- .../CycleScreens/Details/datas_box.dart | 587 +++---- .../CycleScreens/Filter/date_picker.dart | 171 +- .../CycleScreens/Filter/save_button.dart | 179 +- .../CycleScreens/Filter/selector_box.dart | 257 ++- lib/widgets/CycleScreens/Result/banner.dart | 96 +- lib/widgets/CycleScreens/Result/data_box.dart | 345 ++-- .../CycleScreens/Result/filter_objects.dart | 224 ++- .../CycleScreens/Result/search_box.dart | 96 +- lib/widgets/Global/drawer.dart | 526 ++++-- lib/widgets/Global/input_box.dart | 101 +- lib/widgets/Global/internet_error.dart | 20 +- lib/widgets/Global/page_header.dart | 102 +- lib/widgets/Global/splash_screen.dart | 35 +- .../ItemScreens/Add/item_save_button.dart | 90 + .../ItemScreens/Add/item_update_button.dart | 90 + lib/widgets/ItemScreens/Add/upload_image.dart | 186 +++ .../ItemScreens/Details/item_detail_box.dart | 351 ++++ .../Filter/item_filter_button.dart | 98 ++ .../Filter/item_filter_object.dart | 76 + .../ItemScreens/Result/item_data_box.dart | 244 +++ .../LabelScreens/Add/add_package_box.dart | 212 +++ lib/widgets/LabelScreens/Add/date_picker.dart | 146 +- lib/widgets/LabelScreens/Add/save_button.dart | 183 +- .../LabelScreens/Add/selector_box.dart | 293 ++-- .../LabelScreens/Add/update_button.dart | 186 +-- .../LabelScreens/Detail/datas_box.dart | 602 +++---- lib/widgets/LabelScreens/Detail/header.dart | 72 +- .../LabelScreens/Filter/save_button.dart | 175 +- .../LabelScreens/Filter/selector_box.dart | 228 +-- lib/widgets/LabelScreens/Result/data_box.dart | 342 ++-- .../LabelScreens/Result/filter_chip_box.dart | 128 +- .../LabelScreens/Result/floating_buttons.dart | 124 +- .../LabelScreens/Result/search_box.dart | 96 +- lib/widgets/LabelScreens/Scan/input_box.dart | 108 +- .../LabelScreens/Scan/save_button.dart | 116 +- lib/widgets/LabelScreens/Scan/scan_box.dart | 176 +- lib/widgets/MyInfo/input_box.dart | 96 +- .../Detail/cancel_transfer_button.dart | 53 + .../Detail/my_items_detail_box_widget.dart | 536 ++++++ .../Detail/transfer_data_box.dart | 88 + .../Detail/transfer_destroy_button.dart | 47 + .../Filter/my_items_chip_widget.dart | 72 + .../Filter/my_items_filter_button.dart | 85 + .../History/my_items_history_date_widget.dart | 61 + .../Result/item_requests_data_box.dart | 236 +++ .../Result/my_items_data_box_widget.dart | 176 ++ .../Detail/my_packages_detail_box_widget.dart | 449 +++++ .../Filter/my_packages_chip_widget.dart | 64 + .../Filter/my_packages_filter_button.dart | 79 + .../my_packages_history_date_widget.dart | 61 + .../Result/my_packages_data_box_widget.dart | 153 ++ .../Result/package_requests_data_box.dart | 213 +++ .../Add/package_save_button.dart | 93 ++ .../Add/package_update_button.dart | 89 + .../Details/package_detail_box.dart | 290 ++++ .../PackageScreens/Filter/filter_button.dart | 89 + .../Filter/package_filter_object.dart | 68 + .../Result/package_data_box.dart | 204 +++ .../TestResultScreens/Add/capture_image.dart | 648 ++++---- .../TestResultScreens/Add/form_creator.dart | 1468 +++++++++-------- .../TestResultScreens/Add/save_button.dart | 114 +- .../TestResultScreens/Add/selector_box.dart | 269 +-- .../TestResultScreens/Details/datas_box.dart | 535 +++--- .../TestResultScreens/Filter/date_picker.dart | 150 +- .../Filter/drop_down_box.dart | 175 +- .../Filter/selector_box.dart | 260 +-- .../TestResultScreens/Main/add_button.dart | 70 +- .../Main/filter_chip_box.dart | 153 +- .../Main/floating_button.dart | 156 +- .../TestResultScreens/Main/search_box.dart | 96 +- macos/.gitignore | 7 + macos/Flutter/Flutter-Debug.xcconfig | 2 + macos/Flutter/Flutter-Release.xcconfig | 2 + macos/Flutter/GeneratedPluginRegistrant.swift | 18 + macos/Podfile | 43 + macos/Podfile.lock | 49 + macos/Runner.xcodeproj/project.pbxproj | 791 +++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 98 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 + .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 102994 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 5680 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 520 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 14142 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1066 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 36406 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 2218 bytes macos/Runner/Base.lproj/MainMenu.xib | 343 ++++ macos/Runner/Configs/AppInfo.xcconfig | 14 + macos/Runner/Configs/Debug.xcconfig | 2 + macos/Runner/Configs/Release.xcconfig | 2 + macos/Runner/Configs/Warnings.xcconfig | 13 + macos/Runner/DebugProfile.entitlements | 14 + macos/Runner/Info.plist | 32 + macos/Runner/MainFlutterWindow.swift | 15 + macos/Runner/Release.entitlements | 10 + macos/RunnerTests/RunnerTests.swift | 12 + pubspec.lock | 1381 +++++++++------- pubspec.yaml | 187 +-- test/widget_test.dart | 60 +- web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 59 + web/manifest.json | 35 + windows/.gitignore | 17 + windows/CMakeLists.txt | 102 ++ windows/flutter/CMakeLists.txt | 104 ++ .../flutter/generated_plugin_registrant.cc | 14 + windows/flutter/generated_plugin_registrant.h | 15 + windows/flutter/generated_plugins.cmake | 24 + windows/runner/CMakeLists.txt | 40 + windows/runner/Runner.rc | 121 ++ windows/runner/flutter_window.cpp | 71 + windows/runner/flutter_window.h | 33 + windows/runner/main.cpp | 43 + windows/runner/resource.h | 16 + windows/runner/runner.exe.manifest | 20 + windows/runner/utils.cpp | 65 + windows/runner/utils.h | 19 + windows/runner/win32_window.cpp | 288 ++++ windows/runner/win32_window.h | 102 ++ 262 files changed, 31865 insertions(+), 15718 deletions(-) create mode 100644 analysis_options.yaml create mode 100644 android/app/lint-baseline.xml create mode 100644 ios/Podfile create mode 100644 lib/config/colors.dart delete mode 100644 lib/models/connection_model.dart create mode 100644 lib/models/item_model.dart create mode 100644 lib/models/my_item_model.dart create mode 100644 lib/models/my_package_model.dart create mode 100644 lib/models/package_model.dart create mode 100644 lib/models/users_model.dart create mode 100644 lib/pages/CyclePages/cycle_add_screen.dart rename lib/pages/{ => CyclePages}/cycle_detail_screen.dart (76%) create mode 100644 lib/pages/CyclePages/cycle_filter_screen.dart create mode 100644 lib/pages/CyclePages/cycle_result_screen.dart create mode 100644 lib/pages/CyclePages/cycle_scan_screen.dart create mode 100644 lib/pages/CyclePages/cycle_update_screen.dart create mode 100644 lib/pages/ItemPages/item_add_screen.dart create mode 100644 lib/pages/ItemPages/item_detail_screen.dart create mode 100644 lib/pages/ItemPages/item_filter_screen.dart create mode 100644 lib/pages/ItemPages/item_result_screen.dart create mode 100644 lib/pages/ItemPages/item_scan_screen.dart create mode 100644 lib/pages/ItemPages/item_update_screen.dart create mode 100644 lib/pages/LabelPages/label_add_screen.dart rename lib/pages/{ => LabelPages}/label_detail_screen.dart (75%) create mode 100644 lib/pages/LabelPages/label_filter_screen.dart create mode 100644 lib/pages/LabelPages/label_result_screen.dart create mode 100644 lib/pages/LabelPages/label_scan_screen.dart create mode 100644 lib/pages/LabelPages/label_update_screen.dart rename lib/pages/{ => LoginRegisterPages}/forget_pass_screen.dart (83%) create mode 100644 lib/pages/LoginRegisterPages/login_screen.dart rename lib/pages/{ => LoginRegisterPages}/rePass_screen.dart (89%) rename lib/pages/{ => LoginRegisterPages}/register.dart (94%) rename lib/pages/{ => LoginRegisterPages}/verify_pass_screen.dart (87%) create mode 100644 lib/pages/MyItemsPages/Result/my_items_mine_screen.dart create mode 100644 lib/pages/MyItemsPages/Result/my_items_requests_screen.dart create mode 100644 lib/pages/MyItemsPages/Result/my_items_result_screen.dart create mode 100644 lib/pages/MyItemsPages/my_items_detail_screen.dart create mode 100644 lib/pages/MyItemsPages/my_items_filter_screen.dart create mode 100644 lib/pages/MyItemsPages/my_items_history_screen.dart create mode 100644 lib/pages/MyItemsPages/my_items_transfer_screen.dart create mode 100644 lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart create mode 100644 lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart create mode 100644 lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart create mode 100644 lib/pages/MyPackagesPages/my_packages_detail_screen.dart create mode 100644 lib/pages/MyPackagesPages/my_packages_filter_screen.dart create mode 100644 lib/pages/MyPackagesPages/my_packages_history_screen.dart create mode 100644 lib/pages/MyPackagesPages/my_packages_transfer_screen.dart create mode 100644 lib/pages/PackagePages/package_add_screen.dart create mode 100644 lib/pages/PackagePages/package_detail_screen.dart create mode 100644 lib/pages/PackagePages/package_filter_screen.dart create mode 100644 lib/pages/PackagePages/package_result_screen.dart create mode 100644 lib/pages/PackagePages/package_scan_screen.dart create mode 100644 lib/pages/PackagePages/package_update_screen.dart create mode 100644 lib/pages/TestPages/test_add_screen.dart rename lib/pages/{ => TestPages}/test_detail_screen.dart (71%) create mode 100644 lib/pages/TestPages/test_filter_screen.dart rename lib/pages/{ => TestPages}/test_form_page.dart (61%) create mode 100644 lib/pages/TestPages/test_result_screen.dart create mode 100644 lib/pages/TestPages/test_scan_screen.dart rename lib/pages/{ => TestPages}/test_verify_screen.dart (55%) delete mode 100644 lib/pages/cycle_add_screen.dart delete mode 100644 lib/pages/cycle_filter_screen.dart delete mode 100644 lib/pages/cycle_result_screen.dart delete mode 100644 lib/pages/cycle_scan_screen.dart delete mode 100644 lib/pages/label_add_screen.dart delete mode 100644 lib/pages/label_filter_screen.dart delete mode 100644 lib/pages/label_result_screen.dart delete mode 100644 lib/pages/label_scan_screen.dart delete mode 100644 lib/pages/label_update_screen.dart delete mode 100644 lib/pages/login_screen.dart delete mode 100644 lib/pages/test_add_screen.dart delete mode 100644 lib/pages/test_filter_screen.dart delete mode 100644 lib/pages/test_result_screen.dart delete mode 100644 lib/pages/test_scan_screen.dart create mode 100644 lib/providers/items.dart create mode 100644 lib/providers/my_items.dart create mode 100644 lib/providers/my_packages.dart create mode 100644 lib/providers/packages.dart delete mode 100644 lib/providers/test_result_old.dart create mode 100644 lib/providers/users.dart create mode 100644 lib/utils/scan.dart create mode 100644 lib/widgets/CycleScreens/Add/cycle_update_button.dart create mode 100644 lib/widgets/ItemScreens/Add/item_save_button.dart create mode 100644 lib/widgets/ItemScreens/Add/item_update_button.dart create mode 100644 lib/widgets/ItemScreens/Add/upload_image.dart create mode 100644 lib/widgets/ItemScreens/Details/item_detail_box.dart create mode 100644 lib/widgets/ItemScreens/Filter/item_filter_button.dart create mode 100644 lib/widgets/ItemScreens/Filter/item_filter_object.dart create mode 100644 lib/widgets/ItemScreens/Result/item_data_box.dart create mode 100644 lib/widgets/LabelScreens/Add/add_package_box.dart create mode 100644 lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart create mode 100644 lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart create mode 100644 lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart create mode 100644 lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart create mode 100644 lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart create mode 100644 lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart create mode 100644 lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart create mode 100644 lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart create mode 100644 lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart create mode 100644 lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart create mode 100644 lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart create mode 100644 lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart create mode 100644 lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart create mode 100644 lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart create mode 100644 lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart create mode 100644 lib/widgets/PackageScreens/Add/package_save_button.dart create mode 100644 lib/widgets/PackageScreens/Add/package_update_button.dart create mode 100644 lib/widgets/PackageScreens/Details/package_detail_box.dart create mode 100644 lib/widgets/PackageScreens/Filter/filter_button.dart create mode 100644 lib/widgets/PackageScreens/Filter/package_filter_object.dart create mode 100644 lib/widgets/PackageScreens/Result/package_data_box.dart create mode 100644 macos/.gitignore create mode 100644 macos/Flutter/Flutter-Debug.xcconfig create mode 100644 macos/Flutter/Flutter-Release.xcconfig create mode 100644 macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 macos/Podfile create mode 100644 macos/Podfile.lock create mode 100644 macos/Runner.xcodeproj/project.pbxproj create mode 100644 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 macos/Runner/AppDelegate.swift create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 macos/Runner/Base.lproj/MainMenu.xib create mode 100644 macos/Runner/Configs/AppInfo.xcconfig create mode 100644 macos/Runner/Configs/Debug.xcconfig create mode 100644 macos/Runner/Configs/Release.xcconfig create mode 100644 macos/Runner/Configs/Warnings.xcconfig create mode 100644 macos/Runner/DebugProfile.entitlements create mode 100644 macos/Runner/Info.plist create mode 100644 macos/Runner/MainFlutterWindow.swift create mode 100644 macos/Runner/Release.entitlements create mode 100644 macos/RunnerTests/RunnerTests.swift create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/manifest.json create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/flutter/CMakeLists.txt create mode 100644 windows/flutter/generated_plugin_registrant.cc create mode 100644 windows/flutter/generated_plugin_registrant.h create mode 100644 windows/flutter/generated_plugins.cmake create mode 100644 windows/runner/CMakeLists.txt create mode 100644 windows/runner/Runner.rc create mode 100644 windows/runner/flutter_window.cpp create mode 100644 windows/runner/flutter_window.h create mode 100644 windows/runner/main.cpp create mode 100644 windows/runner/resource.h create mode 100644 windows/runner/runner.exe.manifest create mode 100644 windows/runner/utils.cpp create mode 100644 windows/runner/utils.h create mode 100644 windows/runner/win32_window.cpp create mode 100644 windows/runner/win32_window.h diff --git a/.gitignore b/.gitignore index ae1f183..ac246c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,37 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Exceptions to above rules. -!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Web related +lib/generated_plugin_registrant.dart + +# Exceptions to above rules. +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/.metadata b/.metadata index 5d1241e..56b8ab2 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,27 @@ # This file should be version controlled and should not be manually edited. version: - revision: 9f5ff2306bb3e30b2b98eee79cd231b1336f41f4 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: ead455963c12b453cdb2358cad34969c76daf180 + base_revision: ead455963c12b453cdb2358cad34969c76daf180 + - platform: web + create_revision: ead455963c12b453cdb2358cad34969c76daf180 + base_revision: ead455963c12b453cdb2358cad34969c76daf180 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/.vscode/launch.json b/.vscode/launch.json index 3287bb6..5cda00e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,13 +1,13 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Flutter", - "request": "launch", - "type": "dart" - } - ] +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Flutter", + "request": "launch", + "type": "dart" + } + ] } \ No newline at end of file diff --git a/README.md b/README.md index a54c750..8c1c2a5 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -# CSSD - -A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) - -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +# CSSD + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) + +For help getting started with Flutter, view our +[online documentation](https://flutter.dev/docs), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/analysis_options.yaml b/analysis_options.yaml new file mode 100644 index 0000000..7b91d0d --- /dev/null +++ b/analysis_options.yaml @@ -0,0 +1,27 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +# include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at https://dart.dev/lints. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore index bc2100d..0b9e049 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,7 +1,7 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java diff --git a/android/app/build.gradle b/android/app/build.gradle index 49865d4..f5b082c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,67 +1,68 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion 28 - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - lintOptions { - disable 'InvalidPackage' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.cssd" - minSdkVersion 21 - targetSdkVersion 28 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' -} +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 33 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + lintOptions { + // disable 'InvalidPackage' + baseline(file("lint-baseline.xml")) + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.cssd" + minSdkVersion 21 + targetSdkVersion 28 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' +} diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml new file mode 100644 index 0000000..4f6d7b2 --- /dev/null +++ b/android/app/lint-baseline.xml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index e9b79e1..087b687 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 01d5a5a..5e21ae5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt b/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt index 9fb1905..83e08a2 100644 --- a/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt +++ b/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt @@ -1,12 +1,12 @@ -package com.example.cssd - -import androidx.annotation.NonNull; -import io.flutter.embedding.android.FlutterActivity -import io.flutter.embedding.engine.FlutterEngine -import io.flutter.plugins.GeneratedPluginRegistrant - -class MainActivity: FlutterActivity() { - override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { - GeneratedPluginRegistrant.registerWith(flutterEngine); - } -} +package com.example.cssd + +import androidx.annotation.NonNull; +import io.flutter.embedding.android.FlutterActivity +import io.flutter.embedding.engine.FlutterEngine +import io.flutter.plugins.GeneratedPluginRegistrant + +class MainActivity: FlutterActivity() { + override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) { + GeneratedPluginRegistrant.registerWith(flutterEngine); + } +} diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 304732f..8403758 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,12 +1,12 @@ - - - - - - - - + + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa441..4c57322 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index e9b79e1..087b687 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/android/build.gradle b/android/build.gradle index d47e9ee..f02d846 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.7.10' repositories { // google() maven { @@ -10,7 +10,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -34,6 +34,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d45..74c1d92 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ -org.gradle.jvmargs=-Xmx1536M -android.enableR8=true -android.useAndroidX=true -android.enableJetifier=true +org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14f..4f14f8e 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,15 @@ -include ':app' - -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() - -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } -} - -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +include ':app' + +def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + +def plugins = new Properties() +def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') +if (pluginsFile.exists()) { + pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } +} + +plugins.each { name, path -> + def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() + include ":$name" + project(":$name").projectDir = pluginDirectory +} diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle index e7b4def..d3db109 100644 --- a/android/settings_aar.gradle +++ b/android/settings_aar.gradle @@ -1 +1 @@ -include ':app' +include ':app' diff --git a/assets/Icons/cable.svg b/assets/Icons/cable.svg index 4b325d8..558ff5d 100644 --- a/assets/Icons/cable.svg +++ b/assets/Icons/cable.svg @@ -1,63 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/Icons/calendar.svg b/assets/Icons/calendar.svg index db9f571..5f6e7ea 100644 --- a/assets/Icons/calendar.svg +++ b/assets/Icons/calendar.svg @@ -1,112 +1,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/.gitignore b/ios/.gitignore index e96ef60..0f1df0f 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -1,32 +1,32 @@ -*.mode1v3 -*.mode2v3 -*.moved-aside -*.pbxuser -*.perspectivev3 -**/*sync/ -.sconsign.dblite -.tags* -**/.vagrant/ -**/DerivedData/ -Icon? -**/Pods/ -**/.symlinks/ -profile -xcuserdata -**/.generated/ -Flutter/App.framework -Flutter/Flutter.framework -Flutter/Flutter.podspec -Flutter/Generated.xcconfig -Flutter/app.flx -Flutter/app.zip -Flutter/flutter_assets/ -Flutter/flutter_export_environment.sh -ServiceDefinitions.json -Runner/GeneratedPluginRegistrant.* - -# Exceptions to above rules. -!default.mode1v3 -!default.mode2v3 -!default.pbxuser -!default.perspectivev3 +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f7..58e65f9 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -1,26 +1,26 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - App - CFBundleIdentifier - io.flutter.flutter.app - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - App - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - MinimumOSVersion - 8.0 - - + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 8.0 + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..dfd2626 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ -#include "Generated.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..a97381a 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ -#include "Generated.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..fdcc671 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,44 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '11.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 988ea38..8b956b6 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -1,518 +1,518 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; - 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; - 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 97C146EB1CF9000F007C117D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 9740EEB11CF90186004384FC /* Flutter */ = { - isa = PBXGroup; - children = ( - 3B80C3931E831B6300D905FE /* App.framework */, - 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, - 9740EEB21CF90195004384FC /* Debug.xcconfig */, - 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, - 9740EEB31CF90195004384FC /* Generated.xcconfig */, - ); - name = Flutter; - sourceTree = ""; - }; - 97C146E51CF9000F007C117D = { - isa = PBXGroup; - children = ( - 9740EEB11CF90186004384FC /* Flutter */, - 97C146F01CF9000F007C117D /* Runner */, - 97C146EF1CF9000F007C117D /* Products */, - ); - sourceTree = ""; - }; - 97C146EF1CF9000F007C117D /* Products */ = { - isa = PBXGroup; - children = ( - 97C146EE1CF9000F007C117D /* Runner.app */, - ); - name = Products; - sourceTree = ""; - }; - 97C146F01CF9000F007C117D /* Runner */ = { - isa = PBXGroup; - children = ( - 97C146FA1CF9000F007C117D /* Main.storyboard */, - 97C146FD1CF9000F007C117D /* Assets.xcassets */, - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, - 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, - 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, - 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, - 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, - 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, - ); - path = Runner; - sourceTree = ""; - }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - ); - name = "Supporting Files"; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 97C146ED1CF9000F007C117D /* Runner */ = { - isa = PBXNativeTarget; - buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; - buildPhases = ( - 9740EEB61CF901F6004384FC /* Run Script */, - 97C146EA1CF9000F007C117D /* Sources */, - 97C146EB1CF9000F007C117D /* Frameworks */, - 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Runner; - productName = Runner; - productReference = 97C146EE1CF9000F007C117D /* Runner.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 97C146E61CF9000F007C117D /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "The Chromium Authors"; - TargetAttributes = { - 97C146ED1CF9000F007C117D = { - CreatedOnToolsVersion = 7.3.1; - LastSwiftMigration = 1100; - }; - }; - }; - buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 97C146E51CF9000F007C117D; - productRefGroup = 97C146EF1CF9000F007C117D /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 97C146ED1CF9000F007C117D /* Runner */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 97C146EC1CF9000F007C117D /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, - 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Thin Binary"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; - }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 97C146EA1CF9000F007C117D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, - 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 97C146FA1CF9000F007C117D /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C146FB1CF9000F007C117D /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 97C147001CF9000F007C117D /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 249021D3217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Profile; - }; - 249021D4217E4FDB00AE95B9 /* Profile */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Profile; - }; - 97C147031CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 97C147041CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; - SUPPORTED_PLATFORMS = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 97C147061CF9000F007C117D /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Debug; - }; - 97C147071CF9000F007C117D /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; - SWIFT_VERSION = 5.0; - VERSIONING_SYSTEM = "apple-generic"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147031CF9000F007C117D /* Debug */, - 97C147041CF9000F007C117D /* Release */, - 249021D3217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 97C147061CF9000F007C117D /* Debug */, - 97C147071CF9000F007C117D /* Release */, - 249021D4217E4FDB00AE95B9 /* Profile */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 97C146E61CF9000F007C117D /* Project object */; -} +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B80C3931E831B6300D905FE /* App.framework */, + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEBA1CF902C7004384FC /* Flutter.framework */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = "The Chromium Authors"; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a1..59c6d39 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..be0b92e 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,91 +1,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..59c6d39 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 70693e4..3763683 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -1,13 +1,13 @@ -import UIKit -import Flutter - -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..1950fd8 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,122 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 0bedcf2..d08a4de 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -1,23 +1,23 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "LaunchImage.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "LaunchImage@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md index 89c2725..65a94b5 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -1,5 +1,5 @@ -# Launch Screen Assets - -You can customize the launch screen with your own desired assets by replacing the image files in this directory. - +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index f2e259c..497371e 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard index f3c2851..bbb83ca 100644 --- a/ios/Runner/Base.lproj/Main.storyboard +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -1,26 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index b522c75..88c0a29 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -1,45 +1,45 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - cssd - CFBundlePackageType - APPL - CFBundleShortVersionString - $(FLUTTER_BUILD_NAME) - CFBundleSignature - ???? - CFBundleVersion - $(FLUTTER_BUILD_NUMBER) - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + cssd + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/lib/config/colors.dart b/lib/config/colors.dart new file mode 100644 index 0000000..e26b401 --- /dev/null +++ b/lib/config/colors.dart @@ -0,0 +1,14 @@ +import 'package:flutter/material.dart'; + +const kLightBlue = Color(0xFF32CAD5); +const kLightBlueSub = Color(0xFF5FDDE7); +const kPink = Color(0xFFEE3552); +const kPinkSub = Color(0xFFFE687F); +const kBlue = Color(0xFF389ADC); +const kBlueSub = Color(0xFF60AFE2); +const kPurple = Color(0xFFAF3C77); +const kPurpleSub = Color(0xFFBB5B8D); +const kDarkBlue = Color(0xFF14537D); +const kDarkBlueSub = Color(0XFF668FAC); +const kDarkPurple = Color(0xFF862054); +const kDarkPurpleSub = Color(0xFFB75788); diff --git a/lib/config/routes.dart b/lib/config/routes.dart index 2f71a60..7d32664 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -1,27 +1,50 @@ -class Routes { - static const cycleAddScreen = '/CycleAddScreen'; - static const cycleDetailScreen = '/CycleDetailScreen'; - static const cycleFilterScreen = '/CycleFilterScreen'; - static const cycleResultScreen = '/CycleResultScreen'; - static const cycleScanScreen = '/CycleScanScreen'; - static const homePage = '/HomePage'; - static const labelAddScreen = '/LabelAddScreen'; - static const labelUpdateScreen = '/LabelUpdateScreen'; - static const labelDetailScreen = '/LabelDetailScreen'; - static const labelFilterScreen = '/LabelFilterScreen'; - static const labelResultScreen = '/LabelResultScreen'; - static const labelScanScreen = '/LabelScanScreen'; - static const loginScreen = '/LoginScreen'; - static const forgetPassScreen = '/ForgetPassScreen'; - static const sendCodeScreen = '/SendCodeScreen'; - static const rePassScreen = '/RePassScreen'; - static const myInfoScreen = '/MyInfoScreen'; - static const testResultAddScreen = '/TestResultAddScreen'; - static const testDetailsScreen = '/TestDetailsScreen'; - static const testFilterScreen = '/TestFilterScreen'; - static const testResultScreen = '/TestResultScreen'; - static const testVerifyScreen = '/TestVerifyScreen'; - static const testScanScreen = '/TestScanScreen'; - static const captureImageScreen = '/captureImageScreen'; - -} +class Routes { + static const cycleAddScreen = '/CycleAddScreen'; + static const cycleDetailScreen = '/CycleDetailScreen'; + static const cycleFilterScreen = '/CycleFilterScreen'; + static const cycleResultScreen = '/CycleResultScreen'; + static const cycleScanScreen = '/CycleScanScreen'; + static const homePage = '/HomePage'; + static const labelAddScreen = '/LabelAddScreen'; + static const labelUpdateScreen = '/LabelUpdateScreen'; + static const labelDetailScreen = '/LabelDetailScreen'; + static const labelFilterScreen = '/LabelFilterScreen'; + static const labelResultScreen = '/LabelResultScreen'; + static const labelScanScreen = '/LabelScanScreen'; + static const loginScreen = '/LoginScreen'; + static const forgetPassScreen = '/ForgetPassScreen'; + static const sendCodeScreen = '/SendCodeScreen'; + static const rePassScreen = '/RePassScreen'; + static const myInfoScreen = '/MyInfoScreen'; + static const testResultAddScreen = '/TestResultAddScreen'; + static const testDetailsScreen = '/TestDetailsScreen'; + static const testFilterScreen = '/TestFilterScreen'; + static const testResultScreen = '/TestResultScreen'; + static const testVerifyScreen = '/TestVerifyScreen'; + static const testScanScreen = '/TestScanScreen'; + static const captureImageScreen = '/captureImageScreen'; + static const packageAddScreen = '/PackageAddScreen'; + static const packageResultScreen = '/PackageResultScreen'; + static const packageFilterScreen = '/PackageFilterScreen'; + static const packageDetailScreen = '/PackageDetailScreen'; + static const itemAddScreen = '/ItemAddScreen'; + static const itemResultScreen = '/ItemResultScreen'; + static const itemFilterScreen = '/ItemFilterScreen'; + static const itemDetailScreen = '/ItemDetailScreen'; + static const formTestResultScreen = '/FormTestResultScreen'; + static const cycleUpdateScreen = '/CycleUpdateScreen'; + static const packageUpdateScreen = '/PackageUpdateScreen'; + static const itemUpdateScreen = '/ItemUpdateScreen'; + static const itemScanScreen = '/ItemScanScreen'; + static const packageScanScreen = '/PackageScanScreen'; + static const myItemsResultScreen = '/MyItemsResultScreen'; + static const myItemsFilterScreen = '/MyItemsFilterScreen'; + static const myItemsDetailScreen = '/MyItemsDetailScreen'; + static const itemsTransferScreen = '/ItemsTransferScreen'; + static const myItemsHistoryScreen = '/MyItemsHistoryScreen'; + static const myPackagesResultScreen = '/MyPackagesResultScreen'; + static const myPackagesFilterScreen = '/MyPackagesFilterScreen'; + static const myPackagesDetailScreen = '/MyPackagesDetailScreen'; + static const packagesTransferScreen = '/PackagesTransferScreen'; + static const myPackagesHistoryScreen = '/MyPackagesHistoryScreen'; +} diff --git a/lib/config/urls.dart b/lib/config/urls.dart index 806507d..4d220dc 100644 --- a/lib/config/urls.dart +++ b/lib/config/urls.dart @@ -1,81 +1,166 @@ -class Url { - static const String baseUrl = 'https://www.cssd-doc.com/api'; - - static const String login = '$baseUrl/login'; - - static const String getInputs = '$baseUrl/GetInputs'; - - static const String getUserInfo = '$baseUrl/GetInfo'; - - // static const String testResults = '$baseUrl/TestResults'; - - static const String filterItems = '$baseUrl/TestResults/ListFilterItems'; - - static const String labelItems = '$baseUrl/GetLabels'; - - static const String packageItems = '$baseUrl/GetPackages'; - - static const String requestResetPass = '$baseUrl/password/phone'; - - static const String verifyResetPass = '$baseUrl/password/verifyCode'; - - static const String sendResetPass = '$baseUrl/password/reset'; - - static const String addImage = '$baseUrl/UploadFile'; - - - - static String testResults(int id) { - return '$baseUrl/TestResults?page=$id'; - } - - static String testResultVerification(String id,String value) { - return '$baseUrl/TestResults/Verify/$id/$value'; - } - - static String labelResults(int id) { - return '$baseUrl/Labels?page=$id'; - } - - static String cycleResults(int id) { - return '$baseUrl/Cycles?page=$id'; - } - - static String verifyTest(int id) { - return '$baseUrl/TestResults/Verify/$id'; - } - - static String testResultFormValues(String id) { - return '$baseUrl/TestResults/$id/edit'; - } - - static String updateTestResult(String id) { - return '$baseUrl/TestResults/$id'; - } - - static const String createTestResult = '$baseUrl/TestResults'; - - static const String createCycleResult = '$baseUrl/Cycles'; - - static const String createLabelResult = '$baseUrl/Labels'; - - static String updateLabelResult(String id) { - return '$baseUrl/Labels/$id'; - } - - static String getTestResult(String id) { - return '$baseUrl/TestResults/$id'; - } - - static String getLabelResult(String id) { - return '$baseUrl/Labels/$id'; - } - - static String getCycleResult(String id) { - return '$baseUrl/Cycles/$id'; - } - - static String removeTestResult(String id) { - return '$baseUrl/TestResults/$id'; - } -} +class Url { + static const String baseUrl = 'https://www.cssd-doc.com/api'; + + // https://app.cssd-doc.com + + static const String login = '$baseUrl/login'; + + static const String logOut = '$baseUrl/logOut'; + + static const String getInputs = '$baseUrl/GetInputs'; + + static const String getUserInfo = '$baseUrl/GetInfo'; + + // static const String testResults = '$baseUrl/TestResults'; + + static const String filterItems = '$baseUrl/TestResults/ListFilterItems'; + + static const String labelItems = '$baseUrl/GetLabels'; + + static const String packageItems = '$baseUrl/GetPackages'; + + static const String itemItems = '$baseUrl/GetItems'; + + static const String requestResetPass = '$baseUrl/password/phone'; + + static const String verifyResetPass = '$baseUrl/password/verifyCode'; + + static const String sendResetPass = '$baseUrl/password/reset'; + + static const String addImage = '$baseUrl/UploadFile'; + + // static String getUserMedicalCenterId(int id) { + // return '$baseUrl/users?medical_center_id=$id'; + // } + + static String testResults(int id) { + return '$baseUrl/TestResults?page=$id'; + } + + static String labelResults(int id) { + return '$baseUrl/Labels?page=$id'; + } + + static String cycleResults(int id) { + return '$baseUrl/Cycles?page=$id'; + } + + static String packageResults(int id) { + return '$baseUrl/Packages?page=$id'; + } + + static String itemResults(int id) { + return '$baseUrl/Items?page=$id'; + } + + static String verifyTest(int id) { + return '$baseUrl/TestResults/Verify/$id'; + } + + static String testResultFormValues(String id) { + return '$baseUrl/TestResults/$id/edit'; + } + + static String updateTestResult(String id) { + return '$baseUrl/TestResults/$id'; + } + + static String updateCycleResult(String id) { + return '$baseUrl/Cycles/$id'; + } + + static String updatePackageResult(String id) { + return '$baseUrl/Packages/$id'; + } + + static String updateItemResult(String id) { + return '$baseUrl/Items/$id'; + } + + static const String createTestResult = '$baseUrl/TestResults'; + + static const String createCycleResult = '$baseUrl/Cycles'; + + static const String createLabelResult = '$baseUrl/Labels'; + + static const String createPackageResult = '$baseUrl/Packages'; + + static const String createItemResult = '$baseUrl/Items'; + + static String getMyItems(int id) { + return '$baseUrl/transfer-my-items?page=$id'; + } + + static String getHospitalItems(int id) { + return '$baseUrl/transfer-items?page=$id'; + } + + static String getMyItemRequests = '$baseUrl/my-suspended-transfer-items'; + + static const String getHospitalItemRequests = + '$baseUrl/suspended-transfer-items'; + + static String transferItems(String id) { + return '$baseUrl/transfer-items/$id'; + } + + static String testResultVerification(String id, String value) { + return '$baseUrl/TestResults/Verify/$id/$value'; + } + + static String verifyItemRequests(String id, String value) { + return '$baseUrl/transfer-items/ChangeStatus/$id'; + } + + static String updateLabelResult(String id) { + return '$baseUrl/Labels/$id'; + } + + static String getTestResult(String id) { + return '$baseUrl/TestResults/$id'; + } + + static String getLabelResult(String id) { + return '$baseUrl/Labels/$id'; + } + + static String getCycleResult(String id) { + return '$baseUrl/Cycles/$id'; + } + + static String removeTestResult(String id) { + return '$baseUrl/TestResults/$id'; + } + + static String removeLabels(String id) { + return '$baseUrl/Labels/$id'; + } + + static String removeCycles(String id) { + return '$baseUrl/Cycles/$id'; + } + + static String getPackageResult(String id) { + return '$baseUrl/Packages/$id'; + } + + static String removePackages(String id) { + return '$baseUrl/Packages/$id'; + } + + static String getItemResult(String id) { + return '$baseUrl/Items/$id'; + } + + static String removeItems(String id) { + return '$baseUrl/Items/$id'; + } + + static String changeItemStatus(String id) { + return '$baseUrl/Items/ChangeStatus/$id'; + } + + static String getUsers(String id) { + return '$baseUrl/Users?medicalCenter_id=$id'; + } +} diff --git a/lib/config/user.dart b/lib/config/user.dart index 24975d3..9caa18b 100644 --- a/lib/config/user.dart +++ b/lib/config/user.dart @@ -1,11 +1,11 @@ -class User { - static String _token; - - static String get token { - return 'Bearer ' + User._token; - } - - static set token (String token) { - User._token = token; - } -} +class User { + static String? _token; + + static String get token { + return 'Bearer ' + User._token!; + } + + static set token(String token) { + User._token = token; + } +} diff --git a/lib/main.dart b/lib/main.dart index 68b14c9..4b17348 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,147 +1,201 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_phoenix/flutter_phoenix.dart'; -import 'package:provider/provider.dart'; - -import 'config/routes.dart'; -import 'pages/cycle_add_screen.dart'; -import 'pages/cycle_detail_screen.dart'; -import 'pages/cycle_filter_screen.dart'; -import 'pages/cycle_result_screen.dart'; -import 'pages/cycle_scan_screen.dart'; -import 'pages/forget_pass_screen.dart'; -import 'pages/home_screen.dart'; -import 'pages/label_add_screen.dart'; -import 'pages/label_detail_screen.dart'; -import 'pages/label_filter_screen.dart'; -import 'pages/label_result_screen.dart'; -import 'pages/label_scan_screen.dart'; -import 'pages/label_update_screen.dart'; -import 'pages/login_screen.dart'; -import 'pages/my_info_screen.dart'; -import 'pages/rePass_screen.dart'; -import 'pages/test_add_screen.dart'; -import 'pages/test_detail_screen.dart'; -import 'pages/test_filter_screen.dart'; -import 'pages/test_result_screen.dart'; -import 'pages/test_scan_screen.dart'; -import 'pages/test_verify_screen.dart'; -import 'pages/verify_pass_screen.dart'; -import 'providers/auth.dart'; -import 'providers/connectivity.dart'; -import 'providers/cycles.dart'; -import 'providers/input.dart'; -import 'providers/labels.dart'; -import 'providers/my_info.dart'; -import 'providers/test_results.dart'; -import 'widgets/Global/splash_screen.dart'; -import 'widgets/TestResultScreens/Add/capture_image.dart'; - -void main() { - runApp(Phoenix(child: MyApp())); - SystemChrome.setPreferredOrientations([ - DeviceOrientation.portraitUp, - DeviceOrientation.portraitDown, - ]); - // SystemChrome.setEnabledSystemUIOverlays([]); - // SystemChrome.setSystemUIOverlayStyle( - // const SystemUiOverlayStyle( - // statusBarColor: Colors.red, - // systemNavigationBarColor: Colors.red, - // systemNavigationBarDividerColor: Colors.blue, - // ), - // ); -} - -class MyApp extends StatelessWidget { - @override - Widget build(BuildContext context) { - return MultiProvider( - providers: [ - ChangeNotifierProvider.value( - value: Auth(), - ), - ChangeNotifierProvider.value( - value: TestResultsProvider(), - ), - ChangeNotifierProvider.value( - value: Inputs(), - ), - ChangeNotifierProvider.value( - value: MyInfoProvider(), - ), - ChangeNotifierProvider.value( - value: LabelsProvider(), - ), - ChangeNotifierProvider.value( - value: CyclesProvider(), - ), - ChangeNotifierProvider.value( - value: ConnectivityProvider(), - ) - ], - child: Consumer( - builder: (ctx, auth, _) => Consumer( - builder: (ct, connection, _) { - connection.checkConnection(); - print(connection.conStatus); - return MaterialApp( - debugShowCheckedModeBanner: false, - title: 'CSSD-DOC', - theme: ThemeData( - primaryColor: Colors.black, - // cursorColor: Colors.black, - fontFamily: 'montserrat', - // primaryTextTheme: TextTheme( - // body1: TextStyle( - // color: Colors.black, - // ), - // ) - // textTheme: TextTheme( - // body2: TextStyle(color: Colors.white, fontSize: 16), - // ), - ), - home: auth.isAuth - ? HomePage() - : FutureBuilder( - future: auth.tryAutoLogin(), - builder: (ctx, authResultSnapshot) => - authResultSnapshot.connectionState == - ConnectionState.waiting - ? SplashScreen() - : LoginScreen(), - ), - routes: { - Routes.homePage: (ctx) => HomePage(), - Routes.loginScreen: (ctx) => LoginScreen(), - Routes.forgetPassScreen: (ctx) => ForgetPassScreen(), - Routes.myInfoScreen: (ctx) => MyInfoScreen(), - Routes.testResultScreen: (ctx) => TestResultScreen(), - Routes.testDetailsScreen: (ctx) => TestDetailsScreen(), - Routes.testFilterScreen: (ctx) => TestFilterScreen(), - // Routes.register: (ctx) => Register(), - Routes.testResultAddScreen: (ctx) => TestResultAddScreen(), - Routes.labelDetailScreen: (ctx) => LabelDetailScreen(), - Routes.cycleDetailScreen: (ctx) => CycleDetailScreen(), - Routes.labelFilterScreen: (ctx) => LabelFilterScreen(), - Routes.cycleFilterScreen: (ctx) => CycleFilterScreen(), - Routes.cycleScanScreen: (ctx) => CycleScanScreen(), - Routes.labelScanScreen: (ctx) => LabelScanScreen(), - Routes.cycleAddScreen: (ctx) => CycleAddScreen(), - Routes.labelAddScreen: (ctx) => LabelAddScreen(), - Routes.labelUpdateScreen: (ctx) => LabelUpdateScreen(), - Routes.labelResultScreen: (ctx) => LabelResultScreen(), - Routes.cycleResultScreen: (ctx) => CycleResultScreen(), - Routes.testVerifyScreen: (ctx) => TestVerifyScreen(), - Routes.testScanScreen: (ctx) => TestScanScreen(), - Routes.sendCodeScreen: (ctx) => VerifyPassScreen(), - Routes.rePassScreen: (ctx) => RePassScreen(), - Routes.captureImageScreen: (ctx) => CaptureImage(), - }, - ); - }, - ), - ), - ); - } -} +import 'package:cssd/pages/CyclePages/cycle_update_screen.dart'; +import 'package:cssd/pages/ItemPages/item_add_screen.dart'; +import 'package:cssd/pages/ItemPages/item_detail_screen.dart'; +import 'package:cssd/pages/ItemPages/item_filter_screen.dart'; +import 'package:cssd/pages/ItemPages/item_result_screen.dart'; +import 'package:cssd/pages/ItemPages/item_scan_screen.dart'; +import 'package:cssd/pages/ItemPages/item_update_screen.dart'; +import 'package:cssd/pages/LabelPages/label_update_screen.dart'; +import 'package:cssd/pages/MyItemsPages/Result/my_items_result_screen.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_detail_screen.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_filter_screen.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_history_screen.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_transfer_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/Result/my_packages_result_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_detail_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_filter_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_history_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_transfer_screen.dart'; +import 'package:cssd/pages/PackagePages/package_add_screen.dart'; +import 'package:cssd/pages/PackagePages/package_detail_screen.dart'; +import 'package:cssd/pages/PackagePages/package_filter_screen.dart'; +import 'package:cssd/pages/PackagePages/package_result_screen.dart'; +import 'package:cssd/pages/PackagePages/package_scan_screen.dart'; +import 'package:cssd/pages/PackagePages/package_update_screen.dart'; +import 'package:cssd/pages/TestPages/test_form_page.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:cssd/providers/my_packages.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/providers/users.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_phoenix/flutter_phoenix.dart'; +import 'package:provider/provider.dart'; + +import 'config/routes.dart'; +import 'pages/CyclePages/cycle_add_screen.dart'; +import 'pages/CyclePages/cycle_detail_screen.dart'; +import 'pages/CyclePages/cycle_filter_screen.dart'; +import 'pages/CyclePages/cycle_result_screen.dart'; +import 'pages/CyclePages/cycle_scan_screen.dart'; +import 'pages/LoginRegisterPages/forget_pass_screen.dart'; +import 'pages/home_screen.dart'; +import 'pages/LabelPages/label_add_screen.dart'; +import 'pages/LabelPages/label_detail_screen.dart'; +import 'pages/LabelPages/label_filter_screen.dart'; +import 'pages/LabelPages/label_result_screen.dart'; +import 'pages/LabelPages/label_scan_screen.dart'; +import 'pages/LoginRegisterPages/login_screen.dart'; +import 'pages/my_info_screen.dart'; +import 'pages/LoginRegisterPages/rePass_screen.dart'; +import 'pages/TestPages/test_add_screen.dart'; +import 'pages/TestPages/test_detail_screen.dart'; +import 'pages/TestPages/test_filter_screen.dart'; +import 'pages/TestPages/test_result_screen.dart'; +import 'pages/TestPages/test_scan_screen.dart'; +import 'pages/TestPages/test_verify_screen.dart'; +import 'pages/LoginRegisterPages/verify_pass_screen.dart'; +import 'providers/auth.dart'; +import 'providers/connectivity.dart'; +import 'providers/cycles.dart'; +import 'providers/input.dart'; +import 'providers/labels.dart'; +import 'providers/my_info.dart'; +import 'providers/test_results.dart'; +import 'widgets/Global/splash_screen.dart'; +import 'widgets/TestResultScreens/Add/capture_image.dart'; + +void main() { + WidgetsFlutterBinding.ensureInitialized(); + SystemChrome.setPreferredOrientations([ + DeviceOrientation.portraitUp, + DeviceOrientation.portraitDown, + ]); + runApp(Phoenix(child: MyApp())); +} + +class MyApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MultiProvider( + providers: [ + ChangeNotifierProvider.value( + value: Auth(), + ), + ChangeNotifierProvider.value( + value: TestResultsProvider(), + ), + ChangeNotifierProvider.value( + value: Inputs(), + ), + ChangeNotifierProvider.value( + value: MyInfoProvider(), + ), + ChangeNotifierProvider.value( + value: LabelsProvider(), + ), + ChangeNotifierProvider.value( + value: CyclesProvider(), + ), + ChangeNotifierProvider.value( + value: ConnectivityProvider(), + ), + ChangeNotifierProvider.value( + value: PackageProvider(), + ), + ChangeNotifierProvider.value( + value: ItemProvider(), + ), + ChangeNotifierProvider.value( + value: MyItemProvider(), + ), + ChangeNotifierProvider.value( + value: MyPackageProvider(), + ), + ChangeNotifierProvider.value( + value: UsersProvider(), + ), + ], + child: Consumer( + builder: (ctx, auth, _) => Consumer( + builder: (ct, connection, _) { + connection.checkConnection(); + print(connection.conStatus); + return MaterialApp( + debugShowCheckedModeBanner: false, + title: 'CSSD-DOC', + theme: ThemeData( + primaryColor: Colors.black, + fontFamily: 'montserrat', + ), + home: auth.isAuth + ? HomePage() + : FutureBuilder( + future: auth.tryAutoLogin(), + builder: (ctx, authResultSnapshot) => + authResultSnapshot.connectionState == + ConnectionState.waiting + ? SplashScreen() + : LoginScreen(), + ), + routes: { + Routes.homePage: (ctx) => HomePage(), + Routes.loginScreen: (ctx) => LoginScreen(), + Routes.forgetPassScreen: (ctx) => ForgetPassScreen(), + Routes.myInfoScreen: (ctx) => MyInfoScreen(), + Routes.testResultScreen: (ctx) => TestResultScreen(), + Routes.testDetailsScreen: (ctx) => TestDetailsScreen(), + Routes.testFilterScreen: (ctx) => TestFilterScreen(), + Routes.testResultAddScreen: (ctx) => TestResultAddScreen(), + Routes.labelDetailScreen: (ctx) => LabelDetailScreen(), + Routes.cycleDetailScreen: (ctx) => CycleDetailScreen(), + Routes.labelFilterScreen: (ctx) => LabelFilterScreen(), + Routes.cycleFilterScreen: (ctx) => CycleFilterScreen(), + Routes.cycleScanScreen: (ctx) => CycleScanScreen(), + Routes.labelScanScreen: (ctx) => LabelScanScreen(), + Routes.labelUpdateScreen: (ctx) => LabelUpdateScreen(), + Routes.cycleAddScreen: (ctx) => CycleAddScreen(), + Routes.labelAddScreen: (ctx) => LabelAddScreen(), + Routes.labelResultScreen: (ctx) => LabelResultScreen(), + Routes.cycleResultScreen: (ctx) => CycleResultScreen(), + Routes.testVerifyScreen: (ctx) => TestVerifyScreen(), + Routes.testScanScreen: (ctx) => TestScanScreen(), + Routes.sendCodeScreen: (ctx) => VerifyPassScreen(), + Routes.rePassScreen: (ctx) => RePassScreen(), + Routes.captureImageScreen: (ctx) => CaptureImage(), + Routes.packageAddScreen: (ctx) => PackageAddScreen(), + Routes.packageResultScreen: (ctx) => PackageResultScreen(), + Routes.packageDetailScreen: (ctx) => PackageDetailScreen(), + Routes.packageFilterScreen: (ctx) => PackageFilterScreen(), + Routes.itemResultScreen: (ctx) => ItemResultScreen(), + Routes.itemAddScreen: (ctx) => ItemAddScreen(), + Routes.itemFilterScreen: (ctx) => ItemFilterScreen(), + Routes.itemDetailScreen: (ctx) => ItemDetailScreen(), + Routes.formTestResultScreen: (ctx) => FormPage(), + Routes.cycleUpdateScreen: (ctx) => CycleUpdateScreen(), + Routes.packageUpdateScreen: (ctx) => PackageUpdateScreen(), + Routes.itemUpdateScreen: (ctx) => ItemUpdateScreen(), + Routes.itemScanScreen: (ctx) => ItemScanScreen(), + Routes.packageScanScreen: (ctx) => PackageScanScreen(), + Routes.myItemsResultScreen: (ctx) => MyItemsResultScreen(), + Routes.myItemsFilterScreen: (ctx) => MyItemsFilterScreen(), + Routes.myItemsDetailScreen: (ctx) => MyItemsDetailScreen(), + Routes.itemsTransferScreen: (ctx) => ItemsTransferScreen(), + Routes.myItemsHistoryScreen: (ctx) => MyItemsHistoryScreen(), + Routes.myPackagesResultScreen: (ctx) => + MyPackagesResultScreen(), + Routes.myPackagesFilterScreen: (ctx) => MyPackageFilterScreen(), + Routes.myPackagesDetailScreen: (ctx) => + MyPackagesDetailScreen(), + Routes.packagesTransferScreen: (ctx) => PackageTransferScreen(), + Routes.myPackagesHistoryScreen: (ctx) => + MyPackagesHistoryScreen(), + }, + ); + }, + ), + ), + ); + } +} diff --git a/lib/models/connection_model.dart b/lib/models/connection_model.dart deleted file mode 100644 index fbc53f4..0000000 --- a/lib/models/connection_model.dart +++ /dev/null @@ -1,5 +0,0 @@ -enum ConnectionStatus{ - Wifi, - Calcular, - Offline -} \ No newline at end of file diff --git a/lib/models/cycles_models.dart b/lib/models/cycles_models.dart index 4d18e2c..26a9bc9 100644 --- a/lib/models/cycles_models.dart +++ b/lib/models/cycles_models.dart @@ -1,52 +1,90 @@ -import 'package:flutter/cupertino.dart'; - -class CycleResultObject { - final String id; - final List label; - final String createdAt; - - CycleResultObject({ - @required this.id, - @required this.label, - @required this.createdAt, - }); -} - -class CycleDetailObject { - final String id; - final String description; - final String createDate; - final String hospitalName; - - final String date; - final String sterileId; - final String cycleNumber; - final List labels; - - CycleDetailObject({ - @required this.id, - @required this.description, - @required this.createDate, - @required this.hospitalName, - @required this.date, - @required this.sterileId, - @required this.cycleNumber, - @required this.labels, - }); -} - -class CycleFilterObject { - final String id; - final String cycleNumber; - final String sterilizerId; - final String hospital; - final String date; - - CycleFilterObject({ - @required this.id, - @required this.cycleNumber, - @required this.sterilizerId, - @required this.hospital, - @required this.date, - }); -} +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class CycleResultObject extends Equatable { + final String id; + final List label; + final String createdAt; + + CycleResultObject({ + required this.id, + required this.label, + required this.createdAt, + }); + + @override + List get props => [id, label, createdAt]; + + @override + bool get stringify => true; +} + +class CycleDetailObject extends Equatable { + final String id; + final String description; + final String createDate; + final String hospitalName; + + final String date; + final String sterileId; + final String cycleNumber; + final List labels; + + CycleDetailObject({ + required this.id, + required this.description, + required this.createDate, + required this.hospitalName, + required this.date, + required this.sterileId, + required this.cycleNumber, + required this.labels, + }); + + @override + List get props { + return [ + id, + description, + createDate, + hospitalName, + date, + sterileId, + cycleNumber, + labels, + ]; + } + + @override + bool get stringify => true; +} + +class CycleFilterObject extends Equatable { + final String id; + final String cycleNumber; + final String sterilizerId; + final String hospital; + final String date; + + CycleFilterObject({ + required this.id, + required this.cycleNumber, + required this.sterilizerId, + required this.hospital, + required this.date, + }); + + @override + List get props { + return [ + id, + cycleNumber, + sterilizerId, + hospital, + date, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/item_model.dart b/lib/models/item_model.dart new file mode 100644 index 0000000..fde73d5 --- /dev/null +++ b/lib/models/item_model.dart @@ -0,0 +1,111 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class ItemResultObject extends Equatable { + final String id; + final String name; + final String size; + final String userName; + final int status; + final String? batchId; + + ItemResultObject({ + required this.id, + required this.name, + required this.size, + required this.userName, + required this.status, + this.batchId, + }); + + @override + List get props => [ + id, + name, + size, + userName, + status, + batchId!, + ]; + + @override + bool get stringify => true; +} + +class ItemDetailObject extends Equatable { + final String id; + final String name; + final String userName; + final String size; + final String specific; + final String hospital; + final String description; + final String createdAt; + final String udi; + final int status; + + ItemDetailObject({ + required this.id, + required this.name, + required this.userName, + required this.size, + required this.specific, + required this.hospital, + required this.description, + required this.createdAt, + required this.udi, + required this.status, + }); + + @override + List get props { + return [ + id, + name, + userName, + size, + specific, + hospital, + description, + createdAt, + udi, + status, + ]; + } + + @override + bool get stringify => true; +} + +class ItemFilterObject extends Equatable { + final String id; + final String name; + final String udi; + final String hospital; + final String size; + final String specific; + + ItemFilterObject({ + required this.id, + required this.name, + required this.udi, + required this.hospital, + required this.size, + required this.specific, + }); + + @override + List get props { + return [ + id, + name, + udi, + hospital, + size, + specific, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/label_models.dart b/lib/models/label_models.dart index 550ca37..5509f5a 100644 --- a/lib/models/label_models.dart +++ b/lib/models/label_models.dart @@ -1,56 +1,88 @@ -import 'package:flutter/cupertino.dart'; - -class LabelResultObject { - final String id; - final String package; - final String packageId; - final String expireDate; - - LabelResultObject({ - @required this.id, - @required this.package, - @required this.packageId, - @required this.expireDate, - }); -} - -class LabelDetailsObject { - final String id; - final String package; - final String packageId; - final String hospitalName; - - final String createDate; - final String expireDate; - final String sterileDate; - final String sterileId; - final String cycleNumber; - final String lotNumber; - - LabelDetailsObject({ - @required this.id, - @required this.package, - @required this.packageId, - @required this.hospitalName, - @required this.createDate, - @required this.expireDate, - @required this.sterileDate, - @required this.sterileId, - @required this.cycleNumber, - @required this.lotNumber, - }); -} - -class LabelFilterObject { - final String id; - final String cycleNumber; - final String sterilizerId; - final String hospital; - - LabelFilterObject({ - @required this.id, - @required this.cycleNumber, - @required this.sterilizerId, - @required this.hospital, - }); -} +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class LabelResultObject extends Equatable { + final String id; + final String package; + final String packageId; + final String expireDate; + + LabelResultObject({ + required this.id, + required this.package, + required this.packageId, + required this.expireDate, + }); + + @override + List get props => [id, package, packageId, expireDate]; + + @override + bool get stringify => true; +} + +class LabelDetailsObject extends Equatable { + final String id; + final String package; + final String packageId; + final String hospitalName; + + final String createDate; + final String expireDate; + final String sterileDate; + final String sterileId; + final String cycleNumber; + final String lotNumber; + + LabelDetailsObject({ + required this.id, + required this.package, + required this.packageId, + required this.hospitalName, + required this.createDate, + required this.expireDate, + required this.sterileDate, + required this.sterileId, + required this.cycleNumber, + required this.lotNumber, + }); + + @override + List get props { + return [ + id, + package, + packageId, + hospitalName, + createDate, + expireDate, + sterileDate, + sterileId, + cycleNumber, + lotNumber, + ]; + } + + @override + bool get stringify => true; +} + +class LabelFilterObject extends Equatable { + final String id; + final String cycleNumber; + final String sterilizerId; + final String hospital; + + LabelFilterObject({ + required this.id, + required this.cycleNumber, + required this.sterilizerId, + required this.hospital, + }); + + @override + List get props => [id, cycleNumber, sterilizerId, hospital]; + + @override + bool get stringify => true; +} diff --git a/lib/models/my_item_model.dart b/lib/models/my_item_model.dart new file mode 100644 index 0000000..fffa481 --- /dev/null +++ b/lib/models/my_item_model.dart @@ -0,0 +1,62 @@ +import 'package:equatable/equatable.dart'; + +class MyItemResultObject extends Equatable { + final String id; + final String name; + final String size; + final String? userName; + final String? fromDate; + final String? toDate; + + MyItemResultObject({ + required this.id, + required this.name, + required this.size, + this.userName, + this.fromDate, + this.toDate, + }); + + @override + List get props => [ + id, + name, + size, + userName!, + fromDate!, + toDate!, + ]; + + @override + bool get stringify => true; +} + +class MyItemFilterObject extends Equatable { + final String id; + final String name; + final String udi; + final String size; + final String specific; + + MyItemFilterObject({ + required this.id, + required this.name, + required this.udi, + required this.size, + required this.specific, + }); + + @override + List get props { + return [ + id, + name, + udi, + size, + specific, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/my_package_model.dart b/lib/models/my_package_model.dart new file mode 100644 index 0000000..f0370d0 --- /dev/null +++ b/lib/models/my_package_model.dart @@ -0,0 +1,53 @@ +import 'package:equatable/equatable.dart'; + +class MyPackageResultObject extends Equatable { + final String id; + final String name; + final String? userName; + final String? fromDate; + final String? toDate; + + MyPackageResultObject({ + required this.id, + required this.name, + this.userName, + this.fromDate, + this.toDate, + }); + + @override + List get props => [ + id, + name, + userName!, + fromDate!, + toDate!, + ]; + + @override + bool get stringify => true; +} + +class MyPackageFilterObject extends Equatable { + final String id; + final String name; + final String udi; + + MyPackageFilterObject({ + required this.id, + required this.name, + required this.udi, + }); + + @override + List get props { + return [ + id, + name, + udi, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/package_model.dart b/lib/models/package_model.dart new file mode 100644 index 0000000..b8d922f --- /dev/null +++ b/lib/models/package_model.dart @@ -0,0 +1,87 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class PackageResultObject extends Equatable { + final String id; + final String createdAt; + final String name; + + PackageResultObject({ + required this.id, + required this.createdAt, + required this.name, + }); + + @override + List get props => [ + id, + createdAt, + name, + ]; + + @override + bool get stringify => true; +} + +class PackageDetailObject extends Equatable { + final String id; + final String name; + final String description; + final String createDate; + final String hospitalName; + final String udi; + final List items; + + PackageDetailObject({ + required this.id, + required this.name, + required this.description, + required this.createDate, + required this.hospitalName, + required this.udi, + required this.items, + }); + + @override + List get props { + return [ + id, + name, + description, + createDate, + hospitalName, + udi, + items, + ]; + } + + @override + bool get stringify => true; +} + +class PackageFilterObject extends Equatable { + final String id; + final String name; + final String hospital; + final String udi; + + PackageFilterObject({ + required this.id, + required this.name, + required this.hospital, + required this.udi, + }); + + @override + List get props { + return [ + id, + name, + hospital, + udi, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/test_result_models.dart b/lib/models/test_result_models.dart index 9a5b30b..3787f73 100644 --- a/lib/models/test_result_models.dart +++ b/lib/models/test_result_models.dart @@ -1,41 +1,74 @@ -import 'package:flutter/material.dart'; - -class TestResultObject { - final String id; - final String name; - final String deviceId; - final String result; - final String date; - final String hospital; - final String verified; - - TestResultObject({ - @required this.id, - @required this.name, - @required this.deviceId, - @required this.result, - @required this.date, - @required this.hospital, - @required this.verified, - }); -} - -class TestResultFilterObject { - final String id; - final String labelID; - final String userName; - final String hospital; - final String testType; - final String fDate; - final String uDate; - - TestResultFilterObject({ - @required this.id, - @required this.labelID, - @required this.userName, - @required this.hospital, - @required this.testType, - @required this.fDate, - @required this.uDate, - }); -} +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class TestResultObject extends Equatable { + final String id; + final String name; + final String deviceId; + final String result; + final String date; + final String hospital; + final String verified; + + TestResultObject({ + required this.id, + required this.name, + required this.deviceId, + required this.result, + required this.date, + required this.hospital, + required this.verified, + }); + + @override + List get props { + return [ + id, + name, + deviceId, + result, + date, + hospital, + verified, + ]; + } + + @override + bool get stringify => true; +} + +class TestResultFilterObject extends Equatable { + final String id; + final String labelID; + final String userName; + final String hospital; + final String testType; + final String fDate; + final String uDate; + + TestResultFilterObject({ + required this.id, + required this.labelID, + required this.userName, + required this.hospital, + required this.testType, + required this.fDate, + required this.uDate, + }); + + @override + List get props { + return [ + id, + labelID, + userName, + hospital, + testType, + fDate, + uDate, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/users_model.dart b/lib/models/users_model.dart new file mode 100644 index 0000000..ac97b8d --- /dev/null +++ b/lib/models/users_model.dart @@ -0,0 +1,24 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:equatable/equatable.dart'; + +class Users extends Equatable { + final String id; + final String userName; + final String phoneNumber; + + const Users({ + required this.userName, + required this.phoneNumber, + required this.id, + }); + + @override + List get props => [ + userName, + phoneNumber, + id, + ]; + + @override + bool get stringify => true; +} diff --git a/lib/pages/CyclePages/cycle_add_screen.dart b/lib/pages/CyclePages/cycle_add_screen.dart new file mode 100644 index 0000000..01fdb49 --- /dev/null +++ b/lib/pages/CyclePages/cycle_add_screen.dart @@ -0,0 +1,343 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/cycles_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/cycles.dart'; +import '../../widgets/CycleScreens/Add/add_label_box.dart'; +import '../../widgets/CycleScreens/Add/date_picker.dart'; +import '../../widgets/CycleScreens/Add/save_button.dart'; +import '../../widgets/Global/internet_error.dart'; + +class CycleAddScreen extends StatefulWidget { + // static const route = '/CycleAddScreen'; + + @override + _CycleAddScreenState createState() => _CycleAddScreenState(); +} + +class _CycleAddScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + final _descriptionFocosNode = FocusNode(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController striizerIdCTRL = new TextEditingController(); + TextEditingController dateCTRL = new TextEditingController(); + DateTime? dateTimeFrom; + final _form = GlobalKey(); + + bool isInit = true; + CycleFilterObject? filters; + + List labelsCTRL = [TextEditingController()]; + int curLabelVal = 1; + @override + void initState() { + descriptionCTRL.text = ''; + cycleNumberCTRL.text = ''; + dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + striizerIdCTRL.text = ''; + // dateValue = DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + // var _id = ModalRoute.of(context).settings.arguments; + var cycleProviderObject = Provider.of(context); + cycleProviderObject.resetLabelVals(); + cycleProviderObject.getLabelFilters().then( + (result) { + setState( + () { + // labelValues = + // filters.hospital == '' ? labelVals[0] : filters.hospital; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.cycleResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Cycles'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.cycleResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Add a Cycle', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Strilizer ID required!'; + } + return null; + }, + controller: striizerIdCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Strilizer ID', + contentPadding: + EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: + TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context).requestFocus( + _cycleNumberFocusNode); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + striizerIdCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Cycle number required!'; + } + return null; + }, + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Cycle Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocosNode); + }, + ), + SizedBox( + height: 30, + ), + CycleAddDatePicker( + dateCTRL: dateCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 20.0, + ), + Container( + margin: EdgeInsets.symmetric(vertical: 10), + child: Text( + 'Labels included', + style: TextStyle( + color: kPink, + letterSpacing: 2, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + Consumer( + builder: (ctx, cycleProvider, _) => + ListView.builder( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (ctx, index) => AddLabelBox( + text: 'Select Labels included', + iconColor: kPinkSub, + deviceBlockSize: _deviceBlockSize, + values: + cycleProvider.labelValues[index], + vals: cycleProvider.labelVals, + initialLabelValue: + cycleProvider.initialLabelValue, + index: index, + ), + itemCount: + cycleProvider.labelValues.length, + ), + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocosNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 70, + ), + CycleAddSaveButton( + form: _form, + labelValues: Provider.of( + context, + listen: false, + ).labelValues, + cycleNumberCTRL: cycleNumberCTRL, + dateValue: dateCTRL.text, + descriptionCTRL: descriptionCTRL, + striizerIdCTRL: striizerIdCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/cycle_detail_screen.dart b/lib/pages/CyclePages/cycle_detail_screen.dart similarity index 76% rename from lib/pages/cycle_detail_screen.dart rename to lib/pages/CyclePages/cycle_detail_screen.dart index 79113a8..08c5201 100644 --- a/lib/pages/cycle_detail_screen.dart +++ b/lib/pages/CyclePages/cycle_detail_screen.dart @@ -1,85 +1,88 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../models/cycles_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/cycles.dart'; -import '../widgets/CycleScreens/Details/datas_box.dart'; -import '../widgets/Global/internet_error.dart'; - -class CycleDetailScreen extends StatefulWidget { - // static const route = '/CycleDetailScreen'; - final String testResultId; - - CycleDetailScreen({this.testResultId}); - - @override - _CycleDetailScreenState createState() => _CycleDetailScreenState(); -} - -class _CycleDetailScreenState extends State { - bool isInit = true; - bool isEmpty = false; - CycleDetailObject datas; - @override - void didChangeDependencies() async { - if (isInit) { - var _id = ModalRoute.of(context).settings.arguments; - await Provider.of(context, listen: false) - .showCycleResult(_id.toString()) - .then( - (result) { - setState( - () { - if (result.id == 'null') { - isEmpty = true; - } - datas = result; - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Cycles'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : isEmpty - ? Center( - child: Text('This Cycle doesnt exists!'), - ) - : CycleDetailsDataBox( - datas: datas, - deviceBlockSize: _deviceBlockSize, - ) - : ConnectionErrorBox(); - }), - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../models/cycles_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/cycles.dart'; +import '../../widgets/CycleScreens/Details/datas_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +class CycleDetailScreen extends StatefulWidget { + // static const route = '/CycleDetailScreen'; + final String? testResultId; + + CycleDetailScreen({this.testResultId}); + + @override + _CycleDetailScreenState createState() => _CycleDetailScreenState(); +} + +class _CycleDetailScreenState extends State { + bool isInit = true; + bool isEmpty = false; + CycleDetailObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showCycleResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Cycles'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer(builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Cycle doesnt exists!'), + ) + : CycleDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + ) + : ConnectionErrorBox(); + }), + ), + ); + } +} diff --git a/lib/pages/CyclePages/cycle_filter_screen.dart b/lib/pages/CyclePages/cycle_filter_screen.dart new file mode 100644 index 0000000..524d752 --- /dev/null +++ b/lib/pages/CyclePages/cycle_filter_screen.dart @@ -0,0 +1,351 @@ +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/cycles_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/cycles.dart'; +import '../../widgets/CycleScreens/Filter/date_picker.dart'; +import '../../widgets/CycleScreens/Filter/save_button.dart'; +import '../../widgets/CycleScreens/Filter/selector_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +class CycleFilterScreen extends StatefulWidget { + // static const route = '/CycleFilterScreen'; + + @override + _CycleFilterScreenState createState() => _CycleFilterScreenState(); +} + +class _CycleFilterScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + final _strilizerIdFocusNode = FocusNode(); + TextEditingController cycleIdCTRL = new TextEditingController(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController striizerIdCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + + TextEditingController dateCTRL = new TextEditingController(); + DateTime? dateTimeFrom; + // String dateValue; + + List> hospitalVals = []; + // String curhospitalVal; + bool isInit = true; + CycleFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + cycleIdCTRL.text = filters!.id; + cycleNumberCTRL.text = filters!.cycleNumber; + // dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + dateCTRL.text = ''; + striizerIdCTRL.text = filters!.sterilizerId; + // dateValue = DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + // var _id = ModalRoute.of(context).settings.arguments; + await Provider.of(context, listen: false) + .getHospitalsFilters() + .then( + (result) { + setState( + () { + hospitalVals = [ + {'id': '', 'name': ''} + ]; + for (var hospital in result) { + hospitalVals.add(hospital); + } + filters!.hospital == '' + ? hospitalCTRL.text = hospitalVals[0]['name']! + : hospitalVals.forEach( + //id convert to name + (hospital) { + if (hospital['id'] == filters!.hospital) { + hospitalCTRL.text = hospital['name']!; + } + }, + ); + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.cycleResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Cycles'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.cycleResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Filter Cycles', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: cycleIdCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Cycle ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context).requestFocus( + _cycleNumberFocusNode); + }, + ), + ), + // Spacer(), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + cycleIdCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Cycle Number', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_strilizerIdFocusNode); + }, + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextField( + controller: striizerIdCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Strilizer ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _strilizerIdFocusNode, + keyboardType: + TextInputType.visiblePassword, + textInputAction: TextInputAction.done, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + striizerIdCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 20, + ), + FilterHospitalBox( + deviceBlockSize: _deviceBlockSize, + hospitalCTRL: hospitalCTRL, + hospitalVals: hospitalVals, + label: 'Hospital', + ), + SizedBox( + height: 20, + ), + CycleFilterDatePicker( + dateCTRL: dateCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 70, + ), + CycleFilterSaveButton( + hospitalVals: hospitalVals, + hospitalCTRL: hospitalCTRL, + cycleIdCTRL: cycleIdCTRL, + cycleNumberCTRL: cycleNumberCTRL, + striizerIdCTRL: striizerIdCTRL, + dateCTRL: dateCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/CyclePages/cycle_result_screen.dart b/lib/pages/CyclePages/cycle_result_screen.dart new file mode 100644 index 0000000..1c69552 --- /dev/null +++ b/lib/pages/CyclePages/cycle_result_screen.dart @@ -0,0 +1,295 @@ +import 'package:cssd/config/colors.dart'; + +import '../../config/routes.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Result/banner.dart'; +import '../../widgets/CycleScreens/Result/data_box.dart'; +import '../../widgets/CycleScreens/Result/filter_objects.dart'; +import '../../widgets/CycleScreens/Result/search_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +import '../../providers/cycles.dart'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class CycleResultScreen extends StatefulWidget { + // static const route = '/CycleResultScreen'; + final bool? isAdmin; + + CycleResultScreen({this.isAdmin}); + + @override + _CycleResultScreenState createState() => _CycleResultScreenState(); +} + +class _CycleResultScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var testResults = Provider.of(context); + testResults.setLoading(); + testResults.resetPageNumber(); + testResults.getCycleResults().then((_) { + testResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var testResults = Provider.of( + context, + listen: false, + ); + testResults.getCycleResults(); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + floatingActionButton: CycleResultFloatingButton( + deviceBlockSize: _deviceBlockSize, + ), + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, right: 20, bottom: 60, left: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Cycles', + push: Routes.cycleFilterScreen, + ), + Consumer(builder: (ctx, cycle, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + cycle.filters!.id != '' + ? CycleFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + cycleNumber: + cycle.filters!.cycleNumber, + sterilizerId: + cycle.filters!.sterilizerId, + hospital: cycle.filters!.hospital, + date: cycle.filters!.date, + ) + : Container(), + cycle.filters!.cycleNumber != '' + ? CycleFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Cycle Number', + id: cycle.filters!.id, + cycleNumber: '', + sterilizerId: + cycle.filters!.sterilizerId, + hospital: cycle.filters!.hospital, + date: cycle.filters!.date, + ) + : Container(), + cycle.filters!.sterilizerId != '' + ? CycleFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Sterilizer ID', + id: cycle.filters!.id, + cycleNumber: + cycle.filters!.cycleNumber, + sterilizerId: '', + hospital: cycle.filters!.hospital, + date: cycle.filters!.date, + ) + : Container(), + cycle.filters!.hospital != '' + ? CycleFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Hospital', + id: cycle.filters!.id, + cycleNumber: + cycle.filters!.cycleNumber, + sterilizerId: + cycle.filters!.sterilizerId, + hospital: '', + date: cycle.filters!.date, + ) + : Container(), + cycle.filters!.date != '' + ? CycleFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Date', + id: cycle.filters!.id, + cycleNumber: + cycle.filters!.cycleNumber, + sterilizerId: + cycle.filters!.sterilizerId, + hospital: cycle.filters!.hospital, + date: '', + ) + : Container(), + ], + ), + ); + }), + ResultSearchBox( + searchCTRL: searchCTRL, + deviceBlockSize: _deviceBlockSize, + text: 'cycle', + onChanged: (value) { + Provider.of(context, + listen: false) + .search(value); + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, cycleResults, _) { + return cycleResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + String labels = ''; + for (var label in cycleResults + .items![index].label) { + labels += label; + labels += ' , '; + } + if (labels.length >= 3) { + labels = labels.substring( + 0, + labels.length - + 3); // remove extra , + } + return CycleItemBox( + deviceBlockSize: _deviceBlockSize, + item: cycleResults.items?[index], + labels: labels, + ); + }, + itemCount: cycleResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} + +class CycleResultFloatingButton extends StatelessWidget { + const CycleResultFloatingButton({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.cycleScanScreen); + }, + child: Container( + padding: EdgeInsets.all(2.5 * _deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 7.1 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushReplacementNamed(Routes.cycleAddScreen); + }, + child: Container( + padding: EdgeInsets.all(_deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kPink, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/CyclePages/cycle_scan_screen.dart b/lib/pages/CyclePages/cycle_scan_screen.dart new file mode 100644 index 0000000..a7bdb80 --- /dev/null +++ b/lib/pages/CyclePages/cycle_scan_screen.dart @@ -0,0 +1,197 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class CycleScanScreen extends StatefulWidget { + // static const route = '/cycleScanScreen'; + @override + State createState() { + return _CycleScanScreenState(); + } +} + +class _CycleScanScreenState extends State { + String testCode = ""; + TextEditingController idCTRL = new TextEditingController(); + final _form = GlobalKey(); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Cycles'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.only(top: 30), + child: Text( + 'Looking for a Cycle?', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5.5 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 3, + ), + ), + ), + GestureDetector( + child: Container( + margin: EdgeInsets.symmetric(vertical: 10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'Please Scan The Cycle Barcode', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + textAlign: TextAlign.center, + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + launch( + 'https://cssd-doc.com/Show/Cycle/$result', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: result, + // ); + } + }, + ); + }, + ), + SizedBox( + height: 10.0, + ), + Form( + key: _form, + child: TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Id required!!'; + } + return null; + }, + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Or enter a cycle ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + focusedBorder: UnderlineInputBorder( + // borderRadius: BorderRadius.only(Radius.circular(4)), + borderSide: BorderSide( + color: Colors.grey, + ), + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ), + ), + SizedBox( + height: 70, + ), + InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + launch( + 'https://cssd-doc.com/Show/Cycle/${idCTRL.text}', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: idCTRL.text, + // ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPink, kPinkSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Search', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/CyclePages/cycle_update_screen.dart b/lib/pages/CyclePages/cycle_update_screen.dart new file mode 100644 index 0000000..abf9076 --- /dev/null +++ b/lib/pages/CyclePages/cycle_update_screen.dart @@ -0,0 +1,281 @@ +import 'package:cssd/models/cycles_models.dart'; +import 'package:cssd/providers/cycles.dart'; +import 'package:cssd/widgets/CycleScreens/Add/cycle_update_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart' as DateEditor; +import 'package:provider/provider.dart'; +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Add/date_picker.dart'; + +class CycleUpdateScreen extends StatefulWidget { + @override + _CycleUpdateScreenState createState() => _CycleUpdateScreenState(); +} + +class _CycleUpdateScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + final _descriptionFocusNode = FocusNode(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController sterilizerIdCTRL = new TextEditingController(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController dateCTRL = new TextEditingController(); + TextEditingController labelCTRL = new TextEditingController(); + + final _form = GlobalKey(); + + // List> labelVals = []; + // List labelValue = []; + bool isEmpty = false; + bool isInit = true; + CycleDetailObject? datas; + @override + void initState() { + dateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showCycleResult(_id.toString()) + .then( + (result) { + setState( + () { + datas = result; + cycleNumberCTRL.text = datas!.cycleNumber; + sterilizerIdCTRL.text = datas!.sterileId; + descriptionCTRL.text = datas!.description; + dateCTRL.text = datas!.date; + // for (var label in datas!.labels) { + // labelCTRL.text = label; + // } + }, + ); + }, + ); + await Provider.of(context, listen: false) + .getLabelFilters() + .then( + (result) { + setState( + () { + // labelVals = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.cycleResultScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + backgroundColor: Colors.black, + title: Text('Cycles'), + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.cycleResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator(color: Colors.black), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Update a Cycle', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Strilizer ID required!'; + } + return null; + }, + controller: sterilizerIdCTRL, + decoration: InputDecoration( + icon: Icon(FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize), + isDense: true, + labelText: 'Strilizer ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_cycleNumberFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Cycle number required!'; + } + return null; + }, + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Cycle Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocusNode); + }, + ), + SizedBox( + height: 20, + ), + LabelAddDatePicker( + dateCTRL: dateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Date', + ), + // SizedBox( + // height: 20.0, + // ), + // Consumer( + // builder: (ctx, cycleProvider, _) => + // ListView.builder( + // physics: NeverScrollableScrollPhysics(), + // shrinkWrap: true, + // itemBuilder: (ctx, index) => AddLabelBox( + // text: 'Select Labels included', + // iconColor: kPinkSub, + // deviceBlockSize: _deviceBlockSize, + // values: cycleProvider.labelValues[index], + // vals: cycleProvider.labelVals, + // initialLabelValue: labelCTRL.text, + // index: index, + // ), + // itemCount: cycleProvider.labelValues.length, + // ), + // ), + SizedBox( + height: 20, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocusNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 70, + ), + CycleUpdateButton( + form: _form, + id: datas!.id, + cycleNumberCTRL: cycleNumberCTRL, + dateCTRL: dateCTRL, + // labelValue: labelCTRL, + striizerIdCTRL: sterilizerIdCTRL, + deviceBlockSize: _deviceBlockSize, + descriptionCTRL: descriptionCTRL, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/ItemPages/item_add_screen.dart b/lib/pages/ItemPages/item_add_screen.dart new file mode 100644 index 0000000..620b82a --- /dev/null +++ b/lib/pages/ItemPages/item_add_screen.dart @@ -0,0 +1,342 @@ +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/ItemScreens/Add/item_save_button.dart'; +import 'package:cssd/widgets/ItemScreens/Add/upload_image.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; +import 'package:random_string/random_string.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ItemAddScreen extends StatefulWidget { + @override + _ItemAddScreenState createState() => _ItemAddScreenState(); +} + +class _ItemAddScreenState extends State { + final _itemSizeFocusNode = FocusNode(); + final _itemSpecificFocusNode = FocusNode(); + final _itemUdiFocusNode = FocusNode(); + final _descriptionFocusNode = FocusNode(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController specificCTRL = new TextEditingController(); + TextEditingController sizeCTRL = new TextEditingController(); + TextEditingController dateCTRL = new TextEditingController(); + final _form = GlobalKey(); + bool isInit = true; + ItemFilterObject? filters; + final batchId = randomString(10); + + int curLabelVal = 1; + @override + void initState() { + descriptionCTRL.text = ''; + udiCTRL.text = ''; + nameCTRL.text = ''; + sizeCTRL.text = ''; + specificCTRL.text = ''; + dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + var itemProviderObject = Provider.of(context); + itemProviderObject.getItemResults().then( + (result) { + setState( + () { + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + final itemProviderObject = Provider.of(context); + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.itemResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.itemResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Add an Item', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Name required!'; + } + return null; + }, + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Item Name', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSizeFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Size required!'; + } + return null; + }, + controller: sizeCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Size', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSizeFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSpecificFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Specific required!'; + } + return null; + }, + controller: specificCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Specific', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSpecificFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemUdiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'UDI required!'; + } + return null; + }, + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'UDI', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemUdiFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocusNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 30.0, + ), + UploaderImage( + deviceBlockSize: _deviceBlockSize, + providerObject: itemProviderObject, + ), + SizedBox( + height: 70, + ), + ItemAddSaveButton( + form: _form, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + descriptionCTRL: descriptionCTRL, + sizeCTRL: sizeCTRL, + specificCTRL: specificCTRL, + batchId: batchId, + dateValue: dateCTRL.text, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/ItemPages/item_detail_screen.dart b/lib/pages/ItemPages/item_detail_screen.dart new file mode 100644 index 0000000..0ed55fb --- /dev/null +++ b/lib/pages/ItemPages/item_detail_screen.dart @@ -0,0 +1,90 @@ +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/ItemScreens/Details/item_detail_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ItemDetailScreen extends StatefulWidget { + final String? testResultId; + + ItemDetailScreen({ + this.testResultId, + }); + + @override + _ItemDetailScreenState createState() => _ItemDetailScreenState(); +} + +class _ItemDetailScreenState extends State { + bool isInit = true; + bool isEmpty = false; + ItemDetailObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showItemResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Item does\'nt exists!'), + ) + : ItemDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/ItemPages/item_filter_screen.dart b/lib/pages/ItemPages/item_filter_screen.dart new file mode 100644 index 0000000..922c939 --- /dev/null +++ b/lib/pages/ItemPages/item_filter_screen.dart @@ -0,0 +1,409 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:cssd/widgets/ItemScreens/Filter/item_filter_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Filter/selector_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ItemFilterScreen extends StatefulWidget { + @override + _ItemFilterScreenState createState() => _ItemFilterScreenState(); +} + +class _ItemFilterScreenState extends State { + final _itemSizeFocusNode = FocusNode(); + final _itemNameFocusNode = FocusNode(); + final _itemUdiFocusNode = FocusNode(); + final _itemSpecificFocusNode = FocusNode(); + TextEditingController idCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController sizeCTRL = new TextEditingController(); + TextEditingController specificCTRL = new TextEditingController(); + + List> hospitalVals = []; + bool isInit = true; + ItemFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + idCTRL.text = filters!.id; + hospitalCTRL.text = filters!.hospital; + nameCTRL.text = filters!.name; + sizeCTRL.text = filters!.size; + specificCTRL.text = filters!.specific; + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + // var _id = ModalRoute.of(context).settings.arguments; + await Provider.of(context, listen: false) + .getHospitalsFilters() + .then( + (result) { + setState( + () { + hospitalVals = [ + {'id': '', 'name': ''} + ]; + for (var hospital in result) { + hospitalVals.add(hospital); + } + filters!.hospital == '' + ? hospitalCTRL.text = hospitalVals[0]['name']! + : hospitalVals.forEach( + //id convert to name + (hospital) { + if (hospital['id'] == filters!.hospital) { + hospitalCTRL.text = hospital['name']!; + } + }, + ); + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.itemResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.itemResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Filter Items', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Item ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemNameFocusNode); + }, + ), + ), + // Spacer(), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Item Name', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemNameFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemUdiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'UDI', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemUdiFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSizeFocusNode); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30.0, + ), + TextFormField( + controller: sizeCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Size', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSizeFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSpecificFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: specificCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Specific', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSpecificFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + ), + SizedBox( + height: 30, + ), + FilterHospitalBox( + deviceBlockSize: _deviceBlockSize, + hospitalCTRL: hospitalCTRL, + hospitalVals: hospitalVals, + label: 'Hospital', + ), + SizedBox( + height: 90, + ), + ItemFilterSaveButton( + hospitalVals: hospitalVals, + hospitalCTRL: hospitalCTRL, + idCTRL: idCTRL, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + sizeCTRL: sizeCTRL, + specificCTRL: specificCTRL, + deviceBlockSize: _deviceBlockSize, + firstColor: kBlue, + secondColor: kBlueSub, + push: Routes.itemResultScreen, + ), + SizedBox( + height: 100, + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/ItemPages/item_result_screen.dart b/lib/pages/ItemPages/item_result_screen.dart new file mode 100644 index 0000000..e04e6b1 --- /dev/null +++ b/lib/pages/ItemPages/item_result_screen.dart @@ -0,0 +1,294 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/ItemScreens/Filter/item_filter_object.dart'; +import 'package:cssd/widgets/ItemScreens/Result/item_data_box.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Result/banner.dart'; +import '../../widgets/CycleScreens/Result/search_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ItemResultScreen extends StatefulWidget { + final bool? isAdmin; + + ItemResultScreen({this.isAdmin}); + + @override + _ItemResultScreenState createState() => _ItemResultScreenState(); +} + +class _ItemResultScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var testResults = Provider.of(context); + testResults.setLoading(); + testResults.resetPageNumber(); + testResults.getItemResults().then((_) { + testResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var testResults = Provider.of( + context, + listen: false, + ); + testResults.getItemResults(); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + floatingActionButton: ItemResultFloatingButton( + deviceBlockSize: _deviceBlockSize, + ), + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Items', + push: Routes.itemFilterScreen, + ), + Consumer( + builder: (ctx, item, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + item.filters!.id != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + name: item.filters!.name, + udi: item.filters!.udi, + hospital: item.filters!.hospital, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.name != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Item Name', + id: item.filters!.id, + name: '', + udi: item.filters!.udi, + hospital: item.filters!.hospital, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.udi != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'UDI', + id: item.filters!.id, + name: item.filters!.name, + udi: '', + hospital: item.filters!.hospital, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.hospital != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Hospital', + id: item.filters!.id, + name: item.filters!.name, + hospital: '', + udi: item.filters!.udi, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.size != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Size', + id: item.filters!.id, + name: item.filters!.name, + udi: item.filters!.udi, + hospital: item.filters!.hospital, + size: '', + specific: item.filters!.specific, + ) + : Container(), + item.filters!.specific != '' + ? ItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Specific', + id: item.filters!.id, + name: item.filters!.name, + udi: item.filters!.udi, + hospital: item.filters!.hospital, + size: item.filters!.size, + specific: '', + ) + : Container(), + ], + ), + ); + }, + ), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'item', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + Provider.of(context, listen: false) + .search(value); + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, itemResults, _) { + return itemResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + // remove extra , + return ItemItemBox( + deviceBlockSize: _deviceBlockSize, + item: itemResults.items?[index], + ); + }, + itemCount: itemResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} + +class ItemResultFloatingButton extends StatelessWidget { + const ItemResultFloatingButton({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.itemScanScreen); + }, + child: Container( + padding: EdgeInsets.all(2.5 * _deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 7.1 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushReplacementNamed(Routes.itemAddScreen); + }, + child: Container( + padding: EdgeInsets.all(_deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kBlue, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/ItemPages/item_scan_screen.dart b/lib/pages/ItemPages/item_scan_screen.dart new file mode 100644 index 0000000..09e86b9 --- /dev/null +++ b/lib/pages/ItemPages/item_scan_screen.dart @@ -0,0 +1,195 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ItemScanScreen extends StatefulWidget { + @override + State createState() { + return _ItemScanScreenState(); + } +} + +class _ItemScanScreenState extends State { + TextEditingController idCTRL = new TextEditingController(); + final _form = GlobalKey(); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.only(top: 30), + child: Text( + 'Looking for a Item?', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5.5 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 3, + ), + ), + ), + GestureDetector( + child: Container( + margin: EdgeInsets.symmetric(vertical: 10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'Please Scan The Item Barcode', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + textAlign: TextAlign.center, + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + launch( + 'https://cssd-doc.com/Show/Item/$result', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: result, + // ); + } + }, + ); + }, + ), + SizedBox( + height: 10.0, + ), + Form( + key: _form, + child: TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Id required!!'; + } + return null; + }, + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Or enter a Item ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + focusedBorder: UnderlineInputBorder( + // borderRadius: BorderRadius.only(Radius.circular(4)), + borderSide: BorderSide( + color: Colors.grey, + ), + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ), + ), + SizedBox( + height: 70, + ), + InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + launch( + 'https://cssd-doc.com/Show/Item/${idCTRL.text}', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: idCTRL.text, + // ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kBlue, kBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Search', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/ItemPages/item_update_screen.dart b/lib/pages/ItemPages/item_update_screen.dart new file mode 100644 index 0000000..0c59ec0 --- /dev/null +++ b/lib/pages/ItemPages/item_update_screen.dart @@ -0,0 +1,316 @@ +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/ItemScreens/Add/item_update_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ItemUpdateScreen extends StatefulWidget { + @override + _ItemUpdateScreenState createState() => _ItemUpdateScreenState(); +} + +class _ItemUpdateScreenState extends State { + final _itemSizeFocusNode = FocusNode(); + final _itemSpecificFocusNode = FocusNode(); + final _itemUdiFocusNode = FocusNode(); + final _descriptionFocusNode = FocusNode(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController specificCTRL = new TextEditingController(); + TextEditingController sizeCTRL = new TextEditingController(); + TextEditingController dateCTRL = new TextEditingController(); + + final _form = GlobalKey(); + + bool isEmpty = false; + bool isInit = true; + ItemDetailObject? datas; + + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showItemResult(_id.toString()) + .then( + (result) { + setState( + () { + datas = result; + nameCTRL.text = datas!.name; + udiCTRL.text = datas!.udi; + descriptionCTRL.text = datas!.description; + sizeCTRL.text = datas!.size; + specificCTRL.text = datas!.specific; + }, + ); + }, + ); + await Provider.of(context, listen: false) + .getItemResults() + .then( + (result) { + setState( + () { + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.itemResultScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + backgroundColor: Colors.black, + title: Text('Items'), + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.itemResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator(color: Colors.black), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Update a Item', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Name required!'; + } + return null; + }, + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon(FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize), + isDense: true, + labelText: 'Item Name', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSizeFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Size required!'; + } + return null; + }, + controller: sizeCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Size', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSizeFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSpecificFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + controller: specificCTRL, + validator: (val) { + if (val!.isEmpty) { + return 'Specific required!'; + } + return null; + }, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Specific', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + focusNode: _itemSpecificFocusNode, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemUdiFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + controller: udiCTRL, + validator: (val) { + if (val!.isEmpty) { + return 'UDI required!'; + } + return null; + }, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'UDI', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + focusNode: _itemUdiFocusNode, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocusNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 70, + ), + ItemUpdateButton( + form: _form, + id: datas!.id, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + sizeCTRL: sizeCTRL, + specificCTRL: specificCTRL, + deviceBlockSize: _deviceBlockSize, + descriptionCTRL: descriptionCTRL, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/LabelPages/label_add_screen.dart b/lib/pages/LabelPages/label_add_screen.dart new file mode 100644 index 0000000..64bb010 --- /dev/null +++ b/lib/pages/LabelPages/label_add_screen.dart @@ -0,0 +1,353 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:cssd/widgets/LabelScreens/Add/add_package_box.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart' as DateEditor; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/labels.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Add/date_picker.dart'; +import '../../widgets/LabelScreens/Add/save_button.dart'; + +class LabelAddScreen extends StatefulWidget { + @override + _LabelAddScreenState createState() => _LabelAddScreenState(); +} + +class _LabelAddScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + TextEditingController lotNumberCTRL = new TextEditingController(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController striizerIdCTRL = new TextEditingController(); + TextEditingController sDateCTRL = new TextEditingController(); + TextEditingController eDateCTRL = new TextEditingController(); + TextEditingController packageCTRL = new TextEditingController(); + + DateTime? dateTimeS; + + final _form = GlobalKey(); + + List> packageVals = []; + List packageValue = []; + bool isInit = true; + + List labelsCTRL = [TextEditingController()]; + int curLabelVal = 1; + @override + void initState() { + sDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); + eDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + var labelProviderObject = Provider.of(context); + labelProviderObject.resetPackageVals(); + labelProviderObject.getPackageFilters().then( + (result) { + setState( + () { + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.labelResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Labels'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.labelResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Add a Label', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + onChanged: (val) { + setState(() { + lotNumberCTRL.text = val + + ' - ' + + cycleNumberCTRL.text; + }); + }, + validator: (val) { + if (val!.isEmpty) { + return 'Strilizer ID required!'; + } + return null; + }, + controller: striizerIdCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons + .sortNumericDown, + size: 7 * _deviceBlockSize), + isDense: true, + labelText: 'Strilizer ID', + contentPadding: + EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: + TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context).requestFocus( + _cycleNumberFocusNode); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + striizerIdCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 20, + ), + TextFormField( + onChanged: (val) { + setState( + () { + lotNumberCTRL.text = + striizerIdCTRL.text + ' - ' + val; + }, + ); + }, + validator: (val) { + if (val!.isEmpty) { + return 'Cycle number required!'; + } + return null; + }, + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Cycle Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.done, + ), + SizedBox( + height: 20, + ), + TextFormField( + readOnly: true, + controller: lotNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Lot Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + ), + SizedBox( + height: 20, + ), + Container( + margin: EdgeInsets.symmetric(vertical: 10), + child: Text( + 'Packages included', + style: TextStyle( + color: kLightBlue, + letterSpacing: 2, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + Consumer( + builder: (ctx, labelProvider, _) => + ListView.builder( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (ctx, index) => + AddPackageBox( + text: 'Package ID', + iconColor: kLightBlueSub, + deviceBlockSize: _deviceBlockSize, + values: + labelProvider.packageValues[index], + vals: labelProvider.packageVals, + initialLabelValue: + labelProvider.initialPackageValue, + index: index, + ), + itemCount: + labelProvider.packageValues.length, + ), + ), + SizedBox( + height: 10, + ), + LabelAddDatePicker( + dateCTRL: sDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Sterile Date', + ), + SizedBox( + height: 20, + ), + LabelAddDatePicker( + dateCTRL: eDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Expire Date', + ), + SizedBox( + height: 70, + ), + LabelAddSaveButton( + form: _form, + lotNumberCTRL: lotNumberCTRL, + cycleNumberCTRL: cycleNumberCTRL, + sDateCTRL: sDateCTRL, + packageValue: packageValue, + eDateCTRL: eDateCTRL, + striizerIdCTRL: striizerIdCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/label_detail_screen.dart b/lib/pages/LabelPages/label_detail_screen.dart similarity index 75% rename from lib/pages/label_detail_screen.dart rename to lib/pages/LabelPages/label_detail_screen.dart index fdc09a1..751cf2f 100644 --- a/lib/pages/label_detail_screen.dart +++ b/lib/pages/LabelPages/label_detail_screen.dart @@ -1,85 +1,88 @@ -import '../models/label_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/labels.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/LabelScreens/Detail/datas_box.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -class LabelDetailScreen extends StatefulWidget { - // static const route = '/LabelDetailScreen'; - // final String testResultId; - - // LabelDetailScreen({this.testResultId}); - - @override - _LabelDetailScreenState createState() => _LabelDetailScreenState(); -} - -class _LabelDetailScreenState extends State { - bool isEmpty = false; - bool isInit = true; - LabelDetailsObject datas; - @override - void didChangeDependencies() async { - if (isInit) { - var _id = ModalRoute.of(context).settings.arguments; - await Provider.of(context, listen: false) - .showLabelResult(_id.toString()) - .then( - (result) { - setState( - () { - if (result.id == 'null') { - isEmpty = true; - } - datas = result; - isInit = false; - }, - ); - }, - ); - // print(datas); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Labels'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : isEmpty - ? Center( - child: Text('This Lable doesnt exists!'), - ) - : LabelDetailsDataBox( - datas: datas, - deviceBlockSize: _deviceBlockSize, - ) - : ConnectionErrorBox(); - }), - ), - ); - } -} +import '../../models/label_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/labels.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Detail/datas_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class LabelDetailScreen extends StatefulWidget { + // static const route = '/LabelDetailScreen'; + // final String testResultId; + + // LabelDetailScreen({this.testResultId}); + + @override + _LabelDetailScreenState createState() => _LabelDetailScreenState(); +} + +class _LabelDetailScreenState extends State { + bool isEmpty = false; + bool isInit = true; + LabelDetailsObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showLabelResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + // print(datas); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Labels'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer(builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Label dos\'nt exists!'), + ) + : LabelDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + ) + : ConnectionErrorBox(); + }), + ), + ); + } +} diff --git a/lib/pages/LabelPages/label_filter_screen.dart b/lib/pages/LabelPages/label_filter_screen.dart new file mode 100644 index 0000000..8f187bb --- /dev/null +++ b/lib/pages/LabelPages/label_filter_screen.dart @@ -0,0 +1,332 @@ +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/label_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/labels.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Filter/save_button.dart'; +import '../../widgets/LabelScreens/Filter/selector_box.dart'; + +class LabelFilterScreen extends StatefulWidget { + @override + _LabelFilterScreenState createState() => _LabelFilterScreenState(); +} + +class _LabelFilterScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + final _strilizerIdFocusNode = FocusNode(); + + TextEditingController labelIdCTRl = new TextEditingController(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController striizerIdCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + + TextEditingController dateCTRL = new TextEditingController(); + DateTime? dateTimeFrom; + + List> hospitalVals = []; + bool isInit = true; + LabelFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + labelIdCTRl.text = filters!.id; + cycleNumberCTRL.text = filters!.cycleNumber; + striizerIdCTRL.text = filters!.sterilizerId; + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + await Provider.of(context, listen: false) + .getHospitalsFilters() + .then( + (result) { + setState( + () { + hospitalVals = [ + {'id': '', 'name': ''} + ]; + for (var hospital in result) { + hospitalVals.add(hospital); + } + // hospitalVals = result; + filters!.hospital == '' + ? hospitalCTRL.text = hospitalVals[0]['name']! + : hospitalVals.forEach( + //id convert to name + (hospital) { + if (hospital['id'] == filters!.hospital) + hospitalCTRL.text = hospital['name']!; + }, + ); + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.labelResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Labels'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.labelResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Filter Labels', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: labelIdCTRl, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Label ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context).requestFocus( + _cycleNumberFocusNode); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + labelIdCTRl.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Cycle Number', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_strilizerIdFocusNode); + }, + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: striizerIdCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Strilizer ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + textInputAction: TextInputAction.done, + keyboardType: + TextInputType.visiblePassword, + focusNode: _strilizerIdFocusNode, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + striizerIdCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30, + ), + LabelFilterSelectorBox( + deviceBlockSize: _deviceBlockSize, + hospitalCTRL: hospitalCTRL, + hospitalVals: hospitalVals, + ), + SizedBox( + height: 70, + ), + LabelFilterSaveButton( + hospitalVals: hospitalVals, + hospitalCTRL: hospitalCTRL, + labelIdCTRl: labelIdCTRl, + cycleNumberCTRL: cycleNumberCTRL, + striizerIdCTRL: striizerIdCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 50, + ), + // DropDownBox(values: ['Washer ID']), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/LabelPages/label_result_screen.dart b/lib/pages/LabelPages/label_result_screen.dart new file mode 100644 index 0000000..536f9de --- /dev/null +++ b/lib/pages/LabelPages/label_result_screen.dart @@ -0,0 +1,195 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/labels.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/Global/page_header.dart'; +import '../../widgets/LabelScreens/Result/data_box.dart'; +import '../../widgets/LabelScreens/Result/filter_chip_box.dart'; +import '../../widgets/LabelScreens/Result/floating_buttons.dart'; +import '../../widgets/LabelScreens/Result/search_box.dart'; + +class LabelResultScreen extends StatefulWidget { + // static const route = '/LabelResultScreen'; + final bool? isAdmin; + + LabelResultScreen({this.isAdmin}); + + @override + _LabelResultScreenState createState() => _LabelResultScreenState(); +} + +class _LabelResultScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.setLoading(); + labelProviderObject.resetPageNumber(); + labelProviderObject.getLabelResults().then((_) { + labelProviderObject.resetLoading(); + sc!.addListener(() { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.getLabelResults(); + } + }); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + floatingActionButton: + LabelFloatingButtons(deviceBlockSize: _deviceBlockSize), + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, right: 20, bottom: 60, left: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + PageHeader( + deviceBlockSize: _deviceBlockSize, + label: 'Labels', + route: Routes.labelFilterScreen, + ), + Consumer( + builder: (context, label, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + label.filters.id != '' + ? LabelFilterChip( + deviceBlockSize: _deviceBlockSize, + id: '', + cycleNumber: + label.filters.cycleNumber, + sterilizerId: + label.filters.sterilizerId, + hospital: label.filters.hospital, + label: 'ID', + ) + : Container(), + label.filters.cycleNumber != '' + ? LabelFilterChip( + deviceBlockSize: _deviceBlockSize, + id: label.filters.id, + cycleNumber: '', + sterilizerId: + label.filters.sterilizerId, + hospital: label.filters.hospital, + label: 'Cycle Number', + ) + : Container(), + label.filters.sterilizerId != '' + ? LabelFilterChip( + deviceBlockSize: _deviceBlockSize, + id: label.filters.id, + cycleNumber: + label.filters.cycleNumber, + sterilizerId: '', + hospital: label.filters.hospital, + label: 'Sterilizer ID', + ) + : Container(), + label.filters.hospital != '' + ? LabelFilterChip( + deviceBlockSize: _deviceBlockSize, + id: label.filters.id, + cycleNumber: + label.filters.cycleNumber, + sterilizerId: + label.filters.sterilizerId, + hospital: '', + label: 'Hospital', + ) + : Container(), + ], + ), + ); + }, + ), + LabelSearchBox( + searchCTRL: searchCTRL, + deviceBlockSize: _deviceBlockSize), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, labelResults, _) { + return labelResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) => + LabelItemBox( + deviceBlockSize: _deviceBlockSize, + item: labelResults.items?[index], + ), + itemCount: labelResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/LabelPages/label_scan_screen.dart b/lib/pages/LabelPages/label_scan_screen.dart new file mode 100644 index 0000000..69a7cc6 --- /dev/null +++ b/lib/pages/LabelPages/label_scan_screen.dart @@ -0,0 +1,96 @@ +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Scan/input_box.dart'; +import '../../widgets/LabelScreens/Scan/save_button.dart'; +import '../../widgets/LabelScreens/Scan/scan_box.dart'; +// import 'package:flutter/services.dart'; +// import 'package:barcode_scan2/barcode_scan2.dart'; + +class LabelScanScreen extends StatefulWidget { + // static const route = '/LabelScanScreen'; + @override + State createState() { + return _LabelScanScreenState(); + } +} + +class _LabelScanScreenState extends State { + String testCode = ""; + TextEditingController idCTRL = new TextEditingController(); + final _form = GlobalKey(); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Labels'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.only(top: 30), + child: Text( + 'Looking for a Label?', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5.5 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 3, + ), + ), + ), + LabelScanBox(), + SizedBox( + height: 10, + ), + Form( + key: _form, + child: LabelScanInputBox( + idCTRL: idCTRL, + deviceBlockSize: _deviceBlockSize, + ), + ), + SizedBox( + height: 70, + ), + FilterScanSaveButton( + form: _form, + idCTRL: idCTRL, + deviceBlockSize: _deviceBlockSize, + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/LabelPages/label_update_screen.dart b/lib/pages/LabelPages/label_update_screen.dart new file mode 100644 index 0000000..9541141 --- /dev/null +++ b/lib/pages/LabelPages/label_update_screen.dart @@ -0,0 +1,309 @@ +import 'package:cssd/widgets/LabelScreens/Add/selector_box.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart' as DateEditor; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/label_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/labels.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/LabelScreens/Add/date_picker.dart'; +import '../../widgets/LabelScreens/Add/update_button.dart'; + +class LabelUpdateScreen extends StatefulWidget { + // static const route = '/LabelUpdateScreen'; + + @override + _LabelUpdateScreenState createState() => _LabelUpdateScreenState(); +} + +class _LabelUpdateScreenState extends State { + final _cycleNumberFocusNode = FocusNode(); + final _lotNumberFocusNode = FocusNode(); + TextEditingController lotNumberCTRL = new TextEditingController(); + TextEditingController cycleNumberCTRL = new TextEditingController(); + TextEditingController striizerIdCTRL = new TextEditingController(); + TextEditingController sDateCTRL = new TextEditingController(); + TextEditingController eDateCTRL = new TextEditingController(); + TextEditingController packageCTRL = new TextEditingController(); + + DateTime? dateTimeS; + // String sDateValue; + // String eDateValue; + + final _form = GlobalKey(); + + List> packageVals = []; + List packageValue = []; + bool isEmpty = false; + bool isInit = true; + LabelDetailsObject? datas; + + @override + void initState() { + sDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); + eDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showLabelResult(_id.toString()) + .then( + (result) { + setState( + () { + // if (result.id == 'null') { + // isEmpty = true; + // } + datas = result; + lotNumberCTRL.text = datas!.lotNumber; + cycleNumberCTRL.text = datas!.cycleNumber; + striizerIdCTRL.text = datas!.sterileId; + sDateCTRL.text = datas!.sterileDate; + eDateCTRL.text = datas!.expireDate; + packageValue.add(datas!.packageId); + packageValue.add(datas!.package); + packageCTRL.text = datas!.package; + }, + ); + }, + ); + await Provider.of(context, listen: false) + .getPackageFilters() + .then( + (result) { + setState( + () { + // packageVals = result.map((value) => {"name": value}).toList(); + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.labelResultScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + backgroundColor: Colors.black, + title: Text('Labels'), + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.labelResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator(color: Colors.black), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Update a Label', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + onChanged: (val) { + setState(() { + lotNumberCTRL.text = + val + ' - ' + cycleNumberCTRL.text; + }); + }, + validator: (val) { + if (val!.isEmpty) { + return 'Strilizer ID required!'; + } + return null; + }, + controller: striizerIdCTRL, + decoration: InputDecoration( + icon: Icon(FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize), + isDense: true, + labelText: 'Strilizer ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_cycleNumberFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + onChanged: (val) { + setState( + () { + lotNumberCTRL.text = + striizerIdCTRL.text + ' - ' + val; + }, + ); + }, + validator: (val) { + if (val!.isEmpty) { + return 'Cycle number required!'; + } + return null; + }, + controller: cycleNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Cycle Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _cycleNumberFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_lotNumberFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + readOnly: true, + controller: lotNumberCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Lot Number', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + focusNode: _lotNumberFocusNode, + ), + SizedBox( + height: 20, + ), + LabelAddSelectorBox( + deviceBlockSize: _deviceBlockSize, + packageCTRL: packageCTRL, + packageVals: packageVals, + packageValue: packageValue, + ), + SizedBox( + height: 20, + ), + LabelAddDatePicker( + dateCTRL: sDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Sterile Date', + ), + SizedBox( + height: 20, + ), + LabelAddDatePicker( + dateCTRL: eDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Expire Date', + ), + SizedBox( + height: 70, + ), + LabelUpdateButton( + form: _form, + id: datas!.id, + lotNumberCTRL: lotNumberCTRL, + cycleNumberCTRL: cycleNumberCTRL, + sDateCTRL: sDateCTRL, + packageValue: packageValue, + eDateCTRL: eDateCTRL, + striizerIdCTRL: striizerIdCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/forget_pass_screen.dart b/lib/pages/LoginRegisterPages/forget_pass_screen.dart similarity index 83% rename from lib/pages/forget_pass_screen.dart rename to lib/pages/LoginRegisterPages/forget_pass_screen.dart index 2ba5bce..d1b7944 100644 --- a/lib/pages/forget_pass_screen.dart +++ b/lib/pages/LoginRegisterPages/forget_pass_screen.dart @@ -1,198 +1,196 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/auth.dart'; -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class ForgetPassScreen extends StatefulWidget { - // static const route = '/HomeScreen'; - - @override - State createState() { - return _ForgetPassScreenState(); - } -} - -class _ForgetPassScreenState extends State { - final _form = GlobalKey(); - bool _isLoading = false; - final cellNumberController = TextEditingController(); - - @override - void initState() { - cellNumberController.text = ''; - super.initState(); - } - - @override - void dispose() { - super.dispose(); - } - - void _showDialog(String message) { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('Error'), - content: Text(message), - actions: [ - TextButton( - child: Text('Ok'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ); - } - - void _requestCode() async { - if (!_form.currentState.validate()) { - return; - } - _form.currentState.save(); - setState(() { - _isLoading = true; - }); - // try { - await Provider.of(context, listen: false) - .requestCode( - cellNumberController.text, - ) - .then( - (result) { - if (result == 'NotUser') { - _showDialog('User Not Found!!!'); - setState( - () { - _isLoading = false; - }, - ); - } else { - // _showDialog('User or password incorrect!'); - Navigator.of(context).popAndPushNamed(Routes.sendCodeScreen); - // setState( - // () { - // _isLoading = false; - // }, - // ); - } - }, - ); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('CSSD'), - ), - body: Selector( - builder: (ctx, value, _) => value != 'offline' - ? _isLoading - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.symmetric(vertical: 20), - child: Text( - 'FORGET PASSWORD', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - fontWeight: FontWeight.w700, - ), - ), - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Cell number is required.'; - } - RegExp regExp = - RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); - if (!regExp.hasMatch(value)) { - return 'Enter a valid cell number'; - } - return null; - }, - controller: cellNumberController, - decoration: InputDecoration( - icon: Icon( - Icons.call, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cell Number', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.phone, - textInputAction: TextInputAction.next, - onSaved: (value) { - cellNumberController.text = value; - }, - ), - SizedBox(height: 40), - Row( - children: [ - InkWell( - onTap: () => _requestCode(), - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Text( - 'Request Code', - style: TextStyle(color: Colors.white), - ), - ), - ), - Spacer(), - ], - ), - SizedBox(height: 10), - ], - ), - ) - : ConnectionErrorBox(), - selector: (_, connectivity) => connectivity.conStatus, - ), - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/auth.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class ForgetPassScreen extends StatefulWidget { + // static const route = '/HomeScreen'; + + @override + State createState() { + return _ForgetPassScreenState(); + } +} + +class _ForgetPassScreenState extends State { + final _form = GlobalKey(); + bool _isLoading = false; + final cellNumberController = TextEditingController(); + + @override + void initState() { + cellNumberController.text = ''; + super.initState(); + } + + @override + void dispose() { + super.dispose(); + } + + void _showDialog(String message) { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Error'), + content: Text(message), + actions: [ + TextButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ); + } + + void _requestCode() async { + if (!_form.currentState!.validate()) { + return; + } + _form.currentState!.save(); + setState(() { + _isLoading = true; + }); + // try { + await Provider.of(context, listen: false) + .requestCode( + cellNumberController.text, + ) + .then( + (result) { + if (result == 'NotUser') { + _showDialog('User Not Found!!!'); + setState( + () { + _isLoading = false; + }, + ); + } else { + // _showDialog('User or password incorrect!'); + Navigator.of(context).popAndPushNamed(Routes.sendCodeScreen); + // setState( + // () { + // _isLoading = false; + // }, + // ); + } + }, + ); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text('CSSD'), + backgroundColor: Colors.black, + ), + body: Selector( + builder: (ctx, value, _) => value != 'offline' + ? _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 20), + child: Text( + 'Forget Password', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + fontWeight: FontWeight.w700, + ), + ), + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Cell number is required.'; + } + RegExp regExp = + RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); + if (!regExp.hasMatch(value)) { + return 'Enter a valid cell number'; + } + return null; + }, + controller: cellNumberController, + decoration: InputDecoration( + icon: Icon( + Icons.call, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Cell Number', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.phone, + textInputAction: TextInputAction.next, + onSaved: (value) { + cellNumberController.text = value!; + }, + ), + SizedBox(height: 40), + Row( + children: [ + InkWell( + onTap: () => _requestCode(), + child: Container( + width: 88 * _deviceBlockSize, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(7), + ), + child: Center( + child: Text( + 'Request Code', + style: TextStyle(color: Colors.white), + ), + ), + ), + ), + Spacer(), + ], + ), + SizedBox(height: 10), + ], + ), + ) + : ConnectionErrorBox(), + selector: (_, connectivity) => connectivity.conStatus, + ), + ), + ); + } +} diff --git a/lib/pages/LoginRegisterPages/login_screen.dart b/lib/pages/LoginRegisterPages/login_screen.dart new file mode 100644 index 0000000..b315034 --- /dev/null +++ b/lib/pages/LoginRegisterPages/login_screen.dart @@ -0,0 +1,289 @@ +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/auth.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class LoginScreen extends StatefulWidget { + // static const route = '/HomeScreen'; + + @override + State createState() { + return _LoginScreenState(); + } +} + +class _LoginScreenState extends State { + final _passwordFocusNode = FocusNode(); + final _form = GlobalKey(); + bool _isLoading = false; + final cellNumberController = TextEditingController(); + final passwordController = TextEditingController(); + + bool _hidePass = true; + Map map = Map(); + + @override + void initState() { + if (map['cellNumber'] != null) { + cellNumberController.text = map['cellNumber']; + } + super.initState(); + } + + @override + void dispose() { + _passwordFocusNode.dispose(); + super.dispose(); + } + + void _showDialog(String message) { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Error'), + content: Text(message), + actions: [ + TextButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ); + } + + void _login() async { + if (!_form.currentState!.validate()) { + return; + } + _form.currentState!.save(); + setState(() { + _isLoading = true; + }); + await Provider.of(context, listen: false) + .login( + map['cellNumber'], + map['password'], + ) + .then( + (result) { + if (result == 'error') { + _showDialog('Something went wrong!'); + setState( + () { + _isLoading = false; + }, + ); + } else if (result == 'badinput') { + _showDialog('User or password incorrect!'); + setState( + () { + _isLoading = false; + }, + ); + } + }, + ); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text('CSSD'), + backgroundColor: Colors.black, + ), + body: Selector( + builder: (ctx, value, _) => value != 'offline' + ? _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 20), + child: Text( + 'Login', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + fontWeight: FontWeight.w700, + ), + ), + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Call number is required.'; + } + RegExp regExp = + RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); + if (!regExp.hasMatch(value)) { + return 'Enter a valid cell number'; + } + return null; + }, + controller: cellNumberController, + decoration: InputDecoration( + icon: Icon( + Icons.call, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Call Number', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.phone, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_passwordFocusNode); + }, + onSaved: (value) { + map['cellNumber'] = value; + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Password is required.'; + } + if (value.length < 8) { + return 'Password at least is 8 characters.'; + } + return null; + }, + obscureText: _hidePass, + controller: passwordController, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.starOfLife, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Password', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + suffixIcon: InkWell( + child: Icon(FontAwesomeIcons.eye), + onTap: () { + setState(() { + _hidePass = !_hidePass; + }); + }, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + _login(); + }, + keyboardType: TextInputType.visiblePassword, + focusNode: _passwordFocusNode, + onSaved: (value) { + map['password'] = value; + }, + ), + SizedBox(height: 40), + InkWell( + onTap: () => _login(), + child: Container( + width: _devicewidth, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(7), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + Icons.exit_to_app, + color: Colors.white, + ), + SizedBox( + width: 5.0, + ), + Text( + 'Login', + style: TextStyle( + color: Colors.white, + ), + ), + ], + ), + ), + ), + SizedBox(height: 10), + TextButton( + child: Align( + alignment: Alignment.center, + child: Text( + 'Forgot Password ?', + style: TextStyle( + color: Colors.black54, + decoration: TextDecoration.underline, + ), + ), + ), + onPressed: () => Navigator.of(context) + .pushNamed(Routes.forgetPassScreen), + ), + ], + ), + ) + : ConnectionErrorBox(), + selector: (_, connectivity) => connectivity.conStatus, + )), + ), + ); + } +} diff --git a/lib/pages/rePass_screen.dart b/lib/pages/LoginRegisterPages/rePass_screen.dart similarity index 89% rename from lib/pages/rePass_screen.dart rename to lib/pages/LoginRegisterPages/rePass_screen.dart index f4f1c8d..3415819 100644 --- a/lib/pages/rePass_screen.dart +++ b/lib/pages/LoginRegisterPages/rePass_screen.dart @@ -1,243 +1,239 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../providers/auth.dart'; -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class RePassScreen extends StatefulWidget { - // static const route = '/HomeScreen'; - - @override - State createState() { - return _RePassScreenState(); - } -} - -class _RePassScreenState extends State { - final _form = GlobalKey(); - bool _isLoading = false; - // final cellNumberController = TextEditingController(); - final passwordController = new TextEditingController(); - final rePasswordController = new TextEditingController(); - String token = 'Bearer '; - // String token = 'Bearer '; - - bool _hidePass = true; - bool _hideRePass = true; - bool isInit = true; - - @override - void didChangeDependencies() { - if (isInit) { - token += ModalRoute.of(context).settings.arguments; - isInit = false; - } - super.didChangeDependencies(); - } - - Future _showDialog(String message) async { - await showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text(message), - actions: [ - TextButton( - child: Text('Ok'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ); - } - - void _sendRePass() async { - if (!_form.currentState.validate()) { - return; - } - _form.currentState.save(); - setState(() { - _isLoading = true; - }); - await Provider.of(context, listen: false) - .sendRePass(passwordController.text, token) - .then((value) async { - if (value == 'done') { - await _showDialog( - 'Password changed successfully.Now login to your account.'); - Navigator.of(context).pop(); - } - }); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('CSSD'), - ), - body: Selector( - builder: (ctx, value, _) => value != 'offline' - ? _isLoading - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.symmetric(vertical: 20), - child: Text( - 'CHANGE PASSWORD', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 6 * _deviceBlockSize, - letterSpacing: 3, - fontWeight: FontWeight.w700, - ), - ), - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Password is required.'; - } - if (value.length < 8) { - return 'Password at least is 8 characters.'; - } - return null; - }, - obscureText: _hidePass, - controller: passwordController, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.starOfLife, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Password', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - suffixIcon: InkWell( - child: Icon(FontAwesomeIcons.eye), - onTap: () { - setState(() { - _hidePass = !_hidePass; - }); - }, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - textInputAction: TextInputAction.done, - onFieldSubmitted: (_) { - _sendRePass(); - }, - keyboardType: TextInputType.visiblePassword, - ), - SizedBox( - height: 30, - ), - TextFormField( - validator: (value) { - if (value.length < 8) { - return 'Password at least is 8 characters.'; - } - if (value != passwordController.text) { - return 'Password doesnt match!'; - } - return null; - }, - obscureText: _hideRePass, - controller: rePasswordController, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.starOfLife, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Confirm Password', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - suffixIcon: InkWell( - child: Icon(FontAwesomeIcons.eye), - onTap: () { - setState(() { - _hideRePass = !_hideRePass; - }); - }, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - textInputAction: TextInputAction.done, - onFieldSubmitted: (_) { - _sendRePass(); - }, - keyboardType: TextInputType.visiblePassword, - ), - SizedBox(height: 40), - Row( - children: [ - InkWell( - onTap: () => _sendRePass(), - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Text( - 'Change', - style: TextStyle( - color: Colors.white, - ), - textAlign: TextAlign.center, - ), - ), - ), - Spacer(), - ], - ), - SizedBox(height: 10), - ], - ), - ) - : ConnectionErrorBox(), - selector: (_, connectivity) => connectivity.conStatus, - )), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/auth.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class RePassScreen extends StatefulWidget { + // static const route = '/HomeScreen'; + + @override + State createState() { + return _RePassScreenState(); + } +} + +class _RePassScreenState extends State { + final _form = GlobalKey(); + bool _isLoading = false; + // final cellNumberController = TextEditingController(); + final passwordController = new TextEditingController(); + final rePasswordController = new TextEditingController(); + String token = 'Bearer '; + // String token = 'Bearer '; + + bool _hidePass = true; + bool _hideRePass = true; + bool isInit = true; + + @override + void didChangeDependencies() { + if (isInit) { + token += ModalRoute.of(context)!.settings.arguments.toString(); + isInit = false; + } + super.didChangeDependencies(); + } + + Future _showDialog(String message) async { + await showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text(message), + actions: [ + TextButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ); + } + + void _sendRePass() async { + if (!_form.currentState!.validate()) { + return; + } + _form.currentState!.save(); + setState(() { + _isLoading = true; + }); + await Provider.of(context, listen: false) + .sendRePass(passwordController.text, token) + .then((value) async { + if (value == 'done') { + await _showDialog( + 'Password changed successfully.Now login to your account.'); + Navigator.of(context).pop(); + } + }); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text('CSSD'), + backgroundColor: Colors.black, + ), + body: Selector( + builder: (ctx, value, _) => value != 'offline' + ? _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 20), + child: Text( + 'CHANGE PASSWORD', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + fontWeight: FontWeight.w700, + ), + ), + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Password is required.'; + } + if (value.length < 8) { + return 'Password at least is 8 characters.'; + } + return null; + }, + obscureText: _hidePass, + controller: passwordController, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.starOfLife, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Password', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + suffixIcon: InkWell( + child: Icon(FontAwesomeIcons.eye), + onTap: () { + setState(() { + _hidePass = !_hidePass; + }); + }, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + _sendRePass(); + }, + keyboardType: TextInputType.visiblePassword, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (value) { + if (value!.length < 8) { + return 'Password at least is 8 characters.'; + } + if (value != passwordController.text) { + return 'Password doesnt match!'; + } + return null; + }, + obscureText: _hideRePass, + controller: rePasswordController, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.starOfLife, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Confirm Password', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + suffixIcon: InkWell( + child: Icon(FontAwesomeIcons.eye), + onTap: () { + setState(() { + _hideRePass = !_hideRePass; + }); + }, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + _sendRePass(); + }, + keyboardType: TextInputType.visiblePassword, + ), + SizedBox(height: 40), + Row( + children: [ + InkWell( + onTap: () => _sendRePass(), + child: Container( + width: 88 * _deviceBlockSize, + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(7), + ), + child: Text( + 'Change', + style: TextStyle( + color: Colors.white, + ), + textAlign: TextAlign.center, + ), + ), + ), + Spacer(), + ], + ), + SizedBox(height: 10), + ], + ), + ) + : ConnectionErrorBox(), + selector: (_, connectivity) => connectivity.conStatus, + )), + ); + } +} diff --git a/lib/pages/register.dart b/lib/pages/LoginRegisterPages/register.dart similarity index 94% rename from lib/pages/register.dart rename to lib/pages/LoginRegisterPages/register.dart index 1490ac9..ffbb792 100644 --- a/lib/pages/register.dart +++ b/lib/pages/LoginRegisterPages/register.dart @@ -1,379 +1,381 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class Register extends StatefulWidget { - // static const route = '/RegisterScreen'; - - @override - State createState() { - return _RegisterState(); - } -} - -class _RegisterState extends State { - final _passwordFocusNode = FocusNode(); - final _form = GlobalKey(); - bool _isLoading = false; - final cellNumberController = TextEditingController(); - bool _hidePass = true; - Map map = Map(); - final List hospitalVals = ['Shahid Beheshti', 'None']; - String curhospitalVal; - @override - void initState() { - cellNumberController.text = map['cellNumber']; - curhospitalVal = hospitalVals[0]; - super.initState(); - } - - @override - void dispose() { - _passwordFocusNode.dispose(); - super.dispose(); - } - - // void _showDialog(String message) { - // showDialog( - // context: context, - // builder: (ctx) => AlertDialog( - // title: Text('error occured'), - // content: Text(message), - // actions: [ - // TextButton( - // child: Text('Ok'), - // onPressed: () { - // Navigator.of(ctx).pop(); - // }, - // ), - // ], - // ), - // ); - // } - - void _register() async { - if (!_form.currentState.validate()) { - return; - } - _form.currentState.save(); - // setState(() { - // _isLoading = true; - // }); - // try { - // // await Provider.of(context).register( - // // map['cellNumber'], - // // map['password'], - // // ); - // } catch (error) { - // _showDialog('something went wrong!'); - // setState(() { - // _isLoading = false; - // }); - // } - - // Navigator.pushReplacement( - // context, - // MaterialPageRoute(builder: (context) { - // return HomePage(); - // }), - // ); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Login'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: _isLoading - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.symmetric(vertical: 20), - child: Text( - 'register', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 7 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Cell number is required.'; - } - RegExp regExp = RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); - if (!regExp.hasMatch(value)) { - return 'Enter a valid cell number'; - } - return null; - }, - style: TextStyle(fontWeight: FontWeight.w700), - keyboardType: TextInputType.phone, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context).requestFocus(_passwordFocusNode); - }, - controller: cellNumberController, - decoration: InputDecoration( - isDense: true, - icon: Icon( - Icons.call, - color: Colors.grey, - ), - border: UnderlineInputBorder(), - fillColor: Colors.red, - labelText: 'Cell Number', - contentPadding: EdgeInsets.symmetric(vertical: 5), - ), - onSaved: (value) { - map['cellNumber'] = value; - }, - ), - SizedBox( - height: 10, - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Password is required.'; - } - if (value.length < 8) { - return 'Password at least is 8 characters.'; - } - return null; - }, - obscureText: _hidePass, - textInputAction: TextInputAction.done, - onFieldSubmitted: (_) { - _register(); - }, - style: TextStyle(fontWeight: FontWeight.w700), - decoration: InputDecoration( - isDense: true, - icon: Icon( - FontAwesomeIcons.starOfLife, - color: Colors.grey, - ), - border: UnderlineInputBorder(), - fillColor: Colors.red, - labelText: 'Password', - contentPadding: EdgeInsets.symmetric(vertical: 5), - suffixIcon: InkWell( - child: Icon(FontAwesomeIcons.eye), - onTap: () { - setState(() { - _hidePass = !_hidePass; - }); - }, - ), - ), - focusNode: _passwordFocusNode, - onSaved: (value) { - map['password'] = value; - }, - ), - SizedBox( - height: 10, - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Full Name is required.'; - } - // RegExp regExp = RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); - // if (!regExp.hasMatch(value)) { - // return 'Enter a valid cell number'; - // } - return null; - }, - // keyboardType: TextInputType.phone, - // textInputAction: TextInputAction.next, - // onFieldSubmitted: (_) { - // FocusScope.of(context).requestFocus(_passwordFocusNode); - // }, - // controller: cellNumberController, - decoration: InputDecoration( - isDense: true, - icon: Icon( - FontAwesomeIcons.sortNumericDown, - color: Colors.grey, - ), - border: UnderlineInputBorder(), - fillColor: Colors.red, - labelText: 'Full Name', - contentPadding: EdgeInsets.symmetric(vertical: 5), - ), - style: TextStyle(fontWeight: FontWeight.w700), - // onSaved: (value) { - // map['cellNumber'] = value; - // }, - ), - SizedBox( - height: 20, - ), - Row( - // width: double.infinity, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 5 * _deviceBlockSize, - ), - SizedBox( - width: 3 * _deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: DropdownButton( - focusColor: Colors.red, - icon: Icon(FontAwesomeIcons.angleDown), - isExpanded: true, - hint: Padding( - padding: - const EdgeInsets.symmetric(horizontal: 4), - child: Text( - curhospitalVal, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - // color: _mainFontColor, - // fontSize: 5 * _deviceBlockSize, - ), - ), - ), - isDense: true, - items: hospitalVals.map((String value) { - return new DropdownMenuItem( - value: value, - child: Container( - child: Text( - value, - style: TextStyle( - // color: _mainFontColor, - fontSize: 4 * _deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - curhospitalVal = val; - }); - }, - ), - ), - ], - ), - SizedBox(height: 40), - Row( - children: [ - InkWell( - onTap: () => _register(), - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 5, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Spacer(), - Icon( - Icons.add, - color: Colors.white, - ), - Text( - 'register', - style: TextStyle(color: Colors.white), - ), - Spacer() - ], - ) - // TextButton.icon( - // padding: EdgeInsets.all(0), - // onPressed: () { - // _register(); - // }, - // icon: Icon(Icons.exit_to_app, - // color: Colors.white, size: 17), - // label: Text('register', - // style: TextStyle(color: Colors.white)), - // ), - ), - ), - Spacer(), - InkWell( - onTap: () { - Navigator.of(context).pop(); - }, - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 5, - ), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - border: Border.all( - color: Colors.black, - ), - ), - child: Row( - children: [ - Spacer(), - Icon( - Icons.exit_to_app, - // size: 6 * _pixelRatio, - ), - Text( - 'Login', - style: TextStyle( - // fontSize: 5.5, - ), - ), - Spacer(), - ], - ), - ), - ), - ], - ), - ], - ), - ), - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class Register extends StatefulWidget { + // static const route = '/RegisterScreen'; + + @override + State createState() { + return _RegisterState(); + } +} + +class _RegisterState extends State { + final _passwordFocusNode = FocusNode(); + final _form = GlobalKey(); + bool _isLoading = false; + final cellNumberController = TextEditingController(); + bool _hidePass = true; + Map map = Map(); + final List hospitalVals = ['Shahid Beheshti', 'None']; + String? curhospitalVal; + @override + void initState() { + cellNumberController.text = map['cellNumber']; + curhospitalVal = hospitalVals[0]; + super.initState(); + } + + @override + void dispose() { + _passwordFocusNode.dispose(); + super.dispose(); + } + + // void _showDialog(String message) { + // showDialog( + // context: context, + // builder: (ctx) => AlertDialog( + // title: Text('error occured'), + // content: Text(message), + // actions: [ + // TextButton( + // child: Text('Ok'), + // onPressed: () { + // Navigator.of(ctx).pop(); + // }, + // ), + // ], + // ), + // ); + // } + + void _register() async { + if (!_form.currentState!.validate()) { + return; + } + _form.currentState!.save(); + // setState(() { + // _isLoading = true; + // }); + // try { + // // await Provider.of(context).register( + // // map['cellNumber'], + // // map['password'], + // // ); + // } catch (error) { + // _showDialog('something went wrong!'); + // setState(() { + // _isLoading = false; + // }); + // } + + // Navigator.pushReplacement( + // context, + // MaterialPageRoute(builder: (context) { + // return HomePage(); + // }), + // ); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Login'), + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 20), + child: Text( + 'register', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 7 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Cell number is required.'; + } + RegExp regExp = RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); + if (!regExp.hasMatch(value)) { + return 'Enter a valid cell number'; + } + return null; + }, + style: TextStyle(fontWeight: FontWeight.w700), + keyboardType: TextInputType.phone, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context).requestFocus(_passwordFocusNode); + }, + controller: cellNumberController, + decoration: InputDecoration( + isDense: true, + icon: Icon( + Icons.call, + color: Colors.grey, + ), + border: UnderlineInputBorder(), + fillColor: Colors.red, + labelText: 'Cell Number', + contentPadding: EdgeInsets.symmetric(vertical: 5), + ), + onSaved: (value) { + map['cellNumber'] = value; + }, + ), + SizedBox( + height: 10, + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Password is required.'; + } + if (value.length < 8) { + return 'Password at least is 8 characters.'; + } + return null; + }, + obscureText: _hidePass, + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + _register(); + }, + style: TextStyle(fontWeight: FontWeight.w700), + decoration: InputDecoration( + isDense: true, + icon: Icon( + FontAwesomeIcons.starOfLife, + color: Colors.grey, + ), + border: UnderlineInputBorder(), + fillColor: Colors.red, + labelText: 'Password', + contentPadding: EdgeInsets.symmetric(vertical: 5), + suffixIcon: InkWell( + child: Icon(FontAwesomeIcons.eye), + onTap: () { + setState(() { + _hidePass = !_hidePass; + }); + }, + ), + ), + focusNode: _passwordFocusNode, + onSaved: (value) { + map['password'] = value; + }, + ), + SizedBox( + height: 10, + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Full Name is required.'; + } + // RegExp regExp = RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); + // if (!regExp.hasMatch(value)) { + // return 'Enter a valid cell number'; + // } + return null; + }, + // keyboardType: TextInputType.phone, + // textInputAction: TextInputAction.next, + // onFieldSubmitted: (_) { + // FocusScope.of(context).requestFocus(_passwordFocusNode); + // }, + // controller: cellNumberController, + decoration: InputDecoration( + isDense: true, + icon: Icon( + FontAwesomeIcons.sortNumericDown, + color: Colors.grey, + ), + border: UnderlineInputBorder(), + fillColor: Colors.red, + labelText: 'Full Name', + contentPadding: EdgeInsets.symmetric(vertical: 5), + ), + style: TextStyle(fontWeight: FontWeight.w700), + // onSaved: (value) { + // map['cellNumber'] = value; + // }, + ), + SizedBox( + height: 20, + ), + Row( + // width: double.infinity, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 5 * _deviceBlockSize, + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: DropdownButton( + focusColor: Colors.red, + icon: Icon(FontAwesomeIcons.angleDown), + isExpanded: true, + hint: Padding( + padding: + const EdgeInsets.symmetric(horizontal: 4), + child: Text( + curhospitalVal!, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + // color: _mainFontColor, + // fontSize: 5 * _deviceBlockSize, + ), + ), + ), + isDense: true, + items: hospitalVals.map((String value) { + return new DropdownMenuItem( + value: value, + child: Container( + child: Text( + value, + style: TextStyle( + // color: _mainFontColor, + fontSize: 4 * _deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState(() { + curhospitalVal = val; + }); + }, + ), + ), + ], + ), + SizedBox(height: 40), + Row( + children: [ + InkWell( + onTap: () => _register(), + child: Container( + width: 40 * _deviceBlockSize, + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 5, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [Colors.blue, Colors.green], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Spacer(), + Icon( + Icons.add, + color: Colors.white, + ), + Text( + 'register', + style: TextStyle(color: Colors.white), + ), + Spacer() + ], + ) + // TextButton.icon( + // padding: EdgeInsets.all(0), + // onPressed: () { + // _register(); + // }, + // icon: Icon(Icons.exit_to_app, + // color: Colors.white, size: 17), + // label: Text('register', + // style: TextStyle(color: Colors.white)), + // ), + ), + ), + Spacer(), + InkWell( + onTap: () { + Navigator.of(context).pop(); + }, + child: Container( + width: 40 * _deviceBlockSize, + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 5, + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + border: Border.all( + color: Colors.black, + ), + ), + child: Row( + children: [ + Spacer(), + Icon( + Icons.exit_to_app, + // size: 6 * _pixelRatio, + ), + Text( + 'Login', + style: TextStyle( + // fontSize: 5.5, + ), + ), + Spacer(), + ], + ), + ), + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/verify_pass_screen.dart b/lib/pages/LoginRegisterPages/verify_pass_screen.dart similarity index 87% rename from lib/pages/verify_pass_screen.dart rename to lib/pages/LoginRegisterPages/verify_pass_screen.dart index 5bf8423..deaebe1 100644 --- a/lib/pages/verify_pass_screen.dart +++ b/lib/pages/LoginRegisterPages/verify_pass_screen.dart @@ -1,196 +1,194 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/auth.dart'; -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class VerifyPassScreen extends StatefulWidget { - // static const route = '/HomeScreen'; - - @override - State createState() { - return _VerifyPassScreenState(); - } -} - -class _VerifyPassScreenState extends State { - final _form = GlobalKey(); - bool _isLoading = false; - final codeCTRL = TextEditingController(); - - @override - void initState() { - codeCTRL.text = ''; - super.initState(); - } - - @override - void dispose() { - super.dispose(); - } - - void _showDialog(String message) { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('Error'), - content: Text(message), - actions: [ - TextButton( - child: Text('Ok'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ); - } - - void _sendCode() async { - if (!_form.currentState.validate()) { - return; - } - _form.currentState.save(); - setState(() { - _isLoading = true; - }); - // try { - await Provider.of(context, listen: false) - .sendCode( - codeCTRL.text, - ) - .then( - (result) { - if (result == 'wrong') { - _showDialog('Code is wrong!!!'); - setState( - () { - _isLoading = false; - }, - ); - } else { - Navigator.of(context) - .popAndPushNamed(Routes.rePassScreen, arguments: result); - } - }, - ); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('CSSD'), - ), - body: Selector( - builder: (ctx, value, _) => value != 'offline' - ? _isLoading - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.symmetric(vertical: 20), - child: Text( - 'Send Verification Code', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - fontWeight: FontWeight.w700, - ), - ), - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Code is required.'; - } - if (value.length != 6) { - return 'Code most be 6 characters'; - } - return null; - }, - controller: codeCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.starOfLife, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Code', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - ), - keyboardType: TextInputType.number, - onSaved: (value) { - codeCTRL.text = value; - }, - maxLength: 6, - ), - SizedBox(height: 40), - Row( - children: [ - InkWell( - onTap: () => _sendCode(), - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Text( - 'Send Code', - textAlign: TextAlign.center, - style: TextStyle(color: Colors.white), - ), - ), - ), - Spacer(), - ], - ), - SizedBox(height: 10), - ], - ), - ) - : ConnectionErrorBox(), - selector: (_, connectivity) => connectivity.conStatus, - ), - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/auth.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class VerifyPassScreen extends StatefulWidget { + // static const route = '/HomeScreen'; + + @override + State createState() { + return _VerifyPassScreenState(); + } +} + +class _VerifyPassScreenState extends State { + final _form = GlobalKey(); + bool _isLoading = false; + final codeCTRL = TextEditingController(); + + @override + void initState() { + codeCTRL.text = ''; + super.initState(); + } + + @override + void dispose() { + super.dispose(); + } + + void _showDialog(String message) { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Error'), + content: Text(message), + actions: [ + TextButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ); + } + + void _sendCode() async { + if (!_form.currentState!.validate()) { + return; + } + _form.currentState!.save(); + setState(() { + _isLoading = true; + }); + // try { + await Provider.of(context, listen: false) + .sendCode( + codeCTRL.text, + ) + .then( + (result) { + if (result == 'wrong') { + _showDialog('Code is wrong!!!'); + setState( + () { + _isLoading = false; + }, + ); + } else { + Navigator.of(context) + .popAndPushNamed(Routes.rePassScreen, arguments: result); + } + }, + ); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text('CSSD'), + backgroundColor: Colors.black, + ), + body: Selector( + builder: (ctx, value, _) => value != 'offline' + ? _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.symmetric(vertical: 20), + child: Text( + 'Send Verification Code', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + fontWeight: FontWeight.w700, + ), + ), + ), + TextFormField( + validator: (value) { + if (value!.isEmpty) { + return 'Code is required.'; + } + if (value.length != 6) { + return 'Code most be 6 characters'; + } + return null; + }, + controller: codeCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.starOfLife, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Code', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + keyboardType: TextInputType.number, + onSaved: (value) { + codeCTRL.text = value!; + }, + maxLength: 6, + ), + SizedBox(height: 40), + Row( + children: [ + InkWell( + onTap: () => _sendCode(), + child: Container( + width: 88 * _deviceBlockSize, + padding: EdgeInsets.all(10), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(7), + ), + child: Text( + 'Send Code', + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white), + ), + ), + ), + Spacer(), + ], + ), + SizedBox(height: 10), + ], + ), + ) + : ConnectionErrorBox(), + selector: (_, connectivity) => connectivity.conStatus, + ), + ), + ); + } +} diff --git a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart new file mode 100644 index 0000000..aab3bf2 --- /dev/null +++ b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart @@ -0,0 +1,257 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:cssd/config/routes.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_history_screen.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/CycleScreens/Result/search_box.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart'; +import 'package:cssd/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyItemsMineScreen extends StatefulWidget { + final bool? isAdmin; + const MyItemsMineScreen({ + Key? key, + this.isAdmin, + }) : super(key: key); + + @override + State createState() => _MyItemsMineScreenState(); +} + +class _MyItemsMineScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var myItemResults = Provider.of(context); + final userData = Provider.of(context, listen: false).user; + myItemResults.setLoading(); + myItemResults.resetPageNumber(); + if (userData['roles']?.contains('User')) { + myItemResults.getMyItems().then( + (_) { + myItemResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myItemResults = Provider.of( + context, + listen: false, + ); + myItemResults.getMyItems(); + } + }, + ); + }, + ); + } else { + myItemResults.getHospitalItems().then((_) { + myItemResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myItemResults = Provider.of( + context, + listen: false, + ); + myItemResults.getHospitalItems(); + } + }, + ); + }); + } + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + final userData = Provider.of(context, listen: false).user; + return Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'My Items', + push: Routes.myItemsFilterScreen, + ), + Consumer(builder: (ctx, item, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + item.filters!.id != '' + ? MyItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + name: item.filters!.name, + udi: item.filters!.udi, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.name != '' + ? MyItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Item Name', + id: item.filters!.id, + name: '', + udi: item.filters!.udi, + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.udi != '' + ? MyItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'UDI', + id: item.filters!.id, + name: item.filters!.name, + udi: '', + size: item.filters!.size, + specific: item.filters!.specific, + ) + : Container(), + item.filters!.size != '' + ? MyItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Size', + id: item.filters!.id, + name: item.filters!.name, + udi: item.filters!.udi, + size: '', + specific: item.filters!.specific, + ) + : Container(), + item.filters!.specific != '' + ? MyItemFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Specific', + id: item.filters!.id, + name: item.filters!.name, + udi: item.filters!.udi, + size: item.filters!.size, + specific: '', + ) + : Container(), + ], + ), + ); + }), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'item', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + if (userData['roles']?.contains('User')) { + Provider.of(context, listen: false) + .searchMyItems(value); + } else { + Provider.of(context, listen: false) + .searchHospitalItems(value); + } + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, itemResults, _) { + return itemResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + if (userData['roles']?.contains('User')) { + return MyItemsItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: false, + items: itemResults.myItems?[index], + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: ((context) => + MyItemsHistoryScreen( + items: itemResults + .myItems?[index], + )), + ), + ); + }, + ); + } else { + return MyItemsItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: true, + items: + itemResults.hospitalItems?[index], + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: ((context) => + MyItemsHistoryScreen( + items: itemResults + .myItems?[index], + )), + ), + ); + }, + ); + } + }, + itemCount: userData['roles']?.contains('User') + ? itemResults.myItems?.length + : itemResults.hospitalItems?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ); + } +} diff --git a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart new file mode 100644 index 0000000..e56670b --- /dev/null +++ b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart @@ -0,0 +1,154 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:cssd/config/routes.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyItemsScreens/Result/item_requests_data_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyItemsRequestsScreen extends StatefulWidget { + final bool? isAdmin; + const MyItemsRequestsScreen({ + Key? key, + this.isAdmin, + }) : super(key: key); + + @override + State createState() => _MyItemsRequestsScreenState(); +} + +class _MyItemsRequestsScreenState extends State { + bool _isInit = true; + ScrollController? sc; + + @override + void initState() { + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var itemResults = Provider.of(context); + final userData = Provider.of(context, listen: false).user; + itemResults.setLoading(); + itemResults.resetPageNumber(); + if (userData['roles']?.contains('User')) { + itemResults.getMyItemRequests().then( + (_) { + itemResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var itemResults = Provider.of( + context, + listen: false, + ); + itemResults.getMyItemRequests(); + } + }, + ); + }, + ); + } else { + itemResults.getHospitalItemRequests().then( + (_) { + itemResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var itemResults = Provider.of( + context, + listen: false, + ); + itemResults.getHospitalItemRequests(); + } + }, + ); + }, + ); + } + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + final userData = Provider.of(context, listen: false).user; + return Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'My Requests', + hasFilterObject: false, + push: Routes.myItemsFilterScreen, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, itemResults, _) { + return itemResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + if (userData['roles']?.contains('User')) { + return RequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: false, + item: itemResults + .originalMyItemsRequests?[index], + ); + } else { + return RequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: true, + item: itemResults + .originalHospitalItemsRequests?[ + index], + ); + } + }, + itemCount: userData['roles']?.contains('User') + ? itemResults + .originalMyItemsRequests?.length + : itemResults + .originalHospitalItemsRequests + ?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ); + } +} diff --git a/lib/pages/MyItemsPages/Result/my_items_result_screen.dart b/lib/pages/MyItemsPages/Result/my_items_result_screen.dart new file mode 100644 index 0000000..5e3dcca --- /dev/null +++ b/lib/pages/MyItemsPages/Result/my_items_result_screen.dart @@ -0,0 +1,75 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/pages/MyItemsPages/Result/my_items_mine_screen.dart'; +import 'package:cssd/pages/MyItemsPages/Result/my_items_requests_screen.dart'; +import 'package:flutter/material.dart'; + +class MyItemsResultScreen extends StatefulWidget { + const MyItemsResultScreen({super.key}); + + @override + State createState() => _MyItemsResultScreenState(); +} + +class _MyItemsResultScreenState extends State + with SingleTickerProviderStateMixin { + late final TabController _tabController; + + @override + void initState() { + _tabController = TabController(length: 2, vsync: this); + super.initState(); + } + + @override + void dispose() { + _tabController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: DefaultTabController( + length: 2, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + bottom: TabBar( + controller: _tabController, + indicatorColor: kBlue, + tabs: [ + Tab( + text: 'Mine', + ), + Tab( + text: 'Requests', + ), + ], + ), + ), + body: TabBarView( + controller: _tabController, + children: [ + MyItemsMineScreen(), + MyItemsRequestsScreen(), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/MyItemsPages/my_items_detail_screen.dart b/lib/pages/MyItemsPages/my_items_detail_screen.dart new file mode 100644 index 0000000..6968c30 --- /dev/null +++ b/lib/pages/MyItemsPages/my_items_detail_screen.dart @@ -0,0 +1,101 @@ +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/pages/MyItemsPages/my_items_transfer_screen.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class MyItemsDetailScreen extends StatefulWidget { + final String? testResultId; + + MyItemsDetailScreen({ + this.testResultId, + }); + + @override + _MyItemsDetailScreenState createState() => _MyItemsDetailScreenState(); +} + +class _MyItemsDetailScreenState extends State { + bool isInit = true; + bool isEmpty = false; + ItemDetailObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showItemResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Item does\'nt exists!'), + ) + : MyItemsDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => ItemsTransferScreen( + items: datas, + ), + ), + ); + }, + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/MyItemsPages/my_items_filter_screen.dart b/lib/pages/MyItemsPages/my_items_filter_screen.dart new file mode 100644 index 0000000..f101108 --- /dev/null +++ b/lib/pages/MyItemsPages/my_items_filter_screen.dart @@ -0,0 +1,359 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:cssd/widgets/MyItemsScreens/Filter/my_items_filter_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class MyItemsFilterScreen extends StatefulWidget { + @override + _MyItemsFilterScreenState createState() => _MyItemsFilterScreenState(); +} + +class _MyItemsFilterScreenState extends State { + final _itemSizeFocusNode = FocusNode(); + final _itemNameFocusNode = FocusNode(); + final _itemUdiFocusNode = FocusNode(); + final _itemSpecificFocusNode = FocusNode(); + TextEditingController idCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController sizeCTRL = new TextEditingController(); + TextEditingController specificCTRL = new TextEditingController(); + + bool isInit = true; + ItemFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + idCTRL.text = filters!.id; + nameCTRL.text = filters!.name; + sizeCTRL.text = filters!.size; + specificCTRL.text = filters!.specific; + super.initState(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.myItemsResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.myItemsResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Filter My Items', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Item ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemNameFocusNode); + }, + ), + ), + // Spacer(), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Item Name', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemNameFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemUdiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'UDI', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemUdiFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSizeFocusNode); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + SizedBox( + height: 30.0, + ), + TextFormField( + controller: sizeCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Size', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSizeFocusNode, + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_itemSpecificFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: specificCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Specific', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _itemSpecificFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + ), + SizedBox( + height: 90, + ), + MyItemFilterSaveButton( + idCTRL: idCTRL, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + sizeCTRL: sizeCTRL, + specificCTRL: specificCTRL, + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkBlue, + secondColor: kDarkBlueSub, + push: Routes.myItemsResultScreen, + ), + SizedBox( + height: 100, + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/MyItemsPages/my_items_history_screen.dart b/lib/pages/MyItemsPages/my_items_history_screen.dart new file mode 100644 index 0000000..59089ed --- /dev/null +++ b/lib/pages/MyItemsPages/my_items_history_screen.dart @@ -0,0 +1,168 @@ +import 'package:cssd/models/my_item_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/users.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_data_box.dart'; +import 'package:cssd/widgets/MyItemsScreens/History/my_items_history_date_widget.dart'; +import 'package:cssd/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Result/banner.dart'; +import '../../widgets/Global/internet_error.dart'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyItemsHistoryScreen extends StatefulWidget { + final bool? isAdmin; + final MyItemResultObject? items; + + MyItemsHistoryScreen({this.isAdmin, this.items}); + + @override + _MyItemsHistoryScreenState createState() => _MyItemsHistoryScreenState(); +} + +class _MyItemsHistoryScreenState extends State { + bool _isInit = true; + ScrollController? sc; + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var userResults = Provider.of(context); + userResults.setLoading(); + userResults + .getUsers(userResults.getUserMedicalCenter() as String) + .then((_) { + userResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var userResults = Provider.of( + context, + listen: false, + ); + userResults + .getUsers(userResults.getUserMedicalCenter() as String); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + final userData = Provider.of(context, listen: false).user; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Items'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Item History', + push: Routes.itemFilterScreen, + hasFilterObject: false, + ), + SizedBox( + height: 20, + ), + MyItemsItemDataBox( + deviceBlockSize: _deviceBlockSize, + hasHistoryBtn: false, + items: MyItemsHistoryScreen().items!, + isAdmin: userData['roles']?.contains('User') + ? false + : true, + ), + SizedBox( + height: 10.0, + ), + Divider( + color: Colors.grey, + height: 2.0, + ), + SizedBox( + height: 10.0, + ), + Expanded( + child: Consumer( + builder: (context, userResults, child) { + return userResults.isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return Column( + children: [ + ItemHistoryDate( + deviceBlockSize: _deviceBlockSize, + items: + MyItemsHistoryScreen().items!, + ), + SizedBox( + height: 20.0, + ), + TransferDataBox( + deviceBlockSize: _deviceBlockSize, + user: + userResults.usersBox?[index], + ), + ], + ); + }, + itemCount: userResults.usersBox?.length, + shrinkWrap: true, + ); + }, + ), + ) + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/MyItemsPages/my_items_transfer_screen.dart b/lib/pages/MyItemsPages/my_items_transfer_screen.dart new file mode 100644 index 0000000..d66dbc2 --- /dev/null +++ b/lib/pages/MyItemsPages/my_items_transfer_screen.dart @@ -0,0 +1,341 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/config/routes.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:cssd/providers/users.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/CycleScreens/Result/search_box.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_data_box.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ItemsTransferScreen extends StatefulWidget { + final bool? isAdmin; + final ItemDetailObject? items; + const ItemsTransferScreen({ + super.key, + this.isAdmin, + this.items, + }); + + @override + State createState() => _ItemsTransferScreenState(); +} + +class _ItemsTransferScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var userResults = Provider.of(context); + userResults.setLoading(); + userResults.getUsers(userResults.getUserMedicalCenter() as String).then( + (_) { + userResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var userResults = Provider.of( + context, + listen: false, + ); + userResults + .getUsers(userResults.getUserMedicalCenter() as String); + } + }, + ); + }, + ); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Item Details'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 40, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Transfer to', + hasFilterObject: false, + push: Routes.myItemsFilterScreen, + ), + SizedBox( + height: 20.0, + ), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'user', + text2: 'name', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + Provider.of(context, listen: false) + .searchUsers(value); + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, userResults, _) { + return userResults.isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return TransferDataBox( + deviceBlockSize: _deviceBlockSize, + user: userResults.usersBox?[index], + isClicked: + userResults.selectedUserIndex == + index, + onTap: (userId) { + Provider.of( + context, + listen: false, + ).selectUser(index); + print(userId); + Provider.of( + context) + .saveUserId = userId; + }, + ); + }, + itemCount: userResults.usersBox?.length, + shrinkWrap: true, + ); + }, + ), + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkBlue, + secondColor: kDarkBlueSub, + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text( + 'Are you sure to transfer this Item?', + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + content: SizedBox( + width: _deviceBlockSize, + height: 280, + child: Column( + children: [ + Text( + 'By approving, your item will be transferred the specified user. It can be undone unless the user reject the transfer.', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + SizedBox( + height: 10.0, + ), + ItemCard(_deviceBlockSize), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Spacer(), + Text('To'), + SizedBox( + width: 5.0, + ), + ItemCard(_deviceBlockSize), + ], + ), + SizedBox( + height: 20.0, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkBlue, + secondColor: kDarkBlueSub, + onTap: () { + Provider.of( + context, + listen: false, + ).transferItems( + ItemsTransferScreen().items!.id, + Provider.of( + context, + ).saveUserId!, + ); + }, + text: 'Transfer', + ), + SizedBox( + height: 5.0, + ), + CancelTransferButton( + deviceBlockSize: _deviceBlockSize, + color: kPink, + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + ), + ); + }, + ); + }, + text: 'Transfer', + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } + + Container ItemCard(double _deviceBlockSize) { + return Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + borderRadius: BorderRadius.circular(5), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + ItemsTransferScreen().items!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + ItemsTransferScreen().items!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Size: ', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + Text( + ItemsTransferScreen().items!.size, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + ItemsTransferScreen().items!.userName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart new file mode 100644 index 0000000..7353d21 --- /dev/null +++ b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart @@ -0,0 +1,232 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:cssd/config/routes.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_history_screen.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_packages.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/CycleScreens/Result/search_box.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyPackagesMineScreen extends StatefulWidget { + final bool? isAdmin; + const MyPackagesMineScreen({ + Key? key, + this.isAdmin, + }) : super(key: key); + + @override + State createState() => _MyPackagesMineScreenState(); +} + +class _MyPackagesMineScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var myPackageResults = Provider.of(context); + final userData = Provider.of(context, listen: false).user; + myPackageResults.setLoading(); + myPackageResults.resetPageNumber(); + if (userData['roles']?.contains('User')) { + myPackageResults.getMyPackages().then( + (_) { + myPackageResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myItemResults = Provider.of( + context, + listen: false, + ); + myItemResults.getMyPackages(); + } + }, + ); + }, + ); + } else { + myPackageResults.getHospitalPackages().then((_) { + myPackageResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myPackageResults = Provider.of( + context, + listen: false, + ); + myPackageResults.getHospitalPackages(); + } + }, + ); + }); + } + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + final userData = Provider.of(context, listen: false).user; + return Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'My Packages', + push: Routes.myPackagesFilterScreen, + ), + Consumer( + builder: (ctx, package, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + package.filters!.id != '' + ? MyPackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + name: package.filters!.name, + udi: package.filters!.udi, + ) + : Container(), + package.filters!.name != '' + ? MyPackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Package Name', + id: package.filters!.id, + name: '', + udi: package.filters!.udi, + ) + : Container(), + package.filters!.udi != '' + ? MyPackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'UDI', + id: package.filters!.id, + name: package.filters!.name, + udi: '', + ) + : Container(), + ], + ), + ); + }, + ), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'package', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + if (userData['roles']?.contains('User')) { + Provider.of(context, listen: false) + .searchMyPackages(value); + } else { + Provider.of(context, listen: false) + .searchHospitalPackages(value); + } + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, packageResults, _) { + return packageResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + if (userData['roles']?.contains('User')) { + return MyPackagesItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: false, + packages: + packageResults.myPackages?[index], + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: ((context) => + MyPackagesHistoryScreen( + packages: packageResults + .myPackages?[index], + )), + ), + ); + }, + ); + } else { + return MyPackagesItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: true, + packages: packageResults + .hospitalPackages?[index], + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: ((context) => + MyPackagesHistoryScreen( + packages: packageResults + .myPackages?[index], + )), + ), + ); + }, + ); + } + }, + itemCount: userData['roles']?.contains('User') + ? packageResults.myPackages?.length + : packageResults.hospitalPackages?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ); + } +} diff --git a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart new file mode 100644 index 0000000..7657b89 --- /dev/null +++ b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart @@ -0,0 +1,155 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first +import 'package:cssd/config/routes.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_packages.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Result/package_requests_data_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyPackagesRequestsScreen extends StatefulWidget { + final bool? isAdmin; + const MyPackagesRequestsScreen({ + Key? key, + this.isAdmin, + }) : super(key: key); + + @override + State createState() => + _MyPackagesRequestsScreenState(); +} + +class _MyPackagesRequestsScreenState extends State { + bool _isInit = true; + ScrollController? sc; + + @override + void initState() { + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var packageResults = Provider.of(context); + final userData = Provider.of(context, listen: false).user; + packageResults.setLoading(); + packageResults.resetPageNumber(); + if (userData['roles']?.contains('User')) { + packageResults.getMyPackageRequests().then( + (_) { + packageResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var packageResults = Provider.of( + context, + listen: false, + ); + packageResults.getMyPackageRequests(); + } + }, + ); + }, + ); + } else { + packageResults.getHospitalPackageRequests().then( + (_) { + packageResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var packageResults = Provider.of( + context, + listen: false, + ); + packageResults.getHospitalPackageRequests(); + } + }, + ); + }, + ); + } + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + final userData = Provider.of(context, listen: false).user; + return Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'My Requests', + hasFilterObject: false, + push: Routes.myPackagesFilterScreen, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, packageResults, _) { + return packageResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + if (userData['roles']?.contains('User')) { + return PackageRequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: false, + package: packageResults + .originalMyPackagesRequests?[index], + ); + } else { + return PackageRequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: true, + package: packageResults + .originalHospitalPackagesRequests?[ + index], + ); + } + }, + itemCount: userData['roles']?.contains('User') + ? packageResults + .originalMyPackagesRequests?.length + : packageResults + .originalHospitalPackagesRequests + ?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ); + } +} diff --git a/lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart new file mode 100644 index 0000000..a9b2102 --- /dev/null +++ b/lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart @@ -0,0 +1,75 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/pages/MyPackagesPages/Result/my_packages_mine_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/Result/my_packages_requests_screen.dart'; +import 'package:flutter/material.dart'; + +class MyPackagesResultScreen extends StatefulWidget { + const MyPackagesResultScreen({super.key}); + + @override + State createState() => _MyPackagesResultScreenState(); +} + +class _MyPackagesResultScreenState extends State + with SingleTickerProviderStateMixin { + late final TabController _tabController; + + @override + void initState() { + _tabController = TabController(length: 2, vsync: this); + super.initState(); + } + + @override + void dispose() { + _tabController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: DefaultTabController( + length: 2, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + bottom: TabBar( + controller: _tabController, + indicatorColor: kPurple, + tabs: [ + Tab( + text: 'Mine', + ), + Tab( + text: 'Requests', + ), + ], + ), + ), + body: TabBarView( + controller: _tabController, + children: [ + MyPackagesMineScreen(), + MyPackagesRequestsScreen(), + ], + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/MyPackagesPages/my_packages_detail_screen.dart b/lib/pages/MyPackagesPages/my_packages_detail_screen.dart new file mode 100644 index 0000000..34f32b9 --- /dev/null +++ b/lib/pages/MyPackagesPages/my_packages_detail_screen.dart @@ -0,0 +1,101 @@ +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/pages/MyPackagesPages/my_packages_transfer_screen.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class MyPackagesDetailScreen extends StatefulWidget { + final String? testResultId; + + MyPackagesDetailScreen({ + this.testResultId, + }); + + @override + _MyPackagesDetailScreenState createState() => _MyPackagesDetailScreenState(); +} + +class _MyPackagesDetailScreenState extends State { + bool isInit = true; + bool isEmpty = false; + PackageDetailObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showPackageResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Package does\'nt exists!'), + ) + : MyPackageDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + push: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => PackageTransferScreen( + packages: datas, + ), + ), + ); + }, + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/MyPackagesPages/my_packages_filter_screen.dart b/lib/pages/MyPackagesPages/my_packages_filter_screen.dart new file mode 100644 index 0000000..f194cec --- /dev/null +++ b/lib/pages/MyPackagesPages/my_packages_filter_screen.dart @@ -0,0 +1,253 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class MyPackageFilterScreen extends StatefulWidget { + @override + _MyPackageFilterScreenState createState() => _MyPackageFilterScreenState(); +} + +class _MyPackageFilterScreenState extends State { + final _nameFocusNode = FocusNode(); + final _udiFocusNode = FocusNode(); + TextEditingController idCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + + bool isInit = true; + PackageFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + idCTRL.text = filters!.id; + hospitalCTRL.text = filters!.hospital; + nameCTRL.text = filters!.name; + udiCTRL.text = filters!.udi; + super.initState(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.myPackagesResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.myPackagesResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Filter My Packages', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Package ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_nameFocusNode); + }, + ), + ), + // Spacer(), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ) + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Package Name', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _nameFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_udiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'UDI', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _udiFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + ), + SizedBox( + height: 90, + ), + MyPackagesFilterSaveButton( + idCTRL: idCTRL, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkPurple, + secondColor: kDarkPurpleSub, + push: Routes.myPackagesResultScreen, + ), + SizedBox( + height: 100, + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/MyPackagesPages/my_packages_history_screen.dart b/lib/pages/MyPackagesPages/my_packages_history_screen.dart new file mode 100644 index 0000000..a425f55 --- /dev/null +++ b/lib/pages/MyPackagesPages/my_packages_history_screen.dart @@ -0,0 +1,170 @@ +import 'package:cssd/models/my_package_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/users.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_data_box.dart'; +import 'package:cssd/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart'; +import 'package:cssd/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Result/banner.dart'; +import '../../widgets/Global/internet_error.dart'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyPackagesHistoryScreen extends StatefulWidget { + final bool? isAdmin; + final MyPackageResultObject? packages; + + MyPackagesHistoryScreen({this.isAdmin, this.packages}); + + @override + _MyPackagesHistoryScreenState createState() => + _MyPackagesHistoryScreenState(); +} + +class _MyPackagesHistoryScreenState extends State { + bool _isInit = true; + ScrollController? sc; + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var userResults = Provider.of(context); + userResults.setLoading(); + userResults + .getUsers(userResults.getUserMedicalCenter() as String) + .then((_) { + userResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var userResults = Provider.of( + context, + listen: false, + ); + userResults + .getUsers(userResults.getUserMedicalCenter() as String); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + final userData = Provider.of(context, listen: false).user; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('My Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Package History', + push: Routes.itemFilterScreen, + hasFilterObject: false, + ), + SizedBox( + height: 20, + ), + MyPackagesItemDataBox( + deviceBlockSize: _deviceBlockSize, + hasHistoryBtn: false, + packages: MyPackagesHistoryScreen().packages!, + isAdmin: userData['roles']?.contains('User') + ? false + : true, + ), + SizedBox( + height: 10.0, + ), + Divider( + color: Colors.grey, + height: 2.0, + ), + SizedBox( + height: 10.0, + ), + Expanded( + child: Consumer( + builder: (context, userResults, child) { + return userResults.isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return Column( + children: [ + PackageHistoryDate( + deviceBlockSize: _deviceBlockSize, + packages: + MyPackagesHistoryScreen() + .packages!, + ), + SizedBox( + height: 20.0, + ), + TransferDataBox( + deviceBlockSize: _deviceBlockSize, + user: + userResults.usersBox?[index], + ), + ], + ); + }, + itemCount: userResults.usersBox?.length, + shrinkWrap: true, + ); + }, + ), + ) + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart b/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart new file mode 100644 index 0000000..79fc5b3 --- /dev/null +++ b/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart @@ -0,0 +1,343 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/config/routes.dart'; +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/providers/my_packages.dart'; +import 'package:cssd/providers/users.dart'; +import 'package:cssd/widgets/CycleScreens/Result/banner.dart'; +import 'package:cssd/widgets/CycleScreens/Result/search_box.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_data_box.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class PackageTransferScreen extends StatefulWidget { + final bool? isAdmin; + final PackageDetailObject? packages; + const PackageTransferScreen({ + super.key, + this.isAdmin, + this.packages, + }); + + @override + State createState() => _PackageTransferScreenState(); +} + +class _PackageTransferScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var userResults = Provider.of(context); + userResults.setLoading(); + userResults + .getUsers(userResults.getUserMedicalCenter() as String) + .then((_) { + userResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var userResults = Provider.of( + context, + listen: false, + ); + userResults + .getUsers(userResults.getUserMedicalCenter() as String); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _deviceWidth = _media.size.width; + final double _deviceBlockSize = _deviceWidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Package Details'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 40, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Transfer to', + hasFilterObject: false, + push: Routes.myItemsFilterScreen, + ), + SizedBox( + height: 20.0, + ), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'user', + text2: 'name', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + Provider.of(context, listen: false) + .searchUsers(value); + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, userResults, _) { + return userResults.isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return TransferDataBox( + deviceBlockSize: _deviceBlockSize, + user: userResults.usersBox?[index], + isClicked: + userResults.selectedUserIndex == + index, + onTap: (userId) { + Provider.of( + context, + listen: false, + ).selectUser(index); + print(userId); + Provider.of( + context) + .saveUserId = userId; + }, + ); + }, + itemCount: userResults.usersBox?.length, + shrinkWrap: true, + ); + }, + ), + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkPurple, + secondColor: kDarkPurpleSub, + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text( + 'Are you sure to transfer this Package?', + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + content: SizedBox( + width: _deviceBlockSize, + height: 280, + child: Column( + children: [ + Text( + 'By approving, all items in your package will be transferred the specified user. it can be undone unless the user reject the transfer.', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + SizedBox( + height: 10.0, + ), + PackageCard(_deviceBlockSize), + SizedBox( + height: 5.0, + ), + Row( + children: [ + Spacer(), + Text('To'), + SizedBox( + width: 5.0, + ), + PackageCard(_deviceBlockSize), + ], + ), + SizedBox( + height: 20.0, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkBlue, + secondColor: kDarkBlueSub, + onTap: () { + Provider.of( + context, + listen: false, + ).transferPackage( + PackageTransferScreen() + .packages! + .id, + Provider.of( + context, + ).saveUserId!, + ); + }, + text: 'Transfer', + ), + SizedBox( + height: 5.0, + ), + CancelTransferButton( + deviceBlockSize: _deviceBlockSize, + color: kPink, + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + ), + ); + }, + ); + }, + text: 'Transfer', + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } + + Container PackageCard(double _deviceBlockSize) { + return Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + borderRadius: BorderRadius.circular(5), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + PackageTransferScreen().packages!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + PackageTransferScreen().packages!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + // Container( + // width: 30 * _deviceBlockSize, + // child: Row( + // children: [ + // Text( + // 'Size: ', + // overflow: TextOverflow.ellipsis, + // style: TextStyle( + // fontSize: 3 * _deviceBlockSize, + // color: Colors.grey, + // ), + // ), + // Text( + // PackageTransferScreen().packages!.size, + // overflow: TextOverflow.ellipsis, + // style: TextStyle( + // fontWeight: FontWeight.w700, + // fontSize: 3 * _deviceBlockSize, + // ), + // ), + // ], + // ), + // ), + // Container( + // width: 30 * _deviceBlockSize, + // child: Row( + // children: [ + // Text( + // 'User: ', + // style: TextStyle( + // color: Colors.grey, + // fontSize: 3 * _deviceBlockSize, + // ), + // ), + // Text( + // PackageTransferScreen().packages!.userName, + // style: TextStyle( + // fontSize: 3 * _deviceBlockSize, + // fontWeight: FontWeight.w700, + // ), + // ), + // ], + // ), + // ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/pages/PackagePages/package_add_screen.dart b/lib/pages/PackagePages/package_add_screen.dart new file mode 100644 index 0000000..502623d --- /dev/null +++ b/lib/pages/PackagePages/package_add_screen.dart @@ -0,0 +1,281 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/PackageScreens/Add/package_save_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Add/add_label_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +class PackageAddScreen extends StatefulWidget { + @override + _PackageAddScreenState createState() => _PackageAddScreenState(); +} + +class _PackageAddScreenState extends State { + final _packageUdiFocusNode = FocusNode(); + final _descriptionFocusNode = FocusNode(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController dateCTRL = new TextEditingController(); + final _form = GlobalKey(); + bool isInit = true; + PackageFilterObject? filters; + + int curLabelVal = 1; + @override + void initState() { + descriptionCTRL.text = ''; + udiCTRL.text = ''; + nameCTRL.text = ''; + dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + var packageProviderObject = Provider.of(context); + packageProviderObject.resetItemVals(); + packageProviderObject.getItemFilters().then( + (result) { + setState( + () { + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.packageResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.packageResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Add a Package', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Name required!'; + } + return null; + }, + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Package Name', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_packageUdiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'UDI required!'; + } + return null; + }, + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'UDI', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _packageUdiFocusNode, + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocusNode); + }, + ), + SizedBox( + height: 20, + ), + Container( + margin: EdgeInsets.symmetric(vertical: 5), + child: Text( + 'Items included', + style: TextStyle( + color: kPurple, + letterSpacing: 2, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + Consumer( + builder: (ctx, packageProvider, _) => + ListView.builder( + physics: NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (ctx, index) => AddLabelBox( + text: 'Select Items Included', + iconColor: kPurpleSub, + deviceBlockSize: _deviceBlockSize, + values: + packageProvider.itemValues[index], + vals: packageProvider.itemVals, + initialLabelValue: + packageProvider.initialItemValue, + index: index, + ), + itemCount: + packageProvider.itemValues.length, + ), + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocusNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 70, + ), + PackageAddSaveButton( + form: _form, + itemValues: Provider.of( + context, + listen: false, + ).itemValues, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + dateValue: dateCTRL.text, + descriptionCTRL: descriptionCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/PackagePages/package_detail_screen.dart b/lib/pages/PackagePages/package_detail_screen.dart new file mode 100644 index 0000000..856c096 --- /dev/null +++ b/lib/pages/PackagePages/package_detail_screen.dart @@ -0,0 +1,90 @@ +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/PackageScreens/Details/package_detail_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class PackageDetailScreen extends StatefulWidget { + final String? testResultId; + + PackageDetailScreen({ + this.testResultId, + }); + + @override + _PackageDetailScreenState createState() => _PackageDetailScreenState(); +} + +class _PackageDetailScreenState extends State { + bool isInit = true; + bool isEmpty = false; + PackageDetailObject? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showPackageResult(_id.toString()) + .then( + (result) { + setState( + () { + if (result.id == 'null') { + isEmpty = true; + } + datas = result; + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : isEmpty + ? Center( + child: Text('This Package does\'nt exists!'), + ) + : PackageDetailsDataBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/PackagePages/package_filter_screen.dart b/lib/pages/PackagePages/package_filter_screen.dart new file mode 100644 index 0000000..7b796b4 --- /dev/null +++ b/lib/pages/PackagePages/package_filter_screen.dart @@ -0,0 +1,296 @@ +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:cssd/widgets/PackageScreens/Filter/filter_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Filter/selector_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +class PackageFilterScreen extends StatefulWidget { + @override + _PackageFilterScreenState createState() => _PackageFilterScreenState(); +} + +class _PackageFilterScreenState extends State { + final _nameFocusNode = FocusNode(); + final _udiFocusNode = FocusNode(); + TextEditingController idCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + + List> hospitalVals = []; + bool isInit = true; + PackageFilterObject? filters; + @override + void initState() { + filters = Provider.of(context, listen: false).filters; + idCTRL.text = filters!.id; + hospitalCTRL.text = filters!.hospital; + nameCTRL.text = filters!.name; + udiCTRL.text = filters!.udi; + super.initState(); + } + + @override + void didChangeDependencies() async { + if (isInit) { + await Provider.of(context, listen: false) + .getHospitalsFilters() + .then( + (result) { + setState( + () { + hospitalVals = [ + {'id': '', 'name': ''} + ]; + for (var hospital in result) { + hospitalVals.add(hospital); + } + filters!.hospital == '' + ? hospitalCTRL.text = hospitalVals[0]['name']! + : hospitalVals.forEach( + //id convert to name + (hospital) { + if (hospital['id'] == filters!.hospital) { + hospitalCTRL.text = hospital['name']!; + } + }, + ); + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.packageResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.packageResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Filter Packages', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Package ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_nameFocusNode); + }, + ), + ), + // Spacer(), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ) + ], + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Package Name', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _nameFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_udiFocusNode); + }, + ), + SizedBox( + height: 30, + ), + TextFormField( + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'UDI', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _udiFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + ), + SizedBox( + height: 30.0, + ), + FilterHospitalBox( + deviceBlockSize: _deviceBlockSize, + hospitalCTRL: hospitalCTRL, + hospitalVals: hospitalVals, + label: 'Hospital', + ), + SizedBox( + height: 90, + ), + PackageFilterSaveButton( + hospitalVals: hospitalVals, + hospitalCTRL: hospitalCTRL, + idCTRL: idCTRL, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 100, + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart new file mode 100644 index 0000000..6aa969e --- /dev/null +++ b/lib/pages/PackagePages/package_result_screen.dart @@ -0,0 +1,269 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/PackageScreens/Filter/package_filter_object.dart'; +import 'package:cssd/widgets/PackageScreens/Result/package_data_box.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/CycleScreens/Result/banner.dart'; +import '../../widgets/CycleScreens/Result/search_box.dart'; +import '../../widgets/Global/internet_error.dart'; + +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class PackageResultScreen extends StatefulWidget { + final bool? isAdmin; + + PackageResultScreen({this.isAdmin}); + + @override + _PackageResultScreenState createState() => _PackageResultScreenState(); +} + +class _PackageResultScreenState extends State { + bool _isInit = true; + ScrollController? sc; + TextEditingController searchCTRL = new TextEditingController(); + + @override + void initState() { + sc = new ScrollController(); + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var testResults = Provider.of(context); + testResults.setLoading(); + testResults.resetPageNumber(); + testResults.getPackageResults().then((_) { + testResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var testResults = Provider.of( + context, + listen: false, + ); + testResults.getPackageResults(); + } + }, + ); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + floatingActionButton: PackageResultFloatingButton( + deviceBlockSize: _deviceBlockSize, + ), + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer(builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, + right: 20, + bottom: 60, + left: 20, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ResultBanner( + deviceBlockSize: _deviceBlockSize, + text: 'Packages', + push: Routes.packageFilterScreen, + ), + Consumer( + builder: (ctx, package, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + package.filters!.id != '' + ? PackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + name: package.filters!.name, + hospital: package.filters!.hospital, + udi: package.filters!.udi, + ) + : Container(), + package.filters!.name != '' + ? PackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Package Name', + id: package.filters!.id, + name: '', + udi: package.filters!.udi, + hospital: package.filters!.hospital, + ) + : Container(), + package.filters!.hospital != '' + ? PackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'Hospital', + id: package.filters!.id, + name: package.filters!.name, + udi: package.filters!.udi, + hospital: '', + ) + : Container(), + package.filters!.udi != '' + ? PackageFilterChip( + deviceBlockSize: _deviceBlockSize, + label: 'UDI', + id: package.filters!.id, + name: package.filters!.name, + udi: '', + hospital: package.filters!.hospital, + ) + : Container(), + ], + ), + ); + }, + ), + ResultSearchBox( + searchCTRL: searchCTRL, + text: 'package', + deviceBlockSize: _deviceBlockSize, + onChanged: (value) { + Provider.of(context, listen: false) + .search(value); + }, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, packageResults, _) { + return packageResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) { + // String items = ''; + // for (var item in packageResults + // .items![index].items) { + // items += item; + // items += ' , '; + // } + // items = items.substring( + // 0, + // items.length - 3, + // ); // remove extra , + return PackageItemBox( + deviceBlockSize: _deviceBlockSize, + item: packageResults.items?[index], + ); + }, + itemCount: packageResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }), + ), + ), + ); + } +} + +class PackageResultFloatingButton extends StatelessWidget { + const PackageResultFloatingButton({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.packageScanScreen); + }, + child: Container( + padding: EdgeInsets.all(2.5 * _deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 7.1 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushReplacementNamed(Routes.packageAddScreen); + }, + child: Container( + padding: EdgeInsets.all(_deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kPurple, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ); + } +} diff --git a/lib/pages/PackagePages/package_scan_screen.dart b/lib/pages/PackagePages/package_scan_screen.dart new file mode 100644 index 0000000..5f8598d --- /dev/null +++ b/lib/pages/PackagePages/package_scan_screen.dart @@ -0,0 +1,195 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class PackageScanScreen extends StatefulWidget { + @override + State createState() { + return _PackageScanScreenState(); + } +} + +class _PackageScanScreenState extends State { + TextEditingController idCTRL = new TextEditingController(); + final _form = GlobalKey(); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Packages'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.only(top: 30), + child: Text( + 'Looking for a Package?', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5.5 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 3, + ), + ), + ), + GestureDetector( + child: Container( + margin: EdgeInsets.symmetric(vertical: 10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'Please Scan The Package Barcode', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + textAlign: TextAlign.center, + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + launch( + 'https://cssd-doc.com/Show/Package/$result', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: result, + // ); + } + }, + ); + }, + ), + SizedBox( + height: 10.0, + ), + Form( + key: _form, + child: TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Id required!!'; + } + return null; + }, + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Or enter a Package ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + focusedBorder: UnderlineInputBorder( + // borderRadius: BorderRadius.only(Radius.circular(4)), + borderSide: BorderSide( + color: Colors.grey, + ), + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ), + ), + SizedBox( + height: 70, + ), + InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + launch( + 'https://cssd-doc.com/Show/Package/${idCTRL.text}', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: idCTRL.text, + // ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPurple, kPurpleSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Search', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/PackagePages/package_update_screen.dart b/lib/pages/PackagePages/package_update_screen.dart new file mode 100644 index 0000000..c5f56c2 --- /dev/null +++ b/lib/pages/PackagePages/package_update_screen.dart @@ -0,0 +1,240 @@ +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/PackageScreens/Add/package_update_button.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class PackageUpdateScreen extends StatefulWidget { + @override + _PackageUpdateScreenState createState() => _PackageUpdateScreenState(); +} + +class _PackageUpdateScreenState extends State { + final _udiFocusNode = FocusNode(); + final _descriptionFocusNode = FocusNode(); + TextEditingController nameCTRL = new TextEditingController(); + TextEditingController udiCTRL = new TextEditingController(); + TextEditingController descriptionCTRL = new TextEditingController(); + TextEditingController itemCTRL = new TextEditingController(); + + final _form = GlobalKey(); + + bool isEmpty = false; + bool isInit = true; + PackageDetailObject? datas; + + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showPackageResult(_id.toString()) + .then( + (result) { + setState( + () { + datas = result; + nameCTRL.text = datas!.name; + udiCTRL.text = datas!.udi; + descriptionCTRL.text = datas!.description; + for (String item in datas!.items) { + itemCTRL.text = item; + } + }, + ); + }, + ); + await Provider.of(context, listen: false) + .getItemFilters() + .then( + (result) { + setState( + () { + isInit = false; + }, + ); + }, + ); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.packageResultScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + backgroundColor: Colors.black, + title: Text('Packages'), + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context) + .pushReplacementNamed(Routes.packageResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator(color: Colors.black), + ) + : Form( + key: _form, + child: Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Update a Package', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 6 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Name required!'; + } + return null; + }, + controller: nameCTRL, + decoration: InputDecoration( + icon: Icon(FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize), + isDense: true, + labelText: 'Package Name', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_udiFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'UDI required!'; + } + return null; + }, + controller: udiCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'UDI', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + focusNode: _udiFocusNode, + keyboardType: TextInputType.text, + textInputAction: TextInputAction.done, + onFieldSubmitted: (_) { + FocusScope.of(context) + .requestFocus(_descriptionFocusNode); + }, + ), + SizedBox( + height: 20, + ), + TextFormField( + controller: descriptionCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Description', + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.multiline, + focusNode: _descriptionFocusNode, + minLines: 1, + maxLines: 5, + ), + SizedBox( + height: 70, + ), + PackageUpdateButton( + form: _form, + id: datas!.id, + nameCTRL: nameCTRL, + udiCTRL: udiCTRL, + itemCTRL: itemCTRL, + deviceBlockSize: _deviceBlockSize, + descriptionCTRL: descriptionCTRL, + ), + SizedBox( + height: 100, + ), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/TestPages/test_add_screen.dart b/lib/pages/TestPages/test_add_screen.dart new file mode 100644 index 0000000..6fe14f5 --- /dev/null +++ b/lib/pages/TestPages/test_add_screen.dart @@ -0,0 +1,292 @@ +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/test_results.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/TestResultScreens/Add/selector_box.dart'; + +class TestResultAddScreen extends StatefulWidget { + // static const route = '/TestResultAddScreen'; + @override + State createState() { + return _TestResultAddScreenState(); + } +} + +class _TestResultAddScreenState extends State { + TextEditingController testTypeCTRL = new TextEditingController(); + final List testTypeVals = []; + + TextEditingController testCodeCTRL = new TextEditingController(); + bool isInit = true; + @override + void didChangeDependencies() { + if (isInit) { + var testResultProviderObject = + Provider.of(context, listen: false); + testResultProviderObject.getFilterItems().then((result) { + for (var testType in result[1].keys) { + testTypeVals.add(testType); + } + testTypeCTRL.text = testTypeVals[0]; + setState(() { + isInit = false; + }); + }); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.testResultScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Test Results'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + // padding: EdgeInsets.all(0), + onPressed: () => Navigator.of(context) + .popAndPushNamed(Routes.testResultScreen), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView( + padding: EdgeInsets.symmetric( + horizontal: 20, vertical: 20), + children: [ + Container( + padding: EdgeInsets.only( + top: 10, + ), + child: Text( + 'Add a Test Result', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + fontWeight: FontWeight.w700, + ), + ), + ), + GestureDetector( + child: Container( + margin: EdgeInsets.only(top: 5, bottom: 30), + padding: EdgeInsets.all(10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'PLease Scan The Test Barcode', + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.grey, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + Navigator.pushNamed( + context, + Routes.formTestResultScreen, + arguments: result, + ); + } + }, + ); + }, + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.max, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 70 * _deviceBlockSize, + child: TestResultAddSelectorBox( + deviceBlockSize: _deviceBlockSize, + dataCTRL: testTypeCTRL, + dataVals: testTypeVals, + label: 'Choose a Test Type', + ), + ), + Row( + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + 'OR', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 7 * _deviceBlockSize, + ), + ), + SizedBox( + width: 8 * _deviceBlockSize, + ), + Container( + width: 50 * _deviceBlockSize, + child: TextFormField( + onChanged: (val) { + if (val != '') { + setState(() { + testTypeCTRL.text = ''; + }); + } else { + setState(() { + testTypeCTRL.text = + testTypeVals[0]; + }); + } + }, + controller: testCodeCTRL, + decoration: InputDecoration( + isDense: true, + icon: Icon( + FontAwesomeIcons + .sortNumericDown, + ), + labelText: 'Enter a Test Code', + labelStyle: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + contentPadding: EdgeInsets.only( + bottom: 5, + top: 5, + ), + ), + keyboardType: + TextInputType.visiblePassword, + ), + ), + ], + ), + SizedBox( + height: 40.0, + ), + Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + width: 50 * _deviceBlockSize, + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: TextButton( + child: Text( + 'Select', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + onPressed: () { + if (testCodeCTRL.text != '') { + Provider.of( + context, + listen: false, + ).testCode = testCodeCTRL.text; + Navigator.pushNamed( + context, + Routes.formTestResultScreen, + arguments: testCodeCTRL.text, + ); + } else if (testTypeCTRL.text != + '') { + Provider.of( + context, + listen: false, + ).testType = testTypeCTRL.text; + Navigator.pushReplacementNamed( + context, + Routes.formTestResultScreen, + arguments: testTypeCTRL.text, + ); + } + // print(testCode); + }, + ), + ), + ), + ], + ), + SizedBox( + width: 5 * _deviceBlockSize, + ), + ], + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } + + Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } + return barcode.rawContent; + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } + } +} diff --git a/lib/pages/test_detail_screen.dart b/lib/pages/TestPages/test_detail_screen.dart similarity index 71% rename from lib/pages/test_detail_screen.dart rename to lib/pages/TestPages/test_detail_screen.dart index 5870770..50a6169 100644 --- a/lib/pages/test_detail_screen.dart +++ b/lib/pages/TestPages/test_detail_screen.dart @@ -1,75 +1,78 @@ -import '../providers/connectivity.dart'; -import '../providers/test_results.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/TestResultScreens/Details/datas_box.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -class TestDetailsScreen extends StatefulWidget { - // static const route = '/TestDetailsScreen'; - final String testResultId; - - TestDetailsScreen({this.testResultId}); - - @override - _TestDetailsScreenState createState() => _TestDetailsScreenState(); -} - -class _TestDetailsScreenState extends State { - bool isInit = true; - Map datas; - @override - void didChangeDependencies() async { - if (isInit) { - var _id = ModalRoute.of(context).settings.arguments; - await Provider.of(context, listen: false) - .showTestResult(_id.toString()) - .then((result) { - setState(() { - datas = result; - isInit = false; - }); - }); - // print(datas); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - // print(datas); - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Test Result Detail'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : DatasBox( - datas: datas, - deviceBlockSize: _deviceBlockSize, - ) - : ConnectionErrorBox(); - }, - ), - ), - ); - } -} +import '../../providers/connectivity.dart'; +import '../../providers/test_results.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/TestResultScreens/Details/datas_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class TestDetailsScreen extends StatefulWidget { + // static const route = '/TestDetailsScreen'; + final String? testResultId; + + TestDetailsScreen({this.testResultId}); + + @override + _TestDetailsScreenState createState() => _TestDetailsScreenState(); +} + +class _TestDetailsScreenState extends State { + bool isInit = true; + Map? datas; + @override + void didChangeDependencies() async { + if (isInit) { + var _id = ModalRoute.of(context)!.settings.arguments; + await Provider.of(context, listen: false) + .showTestResult(_id.toString()) + .then((result) { + setState(() { + datas = result.cast(); + isInit = false; + }); + }); + // print(datas); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + // print(datas); + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Test Results'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : DatasBox( + datas: datas!, + deviceBlockSize: _deviceBlockSize, + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/TestPages/test_filter_screen.dart b/lib/pages/TestPages/test_filter_screen.dart new file mode 100644 index 0000000..8231709 --- /dev/null +++ b/lib/pages/TestPages/test_filter_screen.dart @@ -0,0 +1,431 @@ +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/test_result_models.dart'; +import '../../providers/connectivity.dart'; +import '../../providers/test_results.dart'; +import '../../widgets/Global/internet_error.dart'; +import '../../widgets/TestResultScreens/Filter/date_picker.dart'; +import '../../widgets/TestResultScreens/Filter/selector_box.dart'; + +class TestFilterScreen extends StatefulWidget { + // static const route = '/TestFilterScreen'; + + @override + _TestFilterScreenState createState() => _TestFilterScreenState(); +} + +class _TestFilterScreenState extends State { + TextEditingController idCTRL = new TextEditingController(); + TextEditingController labelIdCTRL = new TextEditingController(); + TextEditingController testTypeCTRL = new TextEditingController(); + TextEditingController hospitalCTRL = new TextEditingController(); + TextEditingController fDateCTRL = new TextEditingController(); + TextEditingController uDateCTRL = new TextEditingController(); + + TextEditingController usernameCTRL = new TextEditingController(); + // TextEditingController dateFrom = new TextEditingController(); + // TextEditingController dateUntil = new TextEditingController(); + DateTime? dateTimeFrom; + DateTime? dateTimeUntil; + + final List labelIDVals = [ + '', + 'Washer ID', + 'Autoclave ID', + 'Sterilizer ID', + 'Seal Machine ID', + 'Patiant ID', + 'Set/Pack ID', + 'Medical Device ID', + 'OR ID', + 'Insrtument ID', + 'Basket ID', + 'Implant ID', + // 'None', + ]; + // String curLabelIDVal; + + final List testTypeVals = []; + Map? testTypes; + + final List hospitalVals = []; + Map hospitals = {}; + // String curhospitalVal; + + bool isInit = true; + // final List labelIDVals = ['Washer ID']; + // String curLabelIDVal; + + // final List labelIDVals = ['Washer ID']; + // String curLabelIDVal; + + // @override + // void initState() { + // super.initState(); + // } + + @override + void didChangeDependencies() { + if (isInit) { + // fDateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + // uDateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); + fDateCTRL.text = ''; + uDateCTRL.text = ''; + var testResultProviderObject = + Provider.of(context, listen: false); + TestResultFilterObject filters = testResultProviderObject.filters; + idCTRL.text = filters.id; + usernameCTRL.text = filters.userName; + labelIdCTRL.text = + filters.labelID == '' ? labelIDVals[0] : filters.labelID; + idCTRL.text = filters.id; + usernameCTRL.text = filters.userName; + testResultProviderObject.getFilterItems().then((result) { + hospitals = result[0]; + testTypes = result[1]; + hospitalVals.add(''); + for (var hospital in result[0].keys) { + hospitalVals.add(hospital); + } + testTypeVals.add(''); + for (var testType in result[1].keys) { + testTypeVals.add(testType); + } + var testTypeKey = testTypes!.keys.firstWhere( + (k) => testTypes![k] == filters.testType, + orElse: () => ''); // recent testtype name + var hospitalKey = hospitals.keys.firstWhere( + (k) => hospitals[k] == filters.hospital, + orElse: () => ''); // recent testtype name + testTypeCTRL.text = + filters.testType == '' ? testTypeVals[0] : testTypeKey; + hospitalCTRL.text = + filters.hospital == '' ? hospitalVals[0] : hospitalKey; + // print(result[0]); + // print(result[1]); + setState(() { + isInit = false; + }); + }); + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.testResultScreen, + ); + return true; + }, + child: SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Test Results'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).popAndPushNamed( + Routes.testResultScreen, + ), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + Text( + 'Filter Test Results', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + SizedBox( + height: 20, + ), + Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.text, + textInputAction: TextInputAction.next, + // onFieldSubmitted: (_) { + // FocusScope.of(context) + // .requestFocus(_cycleNumberFocusNode); + // }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + // Navigator.of(context).pushNamed( + // CycleDetailScreen.route, + // arguments: result, + // ); + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + + SizedBox( + height: 25, + ), + TestResultFilterSelectorBox( + deviceBlockSize: _deviceBlockSize, + dataCTRL: labelIdCTRL, + dataVals: labelIDVals, + label: 'Label ID', + ), + SizedBox( + height: 25, + ), + + TextFormField( + controller: usernameCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Username', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + textInputAction: TextInputAction.next, + // onFieldSubmitted: (_) { + // FocusScope.of(context) + // .requestFocus(_cycleNumberFocusNode); + // }, + ), + SizedBox( + height: 25, + ), + TestResultFilterSelectorBox( + deviceBlockSize: _deviceBlockSize, + dataCTRL: testTypeCTRL, + dataVals: testTypeVals, + label: 'Test Type', + ), + SizedBox( + height: 25, + ), + TestResultFilterSelectorBox( + deviceBlockSize: _deviceBlockSize, + dataCTRL: hospitalCTRL, + dataVals: hospitalVals, + label: 'Hospital', + ), + SizedBox( + height: 25, + ), + + TestResultFilterDatePicker( + dateCTRL: fDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Date From', + ), + SizedBox( + height: 25, + ), + TestResultFilterDatePicker( + dateCTRL: uDateCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Date Until', + ), + SizedBox( + height: 70, + ), + InkWell( + onTap: () { + Provider.of(context, + listen: false) + .setFilters( + idCTRL.text, + labelIdCTRL.text != '' + ? labelIdCTRL.text + : '', + usernameCTRL.text, + testTypeCTRL.text != '' + ? testTypes![testTypeCTRL.text] + : '', + hospitalCTRL.text != '' + ? hospitals[hospitalCTRL.text] + : '', + fDateCTRL.text, + uDateCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + // Navigator.of(context).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then( + (_) => + Navigator.of(context).popAndPushNamed( + Routes.testResultScreen, + ), + ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [Colors.black, Colors.black87], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ), + SizedBox( + height: 70, + ), + // DropDownBox(values: ['Washer ID']), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ), + ); + } +} + +Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } + try { + var id = barcode.rawContent.contains('www.cssd-doc.com') + ? barcode.rawContent.split('/')[5] + : barcode.rawContent; + + return id; + } catch (_) { + return 'null'; + } + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } +} diff --git a/lib/pages/test_form_page.dart b/lib/pages/TestPages/test_form_page.dart similarity index 61% rename from lib/pages/test_form_page.dart rename to lib/pages/TestPages/test_form_page.dart index 44edd76..902dde4 100644 --- a/lib/pages/test_form_page.dart +++ b/lib/pages/TestPages/test_form_page.dart @@ -1,195 +1,204 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:random_string/random_string.dart'; - -import '../config/routes.dart'; -import '../providers/input.dart'; -import '../providers/test_results.dart'; -import '../widgets/TestResultScreens/Add/form_creator.dart'; - -class FormPage extends StatefulWidget { - final String name; - final String uniqueCode; - final String testResultId; - final String testTypeId; - - FormPage({this.name, this.uniqueCode, this.testResultId, this.testTypeId}); - - @override - _FormPageState createState() => _FormPageState(); -} - -class _FormPageState extends State { - bool _isInit = true; - bool _isLoading = false; - bool isAdding = false; - final _form = GlobalKey(); - Map values = {}; - List> formInputs; - - void _saveForm() { - final batchId = randomString(10); - formatData(formInputs); - var prvObject = Provider.of(context, listen: false); - if (this.widget.testResultId != null && this.widget.testResultId != '') { - values['_method'] = 'put'; - TestResultsProvider.updateTestResult(this.widget.testResultId, values) - .then((_) { - Navigator.of(context).pop(); - }); - } else { - setState(() { - _isLoading = true; - }); - prvObject.createTestResult(values, batchId).then((result) { - setState(() { - _isLoading = false; - }); - if (result == 'done') { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Test added.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((value) => - Navigator.of(context).popAndPushNamed(Routes.testResultScreen)); - } - }); - } - } - - @override - void didChangeDependencies() { - if (_isInit) { - setState(() { - _isLoading = true; - }); - Provider.of(context, listen: false) - .getInputs( - testResultId: this.widget.testResultId ?? "", - name: this.widget.name ?? "", - uniqueCode: this.widget.uniqueCode ?? "", - testTypeId: this.widget.testTypeId ?? "") - .then((_) { - setState(() { - _isLoading = false; - }); - }); - } - _isInit = false; - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.testResultAddScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('Add Test Result'), - actions: [ - IconButton( - icon: Icon(Icons.save), - onPressed: () { - _saveForm(); - }, - ) - ], - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () { - Navigator.of(context) - .popAndPushNamed(Routes.testResultScreen); - }, - ), - ), - body: Column( - children: [ - Expanded( - child: _isLoading - ? Center(child: CircularProgressIndicator()) - : Form( - key: _form, - child: Consumer( - builder: (context, inputs, _) { - formInputs = inputs.inputItems; - return formInputs.length != 0 - ? FormCreator( - form: inputs.inputItems, - onChanged: (value) { - formInputs = value; - }, - ) - : Center( - child: Text('An error happen!!!'), - ); - }, - ), - ), - ), - // https://www.cssd-doc.com/api/GetInfo - // InkWell( - // onTap: () { - // _saveForm(); - // }, - // child: Container( - // padding: EdgeInsets.symmetric(horizontal: 60, vertical: 15), - // margin: EdgeInsets.symmetric(vertical: 20, horizontal: 50), - // decoration: BoxDecoration( - // gradient: LinearGradient(colors: [Colors.blue, Colors.green]), - // borderRadius: BorderRadius.circular(10), - // ), - // child: Text( - // 'Save', - // style: TextStyle(color: Colors.white, fontSize: 17), - // textAlign: TextAlign.center, - // ), - // ), - // ), - ], - )), - ), - ); - } - - void formatData(inputs) { - for (var input in inputs) { - if (input['type'] != 'Form') { - if (input['key'] == 'result') { - values[input["key"]] = input["value"] ? "Accept" : "Reject"; - // print('${input["key"]} : ${input["value"] ? "Accept" : "Reject"}'); - } else if (input['key'] == 'date') { - var date = input["value"]; - - values[input["key"]] = "${date.year}-${date.month}-${date.day}"; - } else { - values[input["key"]] = input["value"]; - // print('${input["key"]} : ${input["value"]}'); - } - } - if (input['children'] != null && input['children'].isNotEmpty) { - formatData(input['children']); - } - } - // print(values); - } -} +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; +import 'package:random_string/random_string.dart'; + +import '../../config/routes.dart'; +import '../../providers/input.dart'; +import '../../providers/test_results.dart'; +import '../../widgets/TestResultScreens/Add/form_creator.dart'; + +class FormPage extends StatefulWidget { + final String? name; + final String? uniqueCode; + final String? testResultId; + final String? testTypeId; + + FormPage({this.name, this.uniqueCode, this.testResultId, this.testTypeId}); + + @override + _FormPageState createState() => _FormPageState(); +} + +class _FormPageState extends State { + bool _isInit = true; + bool _isLoading = false; + bool isAdding = false; + final _form = GlobalKey(); + Map values = {}; + List> formInputs = []; + + void _saveForm() { + final batchId = randomString(10); + formatData(formInputs); + var prvObject = Provider.of(context, listen: false); + if (this.widget.testResultId != null && this.widget.testResultId != '') { + values['_method'] = 'put'; + TestResultsProvider.updateTestResult(this.widget.testResultId!, values) + .then((_) { + Navigator.of(context).pop(); + }); + } else { + setState(() { + _isLoading = true; + }); + prvObject.createTestResult(values, batchId).then((result) { + setState(() { + _isLoading = false; + }); + if (result == 'done') { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Test added.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((value) => + Navigator.of(context).popAndPushNamed(Routes.testResultScreen)); + } + }); + } + } + + @override + void didChangeDependencies() { + if (_isInit) { + setState(() { + _isLoading = true; + }); + String testTypeName = Provider.of(context).testType; + String testCode = Provider.of(context).testCode; + Provider.of(context, listen: false) + .getInputs( + testResultId: '', + name: testTypeName, + uniqueCode: testCode, + testTypeId: '', + ) + .then((_) { + setState(() { + _isLoading = false; + }); + }); + } + _isInit = false; + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + return WillPopScope( + onWillPop: () async { + Navigator.pushReplacementNamed( + context, + Routes.testResultAddScreen, + ); + return true; + }, + child: SafeArea( + child: Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text('Add Test Result'), + backgroundColor: Colors.black, + actions: [ + IconButton( + icon: Icon(Icons.save), + onPressed: () { + _saveForm(); + }, + ) + ], + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () { + Navigator.of(context).popAndPushNamed(Routes.testResultScreen); + }, + ), + ), + body: SingleChildScrollView( + child: Column( + children: [ + _isLoading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Form( + key: _form, + child: Consumer( + builder: (context, inputs, _) { + formInputs = inputs.inputItems; + print(formInputs); + return formInputs.length != 0 + ? FormCreator( + form: formInputs, + onChanged: (value) { + formInputs = value; + }, + ) + : Center( + child: Text('Something went wrong!!!'), + ); + }, + ), + ), + // https://www.cssd-doc.com/api/GetInfo + // InkWell( + // onTap: () { + // _saveForm(); + // }, + // child: Container( + // padding: EdgeInsets.symmetric(horizontal: 60, vertical: 15), + // margin: EdgeInsets.symmetric(vertical: 20, horizontal: 50), + // decoration: BoxDecoration( + // gradient: LinearGradient(colors: [Colors.blue, Colors.green]), + // borderRadius: BorderRadius.circular(10), + // ), + // child: Text( + // 'Save', + // style: TextStyle(color: Colors.white, fontSize: 17), + // textAlign: TextAlign.center, + // ), + // ), + // ), + ], + ), + ), + ), + ), + ); + } + + void formatData(inputs) { + for (var input in inputs) { + if (input['type'] != 'Form') { + if (input['key'] == 'result') { + values[input["key"]] = input["value"] ? "Accept" : "Reject"; + // print('${input["key"]} : ${input["value"] ? "Accept" : "Reject"}'); + } else if (input['key'] == 'date') { + var date = input["value"]; + + values[input["key"]] = "${date.year}-${date.month}-${date.day}"; + } else { + values[input["key"]] = input["value"]; + // print('${input["key"]} : ${input["value"]}'); + } + } + if (input['children'] != null && input['children'].isNotEmpty) { + formatData(input['children']); + } + } + // print(values); + } +} diff --git a/lib/pages/TestPages/test_result_screen.dart b/lib/pages/TestPages/test_result_screen.dart new file mode 100644 index 0000000..55ecbb5 --- /dev/null +++ b/lib/pages/TestPages/test_result_screen.dart @@ -0,0 +1,449 @@ +// import 'package:cssd/providers/test_result.dart'; +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/test_results.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/TestResultScreens/Main/filter_chip_box.dart'; +import 'package:cssd/widgets/TestResultScreens/Main/floating_button.dart'; +import 'package:cssd/widgets/TestResultScreens/Main/search_box.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/test_result_models.dart'; +import '../../providers/connectivity.dart'; + +class TestResultScreen extends StatefulWidget { + // static const route = '/TestResultScreen'; + final bool? isAdmin; + + TestResultScreen({this.isAdmin}); + + @override + _TestResultScreenState createState() => _TestResultScreenState(); +} + +class _TestResultScreenState extends State { + TextEditingController searchCTRL = new TextEditingController(); + ScrollController? sc; + + bool _isInit = true; + // List _data = []; + + @override + void initState() { + sc = new ScrollController(); + + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + var testResults = + Provider.of(context, listen: false); + // testResults.resetFilters(); + testResults.setLoading(); + testResults.resetPageNumber(); + testResults.getTestResults().then((_) { + testResults.resetLoading(); + sc!.addListener(() { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.getTestResults(); + } + }); + + // setState(() { + // _isLoading = false; + // }); + }); + _isInit = false; + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + floatingActionButton: + TestResultFloatingButton(deviceBlockSize: _deviceBlockSize), + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? Padding( + padding: EdgeInsets.only( + top: 20, left: 20, right: 20, bottom: 60), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + // padding: EdgeInsets.only(top: 20, bottom: 40), + child: Text( + 'My Test Results', + // textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 6 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 2, + ), + ), + ), + Spacer(), + InkWell( + onTap: () { + Navigator.of(context) + .popAndPushNamed(Routes.testFilterScreen); + }, + child: Container( + padding: EdgeInsets.all(7), + child: Icon( + FontAwesomeIcons.filter, + size: 7 * _deviceBlockSize, + ), + ), + ), + ], + ), + Consumer( + builder: (context, testResult, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + testResult.filters.id != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + labelID: testResult.filters.labelID, + testType: + testResult.filters.testType, + hospital: + testResult.filters.hospital, + username: + testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.labelID != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Label ID', + id: testResult.filters.id, + labelID: '', + testType: + testResult.filters.testType, + hospital: + testResult.filters.hospital, + username: + testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.testType != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Test Type', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: '', + hospital: + testResult.filters.hospital, + username: + testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.hospital != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Hospital', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: + testResult.filters.testType, + hospital: '', + username: + testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.userName != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Username', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: + testResult.filters.testType, + hospital: + testResult.filters.hospital, + username: '', + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.fDate != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'From Date', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: + testResult.filters.testType, + hospital: + testResult.filters.hospital, + username: + testResult.filters.userName, + fDate: '', + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.uDate != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Until Date', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: + testResult.filters.testType, + hospital: + testResult.filters.hospital, + username: + testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: '', + ) + : Container(), + ], + ), + ); + }, + ), + TestResultSearchBox( + searchCTRL: searchCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, testResults, _) { + return testResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) => + TestItemBox( + deviceBlockSize: _deviceBlockSize, + item: testResults.items![index], + ), + itemCount: testResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} + +class TestItemBox extends StatelessWidget { + final TestResultObject? item; + const TestItemBox({ + Key? key, + required double deviceBlockSize, + required this.item, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + // print(item.result); + final userData = Provider.of(context, listen: false).user; + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.testDetailsScreen, + arguments: item!.id, + ), + child: Card( + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 57 * _deviceBlockSize, + child: Text( + item!.name, + overflow: TextOverflow.ellipsis, + // style: TextStyle(fontSize: 20), + ), + ), + Container( + width: 57 * _deviceBlockSize, + child: Text( + item!.hospital, + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + ), + SizedBox( + height: 15, + ), + item!.result == 'Accepted' + ? Text( + 'Accepted', + style: TextStyle( + color: kLightBlue, + ), + ) + : Text( + 'Rejected', + style: TextStyle( + color: kPink, + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text(item!.date), + SizedBox( + height: 15, + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Delete'), + content: Text( + 'Are you sure you want delete this Test?'), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(context).pop(); + Provider.of( + context, + listen: false) + .removeTestResult(item!.id); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + ); + }, + child: Icon( + Icons.delete, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 7.5, + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed( + Routes.testDetailsScreen, + arguments: item!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ) + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/TestPages/test_scan_screen.dart b/lib/pages/TestPages/test_scan_screen.dart new file mode 100644 index 0000000..5e576ae --- /dev/null +++ b/lib/pages/TestPages/test_scan_screen.dart @@ -0,0 +1,187 @@ +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../providers/connectivity.dart'; +import '../../widgets/Global/internet_error.dart'; + +class TestScanScreen extends StatefulWidget { + // static const route = '/TestScanScreen'; + @override + State createState() { + return _TestScanScreenState(); + } +} + +class _TestScanScreenState extends State { + String testCode = ""; + TextEditingController idCTRL = new TextEditingController(); + final _form = GlobalKey(); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Test Results'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? ListView( + padding: EdgeInsets.symmetric(horizontal: 20), + children: [ + Container( + padding: EdgeInsets.only(top: 30), + child: Text( + 'Looking for a Test Result?', + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 5.5 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 3, + ), + ), + ), + GestureDetector( + child: Container( + margin: EdgeInsets.symmetric(vertical: 10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'Please Scan The Test Result Barcode', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + textAlign: TextAlign.center, + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + launch( + 'https://cssd-doc.com/Show/TestResult/$result', + ); + // Navigator.of(context).pushNamed( + // Routes.cycleDetailScreen, + // arguments: result, + // ); + } + }, + ); + }, + ), + SizedBox( + height: 10.0, + ), + Form( + key: _form, + child: TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Id required!!'; + } + return null; + }, + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + isDense: true, + labelText: 'Or enter a Test Result ID', + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + focusedBorder: UnderlineInputBorder( + // borderRadius: BorderRadius.only(Radius.circular(4)), + borderSide: BorderSide( + color: Colors.grey, + ), + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ), + ), + SizedBox( + height: 70, + ), + InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + launch( + 'https://cssd-doc.com/Show/TestResult/${idCTRL.text}', + ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [Colors.black, Colors.black87], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Search', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} diff --git a/lib/pages/test_verify_screen.dart b/lib/pages/TestPages/test_verify_screen.dart similarity index 55% rename from lib/pages/test_verify_screen.dart rename to lib/pages/TestPages/test_verify_screen.dart index 2b1a570..a0a1e8f 100644 --- a/lib/pages/test_verify_screen.dart +++ b/lib/pages/TestPages/test_verify_screen.dart @@ -1,515 +1,466 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/test_result_models.dart'; -import '../providers/auth.dart'; -import '../providers/test_results.dart'; -import '../widgets/TestResultScreens/Main/search_box.dart'; - -class TestVerifyScreen extends StatefulWidget { - // static const route = '/TestVerifyScreen'; - // final bool isAdmin; - - // TestVerifyScreen({this.isAdmin}); - - @override - _TestVerifyScreenState createState() => _TestVerifyScreenState(); -} - -class _TestVerifyScreenState extends State { - TextEditingController searchCTRL = new TextEditingController(); - ScrollController sc; - - bool _isInit = true; - // List _data = []; - - @override - void initState() { - sc = new ScrollController(); - - super.initState(); - } - - @override - void didChangeDependencies() { - if (_isInit) { - // setState(() { - // _isLoading = true; - // }); - var testResults = - Provider.of(context, listen: false); - testResults.setLoading(); - testResults.resetFilters(); - testResults.resetPageNumber(); - testResults.getTestResults().then((_) { - testResults.resetLoading(); - sc.addListener(() { - if (sc.position.pixels == sc.position.maxScrollExtent && - searchCTRL.text == '') { - var labelProviderObject = - Provider.of(context, listen: false); - labelProviderObject.getTestResults(); - } - }); - - // setState(() { - // _isLoading = false; - // }); - }); - _isInit = false; - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final userData = Provider.of(context, listen: false).user; - - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Home'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Padding( - padding: EdgeInsets.only(top: 20, left: 20, right: 20, bottom: 60), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - // padding: EdgeInsets.only(top: 20, bottom: 40), - child: Text( - 'TESTS TO VERIFY', - // textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 6 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 2, - ), - ), - ), - // Spacer(), - // InkWell( - // onTap: () { - // Navigator.of(context) - // .popAndPushNamed(Routes.testFilterScreen); - // }, - // child: Container( - // padding: EdgeInsets.all(7), - // child: Icon( - // FontAwesomeIcons.filter, - // size: 7 * _deviceBlockSize, - // ), - // ), - // ), - ], - ), - SizedBox( - height: 20, - ), - // Consumer( - // builder: (context, testResult, _) { - // return Container( - // height: 50, - // child: ListView( - // scrollDirection: Axis.horizontal, - // shrinkWrap: true, - // children: [ - // InkWell( - // onTap: () { - // Navigator.of(context) - // .popAndPushNamed(Routes.testFilterScreen); - // }, - // child: Chip( - // backgroundColor: Colors.black, - // label: Text( - // 'Filters', - // style: TextStyle( - // color: Colors.white, - // ), - // ), - // deleteIcon: Icon( - // FontAwesomeIcons.filter, - // color: Colors.white, - // size: 4 * _deviceBlockSize, - // ), - // onDeleted: () { - // Navigator.of(context) - // .popAndPushNamed(Routes.testFilterScreen); - // }, - // ), - // ), - // testResult.filters.id != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'ID', - // id: '', - // labelID: testResult.filters.labelID, - // testType: testResult.filters.testType, - // hospital: testResult.filters.hospital, - // username: testResult.filters.userName, - // fDate: testResult.filters.fDate, - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.labelID != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'Label ID', - // id: testResult.filters.id, - // labelID: '', - // testType: testResult.filters.testType, - // hospital: testResult.filters.hospital, - // username: testResult.filters.userName, - // fDate: testResult.filters.fDate, - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.testType != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'Test Type', - // id: testResult.filters.id, - // labelID: testResult.filters.labelID, - // testType: '', - // hospital: testResult.filters.hospital, - // username: testResult.filters.userName, - // fDate: testResult.filters.fDate, - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.hospital != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'Hospital', - // id: testResult.filters.id, - // labelID: testResult.filters.labelID, - // testType: testResult.filters.testType, - // hospital: '', - // username: testResult.filters.userName, - // fDate: testResult.filters.fDate, - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.userName != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'Username', - // id: testResult.filters.id, - // labelID: testResult.filters.labelID, - // testType: testResult.filters.testType, - // hospital: testResult.filters.hospital, - // username: '', - // fDate: testResult.filters.fDate, - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.fDate != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'From Date', - // id: testResult.filters.id, - // labelID: testResult.filters.labelID, - // testType: testResult.filters.testType, - // hospital: testResult.filters.hospital, - // username: testResult.filters.userName, - // fDate: '', - // uDate: testResult.filters.uDate, - // ) - // : Container(), - // testResult.filters.uDate != '' - // ? TestResultChip( - // deviceBlockSize: _deviceBlockSize, - // label: 'Until Date', - // id: testResult.filters.id, - // labelID: testResult.filters.labelID, - // testType: testResult.filters.testType, - // hospital: testResult.filters.hospital, - // username: testResult.filters.userName, - // fDate: testResult.filters.fDate, - // uDate: '', - // ) - // : Container(), - // ], - // ), - // ); - // }, - // ), - TestResultSearchBox( - searchCTRL: searchCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 20, - ), - Expanded( - child: Consumer( - builder: (context, testResults, _) { - return testResults.isloading - ? Center( - child: CircularProgressIndicator(), - ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) => - (testResults.items[index].verified == 'None' && - userData['roles'] - .contains('Supervisor')) || - userData['roles'].contains('Admin') - ? TestItemBox( - deviceBlockSize: _deviceBlockSize, - item: testResults.items[index], - id: testResults.items[index].id, - userData: userData, - ) - : Container(), - // Column( - // children: [ - // Text(testResults.items[index].name), - // Text(testResults.items[index].isVerified.toString()), - // Text(testResults.items[index].hospital), - // Text(testResults.items[index].date), - - // ], - // ), - // ChangeNotifierProvider.value( - // value: testResults.items[index], - // child: ResultCard( - // isAdmin: widget.isAdmin, - // ), - // ), - itemCount: testResults.items.length, - shrinkWrap: true, - ); - }, - ), - ), - ], - ), - ), - ), - ); - } -} - -class TestItemBox extends StatelessWidget { - final TestResultObject item; - const TestItemBox({ - Key key, - @required String id, - @required double deviceBlockSize, - @required this.item, - @required this.userData, - }) : _deviceBlockSize = deviceBlockSize, - // _id = id, - super(key: key); - final Map userData; - final double _deviceBlockSize; - // final String _id; - - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: () => Navigator.of(context).pushNamed( - Routes.testDetailsScreen, - arguments: item.id, - ), - child: Card( - child: Container( - padding: EdgeInsets.all(10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 57 * _deviceBlockSize, - child: Text( - item.name, - overflow: TextOverflow.ellipsis, - // style: TextStyle(fontSize: 20), - ), - ), - Container( - width: 57 * _deviceBlockSize, - child: Text( - item.hospital, - style: TextStyle( - color: Colors.grey, - fontSize: 3 * _deviceBlockSize, - ), - ), - ), - SizedBox( - height: 15, - ), - item.verified == 'None' - ? Text( - 'Awaiting Verification', - style: TextStyle(color: Colors.orange), - ) - : item.verified == 'Verified' - ? Text( - 'Verified', - style: TextStyle( - color: Colors.blueAccent, - ), - ) - : Text( - 'Rejected', - style: TextStyle( - color: Colors.red, - ), - ), - ], - ), - Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text(item.date), - SizedBox( - height: 15, - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - InkWell( - onTap: () { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('Verify'), - content: Text( - 'Are you sure for verify this test?'), - actions: [ - TextButton( - onPressed: () async { - Provider.of( - context) - .changeVerification( - item.id, 'Verified') - .then((result) { - if (result) { - print('true'); - } - Navigator.of(ctx).pop(); - Navigator.of(context).popAndPushNamed( - Routes.testVerifyScreen); - }); - }, - child: Text('Yes'), - ), - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('No'), - ), - ], - ), - ); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Color.fromRGBO(0, 190, 190, 1), - ), - child: Icon( - Icons.check, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - SizedBox( - width: 3, - ), - InkWell( - onTap: () { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('Reject'), - content: Text( - 'Are you sure for reject this test?'), - actions: [ - TextButton( - onPressed: () async { - await Provider.of( - context) - .changeVerification( - item.id, 'NotVerified') - .then((result) { - if (result) { - print('true'); - } - Navigator.of(ctx).pop(); - Navigator.of(context).popAndPushNamed( - Routes.testVerifyScreen); - }); - }, - child: Text('Yes'), - ), - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('No'), - ), - ], - ), - ); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.red, - ), - child: Icon( - Icons.close, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ), - SizedBox( - width: _deviceBlockSize, - ), - ], - ) - ], - ), - ], - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:cssd/widgets/TestResultScreens/Main/filter_chip_box.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; +import '../../models/test_result_models.dart'; +import '../../providers/auth.dart'; +import '../../providers/test_results.dart'; +import '../../widgets/TestResultScreens/Main/search_box.dart'; + +class TestVerifyScreen extends StatefulWidget { + // static const route = '/TestVerifyScreen'; + // final bool isAdmin; + + // TestVerifyScreen({this.isAdmin}); + + @override + _TestVerifyScreenState createState() => _TestVerifyScreenState(); +} + +class _TestVerifyScreenState extends State { + TextEditingController searchCTRL = new TextEditingController(); + ScrollController? sc; + + bool _isInit = true; + // List _data = []; + + @override + void initState() { + sc = new ScrollController(); + + super.initState(); + } + + @override + void didChangeDependencies() { + if (_isInit) { + // setState(() { + // _isLoading = true; + // }); + var testResults = + Provider.of(context, listen: false); + testResults.setLoading(); + testResults.resetFilters(); + testResults.resetPageNumber(); + testResults.getTestResults().then((_) { + testResults.resetLoading(); + sc!.addListener(() { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.getTestResults(); + } + }); + + // setState(() { + // _isLoading = false; + // }); + }); + _isInit = false; + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Home'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Padding( + padding: EdgeInsets.only(top: 20, left: 20, right: 20, bottom: 60), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + // crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + // padding: EdgeInsets.only(top: 20, bottom: 40), + child: Text( + 'Tests To Verify', + // textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 6 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 2, + ), + ), + ), + ], + ), + Consumer( + builder: (context, testResult, _) { + return Container( + height: 50, + child: ListView( + scrollDirection: Axis.horizontal, + shrinkWrap: true, + children: [ + testResult.filters.id != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'ID', + id: '', + labelID: testResult.filters.labelID, + testType: testResult.filters.testType, + hospital: testResult.filters.hospital, + username: testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.labelID != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Label ID', + id: testResult.filters.id, + labelID: '', + testType: testResult.filters.testType, + hospital: testResult.filters.hospital, + username: testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.testType != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Test Type', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: '', + hospital: testResult.filters.hospital, + username: testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.hospital != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Hospital', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: testResult.filters.testType, + hospital: '', + username: testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.userName != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Username', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: testResult.filters.testType, + hospital: testResult.filters.hospital, + username: '', + fDate: testResult.filters.fDate, + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.fDate != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'From Date', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: testResult.filters.testType, + hospital: testResult.filters.hospital, + username: testResult.filters.userName, + fDate: '', + uDate: testResult.filters.uDate, + ) + : Container(), + testResult.filters.uDate != '' + ? TestResultChip( + deviceBlockSize: _deviceBlockSize, + label: 'Until Date', + id: testResult.filters.id, + labelID: testResult.filters.labelID, + testType: testResult.filters.testType, + hospital: testResult.filters.hospital, + username: testResult.filters.userName, + fDate: testResult.filters.fDate, + uDate: '', + ) + : Container(), + ], + ), + ); + }, + ), + TestResultSearchBox( + searchCTRL: searchCTRL, + deviceBlockSize: _deviceBlockSize, + ), + SizedBox( + height: 20, + ), + Expanded( + child: Consumer( + builder: (context, testResults, _) { + return testResults.isloading + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView.builder( + controller: sc, + itemBuilder: (context, index) => + (testResults.items![index].verified == 'None' && + userData['roles'] + .contains('Supervisor')) || + userData['roles'].contains('Admin') + ? TestItemBox( + deviceBlockSize: _deviceBlockSize, + item: testResults.items![index], + id: testResults.items![index].id, + userData: userData, + ) + : Container(), + itemCount: testResults.items?.length, + shrinkWrap: true, + ); + }, + ), + ), + ], + ), + ), + ), + ); + } +} + +class TestItemBox extends StatelessWidget { + final TestResultObject item; + const TestItemBox({ + Key? key, + required String id, + required double deviceBlockSize, + required this.item, + required this.userData, + }) : _deviceBlockSize = deviceBlockSize, + // _id = id, + super(key: key); + final Map userData; + final double _deviceBlockSize; + // final String _id; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.testDetailsScreen, + arguments: item.id, + ), + child: Card( + child: Container( + padding: EdgeInsets.all(10), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 57 * _deviceBlockSize, + child: Text( + item.name, + overflow: TextOverflow.ellipsis, + // style: TextStyle(fontSize: 20), + ), + ), + Container( + width: 57 * _deviceBlockSize, + child: Text( + item.hospital, + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + ), + SizedBox( + height: 15, + ), + item.verified == 'None' + ? Text( + 'Awaiting Verification', + style: TextStyle(color: Colors.orange), + ) + : item.verified == 'Verified' + ? Text( + 'Verified', + style: TextStyle( + color: kBlue, + ), + ) + : Text( + 'Rejected', + style: TextStyle( + color: kPink, + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text(item.date), + SizedBox( + height: 15, + ), + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Verify'), + content: Text( + 'Are you sure for verify this test?'), + actions: [ + TextButton( + onPressed: () async { + Provider.of( + context, + listen: false) + .changeVerification( + item.id, 'Verified') + .then((result) { + if (result) { + print('true'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.testVerifyScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 10 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kBlue, + ), + child: Icon( + Icons.check, + size: 6 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 3, + ), + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Reject'), + content: Text( + 'Are you sure for reject this test?'), + actions: [ + TextButton( + onPressed: () async { + await Provider.of( + context, + listen: false) + .changeVerification( + item.id, 'NotVerified') + .then((result) { + if (result) { + print('true'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.testVerifyScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 10 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kPink, + ), + child: Icon( + Icons.close, + size: 6 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + SizedBox( + width: _deviceBlockSize, + ), + ], + ) + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/pages/cycle_add_screen.dart b/lib/pages/cycle_add_screen.dart deleted file mode 100644 index 1ad572a..0000000 --- a/lib/pages/cycle_add_screen.dart +++ /dev/null @@ -1,291 +0,0 @@ -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/cycles_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/cycles.dart'; -import '../widgets/CycleScreens/Add/add_label_box.dart'; -import '../widgets/CycleScreens/Add/date_picker.dart'; -import '../widgets/CycleScreens/Add/save_button.dart'; -import '../widgets/Global/internet_error.dart'; - -class CycleAddScreen extends StatefulWidget { - // static const route = '/CycleAddScreen'; - - @override - _CycleAddScreenState createState() => _CycleAddScreenState(); -} - -class _CycleAddScreenState extends State { - final _cycleNumberFocusNode = FocusNode(); - final _descriptionFocosNode = FocusNode(); - TextEditingController descriptionCTRL = new TextEditingController(); - TextEditingController cycleNumberCTRL = new TextEditingController(); - TextEditingController striizerIdCTRL = new TextEditingController(); - TextEditingController dateCTRL = new TextEditingController(); - // String initialLabelValue = ''; - DateTime dateTimeFrom; - // String dateValue; - final _form = GlobalKey(); - - // List labelVals = []; - // List labelValues = []; - bool isInit = true; - CycleFilterObject filters; - - List labelsCTRL = [TextEditingController()]; - int curLabelVal = 1; - @override - void initState() { - descriptionCTRL.text = ''; - cycleNumberCTRL.text = ''; - dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); - striizerIdCTRL.text = ''; - // dateValue = DateFormat('y-M-d').format(DateTime.now()); - super.initState(); - } - - @override - void didChangeDependencies() async { - if (isInit) { - // var _id = ModalRoute.of(context).settings.arguments; - var cycleProviderObject = Provider.of(context); - cycleProviderObject.resetLabelVals(); - cycleProviderObject.getLabelFilters().then( - (result) { - setState( - () { - // labelValues = - // filters.hospital == '' ? labelVals[0] : filters.hospital; - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.cycleResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Cycles'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context) - .pushReplacementNamed(Routes.cycleResultScreen), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: Padding( - padding: EdgeInsets.all(20), - child: ListView( - // crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'ADD A CYCLE', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 6 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - SizedBox( - height: 20, - ), - - TextFormField( - validator: (val) { - if (val.isEmpty) { - return 'Strilizer ID required!'; - } - return null; - }, - controller: striizerIdCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Strilizer ID', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_cycleNumberFocusNode); - }, - ), - SizedBox( - height: 30, - ), - TextFormField( - validator: (val) { - if (val.isEmpty) { - return 'Cycle number required!'; - } - return null; - }, - controller: cycleNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Cycle Number', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _cycleNumberFocusNode, - keyboardType: TextInputType.number, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_descriptionFocosNode); - }, - ), - - SizedBox( - height: 20, - ), - Container( - margin: EdgeInsets.symmetric(vertical: 10), - child: Text( - 'LABELS INCLUDED', - style: TextStyle( - color: Colors.deepOrange, - letterSpacing: 2, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - Consumer( - builder: (ctx, cycleProvider, _) => - ListView.builder( - physics: NeverScrollableScrollPhysics(), - shrinkWrap: true, - itemBuilder: (ctx, index) => CycleAddLabelBox( - deviceBlockSize: _deviceBlockSize, - labelValues: - cycleProvider.labelValues[index], - labelVals: cycleProvider.labelVals, - initialLabelValue: - cycleProvider.initialLabelValue, - index: index, - ), - itemCount: cycleProvider.labelValues.length, - ), - ), - - CycleAddDatePicker( - dateCTRL: dateCTRL, - deviceBlockSize: _deviceBlockSize), - SizedBox( - height: 30, - ), - TextFormField( - controller: descriptionCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.alignLeft, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Description', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.multiline, - focusNode: _descriptionFocosNode, - minLines: 1, - maxLines: 5, - ), - SizedBox( - height: 70, - ), - CycleAddSaveButton( - form: _form, - labelValues: Provider.of( - context, - listen: false) - .labelValues, - cycleNumberCTRL: cycleNumberCTRL, - dateValue: dateCTRL.text, - descriptionCTRL: descriptionCTRL, - striizerIdCTRL: striizerIdCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 100, - ), - - // DropDownBox(values: ['Washer ID']), - ], - ), - ), - ) - : ConnectionErrorBox(); - }), - ), - ), - ); - } -} diff --git a/lib/pages/cycle_filter_screen.dart b/lib/pages/cycle_filter_screen.dart deleted file mode 100644 index f078850..0000000 --- a/lib/pages/cycle_filter_screen.dart +++ /dev/null @@ -1,330 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/cycles_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/cycles.dart'; -import '../widgets/CycleScreens/Filter/date_picker.dart'; -import '../widgets/CycleScreens/Filter/save_button.dart'; -import '../widgets/CycleScreens/Filter/selector_box.dart'; -import '../widgets/Global/internet_error.dart'; - -class CycleFilterScreen extends StatefulWidget { - // static const route = '/CycleFilterScreen'; - - @override - _CycleFilterScreenState createState() => _CycleFilterScreenState(); -} - -class _CycleFilterScreenState extends State { - final _cycleNumberFocusNode = FocusNode(); - final _strilizerIdFocusNode = FocusNode(); - TextEditingController cycleIdCTRL = new TextEditingController(); - TextEditingController cycleNumberCTRL = new TextEditingController(); - TextEditingController striizerIdCTRL = new TextEditingController(); - TextEditingController hospitalCTRL = new TextEditingController(); - - TextEditingController dateCTRL = new TextEditingController(); - DateTime dateTimeFrom; - // String dateValue; - - List> hospitalVals = []; - // String curhospitalVal; - bool isInit = true; - CycleFilterObject filters; - @override - void initState() { - filters = Provider.of(context, listen: false).filters; - cycleIdCTRL.text = filters.id; - cycleNumberCTRL.text = filters.cycleNumber; - // dateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); - dateCTRL.text = ''; - striizerIdCTRL.text = filters.sterilizerId; - // dateValue = DateFormat('y-M-d').format(DateTime.now()); - super.initState(); - } - - @override - void didChangeDependencies() async { - if (isInit) { - // var _id = ModalRoute.of(context).settings.arguments; - await Provider.of(context, listen: false) - .getHospitalsFilters() - .then( - (result) { - setState( - () { - hospitalVals = [ - {'id': '', 'name': ''} - ]; - for (var hospital in result) { - hospitalVals.add(hospital); - } - filters.hospital == '' - ? hospitalCTRL.text = hospitalVals[0]['name'] - : hospitalVals.forEach( - //id convert to name - (hospital) { - if (hospital['id'] == filters.hospital) { - hospitalCTRL.text = hospital['name']; - } - }, - ); - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.cycleResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Cycles'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context) - .pushReplacementNamed(Routes.cycleResultScreen), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Padding( - padding: EdgeInsets.all(20), - child: ListView( - // crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'FILTER RESULTS', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - ), - SizedBox( - height: 20, - ), - Row( - children: [ - Flexible( - flex: 8, - child: TextFormField( - controller: cycleIdCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cycle ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_cycleNumberFocusNode); - }, - ), - ), - // Spacer(), - Flexible( - flex: 1, - child: InkWell( - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - cycleIdCTRL.text = result; - // Navigator.of(context).pushNamed( - // CycleDetailScreen.route, - // arguments: result, - // ); - } - }, - ); - }, - child: Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 5 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ) - ], - ), - SizedBox( - height: 30, - ), - TextFormField( - controller: cycleNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cycle Number', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _cycleNumberFocusNode, - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_strilizerIdFocusNode); - }, - ), - SizedBox( - height: 30, - ), - TextField( - controller: striizerIdCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Strilizer ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _strilizerIdFocusNode, - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.done, - ), - SizedBox( - height: 20, - ), - CycleFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - hospitalCTRL: hospitalCTRL, - hospitalVals: hospitalVals, - label: 'Hospital', - ), - SizedBox( - height: 20, - ), - CycleFilterDatePicker( - dateCTRL: dateCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 70, - ), - CycleFilterSaveButton( - hospitalVals: hospitalVals, - hospitalCTRL: hospitalCTRL, - cycleIdCTRL: cycleIdCTRL, - cycleNumberCTRL: cycleNumberCTRL, - striizerIdCTRL: striizerIdCTRL, - dateCTRL: dateCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 100, - ), - ], - ), - ) - : ConnectionErrorBox(); - }), - ), - ), - ); - } -} - -Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } -} diff --git a/lib/pages/cycle_result_screen.dart b/lib/pages/cycle_result_screen.dart deleted file mode 100644 index ad13c07..0000000 --- a/lib/pages/cycle_result_screen.dart +++ /dev/null @@ -1,264 +0,0 @@ -import '../config/routes.dart'; - -import '../providers/connectivity.dart'; -import '../widgets/CycleScreens/Result/banner.dart'; -import '../widgets/CycleScreens/Result/data_box.dart'; -import '../widgets/CycleScreens/Result/filter_objects.dart'; -import '../widgets/CycleScreens/Result/search_box.dart'; -import '../widgets/Global/internet_error.dart'; - -import '../providers/cycles.dart'; - -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -class CycleResultScreen extends StatefulWidget { - // static const route = '/CycleResultScreen'; - final bool isAdmin; - - CycleResultScreen({this.isAdmin}); - - @override - _CycleResultScreenState createState() => _CycleResultScreenState(); -} - -class _CycleResultScreenState extends State { - bool _isInit = true; - ScrollController sc; - TextEditingController searchCTRL = new TextEditingController(); - - @override - void initState() { - sc = new ScrollController(); - super.initState(); - } - - @override - void didChangeDependencies() { - if (_isInit) { - var testResults = Provider.of(context); - testResults.setLoading(); - testResults.resetPageNumber(); - testResults.getCycleResults().then((_) { - testResults.resetLoading(); - sc.addListener( - () { - if (sc.position.pixels == sc.position.maxScrollExtent && - searchCTRL.text == '') { - var testResults = Provider.of(context); - testResults.getCycleResults(); - } - }, - ); - }); - } - _isInit = false; - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - floatingActionButton: CycleResultFloatingButton( - deviceBlockSize: _deviceBlockSize, - ), - appBar: AppBar( - titleSpacing: -10, - title: Text('Home'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? Padding( - padding: - EdgeInsets.only(top: 20, right: 20, bottom: 60, left: 20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CycleResultBanner(deviceBlockSize: _deviceBlockSize), - SizedBox( - height: 10, - ), - Consumer(builder: (ctx, cycle, _) { - return Container( - height: 50, - child: ListView( - scrollDirection: Axis.horizontal, - shrinkWrap: true, - children: [ - CycleFilterBaner( - deviceBlockSize: _deviceBlockSize), - cycle.filters.id != '' - ? CycleFilterChip( - deviceBlockSize: _deviceBlockSize, - label: 'ID', - id: '', - cycleNumber: cycle.filters.cycleNumber, - sterilizerId: cycle.filters.sterilizerId, - hospital: cycle.filters.hospital, - date: cycle.filters.date, - ) - : Container(), - cycle.filters.cycleNumber != '' - ? CycleFilterChip( - deviceBlockSize: _deviceBlockSize, - label: 'Cycle Number', - id: cycle.filters.id, - cycleNumber: '', - sterilizerId: cycle.filters.sterilizerId, - hospital: cycle.filters.hospital, - date: cycle.filters.date, - ) - : Container(), - cycle.filters.sterilizerId != '' - ? CycleFilterChip( - deviceBlockSize: _deviceBlockSize, - label: 'Sterilizer ID', - id: cycle.filters.id, - cycleNumber: cycle.filters.cycleNumber, - sterilizerId: '', - hospital: cycle.filters.hospital, - date: cycle.filters.date, - ) - : Container(), - cycle.filters.hospital != '' - ? CycleFilterChip( - deviceBlockSize: _deviceBlockSize, - label: 'Hospital', - id: cycle.filters.id, - cycleNumber: cycle.filters.cycleNumber, - sterilizerId: cycle.filters.sterilizerId, - hospital: '', - date: cycle.filters.date, - ) - : Container(), - cycle.filters.date != '' - ? CycleFilterChip( - deviceBlockSize: _deviceBlockSize, - label: 'Date', - id: cycle.filters.id, - cycleNumber: cycle.filters.cycleNumber, - sterilizerId: cycle.filters.sterilizerId, - hospital: cycle.filters.hospital, - date: '', - ) - : Container(), - ], - ), - ); - }), - CycleResultSearchBox( - searchCTRL: searchCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 20, - ), - Expanded( - child: Consumer( - builder: (context, cycleResults, _) { - return cycleResults.isloading - ? Center( - child: CircularProgressIndicator(), - ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - String labels = ''; - for (var label - in cycleResults.items[index].label) { - labels += label; - labels += ' , '; - } - labels = labels.substring(0, - labels.length - 3); // remove extra , - return CycleItemBox( - deviceBlockSize: _deviceBlockSize, - item: cycleResults.items[index], - labels: labels, - ); - }, - itemCount: cycleResults.items.length, - shrinkWrap: true, - ); - }, - ), - ), - ], - ), - ) - : ConnectionErrorBox(); - }), - ), - ); - } -} - -class CycleResultFloatingButton extends StatelessWidget { - const CycleResultFloatingButton({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed(Routes.cycleScanScreen); - }, - child: Container( - padding: EdgeInsets.all(2.5 * _deviceBlockSize), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 7.1 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - SizedBox( - width: 2 * _deviceBlockSize, - ), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushReplacementNamed(Routes.cycleAddScreen); - }, - child: Container( - padding: EdgeInsets.all(_deviceBlockSize), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Color.fromRGBO(0, 190, 190, 1), - ), - child: Icon( - Icons.add, - size: 10 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ); - } -} diff --git a/lib/pages/cycle_scan_screen.dart b/lib/pages/cycle_scan_screen.dart deleted file mode 100644 index c2da146..0000000 --- a/lib/pages/cycle_scan_screen.dart +++ /dev/null @@ -1,220 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class CycleScanScreen extends StatefulWidget { - // static const route = '/cycleScanScreen'; - @override - State createState() { - return _CycleScanScreenState(); - } -} - -class _CycleScanScreenState extends State { - String testCode = ""; - TextEditingController idCTRL = new TextEditingController(); - final _form = GlobalKey(); - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - titleSpacing: -10, - title: Text('CSSD'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.only(top: 30), - child: Text( - 'LOOKING FOR A CYCLE?', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 5.5 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 3, - ), - ), - ), - GestureDetector( - child: Container( - margin: EdgeInsets.symmetric(vertical: 10), - height: 200, - decoration: BoxDecoration(border: Border.all()), - child: Center( - child: Text( - 'Please Scan The Cycle Barcode', - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - fontWeight: FontWeight.w100, - letterSpacing: 3, - ), - textAlign: TextAlign.center, - ), - ), - ), - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - launch( - 'https://cssd-doc.com/Show/Cycle/$result', - ); - // Navigator.of(context).pushNamed( - // Routes.cycleDetailScreen, - // arguments: result, - // ); - } - }, - ); - }, - ), - Form( - key: _form, - child: TextFormField( - validator: (val) { - if (val.isEmpty) { - return 'Id required!!'; - } - return null; - }, - controller: idCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Or enter a cycle ID', - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - focusedBorder: UnderlineInputBorder( - // borderRadius: BorderRadius.only(Radius.circular(4)), - borderSide: BorderSide( - color: Colors.grey, - ), - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - ), - ), - SizedBox( - height: 40, - ), - Divider( - color: Colors.black, - thickness: 3, - ), - SizedBox( - height: 30, - ), - InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - launch( - 'https://cssd-doc.com/Show/Cycle/${idCTRL.text}', - ); - // Navigator.of(context).pushNamed( - // Routes.cycleDetailScreen, - // arguments: idCTRL.text, - // ); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - margin: - EdgeInsets.only(bottom: 50, left: 20, right: 20), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.red, Colors.orange], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'GO!', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ), - ], - ) - : ConnectionErrorBox(); - }), - ), - ); - } - - Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } - } -} diff --git a/lib/pages/home_screen.dart b/lib/pages/home_screen.dart index 4499903..d538108 100644 --- a/lib/pages/home_screen.dart +++ b/lib/pages/home_screen.dart @@ -1,462 +1,484 @@ -import 'package:barcode_scan2/platform_wrapper.dart'; -import 'package:double_back_to_close_app/double_back_to_close_app.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_phoenix/flutter_phoenix.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../providers/auth.dart'; -import '../providers/connectivity.dart'; -import '../widgets/Global/drawer.dart'; -import '../widgets/Global/internet_error.dart'; -import 'cycle_result_screen.dart'; -import 'label_result_screen.dart'; -import 'my_info_screen.dart'; -import 'test_result_screen.dart'; -import 'test_verify_screen.dart'; - -class HomePage extends StatelessWidget { - // 09338736511 - - // static const route = '/HomeScreen'; - @override - Widget build(BuildContext context) { - final userData = Provider.of(context, listen: false).user; - - // print(userData['roles']); - return SafeArea( - child: Scaffold( - // resizeToAvoidBottomPadding: false, - drawer: Selector( - builder: (ctx, value, _) => - value != 'offline' ? AppDrawer() : Container(), - selector: (_, connctivity) => connctivity.conStatus, - ) - // Consumer(builder: (ct, connection, _) { - // return connection.conStatus != 'offline' ? AppDrawer() : Container(); - // }) - , - appBar: AppBar( - centerTitle: true, - title: Text('CSSD'), - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: IconButton( - icon: Icon( - Icons.power_settings_new, - ), - onPressed: () { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('LogOut'), - content: Text('Are you sure for logout?'), - actions: [ - TextButton( - child: Text('Yes'), - onPressed: () { - Navigator.of(ctx).pop(); - Provider.of(context, listen: false).logout(); - Phoenix.rebirth(context); - }, - ), - TextButton( - child: Text('No'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ); - }, - ), - ) - ], - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? DoubleBackToCloseApp( - snackBar: SnackBar( - duration: Duration(seconds: 2), - backgroundColor: Colors.black, - content: Text( - 'Double tap for exit . . .', - style: TextStyle(color: Colors.white), - ), - ), - child: Container( - margin: EdgeInsets.only( - top: 0, bottom: 10, left: 20, right: 20), - child: ListView( - // crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - margin: EdgeInsets.only(top: 20, bottom: 10), - child: Text( - 'WELCOME HOME', - style: TextStyle( - color: Colors.black, - fontSize: 20, - letterSpacing: 3.5, - fontWeight: FontWeight.w700, - ), - ), - ), - SelectionItem( - startColor: Color(0xFFFCB8A2), - endColor: Color(0xFFFFECD2), - firstLine: 'My INFO', - secondLine: 'List, Details & Add a one', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return MyInfoScreen(); - }, - ); - }, - ), - ), - ), - SelectionItem( - startColor: Color(0xFFD5F5FD), - endColor: Color(0xFFE9FFF7), - firstLine: 'TEST RESULTS', - secondLine: 'List, Details & Add a one', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return TestResultScreen(); - }, - ); - }, - ), - ), - // MyTestResult( - // isAdmin: false, - // ), - ), - SelectionItem( - startColor: Color(0xFFE2D2C4), - endColor: Color(0xFFFAF7F5), - firstLine: 'LABELS', - secondLine: 'List, Details & Add a one', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return LabelResultScreen(); - }, - ); - }, - ), - ), - ), - SelectionItem( - startColor: Color(0xFFA7CCE1), - endColor: Color(0xFFECF7ED), - firstLine: 'CYCLES', - secondLine: 'List, Details & Add a one', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return CycleResultScreen(); - }, - ); - }, - ), - ), - ), - // SelectionItem( - // startColor: Color(0xFFA7CCE1), - // endColor: Color(0xFFECF7ED), - // firstLine: 'image', - // secondLine: 'image', - // onTap: CaptureImage(), - // ), - userData['roles'].contains('User') - ? Container() - : SelectionItem( - startColor: Color(0xFFA7CCE1), - endColor: Color(0xFFECF7ED), - firstLine: 'TEST TO VERIFY', - secondLine: 'Verify and reject Test Results', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return TestVerifyScreen(); - }, - ); - }, - ), - ), - ), - BarcodeSelectionItem(), - ], - ), - ), - ) - : ConnectionErrorBox(); - }, - ), - ), - ); - } -} - -Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent; - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } -} - -class SelectionItem extends StatelessWidget { - final Color startColor; - final Color endColor; - final String firstLine; - final String secondLine; - final Function onTap; - - SelectionItem( - {this.startColor, - this.endColor, - this.firstLine, - this.secondLine, - this.onTap}); - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return Container( - margin: EdgeInsets.symmetric(vertical: 10), - padding: EdgeInsets.symmetric(vertical: 5), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [startColor, endColor], - ), - borderRadius: BorderRadius.all( - Radius.circular(3), - ), - ), - child: InkWell( - splashColor: Colors.red, - onTap: onTap, - child: ListTile( - title: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - firstLine, - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3.5, - ), - ), - Text( - secondLine, - style: TextStyle( - color: Colors.grey, - fontSize: 3.5 * _deviceBlockSize, - ), - ), - ], - ), - trailing: Icon( - Icons.arrow_forward_ios, - color: Colors.black, - ), - ), - // Column( - // children: [ - // ListTile( - // title: Text( - // firstLine, - // textAlign: TextAlign.start, - // style: TextStyle(color: Colors.black), - // ), - // ), - // ListTile( - // title: Text( - // secondLine, - // style: TextStyle(color: Colors.black, fontSize: 20), - // ), - // trailing: Icon( - // Icons.arrow_forward_ios, - // color: Colors.black, - // ), - // ), - // ], - // ), - ), - ); - } -} - -class BarcodeSelectionItem extends StatelessWidget { - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return Container( - margin: EdgeInsets.symmetric(vertical: 10), - padding: EdgeInsets.symmetric(vertical: 5), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.black, Colors.black87], - ), - borderRadius: BorderRadius.all( - Radius.circular(3), - ), - ), - child: InkWell( - splashColor: Colors.red, - onTap: () => scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - showDialog( - context: context, - builder: (_) => AlertDialog( - title: Text( - 'نتیجه ی اسکن', - textDirection: TextDirection.rtl, - textAlign: TextAlign.right, - style: TextStyle( - fontSize: 2.75 * _deviceBlockSize, - ), - ), - content: Text( - result, - textDirection: TextDirection.rtl, - style: TextStyle( - fontSize: 4 * _deviceBlockSize, - ), - ), - actions: [ - TextButton( - onPressed: () async { - await launch(result); - Navigator.of(context).pop(); - }, - child: Text( - 'بازکردن در مرورگر', - style: TextStyle( - fontFamily: 'montserrat', - ), - ), - ) - ], - ), - ); - } - }, - ), - child: ListTile( - title: Row( - children: [ - Icon( - Icons.qr_code_scanner, - color: Colors.white, - size: 8 * _deviceBlockSize, - ), - SizedBox( - width: 2 * _deviceBlockSize, - ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - 'SCANNER', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3.5, - ), - ), - Text( - 'Scan a Bar or QR code', - style: TextStyle( - color: Colors.white, - fontSize: 3.5 * _deviceBlockSize, - ), - ), - ], - ) - ], - ), - trailing: Icon( - Icons.arrow_forward_ios, - color: Colors.white, - ), - ), - // Column( - // children: [ - // ListTile( - // title: Text( - // firstLine, - // textAlign: TextAlign.start, - // style: TextStyle(color: Colors.black), - // ), - // ), - // ListTile( - // title: Text( - // secondLine, - // style: TextStyle(color: Colors.black, fontSize: 20), - // ), - // trailing: Icon( - // Icons.arrow_forward_ios, - // color: Colors.black, - // ), - // ), - // ], - // ), - ), - ); - } -} +import 'package:barcode_scan2/platform_wrapper.dart'; +import 'package:cssd/config/colors.dart'; +import 'package:cssd/pages/ItemPages/item_result_screen.dart'; +import 'package:cssd/pages/MyItemsPages/Result/my_items_result_screen.dart'; +import 'package:cssd/pages/MyPackagesPages/Result/my_packages_result_screen.dart'; +import 'package:cssd/pages/PackagePages/package_result_screen.dart'; +import 'package:double_back_to_close_app/double_back_to_close_app.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:flutter_phoenix/flutter_phoenix.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../providers/auth.dart'; +import '../providers/connectivity.dart'; +import '../widgets/Global/drawer.dart'; +import '../widgets/Global/internet_error.dart'; +import 'CyclePages/cycle_result_screen.dart'; +import 'LabelPages/label_result_screen.dart'; +import 'my_info_screen.dart'; +import 'TestPages/test_result_screen.dart'; +import 'TestPages/test_verify_screen.dart'; + +class HomePage extends StatelessWidget { + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return SafeArea( + child: Scaffold( + drawer: Selector( + builder: (ctx, value, _) => + value != 'offline' ? AppDrawer() : Container(), + selector: (_, connectivity) => connectivity.conStatus, + ), + appBar: AppBar( + centerTitle: true, + title: Text('CSSD'), + backgroundColor: Colors.black, + actions: [ + Padding( + padding: const EdgeInsets.only(right: 10.0), + child: IconButton( + icon: Icon( + Icons.power_settings_new, + ), + onPressed: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('LogOut'), + content: Text('Are you sure for logout?'), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(ctx).pop(); + Provider.of(context, listen: false).logout(); + Phoenix.rebirth(context); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ); + }, + ), + ) + ], + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? DoubleBackToCloseApp( + snackBar: SnackBar( + duration: Duration(seconds: 2), + backgroundColor: Colors.black, + content: Text( + 'Double tap for exit . . .', + style: TextStyle(color: Colors.white), + ), + ), + child: Container( + margin: EdgeInsets.only( + top: 0, bottom: 10, left: 20, right: 20), + child: ListView( + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: EdgeInsets.only(top: 20, bottom: 10), + child: Text( + 'WELCOME HOME', + style: TextStyle( + color: Colors.black, + fontSize: 20, + letterSpacing: 3.5, + fontWeight: FontWeight.w700, + ), + ), + ), + SelectionItem( + firstLine: 'MY INFO', + secondLine: 'Personal Details', + firstLineColor: Colors.black, + secondLineColor: Colors.grey, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return MyInfoScreen(); + }, + ); + }, + ), + ), + ), + SelectionItem( + firstLine: 'TEST RESULTS', + secondLine: 'List, Details & Add a one', + firstLineColor: Colors.black, + secondLineColor: Colors.grey, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return TestResultScreen(); + }, + ); + }, + ), + ), + ), + Divider( + height: 2, + ), + SelectionItem( + firstLine: 'LABELS', + secondLine: 'List, Details & Add a one', + firstLineColor: kLightBlue, + secondLineColor: kLightBlueSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return LabelResultScreen(); + }, + ); + }, + ), + ), + ), + SelectionItem( + firstLine: 'CYCLES', + secondLine: 'List, Details & Add a one', + firstLineColor: kPink, + secondLineColor: kPinkSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return CycleResultScreen(); + }, + ); + }, + ), + ), + ), + Divider( + height: 2, + ), + SelectionItem( + firstLine: 'PACKAGES', + secondLine: 'List, Details & Add a one', + firstLineColor: kPurple, + secondLineColor: kPurpleSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return PackageResultScreen(); + }, + ); + }, + ), + ), + ), + SelectionItem( + firstLine: 'MY PACKAGES', + secondLine: 'The Package that i possess', + firstLineColor: kDarkPurple, + secondLineColor: kDarkPurpleSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return MyPackagesResultScreen(); + }, + ); + }, + ), + ), + ), + Divider( + height: 2, + ), + SelectionItem( + firstLine: 'ITEMS', + secondLine: 'List, Details & Add a one', + firstLineColor: kBlue, + secondLineColor: kBlueSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return ItemResultScreen(); + }, + ); + }, + ), + ), + ), + SelectionItem( + firstLine: 'MY ITEMS', + secondLine: 'The Items that i possess', + firstLineColor: kDarkBlue, + secondLineColor: kDarkBlueSub, + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return MyItemsResultScreen(); + }, + ); + }, + ), + ), + ), + Divider(height: 2), + userData['roles']?.contains('User') ?? false + ? Container() + : SelectionItem( + firstLine: 'TEST TO VERIFY', + secondLine: 'Verify and reject Test Results', + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return TestVerifyScreen(); + }, + ); + }, + ), + ), + ), + BarcodeSelectionItem(), + ], + ), + ), + ) + : ConnectionErrorBox(); + }, + ), + ), + ); + } +} + +Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } + try { + var id = barcode.rawContent; + return id; + } catch (_) { + return 'null'; + } + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } +} + +class SelectionItem extends StatelessWidget { + final String? firstLine; + final String? secondLine; + final Color? firstLineColor; + final Color? secondLineColor; + final VoidCallback? onTap; + + SelectionItem({ + this.firstLine, + this.secondLine, + this.onTap, + this.firstLineColor, + this.secondLineColor, + }); + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return Container( + margin: EdgeInsets.symmetric(vertical: 10), + padding: EdgeInsets.symmetric(vertical: 5), + decoration: BoxDecoration( + color: Colors.transparent, + borderRadius: BorderRadius.all( + Radius.circular(3), + ), + ), + child: InkWell( + splashColor: Colors.grey[350], + onTap: onTap, + child: ListTile( + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + firstLine!, + style: TextStyle( + color: firstLineColor, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3.5, + ), + ), + Text( + secondLine!, + style: TextStyle( + color: secondLineColor, + fontSize: 3.5 * _deviceBlockSize, + ), + ), + ], + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.black, + ), + ), + ), + ); + } +} + +class BarcodeSelectionItem extends StatelessWidget { + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return Container( + margin: EdgeInsets.symmetric(vertical: 10), + padding: EdgeInsets.symmetric(vertical: 5), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [Colors.black, Colors.black87], + ), + borderRadius: BorderRadius.all( + Radius.circular(3), + ), + ), + child: InkWell( + splashColor: Colors.red, + onTap: () => scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + showDialog( + context: context, + builder: (_) => AlertDialog( + title: Text( + 'نتیجه ی اسکن', + textDirection: TextDirection.rtl, + textAlign: TextAlign.right, + style: TextStyle( + fontSize: 2.75 * _deviceBlockSize, + ), + ), + content: Text( + result, + textDirection: TextDirection.rtl, + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + actions: [ + TextButton( + onPressed: () async { + await launch(result); + Navigator.of(context).pop(); + }, + child: Text( + 'بازکردن در مرورگر', + style: TextStyle( + fontFamily: 'montserrat', + ), + ), + ), + ], + ), + ); + } + }, + ), + child: ListTile( + title: Row( + children: [ + Icon( + Icons.qr_code_scanner, + color: Colors.white, + size: 8 * _deviceBlockSize, + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'SCANNER', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3.5, + ), + ), + Text( + 'Scan a Bar or QR code', + style: TextStyle( + color: Colors.white, + fontSize: 3.5 * _deviceBlockSize, + ), + ), + ], + ) + ], + ), + trailing: Icon( + Icons.arrow_forward_ios, + color: Colors.white, + ), + ), + ), + ); + } +} diff --git a/lib/pages/label_add_screen.dart b/lib/pages/label_add_screen.dart deleted file mode 100644 index f887d59..0000000 --- a/lib/pages/label_add_screen.dart +++ /dev/null @@ -1,281 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart' as DateEditor; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/connectivity.dart'; -import '../providers/labels.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/LabelScreens/Add/date_picker.dart'; -import '../widgets/LabelScreens/Add/save_button.dart'; -import '../widgets/LabelScreens/Add/selector_box.dart'; - -class LabelAddScreen extends StatefulWidget { - // static const route = '/LabelAddScreen'; - - @override - _LabelAddScreenState createState() => _LabelAddScreenState(); -} - -class _LabelAddScreenState extends State { - final _cycleNumberFocusNode = FocusNode(); - TextEditingController lotNumberCTRL = new TextEditingController(); - TextEditingController cycleNumberCTRL = new TextEditingController(); - TextEditingController striizerIdCTRL = new TextEditingController(); - TextEditingController sDateCTRL = new TextEditingController(); - TextEditingController eDateCTRL = new TextEditingController(); - TextEditingController packageCTRL = new TextEditingController(); - - DateTime dateTimeS; - // String sDateValue; - // String eDateValue; - - final _form = GlobalKey(); - - List> packageVals = []; - List packageValue = []; - bool isInit = true; - // CycleFilterObject filters; - - List labelsCTRL = [TextEditingController()]; - int curLabelVal = 1; - @override - void initState() { - sDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - // sDateValue = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - eDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - // eDateValue = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - super.initState(); - } - - @override - void didChangeDependencies() async { - if (isInit) { - Provider.of(context, listen: false) - .getPackageFilters() - .then( - (result) { - setState( - () { - packageVals = result; - packageValue.add(result[0]['id']); - packageValue.add(result[0]['name']); - packageCTRL.text = result[0]['name']; - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.labelResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Labels'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context) - .pushReplacementNamed(Routes.labelResultScreen), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - Text( - 'ADD A LABEL', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 6 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - SizedBox( - height: 20, - ), - TextFormField( - onChanged: (val) { - setState(() { - lotNumberCTRL.text = - val + ' - ' + cycleNumberCTRL.text; - }); - }, - validator: (val) { - if (val.isEmpty) { - return 'Strilizer ID required!'; - } - return null; - }, - controller: striizerIdCTRL, - decoration: InputDecoration( - icon: Icon(FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize), - isDense: true, - labelText: 'Strilizer ID', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_cycleNumberFocusNode); - }, - ), - SizedBox( - height: 20, - ), - TextFormField( - onChanged: (val) { - setState( - () { - lotNumberCTRL.text = - striizerIdCTRL.text + ' - ' + val; - }, - ); - }, - validator: (val) { - if (val.isEmpty) { - return 'Cycle number required!'; - } - return null; - }, - controller: cycleNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Cycle Number', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _cycleNumberFocusNode, - keyboardType: TextInputType.number, - textInputAction: TextInputAction.done, - ), - SizedBox( - height: 20, - ), - TextFormField( - readOnly: true, - controller: lotNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Lot Number', - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - ), - SizedBox( - height: 20, - ), - LabelAddSelectorBox( - deviceBlockSize: _deviceBlockSize, - packageCTRL: packageCTRL, - packageVals: packageVals, - packageValue: packageValue, - ), - SizedBox( - height: 10, - ), - LabelAddDatePicker( - dateCTRL: sDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Sterile Date', - ), - SizedBox( - height: 20, - ), - LabelAddDatePicker( - dateCTRL: eDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Expire Date', - ), - SizedBox( - height: 70, - ), - LabelAddSaveButton( - form: _form, - lotNumberCTRL: lotNumberCTRL, - cycleNumberCTRL: cycleNumberCTRL, - sDateCTRL: sDateCTRL, - packageValue: packageValue, - eDateCTRL: eDateCTRL, - striizerIdCTRL: striizerIdCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 100, - ), - ], - ), - ), - ) - : ConnectionErrorBox(); - }), - ), - ), - ); - } -} diff --git a/lib/pages/label_filter_screen.dart b/lib/pages/label_filter_screen.dart deleted file mode 100644 index 8c8c211..0000000 --- a/lib/pages/label_filter_screen.dart +++ /dev/null @@ -1,316 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/label_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/labels.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/LabelScreens/Filter/save_button.dart'; -import '../widgets/LabelScreens/Filter/selector_box.dart'; - -class LabelFilterScreen extends StatefulWidget { - // static const route = '/LabelFilterScreen'; - - @override - _LabelFilterScreenState createState() => _LabelFilterScreenState(); -} - -class _LabelFilterScreenState extends State { - final _cycleNumberFocusNode = FocusNode(); - final _strilizerIdFocusNode = FocusNode(); - - TextEditingController labelIdCTRl = new TextEditingController(); - TextEditingController cycleNumberCTRL = new TextEditingController(); - TextEditingController striizerIdCTRL = new TextEditingController(); - TextEditingController hospitalCTRL = new TextEditingController(); - - TextEditingController dateCTRL = new TextEditingController(); - DateTime dateTimeFrom; - - List> hospitalVals = []; - bool isInit = true; - LabelFilterObject filters; - @override - void initState() { - filters = Provider.of(context, listen: false).filters; - labelIdCTRl.text = filters.id; - cycleNumberCTRL.text = filters.cycleNumber; - striizerIdCTRL.text = filters.sterilizerId; - super.initState(); - } - - @override - void didChangeDependencies() async { - if (isInit) { - await Provider.of(context, listen: false) - .getHospitalsFilters() - .then( - (result) { - setState( - () { - hospitalVals = [ - {'id': '', 'name': ''} - ]; - for (var hospital in result) { - hospitalVals.add(hospital); - } - // hospitalVals = result; - filters.hospital == '' - ? hospitalCTRL.text = hospitalVals[0]['name'] - : hospitalVals.forEach( - //id convert to name - (hospital) { - if (hospital['id'] == filters.hospital) - hospitalCTRL.text = hospital['name']; - }, - ); - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.labelResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Labels'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context) - .pushReplacementNamed(Routes.labelResultScreen), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - Text( - 'FILTER RESULTS', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - ), - SizedBox( - height: 20, - ), - Row( - children: [ - Flexible( - flex: 8, - child: TextFormField( - controller: labelIdCTRl, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Label ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context).requestFocus( - _cycleNumberFocusNode); - }, - ), - ), - Flexible( - flex: 1, - child: InkWell( - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - labelIdCTRl.text = result; - // Navigator.of(context).pushNamed( - // CycleDetailScreen.route, - // arguments: result, - // ); - } - }, - ); - }, - child: Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 5 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ) - ], - ), - SizedBox( - height: 30, - ), - TextFormField( - controller: cycleNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cycle Number', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _cycleNumberFocusNode, - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_strilizerIdFocusNode); - }, - ), - SizedBox( - height: 30, - ), - TextFormField( - controller: striizerIdCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Strilizer ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - textInputAction: TextInputAction.done, - keyboardType: TextInputType.visiblePassword, - focusNode: _strilizerIdFocusNode, - ), - SizedBox( - height: 30, - ), - - LabelFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - hospitalCTRL: hospitalCTRL, - hospitalVals: hospitalVals, - ), - SizedBox( - height: 70, - ), - LabelFilterSaveButton( - hospitalVals: hospitalVals, - hospitalCTRL: hospitalCTRL, - labelIdCTRl: labelIdCTRl, - cycleNumberCTRL: cycleNumberCTRL, - striizerIdCTRL: striizerIdCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 50, - ), - // DropDownBox(values: ['Washer ID']), - ], - ), - ) - : ConnectionErrorBox(); - }, - ), - ), - ), - ); - } -} - -Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } -} diff --git a/lib/pages/label_result_screen.dart b/lib/pages/label_result_screen.dart deleted file mode 100644 index ea3426b..0000000 --- a/lib/pages/label_result_screen.dart +++ /dev/null @@ -1,217 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/connectivity.dart'; -import '../providers/labels.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/Global/page_header.dart'; -import '../widgets/LabelScreens/Result/data_box.dart'; -import '../widgets/LabelScreens/Result/filter_chip_box.dart'; -import '../widgets/LabelScreens/Result/floating_buttons.dart'; -import '../widgets/LabelScreens/Result/search_box.dart'; - -class LabelResultScreen extends StatefulWidget { - // static const route = '/LabelResultScreen'; - final bool isAdmin; - - LabelResultScreen({this.isAdmin}); - - @override - _LabelResultScreenState createState() => _LabelResultScreenState(); -} - -class _LabelResultScreenState extends State { - bool _isInit = true; - ScrollController sc; - TextEditingController searchCTRL = new TextEditingController(); - - @override - void initState() { - sc = new ScrollController(); - - super.initState(); - } - - @override - void didChangeDependencies() { - if (_isInit) { - var labelProviderObject = - Provider.of(context, listen: false); - labelProviderObject.setLoading(); - labelProviderObject.resetPageNumber(); - labelProviderObject.getLabelResults().then((_) { - labelProviderObject.resetLoading(); - sc.addListener(() { - if (sc.position.pixels == sc.position.maxScrollExtent && - searchCTRL.text == '') { - var labelProviderObject = - Provider.of(context, listen: false); - labelProviderObject.getLabelResults(); - } - }); - }); - } - _isInit = false; - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - floatingActionButton: - LabelFloatingButtons(deviceBlockSize: _deviceBlockSize), - appBar: AppBar( - titleSpacing: -10, - title: Text('Home'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? Padding( - padding: EdgeInsets.only( - top: 20, right: 20, bottom: 60, left: 20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - PageHeader( - deviceBlockSize: _deviceBlockSize, - label: 'LABELS', - route: Routes.labelFilterScreen, - ), - SizedBox( - height: 10, - ), - Consumer( - builder: (context, label, _) { - return Container( - height: 50, - child: ListView( - scrollDirection: Axis.horizontal, - shrinkWrap: true, - children: [ - InkWell( - onTap: () { - Navigator.of(context).popAndPushNamed( - Routes.labelFilterScreen, - ); - }, - child: Chip( - backgroundColor: Colors.black, - label: Text( - 'Filters', - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - FontAwesomeIcons.filter, - color: Colors.white, - size: 4 * _deviceBlockSize, - ), - onDeleted: () { - Navigator.of(context).popAndPushNamed( - Routes.labelFilterScreen, - ); - }, - ), - ), - label.filters.id != '' - ? LabelFilterChip( - deviceBlockSize: _deviceBlockSize, - id: '', - cycleNumber: - label.filters.cycleNumber, - sterilizerId: - label.filters.sterilizerId, - hospital: label.filters.hospital, - label: 'ID', - ) - : Container(), - label.filters.cycleNumber != '' - ? LabelFilterChip( - deviceBlockSize: _deviceBlockSize, - id: label.filters.id, - cycleNumber: '', - sterilizerId: - label.filters.sterilizerId, - hospital: label.filters.hospital, - label: 'Cycle Number', - ) - : Container(), - label.filters.sterilizerId != '' - ? LabelFilterChip( - deviceBlockSize: _deviceBlockSize, - id: label.filters.id, - cycleNumber: - label.filters.cycleNumber, - sterilizerId: '', - hospital: label.filters.hospital, - label: 'Sterilizer ID', - ) - : Container(), - label.filters.hospital != '' - ? LabelFilterChip( - deviceBlockSize: _deviceBlockSize, - id: label.filters.id, - cycleNumber: - label.filters.cycleNumber, - sterilizerId: - label.filters.sterilizerId, - hospital: '', - label: 'Hospital', - ) - : Container(), - ], - ), - ); - }, - ), - LabelSearchBox( - searchCTRL: searchCTRL, - deviceBlockSize: _deviceBlockSize), - SizedBox( - height: 20, - ), - Expanded( - child: Consumer( - builder: (context, labelResults, _) { - return labelResults.isloading - ? Center( - child: CircularProgressIndicator(), - ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) => - LabelItemBox( - deviceBlockSize: _deviceBlockSize, - item: labelResults.items[index], - ), - itemCount: labelResults.items.length, - shrinkWrap: true, - ); - }, - ), - ), - ], - ), - ) - : ConnectionErrorBox(); - }, - ), - ), - ); - } -} diff --git a/lib/pages/label_scan_screen.dart b/lib/pages/label_scan_screen.dart deleted file mode 100644 index 9a82d71..0000000 --- a/lib/pages/label_scan_screen.dart +++ /dev/null @@ -1,93 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/LabelScreens/Scan/input_box.dart'; -import '../widgets/LabelScreens/Scan/save_button.dart'; -import '../widgets/LabelScreens/Scan/scan_box.dart'; -// import 'package:flutter/services.dart'; -// import 'package:barcode_scan2/barcode_scan2.dart'; - -class LabelScanScreen extends StatefulWidget { - // static const route = '/LabelScanScreen'; - @override - State createState() { - return _LabelScanScreenState(); - } -} - -class _LabelScanScreenState extends State { - String testCode = ""; - TextEditingController idCTRL = new TextEditingController(); - final _form = GlobalKey(); - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - titleSpacing: -10, - title: Text('CSSD'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.only(top: 30), - child: Text( - 'LOOKING FOR A Label?', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 5.5 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 3, - ), - ), - ), - LabelScanBox(), - Form( - key: _form, - child: LabelScanInputBox( - idCTRL: idCTRL, deviceBlockSize: _deviceBlockSize), - ), - SizedBox( - height: 40, - ), - Divider( - color: Colors.black, - thickness: 3, - ), - SizedBox( - height: 30, - ), - FilterScanSaveButton( - form: _form, - idCTRL: idCTRL, - deviceBlockSize: _deviceBlockSize, - ), - ], - ) - : ConnectionErrorBox(); - }, - ), - ), - ); - } -} diff --git a/lib/pages/label_update_screen.dart b/lib/pages/label_update_screen.dart deleted file mode 100644 index 82c5670..0000000 --- a/lib/pages/label_update_screen.dart +++ /dev/null @@ -1,305 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart' as DateEditor; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/label_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/labels.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/LabelScreens/Add/date_picker.dart'; -import '../widgets/LabelScreens/Add/selector_box.dart'; -import '../widgets/LabelScreens/Add/update_button.dart'; - -class LabelUpdateScreen extends StatefulWidget { - // static const route = '/LabelUpdateScreen'; - - @override - _LabelUpdateScreenState createState() => _LabelUpdateScreenState(); -} - -class _LabelUpdateScreenState extends State { - final _cycleNumberFocusNode = FocusNode(); - TextEditingController lotNumberCTRL = new TextEditingController(); - TextEditingController cycleNumberCTRL = new TextEditingController(); - TextEditingController striizerIdCTRL = new TextEditingController(); - TextEditingController sDateCTRL = new TextEditingController(); - TextEditingController eDateCTRL = new TextEditingController(); - TextEditingController packageCTRL = new TextEditingController(); - - DateTime dateTimeS; - // String sDateValue; - // String eDateValue; - - final _form = GlobalKey(); - - List> packageVals = []; - List packageValue = []; - bool isEmpty = false; - bool isInit = true; - LabelDetailsObject datas; - // CycleFilterObject filters; - - List labelsCTRL = [TextEditingController()]; - int curLabelVal = 1; - @override - void initState() { - sDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - // sDateValue = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - eDateCTRL.text = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - // eDateValue = DateEditor.DateFormat('y-M-d').format(DateTime.now()); - super.initState(); - } - - @override - void didChangeDependencies() async { - if (isInit) { - var _id = ModalRoute.of(context).settings.arguments; - await Provider.of(context, listen: false) - .showLabelResult(_id.toString()) - .then( - (result) { - setState( - () { - // if (result.id == 'null') { - // isEmpty = true; - // } - datas = result; - lotNumberCTRL.text = datas.lotNumber; - cycleNumberCTRL.text = datas.cycleNumber; - striizerIdCTRL.text = datas.sterileId; - sDateCTRL.text = datas.sterileDate; - eDateCTRL.text = datas.expireDate; - packageValue.add(datas.packageId); - packageValue.add(datas.package); - packageCTRL.text = datas.package; - }, - ); - }, - ); - Provider.of(context, listen: false) - .getPackageFilters() - .then( - (result) { - setState( - () { - packageVals = result; - isInit = false; - }, - ); - }, - ); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.labelResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Labels'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context) - .pushReplacementNamed(Routes.labelResultScreen), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - Text( - 'Update A LABEL', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 6 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - SizedBox( - height: 20, - ), - TextFormField( - onChanged: (val) { - setState(() { - lotNumberCTRL.text = - val + ' - ' + cycleNumberCTRL.text; - }); - }, - validator: (val) { - if (val.isEmpty) { - return 'Strilizer ID required!'; - } - return null; - }, - controller: striizerIdCTRL, - decoration: InputDecoration( - icon: Icon(FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize), - isDense: true, - labelText: 'Strilizer ID', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_cycleNumberFocusNode); - }, - ), - SizedBox( - height: 20, - ), - TextFormField( - onChanged: (val) { - setState( - () { - lotNumberCTRL.text = - striizerIdCTRL.text + ' - ' + val; - }, - ); - }, - validator: (val) { - if (val.isEmpty) { - return 'Cycle number required!'; - } - return null; - }, - controller: cycleNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Cycle Number', - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - focusNode: _cycleNumberFocusNode, - keyboardType: TextInputType.number, - textInputAction: TextInputAction.done, - ), - SizedBox( - height: 20, - ), - TextFormField( - readOnly: true, - controller: lotNumberCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 7 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Lot Number', - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - ), - SizedBox( - height: 20, - ), - LabelAddSelectorBox( - deviceBlockSize: _deviceBlockSize, - packageCTRL: packageCTRL, - packageVals: packageVals, - packageValue: packageValue, - ), - SizedBox( - height: 10, - ), - LabelAddDatePicker( - dateCTRL: sDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Sterile Date', - ), - SizedBox( - height: 20, - ), - LabelAddDatePicker( - dateCTRL: eDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Expire Date', - ), - SizedBox( - height: 70, - ), - LabelUpdateButton( - form: _form, - id: datas.id, - lotNumberCTRL: lotNumberCTRL, - cycleNumberCTRL: cycleNumberCTRL, - sDateCTRL: sDateCTRL, - packageValue: packageValue, - eDateCTRL: eDateCTRL, - striizerIdCTRL: striizerIdCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 100, - ), - ], - ), - ), - ) - : ConnectionErrorBox(); - }), - ), - ), - ); - } -} diff --git a/lib/pages/login_screen.dart b/lib/pages/login_screen.dart deleted file mode 100644 index 5663167..0000000 --- a/lib/pages/login_screen.dart +++ /dev/null @@ -1,297 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/auth.dart'; -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class LoginScreen extends StatefulWidget { - // static const route = '/HomeScreen'; - - @override - State createState() { - return _LoginScreenState(); - } -} - -class _LoginScreenState extends State { - final _passwordFocusNode = FocusNode(); - final _form = GlobalKey(); - bool _isLoading = false; - final cellNumberController = TextEditingController(); - final passwordController = TextEditingController(); - - bool _hidePass = true; - Map map = Map(); - - @override - void initState() { - cellNumberController.text = map['cellNumber']; - super.initState(); - } - - @override - void dispose() { - _passwordFocusNode.dispose(); - super.dispose(); - } - - void _showDialog(String message) { - showDialog( - context: context, - builder: (ctx) => AlertDialog( - title: Text('Error'), - content: Text(message), - actions: [ - TextButton( - child: Text('Ok'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ); - } - - void _login() async { - if (!_form.currentState.validate()) { - return; - } - _form.currentState.save(); - setState(() { - _isLoading = true; - }); - // try { - await Provider.of(context, listen: false) - .login( - map['cellNumber'], - map['password'], - ) - .then( - (result) { - if (result == 'error') { - _showDialog('Something went wrong!'); - setState( - () { - _isLoading = false; - }, - ); - } else if (result == 'badinput') { - _showDialog('User or password incorrect!'); - setState( - () { - _isLoading = false; - }, - ); - } - }, - ); - // } - // } catch (error) { - // _showDialog('something went wrong!'); - // setState(() { - // _isLoading = false; - // }); - // } - - // Navigator.pushReplacement( - // context, - // MaterialPageRoute(builder: (context) { - // return HomePage(); - // }), - // ); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text('CSSD'), - ), - body: Selector( - builder: (ctx, value, _) => value != 'offline' - ? _isLoading - ? Center( - child: CircularProgressIndicator(), - ) - : Form( - key: _form, - child: ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.symmetric(vertical: 20), - child: Text( - 'LOGIN', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 6 * _deviceBlockSize, - letterSpacing: 3, - fontWeight: FontWeight.w700, - ), - ), - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Cell number is required.'; - } - RegExp regExp = - RegExp(r'^09[0,1,2,3,9]{1}[0-9]{8}$'); - if (!regExp.hasMatch(value)) { - return 'Enter a valid cell number'; - } - return null; - }, - controller: cellNumberController, - decoration: InputDecoration( - icon: Icon( - Icons.call, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cell Number', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.phone, - textInputAction: TextInputAction.next, - onFieldSubmitted: (_) { - FocusScope.of(context) - .requestFocus(_passwordFocusNode); - }, - onSaved: (value) { - map['cellNumber'] = value; - }, - ), - SizedBox( - height: 30, - ), - TextFormField( - validator: (value) { - if (value.isEmpty) { - return 'Password is required.'; - } - if (value.length < 8) { - return 'Password at least is 8 characters.'; - } - return null; - }, - obscureText: _hidePass, - controller: passwordController, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.starOfLife, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Password', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - suffixIcon: InkWell( - child: Icon(FontAwesomeIcons.eye), - onTap: () { - setState(() { - _hidePass = !_hidePass; - }); - }, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - textInputAction: TextInputAction.done, - onFieldSubmitted: (_) { - _login(); - }, - keyboardType: TextInputType.visiblePassword, - focusNode: _passwordFocusNode, - onSaved: (value) { - map['password'] = value; - }, - ), - SizedBox(height: 40), - Row( - children: [ - InkWell( - onTap: () => _login(), - child: Container( - width: 40 * _deviceBlockSize, - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Spacer(), - Icon( - Icons.exit_to_app, - color: Colors.white, - ), - Text( - 'Login', - style: TextStyle(color: Colors.white), - ), - Spacer() - ], - )), - ), - Spacer(), - ], - ), - SizedBox(height: 10), - TextButton( - child: Align( - alignment: Alignment.centerLeft, - child: Text( - 'Forgot Password ?', - style: TextStyle( - color: Colors.black54, - decoration: TextDecoration.underline, - ), - ), - ), - onPressed: () => Navigator.of(context) - .pushNamed(Routes.forgetPassScreen), - ), - ], - ), - ) - : ConnectionErrorBox(), - selector: (_, connectivity) => connectivity.conStatus, - )), - ); - } -} diff --git a/lib/pages/my_info_screen.dart b/lib/pages/my_info_screen.dart index 4d6d2b7..68f15a3 100644 --- a/lib/pages/my_info_screen.dart +++ b/lib/pages/my_info_screen.dart @@ -1,180 +1,189 @@ -// import 'package:cssd/widgets/LabelScreens/LabelDetails/header.dart'; -import 'package:cssd/providers/connectivity.dart'; -import 'package:cssd/widgets/Global/internet_error.dart'; -import 'package:cssd/widgets/LabelScreens/Detail/header.dart'; -import 'package:cssd/widgets/MyInfo/input_box.dart'; -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; -import '../providers/auth.dart'; - -class MyInfoScreen extends StatefulWidget { - // static const route = '/MyInfoScreenRoute'; - - @override - State createState() { - return _MyInfoScreenState(); - } -} - -class _MyInfoScreenState extends State { - Map user; - TextEditingController usernameCTRL = new TextEditingController(); - TextEditingController emailCTRL = new TextEditingController(); - - bool isInit = true; - @override - void didChangeDependencies() async { - if (isInit) { - var authObj = Provider.of(context, listen: false); - user = await authObj.getUserData(); - usernameCTRL.text = user['name'] != null ? user['name'] : ''; - emailCTRL.text = user['email'] != null ? user['email'] : ''; - isInit = false; - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Dashboard'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : ListView( - children: [ - InfoHeader( - deviceBlockSize: _deviceBlockSize, - label: 'MY INFO', - ), - Container( - padding: EdgeInsets.symmetric(horizontal: 20), - child: Column( - children: [ - InfoInputBox( - controller: usernameCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Full Name', - icon: FontAwesomeIcons.sortNumericDown, - inputType: TextInputType.text, - ), - SizedBox( - height: 20, - ), - TextFormField( - readOnly: true, - initialValue: user['cell_number'], - decoration: InputDecoration( - icon: Icon( - Icons.call, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Cell Number', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.grey, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - textInputAction: TextInputAction.next, - ), - SizedBox( - height: 20, - ), - InfoInputBox( - controller: emailCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Email Address', - icon: FontAwesomeIcons.envelope, - inputType: TextInputType.emailAddress, - ), - SizedBox( - height: 40, - ), - InkWell( - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 60, vertical: 10), - margin: EdgeInsets.only(top: 50, bottom: 20), - width: double.infinity, - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(5), - ), - child: Text( - 'Save', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - textAlign: TextAlign.center, - ), - ), - onTap: () async { - await Provider.of(context, - listen: false) - .setUserData( - user['id'], - usernameCTRL.text, - emailCTRL.text, - ) - .then( - (value) async => await showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text( - 'Info changed successfully.', - ), - actions: [ - TextButton( - child: Text('Ok'), - onPressed: () { - Navigator.of(ctx).pop(); - }, - ), - ], - ), - ), - ); - Navigator.of(context).pop(); - }, - ), - ], - ), - ), - ], - ) - : ConnectionErrorBox(); - }), - ), - ); - } -} +// import 'package:cssd/widgets/LabelScreens/LabelDetails/header.dart'; +import 'package:cssd/providers/connectivity.dart'; +import 'package:cssd/widgets/Global/internet_error.dart'; +import 'package:cssd/widgets/LabelScreens/Detail/header.dart'; +import 'package:cssd/widgets/MyInfo/input_box.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; +import '../providers/auth.dart'; + +class MyInfoScreen extends StatefulWidget { + // static const route = '/MyInfoScreenRoute'; + + @override + State createState() { + return _MyInfoScreenState(); + } +} + +class _MyInfoScreenState extends State { + Map? user; + TextEditingController usernameCTRL = new TextEditingController(); + TextEditingController emailCTRL = new TextEditingController(); + + bool isInit = true; + @override + void didChangeDependencies() async { + if (isInit) { + var authObj = Provider.of(context, listen: false); + user = await authObj.getUserData(); + usernameCTRL.text = user!['name'] != null ? user!['name'] : ''; + emailCTRL.text = user!['email'] != null ? user!['email'] : ''; + isInit = false; + } + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return SafeArea( + child: GestureDetector( + onTap: () { + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + appBar: AppBar( + titleSpacing: -10, + title: Text('Dashboard'), + backgroundColor: Colors.black, + leading: IconButton( + icon: Icon( + Icons.keyboard_arrow_left, + size: 35, + ), + onPressed: () => Navigator.of(context).pop(), + ), + ), + body: Consumer( + builder: (ct, connection, _) { + return connection.conStatus != 'offline' + ? isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : ListView( + children: [ + InfoHeader( + deviceBlockSize: _deviceBlockSize, + label: 'My Info', + ), + Container( + padding: EdgeInsets.symmetric(horizontal: 20), + child: Column( + children: [ + InfoInputBox( + controller: usernameCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Full Name', + icon: FontAwesomeIcons.alignLeft, + inputType: TextInputType.text, + ), + SizedBox( + height: 20, + ), + TextFormField( + readOnly: true, + initialValue: user!['cell_number'], + decoration: InputDecoration( + icon: Icon( + Icons.call, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Cell Number', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.grey, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + textInputAction: TextInputAction.next, + ), + SizedBox( + height: 20, + ), + InfoInputBox( + controller: emailCTRL, + deviceBlockSize: _deviceBlockSize, + label: 'Email Address', + icon: FontAwesomeIcons.envelope, + inputType: TextInputType.emailAddress, + ), + SizedBox( + height: 40, + ), + InkWell( + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 60, vertical: 10), + margin: + EdgeInsets.only(top: 50, bottom: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Colors.black, + borderRadius: BorderRadius.circular(5), + ), + child: Text( + 'Save', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + textAlign: TextAlign.center, + ), + ), + onTap: () async { + await Provider.of(context, + listen: false) + .setUserData( + user!['id'], + usernameCTRL.text, + emailCTRL.text, + ) + .then( + (value) async => await showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text( + 'Info changed successfully.', + ), + actions: [ + TextButton( + child: Text('Ok'), + onPressed: () { + Navigator.of(ctx).pop(); + }, + ), + ], + ), + ), + ); + Navigator.of(context).pop(); + }, + ), + ], + ), + ), + ], + ) + : ConnectionErrorBox(); + }, + ), + ), + ), + ); + } +} diff --git a/lib/pages/test_add_screen.dart b/lib/pages/test_add_screen.dart deleted file mode 100644 index 9db3125..0000000 --- a/lib/pages/test_add_screen.dart +++ /dev/null @@ -1,283 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -// import 'package:flutter_barcode_scanner/flutter_barcode_scanner.dart'; - -import 'package:cssd/pages/test_form_page.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../providers/connectivity.dart'; -import '../providers/test_results.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/TestResultScreens/Add/selector_box.dart'; - -class TestResultAddScreen extends StatefulWidget { - // static const route = '/TestResultAddScreen'; - @override - State createState() { - return _TestResultAddScreenState(); - } -} - -class _TestResultAddScreenState extends State { - String testCode = ""; - TextEditingController testTypeCTRL = new TextEditingController(); - final List testTypeVals = []; - - TextEditingController testIdCTRL = new TextEditingController(); - bool isInit = true; - @override - void didChangeDependencies() { - if (isInit) { - var testResultProviderObject = - Provider.of(context, listen: false); - testResultProviderObject.getFilterItems().then((result) { - for (var testType in result[1].keys) { - testTypeVals.add(testType); - } - testTypeCTRL.text = testTypeVals[0]; - setState(() { - isInit = false; - }); - }); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.testResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Test Results'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - // padding: EdgeInsets.all(0), - onPressed: () => Navigator.of(context) - .popAndPushNamed(Routes.testResultScreen), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : ListView( - padding: - EdgeInsets.symmetric(horizontal: 20, vertical: 20), - children: [ - Container( - padding: EdgeInsets.only( - top: 10, - ), - child: Text( - 'ADD A TEST RESULT', - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - fontWeight: FontWeight.w700, - ), - ), - ), - GestureDetector( - child: Container( - margin: EdgeInsets.only(top: 5, bottom: 30), - padding: EdgeInsets.all(10), - height: 200, - decoration: BoxDecoration(border: Border.all()), - child: Center( - child: Text( - 'PLEASE SCAN THE TEST BARCODE', - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.grey, - fontSize: 5 * _deviceBlockSize, - fontWeight: FontWeight.w100, - letterSpacing: 3, - ), - ), - ), - ), - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) { - return FormPage( - uniqueCode: result, - ); - }, - ), - ); - } - }, - ); - }, - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.max, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 70 * _deviceBlockSize, - child: TestResultAddSelectorBox( - deviceBlockSize: _deviceBlockSize, - dataCTRL: testTypeCTRL, - dataVals: testTypeVals, - label: 'Choose a Test Type'), - ), - Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text( - 'OR', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 7 * _deviceBlockSize, - ), - ), - SizedBox( - width: 8 * _deviceBlockSize, - ), - Container( - width: 50 * _deviceBlockSize, - child: TextFormField( - onChanged: (val) { - if (val != '') { - setState(() { - testTypeCTRL.text = ''; - }); - } else { - setState(() { - testTypeCTRL.text = - testTypeVals[0]; - }); - } - }, - controller: testIdCTRL, - decoration: InputDecoration( - isDense: true, - icon: Icon( - FontAwesomeIcons.sortNumericDown, - ), - labelText: 'Enter a Test Code', - labelStyle: TextStyle( - fontSize: 3 * _deviceBlockSize), - contentPadding: EdgeInsets.only( - bottom: 5, top: 5), - ), - keyboardType: TextInputType.number, - ), - ), - ], - ) - ], - ), - SizedBox( - width: 5 * _deviceBlockSize, - ), - Expanded( - child: Container( - height: 100, - margin: EdgeInsets.only(bottom: 50), - decoration: BoxDecoration( - color: Color(0xFFEB4A64), - borderRadius: BorderRadius.circular(10), - ), - child: TextButton( - child: Text( - 'GO', - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 6 * _deviceBlockSize, - fontWeight: FontWeight.w700), - ), - onPressed: () { - if (testIdCTRL.text != '') { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return FormPage( - uniqueCode: testIdCTRL.text); - }, - ), - ); - } else if (testTypeCTRL.text != '') { - Navigator.pushReplacement( - context, - MaterialPageRoute( - builder: (context) { - return FormPage( - name: testTypeCTRL.text, - ); - }, - ), - ); - } - // print(testCode); - }, - ), - ), - ) - ], - ), - ], - ) - : ConnectionErrorBox(); - }), - ), - ), - ); - } - - Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - return barcode.rawContent; - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } - } -} diff --git a/lib/pages/test_filter_screen.dart b/lib/pages/test_filter_screen.dart deleted file mode 100644 index 21df194..0000000 --- a/lib/pages/test_filter_screen.dart +++ /dev/null @@ -1,423 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/test_result_models.dart'; -import '../providers/connectivity.dart'; -import '../providers/test_results.dart'; -import '../widgets/Global/internet_error.dart'; -import '../widgets/TestResultScreens/Filter/date_picker.dart'; -import '../widgets/TestResultScreens/Filter/selector_box.dart'; - -class TestFilterScreen extends StatefulWidget { - // static const route = '/TestFilterScreen'; - - @override - _TestFilterScreenState createState() => _TestFilterScreenState(); -} - -class _TestFilterScreenState extends State { - TextEditingController idCTRL = new TextEditingController(); - TextEditingController labelIdCTRL = new TextEditingController(); - TextEditingController testTypeCTRL = new TextEditingController(); - TextEditingController hospitalCTRL = new TextEditingController(); - TextEditingController fDateCTRL = new TextEditingController(); - TextEditingController uDateCTRL = new TextEditingController(); - - TextEditingController usernameCTRL = new TextEditingController(); - // TextEditingController dateFrom = new TextEditingController(); - // TextEditingController dateUntil = new TextEditingController(); - DateTime dateTimeFrom; - DateTime dateTimeUntil; - - final List labelIDVals = [ - '', - 'Washer ID', - 'Autoclave ID', - 'Sterilizer ID', - 'Seal Machine ID', - 'Patiant ID', - 'Set/Pack ID', - 'Medical Device ID', - 'OR ID', - 'Insrtument ID', - 'Basket ID', - 'Implant ID', - // 'None', - ]; - // String curLabelIDVal; - - final List testTypeVals = []; - Map testTypes; - - final List hospitalVals = []; - Map hospitals = {}; - // String curhospitalVal; - - bool isInit = true; - // final List labelIDVals = ['Washer ID']; - // String curLabelIDVal; - - // final List labelIDVals = ['Washer ID']; - // String curLabelIDVal; - - // @override - // void initState() { - // super.initState(); - // } - - @override - void didChangeDependencies() { - if (isInit) { - // fDateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); - // uDateCTRL.text = DateFormat('y-M-d').format(DateTime.now()); - fDateCTRL.text = ''; - uDateCTRL.text = ''; - var testResultProviderObject = - Provider.of(context, listen: false); - TestResultFilterObject filters = testResultProviderObject.filters; - idCTRL.text = filters.id; - usernameCTRL.text = filters.userName; - labelIdCTRL.text = - filters.labelID == '' ? labelIDVals[0] : filters.labelID; - idCTRL.text = filters.id; - usernameCTRL.text = filters.userName; - testResultProviderObject.getFilterItems().then((result) { - hospitals = result[0]; - testTypes = result[1]; - hospitalVals.add(''); - for (var hospital in result[0].keys) { - hospitalVals.add(hospital); - } - testTypeVals.add(''); - for (var testType in result[1].keys) { - testTypeVals.add(testType); - } - var testTypeKey = testTypes.keys.firstWhere( - (k) => testTypes[k] == filters.testType, - orElse: () => ''); // recent testtype name - var hospitalKey = hospitals.keys.firstWhere( - (k) => hospitals[k] == filters.hospital, - orElse: () => ''); // recent testtype name - testTypeCTRL.text = - filters.testType == '' ? testTypeVals[0] : testTypeKey; - hospitalCTRL.text = - filters.hospital == '' ? hospitalVals[0] : hospitalKey; - // print(result[0]); - // print(result[1]); - setState(() { - isInit = false; - }); - }); - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return WillPopScope( - onWillPop: () async { - Navigator.pushReplacementNamed( - context, - Routes.testResultScreen, - ); - return true; - }, - child: SafeArea( - child: Scaffold( - appBar: AppBar( - titleSpacing: -10, - title: Text('Tests'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).popAndPushNamed( - Routes.testResultScreen, - ), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Padding( - padding: EdgeInsets.all(20), - child: ListView( - // crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'FILTER RESULTS', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - ), - SizedBox( - height: 20, - ), - Row( - children: [ - Flexible( - flex: 8, - child: TextFormField( - controller: idCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.text, - textInputAction: TextInputAction.next, - // onFieldSubmitted: (_) { - // FocusScope.of(context) - // .requestFocus(_cycleNumberFocusNode); - // }, - ), - ), - Flexible( - flex: 1, - child: InkWell( - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - idCTRL.text = result; - // Navigator.of(context).pushNamed( - // CycleDetailScreen.route, - // arguments: result, - // ); - } - }, - ); - }, - child: Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 5 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ), - ], - ), - - SizedBox( - height: 25, - ), - TestResultFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - dataCTRL: labelIdCTRL, - dataVals: labelIDVals, - label: 'Label ID', - ), - SizedBox( - height: 25, - ), - - TextFormField( - controller: usernameCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Username', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - textInputAction: TextInputAction.next, - // onFieldSubmitted: (_) { - // FocusScope.of(context) - // .requestFocus(_cycleNumberFocusNode); - // }, - ), - SizedBox( - height: 25, - ), - TestResultFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - dataCTRL: testTypeCTRL, - dataVals: testTypeVals, - label: 'Test Type', - ), - SizedBox( - height: 25, - ), - TestResultFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - dataCTRL: hospitalCTRL, - dataVals: hospitalVals, - label: 'Hospital', - ), - SizedBox( - height: 25, - ), - - TestResultFilterDatePicker( - dateCTRL: fDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Date From', - ), - SizedBox( - height: 25, - ), - TestResultFilterDatePicker( - dateCTRL: uDateCTRL, - deviceBlockSize: _deviceBlockSize, - label: 'Date Until', - ), - SizedBox( - height: 70, - ), - InkWell( - onTap: () { - Provider.of(context) - .setFilters( - idCTRL.text, - labelIdCTRL.text != '' - ? labelIdCTRL.text - : '', - usernameCTRL.text, - testTypeCTRL.text != '' - ? testTypes[testTypeCTRL.text] - : '', - hospitalCTRL.text != '' - ? hospitals[hospitalCTRL.text] - : '', - fDateCTRL.text, - uDateCTRL.text, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Filters changed.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - // Navigator.of(context).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then( - (_) => - Navigator.of(context).popAndPushNamed( - Routes.testResultScreen, - ), - ); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'FILTER', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ), - SizedBox( - height: 70, - ), - // DropDownBox(values: ['Washer ID']), - ], - ), - ) - : ConnectionErrorBox(); - }, - ), - ), - ), - ); - } -} - -Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } -} diff --git a/lib/pages/test_result_screen.dart b/lib/pages/test_result_screen.dart deleted file mode 100644 index 15819f8..0000000 --- a/lib/pages/test_result_screen.dart +++ /dev/null @@ -1,454 +0,0 @@ -// import 'package:cssd/providers/test_result.dart'; -import 'package:cssd/providers/test_results.dart'; -import 'package:cssd/widgets/Global/internet_error.dart'; -import 'package:cssd/widgets/TestResultScreens/Main/filter_chip_box.dart'; -import 'package:cssd/widgets/TestResultScreens/Main/floating_button.dart'; -import 'package:cssd/widgets/TestResultScreens/Main/search_box.dart'; -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../config/routes.dart'; -import '../models/test_result_models.dart'; -import '../providers/connectivity.dart'; - -class TestResultScreen extends StatefulWidget { - // static const route = '/TestResultScreen'; - final bool isAdmin; - - TestResultScreen({this.isAdmin}); - - @override - _TestResultScreenState createState() => _TestResultScreenState(); -} - -class _TestResultScreenState extends State { - TextEditingController searchCTRL = new TextEditingController(); - ScrollController sc; - - bool _isInit = true; - // List _data = []; - - @override - void initState() { - sc = new ScrollController(); - - super.initState(); - } - - @override - void didChangeDependencies() { - if (_isInit) { - var testResults = - Provider.of(context, listen: false); - // testResults.resetFilters(); - testResults.setLoading(); - testResults.resetPageNumber(); - testResults.getTestResults().then((_) { - testResults.resetLoading(); - sc.addListener(() { - if (sc.position.pixels == sc.position.maxScrollExtent && - searchCTRL.text == '') { - var labelProviderObject = - Provider.of(context, listen: false); - labelProviderObject.getTestResults(); - } - }); - - // setState(() { - // _isLoading = false; - // }); - }); - _isInit = false; - } - super.didChangeDependencies(); - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - floatingActionButton: - TestResultFloatingButton(deviceBlockSize: _deviceBlockSize), - appBar: AppBar( - titleSpacing: -10, - title: Text('Home'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer( - builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? Padding( - padding: EdgeInsets.only( - top: 20, left: 20, right: 20, bottom: 60), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - // padding: EdgeInsets.only(top: 20, bottom: 40), - child: Text( - 'MY TEST RESULTS', - // textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 6 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 2, - ), - ), - ), - Spacer(), - InkWell( - onTap: () { - Navigator.of(context) - .popAndPushNamed(Routes.testFilterScreen); - }, - child: Container( - padding: EdgeInsets.all(7), - child: Icon( - FontAwesomeIcons.filter, - size: 7 * _deviceBlockSize, - ), - ), - ), - ], - ), - SizedBox( - height: 20, - ), - Consumer( - builder: (context, testResult, _) { - return Container( - height: 50, - child: ListView( - scrollDirection: Axis.horizontal, - shrinkWrap: true, - children: [ - InkWell( - onTap: () { - Navigator.of(context).popAndPushNamed( - Routes.testFilterScreen); - }, - child: Chip( - backgroundColor: Colors.black, - label: Text( - 'Filters', - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - FontAwesomeIcons.filter, - color: Colors.white, - size: 4 * _deviceBlockSize, - ), - onDeleted: () { - Navigator.of(context).popAndPushNamed( - Routes.testFilterScreen, - ); - }, - ), - ), - testResult.filters.id != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'ID', - id: '', - labelID: testResult.filters.labelID, - testType: testResult.filters.testType, - hospital: testResult.filters.hospital, - username: testResult.filters.userName, - fDate: testResult.filters.fDate, - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.labelID != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'Label ID', - id: testResult.filters.id, - labelID: '', - testType: testResult.filters.testType, - hospital: testResult.filters.hospital, - username: testResult.filters.userName, - fDate: testResult.filters.fDate, - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.testType != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'Test Type', - id: testResult.filters.id, - labelID: testResult.filters.labelID, - testType: '', - hospital: testResult.filters.hospital, - username: testResult.filters.userName, - fDate: testResult.filters.fDate, - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.hospital != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'Hospital', - id: testResult.filters.id, - labelID: testResult.filters.labelID, - testType: testResult.filters.testType, - hospital: '', - username: testResult.filters.userName, - fDate: testResult.filters.fDate, - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.userName != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'Username', - id: testResult.filters.id, - labelID: testResult.filters.labelID, - testType: testResult.filters.testType, - hospital: testResult.filters.hospital, - username: '', - fDate: testResult.filters.fDate, - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.fDate != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'From Date', - id: testResult.filters.id, - labelID: testResult.filters.labelID, - testType: testResult.filters.testType, - hospital: testResult.filters.hospital, - username: testResult.filters.userName, - fDate: '', - uDate: testResult.filters.uDate, - ) - : Container(), - testResult.filters.uDate != '' - ? TestResultChip( - deviceBlockSize: _deviceBlockSize, - label: 'Until Date', - id: testResult.filters.id, - labelID: testResult.filters.labelID, - testType: testResult.filters.testType, - hospital: testResult.filters.hospital, - username: testResult.filters.userName, - fDate: testResult.filters.fDate, - uDate: '', - ) - : Container(), - ], - ), - ); - }, - ), - TestResultSearchBox( - searchCTRL: searchCTRL, - deviceBlockSize: _deviceBlockSize, - ), - SizedBox( - height: 20, - ), - Expanded( - child: Consumer( - builder: (context, testResults, _) { - return testResults.isloading - ? Center( - child: CircularProgressIndicator(), - ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) => - TestItemBox( - deviceBlockSize: _deviceBlockSize, - item: testResults.items[index], - ), - itemCount: testResults.items.length, - shrinkWrap: true, - ); - }, - ), - ), - ], - ), - ) - : ConnectionErrorBox(); - }, - ), - ), - ); - } -} - -class TestItemBox extends StatelessWidget { - final TestResultObject item; - const TestItemBox({ - Key key, - @required double deviceBlockSize, - this.item, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - // print(item.result); - return GestureDetector( - onTap: () => Navigator.of(context).pushNamed( - Routes.testDetailsScreen, - arguments: item.id, - ), - child: Card( - child: Container( - padding: EdgeInsets.all(10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 57 * _deviceBlockSize, - child: Text( - item.name, - overflow: TextOverflow.ellipsis, - // style: TextStyle(fontSize: 20), - ), - ), - Container( - width: 57 * _deviceBlockSize, - child: Text( - item.hospital, - style: TextStyle( - color: Colors.grey, - fontSize: 3 * _deviceBlockSize, - ), - ), - ), - SizedBox( - height: 15, - ), - item.result == 'Accepted' - ? Text( - 'Accepted', - style: TextStyle(color: Colors.green), - ) - : Text( - 'Rejected', - style: TextStyle( - color: Colors.red, - ), - ), - ], - ), - Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text(item.date), - SizedBox( - height: 15, - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - // item.result != 'Accepted' - // ? InkWell( - // onTap: () { - // showDialog( - // context: context, - // builder: (ctx) => AlertDialog( - // title: Text('Delete'), - // content: Text( - // 'Are you sure for delete this test?'), - // actions: [ - // TextButton( - // onPressed: () { - // Provider.of( - // context) - // .removeTestResult( - // item.id.toString()) - // .then((_) { - // Navigator.of(ctx).pop(); - // }); - // }, - // child: Text('Yes'), - // ), - // TextButton( - // onPressed: () { - // Navigator.of(ctx).pop(); - // }, - // child: Text('No'), - // ), - // ], - // ), - // ); - // }, - // child: Container( - // padding: EdgeInsets.all(7), - // width: 10 * _deviceBlockSize, - // decoration: BoxDecoration( - // shape: BoxShape.circle, - // color: Colors.red, - // ), - // child: Icon( - // Icons.delete, - // size: 6 * _deviceBlockSize, - // color: Colors.white, - // ), - // ), - // ) - // : Container(), - // SizedBox( - // width: _deviceBlockSize, - // ), - InkWell( - onTap: () { - Navigator.of(context).pushNamed( - Routes.testDetailsScreen, - arguments: item.id, - ); - // TestDetail(testResultId: item.id.toString()); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.fileAlt, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ) - ], - ), - ], - ), - ), - ), - ); - } -} diff --git a/lib/pages/test_scan_screen.dart b/lib/pages/test_scan_screen.dart deleted file mode 100644 index 1a32696..0000000 --- a/lib/pages/test_scan_screen.dart +++ /dev/null @@ -1,216 +0,0 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../providers/connectivity.dart'; -import '../widgets/Global/internet_error.dart'; - -class TestScanScreen extends StatefulWidget { - // static const route = '/TestScanScreen'; - @override - State createState() { - return _TestScanScreenState(); - } -} - -class _TestScanScreenState extends State { - String testCode = ""; - TextEditingController idCTRL = new TextEditingController(); - final _form = GlobalKey(); - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return SafeArea( - child: Scaffold( - appBar: AppBar( - centerTitle: true, - titleSpacing: -10, - title: Text('CSSD'), - leading: IconButton( - icon: Icon( - Icons.keyboard_arrow_left, - size: 35, - ), - onPressed: () => Navigator.of(context).pop(), - ), - ), - body: Consumer(builder: (ct, connection, _) { - return connection.conStatus != 'offline' - ? ListView( - padding: EdgeInsets.symmetric(horizontal: 20), - children: [ - Container( - padding: EdgeInsets.only(top: 30), - child: Text( - 'LOOKING FOR A Test Result?', - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 5.5 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 3, - ), - ), - ), - GestureDetector( - child: Container( - margin: EdgeInsets.symmetric(vertical: 10), - height: 200, - decoration: BoxDecoration(border: Border.all()), - child: Center( - child: Text( - 'Please Scan The Test Result Barcode', - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - fontWeight: FontWeight.w100, - letterSpacing: 3, - ), - textAlign: TextAlign.center, - ), - ), - ), - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - launch( - 'https://cssd-doc.com/Show/TestResult/$result', - ); - // Navigator.of(context).pushNamed( - // Routes.cycleDetailScreen, - // arguments: result, - // ); - } - }, - ); - }, - ), - Form( - key: _form, - child: TextFormField( - validator: (val) { - if (val.isEmpty) { - return 'Id required!!'; - } - return null; - }, - controller: idCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - isDense: true, - labelText: 'Or enter a Test Result ID', - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - focusedBorder: UnderlineInputBorder( - // borderRadius: BorderRadius.only(Radius.circular(4)), - borderSide: BorderSide( - color: Colors.grey, - ), - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - ), - ), - SizedBox( - height: 40, - ), - Divider( - color: Colors.black, - thickness: 3, - ), - SizedBox( - height: 30, - ), - InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - launch( - 'https://cssd-doc.com/Show/TestResult/${idCTRL.text}', - ); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - margin: - EdgeInsets.only(bottom: 50, left: 20, right: 20), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.red, Colors.orange], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'GO!', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ), - ], - ) - : ConnectionErrorBox(); - }), - ), - ); - } - - Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } - } -} diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart index 8ca040b..ab56d89 100644 --- a/lib/providers/auth.dart +++ b/lib/providers/auth.dart @@ -1,249 +1,255 @@ -import 'dart:convert'; -import 'dart:io'; - -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; -import 'package:shared_preferences/shared_preferences.dart'; - -import '../config/urls.dart'; -import '../config/user.dart'; - -class Auth with ChangeNotifier { - String _token; - DateTime _expiaryDate; - - Map _user = {}; - - bool get isAuth { - return token != null; - } - - String get token { - if (_expiaryDate != null && - _expiaryDate.isAfter(DateTime.now()) && - _token != null) { - return _token; - } - return null; - } - - Map get user { - return {..._user}; - } - - Future requestCode(String cellNumber) async { - final response = await http.post( - Uri.parse(Url.requestResetPass), - body: { - 'cell_number': cellNumber, - }, - // headers: {'X-Requested-With': 'XMLHttpRequest'}, - ); - final responseData = json.decode(response.body); - if (responseData['status'] == 'Faild') { - return 'NotUser'; - } else { - return 'Done'; - } - // print(responseData); - } - - Future sendCode(String code) async { - final response = await http.post( - Uri.parse(Url.verifyResetPass), - body: { - 'code': code, - }, - // headers: {'X-Requested-With': 'XMLHttpRequest'}, - ); - final responseData = json.decode(response.body); - // if (responseData['status']=='Faild') { - // return 'NotUser'; - // } else { - // return 'Done'; - // } - print(responseData); - if (responseData['status'] == 'Faild') { - return 'wrong'; - } else { - return responseData['access_token']; - } - } - - Future sendRePass(String password, String token) async { - print(password); - print(token); - - final response = await http.post( - Uri.parse(Url.sendResetPass), - body: { - 'password': password, - 'password_confirmation': password, - }, - headers: {'Authorization': token, 'X-Requested-With': 'XMLHttpRequest'}, - // headers: {'X-Requested-With': 'XMLHttpRequest'}, - ); - final responseData = json.decode(response.body); - // if (responseData['status']=='Faild') { - // return 'NotUser'; - // } else { - // return 'Done'; - // } - print(responseData); - if (responseData['status'] == 'Success') { - return 'done'; - } else { - return 'error'; - } - } - - Future login(String cellNumber, String password) async { - final response = await http.post( - Uri.parse(Url.login), - body: { - 'cell_number': cellNumber, - 'password': password, - }, - // headers: {'X-Requested-With': 'XMLHttpRequest'}, - ); - final responseData = json.decode(response.body); - print(responseData); - if (response.statusCode == 401) { - if (responseData['message'] == 'The user credentials were incorrect.') { - return 'badinput'; // incorrect user or pass - } else { - return 'error'; - } - } - _token = responseData['access_token']; - _expiaryDate = DateTime.now().add( - Duration( - seconds: responseData['expires_in'], - ), - ); - User.token = _token; - // print(isAuth); - - // print(User.token); - var localUser = await getUserData(); - // print("------ in auth ==========="); - print(localUser); - - final prefs = await SharedPreferences.getInstance(); - final userData = json.encode({ - 'token': _token, - 'expiaryDate': _expiaryDate.toIso8601String(), - 'user': user - }); - prefs.setString('userData', userData); - notifyListeners(); - return 'true'; - } - - Future tryAutoLogin() async { - final prefs = await SharedPreferences.getInstance(); - if (!prefs.containsKey('userData')) { - return false; - } - final userData = - json.decode(prefs.getString('userData')) as Map; - final expiaryDate = DateTime.parse(userData['expiaryDate']); - if (expiaryDate.isBefore(DateTime.now())) { - return false; - } - _token = userData['token']; - _expiaryDate = expiaryDate; - _user = userData['user']; - User.token = _token; - notifyListeners(); - return true; - } - - Future> getUserData() async { - final response = await http.get( - Uri.parse(Url.getUserInfo), - headers: {'Authorization': 'Bearer ' + token}, - ); - // print(response.body); - if (response.statusCode == 200) { - var data = json.decode(response.body)['data']; - _user.addAll( - { - 'id': data['user']['id'], - 'name': data['user']['name'], - 'email': data['user']['email'], - 'cell_number': data['user']['cell_number'], - 'address': data['user']['address'], - 'gender': data['user']['gender'], - 'medical_center': data['user']['medical_center']['name'], - 'roles': data['roles'], - }, - ); - // print(_user); - notifyListeners(); - return _user; - } else { - return {}; - } - } - - Future setUserData(id, name, email) async { - var response = await http.post( - Uri.parse('https://cssd-doc.com/api/UpdateInfo'), - headers: { - 'Authorization': 'Bearer ' + token, - HttpHeaders.contentTypeHeader: 'application/json', - }, - body: json.encode( - { - "id": id, - "name": name, - "email": email, - // "country_code": "0098", - // "cell_number": "09338736511", - // "gender": "Male", - // "verified": "Verified", - // "status": "Active", - // "medical_center_id": 1, - // "address": null, - // "created_at": null, - // "updated_at": "2020-04-23 21:54:52", - // "medical_center": { - // "id": 1, - // "name": "B", - // "address": "1", - // "phone_number": "12345678951", - // "city_id": 1, - // "created_at": null, - // "updated_at": "2020-01-12 05:38:35" - // }, - // "roles": [ - // { - // "id": 1, - // "name": "Admin", - // "guard_name": "web", - // "created_at": null, - // "updated_at": null, - // "pivot": { - // "model_id": 1, - // "role_id": 1, - // "model_type": "App\\User", - // }, - // }, - // ], - }, - ), - ); - print(response.body); - } - - void logout() async { - _token = null; - _expiaryDate = null; - _user = {}; - User.token = null; - final prefs = await SharedPreferences.getInstance(); - prefs.remove('userData'); - notifyListeners(); - } -} +import 'dart:convert'; +import 'dart:io'; + +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; +import 'package:shared_preferences/shared_preferences.dart'; + +import '../config/urls.dart'; +import '../config/user.dart'; + +class Auth with ChangeNotifier { + String? _token; + DateTime? _expiaryDate; + + Map _user = {}; + + bool get isAuth { + return token != null; + } + + String? get token { + if (_expiaryDate != null && + _expiaryDate!.isAfter(DateTime.now()) && + _token != null) { + return _token!; + } + return null; + } + + Map get user { + return {..._user}; + } + + Future requestCode(String cellNumber) async { + final response = await http.post( + Uri.parse(Url.requestResetPass), + body: { + 'cell_number': cellNumber, + }, + // headers: {'X-Requested-With': 'XMLHttpRequest'}, + ); + final responseData = json.decode(response.body); + if (responseData['status'] == 'Faild') { + return 'NotUser'; + } else { + return 'Done'; + } + // print(responseData); + } + + Future sendCode(String code) async { + final response = await http.post( + Uri.parse(Url.verifyResetPass), + body: { + 'code': code, + }, + // headers: {'X-Requested-With': 'XMLHttpRequest'}, + ); + final responseData = json.decode(response.body); + // if (responseData['status']=='Faild') { + // return 'NotUser'; + // } else { + // return 'Done'; + // } + print(responseData); + if (responseData['status'] == 'Faild') { + return 'wrong'; + } else { + return responseData['access_token']; + } + } + + Future sendRePass(String password, String token) async { + print(password); + print(token); + + final response = await http.post( + Uri.parse(Url.sendResetPass), + body: { + 'password': password, + 'password_confirmation': password, + }, + headers: {'Authorization': token, 'X-Requested-With': 'XMLHttpRequest'}, + // headers: {'X-Requested-With': 'XMLHttpRequest'}, + ); + final responseData = json.decode(response.body); + // if (responseData['status']=='Faild') { + // return 'NotUser'; + // } else { + // return 'Done'; + // } + print(responseData); + if (responseData['status'] == 'Success') { + return 'done'; + } else { + return 'error'; + } + } + + Future login(String cellNumber, String password) async { + final response = await http.post( + Uri.parse(Url.login), + body: { + 'cell_number': cellNumber, + 'password': password, + }, + // headers: {'X-Requested-With': 'XMLHttpRequest'}, + ); + final responseData = json.decode(response.body); + print(responseData); + if (response.statusCode == 401) { + if (responseData['message'] == 'The user credentials were incorrect.') { + return 'badinput'; // incorrect user or pass + } else { + return 'error'; + } + } + _token = responseData['access_token']; + _expiaryDate = DateTime.now().add( + Duration( + seconds: responseData['expires_in'], + ), + ); + User.token = _token!; + // print(isAuth); + + // print(User.token); + var localUser = await getUserData(); + // print("------ in auth ==========="); + print(localUser); + + final prefs = await SharedPreferences.getInstance(); + final userData = json.encode({ + 'token': _token, + 'expiaryDate': _expiaryDate!.toIso8601String(), + 'user': user + }); + prefs.setString('userData', userData); + notifyListeners(); + return 'true'; + } + + Future tryAutoLogin() async { + final prefs = await SharedPreferences.getInstance(); + if (!prefs.containsKey('userData')) { + return false; + } + final userData = + json.decode(prefs.getString('userData')!) as Map; + final expiaryDate = DateTime.parse(userData['expiaryDate']); + if (expiaryDate.isBefore(DateTime.now())) { + return false; + } + _token = userData['token']; + _expiaryDate = expiaryDate; + _user = userData['user']; + User.token = _token!; + notifyListeners(); + return true; + } + + Future> getUserData() async { + final response = await http.get( + Uri.parse(Url.getUserInfo), + headers: {'Authorization': 'Bearer ' + token!}, + ); + // print(response.body); + if (response.statusCode == 200) { + var data = json.decode(response.body)['data']; + _user.addAll( + { + 'id': data['user']['id'], + 'name': data['user']['name'], + 'email': data['user']['email'], + 'cell_number': data['user']['cell_number'], + 'address': data['user']['address'], + 'gender': data['user']['gender'], + 'medical_center': data['user']['medical_center']['name'], + 'roles': data['roles'], + }, + ); + // print(_user); + notifyListeners(); + return _user; + } else { + return {}; + } + } + + Future setUserData(id, name, email) async { + var response = await http.post( + Uri.parse('https://cssd-doc.com/api/UpdateInfo'), + headers: { + 'Authorization': 'Bearer ' + token!, + HttpHeaders.contentTypeHeader: 'application/json', + }, + body: json.encode( + { + "id": id, + "name": name, + "email": email, + // "country_code": "0098", + // "cell_number": "09338736511", + // "gender": "Male", + // "verified": "Verified", + // "status": "Active", + // "medical_center_id": 1, + // "address": null, + // "created_at": null, + // "updated_at": "2020-04-23 21:54:52", + // "medical_center": { + // "id": 1, + // "name": "B", + // "address": "1", + // "phone_number": "12345678951", + // "city_id": 1, + // "created_at": null, + // "updated_at": "2020-01-12 05:38:35" + // }, + // "roles": [ + // { + // "id": 1, + // "name": "Admin", + // "guard_name": "web", + // "created_at": null, + // "updated_at": null, + // "pivot": { + // "model_id": 1, + // "role_id": 1, + // "model_type": "App\\User", + // }, + // }, + // ], + }, + ), + ); + print(response.body); + } + + void logout() async { + _token = null; + _expiaryDate = null; + _user = {}; + User.token = ''; + final prefs = await SharedPreferences.getInstance(); + prefs.remove('userData'); + var response = await http.post( + Uri.parse( + Url.logOut, + ), + ); + print(response.statusCode); + notifyListeners(); + } +} diff --git a/lib/providers/connectivity.dart b/lib/providers/connectivity.dart index e0976eb..b3250fe 100644 --- a/lib/providers/connectivity.dart +++ b/lib/providers/connectivity.dart @@ -1,31 +1,32 @@ - -import 'package:flutter/material.dart'; -import 'package:connectivity/connectivity.dart'; - -class ConnectivityProvider extends ChangeNotifier { - String conStatus = ''; - - checkConnection() { - Connectivity().onConnectivityChanged.listen((ConnectivityResult result) { - conStatus = _getStatus(result); - notifyListeners(); - }); - } - - String _getStatus(ConnectivityResult result) { - switch (result) { - case ConnectivityResult.wifi: - return 'wifi'; - break; - case ConnectivityResult.mobile: - return 'calcular'; - break; - case ConnectivityResult.none: - return 'offline'; - break; - default: - return 'offline'; - break; - } - } -} +import 'package:flutter/material.dart'; +import 'package:connectivity/connectivity.dart'; + +enum ConnectionStatus { + Wifi, + Cellular, + Offline, +} + +class ConnectivityProvider extends ChangeNotifier { + String conStatus = ''; + + void checkConnection() { + Connectivity().onConnectivityChanged.listen((ConnectivityResult? result) { + conStatus = _getStatus(result); + notifyListeners(); + }); + } + + String _getStatus(ConnectivityResult? result) { + switch (result) { + case ConnectivityResult.wifi: + return 'wifi'; + case ConnectivityResult.mobile: + return 'cellular'; + case ConnectivityResult.none: + return 'offline'; + default: + return 'offline'; + } + } +} diff --git a/lib/providers/cycles.dart b/lib/providers/cycles.dart index abba973..a6319c8 100644 --- a/lib/providers/cycles.dart +++ b/lib/providers/cycles.dart @@ -1,265 +1,310 @@ -import 'dart:convert'; - -import '../config/urls.dart'; -import '../config/user.dart'; -import '../models/cycles_models.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; - -class CyclesProvider extends ChangeNotifier { - List labelVals = []; - List labelValues = []; - String initialLabelValue = ''; - int curLabelVal = 1; - - resetLabelVals() { - labelVals = []; - labelValues = []; - initialLabelValue = ''; - curLabelVal = 1; - // notifyListeners(); - } - - addLabelVal() { - curLabelVal += 1; - TextEditingController lbl = new TextEditingController(); - lbl.text = initialLabelValue; - labelValues.add(lbl); - notifyListeners(); - } - - changeLabelVal(String value, int index) { - labelValues[index].text = value; - notifyListeners(); - } - - String searchBoxValue = ''; - bool filterOn = false; - List items; - List originalItems; //before do search on results - - CycleDetailObject result; - CycleFilterObject filters = CycleFilterObject( - id: '', - cycleNumber: '', - sterilizerId: '', - hospital: '', - date: '', - ); - int pageNumber = 1; - void resetPageNumber() => pageNumber = 1; - bool isloading = false; - void resetLoading() { - isloading = false; - notifyListeners(); - } - - void setLoading() { - isloading = true; - // notifyListeners(); - } - - Future>> getHospitalsFilters() async { - var response = await http.get( - Uri.parse(Url.filterItems), - headers: { - 'Authorization': User.token, - }, - ); - List> result = []; - var filterDatas = json.decode(response.body); - for (var hospital in filterDatas['data']['MedicalCenters']) { - result.add({ - 'name': hospital['name'].toString(), - 'id': hospital['id'].toString() - }); - // print(hospital['name']); - } - return result; - } - - Future> getLabelFilters() async { - var response = await http.get( - Uri.parse(Url.labelItems), - headers: { - 'Authorization': User.token, - }, - ); - List result = []; - var filterDatas = json.decode(response.body); - for (var label in filterDatas['data']) { - result.add(label['id'].toString()); - // print(hospital['name']); - } - labelVals = result; - initialLabelValue = labelVals[0]; - TextEditingController newLbl = new TextEditingController(); - newLbl.text = initialLabelValue; - labelValues.add(newLbl); - notifyListeners(); - return result; - } - - Future createCycleResult( - cycleNumber, date, labels, note, sterilizerId) async { - List> labs = []; - for (var label in labels) { - labs.add({'name': '', 'id': label}); - } - // print(labs); - var response = await http.post(Uri.parse(Url.createCycleResult), - body: json.encode( - { - 'note': note, - 'labels': labs, - 'cycle_number': cycleNumber, - 'date': date, - 'sterilizer_id': sterilizerId, - }, - ), - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - "Content-Type": "application/json", - "Accept": "application/json" - }); - - print(response.body); - } - - void setFilters(id, cycleNumber, sterilizerId, hospital, date) { - pageNumber = 1; - filters = CycleFilterObject( - id: id, - cycleNumber: cycleNumber, - sterilizerId: sterilizerId, - hospital: hospital, - date: date, - ); - if (filters.id == '' && - filters.cycleNumber == '' && - filters.sterilizerId == '' && - filters.hospital == '' && - filters.date == '') { - filterOn = false; - } else { - filterOn = true; - } - notifyListeners(); - } - - void search(String value) { - items = []; - searchBoxValue = value; - originalItems.forEach((result) { - if (result.id.toString().contains(searchBoxValue)) { - items.add(result); - } - }); - notifyListeners(); - } - - Future getCycleResults() async { - String url = Url.cycleResults(pageNumber); - if (filterOn) { - items = []; - if (filters.id != '') { - url += '&cycle_id=${filters.id}'; - } - if (filters.cycleNumber != '') { - url += '&cycle_number=${filters.cycleNumber}'; - } - if (filters.sterilizerId != '') { - url += '&sterilizer_id=${filters.sterilizerId}'; - } - if (filters.hospital != '') { - url += '&medical_center_id=${filters.hospital}'; - } - if (filters.date != '') { - url += '&date=${filters.date}'; - } - } - // print(url); - var response = await http.get( - Uri.parse(url), - headers: { - 'Authorization': User.token, - }, - ); - - var testResultData = json.decode(response.body); - List labels = []; - if (pageNumber == 1) { - originalItems = []; - items = []; - } - - for (var item in testResultData['data']['data']) { - // print(item); - labels = []; - for (var label in item['labels']) { - // print(label['id']); - labels.add(label['id'].toString()); - } - originalItems.add( - CycleResultObject( - createdAt: item['date'], - id: item['id'].toString(), - label: labels, - ), - ); - } - pageNumber += 1; - search(''); - } - - Future showCycleResult(String id) async { - var response = await http.get(Uri.parse(Url.getCycleResult(id)), headers: { - 'Authorization': User.token, - }); - if (response.statusCode != 200) { - return CycleDetailObject( - id: 'null', - description: 'null', - createDate: 'null', - hospitalName: 'null', - date: '2020-01-01', - sterileId: 'null', - cycleNumber: 'null', - labels: [], - ); - } - var data = json.decode(response.body)['data']; - List lablesList = []; - for (var label in data['labels']) { - lablesList.add(label['id'].toString()); - } - print(data); - result = CycleDetailObject( - id: data['id'].toString(), - description: data['note'] != null ? data['note'] : '', - createDate: data['created_at'] != null ? data['created_at'] : '', - hospitalName: data['user']['medical_center']['name'], - date: data['date'] != null ? data['date'] : '', - sterileId: data['sterilizer_id'] != null ? data['sterilizer_id'] : '', - cycleNumber: data['cycle_number'] != null ? data['cycle_number'] : '', - labels: lablesList, - ); - // result = { - // 'id': data['id'], - // 'auto_cleave_id': data['inputs']['Autoclave ID'], - // 'test_code': data['test_type_id'], - // 'date': data['created_at'], - // 'verified': data['verified'], - // 'description': data['inputs']['Note'], - // 'test_type_name': data['test_type']['name'], - - // // 'device_label': data['device_label'], - // // 'device_id': data['device_id'], - // // 'result': data['result'], - // // 'user_name': data['user']['name'], - // // 'medical_center': data['user']['medical_center']['name'], - // }; - return result; - } -} +import 'dart:convert'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import '../models/cycles_models.dart'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; + +class CyclesProvider extends ChangeNotifier { + List labelVals = []; + List labelValues = []; + String initialLabelValue = ''; + int curLabelVal = 1; + + resetLabelVals() { + labelVals = []; + labelValues = []; + initialLabelValue = ''; + curLabelVal = 1; + // notifyListeners(); + } + + addLabelVal() { + curLabelVal += 1; + TextEditingController lbl = new TextEditingController(); + lbl.text = initialLabelValue; + labelValues.add(lbl); + notifyListeners(); + } + + changeLabelVal(String value, int index) { + labelValues[index].text = value; + notifyListeners(); + } + + String searchBoxValue = ''; + bool filterOn = false; + List? items; + List? originalItems; + + CycleDetailObject? result; + CycleFilterObject? filters = CycleFilterObject( + id: '', + cycleNumber: '', + sterilizerId: '', + hospital: '', + date: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + Future>> getHospitalsFilters() async { + var response = await http.get( + Uri.parse(Url.filterItems), + headers: { + 'Authorization': User.token, + }, + ); + List> result = []; + var filterDatas = json.decode(response.body); + for (var hospital in filterDatas['data']['MedicalCenters']) { + result.add({ + 'name': hospital['name'].toString(), + 'id': hospital['id'].toString() + }); + // print(hospital['name']); + } + return result; + } + + Future> getLabelFilters() async { + var response = await http.get( + Uri.parse(Url.labelItems), + headers: { + 'Authorization': User.token, + }, + ); + List result = []; + var filterDatas = json.decode(response.body); + for (var label in filterDatas['data']) { + result.add(label['id'].toString()); + // print(hospital['name']); + } + labelVals = result; + initialLabelValue = labelVals[0]; + TextEditingController newLbl = new TextEditingController(); + newLbl.text = initialLabelValue; + labelValues.add(newLbl); + notifyListeners(); + return result; + } + + Future createCycleResult( + cycleNumber, date, labels, note, sterilizerId) async { + List> labs = []; + for (var label in labels) { + labs.add({'name': '', 'id': label}); + } + // print(labs); + var response = await http.post(Uri.parse(Url.createCycleResult), + body: json.encode( + { + 'note': note, + 'labels': labs, + 'cycle_number': cycleNumber, + 'date': date, + 'sterilizer_id': sterilizerId, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future updateCycleResult( + id, + sterilizerId, + cycleNumber, + // label, + date, + description, + ) async { + var response = await http.put(Uri.parse(Url.updateCycleResult(id)), + body: json.encode( + { + 'sterilizer_id': sterilizerId, + 'cycle_number': cycleNumber, + 'note': description, + // 'label_id': label['id'].toString(), + 'date': date, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future removeCycles(String id) async { + var response = await http.post(Uri.parse(Url.removeCycles(id)), body: { + '_method': 'delete' + }, headers: { + 'Authorization': User.token, + }); + + if (response.statusCode == 200) { + items!.removeWhere((item) { + return item.id.toString() == id; + }); + } + + notifyListeners(); + return true; + } + + void setFilters(id, cycleNumber, sterilizerId, hospital, date) { + pageNumber = 1; + filters = CycleFilterObject( + id: id, + cycleNumber: cycleNumber, + sterilizerId: sterilizerId, + hospital: hospital, + date: date, + ); + if (filters!.id == '' && + filters!.cycleNumber == '' && + filters!.sterilizerId == '' && + filters!.hospital == '' && + filters!.date == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + void search(String value) { + items = []; + searchBoxValue = value; + originalItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + items!.add(result); + } + }); + notifyListeners(); + } + + Future getCycleResults() async { + String url = Url.cycleResults(pageNumber); + if (filterOn) { + items = []; + if (filters!.id != '') { + url += '&cycle_id=${filters!.id}'; + } + if (filters!.cycleNumber != '') { + url += '&cycle_number=${filters!.cycleNumber}'; + } + if (filters!.sterilizerId != '') { + url += '&sterilizer_id=${filters!.sterilizerId}'; + } + if (filters!.hospital != '') { + url += '&medical_center_id=${filters!.hospital}'; + } + if (filters!.date != '') { + url += '&date=${filters!.date}'; + } + } + // print(url); + var response = await http.get( + Uri.parse(url), + headers: { + 'Authorization': User.token, + }, + ); + + var testResultData = json.decode(response.body); + List labels = []; + if (pageNumber == 1) { + originalItems = []; + items = []; + } + + for (var item in testResultData['data']['data']) { + // print(item); + labels = []; + for (var label in item['labels']) { + // print(label['id']); + labels.add(label['id'].toString()); + } + originalItems!.add( + CycleResultObject( + createdAt: item['date'], + id: item['id'].toString(), + label: labels, + ), + ); + } + pageNumber += 1; + search(''); + } + + Future showCycleResult(String id) async { + var response = await http.get(Uri.parse(Url.getCycleResult(id)), headers: { + 'Authorization': User.token, + }); + if (response.statusCode != 200) { + return CycleDetailObject( + id: 'null', + description: 'null', + createDate: 'null', + hospitalName: 'null', + date: '2020-01-01', + sterileId: 'null', + cycleNumber: 'null', + labels: [], + ); + } + var data = json.decode(response.body)['data']; + List lablesList = []; + for (var label in data['labels']) { + lablesList.add(label['id'].toString()); + } + print(data); + result = CycleDetailObject( + id: data['id'].toString(), + description: data['note'] != null ? data['note'] : '', + createDate: data['created_at'] != null ? data['created_at'] : '', + hospitalName: data['user']['medical_center']['name'], + date: data['date'] != null ? data['date'] : '', + sterileId: data['sterilizer_id'] != null ? data['sterilizer_id'] : '', + cycleNumber: data['cycle_number'] != null ? data['cycle_number'] : '', + labels: lablesList, + ); + // result = { + // 'id': data['id'], + // 'auto_cleave_id': data['inputs']['Autoclave ID'], + // 'test_code': data['test_type_id'], + // 'date': data['created_at'], + // 'verified': data['verified'], + // 'description': data['inputs']['Note'], + // 'test_type_name': data['test_type']['name'], + + // // 'device_label': data['device_label'], + // // 'device_id': data['device_id'], + // // 'result': data['result'], + // // 'user_name': data['user']['name'], + // // 'medical_center': data['user']['medical_center']['name'], + // }; + return result!; + } +} diff --git a/lib/providers/input.dart b/lib/providers/input.dart index 67befe1..f93fe34 100644 --- a/lib/providers/input.dart +++ b/lib/providers/input.dart @@ -1,134 +1,122 @@ -import 'dart:convert'; - -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; - -import '../config/urls.dart'; -import '../config/user.dart'; - -class Inputs with ChangeNotifier { - List> inputItems = []; - - Future getInputs( - {String testResultId = "", - String name = "", - String uniqueCode = "", - String testTypeId = ""}) async { - // print( - // { - // 'test_type_id': testTypeId, - // 'test_result_id': testResultId, - // 'name': name, - // 'unique_code': uniqueCode, - // }, - // ); - var response = await http.post( - Uri.parse(Url.getInputs), - body: { - 'test_type_id': testTypeId, - 'test_result_id': testResultId, - 'name': name, - 'unique_code': uniqueCode, - }, - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - }, - ); - if (response.statusCode != 200) { - inputItems = []; - notifyListeners(); - return false; - } - final responseData = json.decode(response.body); - - // print(responseData['data']['inputs']); - // for (var item in responseData['data']['testType'].keys) { - // print(item); - // } - Map values; - if (testResultId.isNotEmpty) { - response = await http.get(Uri.parse(Url.testResultFormValues(testResultId)), - headers: {'Authorization': User.token}); - values = json.decode(response.body)['data']; - } - - var inputs = responseData['data']['inputs'] as List; - var general = responseData['data']['testType'] as Map; - - clearInputs(); - bool result = false; - DateTime dateTime = DateTime.now(); - String deviceLabel; - if (values != null && values.isNotEmpty) { - result = values['result'] == 'Accept' ? true : false; - dateTime = values['date'] == null - ? DateTime.now() - : DateTime.parse(values['date']); - deviceLabel = values['device_id'] ?? ''; - } - - inputItems.add({ - 'type': 'Label', - 'key': 'test_type_id', - 'name': general['name'], - 'value': general['id'] - }); - - // print(responseData['data']['inputs']); - inputItems.add({ - 'type': 'Text', - 'key': 'device_id', - 'name': general['device_label'], - 'value': deviceLabel, - }); - inputItems.add( - {'type': 'Date', 'key': 'date', 'name': 'date', 'value': dateTime}); - inputItems.add( - {'type': 'Switch', 'key': 'result', 'name': 'Result', 'value': result}); - - setValues(inputs, values); - for (var input in inputs) { - inputItems.add(input as Map); - // print(input); - } - inputItems.add({ - 'type': 'Image', - 'key': 'test_type_id', - 'name': general['name'], - 'value': general['id'] - }); - - notifyListeners(); - return true; - } - - void setValues(inputs, values) { - for (var input in inputs) { - if (input.containsKey('children')) { - setValues(input['children'], values); - } - var key = "${input['name']}_${input['id']}"; - input['key'] = key; - if (values != null && values.isNotEmpty && values.containsKey(key)) { - if (input['type'] == 'Range' || - input['type'] == 'Temperature' || - input['type'] == 'Pressure') { - input['value'] = double.parse(values[key]); - } else if (input['type'] == 'Switch') { - input['value'] = values[key] == "1" ? true : false; - } else if (input['type'] == 'Time') { - input['value'] = values[key] == null - ? '' - : values[key].substring(0, 2) + ":" + values[key].substring(2, 4); - } else { - input['value'] = values[key]; - } - } - } - } - - void clearInputs() { - inputItems.clear(); - } -} +import 'dart:convert'; + +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; + +import '../config/urls.dart'; +import '../config/user.dart'; + +class Inputs with ChangeNotifier { + List> inputItems = []; + + Future getInputs({ + required String testResultId, + required String name, + required String uniqueCode, + required String testTypeId, + }) async { + var response = await http.post( + Uri.parse(Url.getInputs), + body: { + 'test_type_id': testTypeId, + 'test_result_id': testResultId, + 'name': name, + 'unique_code': uniqueCode, + }, + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + }, + ); + if (response.statusCode != 200) { + inputItems = []; + notifyListeners(); + return false; + } + final responseData = json.decode(response.body); + + Map? values; + if (testResultId.isNotEmpty) { + response = await http.get( + Uri.parse(Url.testResultFormValues(testResultId)), + headers: {'Authorization': User.token}); + values = json.decode(response.body)['data']; + } + + var inputs = responseData['data']['inputs'] as List; + var general = responseData['data']['testType'] as Map; + + clearInputs(); + bool result = false; + DateTime dateTime = DateTime.now(); + String? deviceLabel; + if (values != null && values.isNotEmpty) { + result = values['result'] == 'Accept' ? true : false; + dateTime = values['date'] == null + ? DateTime.now() + : DateTime.parse(values['date']); + deviceLabel = values['device_id'] ?? ''; + } + + inputItems.add({ + 'type': 'Label', + 'key': 'test_type_id', + 'name': general['name'], + 'value': general['id'] + }); + + inputItems.add({ + 'type': 'Text', + 'key': 'device_id', + 'name': general['device_label'], + 'value': deviceLabel, + }); + inputItems.add( + {'type': 'Date', 'key': 'date', 'name': 'date', 'value': dateTime}); + inputItems.add( + {'type': 'Switch', 'key': 'result', 'name': 'Result', 'value': result}); + + setValues(inputs, values); + for (var input in inputs) { + inputItems.add(input as Map); + } + inputItems.add({ + 'type': 'Image', + 'key': 'test_type_id', + 'name': general['name'], + 'value': general['id'] + }); + + notifyListeners(); + return true; + } + + void setValues(inputs, values) { + for (var input in inputs) { + if (input.containsKey('children')) { + setValues(input['children'], values); + } + var key = "${input['name']}_${input['id']}"; + input['key'] = key; + if (values != null && values.isNotEmpty && values.containsKey(key)) { + if (input['type'] == 'Range' || + input['type'] == 'Temperature' || + input['type'] == 'Pressure') { + input['value'] = double.parse(values[key]); + } else if (input['type'] == 'Switch') { + input['value'] = values[key] == "1" ? true : false; + } else if (input['type'] == 'Time') { + input['value'] = values[key] == null + ? '' + : values[key].substring(0, 2) + ":" + values[key].substring(2, 4); + } else { + input['value'] = values[key]; + } + } + } + } + + void clearInputs() { + inputItems.clear(); + } +} diff --git a/lib/providers/items.dart b/lib/providers/items.dart new file mode 100644 index 0000000..a5a2dcf --- /dev/null +++ b/lib/providers/items.dart @@ -0,0 +1,346 @@ +import 'dart:convert'; + +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/models/my_item_model.dart'; +import 'package:dio/dio.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/foundation.dart'; +import 'package:random_string/random_string.dart'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import 'package:http/http.dart' as http; + +class ItemProvider extends ChangeNotifier { + List catchImages = []; + List images = []; + String searchBoxValue = ''; + bool filterOn = false; + List? items; + + List? originalItems; + + ItemDetailObject? result; + ItemFilterObject? filters = ItemFilterObject( + id: '', + hospital: '', + name: '', + udi: '', + size: '', + specific: '', + ); + + MyItemFilterObject? myItemsFilters = MyItemFilterObject( + id: '', + name: '', + udi: '', + size: '', + specific: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + Future>> getHospitalsFilters() async { + var response = await http.get( + Uri.parse(Url.filterItems), + headers: { + 'Authorization': User.token, + }, + ); + List> result = []; + var filterData = json.decode(response.body); + for (var hospital in filterData['data']['MedicalCenters']) { + result.add({ + 'name': hospital['name'].toString(), + 'id': hospital['id'].toString() + }); + // print(hospital['name']); + } + return result; + } + + setImages() async { + images = []; + for (var image in catchImages) { + var result = image.bytes; + // final batchId = randomString(10); + // addImage(batchId, result, image.path); + images.add(result!.buffer + .asUint8List(result.offsetInBytes, result.lengthInBytes)); + } + notifyListeners(); + } + + setCatchImages(List images) { + catchImages = images; + notifyListeners(); + } + + removeImage(int index) { + catchImages.removeAt(index); + notifyListeners(); + } + + Future addImage(String batchId, dynamic file, String fileName) async { + var imageListInt = file.cast(); + var dio = Dio(); + dio.options.headers = { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + 'Content-Type': 'application/json', + }; + FormData formData = FormData.fromMap( + { + "batch_id": batchId, + 'model_type': 'Item', + "file": MultipartFile.fromBytes(imageListInt, filename: fileName) + }, + ); + + await dio.post( + Url.addImage, + data: formData, + ); + return 'Added'; + } + + Future createItemResult( + name, + size, + specific, + udi, + note, + batchId, + ) async { + batchId = randomString(10); + + for (var image in catchImages) { + await addImage(batchId, image.bytes, image.path!); + } + var response = await http.post(Uri.parse(Url.createItemResult), + body: json.encode( + { + 'note': note, + 'size': size, + 'specific': specific, + 'name': name, + 'udi': udi, + 'file_batch_id': batchId, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + print(response.body); + } + + Future updateItemResult( + id, + name, + size, + specific, + udi, + description, + ) async { + var response = await http.put(Uri.parse(Url.updateItemResult(id)), + body: json.encode( + { + 'name': name, + 'udi': udi, + 'note': description, + 'size': size, + 'specific': specific, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future removeItems(String id) async { + var response = await http.post(Uri.parse(Url.removeItems(id)), body: { + '_method': 'delete' + }, headers: { + 'Authorization': User.token, + }); + + if (response.statusCode == 200) { + items!.removeWhere((item) { + return item.id.toString() == id; + }); + } + + notifyListeners(); + return true; + } + + void setFilters( + id, + name, + udi, + hospital, + size, + specific, + ) { + pageNumber = 1; + filters = ItemFilterObject( + id: id, + name: name, + udi: udi, + hospital: hospital, + size: size, + specific: specific, + ); + if (filters!.id == '' && + filters!.name == '' && + filters!.hospital == '' && + filters!.size == '' && + filters!.specific != '' && + filters!.udi == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + void search(String value) { + items = []; + searchBoxValue = value; + originalItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + items!.add(result); + } + }); + notifyListeners(); + } + + Future getItemResults() async { + String url = Url.itemResults(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&item_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.hospital != '') { + url += '&medical_center_id=${filters!.hospital}'; + } + if (filters!.size != '') { + url += '&size=${filters!.size}'; + } + if (filters!.specific != '') { + url += '&specific=${filters!.specific}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: { + 'Authorization': User.token, + }, + ); + + var testResultData = json.decode(response.body); + if (pageNumber == 1) { + originalItems = []; + } + + for (var item in testResultData['data']['data']) { + originalItems!.add( + ItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + userName: item['user'] != null ? item['user']['name'] : '', + status: item['status'], + ), + ); + } + pageNumber += 1; + + search(''); + } + + Future showItemResult(String id) async { + var response = await http.get(Uri.parse(Url.getItemResult(id)), headers: { + 'Authorization': User.token, + }); + if (response.statusCode != 200) { + return ItemDetailObject( + id: 'null', + description: 'null', + name: 'null', + userName: 'null', + specific: 'null', + hospital: 'null', + size: 'null', + createdAt: '2019-09-18 10:02:03', + udi: 'null', + status: 0, + ); + } + var data = json.decode(response.body)['data']; + print(data); + result = ItemDetailObject( + id: data['id'].toString(), + description: data['note'] != null ? data['note'] : '', + name: data['name'] != null ? data['name'] : '', + hospital: + data['user'] != null ? data['user']['medical_center']['name'] : '', + userName: data['user'] != null ? data['user']['name'] : '', + size: data['size'] != null ? data['size'] : '', + specific: data['specific'] != null ? data['specific'] : '', + createdAt: data['created_at'] != null ? data['created_at'] : '', + udi: data['udi'] != null ? data['udi'] : '', + status: data['status'], + ); + return result!; + } + + Future changeStatus(String id) async { + print(id); + var response = await http.post( + Uri.parse(Url.changeItemStatus(id)), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + var itemData = json.decode(response.body); + + try { + if (itemData['status'] == 'Success') { + return true; + } else { + return false; + } + } catch (e) { + return false; + } + } +} diff --git a/lib/providers/labels.dart b/lib/providers/labels.dart index fb91ac7..f47c869 100644 --- a/lib/providers/labels.dart +++ b/lib/providers/labels.dart @@ -1,257 +1,304 @@ -import 'dart:convert'; - -import '../config/urls.dart'; -import '../config/user.dart'; -import '../models/label_models.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; - -class LabelsProvider extends ChangeNotifier { - String searchBoxValue = ''; - bool filterOn = false; - List items; - List originalItems; - - LabelDetailsObject result; - LabelFilterObject filters = LabelFilterObject( - id: '', - cycleNumber: '', - sterilizerId: '', - hospital: '', - ); - int pageNumber = 1; - void resetPageNumber() => pageNumber = 1; - bool isloading = false; - void resetLoading() { - isloading = false; - notifyListeners(); - } - - void setLoading() { - isloading = true; - // notifyListeners(); - } - - Future>> getHospitalsFilters() async { - var response = await http.get( - Uri.parse(Url.filterItems), - headers: { - 'Authorization': User.token, - }, - ); - List> result = []; - var filterDatas = json.decode(response.body); - for (var hospital in filterDatas['data']['MedicalCenters']) { - result.add({ - 'name': hospital['name'].toString(), - 'id': hospital['id'].toString() - }); - // print(hospital); - } - return result; - } - - Future>> getPackageFilters() async { - var response = await http.get( - Uri.parse(Url.packageItems), - headers: { - 'Authorization': User.token, - }, - ); - List> result = []; - var filterDatas = json.decode(response.body); - // print(filterDatas); - for (var package in filterDatas['data']) { - result.add( - { - 'name': package['name'].toString(), - 'id': package['id'].toString(), - }, - ); - // print(hospital['name']); - } - // print(result); - return result; - } - - Future createLabelResult(lotNumber, cycleNumber, sterileDate, package, - expireDate, sterilizerId) async { - // print(labs); - var response = await http.post(Uri.parse(Url.createLabelResult), - body: json.encode( - { - 'sterile_date': sterileDate, - 'expire_date': expireDate, - 'sterilizer_id': sterilizerId, - 'cycle_number': cycleNumber, - 'lot_number': lotNumber, - 'package_id': package['id'] - // 'package': { - // 'id': package['id'], - // 'name': package['name'], - // }, - }, - ), - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - "Content-Type": "application/json", - "Accept": "application/json" - }); - - print(response.body); - } - - Future updateLabelResult( - id, - lotNumber, - cycleNumber, - sterileDate, - package, - expireDate, - sterilizerId, - ) async { - // print(labs); - var response = await http.put(Uri.parse(Url.updateLabelResult(id)), - body: json.encode( - { - 'sterile_date': sterileDate, - 'expire_date': expireDate, - 'sterilizer_id': sterilizerId, - 'cycle_number': cycleNumber, - 'lot_number': lotNumber, - 'package_id': package['id'] - // 'package': { - // 'id': package['id'], - // 'name': package['name'], - // }, - }, - ), - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - "Content-Type": "application/json", - "Accept": "application/json" - }); - - print(response.body); - } - - void setFilters(id, cycleNumber, sterilizerId, hospital) { - pageNumber = 1; - filters = LabelFilterObject( - id: id, - cycleNumber: cycleNumber, - sterilizerId: sterilizerId, - hospital: hospital, - ); - if (filters.id == '' && - filters.cycleNumber == '' && - filters.sterilizerId == '' && - filters.hospital == '') { - filterOn = false; - } else { - filterOn = true; - } - notifyListeners(); - } - - void search(String value) { - items = []; - searchBoxValue = value; - originalItems.forEach((result) { - if (result.id.toString().contains(searchBoxValue)) { - items.add(result); - } - }); - notifyListeners(); - } - - Future getLabelResults() async { - String url = Url.labelResults(pageNumber); - if (filterOn) { - items = []; - // url = Url.labelResults(pNum); - if (filters.id != '') { - url += '&label_id=${filters.id}'; - } - if (filters.hospital != '') { - url += '&medical_center_id=${filters.hospital}'; - } - if (filters.sterilizerId != '') { - url += '&sterilizer_id=${filters.sterilizerId}'; - } - if (filters.cycleNumber != '') { - url += '&cycle_number=${filters.cycleNumber}'; - } - } - - var response = await http.get( - Uri.parse(url), - headers: { - 'Authorization': User.token, - }, - ); - - var testResultData = json.decode(response.body); - if (pageNumber == 1) { - originalItems = []; - items = []; - } - - for (var item in testResultData['data']['data']) { - // print(item); - originalItems.add( - LabelResultObject( - expireDate: item['expire_date'], - id: item['id'].toString(), - package: item['package']['name'], - packageId: item['package']['id'].toString(), - ), - ); - } - pageNumber += 1; - search(''); - } - - Future showLabelResult(String id) async { - var response = await http.get( - Uri.parse(Url.getLabelResult(id)), - headers: { - 'Authorization': User.token, - }, - ); - if (response.statusCode != 200) { - return LabelDetailsObject( - id: 'null', - package: 'null', - packageId: 'null', - hospitalName: 'null', - createDate: 'null', - expireDate: 'null', - sterileDate: 'null', - sterileId: 'null', - cycleNumber: 'null', - lotNumber: 'null', - ); - } - - var data = json.decode(response.body)['data']; - print(data); - result = LabelDetailsObject( - id: data['id'].toString(), - package: data['package']['name'] != null ? data['package']['name'] : '', - packageId: data['package']['id'].toString() != 'null' - ? data['package']['id'].toString() - : '', - hospitalName: data['user']['medical_center']['name'], - createDate: data['created_at'] != null ? data['created_at'] : '', - expireDate: data['expire_date'] != null ? data['expire_date'] : '', - sterileDate: data['sterile_date'] != null ? data['sterile_date'] : '', - sterileId: data['sterilizer_id'] != null ? data['sterilizer_id'] : '', - cycleNumber: data['cycle_number'] != null ? data['cycle_number'] : '', - lotNumber: data['lot_number'] != null ? data['lot_number'] : '', - ); - return result; - } -} +import 'dart:convert'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import '../models/label_models.dart'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; + +class LabelsProvider extends ChangeNotifier { + String searchBoxValue = ''; + bool filterOn = false; + List? items; + List? originalItems; + List packageVals = []; + List packageValues = []; + String initialPackageValue = ''; + int curPackageVal = 1; + + resetPackageVals() { + packageVals = []; + packageValues = []; + initialPackageValue = ''; + curPackageVal = 1; + // notifyListeners(); + } + + addPackageVal() { + curPackageVal += 1; + TextEditingController lbl = new TextEditingController(); + lbl.text = initialPackageValue; + packageValues.add(lbl); + notifyListeners(); + } + + changePackageVal(String value, int index) { + packageValues[index].text = value; + notifyListeners(); + } + + LabelDetailsObject? result; + LabelFilterObject filters = LabelFilterObject( + id: '', + cycleNumber: '', + sterilizerId: '', + hospital: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + Future>> getHospitalsFilters() async { + var response = await http.get( + Uri.parse(Url.filterItems), + headers: { + 'Authorization': User.token, + }, + ); + List> result = []; + var filterDatas = json.decode(response.body); + for (var hospital in filterDatas['data']['MedicalCenters']) { + result.add({ + 'name': hospital['name'].toString(), + 'id': hospital['id'].toString() + }); + // print(hospital); + } + return result; + } + + Future> getPackageFilters() async { + var response = await http.get( + Uri.parse(Url.packageItems), + headers: { + 'Authorization': User.token, + }, + ); + List result = []; + var filterDatas = json.decode(response.body); + for (var package in filterDatas['data']) { + result.add( + "${package['name']} - ${package['udi'] != null ? package['udi'] : ''}"); + } + packageVals = result; + initialPackageValue = packageVals[0]; + TextEditingController newLbl = new TextEditingController(); + newLbl.text = initialPackageValue; + packageValues.add(newLbl); + notifyListeners(); + return result; + } + + Future createLabelResult(lotNumber, cycleNumber, sterileDate, package, + expireDate, sterilizerId) async { + // print(labs); + var response = await http.post(Uri.parse(Url.createLabelResult), + body: json.encode( + { + 'sterile_date': sterileDate, + 'expire_date': expireDate, + 'sterilizer_id': sterilizerId, + 'cycle_number': cycleNumber, + 'lot_number': lotNumber, + 'package_id': package['id'] + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future updateLabelResult( + id, + lotNumber, + cycleNumber, + sterileDate, + package, + expireDate, + sterilizerId, + ) async { + // print(labs); + print( + { + 'sterile_date': sterileDate, + 'expire_date': expireDate, + 'sterilizer_id': sterilizerId, + 'cycle_number': cycleNumber, + 'lot_number': lotNumber, + 'package_id': package['id'], + }, + ); + var response = await http.put(Uri.parse(Url.updateLabelResult(id)), + body: json.encode( + { + 'sterile_date': sterileDate, + 'expire_date': expireDate, + 'sterilizer_id': sterilizerId, + 'cycle_number': cycleNumber, + 'lot_number': lotNumber, + 'package_id': package['id'], + // 'package': { + // 'id': package['id'], + // 'name': package['name'], + // }, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future removeLabels(String id) async { + var response = await http.post(Uri.parse(Url.removeLabels(id)), body: { + '_method': 'delete' + }, headers: { + 'Authorization': User.token, + }); + + if (response.statusCode == 200) { + items!.removeWhere((item) { + return item.id.toString() == id; + }); + } + + notifyListeners(); + return true; + } + + void setFilters(id, cycleNumber, sterilizerId, hospital) { + pageNumber = 1; + filters = LabelFilterObject( + id: id, + cycleNumber: cycleNumber, + sterilizerId: sterilizerId, + hospital: hospital, + ); + if (filters.id == '' && + filters.cycleNumber == '' && + filters.sterilizerId == '' && + filters.hospital == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + void search(String value) { + items = []; + searchBoxValue = value; + originalItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + items!.add(result); + } + }); + notifyListeners(); + } + + Future getLabelResults() async { + String url = Url.labelResults(pageNumber); + if (filterOn) { + items = []; + // url = Url.labelResults(pNum); + if (filters.id != '') { + url += '&label_id=${filters.id}'; + } + if (filters.hospital != '') { + url += '&medical_center_id=${filters.hospital}'; + } + if (filters.sterilizerId != '') { + url += '&sterilizer_id=${filters.sterilizerId}'; + } + if (filters.cycleNumber != '') { + url += '&cycle_number=${filters.cycleNumber}'; + } + } + + var response = await http.get( + Uri.parse(url), + headers: { + 'Authorization': User.token, + }, + ); + + var testResultData = json.decode(response.body); + if (pageNumber == 1) { + originalItems = []; + items = []; + } + + for (var item in testResultData['data']['data']) { + // print(item); + originalItems!.add( + LabelResultObject( + expireDate: item['expire_date'], + id: item['id'].toString(), + package: item['package']['name'], + packageId: item['package']['id'].toString(), + ), + ); + } + pageNumber += 1; + search(''); + } + + Future showLabelResult(String id) async { + var response = await http.get( + Uri.parse(Url.getLabelResult(id)), + headers: { + 'Authorization': User.token, + }, + ); + if (response.statusCode != 200) { + return LabelDetailsObject( + id: 'null', + package: 'null', + packageId: 'null', + hospitalName: 'null', + createDate: 'null', + expireDate: 'null', + sterileDate: 'null', + sterileId: 'null', + cycleNumber: 'null', + lotNumber: 'null', + ); + } + + var data = json.decode(response.body)['data']; + print(data); + result = LabelDetailsObject( + id: data['id'].toString(), + package: data['package']['name'] != null ? data['package']['name'] : '', + packageId: data['package']['id'].toString() != 'null' + ? data['package']['id'].toString() + : '', + hospitalName: data['user']['medical_center']['name'], + createDate: data['created_at'] != null ? data['created_at'] : '', + expireDate: data['expire_date'] != null ? data['expire_date'] : '', + sterileDate: data['sterile_date'] != null ? data['sterile_date'] : '', + sterileId: data['sterilizer_id'] != null ? data['sterilizer_id'] : '', + cycleNumber: data['cycle_number'] != null ? data['cycle_number'] : '', + lotNumber: data['lot_number'] != null ? data['lot_number'] : '', + ); + return result!; + } +} diff --git a/lib/providers/my_info.dart b/lib/providers/my_info.dart index 979e6e5..8fb9600 100644 --- a/lib/providers/my_info.dart +++ b/lib/providers/my_info.dart @@ -1,59 +1,58 @@ -import 'dart:convert'; -import 'package:http/http.dart' as http; -import '../config/urls.dart'; - -import 'package:flutter/material.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - -class MyInfoProvider extends ChangeNotifier { - Map _user = {}; - Map get user { - return {..._user}; - } - - String _token; - - Future setToken() async { - final prefs = await SharedPreferences.getInstance(); - if (!prefs.containsKey('auth')) { - return false; - } - final auth = json.decode(prefs.getString('auth')) as Map; - _token = auth['token']; - notifyListeners(); - } - - Future> getUserData() async { - final prefs = await SharedPreferences.getInstance(); - final auth = json.decode(prefs.getString('auth')) as Map; - _token = auth['token']; - final response = await http.get( - Uri.parse(Url.getUserInfo), - headers: { - 'Authorization': 'Bearer ' + _token, - }, - ); - print(response.body); - - if (response.statusCode == 200) { - var data = json.decode(response.body)['data']; - _user.addAll( - { - 'id': data['user']['id'], - 'name': data['user']['name'], - 'email': data['user']['email'], - 'cell_number': data['user']['cell_number'], - 'address': data['user']['address'], - 'gender': data['user']['gender'], - 'medical_center': data['user']['medical_center']['name'], - 'roles': data['roles'], - }, - ); - final prefs = await SharedPreferences.getInstance(); - prefs.setString('userData', json.encode(_user)); - return _user; - } else { - return {}; - } - } -} +import 'dart:convert'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; +import 'package:shared_preferences/shared_preferences.dart'; + +import '../config/urls.dart'; + +class MyInfoProvider with ChangeNotifier { + Map _user = {}; + Map get user { + return {..._user}; + } + + String? _token; + + Future setToken() async { + final prefs = await SharedPreferences.getInstance(); + if (!prefs.containsKey('auth')) { + return; + } + final auth = json.decode(prefs.getString('auth')!) as Map; + _token = auth['token']; + notifyListeners(); + } + + Future> getUserData() async { + final prefs = await SharedPreferences.getInstance(); + final auth = json.decode(prefs.getString('auth')!) as Map; + _token = auth['token']; + final response = await http.get( + Uri.parse(Url.getUserInfo), + headers: { + 'Authorization': 'Bearer $_token', + }, + ); + print(response.body); + if (response.statusCode == 200) { + var data = json.decode(response.body)['data']; + _user.addAll( + { + 'id': data['user']['id'], + 'name': data['user']['name'], + 'email': data['user']['email'], + 'cell_number': data['user']['cell_number'], + 'address': data['user']['address'], + 'gender': data['user']['gender'], + 'medical_center': data['user']['medical_center']['name'], + 'roles': data['roles'], + }, + ); + final prefs = await SharedPreferences.getInstance(); + prefs.setString('userData', json.encode(_user)); + return _user; + } else { + return {}; + } + } +} diff --git a/lib/providers/my_items.dart b/lib/providers/my_items.dart new file mode 100644 index 0000000..5ffb834 --- /dev/null +++ b/lib/providers/my_items.dart @@ -0,0 +1,274 @@ +import 'dart:convert'; + +import 'package:cssd/models/my_item_model.dart'; +import 'package:flutter/foundation.dart'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import 'package:http/http.dart' as http; + +class MyItemProvider extends ChangeNotifier { + String searchBoxValue = ''; + bool filterOn = false; + List? myItems; + List? hospitalItems; + + List? originalMyItems; + List? originalHospitalItems; + + List? originalMyItemsRequests; + List? originalHospitalItemsRequests; + + MyItemFilterObject? filters = MyItemFilterObject( + id: '', + name: '', + udi: '', + size: '', + specific: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + void searchMyItems(String value) { + myItems = []; + searchBoxValue = value; + originalMyItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + myItems!.add(result); + } + }); + notifyListeners(); + } + + void searchHospitalItems(String value) { + hospitalItems = []; + searchBoxValue = value; + originalHospitalItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + hospitalItems!.add(result); + } + }); + notifyListeners(); + } + + void setFilters( + id, + name, + udi, + size, + specific, + ) { + pageNumber = 1; + filters = MyItemFilterObject( + id: id, + name: name, + udi: udi, + size: size, + specific: specific, + ); + if (filters!.id == '' && + filters!.name == '' && + filters!.size == '' && + filters!.specific != '' && + filters!.udi == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + Future getMyItems() async { + String url = Url.getMyItems(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&item_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.size != '') { + url += '&size=${filters!.size}'; + } + if (filters!.specific != '') { + url += '&specific=${filters!.specific}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var itemsData = json.decode(response.body); + + if (pageNumber == 1) { + originalMyItems = []; + } + + for (var item in itemsData['data']) { + originalMyItems!.add( + MyItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + fromDate: item['transfers']['from_date'], + toDate: item['transfers']['to_date'], + ), + ); + } + pageNumber += 1; + searchMyItems(''); + } + + Future getHospitalItems() async { + String url = Url.getHospitalItems(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&item_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.size != '') { + url += '&size=${filters!.size}'; + } + if (filters!.specific != '') { + url += '&specific=${filters!.specific}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + print(response.body); + print(response.statusCode); + + var itemsData = json.decode(response.body); + + if (pageNumber == 1) { + originalHospitalItems = []; + } + + for (var item in itemsData['data']) { + originalHospitalItems!.add( + MyItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + userName: item['user'] != null ? item['user']['name'] : '', + // fromDate: item['transfers']['from_date'], + // toDate: item['transfers']['to_date'], + ), + ); + } + pageNumber += 1; + searchHospitalItems(''); + } + + Future getMyItemRequests() async { + String url = Url.getMyItemRequests; + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var itemsData = json.decode(response.body); + + originalMyItemsRequests = []; + + for (var item in itemsData['data']) { + originalMyItemsRequests!.add( + MyItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + ), + ); + } + } + + Future getHospitalItemRequests() async { + String url = Url.getHospitalItemRequests; + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var itemsData = json.decode(response.body); + + originalHospitalItemsRequests = []; + + for (var item in itemsData['data']) { + originalHospitalItemsRequests!.add( + MyItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + userName: item['user'] != null ? item['user']['name'] : '', + ), + ); + } + } + + Future transferItems(String itemId, String userId) async { + var response = await http.post( + Uri.parse(Url.transferItems(itemId)), + body: json.encode( + { + 'user_id': userId, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + var itemData = json.decode(response.body); + print(itemData); + } + + Future verifyItemRequests(String id, String value) async { + var response = await http.post( + Uri.parse(Url.verifyItemRequests(id, value)), + body: json.encode({'status': value}), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + var itemData = json.decode(response.body); + + try { + if (itemData['data']['transfers']['status'] == 'approved') { + return true; + } else { + return false; + } + } catch (e) { + return false; + } + } +} diff --git a/lib/providers/my_packages.dart b/lib/providers/my_packages.dart new file mode 100644 index 0000000..d83c007 --- /dev/null +++ b/lib/providers/my_packages.dart @@ -0,0 +1,245 @@ +import 'dart:convert'; + +import 'package:cssd/models/my_package_model.dart'; +import 'package:flutter/foundation.dart'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import 'package:http/http.dart' as http; + +class MyPackageProvider extends ChangeNotifier { + String searchBoxValue = ''; + bool filterOn = false; + List? myPackages; + List? hospitalPackages; + + List? originalMyPackages; + List? originalHospitalPackages; + + List? originalMyPackagesRequests; + List? originalHospitalPackagesRequests; + + MyPackageFilterObject? filters = MyPackageFilterObject( + id: '', + name: '', + udi: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + void searchMyPackages(String value) { + myPackages = []; + searchBoxValue = value; + originalMyPackages!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + myPackages!.add(result); + } + }); + notifyListeners(); + } + + void searchHospitalPackages(String value) { + hospitalPackages = []; + searchBoxValue = value; + originalHospitalPackages!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + hospitalPackages!.add(result); + } + }); + notifyListeners(); + } + + void setFilters( + id, + name, + udi, + ) { + pageNumber = 1; + filters = MyPackageFilterObject( + id: id, + name: name, + udi: udi, + ); + if (filters!.id == '' && filters!.name == '' && filters!.udi == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + Future getMyPackages() async { + String url = Url.getMyItems(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&package_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var packagesData = json.decode(response.body); + + if (pageNumber == 1) { + originalMyPackages = []; + } + + for (var package in packagesData['data']) { + originalMyPackages!.add( + MyPackageResultObject( + name: package['name'], + id: package['id'].toString(), + fromDate: package['transfers']['from_date'], + toDate: package['transfers']['to_date'], + ), + ); + } + pageNumber += 1; + searchMyPackages(''); + } + + Future getHospitalPackages() async { + String url = Url.getHospitalItems(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&package_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var packagesData = json.decode(response.body); + + if (pageNumber == 1) { + originalHospitalPackages = []; + } + + for (var package in packagesData['data']) { + originalHospitalPackages!.add( + MyPackageResultObject( + name: package['name'], + id: package['id'].toString(), + userName: package['user'] != null ? package['user']['name'] : '', + fromDate: package['transfers']['from_date'], + toDate: package['transfers']['to_date'], + ), + ); + } + pageNumber += 1; + searchHospitalPackages(''); + } + + Future getMyPackageRequests() async { + String url = Url.getMyItemRequests; + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var packagesData = json.decode(response.body); + + originalMyPackagesRequests = []; + + for (var package in packagesData['data']) { + originalMyPackagesRequests!.add( + MyPackageResultObject( + name: package['name'], + id: package['id'].toString(), + ), + ); + } + } + + Future getHospitalPackageRequests() async { + String url = Url.getHospitalItemRequests; + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var packagesData = json.decode(response.body); + + originalHospitalPackagesRequests = []; + + for (var package in packagesData['data']) { + originalHospitalPackagesRequests!.add( + MyPackageResultObject( + name: package['name'], + id: package['id'].toString(), + userName: package['user'] != null ? package['user']['name'] : '', + ), + ); + } + } + + Future transferPackage(String packageId, String userId) async { + var response = await http.post( + Uri.parse(Url.transferItems(packageId)), + body: json.encode( + { + 'user_id': userId, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + var packageData = json.decode(response.body); + print(packageData); + } + + Future verifyPackageRequests(String id, String value) async { + var response = await http.post( + Uri.parse(Url.verifyItemRequests(id, value)), + body: json.encode({'status': value}), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + var packageData = json.decode(response.body); + + try { + if (packageData['data']['transfers']['status'] == 'approved') { + return true; + } else { + return false; + } + } catch (e) { + return false; + } + } +} diff --git a/lib/providers/packages.dart b/lib/providers/packages.dart new file mode 100644 index 0000000..245cc1b --- /dev/null +++ b/lib/providers/packages.dart @@ -0,0 +1,295 @@ +import 'dart:convert'; + +import 'package:cssd/models/package_model.dart'; + +import '../config/urls.dart'; +import '../config/user.dart'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; + +class PackageProvider extends ChangeNotifier { + List itemVals = []; + List itemValues = []; + String initialItemValue = ''; + int curItemVal = 1; + + resetItemVals() { + itemVals = []; + itemValues = []; + initialItemValue = ''; + curItemVal = 1; + // notifyListeners(); + } + + addItemVal() { + curItemVal += 1; + TextEditingController lbl = new TextEditingController(); + lbl.text = initialItemValue; + itemValues.add(lbl); + notifyListeners(); + } + + changeItemVal(String value, int index) { + itemValues[index].text = value; + notifyListeners(); + } + + String searchBoxValue = ''; + bool filterOn = false; + List? items; + List? originalItems; + + PackageDetailObject? result; + PackageFilterObject? filters = PackageFilterObject( + id: '', + hospital: '', + name: '', + udi: '', + ); + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + Future>> getHospitalsFilters() async { + var response = await http.get( + Uri.parse(Url.filterItems), + headers: { + 'Authorization': User.token, + }, + ); + List> result = []; + var filterData = json.decode(response.body); + for (var hospital in filterData['data']['MedicalCenters']) { + result.add({ + 'name': hospital['name'].toString(), + 'id': hospital['id'].toString() + }); + } + return result; + } + + Future> getItemFilters() async { + var response = await http.get( + Uri.parse(Url.itemItems), + headers: { + 'Authorization': User.token, + }, + ); + List result = []; + var filterData = json.decode(response.body); + for (var item in filterData['data']) { + result.add(item['id'].toString()); + } + itemVals = result; + initialItemValue = itemVals[0]; + TextEditingController newLbl = new TextEditingController(); + newLbl.text = initialItemValue; + itemValues.add(newLbl); + notifyListeners(); + return result; + } + + Future createPackageResult( + name, + udi, + items, + note, + ) async { + List> items = []; + for (var item in items) { + items.add({'name': '', 'id': item}); + } + var response = await http.post( + Uri.parse(Url.createPackageResult), + body: json.encode( + { + 'note': note, + 'items': items, + 'name': name, + 'udi': udi, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + + print(response.body); + } + + Future updatePackageResult( + id, + name, + udi, + description, + items, + ) async { + // List> items = []; + // for (var item in items) { + // items.add({'name': '', 'id': item}); + // } + print({ + 'note': description, + 'name': name, + 'udi': udi, + 'items': items, + }); + var response = await http.put(Uri.parse(Url.updatePackageResult(id)), + body: json.encode( + { + 'name': name, + 'udi': udi, + 'note': description, + 'items': items, + }, + ), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }); + + print(response.body); + } + + Future removePackages(String id) async { + var response = await http.post(Uri.parse(Url.removePackages(id)), body: { + '_method': 'delete' + }, headers: { + 'Authorization': User.token, + }); + + if (response.statusCode == 200) { + items!.removeWhere((item) { + return item.id.toString() == id; + }); + } + + notifyListeners(); + return true; + } + + void setFilters( + id, + name, + hospital, + udi, + ) { + pageNumber = 1; + filters = PackageFilterObject( + id: id, + name: name, + hospital: hospital, + udi: udi, + ); + if (filters!.id == '' && + filters!.name == '' && + filters!.hospital == '' && + filters!.udi != '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + void search(String value) { + items = []; + searchBoxValue = value; + originalItems!.forEach((result) { + if (result.id.toString().contains(searchBoxValue)) { + items!.add(result); + } + }); + notifyListeners(); + } + + Future getPackageResults() async { + String url = Url.packageResults(pageNumber); + if (filterOn) { + if (filters!.id != '') { + url += '&package_id=${filters!.id}'; + } + if (filters!.name != '') { + url += '&name=${filters!.name}'; + } + if (filters!.hospital != '') { + url += '&medical_center_id=${filters!.hospital}'; + } + if (filters!.udi != '') { + url += '&udi=${filters!.udi}'; + } + } + var response = await http.get( + Uri.parse(url), + headers: { + 'Authorization': User.token, + }, + ); + + var testResultData = json.decode(response.body); + if (pageNumber == 1) { + originalItems = []; + } + + for (var item in testResultData['data']['data']) { + originalItems!.add( + PackageResultObject( + createdAt: item['created_at'], + id: item['id'].toString(), + name: item['name'], + ), + ); + } + pageNumber += 1; + search(''); + } + + Future showPackageResult(String id) async { + var response = + await http.get(Uri.parse(Url.getPackageResult(id)), headers: { + 'Authorization': User.token, + }); + if (response.statusCode != 200) { + return PackageDetailObject( + id: 'null', + name: 'null', + description: 'null', + createDate: '2020-07-14 13:50:42', + hospitalName: 'null', + udi: 'null', + items: [], + ); + } + var data = json.decode(response.body)['data']; + List itemsList = []; + for (var item in data['items']) { + itemsList.add(item['id'].toString()); + } + print(data); + result = PackageDetailObject( + id: data['id'].toString(), + name: data['name'] != null ? data['name'] : '', + description: data['note'] != null ? data['note'] : '', + udi: data['udi'] != null ? data['udi'] : '', + createDate: data['created_at'] != null ? data['created_at'] : '', + hospitalName: + data['user'] != null ? data['user']['medical_center']['name'] : '', + items: itemsList, + ); + return result!; + } +} diff --git a/lib/providers/test_result_old.dart b/lib/providers/test_result_old.dart deleted file mode 100644 index 7be764c..0000000 --- a/lib/providers/test_result_old.dart +++ /dev/null @@ -1,38 +0,0 @@ -import '../config/urls.dart'; -import '../config/user.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; - -class TestResult with ChangeNotifier{ - final int id; - final String name; - final String date; - final String deviceId; - String result; - - bool get isVerified { - return result == 'Verified'; - } - - TestResult({ - this.id, - this.name, - this.date, - this.deviceId, - this.result, - }); - - Future toggleVerify() async { - final response = await http.post( - Uri.parse(Url.verifyTest(id)), headers: { - 'Authorization': User.token - } - ); - - if (response.statusCode == 200) { - result = result == 'Verified' ? 'NotVerified' : 'Verified'; - notifyListeners(); - } - - } -} diff --git a/lib/providers/test_results.dart b/lib/providers/test_results.dart index d4bd42a..e5cf297 100644 --- a/lib/providers/test_results.dart +++ b/lib/providers/test_results.dart @@ -1,375 +1,373 @@ -import 'dart:convert'; -import 'dart:typed_data'; -// import 'dart:typed_data'; -import 'package:dio/dio.dart' as di; - -import 'package:cssd/config/urls.dart'; -import 'package:cssd/config/user.dart'; -import 'package:cssd/models/test_result_models.dart'; -import 'package:file_picker/file_picker.dart'; -// import 'package:cssd/providers/test_result.dart'; -import 'package:flutter/material.dart'; -import 'package:http/http.dart' as http; -import 'package:random_string/random_string.dart'; -// import 'package:multi_image_picker/multi_image_picker.dart'; - -class TestResultsProvider with ChangeNotifier { - List catchImages = []; - List images = []; - - setImages() async { - images = []; - for (var image in catchImages) { - var result = image.bytes; - // final batchId = randomString(10); - // addImage(batchId, result, image.path); - images.add(result.buffer - .asUint8List(result.offsetInBytes, result.lengthInBytes)); - } - notifyListeners(); - } - - setCatchImages(List images) { - catchImages = images; - notifyListeners(); - } - - removeImage(int index) { - catchImages.removeAt(index); - notifyListeners(); - } - - // Future addImage() async { - // Map imgs = {}; - // var counter = 0; - // for (var image in images) { - // imgs[counter.toString()] = - // di.MultipartFile.fromBytes(image, filename: 'test$counter.jpg'); - // counter += 1; - // } - - // return 'True'; - // } - - String searchBoxValue = ''; - bool filterOn = false; - List items; - List originalItems; - // List items = []; - Map result; - - TestResultFilterObject _filters = TestResultFilterObject( - id: '', - labelID: '', - userName: '', - hospital: '', - testType: '', - fDate: '', - uDate: '', - ); - - void resetFilters() { - filterOn = false; - _filters = TestResultFilterObject( - id: '', - labelID: '', - userName: '', - hospital: '', - testType: '', - fDate: '', - uDate: '', - ); - } - - int pageNumber = 1; - void resetPageNumber() => pageNumber = 1; - bool isloading = false; - void resetLoading() { - isloading = false; - notifyListeners(); - } - - void setLoading() { - isloading = true; - // notifyListeners(); - } - - TestResultFilterObject get filters { - return _filters; - } - - void search(String value) { - print(value); - items = []; - searchBoxValue = value; - originalItems.forEach((result) { - if (result.name.toString().contains(searchBoxValue)) { - items.add(result); - } - }); - notifyListeners(); - } - - void setFilters(id, labelId, username, testType, hospital, fDate, uDate) { - pageNumber = 1; - _filters = TestResultFilterObject( - id: id, - labelID: labelId, - userName: username, - hospital: hospital, - testType: testType, - fDate: fDate, - uDate: uDate); - if (_filters.id == '' && - _filters.labelID == '' && - _filters.testType == '' && - _filters.hospital == '' && - _filters.userName == '' && - _filters.fDate == '' && - _filters.uDate == '') { - filterOn = false; - } else { - filterOn = true; - } - notifyListeners(); - } - - Future>> getFilterItems() async { - var response = await http.get( - Uri.parse(Url.filterItems), - headers: { - 'Authorization': User.token, - }, - ); - List> result = []; - Map hospitals = {}; - Map testTypes = {}; - - var filterDatas = json.decode(response.body); - for (var hospital in filterDatas['data']['MedicalCenters']) { - hospitals.addAll({hospital['name']: hospital['id'].toString()}); - } - result.add(hospitals); - for (var testType in filterDatas['data']['TestTypes']) { - testTypes.addAll({testType['name']: testType['id'].toString()}); - } - result.add(testTypes); - - return result; - } - - Future getTestResults() async { - String url = Url.testResults(pageNumber); - if (filterOn) { - items = []; - if (_filters.id != '') { - url += '&device_id=${_filters.id}'; - } - if (_filters.labelID != '') { - url += '&device_label=${_filters.labelID}'; - } - if (_filters.hospital != '') { - url += '&medicalCenter_id=${_filters.hospital}'; - } - if (_filters.testType != '') { - url += '&testType_id=${_filters.testType}'; - } - if (_filters.userName != '') { - url += '&user_name=${_filters.userName}'; - } - if (_filters.fDate != '') { - url += '&fromPicker=${_filters.fDate}'; - } - if (_filters.uDate != '') { - url += '&upToPicker=${_filters.uDate}'; - } - print(url); - } - //'device_id=3526&testType_id=107&medicalCenter_id=2&user_name=erfan&fromPicker=2020-05-12&upToPicker=2020-05-19&device_label=Instrument%20ID&page=1' - var response = await http.get( - Uri.parse(url), - headers: { - 'Authorization': User.token, - // 'X-Requested-With': 'XMLHttpRequest', - }, - ); - - var testResultData = json.decode(response.body); - - if (pageNumber == 1) { - originalItems = []; - items = []; - } - for (var item in testResultData['data']['data']) { - print(item); - originalItems.add( - TestResultObject( - id: item['id'].toString(), - name: item['test_type'] != null ? item['test_type']['name'] : '', - deviceId: item['device_id'].toString(), - result: item['result'] == 'Accept' ? 'Accepted' : 'Not Accepted', - date: item['created_at'].toString().substring(0, 10), - hospital: item['user']['medical_center']['name'], - verified: item['verified'].toString(), - ), - ); - } - pageNumber += 1; - search(''); - notifyListeners(); - } - - static Future updateTestResult(String id, values) async { - var response = await http.post( - Uri.parse(Url.updateTestResult(id)), - body: json.encode(values), - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - "Content-Type": "application/json", - "Accept": "application/json" - }, - ); - print(response.body); - } - - Future addImage(String batchId, dynamic file, String fileName) async { - var imageListInt = file.cast(); - var dio = new di.Dio(); - dio.options.headers = { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - 'Content-Type': 'application/json', - }; - di.FormData formData = new di.FormData.fromMap({ - "batch_id": batchId, - 'model_type': 'TestResult', - "file": di.MultipartFile.fromBytes(imageListInt, filename: fileName) - }); - - await dio.post( - Url.addImage, - data: formData, - ); - // print(response.statusCode); - // print(response.statusMessage); - // print(response.data); - - return 'Added'; - } - - Future createTestResult(values, batchId) async { - final batchId = randomString(10); - - for (var image in catchImages) { - await addImage(batchId, image.bytes, image.path); - } - dynamic vals = values; - vals['file_batch_id'] = batchId; - - // int counter = 0; - // if (images.length != 0) { - // for (var image in images) { - // vals['imgs'][counter.toString()] = base64Encode( - // image, - // ); - // counter += 1; - // } - // } - - var dio = new di.Dio(); - dio.options.headers = { - 'Authorization': User.token, - // 'X-Requested-With': 'XMLHttpRequest' - }; - var response = await dio.post( - Url.createTestResult, - data: vals, - ); - print(response.data); - if (response.data['status'] == 'Success') { - catchImages = []; - return 'done'; - } else { - return 'error'; - } - // var response = await http - // .post(Url.createTestResult, body: json.encode(values), headers: { - // 'Authorization': User.token, - // 'X-Requested-With': 'XMLHttpRequest', - // "Content-Type": "application/json", - // "Accept": "application/json" - // }); - - // print(response.body); - } - - Future> showTestResult(String id) async { - var response = await http.get(Uri.parse(Url.getTestResult(id)), headers: { - 'Authorization': User.token, - }); - - var data = json.decode(response.body)['data']; - // print(data); - result = { - 'id': data['id'], - 'auto_cleave_id': data['inputs']['Autoclave ID'] != null - ? data['inputs']['Autoclave ID'] - : '', - 'test_code': data['test_type_id'] != null ? data['test_type_id'] : '', - 'date': data['created_at'] != null ? data['created_at'] : '', - 'accepted': originalItems - .firstWhere((element) => element.id == data['id'].toString()) - .result, //az api safheye asli estefade mishavad - 'description': - data['inputs']['Note'] != null ? data['inputs']['Note'] : '', - 'test_type_name': - data['test_type']['name'] != null ? data['test_type']['name'] : '', - 'hospital': originalItems - .firstWhere((element) => element.id == data['id'].toString()) - .hospital // az api safheye asli estefade mi shavad - }; - return result; - } - - Future removeTestResult(String id) async { - var response = await http.post(Uri.parse(Url.removeTestResult(id)), body: { - '_method': 'delete' - }, headers: { - 'Authorization': User.token, - }); - - if (response.statusCode == 200) { - items.removeWhere((item) { - return item.id.toString() == id; - }); - } - - notifyListeners(); - return true; - } - - Future changeVerification(String id, String value) async { - print(id); - print(value); - var response = await http.post( - Uri.parse(Url.testResultVerification(id, value)), - headers: { - 'Authorization': User.token, - 'X-Requested-With': 'XMLHttpRequest', - "Content-Type": "application/json", - "Accept": "application/json" - }, - ); - var testResultData = json.decode(response.body); - // print(response.body); - try { - if (testResultData['status'] == 'Success') { - return true; - } else { - return false; - } - } catch (e) {} - return false; - } -} +import 'dart:convert'; +import 'dart:typed_data'; +// import 'dart:typed_data'; +import 'package:dio/dio.dart' as di; + +import 'package:cssd/config/urls.dart'; +import 'package:cssd/config/user.dart'; +import 'package:cssd/models/test_result_models.dart'; +import 'package:file_picker/file_picker.dart'; +// import 'package:cssd/providers/test_result.dart'; +import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; +import 'package:random_string/random_string.dart'; +// import 'package:multi_image_picker/multi_image_picker.dart'; + +class TestResultsProvider with ChangeNotifier { + List catchImages = []; + List images = []; + String testType = ''; + String testCode = ''; + + setImages() async { + images = []; + for (var image in catchImages) { + var result = image.bytes; + // final batchId = randomString(10); + // addImage(batchId, result, image.path); + images.add(result!.buffer + .asUint8List(result.offsetInBytes, result.lengthInBytes)); + } + notifyListeners(); + } + + setCatchImages(List images) { + catchImages = images; + notifyListeners(); + } + + removeImage(int index) { + catchImages.removeAt(index); + notifyListeners(); + } + + // Future addImage() async { + // Map imgs = {}; + // var counter = 0; + // for (var image in images) { + // imgs[counter.toString()] = + // di.MultipartFile.fromBytes(image, filename: 'test$counter.jpg'); + // counter += 1; + // } + + // return 'True'; + // } + + String searchBoxValue = ''; + bool filterOn = false; + List? items; + List? originalItems; + Map? result; + + TestResultFilterObject _filters = TestResultFilterObject( + id: '', + labelID: '', + userName: '', + hospital: '', + testType: '', + fDate: '', + uDate: '', + ); + + void resetFilters() { + filterOn = false; + _filters = TestResultFilterObject( + id: '', + labelID: '', + userName: '', + hospital: '', + testType: '', + fDate: '', + uDate: '', + ); + } + + int pageNumber = 1; + void resetPageNumber() => pageNumber = 1; + bool isloading = false; + void resetLoading() { + isloading = false; + notifyListeners(); + } + + void setLoading() { + isloading = true; + // notifyListeners(); + } + + TestResultFilterObject get filters { + return _filters; + } + + void search(String value) { + print(value); + items = []; + searchBoxValue = value; + originalItems!.forEach((result) { + if (result.name.toString().contains(searchBoxValue)) { + items!.add(result); + } + }); + notifyListeners(); + } + + void setFilters(id, labelId, username, testType, hospital, fDate, uDate) { + pageNumber = 1; + _filters = TestResultFilterObject( + id: id, + labelID: labelId, + userName: username, + hospital: hospital, + testType: testType, + fDate: fDate, + uDate: uDate); + if (_filters.id == '' && + _filters.labelID == '' && + _filters.testType == '' && + _filters.hospital == '' && + _filters.userName == '' && + _filters.fDate == '' && + _filters.uDate == '') { + filterOn = false; + } else { + filterOn = true; + } + notifyListeners(); + } + + Future>> getFilterItems() async { + var response = await http.get( + Uri.parse(Url.filterItems), + headers: { + 'Authorization': User.token, + }, + ); + List> result = []; + Map hospitals = {}; + Map testTypes = {}; + + var filterDatas = json.decode(response.body); + for (var hospital in filterDatas['data']['MedicalCenters']) { + hospitals.addAll({hospital['name']: hospital['id'].toString()}); + } + result.add(hospitals); + for (var testType in filterDatas['data']['TestTypes']) { + testTypes.addAll({testType['name']: testType['id'].toString()}); + } + result.add(testTypes); + + return result; + } + + Future getTestResults() async { + String url = Url.testResults(pageNumber); + if (filterOn) { + items = []; + if (_filters.id != '') { + url += '&device_id=${_filters.id}'; + } + if (_filters.labelID != '') { + url += '&device_label=${_filters.labelID}'; + } + if (_filters.hospital != '') { + url += '&medicalCenter_id=${_filters.hospital}'; + } + if (_filters.testType != '') { + url += '&testType_id=${_filters.testType}'; + } + if (_filters.userName != '') { + url += '&user_name=${_filters.userName}'; + } + if (_filters.fDate != '') { + url += '&fromPicker=${_filters.fDate}'; + } + if (_filters.uDate != '') { + url += '&upToPicker=${_filters.uDate}'; + } + print(url); + } + //'device_id=3526&testType_id=107&medicalCenter_id=2&user_name=erfan&fromPicker=2020-05-12&upToPicker=2020-05-19&device_label=Instrument%20ID&page=1' + var response = await http.get( + Uri.parse(url), + headers: { + 'Authorization': User.token, + }, + ); + + var testResultData = json.decode(response.body); + if (pageNumber == 1) { + originalItems = []; + } + + for (var item in testResultData['data']['data']) { + originalItems!.add( + TestResultObject( + id: item['id'].toString(), + name: item['test_type'] != null ? item['test_type']['name'] : '', + deviceId: item['device_id'].toString(), + result: item['result'] == 'Accept' ? 'Accepted' : 'Not Accepted', + date: item['created_at'].toString().substring(0, 10), + hospital: item['user']['medical_center']['name'], + verified: item['verified'].toString(), + ), + ); + } + pageNumber += 1; + search(''); + notifyListeners(); + } + + static Future updateTestResult(String id, values) async { + var response = await http.post( + Uri.parse(Url.updateTestResult(id)), + body: json.encode(values), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + print(response.body); + } + + Future addImage(String batchId, dynamic file, String fileName) async { + var imageListInt = file.cast(); + var dio = new di.Dio(); + dio.options.headers = { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + 'Content-Type': 'application/json', + }; + di.FormData formData = new di.FormData.fromMap({ + "batch_id": batchId, + 'model_type': 'TestResult', + "file": di.MultipartFile.fromBytes(imageListInt, filename: fileName) + }); + + await dio.post( + Url.addImage, + data: formData, + ); + // print(response.statusCode); + // print(response.statusMessage); + // print(response.data); + + return 'Added'; + } + + Future createTestResult(values, batchId) async { + final batchId = randomString(10); + + for (var image in catchImages) { + await addImage(batchId, image.bytes, image.path!); + } + dynamic vals = values; + vals['file_batch_id'] = batchId; + + // int counter = 0; + // if (images.length != 0) { + // for (var image in images) { + // vals['imgs'][counter.toString()] = base64Encode( + // image, + // ); + // counter += 1; + // } + // } + + var dio = new di.Dio(); + dio.options.headers = { + 'Authorization': User.token, + // 'X-Requested-With': 'XMLHttpRequest' + }; + var response = await dio.post( + Url.createTestResult, + data: vals, + ); + print(response.data); + if (response.data['status'] == 'Success') { + catchImages = []; + return 'done'; + } else { + return 'error'; + } + // var response = await http + // .post(Url.createTestResult, body: json.encode(values), headers: { + // 'Authorization': User.token, + // 'X-Requested-With': 'XMLHttpRequest', + // "Content-Type": "application/json", + // "Accept": "application/json" + // }); + + // print(response.body); + } + + Future> showTestResult(String id) async { + var response = await http.get(Uri.parse(Url.getTestResult(id)), headers: { + 'Authorization': User.token, + }); + + var data = json.decode(response.body)['data']; + // print(data); + result = { + 'id': data['id'], + 'auto_cleave_id': data['inputs']['Autoclave ID'] != null + ? data['inputs']['Autoclave ID'] + : '', + 'test_code': data['test_type_id'] != null ? data['test_type_id'] : '', + 'date': data['created_at'] != null ? data['created_at'] : '', + 'accepted': originalItems! + .firstWhere((element) => element.id == data['id'].toString()) + .result, //az api safheye asli estefade mishavad + 'description': + data['inputs']['Note'] != null ? data['inputs']['Note'] : '', + 'test_type_name': + data['test_type']['name'] != null ? data['test_type']['name'] : '', + 'hospital': originalItems! + .firstWhere((element) => element.id == data['id'].toString()) + .hospital // az api safheye asli estefade mi shavad + }; + return result!; + } + + Future removeTestResult(String id) async { + var response = await http.post(Uri.parse(Url.removeTestResult(id)), body: { + '_method': 'delete' + }, headers: { + 'Authorization': User.token, + }); + + if (response.statusCode == 200) { + items!.removeWhere((item) { + return item.id.toString() == id; + }); + } + + notifyListeners(); + return true; + } + + Future changeVerification(String id, String value) async { + print(id); + print(value); + var response = await http.post( + Uri.parse(Url.testResultVerification(id, value)), + headers: { + 'Authorization': User.token, + 'X-Requested-With': 'XMLHttpRequest', + "Content-Type": "application/json", + "Accept": "application/json" + }, + ); + var testResultData = json.decode(response.body); + // print(response.body); + try { + if (testResultData['status'] == 'Success') { + return true; + } else { + return false; + } + } catch (e) {} + return false; + } +} diff --git a/lib/providers/users.dart b/lib/providers/users.dart new file mode 100644 index 0000000..b459f0c --- /dev/null +++ b/lib/providers/users.dart @@ -0,0 +1,85 @@ +import 'dart:convert'; + +import 'package:cssd/config/urls.dart'; +import 'package:cssd/config/user.dart'; +import 'package:cssd/models/users_model.dart'; +import 'package:flutter/foundation.dart'; + +import 'package:http/http.dart' as http; + +class UsersProvider extends ChangeNotifier { + String searchBoxValue = ''; + + List? usersBox; + List? originalUsersBox; + + String? medicalCenterId; + + int? selectedUserIndex; + + String? saveUserId; + + bool isLoading = false; + void resetLoading() { + isLoading = false; + notifyListeners(); + } + + void setLoading() { + isLoading = true; + } + + void selectUser(int index) { + selectedUserIndex = index; + notifyListeners(); + } + + void searchUsers(String value) { + usersBox = []; + searchBoxValue = value; + originalUsersBox!.forEach((result) { + if (result.id.toString().contains(searchBoxValue) || + result.userName.toString().contains(searchBoxValue)) { + usersBox!.add(result); + } + }); + notifyListeners(); + } + + Future getUsers(String medicalCenterId) async { + String url = Url.getUsers(medicalCenterId); + var response = await http.get( + Uri.parse(url), + headers: {'Authorization': User.token, "Accept": "application/json"}, + ); + + var usersData = json.decode(response.body); + + originalUsersBox = []; + + for (var user in usersData['data']['data']) { + originalUsersBox!.add( + Users( + userName: user['name'], + id: user['id'].toString(), + phoneNumber: user['cell_number'].toString(), + ), + ); + } + } + + Future getUserMedicalCenter() async { + final response = await http.get( + Uri.parse(Url.getUserInfo), + headers: {'Authorization': User.token}, + ); + if (response.statusCode == 200) { + var data = json.decode(response.body)['data']; + medicalCenterId = data['user']['medical_center_id'].toString(); + notifyListeners(); + return medicalCenterId; + } else { + return ''; + } + } +} diff --git a/lib/utils/scan.dart b/lib/utils/scan.dart new file mode 100644 index 0000000..0accaf6 --- /dev/null +++ b/lib/utils/scan.dart @@ -0,0 +1,26 @@ +import 'package:barcode_scan2/platform_wrapper.dart'; +import 'package:flutter/services.dart'; + +Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } + try { + var id = barcode.rawContent.contains('www.cssd-doc.com') + ? barcode.rawContent.split('/')[5] + : barcode.rawContent; + + return id; + } catch (_) { + return 'null'; + } + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } +} diff --git a/lib/widgets/CycleScreens/Add/add_label_box.dart b/lib/widgets/CycleScreens/Add/add_label_box.dart index d4ff237..efcb524 100644 --- a/lib/widgets/CycleScreens/Add/add_label_box.dart +++ b/lib/widgets/CycleScreens/Add/add_label_box.dart @@ -1,251 +1,212 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/cycles.dart'; - -class CycleAddLabelBox extends StatelessWidget { - const CycleAddLabelBox({ - Key key, - @required double deviceBlockSize, - @required this.labelValues, - @required this.labelVals, - @required this.initialLabelValue, - @required this.index, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController labelValues; - final List labelVals; - final String initialLabelValue; - final int index; - - @override - Widget build(BuildContext context) { - return Container( - // color: Colors.blue, - height: 150, - child: Stack( - children: [ - Container( - padding: EdgeInsets.only( - right: 10, - bottom: 30, - left: 10, - top: 10, - ), - decoration: BoxDecoration( - border: Border( - left: BorderSide(color: Colors.black, width: 2), - right: BorderSide(color: Colors.grey), - bottom: BorderSide(color: Colors.grey), - top: BorderSide(color: Colors.grey), - ), - ), - height: 120, - child: Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 7 * _deviceBlockSize, - ), - SizedBox( - width: 4 * _deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - SizedBox( - width: _deviceBlockSize, - ), - Text( - 'Select Labels Included', - style: TextStyle( - fontSize: 3.5 * _deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w100, - ), - ), - ], - ), - Row( - children: [ - Container( - width: MediaQuery.of(context).size.width - - (40 * _deviceBlockSize), - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: _deviceBlockSize, - ), - border: InputBorder.none, - ), - iconSize: 7 * _deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric( - horizontal: 0), - child: TextFormField( - controller: labelValues, - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - bottom: 12, - ), - isDense: true, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - isDense: true, - items: labelVals.map((val) { - return new DropdownMenuItem( - value: val, - child: Container( - child: Text( - val, - style: TextStyle( - fontSize: 4 * _deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - Provider.of(context, - listen: false) - .changeLabelVal(val, index); - // setState(() { - // labelValues[index] - // .text = val; - // }); - }, - ), - ), - Spacer(), - InkWell( - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - Provider.of(context, - listen: false) - .changeLabelVal(result, index); - // Navigator.of(context).pushNamed( - // CycleDetailScreen.route, - // arguments: result, - // ); - } - }, - ); - }, - child: Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 5 * _deviceBlockSize, - color: Colors.white, - ), - ), - ) - ], - ), - ]), - ), - ], - ), - ), - ), - Positioned( - bottom: 15, - right: 0, - child: InkWell( - onTap: () { - Provider.of(context).addLabelVal(); - // setState( - // () { - // curLabelVal += 1; - // TextEditingController lbl = - // new TextEditingController(); - // lbl.text = initialLabelValue; - // labelValues.add(lbl); - // }, - // ); - }, - child: Container( - padding: EdgeInsets.all(3), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.deepOrange, - ), - child: Icon( - Icons.add, - color: Colors.white, - ), - ), - ), - ), - ], - ), - ); - } - - Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } - } -} +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/cycles.dart'; + +class AddLabelBox extends StatelessWidget { + const AddLabelBox({ + Key? key, + required double deviceBlockSize, + required this.values, + required this.vals, + required this.initialLabelValue, + required this.index, + required this.text, + this.iconColor, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController values; + final List vals; + final String initialLabelValue; + final int index; + final String text; + final Color? iconColor; + + @override + Widget build(BuildContext context) { + return Container( + height: 150, + child: Stack( + children: [ + Container( + padding: EdgeInsets.only( + right: 10, + bottom: 25, + left: 10, + top: 10, + ), + decoration: BoxDecoration( + border: Border( + left: BorderSide(color: Colors.black, width: 2), + right: BorderSide(color: Colors.grey), + bottom: BorderSide(color: Colors.grey), + top: BorderSide(color: Colors.grey), + ), + ), + height: 120, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * _deviceBlockSize, + ), + SizedBox( + width: 4 * _deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Text( + text, + style: TextStyle( + fontSize: 3.5 * _deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, + ), + ), + ], + ), + Row( + children: [ + Container( + width: MediaQuery.of(context).size.width - + (40 * _deviceBlockSize), + // height: 30, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + left: _deviceBlockSize, + ), + border: InputBorder.none, + ), + iconSize: 7 * _deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric( + horizontal: 0), + child: TextFormField( + controller: values, + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + bottom: 12, + ), + isDense: true, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + isDense: true, + items: vals.map((val) { + return new DropdownMenuItem( + value: val, + child: Container( + child: Text( + val, + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + Provider.of(context, + listen: false) + .changeLabelVal(val!, index); + }, + ), + ), + Spacer(), + InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + Provider.of(context, + listen: false) + .changeLabelVal(result, index); + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ) + ], + ), + ]), + ), + ], + ), + ), + ), + Positioned( + bottom: 15, + right: 0, + child: InkWell( + onTap: () { + Provider.of(context).addLabelVal(); + }, + child: Container( + padding: EdgeInsets.all(3), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: iconColor, + ), + child: Icon( + Icons.add, + color: Colors.white, + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Add/cycle_update_button.dart b/lib/widgets/CycleScreens/Add/cycle_update_button.dart new file mode 100644 index 0000000..0212211 --- /dev/null +++ b/lib/widgets/CycleScreens/Add/cycle_update_button.dart @@ -0,0 +1,94 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/cycles.dart'; + +import '../../../config/routes.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class CycleUpdateButton extends StatelessWidget { + const CycleUpdateButton({ + Key? key, + required GlobalKey form, + required this.id, + required this.descriptionCTRL, + required this.cycleNumberCTRL, + required this.dateCTRL, + // required this.labelValue, + required this.striizerIdCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final String id; + final TextEditingController descriptionCTRL; + final TextEditingController cycleNumberCTRL; + final TextEditingController dateCTRL; + // final TextEditingController labelValue; + final TextEditingController striizerIdCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + // List labels = []; + // for (TextEditingController label in labelValue) { + // labels.add(label.text); + // } + Provider.of(context, listen: false).updateCycleResult( + id, + striizerIdCTRL.text, + cycleNumberCTRL.text, + // labelValue.text, + dateCTRL.text, + descriptionCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Cycle updated.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPink, kPinkSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Update', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Add/date_picker.dart b/lib/widgets/CycleScreens/Add/date_picker.dart index 45857f8..f21e877 100644 --- a/lib/widgets/CycleScreens/Add/date_picker.dart +++ b/lib/widgets/CycleScreens/Add/date_picker.dart @@ -1,77 +1,79 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart'; -class CycleAddDatePicker extends StatefulWidget { - const CycleAddDatePicker({ - Key key, - @required this.dateCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, super(key: key); - - final TextEditingController dateCTRL; - final double _deviceBlockSize; - - @override - _CycleAddDatePickerState createState() => _CycleAddDatePickerState(); -} - -class _CycleAddDatePickerState extends State { - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () async { - var res = await showDatePicker( - context: context, - initialDate: DateTime.now(), - firstDate: DateTime(2010, 1), - lastDate: DateTime(2101), - ); - if (res != null) { - // dateTimeFrom = res; - setState( - () { - widget.dateCTRL.text = DateFormat('y-M-d').format(res); - // dateValue = DateFormat('y-M-d').format( - // dateTimeFrom, - // ); // baraye tavize makane gharar giri baraye api - }, - ); - } - }, - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: TextField( - enabled: false, - controller: widget.dateCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.alignLeft, - size: 7 * widget._deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * widget._deviceBlockSize, - ), - labelText: 'Date', - isDense: true, - contentPadding: EdgeInsets.only( - bottom: 7, - right: 3, - left: 3, - ), - // border: InputBorder.none, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - Icon(FontAwesomeIcons.angleDown) - ], - ), - ); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; + +class CycleAddDatePicker extends StatefulWidget { + const CycleAddDatePicker({ + Key? key, + required this.dateCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController dateCTRL; + final double _deviceBlockSize; + + @override + _CycleAddDatePickerState createState() => _CycleAddDatePickerState(); +} + +class _CycleAddDatePickerState extends State { + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () async { + var res = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime(2010, 1), + lastDate: DateTime(2101), + ); + if (res != null) { + // dateTimeFrom = res; + setState( + () { + widget.dateCTRL.text = DateFormat('y-M-d').format(res); + // dateValue = DateFormat('y-M-d').format( + // dateTimeFrom, + // ); // baraye tavize makane gharar giri baraye api + }, + ); + } + }, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: TextField( + enabled: false, + controller: widget.dateCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.alignLeft, + size: 7 * widget._deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * widget._deviceBlockSize, + ), + labelText: 'Date', + isDense: true, + contentPadding: EdgeInsets.only( + bottom: 7, + right: 3, + left: 3, + ), + // border: InputBorder.none, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + Icon(FontAwesomeIcons.angleDown) + ], + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Add/save_button.dart b/lib/widgets/CycleScreens/Add/save_button.dart index 60a5c72..573fbf2 100644 --- a/lib/widgets/CycleScreens/Add/save_button.dart +++ b/lib/widgets/CycleScreens/Add/save_button.dart @@ -1,91 +1,92 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/cycles.dart'; - -class CycleAddSaveButton extends StatelessWidget { - const CycleAddSaveButton({ - Key key, - @required GlobalKey form, - @required this.labelValues, - @required this.cycleNumberCTRL, - @required this.dateValue, - @required this.descriptionCTRL, - @required this.striizerIdCTRL, - @required double deviceBlockSize, - }) : _form = form, - _deviceBlockSize = deviceBlockSize, - super(key: key); - - final GlobalKey _form; - final List labelValues; - final TextEditingController cycleNumberCTRL; - final String dateValue; - final TextEditingController descriptionCTRL; - final TextEditingController striizerIdCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - - List labels = []; - for (TextEditingController label in labelValues) { - labels.add(label.text); - } - Provider.of(context).createCycleResult( - cycleNumberCTRL.text, - dateValue, - labels, - descriptionCTRL.text, - striizerIdCTRL.text, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Cycle added.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((_) { - Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen); - }); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.red, Colors.orange], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'SAVE', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../providers/cycles.dart'; + +class CycleAddSaveButton extends StatelessWidget { + const CycleAddSaveButton({ + Key? key, + required GlobalKey form, + required this.labelValues, + required this.cycleNumberCTRL, + required this.dateValue, + required this.descriptionCTRL, + required this.striizerIdCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final List labelValues; + final TextEditingController cycleNumberCTRL; + final String dateValue; + final TextEditingController descriptionCTRL; + final TextEditingController striizerIdCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + + List labels = []; + for (TextEditingController label in labelValues) { + labels.add(label.text); + } + Provider.of(context, listen: false).createCycleResult( + cycleNumberCTRL.text, + dateValue, + labels, + descriptionCTRL.text, + striizerIdCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Cycle added.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPink, kPinkSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Save', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Details/datas_box.dart b/lib/widgets/CycleScreens/Details/datas_box.dart index e6a62ec..d5e9cb3 100644 --- a/lib/widgets/CycleScreens/Details/datas_box.dart +++ b/lib/widgets/CycleScreens/Details/datas_box.dart @@ -1,291 +1,296 @@ -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../../models/cycles_models.dart'; - -class CycleDetailsDataBox extends StatelessWidget { - const CycleDetailsDataBox({ - Key key, - @required this.datas, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final CycleDetailObject datas; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - SizedBox( - height: 10, - ), - Text( - 'CYCLE DETAILS', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - SizedBox( - height: 10, - ), - Container( - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - color: Color.fromRGBO(235, 235, 235, 1), - border: Border( - left: BorderSide( - color: Colors.black54, - width: 2, - ), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - DateFormat.yMMMd().format( - DateTime.parse( - datas.createDate, - ), - ), - style: TextStyle( - color: Colors.red, - ), - ), - Divider(), - Text( - 'ID: ${datas.id}', - style: TextStyle( - color: Colors.red, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 30, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Sterilizer ID', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.sterileId.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Cycle Number', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.cycleNumber.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Date', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - DateFormat('d-M-y').format( - DateTime.parse( - datas.date, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Description', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.description.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Hospital Name', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.hospitalName, - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 30, - ), - Text( - 'LABELS INCLUDED', - style: TextStyle( - color: Colors.orange, - letterSpacing: 3, - fontWeight: FontWeight.w700, - fontSize: 4.5 * _deviceBlockSize, - ), - ), - Container( - width: double.infinity, - padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - border: Border.all( - color: Colors.grey, - ), - ), - child: ListView.separated( - shrinkWrap: true, - itemBuilder: (ctx, index) => RichText( - text: TextSpan( - text: 'Label ID ', - style: TextStyle( - color: Colors.grey, - fontFamily: 'montserrat', - ), - // style: DefaultTextStyle.of(context).style, - children: [ - TextSpan( - text: datas.labels[index], - style: TextStyle( - fontWeight: FontWeight.bold, - color: Colors.orange, - ), - ), - ], - ), - ), - separatorBuilder: (ctx, index) => Divider(), - itemCount: datas.labels.length, - ), - ), - SizedBox( - height: 50, - ) - ], - ), - ), - SizedBox(height: 20,), - InkWell( - onTap: () async=> await launch( - 'https://cssd-doc.com/Show/Cycle/${datas.id.toString()}', - // forceSafariVC: true, - // forceWebView: true, - // headers: {'my_header_key': 'my_header_value'}, - // child: Text('Show Full Details'), - ), - child: Container( - padding: EdgeInsets.symmetric(vertical: 20), - width: double.infinity, - decoration: BoxDecoration( - color: Color.fromRGBO(230, 230, 230, 1), - borderRadius: BorderRadius.circular(25), - ), - child: Center( - child: Text( - 'Show More Details', - style: TextStyle(fontWeight: FontWeight.w700), - ), - ), - ), - ), - SizedBox(height: 30,) - ], - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../../models/cycles_models.dart'; + +class CycleDetailsDataBox extends StatelessWidget { + const CycleDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final CycleDetailObject datas; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Cycle Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kPink, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + color: kPink, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kPink, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Sterilizer ID', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.sterileId.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Cycle Number', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.cycleNumber.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas.date, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.description.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospitalName, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 30, + ), + Text( + 'Labels included', + style: TextStyle( + color: kPink, + letterSpacing: 3, + fontWeight: FontWeight.w700, + fontSize: 4.5 * _deviceBlockSize, + ), + ), + Container( + width: double.infinity, + padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + border: Border.all( + color: Colors.grey, + ), + ), + child: ListView.separated( + shrinkWrap: true, + itemBuilder: (ctx, index) => RichText( + text: TextSpan( + text: 'Label ID ', + style: TextStyle( + color: Colors.grey, + fontFamily: 'montserrat', + ), + // style: DefaultTextStyle.of(context).style, + children: [ + TextSpan( + text: datas.labels[index], + style: TextStyle( + fontWeight: FontWeight.bold, + color: kPink, + ), + ), + ], + ), + ), + separatorBuilder: (ctx, index) => Divider(), + itemCount: datas.labels.length, + ), + ), + SizedBox( + height: 50, + ) + ], + ), + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/Cycle/${datas.id.toString()}', + // forceSafariVC: true, + // forceWebView: true, + // headers: {'my_header_key': 'my_header_value'}, + // child: Text('Show Full Details'), + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ), + SizedBox( + height: 30, + ) + ], + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Filter/date_picker.dart b/lib/widgets/CycleScreens/Filter/date_picker.dart index 641bf22..a0c5670 100644 --- a/lib/widgets/CycleScreens/Filter/date_picker.dart +++ b/lib/widgets/CycleScreens/Filter/date_picker.dart @@ -1,85 +1,86 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart'; -class CycleFilterDatePicker extends StatefulWidget { - const CycleFilterDatePicker({ - Key key, - @required this.dateCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final TextEditingController dateCTRL; - final double _deviceBlockSize; - - @override - _CycleFilterDatePickerState createState() => _CycleFilterDatePickerState(); -} - -class _CycleFilterDatePickerState extends State { - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () async { - var res = await showDatePicker( - context: context, - initialDate: DateTime.now(), - firstDate: DateTime(2010, 1), - lastDate: DateTime(2101), - ); - if (res != null) { - // dateTimeFrom = res; - setState( - () { - widget.dateCTRL.text = DateFormat('y-M-d').format(res); - // dateValue = DateFormat('y-M-d').format( - // dateTimeFrom, - // ); // baraye tavize makane gharar giri baraye api - }, - ); - } - }, - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: TextField( - enabled: false, - controller: widget.dateCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.calendarAlt, - size: 7 * widget._deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * widget._deviceBlockSize, - ), - labelText: 'Date', - isDense: true, - contentPadding: EdgeInsets.only( - bottom: 5, - left: 2, - ), - // border: InputBorder.none, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - Icon(FontAwesomeIcons.angleDown) - ], - ), - // Divider( - // color: Colors.grey, - // ) - ], - ), - ); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; + +class CycleFilterDatePicker extends StatefulWidget { + const CycleFilterDatePicker({ + Key? key, + required this.dateCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController dateCTRL; + final double _deviceBlockSize; + + @override + _CycleFilterDatePickerState createState() => _CycleFilterDatePickerState(); +} + +class _CycleFilterDatePickerState extends State { + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () async { + var res = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime(2010, 1), + lastDate: DateTime(2101), + ); + if (res != null) { + // dateTimeFrom = res; + setState( + () { + widget.dateCTRL.text = DateFormat('y-M-d').format(res); + // dateValue = DateFormat('y-M-d').format( + // dateTimeFrom, + // ); // baraye tavize makane gharar giri baraye api + }, + ); + } + }, + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: TextField( + enabled: false, + controller: widget.dateCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.calendarAlt, + size: 7 * widget._deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * widget._deviceBlockSize, + ), + labelText: 'Date', + isDense: true, + contentPadding: EdgeInsets.only( + bottom: 5, + left: 2, + ), + // border: InputBorder.none, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + Icon(FontAwesomeIcons.angleDown) + ], + ), + // Divider( + // color: Colors.grey, + // ) + ], + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Filter/save_button.dart b/lib/widgets/CycleScreens/Filter/save_button.dart index c6bb674..da628c5 100644 --- a/lib/widgets/CycleScreens/Filter/save_button.dart +++ b/lib/widgets/CycleScreens/Filter/save_button.dart @@ -1,90 +1,89 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/cycles.dart'; - -class CycleFilterSaveButton extends StatelessWidget { - const CycleFilterSaveButton({ - Key key, - @required this.hospitalVals, - @required this.hospitalCTRL, - @required this.cycleIdCTRL, - @required this.cycleNumberCTRL, - @required this.striizerIdCTRL, - @required this.dateCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final List> hospitalVals; - final TextEditingController hospitalCTRL; - final TextEditingController cycleIdCTRL; - final TextEditingController cycleNumberCTRL; - final TextEditingController striizerIdCTRL; - final TextEditingController dateCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - String hospitalID; - hospitalVals.forEach( - (hospital) { - if (hospital['name'] == hospitalCTRL.text) { - hospitalID = hospital['id']; - } - }, - ); - Provider.of(context).setFilters( - cycleIdCTRL.text, - cycleNumberCTRL.text, - striizerIdCTRL.text, - hospitalID, - dateCTRL.text, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Filters changed.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((_) { - Navigator.of(context).popAndPushNamed(Routes.cycleResultScreen); - }); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 5, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.red, Colors.orange], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'FILTER', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../providers/cycles.dart'; + +class CycleFilterSaveButton extends StatelessWidget { + const CycleFilterSaveButton({ + Key? key, + required this.hospitalVals, + required this.hospitalCTRL, + required this.cycleIdCTRL, + required this.cycleNumberCTRL, + required this.striizerIdCTRL, + required this.dateCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final List> hospitalVals; + final TextEditingController hospitalCTRL; + final TextEditingController cycleIdCTRL; + final TextEditingController cycleNumberCTRL; + final TextEditingController striizerIdCTRL; + final TextEditingController dateCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + String? hospitalID; + hospitalVals.forEach( + (hospital) { + if (hospital['name'] == hospitalCTRL.text) { + hospitalID = hospital['id']!; + } + }, + ); + Provider.of(context, listen: false).setFilters( + cycleIdCTRL.text, + cycleNumberCTRL.text, + striizerIdCTRL.text, + hospitalID, + dateCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(Routes.cycleResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPink, kPinkSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Filter/selector_box.dart b/lib/widgets/CycleScreens/Filter/selector_box.dart index 8d92960..9247967 100644 --- a/lib/widgets/CycleScreens/Filter/selector_box.dart +++ b/lib/widgets/CycleScreens/Filter/selector_box.dart @@ -1,131 +1,126 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class CycleFilterSelectorBox extends StatefulWidget { - const CycleFilterSelectorBox( - {Key key, - @required double deviceBlockSize, - @required this.hospitalCTRL, - @required this.hospitalVals, - @required String label}) - : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController hospitalCTRL; - final List> hospitalVals; - final String _label; - - @override - _CycleFilterSelectorBoxState createState() => _CycleFilterSelectorBoxState(); -} - -class _CycleFilterSelectorBoxState extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 7 * widget._deviceBlockSize, - ), - SizedBox( - width: 4 * widget._deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - SizedBox( - width: widget._deviceBlockSize, - ), - Text( - widget._label, - style: TextStyle( - fontSize: 3.5 * widget._deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w100, - ), - ), - ], - ), - Container( - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: widget._deviceBlockSize, - ), - border: InputBorder.none, - ), - iconSize: 7 * widget._deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric( - horizontal: 0, - ), - child: TextFormField( - controller: widget.hospitalCTRL, - decoration: InputDecoration( - contentPadding: EdgeInsets.only(bottom: 15), - isDense: true, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - ), - ), - ), - isDense: true, - items: widget.hospitalVals.map((val) { - return new DropdownMenuItem( - value: val['name'], - child: Container( - child: Text( - val['name'], - style: TextStyle( - // color: _mainFontColor, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - widget.hospitalCTRL.text = val; - // packageValue[1] = val; - // packageCTRL.text = val; - // packageVals.forEach((package) { - // if (package['name'] == val) { - // packageValue[0] = package['id']; - // } - // }); - }); - }, - ), - ), - ]), - ), - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class FilterHospitalBox extends StatefulWidget { + const FilterHospitalBox( + {Key? key, + required double deviceBlockSize, + required this.hospitalCTRL, + required this.hospitalVals, + required String label}) + : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController hospitalCTRL; + final List> hospitalVals; + final String _label; + + @override + _FilterHospitalBoxState createState() => _FilterHospitalBoxState(); +} + +class _FilterHospitalBoxState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * widget._deviceBlockSize, + ), + SizedBox( + width: 4 * widget._deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + SizedBox( + width: widget._deviceBlockSize, + ), + Text( + widget._label, + style: TextStyle( + fontSize: 3.5 * widget._deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, + ), + ), + ], + ), + Container( + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + left: widget._deviceBlockSize, + ), + border: InputBorder.none, + ), + iconSize: 7 * widget._deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric( + horizontal: 0, + ), + child: TextFormField( + controller: widget.hospitalCTRL, + decoration: InputDecoration( + contentPadding: EdgeInsets.only(bottom: 15), + isDense: true, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + ), + ), + ), + isDense: true, + items: widget.hospitalVals.map((val) { + return new DropdownMenuItem( + value: val['name'], + child: Container( + child: Text( + val['name']!, + style: TextStyle( + // color: _mainFontColor, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState( + () { + widget.hospitalCTRL.text = val!; + }, + ); + }, + ), + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Result/banner.dart b/lib/widgets/CycleScreens/Result/banner.dart index 2a9d3c1..d8499d6 100644 --- a/lib/widgets/CycleScreens/Result/banner.dart +++ b/lib/widgets/CycleScreens/Result/banner.dart @@ -1,46 +1,50 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -import '../../../config/routes.dart'; - -class CycleResultBanner extends StatelessWidget { - const CycleResultBanner({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Row( - // crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - 'CYCLES', - style: TextStyle( - color: Colors.black, - fontSize: 7 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 2, - ), - ), - Spacer(), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).popAndPushNamed(Routes.cycleFilterScreen); - }, - child: Container( - padding: EdgeInsets.all(5), - child: Icon( - FontAwesomeIcons.filter, - size: 7 * _deviceBlockSize, - ), - ), - ), - ], - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class ResultBanner extends StatelessWidget { + const ResultBanner({ + Key? key, + required double deviceBlockSize, + required this.text, + required this.push, + this.hasFilterObject = true, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final String text; + final String push; + final bool hasFilterObject; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Text( + text, + style: TextStyle( + color: Colors.black, + fontSize: 7 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 2, + ), + ), + Spacer(), + if (hasFilterObject) + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).popAndPushNamed(push); + }, + child: Container( + padding: EdgeInsets.all(5), + child: Icon( + FontAwesomeIcons.filter, + size: 7 * _deviceBlockSize, + ), + ), + ), + ], + ); + } +} diff --git a/lib/widgets/CycleScreens/Result/data_box.dart b/lib/widgets/CycleScreens/Result/data_box.dart index 8bc3f0f..ad91b2c 100644 --- a/lib/widgets/CycleScreens/Result/data_box.dart +++ b/lib/widgets/CycleScreens/Result/data_box.dart @@ -1,140 +1,205 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart'; - -import '../../../config/routes.dart'; -import '../../../models/cycles_models.dart'; - -class CycleItemBox extends StatelessWidget { - final CycleResultObject item; - final String labels; - - const CycleItemBox({ - Key key, - @required double deviceBlockSize, - this.item, - this.labels, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: () => Navigator.of(context).pushNamed( - Routes.cycleDetailScreen, - arguments: item.id, - ), - child: Card( - elevation: 1, - child: Container( - padding: EdgeInsets.all(10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - padding: const EdgeInsets.all(8.0), - child: Text( - item.id, - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - SizedBox( - width: 3 * _deviceBlockSize, - ), - // Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 50 * _deviceBlockSize, - child: Text( - 'Label Included:', - style: TextStyle( - fontSize: 3 * _deviceBlockSize, - color: Colors.grey, - ), - ), - ), - Container( - width: 50 * _deviceBlockSize, - child: Text( - labels, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 3 * _deviceBlockSize, - ), - ), - ), - Container( - width: 50 * _deviceBlockSize, - child: Row( - children: [ - Text( - 'Date:', - style: TextStyle( - color: Colors.grey, - fontSize: 3 * _deviceBlockSize, - ), - ), - Text( - DateFormat('y-M-d').format( - DateTime.parse( - item.createdAt, - ), - ), - style: TextStyle( - fontSize: 3 * _deviceBlockSize, - ), - ), - ], - ), - ) - ], - ), - Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed( - Routes.cycleDetailScreen, - arguments: item.id, - ); - // TestDetail(testResultId: item.id.toString()); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.fileAlt, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ) - ], - ), - ], - ), - ), - ), - ); - } -} +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/cycles.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../models/cycles_models.dart'; + +class CycleItemBox extends StatelessWidget { + final CycleResultObject? item; + final String? labels; + + const CycleItemBox({ + Key? key, + required double deviceBlockSize, + this.item, + this.labels, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.cycleDetailScreen, + arguments: item!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6), + child: Text( + item!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 30 * _deviceBlockSize, + child: Text( + 'Label Included:', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + ), + Container( + width: 40 * _deviceBlockSize, + child: Text( + labels!, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Date:', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + DateFormat('y-M-d').format( + DateTime.parse( + item!.createdAt, + ), + ), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ) + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.cycleUpdateScreen, + arguments: item!.id, + ); + }, + child: Icon( + Icons.edit, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Delete'), + content: Text( + 'Are you sure you want delete this Cycle?', + ), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(context).pop(); + Provider.of(context, + listen: false) + .removeCycles(item!.id); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + ); + }, + child: Icon( + Icons.delete, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.cycleDetailScreen, + arguments: item!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/CycleScreens/Result/filter_objects.dart b/lib/widgets/CycleScreens/Result/filter_objects.dart index 76c3d9c..08c3ebd 100644 --- a/lib/widgets/CycleScreens/Result/filter_objects.dart +++ b/lib/widgets/CycleScreens/Result/filter_objects.dart @@ -1,115 +1,109 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/cycles.dart'; - -class CycleFilterBaner extends StatelessWidget { - const CycleFilterBaner({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - Navigator.of(context).popAndPushNamed(Routes.cycleFilterScreen); - }, - child: Chip( - backgroundColor: Colors.black, - label: Text( - 'Filters', - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - FontAwesomeIcons.filter, - color: Colors.white, - size: 4 * _deviceBlockSize, - ), - onDeleted: () { - Navigator.of(context).popAndPushNamed(Routes.cycleFilterScreen); - }, - ), - ); - } -} - -class CycleFilterChip extends StatelessWidget { - const CycleFilterChip({ - Key key, - @required double deviceBlockSize, - @required String label, - @required String id, - @required String cycleNumber, - @required String sterilizerId, - @required String hospital, - @required String date, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - _id = id, - _cycleNumber = cycleNumber, - _sterilizerId = sterilizerId, - _hospital = hospital, - _date = date, - super(key: key); - - final double _deviceBlockSize; - final String _label; - final String _id; - final String _cycleNumber; - final String _sterilizerId; - final String _hospital; - final String _date; - - @override - Widget build(BuildContext context) { - return Row(children: [ - SizedBox( - width: _deviceBlockSize, - ), - Chip( - backgroundColor: Colors.black, - label: Text( - _label, - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - Icons.close, - color: Colors.white, - ), - onDeleted: () { - var cycleProvider = Provider.of(context); - cycleProvider.setFilters( - _id, - _cycleNumber, - _sterilizerId, - _hospital, - _date, - ); - // cycle.resetPageNumber(); - // cycle.setFilters( - // '', - // cycle.filters.cycleNumber, - // cycle.filters.sterilizerId, - // cycle.filters.hospital, - // cycle.filters.date, - // ); - cycleProvider.setLoading(); - cycleProvider.getCycleResults().then((_) { - cycleProvider.resetLoading(); - }); - // _reloadItems(); - }, - ), - ]); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/cycles.dart'; + +class FilterBanner extends StatelessWidget { + const FilterBanner({ + Key? key, + required double deviceBlockSize, + required this.push, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final String push; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + Navigator.of(context).popAndPushNamed(push); + }, + child: Chip( + backgroundColor: Colors.black, + label: Text( + 'Filters', + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + FontAwesomeIcons.filter, + color: Colors.white, + size: 4 * _deviceBlockSize, + ), + onDeleted: () { + Navigator.of(context).popAndPushNamed(push); + }, + ), + ); + } +} + +class CycleFilterChip extends StatelessWidget { + const CycleFilterChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String cycleNumber, + required String sterilizerId, + required String hospital, + required String date, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _id = id, + _cycleNumber = cycleNumber, + _sterilizerId = sterilizerId, + _hospital = hospital, + _date = date, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _id; + final String _cycleNumber; + final String _sterilizerId; + final String _hospital; + final String _date; + + @override + Widget build(BuildContext context) { + return Row(children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var cycleProvider = + Provider.of(context, listen: false); + cycleProvider.setFilters( + _id, + _cycleNumber, + _sterilizerId, + _hospital, + _date, + ); + cycleProvider.setLoading(); + cycleProvider.getCycleResults().then((_) { + cycleProvider.resetLoading(); + }); + // _reloadItems(); + }, + ), + ]); + } +} diff --git a/lib/widgets/CycleScreens/Result/search_box.dart b/lib/widgets/CycleScreens/Result/search_box.dart index 98159b5..e2a4a5f 100644 --- a/lib/widgets/CycleScreens/Result/search_box.dart +++ b/lib/widgets/CycleScreens/Result/search_box.dart @@ -1,47 +1,49 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/cycles.dart'; -class CycleResultSearchBox extends StatelessWidget { - const CycleResultSearchBox({ - Key key, - @required this.searchCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final TextEditingController searchCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return TextField( - onEditingComplete: () { - FocusScope.of(context).unfocus(); - }, - controller: searchCTRL, - onChanged: (value) { - Provider.of(context, listen: false).search(value); - }, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.search, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Search by cycle ID', - isDense: true, - contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - ); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class ResultSearchBox extends StatelessWidget { + const ResultSearchBox({ + Key? key, + required this.searchCTRL, + required double deviceBlockSize, + required this.text, + required this.onChanged, + this.text2 = 'ID', + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController searchCTRL; + final double _deviceBlockSize; + final String text; + final String text2; + final dynamic onChanged; + + @override + Widget build(BuildContext context) { + return TextField( + onEditingComplete: () { + FocusScope.of(context).unfocus(); + }, + controller: searchCTRL, + onChanged: onChanged, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.search, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Search by $text $text2', + isDense: true, + contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ); + } +} diff --git a/lib/widgets/Global/drawer.dart b/lib/widgets/Global/drawer.dart index 574209a..fe7b3b8 100644 --- a/lib/widgets/Global/drawer.dart +++ b/lib/widgets/Global/drawer.dart @@ -1,183 +1,343 @@ -// import 'package:cssd/pages/test_result_screen.dart'; -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -import '../../config/routes.dart'; - -class AppDrawer extends StatelessWidget { - @override - Widget build(BuildContext context) { - return SafeArea( - child: SizedBox( - width: 250, - child: Drawer( - child: Container( - padding: EdgeInsets.all(20), - decoration: BoxDecoration( - color: Colors.black, - ), - child: Column( - children: [ - ListTile( - leading: CircleAvatar( - backgroundColor: Colors.white, - ), - title: Text( - 'CSSD', - style: TextStyle( - color: Colors.white, - ), - ), - ), - Divider( - color: Colors.white, - ), - InkWell( - onTap: () => - Navigator.of(context).pushNamed(Routes.myInfoScreen), - child: Container( - padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), - margin: EdgeInsets.only(top: 10), - decoration: BoxDecoration( - gradient: - LinearGradient(colors: [Colors.blue, Colors.green]), - borderRadius: BorderRadius.circular(5), - ), - child: Row( - children: [ - Icon( - Icons.person_outline, - color: Colors.white, - ), - SizedBox( - width: 10, - ), - Text( - 'My Info', - style: TextStyle( - color: Colors.white, - ), - ) - ], - ), - ), - ), - InkWell( - onTap: () => - Navigator.of(context).pushNamed(Routes.testResultScreen), - child: Container( - padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), - margin: EdgeInsets.only(top: 10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - ), - child: Row( - children: [ - Icon( - Icons.assignment, - color: Colors.white, - ), - SizedBox( - width: 10, - ), - Text( - 'Test Results', - style: TextStyle( - color: Colors.white, - ), - ) - ], - ), - ), - ), - InkWell( - onTap: () { - Navigator.of(context).pushNamed(Routes.labelResultScreen); - }, - child: Container( - padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), - margin: EdgeInsets.only(top: 10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - ), - child: Row( - children: [ - Icon( - FontAwesomeIcons.tag, - color: Colors.white, - ), - SizedBox( - width: 10, - ), - Text( - 'Labels', - style: TextStyle( - color: Colors.white, - ), - ) - ], - ), - ), - ), - InkWell( - onTap: () { - Navigator.of(context).pushNamed(Routes.cycleResultScreen); - }, - child: Container( - padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), - margin: EdgeInsets.only(top: 10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - ), - child: Row( - children: [ - Icon( - Icons.refresh, - color: Colors.white, - ), - SizedBox( - width: 10, - ), - Text( - 'Circles', - style: TextStyle( - color: Colors.white, - ), - ) - ], - ), - ), - ), - Container( - margin: EdgeInsets.only(left: 20), - child: ListTile( - leading: Icon(Icons.phone_bluetooth_speaker), - title: Text('All Test Result'), - dense: true, - ), - ), - Container( - margin: EdgeInsets.only(left: 20), - child: ListTile( - leading: Icon(Icons.settings), - title: Text('Manage Users'), - dense: true, - ), - ), - Container( - margin: EdgeInsets.only(left: 20), - child: ListTile( - leading: Icon(Icons.label), - title: Text('Manage Medical Center'), - dense: true, - ), - ), - ], - ), - ), - elevation: 0, - ), - ), - ); - } -} +// import 'package:cssd/pages/test_result_screen.dart'; +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../config/routes.dart'; + +class AppDrawer extends StatefulWidget { + @override + State createState() => _AppDrawerState(); +} + +class _AppDrawerState extends State { + Map? user; + + @override + void didChangeDependencies() async { + var authObj = Provider.of(context, listen: false); + user = await authObj.getUserData(); + super.didChangeDependencies(); + } + + @override + Widget build(BuildContext context) { + return SafeArea( + child: SizedBox( + width: 250, + child: Drawer( + child: Container( + padding: EdgeInsets.all(20), + decoration: BoxDecoration( + color: Colors.black, + ), + child: Column( + children: [ + ListTile( + leading: CircleAvatar( + backgroundColor: kLightBlue, + child: Icon( + Icons.person, + color: Colors.white, + ), + ), + title: Text( + user?['name'] != null ? user!['name'] : '', + style: TextStyle( + color: Colors.white, + ), + ), + ), + Divider( + color: Colors.white, + ), + Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + color: kLightBlue, + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.dashboard, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Dashboard', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + InkWell( + onTap: () => + Navigator.of(context).pushNamed(Routes.myInfoScreen), + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.person_outline, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'My Info', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () => + Navigator.of(context).pushNamed(Routes.testResultScreen), + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.assignment, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Test Results', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.labelResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + FontAwesomeIcons.tag, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Labels', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.cycleResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.refresh, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Cycles', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.packageResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.all_inbox_rounded, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Packages', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.myItemsResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.inbox_rounded, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'My Packages', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.itemResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.book, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'Items', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + InkWell( + onTap: () { + Navigator.of(context).pushNamed(Routes.myItemsResultScreen); + }, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5, horizontal: 15), + margin: EdgeInsets.only(top: 10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + ), + child: Row( + children: [ + Icon( + Icons.my_library_books, + color: Colors.white, + ), + SizedBox( + width: 10, + ), + Text( + 'My Items', + style: TextStyle( + color: Colors.white, + ), + ) + ], + ), + ), + ), + // Container( + // margin: EdgeInsets.only(left: 20), + // child: ListTile( + // leading: Icon(Icons.phone_bluetooth_speaker), + // title: Text('All Test Result'), + // dense: true, + // ), + // ), + // Container( + // margin: EdgeInsets.only(left: 20), + // child: ListTile( + // leading: Icon(Icons.settings), + // title: Text('Manage Users'), + // dense: true, + // ), + // ), + // Container( + // margin: EdgeInsets.only(left: 20), + // child: ListTile( + // leading: Icon(Icons.label), + // title: Text('Manage Medical Center'), + // dense: true, + // ), + // ), + ], + ), + ), + elevation: 0, + ), + ), + ); + } +} diff --git a/lib/widgets/Global/input_box.dart b/lib/widgets/Global/input_box.dart index e655ef7..119fd0c 100644 --- a/lib/widgets/Global/input_box.dart +++ b/lib/widgets/Global/input_box.dart @@ -1,50 +1,51 @@ -import 'package:flutter/material.dart'; - -class InputBox extends StatelessWidget { - const InputBox({ - Key key, - @required double deviceBlockSize, - this.lable, - this.initialValue, - this.ico, this.isPass, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - final String lable; - final String initialValue; - final IconData ico; - final bool isPass; - - @override - Widget build(BuildContext context) { - return Row( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - ico, - color: Colors.grey, - ), - SizedBox( - width: _deviceBlockSize, - ), - Expanded( - child: TextFormField( - decoration: InputDecoration( - isDense: false, - // border: UnderlineInputBorder(), - fillColor: Colors.red, - labelText: lable, - contentPadding: EdgeInsets.all(0), - ), - style: TextStyle( - fontSize: 6 * _deviceBlockSize, - ), - initialValue: initialValue, - ), - ), - ], - ); - } -} +import 'package:flutter/material.dart'; + +class InputBox extends StatelessWidget { + const InputBox({ + Key? key, + required double deviceBlockSize, + this.lable, + this.initialValue, + this.ico, + this.isPass, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final String? lable; + final String? initialValue; + final IconData? ico; + final bool? isPass; + + @override + Widget build(BuildContext context) { + return Row( + crossAxisAlignment: CrossAxisAlignment.end, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + ico, + color: Colors.grey, + ), + SizedBox( + width: _deviceBlockSize, + ), + Expanded( + child: TextFormField( + decoration: InputDecoration( + isDense: false, + // border: UnderlineInputBorder(), + fillColor: Colors.red, + labelText: lable, + contentPadding: EdgeInsets.all(0), + ), + style: TextStyle( + fontSize: 6 * _deviceBlockSize, + ), + initialValue: initialValue, + ), + ), + ], + ); + } +} diff --git a/lib/widgets/Global/internet_error.dart b/lib/widgets/Global/internet_error.dart index 8bca2f5..aa2b144 100644 --- a/lib/widgets/Global/internet_error.dart +++ b/lib/widgets/Global/internet_error.dart @@ -1,10 +1,10 @@ -import 'package:flutter/material.dart'; - -class ConnectionErrorBox extends StatelessWidget { - @override - Widget build(BuildContext context) { - return Center( - child: Text('Please connect to the Internet ! !'), - ); - } -} +import 'package:flutter/material.dart'; + +class ConnectionErrorBox extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Center( + child: Text('Please connect to the Internet ! !'), + ); + } +} diff --git a/lib/widgets/Global/page_header.dart b/lib/widgets/Global/page_header.dart index 7acaac8..935def4 100644 --- a/lib/widgets/Global/page_header.dart +++ b/lib/widgets/Global/page_header.dart @@ -1,51 +1,51 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class PageHeader extends StatelessWidget { - const PageHeader({ - Key key, - @required double deviceBlockSize, - @required String label, - @required String route, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - _route = route, - super(key: key); - - final double _deviceBlockSize; - final String _label; - final String _route; - - @override - Widget build(BuildContext context) { - return Row( - children: [ - Container( - child: Text( - _label, - style: TextStyle( - color: Colors.black, - fontSize: 7 * _deviceBlockSize, - fontWeight: FontWeight.w700, - letterSpacing: 2, - ), - ), - ), - Spacer(), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).popAndPushNamed(_route); - }, - child: Container( - padding: EdgeInsets.all(5), - child: Icon( - FontAwesomeIcons.filter, - size: 7 * _deviceBlockSize, - ), - ), - ), - ], - ); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class PageHeader extends StatelessWidget { + const PageHeader({ + Key? key, + required double deviceBlockSize, + required String label, + required String route, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _route = route, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _route; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Container( + child: Text( + _label, + style: TextStyle( + color: Colors.black, + fontSize: 7 * _deviceBlockSize, + fontWeight: FontWeight.w700, + letterSpacing: 2, + ), + ), + ), + Spacer(), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).popAndPushNamed(_route); + }, + child: Container( + padding: EdgeInsets.all(5), + child: Icon( + FontAwesomeIcons.filter, + size: 7 * _deviceBlockSize, + ), + ), + ), + ], + ); + } +} diff --git a/lib/widgets/Global/splash_screen.dart b/lib/widgets/Global/splash_screen.dart index e287656..ddfa57a 100644 --- a/lib/widgets/Global/splash_screen.dart +++ b/lib/widgets/Global/splash_screen.dart @@ -1,12 +1,23 @@ -import 'package:flutter/material.dart'; - -class SplashScreen extends StatelessWidget { - @override - Widget build(BuildContext context) { - return Scaffold( - body: Center( - child: Text('Loading...'), - ), - ); - } -} +import 'package:flutter/material.dart'; + +class SplashScreen extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + CircularProgressIndicator( + color: Colors.black, + ), + SizedBox( + width: 5.0, + ), + Text('Loading...'), + ], + ), + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Add/item_save_button.dart b/lib/widgets/ItemScreens/Add/item_save_button.dart new file mode 100644 index 0000000..5928c8f --- /dev/null +++ b/lib/widgets/ItemScreens/Add/item_save_button.dart @@ -0,0 +1,90 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class ItemAddSaveButton extends StatelessWidget { + const ItemAddSaveButton({ + Key? key, + required GlobalKey form, + this.batchId, + required this.nameCTRL, + required this.descriptionCTRL, + required this.udiCTRL, + required double deviceBlockSize, + required this.sizeCTRL, + required this.specificCTRL, + required this.dateValue, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final TextEditingController nameCTRL; + final TextEditingController descriptionCTRL; + final TextEditingController udiCTRL; + final TextEditingController sizeCTRL; + final TextEditingController specificCTRL; + final String dateValue; + final String? batchId; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + Provider.of(context, listen: false).createItemResult( + nameCTRL.text, + sizeCTRL.text, + specificCTRL.text, + udiCTRL.text, + descriptionCTRL.text, + batchId, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Item added.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.itemResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kBlue, kBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Save', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Add/item_update_button.dart b/lib/widgets/ItemScreens/Add/item_update_button.dart new file mode 100644 index 0000000..0ad4783 --- /dev/null +++ b/lib/widgets/ItemScreens/Add/item_update_button.dart @@ -0,0 +1,90 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/items.dart'; + +import '../../../config/routes.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ItemUpdateButton extends StatelessWidget { + const ItemUpdateButton({ + Key? key, + required GlobalKey form, + required this.id, + required this.descriptionCTRL, + required this.nameCTRL, + required this.udiCTRL, + required this.sizeCTRL, + required this.specificCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final String id; + final TextEditingController descriptionCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final TextEditingController sizeCTRL; + final TextEditingController specificCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + Provider.of(context, listen: false).updateItemResult( + id, + nameCTRL.text, + sizeCTRL.text, + specificCTRL.text, + udiCTRL.text, + descriptionCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Item updated.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.itemResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kBlue, kBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Update', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Add/upload_image.dart b/lib/widgets/ItemScreens/Add/upload_image.dart new file mode 100644 index 0000000..f3a4395 --- /dev/null +++ b/lib/widgets/ItemScreens/Add/upload_image.dart @@ -0,0 +1,186 @@ +import 'package:cssd/providers/items.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class UploaderImage extends StatelessWidget { + final double deviceBlockSize; + final ItemProvider providerObject; + const UploaderImage({ + super.key, + required this.deviceBlockSize, + required this.providerObject, + }); + + @override + Widget build(BuildContext context) { + return Container( + child: Directionality( + textDirection: TextDirection.rtl, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + margin: EdgeInsets.only(top: 20), + height: providerObject.catchImages.length != 0 ? 60 : 0, + child: ImageBox( + deviceBlockSize: deviceBlockSize, + itemProvider: providerObject, + ), + ), + SizedBox( + height: providerObject.catchImages.length != 0 ? 10 : 0, + ), + InkWell( + onTap: () async { + await loadAssets(context); + }, + child: Container( + width: MediaQuery.of(context).size.width - 40, + padding: EdgeInsets.symmetric(vertical: 10, horizontal: 30), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + color: Colors.black, + ), + child: Text( + '+ Add an image or file from device', + textDirection: TextDirection.ltr, + style: TextStyle(color: Colors.white), + textAlign: TextAlign.center, + ), + ), + ), + ], + ), + ), + ); + } + + Future loadAssets(BuildContext context) async { + var providerObject = Provider.of(context, listen: false); + List files = providerObject.catchImages; + try { + var datas = await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['jpg', 'png', 'bmp', 'jpeg', 'pdf', 'docx', 'doc'], + withData: true, + withReadStream: true, + ); + files += datas!.files; + } catch (_) {} + + providerObject.setCatchImages(files); + providerObject.setImages(); + } +} + +class ImageBox extends StatelessWidget { + const ImageBox({ + Key? key, + required double deviceBlockSize, + required ItemProvider itemProvider, + }) : _deviceBlockSize = deviceBlockSize, + _providerObject = itemProvider, + super(key: key); + + final double _deviceBlockSize; + final ItemProvider _providerObject; + + @override + Widget build(BuildContext context) { + return ListView.separated( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemBuilder: (ctx, index) { + bool isPdf = _providerObject.catchImages[index].path!.endsWith('pdf'); + bool isWord = + _providerObject.catchImages[index].path!.endsWith('docx') || + _providerObject.catchImages[index].path!.endsWith('doc'); + + // print(_providerObject.catchImages[index].path.endsWith('jpg')); + // .substring(_providerObject.catchImages[index].path.length - 4)); + return ClipRRect( + borderRadius: BorderRadius.circular(5), + child: Container( + width: 60, + height: 60, + child: Stack( + children: [ + Positioned( + top: 10, + left: 0, + child: GestureDetector( + onTap: () => isPdf + ? print('pdf') + : isWord + ? print('word') + : Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => Container( + color: Colors.white, + child: Center( + child: Image.memory( + _providerObject + .catchImages[index].bytes!, + fit: BoxFit.contain, + ), + ), + ), + ), + ), + child: isPdf + ? Image.asset( + 'assets/Images/pdf.png', + width: 60, + height: 60, + fit: BoxFit.fill, + ) + : isWord + ? Image.asset( + 'assets/Images/word.png', + width: 60, + height: 60, + fit: BoxFit.fill, + ) + : Image.memory( + _providerObject.catchImages[index].bytes!, + // asset: _images[index], + width: 60, + height: 60, + fit: BoxFit.contain, + ), + ), + ), + Positioned( + top: 0, + right: 0, + child: GestureDetector( + onTap: () { + // setState(() { + _providerObject.removeImage(index); + // }); + }, + child: CircleAvatar( + backgroundColor: Colors.red, + radius: 10, + child: Icon( + Icons.close, + size: 12, + color: Colors.white, + ), + ), + ), + ) + ], + ), + ), + ); + }, + itemCount: _providerObject.catchImages.length, + separatorBuilder: (BuildContext context, int index) => SizedBox( + width: 3 * _deviceBlockSize, + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Details/item_detail_box.dart b/lib/widgets/ItemScreens/Details/item_detail_box.dart new file mode 100644 index 0000000..aacbeff --- /dev/null +++ b/lib/widgets/ItemScreens/Details/item_detail_box.dart @@ -0,0 +1,351 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class ItemDetailsDataBox extends StatelessWidget { + const ItemDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final ItemDetailObject datas; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + print(datas.status); + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Item Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kBlue, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createdAt, + ), + ), + style: TextStyle( + color: kBlue, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kBlue, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Item Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.name.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Size', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.size.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Specific', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.specific.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'User', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.userName.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'UDI', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.udi.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas.createdAt, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.description.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospital, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Status', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.status == 1 ? 'Success' : 'Failure', + style: TextStyle( + fontWeight: FontWeight.w700, + color: datas.status == 1 ? kBlue : kPink, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/Item/${datas.id.toString()}', + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ), + SizedBox( + height: 30, + ), + ], + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Filter/item_filter_button.dart b/lib/widgets/ItemScreens/Filter/item_filter_button.dart new file mode 100644 index 0000000..cca49f6 --- /dev/null +++ b/lib/widgets/ItemScreens/Filter/item_filter_button.dart @@ -0,0 +1,98 @@ +import 'package:cssd/providers/items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ItemFilterSaveButton extends StatelessWidget { + const ItemFilterSaveButton({ + Key? key, + this.hospitalVals, + this.hospitalCTRL, + required this.idCTRL, + required this.nameCTRL, + required this.udiCTRL, + required this.sizeCTRL, + required this.specificCTRL, + required this.firstColor, + required this.secondColor, + required this.push, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final List>? hospitalVals; + final TextEditingController? hospitalCTRL; + final TextEditingController idCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final TextEditingController sizeCTRL; + final TextEditingController specificCTRL; + final Color firstColor; + final Color secondColor; + final String push; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + String? hospitalID; + hospitalVals!.forEach( + (hospital) { + if (hospital['name'] == hospitalCTRL!.text) { + hospitalID = hospital['id']!; + } + }, + ); + Provider.of(context, listen: false).setFilters( + idCTRL.text, + nameCTRL.text, + udiCTRL.text, + hospitalID, + sizeCTRL.text, + specificCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(push); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + firstColor, + secondColor, + ], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/ItemScreens/Filter/item_filter_object.dart b/lib/widgets/ItemScreens/Filter/item_filter_object.dart new file mode 100644 index 0000000..b325043 --- /dev/null +++ b/lib/widgets/ItemScreens/Filter/item_filter_object.dart @@ -0,0 +1,76 @@ +import 'package:cssd/providers/items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class ItemFilterChip extends StatelessWidget { + const ItemFilterChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String name, + required String udi, + required String hospital, + required String size, + required String specific, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _id = id, + _name = name, + _udi = udi, + _hospital = hospital, + _size = size, + _specific = specific, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _id; + final String _name; + final String _udi; + final String _hospital; + final String _size; + final String _specific; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var itemProvider = + Provider.of(context, listen: false); + itemProvider.setFilters( + _id, + _name, + _udi, + _hospital, + _size, + _specific, + ); + itemProvider.setLoading(); + itemProvider.getItemResults().then( + (_) { + itemProvider.resetLoading(); + }, + ); + }, + ), + ], + ); + } +} diff --git a/lib/widgets/ItemScreens/Result/item_data_box.dart b/lib/widgets/ItemScreens/Result/item_data_box.dart new file mode 100644 index 0000000..9384606 --- /dev/null +++ b/lib/widgets/ItemScreens/Result/item_data_box.dart @@ -0,0 +1,244 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class ItemItemBox extends StatelessWidget { + final ItemResultObject? item; + + const ItemItemBox({ + Key? key, + required double deviceBlockSize, + this.item, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.itemDetailScreen, + arguments: item!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + item!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + item!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Size: ', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + Text( + item!.size, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + item!.userName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + Provider.of(context, + listen: false) + .changeStatus(item!.id) + .then( + (value) { + if (value) { + print('true'); + } + Navigator.of(context).popAndPushNamed( + Routes.itemResultScreen); + }, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 6 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: item!.status == 1 ? kPink : kBlue, + ), + child: Icon( + item!.status == 1 ? Icons.close : Icons.check, + size: 2 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 5.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + onTap: () { + Navigator.of(context).pushNamed( + Routes.itemUpdateScreen, + arguments: item!.id, + ); + }, + child: Icon( + Icons.edit, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Delete'), + content: Text( + 'Are you sure you want delete this Item?'), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(context).pop(); + Provider.of(context, + listen: false) + .removeItems(item!.id); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + ); + }, + child: Icon( + Icons.delete, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.itemDetailScreen, + arguments: item!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Add/add_package_box.dart b/lib/widgets/LabelScreens/Add/add_package_box.dart new file mode 100644 index 0000000..51f4b03 --- /dev/null +++ b/lib/widgets/LabelScreens/Add/add_package_box.dart @@ -0,0 +1,212 @@ +import 'package:cssd/providers/labels.dart'; +import 'package:cssd/utils/scan.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +class AddPackageBox extends StatelessWidget { + const AddPackageBox({ + Key? key, + required double deviceBlockSize, + required this.values, + required this.vals, + required this.initialLabelValue, + required this.index, + required this.text, + this.iconColor, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController values; + final List vals; + final String initialLabelValue; + final int index; + final String text; + final Color? iconColor; + + @override + Widget build(BuildContext context) { + return Container( + height: 150, + child: Stack( + children: [ + Container( + padding: EdgeInsets.only( + right: 10, + bottom: 25, + left: 10, + top: 10, + ), + decoration: BoxDecoration( + border: Border( + left: BorderSide(color: Colors.black, width: 2), + right: BorderSide(color: Colors.grey), + bottom: BorderSide(color: Colors.grey), + top: BorderSide(color: Colors.grey), + ), + ), + height: 120, + child: Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * _deviceBlockSize, + ), + SizedBox( + width: 4 * _deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Text( + text, + style: TextStyle( + fontSize: 3.5 * _deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, + ), + ), + ], + ), + Row( + children: [ + Container( + width: MediaQuery.of(context).size.width - + (40 * _deviceBlockSize), + // height: 30, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + left: _deviceBlockSize, + ), + border: InputBorder.none, + ), + iconSize: 7 * _deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: + const EdgeInsets.symmetric(horizontal: 0), + child: TextFormField( + controller: values, + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + bottom: 12, + ), + isDense: true, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + isDense: true, + items: vals.map((val) { + return new DropdownMenuItem( + value: val, + child: Container( + child: Text( + val, + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + Provider.of(context, + listen: false) + .changePackageVal(val!, index); + }, + ), + ), + Spacer(), + InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + Provider.of(context, + listen: false) + .changePackageVal(result, index); + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ) + ], + ), + ], + ), + ), + ], + ), + ), + ), + Positioned( + bottom: 15, + right: 0, + child: InkWell( + onTap: () { + Provider.of(context).addPackageVal(); + }, + child: Container( + padding: EdgeInsets.all(3), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: iconColor, + ), + child: Icon( + Icons.add, + color: Colors.white, + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Add/date_picker.dart b/lib/widgets/LabelScreens/Add/date_picker.dart index 6777aee..ea09309 100644 --- a/lib/widgets/LabelScreens/Add/date_picker.dart +++ b/lib/widgets/LabelScreens/Add/date_picker.dart @@ -1,73 +1,73 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart' as DateEditor; - -class LabelAddDatePicker extends StatefulWidget { - LabelAddDatePicker({ - Key key, - @required this.dateCTRL, - @required double deviceBlockSize, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final TextEditingController dateCTRL; - final double _deviceBlockSize; - final String _label; - - @override - _LabelAddDatePickerState createState() => _LabelAddDatePickerState(); -} - -class _LabelAddDatePickerState extends State { - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () async { - var res = await showDatePicker( - context: context, - initialDate: DateTime.now(), - firstDate: DateTime(2010, 1), - lastDate: DateTime(2101), - ); - if (res != null) { - setState( - () { - widget.dateCTRL.text = DateEditor.DateFormat('y-M-d').format(res); - // sDateValue = - // DateEditor.DateFormat('y-M-d').format( - // dateTimeS, - // ); // baraye tavize makane gharar giri baraye api - }, - ); - } - }, - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: TextField( - enabled: false, - controller: widget.dateCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.calendarAlt, - size: 7 * widget._deviceBlockSize, - ), - labelText: widget._label, - isDense: true, - contentPadding: EdgeInsets.only(bottom: 7, right: 3, left: 3), - // border: InputBorder.none, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - ), - ), - Icon(FontAwesomeIcons.angleDown) - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart' as DateEditor; + +class LabelAddDatePicker extends StatefulWidget { + LabelAddDatePicker({ + Key? key, + required this.dateCTRL, + required double deviceBlockSize, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final TextEditingController dateCTRL; + final double _deviceBlockSize; + final String _label; + + @override + _LabelAddDatePickerState createState() => _LabelAddDatePickerState(); +} + +class _LabelAddDatePickerState extends State { + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () async { + var res = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime(2010, 1), + lastDate: DateTime(2101), + ); + if (res != null) { + setState( + () { + widget.dateCTRL.text = DateEditor.DateFormat('y-M-d').format(res); + // sDateValue = + // DateEditor.DateFormat('y-M-d').format( + // dateTimeS, + // ); // baraye tavize makane gharar giri baraye api + }, + ); + } + }, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: TextField( + enabled: false, + controller: widget.dateCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.calendarAlt, + size: 7 * widget._deviceBlockSize, + ), + labelText: widget._label, + isDense: true, + contentPadding: EdgeInsets.only(bottom: 7, right: 3, left: 3), + // border: InputBorder.none, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + ), + ), + Icon(FontAwesomeIcons.angleDown) + ], + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Add/save_button.dart b/lib/widgets/LabelScreens/Add/save_button.dart index 002a869..dcb2241 100644 --- a/lib/widgets/LabelScreens/Add/save_button.dart +++ b/lib/widgets/LabelScreens/Add/save_button.dart @@ -1,91 +1,92 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/labels.dart'; - -class LabelAddSaveButton extends StatelessWidget { - const LabelAddSaveButton({ - Key key, - @required GlobalKey form, - @required this.lotNumberCTRL, - @required this.cycleNumberCTRL, - @required this.sDateCTRL, - @required this.packageValue, - @required this.eDateCTRL, - @required this.striizerIdCTRL, - @required double deviceBlockSize, - }) : _form = form, - _deviceBlockSize = deviceBlockSize, - super(key: key); - - final GlobalKey _form; - final TextEditingController lotNumberCTRL; - final TextEditingController cycleNumberCTRL; - final TextEditingController sDateCTRL; - final List packageValue; - final TextEditingController eDateCTRL; - final TextEditingController striizerIdCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - Provider.of(context).createLabelResult( - lotNumberCTRL.text, - cycleNumberCTRL.text, - sDateCTRL.text, - // sDateValue, - {'id': packageValue[0], 'name': packageValue[1]}, - eDateCTRL.text, - // eDateValue, - striizerIdCTRL.text, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Label added.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((_) { - Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); - }); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'SAVE', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../providers/labels.dart'; + +class LabelAddSaveButton extends StatelessWidget { + const LabelAddSaveButton({ + Key? key, + required GlobalKey form, + required this.lotNumberCTRL, + required this.cycleNumberCTRL, + required this.sDateCTRL, + required this.packageValue, + required this.eDateCTRL, + required this.striizerIdCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final TextEditingController lotNumberCTRL; + final TextEditingController cycleNumberCTRL; + final TextEditingController sDateCTRL; + final List packageValue; + final TextEditingController eDateCTRL; + final TextEditingController striizerIdCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + Provider.of(context, listen: false).createLabelResult( + lotNumberCTRL.text, + cycleNumberCTRL.text, + sDateCTRL.text, + // sDateValue, + {'id': packageValue[0], 'name': packageValue[1]}, + eDateCTRL.text, + // eDateValue, + striizerIdCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Label added.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kLightBlue, kLightBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Save', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Add/selector_box.dart b/lib/widgets/LabelScreens/Add/selector_box.dart index 0aba8c1..560735d 100644 --- a/lib/widgets/LabelScreens/Add/selector_box.dart +++ b/lib/widgets/LabelScreens/Add/selector_box.dart @@ -1,144 +1,149 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class LabelAddSelectorBox extends StatefulWidget { - const LabelAddSelectorBox({ - Key key, - @required double deviceBlockSize, - @required this.packageCTRL, - @required this.packageVals, - @required this.packageValue, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController packageCTRL; - final List> packageVals; - final List packageValue; - - @override - _LabelAddSelectorBoxState createState() => _LabelAddSelectorBoxState(); -} - -class _LabelAddSelectorBoxState extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 7 * widget._deviceBlockSize, - ), - SizedBox( - width: 4 * widget._deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - SizedBox( - width: widget._deviceBlockSize, - ), - Text( - 'Package', - style: TextStyle( - fontSize: 3.5 * widget._deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w700), - ), - ], - ), - Container( - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: widget._deviceBlockSize), - // border: InputBorder.none, - ), - iconSize: 7 * widget._deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric(horizontal: 0), - child: Text( - widget.packageCTRL.text, - textDirection: TextDirection.rtl, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - // Container( - // // width: 100, - // height: 70, - // padding: const EdgeInsets.symmetric(horizontal: 0), - // child: TextFormField( - // controller: widget.packageCTRL, - // decoration: InputDecoration( - // contentPadding: EdgeInsets.only(bottom: 15), - // isDense: true, - // ), - // style: TextStyle( - // fontWeight: FontWeight.w700, - // color: Colors.black, - // fontSize: 5 * widget._deviceBlockSize, - // ), - // ), - // ), - isDense: true, - items: widget.packageVals.map((val) { - return new DropdownMenuItem( - value: val['name'], - child: Container( - child: Text( - val['name'], - textDirection: TextDirection.rtl, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - widget.packageValue[1] = val; - widget.packageCTRL.text = val; - widget.packageVals.forEach((package) { - if (package['name'] == val) { - widget.packageValue[0] = package['id']; - } - }); - }); - }, - ), - ), - ]), - ), - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class LabelAddSelectorBox extends StatefulWidget { + const LabelAddSelectorBox({ + Key? key, + required double deviceBlockSize, + required this.packageCTRL, + required this.packageVals, + required this.packageValue, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController packageCTRL; + final List> packageVals; + final List packageValue; + + @override + _LabelAddSelectorBoxState createState() => _LabelAddSelectorBoxState(); +} + +class _LabelAddSelectorBoxState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * widget._deviceBlockSize, + ), + SizedBox( + width: 4 * widget._deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + SizedBox( + width: widget._deviceBlockSize, + ), + Text( + 'Package', + style: TextStyle( + fontSize: 3.5 * widget._deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w700), + ), + ], + ), + Container( + // height: 30, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: widget._deviceBlockSize), + // border: InputBorder.none, + ), + iconSize: 7 * widget._deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric(horizontal: 0), + child: Text( + widget.packageCTRL.text, + textDirection: TextDirection.rtl, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + // Container( + // // width: 100, + // height: 70, + // padding: const EdgeInsets.symmetric(horizontal: 0), + // child: TextFormField( + // controller: widget.packageCTRL, + // decoration: InputDecoration( + // contentPadding: EdgeInsets.only(bottom: 15), + // isDense: true, + // ), + // style: TextStyle( + // fontWeight: FontWeight.w700, + // color: Colors.black, + // fontSize: 5 * widget._deviceBlockSize, + // ), + // ), + // ), + isDense: true, + items: widget.packageVals.map((val) { + return new DropdownMenuItem( + value: val['name'], + child: Container( + child: Text( + val['name'] ?? '', + textDirection: TextDirection.rtl, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState( + () { + widget.packageValue[1] = val!; + widget.packageCTRL.text = val; + widget.packageVals.forEach( + (package) { + if (package['name'] == val) { + widget.packageValue[0] = package['id'] ?? ''; + } + }, + ); + }, + ); + }, + ), + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Add/update_button.dart b/lib/widgets/LabelScreens/Add/update_button.dart index ea67a90..1196e2a 100644 --- a/lib/widgets/LabelScreens/Add/update_button.dart +++ b/lib/widgets/LabelScreens/Add/update_button.dart @@ -1,93 +1,93 @@ -import '../../../config/routes.dart'; -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import '../../../providers/labels.dart'; - -class LabelUpdateButton extends StatelessWidget { - const LabelUpdateButton({ - Key key, - @required GlobalKey form, - @required this.id, - @required this.lotNumberCTRL, - @required this.cycleNumberCTRL, - @required this.sDateCTRL, - @required this.packageValue, - @required this.eDateCTRL, - @required this.striizerIdCTRL, - @required double deviceBlockSize, - }) : _form = form, - _deviceBlockSize = deviceBlockSize, - super(key: key); - - final GlobalKey _form; - final String id; - final TextEditingController lotNumberCTRL; - final TextEditingController cycleNumberCTRL; - final TextEditingController sDateCTRL; - final List packageValue; - final TextEditingController eDateCTRL; - final TextEditingController striizerIdCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - Provider.of(context).updateLabelResult( - id, - lotNumberCTRL.text, - cycleNumberCTRL.text, - sDateCTRL.text, - // sDateValue, - {'id': packageValue[0], 'name': packageValue[1]}, - eDateCTRL.text, - // eDateValue, - striizerIdCTRL.text, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Label updated.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((_) { - Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); - }); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'UPDATE', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import 'package:flutter/material.dart'; +import '../../../providers/labels.dart'; + +class LabelUpdateButton extends StatelessWidget { + const LabelUpdateButton({ + Key? key, + required GlobalKey form, + required this.id, + required this.lotNumberCTRL, + required this.cycleNumberCTRL, + required this.sDateCTRL, + required this.packageValue, + required this.eDateCTRL, + required this.striizerIdCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final String id; + final TextEditingController lotNumberCTRL; + final TextEditingController cycleNumberCTRL; + final TextEditingController sDateCTRL; + final List packageValue; + final TextEditingController eDateCTRL; + final TextEditingController striizerIdCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + Provider.of(context, listen: false).updateLabelResult( + id, + lotNumberCTRL.text, + cycleNumberCTRL.text, + sDateCTRL.text, + {'id': packageValue[0]}, + eDateCTRL.text, + striizerIdCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Label updated.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kLightBlue, kLightBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Update', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Detail/datas_box.dart b/lib/widgets/LabelScreens/Detail/datas_box.dart index ffd110e..7f00b55 100644 --- a/lib/widgets/LabelScreens/Detail/datas_box.dart +++ b/lib/widgets/LabelScreens/Detail/datas_box.dart @@ -1,300 +1,302 @@ -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import '../../../models/label_models.dart'; - -class LabelDetailsDataBox extends StatelessWidget { - const LabelDetailsDataBox({ - Key key, - @required this.datas, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final LabelDetailsObject datas; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - SizedBox( - height: 10, - ), - Text( - 'LABEL DETAILS', - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - letterSpacing: 3, - ), - ), - SizedBox( - height: 10, - ), - Container( - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - color: Color.fromRGBO(235, 235, 235, 1), - border: Border( - left: BorderSide( - color: Colors.black54, - width: 2, - ), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - DateFormat.yMMMd().format( - DateTime.parse( - datas.createDate, - ), - ), - style: TextStyle( - color: Colors.red, - ), - ), - Divider(), - Text( - 'ID: ${datas.id}', - style: TextStyle( - color: Colors.red, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 30, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Sterilizer ID', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.sterileId.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Cycle Number', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.cycleNumber.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Lot Number', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.lotNumber.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Sterile Date', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - DateFormat('y-M-d').format( - DateTime.parse( - datas.sterileDate, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Expire Date', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - DateFormat('y-M-d').format( - DateTime.parse( - datas.expireDate, - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, color: Colors.red), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Package', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.package.toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Hospital Name', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas.hospitalName, - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - ], - ), - ), - SizedBox( - height: 20, - ), - InkWell( - onTap: () => launch( - 'https://cssd-doc.com/Show/Label/${datas.id.toString()}', - // forceSafariVC: true, - // forceWebView: true, - // headers: {'my_header_key': 'my_header_value'}, - // child: Text('Show Full Details'), - ), - child: Container( - padding: EdgeInsets.symmetric(vertical: 20), - width: double.infinity, - decoration: BoxDecoration( - color: Color.fromRGBO(230, 230, 230, 1), - borderRadius: BorderRadius.circular(25), - ), - child: Center( - child: Text( - 'Show More Details', - style: TextStyle(fontWeight: FontWeight.w700), - ), - ), - ), - ) - ], - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; + +import '../../../models/label_models.dart'; + +class LabelDetailsDataBox extends StatelessWidget { + const LabelDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final LabelDetailsObject datas; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Label Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kLightBlue, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + color: kLightBlue, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kLightBlue, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Sterilizer ID', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.sterileId.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Cycle Number', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.cycleNumber.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Lot Number', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.lotNumber.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Sterile Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('y-M-d').format( + DateTime.parse( + datas.sterileDate, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Expire Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('y-M-d').format( + DateTime.parse( + datas.expireDate, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: kPink, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Package', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.package.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospitalName, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () => launch( + 'https://cssd-doc.com/Show/Label/${datas.id.toString()}', + // forceSafariVC: true, + // forceWebView: true, + // headers: {'my_header_key': 'my_header_value'}, + // child: Text('Show Full Details'), + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ) + ], + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Detail/header.dart b/lib/widgets/LabelScreens/Detail/header.dart index 9cdebb3..8dcbdc3 100644 --- a/lib/widgets/LabelScreens/Detail/header.dart +++ b/lib/widgets/LabelScreens/Detail/header.dart @@ -1,36 +1,36 @@ -import 'package:flutter/material.dart'; - -class InfoHeader extends StatelessWidget { - const InfoHeader({ - Key key, - @required double deviceBlockSize, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final double _deviceBlockSize; - final String _label; - - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.only( - left: 20, - top: 20, - bottom: 10, - right: 20, - ), - child: Text( - _label, - textAlign: TextAlign.left, - style: TextStyle( - color: Colors.black, - fontSize: 7 * _deviceBlockSize, - letterSpacing: _deviceBlockSize, - fontWeight: FontWeight.w700, - ), - ), - ); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; + +class InfoHeader extends StatelessWidget { + const InfoHeader({ + Key? key, + required double deviceBlockSize, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final double _deviceBlockSize; + final String _label; + + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.only( + left: 20, + top: 20, + bottom: 10, + right: 20, + ), + child: Text( + _label, + textAlign: TextAlign.left, + style: TextStyle( + color: Colors.black, + fontSize: 7 * _deviceBlockSize, + letterSpacing: _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Filter/save_button.dart b/lib/widgets/LabelScreens/Filter/save_button.dart index 2642d13..787cbd9 100644 --- a/lib/widgets/LabelScreens/Filter/save_button.dart +++ b/lib/widgets/LabelScreens/Filter/save_button.dart @@ -1,87 +1,88 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/labels.dart'; - -class LabelFilterSaveButton extends StatelessWidget { - const LabelFilterSaveButton({ - Key key, - @required this.hospitalVals, - @required this.hospitalCTRL, - @required this.labelIdCTRl, - @required this.cycleNumberCTRL, - @required this.striizerIdCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final List> hospitalVals; - final TextEditingController hospitalCTRL; - final TextEditingController labelIdCTRl; - final TextEditingController cycleNumberCTRL; - final TextEditingController striizerIdCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - String hospitalID; - hospitalVals.forEach( - (hospital) { - if (hospital['name'] == hospitalCTRL.text) { - hospitalID = hospital['id']; - } - }, - ); - Provider.of(context).setFilters( - labelIdCTRl.text, - cycleNumberCTRL.text, - striizerIdCTRL.text, - hospitalID, - ); - showDialog( - context: context, - builder: (ctx) => AlertDialog( - content: Text('Filters changed.'), - actions: [ - TextButton( - onPressed: () { - Navigator.of(ctx).pop(); - }, - child: Text('Ok'), - ) - ], - ), - ).then((_) { - Navigator.of(context).popAndPushNamed(Routes.labelResultScreen); - }); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 5, - ), - // margin: - // EdgeInsets.symmetric(horizontal: 35, vertical: 15), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'FILTER', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../providers/labels.dart'; + +class LabelFilterSaveButton extends StatelessWidget { + const LabelFilterSaveButton({ + Key? key, + required this.hospitalVals, + required this.hospitalCTRL, + required this.labelIdCTRl, + required this.cycleNumberCTRL, + required this.striizerIdCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final List> hospitalVals; + final TextEditingController hospitalCTRL; + final TextEditingController labelIdCTRl; + final TextEditingController cycleNumberCTRL; + final TextEditingController striizerIdCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + String? hospitalID; + hospitalVals.forEach( + (hospital) { + if (hospital['name'] == hospitalCTRL.text) { + hospitalID = hospital['id']!; + } + }, + ); + Provider.of(context, listen: false).setFilters( + labelIdCTRl.text, + cycleNumberCTRL.text, + striizerIdCTRL.text, + hospitalID, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(Routes.labelResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kLightBlue, kLightBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Filter/selector_box.dart b/lib/widgets/LabelScreens/Filter/selector_box.dart index c0f9792..efc909a 100644 --- a/lib/widgets/LabelScreens/Filter/selector_box.dart +++ b/lib/widgets/LabelScreens/Filter/selector_box.dart @@ -1,114 +1,114 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class LabelFilterSelectorBox extends StatefulWidget { - const LabelFilterSelectorBox({ - Key key, - @required double deviceBlockSize, - @required this.hospitalCTRL, - @required this.hospitalVals, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController hospitalCTRL; - final List> hospitalVals; - - @override - _LabelFilterSelectorBoxState createState() => _LabelFilterSelectorBoxState(); -} - -class _LabelFilterSelectorBoxState extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 7 * widget._deviceBlockSize, - ), - SizedBox( - width: 4 * widget._deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - 'Hospital', - style: TextStyle( - fontSize: 3.5 * widget._deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w700, - ), - ), - ], - ), - Container( - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only(left: 0), - border: InputBorder.none, - ), - iconSize: 7 * widget._deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric(horizontal: 0), - child: TextFormField( - controller: widget.hospitalCTRL, - decoration: InputDecoration( - contentPadding: EdgeInsets.only(bottom: 15), - isDense: true, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - ), - ), - ), - isDense: true, - items: widget.hospitalVals.map((val) { - return new DropdownMenuItem( - value: val['name'], - child: Container( - child: Text( - val['name'], - style: TextStyle( - // color: _mainFontColor, - fontSize: 4 * widget._deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - widget.hospitalCTRL.text = val; - }); - }, - ), - ), - ]), - ), - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class LabelFilterSelectorBox extends StatefulWidget { + const LabelFilterSelectorBox({ + Key? key, + required double deviceBlockSize, + required this.hospitalCTRL, + required this.hospitalVals, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController hospitalCTRL; + final List> hospitalVals; + + @override + _LabelFilterSelectorBoxState createState() => _LabelFilterSelectorBoxState(); +} + +class _LabelFilterSelectorBoxState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * widget._deviceBlockSize, + ), + SizedBox( + width: 4 * widget._deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + 'Hospital', + style: TextStyle( + fontSize: 3.5 * widget._deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + Container( + // height: 30, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only(left: 0), + border: InputBorder.none, + ), + iconSize: 7 * widget._deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric(horizontal: 0), + child: TextFormField( + controller: widget.hospitalCTRL, + decoration: InputDecoration( + contentPadding: EdgeInsets.only(bottom: 15), + isDense: true, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + ), + ), + ), + isDense: true, + items: widget.hospitalVals.map((val) { + return new DropdownMenuItem( + value: val['name'], + child: Container( + child: Text( + val['name']!, + style: TextStyle( + // color: _mainFontColor, + fontSize: 4 * widget._deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState(() { + widget.hospitalCTRL.text = val!; + }); + }, + ), + ), + ]), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Result/data_box.dart b/lib/widgets/LabelScreens/Result/data_box.dart index d30146e..7bae2d9 100644 --- a/lib/widgets/LabelScreens/Result/data_box.dart +++ b/lib/widgets/LabelScreens/Result/data_box.dart @@ -1,150 +1,192 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -import '../../../config/routes.dart'; -import '../../../models/label_models.dart'; - -class LabelItemBox extends StatelessWidget { - final LabelResultObject item; - const LabelItemBox({ - Key key, - @required double deviceBlockSize, - this.item, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return GestureDetector( - onTap: () => Navigator.of(context).pushNamed( - Routes.labelDetailScreen, - arguments: item.id, - ), - child: Card( - elevation: 1, - child: Container( - padding: EdgeInsets.all(10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - padding: const EdgeInsets.all(8.0), - child: Text( - item.id, - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - SizedBox( - width: 3 * _deviceBlockSize, - ), - // Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - width: 30 * _deviceBlockSize, - child: Text( - 'Package:', - style: TextStyle( - fontSize: 3 * _deviceBlockSize, - color: Colors.grey, - ), - ), - ), - Container( - width: 40 * _deviceBlockSize, - child: Text( - item.package, - overflow: TextOverflow.ellipsis, - ), - ), - Container( - width: 30 * _deviceBlockSize, - child: Row( - children: [ - Text( - 'Exp:', - style: TextStyle( - color: Colors.grey, - fontSize: 3 * _deviceBlockSize, - ), - ), - Text( - item.expireDate, - style: TextStyle( - fontSize: 3 * _deviceBlockSize, - ), - ), - ], - ), - ) - ], - ), - Spacer(), - Column( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushReplacementNamed( - Routes.labelUpdateScreen, - arguments: item.id, - ); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - Icons.edit, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - SizedBox(width: _deviceBlockSize,), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed( - Routes.labelDetailScreen, - arguments: item.id, - ); - }, - child: Container( - padding: EdgeInsets.all(7), - width: 10 * _deviceBlockSize, - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.fileAlt, - size: 6 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ) - ], - ), - ], - ), - ), - ), - ); - } -} +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/labels.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../models/label_models.dart'; + +class LabelItemBox extends StatelessWidget { + final LabelResultObject? item; + const LabelItemBox({ + Key? key, + required double deviceBlockSize, + this.item, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.labelDetailScreen, + arguments: item!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6), + child: Text( + item!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 30 * _deviceBlockSize, + child: Text( + 'Package:', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + ), + Container( + width: 40 * _deviceBlockSize, + child: Text( + item!.package, + overflow: TextOverflow.ellipsis, + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Exp:', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + item!.expireDate, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ) + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.labelUpdateScreen, + arguments: item!.id, + ); + }, + child: Icon( + Icons.edit, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Delete'), + content: Text( + 'Are you sure you want delete this Label?'), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(context).pop(); + Provider.of(context, + listen: false) + .removeLabels(item!.id); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + ); + }, + child: Icon( + Icons.delete, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.labelDetailScreen, + arguments: item!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Result/filter_chip_box.dart b/lib/widgets/LabelScreens/Result/filter_chip_box.dart index 54180fd..0760230 100644 --- a/lib/widgets/LabelScreens/Result/filter_chip_box.dart +++ b/lib/widgets/LabelScreens/Result/filter_chip_box.dart @@ -1,63 +1,65 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/labels.dart'; -class LabelFilterChip extends StatelessWidget { - const LabelFilterChip({ - Key key, - @required double deviceBlockSize, - @required String id, - @required String cycleNumber, - @required String sterilizerId, - @required String hospital, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _id = id, - _cycleNumber = cycleNumber, - _sterilizerId = sterilizerId, - _hispotal = hospital, - _label = label, - super(key: key); - - final double _deviceBlockSize; - final String _id; - final String _cycleNumber; - final String _sterilizerId; - final String _hispotal; - final String _label; - - @override - Widget build(BuildContext context) { - return Row(children: [ - SizedBox( - width: _deviceBlockSize, - ), - Chip( - backgroundColor: Colors.black, - label: Text( - _label, - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - Icons.close, - color: Colors.white, - ), - onDeleted: () { - var labelProviderObject = Provider.of(context); - labelProviderObject.setFilters( - _id, - _cycleNumber, - _sterilizerId, - _hispotal, - ); - labelProviderObject.setLoading(); - labelProviderObject.getLabelResults().then((_) { - labelProviderObject.resetLoading(); - }); - }, - ), - ]); - } -} \ No newline at end of file +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/labels.dart'; + +class LabelFilterChip extends StatelessWidget { + const LabelFilterChip({ + Key? key, + required double deviceBlockSize, + required String id, + required String cycleNumber, + required String sterilizerId, + required String hospital, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _id = id, + _cycleNumber = cycleNumber, + _sterilizerId = sterilizerId, + _hispotal = hospital, + _label = label, + super(key: key); + + final double _deviceBlockSize; + final String _id; + final String _cycleNumber; + final String _sterilizerId; + final String _hispotal; + final String _label; + + @override + Widget build(BuildContext context) { + return Row(children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.setFilters( + _id, + _cycleNumber, + _sterilizerId, + _hispotal, + ); + labelProviderObject.setLoading(); + labelProviderObject.getLabelResults().then((_) { + labelProviderObject.resetLoading(); + }); + }, + ), + ]); + } +} diff --git a/lib/widgets/LabelScreens/Result/floating_buttons.dart b/lib/widgets/LabelScreens/Result/floating_buttons.dart index 80f91dd..79aa5c5 100644 --- a/lib/widgets/LabelScreens/Result/floating_buttons.dart +++ b/lib/widgets/LabelScreens/Result/floating_buttons.dart @@ -1,62 +1,62 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -import '../../../config/routes.dart'; - -class LabelFloatingButtons extends StatelessWidget { - const LabelFloatingButtons({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed(Routes.labelScanScreen); - }, - child: Container( - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 7.1 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - SizedBox( - width: 2 * _deviceBlockSize, - ), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushReplacementNamed(Routes.labelAddScreen); - }, - child: Container( - padding: EdgeInsets.all(5), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.redAccent, - ), - child: Icon( - Icons.add, - size: 10 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; + +import '../../../config/routes.dart'; + +class LabelFloatingButtons extends StatelessWidget { + const LabelFloatingButtons({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.labelScanScreen); + }, + child: Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 7.1 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushReplacementNamed(Routes.labelAddScreen); + }, + child: Container( + padding: EdgeInsets.all(5), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kLightBlue, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ); + } +} diff --git a/lib/widgets/LabelScreens/Result/search_box.dart b/lib/widgets/LabelScreens/Result/search_box.dart index aa6b271..92ce288 100644 --- a/lib/widgets/LabelScreens/Result/search_box.dart +++ b/lib/widgets/LabelScreens/Result/search_box.dart @@ -1,48 +1,48 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/labels.dart'; - -class LabelSearchBox extends StatelessWidget { - const LabelSearchBox({ - Key key, - @required this.searchCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final TextEditingController searchCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return TextField( - onEditingComplete: () { - FocusScope.of(context).unfocus(); - }, - onChanged: (value) { - Provider.of(context, listen: false).search(value); - }, - controller: searchCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.search, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Search by lable ID', - isDense: true, - contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/labels.dart'; + +class LabelSearchBox extends StatelessWidget { + const LabelSearchBox({ + Key? key, + required this.searchCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController searchCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return TextField( + onEditingComplete: () { + FocusScope.of(context).unfocus(); + }, + onChanged: (value) { + Provider.of(context, listen: false).search(value); + }, + controller: searchCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.search, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Search by label ID', + isDense: true, + contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ); + } +} diff --git a/lib/widgets/LabelScreens/Scan/input_box.dart b/lib/widgets/LabelScreens/Scan/input_box.dart index 67085e4..a19d202 100644 --- a/lib/widgets/LabelScreens/Scan/input_box.dart +++ b/lib/widgets/LabelScreens/Scan/input_box.dart @@ -1,54 +1,54 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class LabelScanInputBox extends StatelessWidget { - const LabelScanInputBox({ - Key key, - @required this.idCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final TextEditingController idCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return TextFormField( - validator: (val) { - if (val.isEmpty) { - return 'Id required!!'; - } - return null; - }, - controller: idCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.sortNumericDown, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Or enter a label ID', - isDense: true, - contentPadding: EdgeInsets.symmetric( - vertical: 2, - horizontal: 3, - ), - focusedBorder: UnderlineInputBorder( - // borderRadius: BorderRadius.only(Radius.circular(4)), - borderSide: BorderSide( - color: Colors.grey, - ), - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.number, - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class LabelScanInputBox extends StatelessWidget { + const LabelScanInputBox({ + Key? key, + required this.idCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController idCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return TextFormField( + validator: (val) { + if (val!.isEmpty) { + return 'Id required!!'; + } + return null; + }, + controller: idCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.sortNumericDown, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Or enter a label ID', + isDense: true, + contentPadding: EdgeInsets.symmetric( + vertical: 2, + horizontal: 3, + ), + focusedBorder: UnderlineInputBorder( + // borderRadius: BorderRadius.only(Radius.circular(4)), + borderSide: BorderSide( + color: Colors.grey, + ), + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.number, + ); + } +} diff --git a/lib/widgets/LabelScreens/Scan/save_button.dart b/lib/widgets/LabelScreens/Scan/save_button.dart index a1843c4..c788b77 100644 --- a/lib/widgets/LabelScreens/Scan/save_button.dart +++ b/lib/widgets/LabelScreens/Scan/save_button.dart @@ -1,58 +1,58 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -class FilterScanSaveButton extends StatelessWidget { - const FilterScanSaveButton({ - Key key, - @required GlobalKey form, - @required this.idCTRL, - @required double deviceBlockSize, - }) : _form = form, - _deviceBlockSize = deviceBlockSize, - super(key: key); - - final GlobalKey _form; - final TextEditingController idCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - if (!_form.currentState.validate()) { - return; - } - launch( - 'https://cssd-doc.com/Show/Label/${idCTRL.text}', - ); - // Navigator.of(context).pushNamed( - // Routes.labelDetailScreen, - // arguments: idCTRL.text, - // ); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - margin: EdgeInsets.only(bottom: 50,left: 20,right: 20), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'GO!', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class FilterScanSaveButton extends StatelessWidget { + const FilterScanSaveButton({ + Key? key, + required GlobalKey form, + required this.idCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final TextEditingController idCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + launch( + 'https://cssd-doc.com/Show/Label/${idCTRL.text}', + ); + // Navigator.of(context).pushNamed( + // Routes.labelDetailScreen, + // arguments: idCTRL.text, + // ); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kLightBlue, kLightBlueSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Search', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/LabelScreens/Scan/scan_box.dart b/lib/widgets/LabelScreens/Scan/scan_box.dart index 51a5d53..2296bab 100644 --- a/lib/widgets/LabelScreens/Scan/scan_box.dart +++ b/lib/widgets/LabelScreens/Scan/scan_box.dart @@ -1,88 +1,88 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:url_launcher/url_launcher.dart'; - -class LabelScanBox extends StatelessWidget { - const LabelScanBox({ - Key key, - }) : super(key: key); - Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } // print(barcode.split('/')); - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } - - // } on FormatException { - // setState(() => this.testCode = - // 'null (User returned using the "back"-button before scanning anything. Result)'); - // } catch (e) { - // setState(() => this.testCode = 'Unknown error: $e'); - // } - // return null; - } - - @override - Widget build(BuildContext context) { - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return GestureDetector( - child: Container( - margin: EdgeInsets.symmetric(vertical: 10), - height: 200, - decoration: BoxDecoration(border: Border.all()), - child: Center( - child: Text( - 'Please Scan The Label Barcode', - style: TextStyle( - color: Colors.black, - fontSize: 5 * _deviceBlockSize, - fontWeight: FontWeight.w100, - letterSpacing: 3, - ), - textAlign: TextAlign.center, - ), - ), - ), - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - launch( - 'https://cssd-doc.com/Show/Label/$result', - ); - // Navigator.of(context).pushNamed( - // Routes.labelDetailScreen, - // arguments: result, - // ); - } - }, - ); - }, - ); - } -} +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class LabelScanBox extends StatelessWidget { + const LabelScanBox({ + Key? key, + }) : super(key: key); + Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } // print(barcode.split('/')); + try { + var id = barcode.rawContent.contains('www.cssd-doc.com') + ? barcode.rawContent.split('/')[5] + : barcode.rawContent; + return id; + } catch (_) { + return 'null'; + } + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } + + // } on FormatException { + // setState(() => this.testCode = + // 'null (User returned using the "back"-button before scanning anything. Result)'); + // } catch (e) { + // setState(() => this.testCode = 'Unknown error: $e'); + // } + // return null; + } + + @override + Widget build(BuildContext context) { + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return GestureDetector( + child: Container( + margin: EdgeInsets.symmetric(vertical: 10), + height: 200, + decoration: BoxDecoration(border: Border.all()), + child: Center( + child: Text( + 'Please Scan The Label Barcode', + style: TextStyle( + color: Colors.black, + fontSize: 5 * _deviceBlockSize, + fontWeight: FontWeight.w100, + letterSpacing: 3, + ), + textAlign: TextAlign.center, + ), + ), + ), + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + launch( + 'https://cssd-doc.com/Show/Label/$result', + ); + // Navigator.of(context).pushNamed( + // Routes.labelDetailScreen, + // arguments: result, + // ); + } + }, + ); + }, + ); + } +} diff --git a/lib/widgets/MyInfo/input_box.dart b/lib/widgets/MyInfo/input_box.dart index 643ade7..a2b4d2b 100644 --- a/lib/widgets/MyInfo/input_box.dart +++ b/lib/widgets/MyInfo/input_box.dart @@ -1,48 +1,48 @@ -import 'package:flutter/material.dart'; - -class InfoInputBox extends StatelessWidget { - const InfoInputBox({ - Key key, - @required this.controller, - @required double deviceBlockSize, - @required String label, - @required IconData icon, - @required TextInputType inputType, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - _icon = icon, - _inputType = inputType, - super(key: key); - - final TextEditingController controller; - final double _deviceBlockSize; - final String _label; - final IconData _icon; - final TextInputType _inputType; - - @override - Widget build(BuildContext context) { - return TextFormField( - controller: controller, - decoration: InputDecoration( - icon: Icon( - _icon, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: _label, - isDense: true, - contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: _inputType, - textInputAction: TextInputAction.next, - ); - } -} +import 'package:flutter/material.dart'; + +class InfoInputBox extends StatelessWidget { + const InfoInputBox({ + Key? key, + required this.controller, + required double deviceBlockSize, + required String label, + required IconData icon, + required TextInputType inputType, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _icon = icon, + _inputType = inputType, + super(key: key); + + final TextEditingController controller; + final double _deviceBlockSize; + final String _label; + final IconData _icon; + final TextInputType _inputType; + + @override + Widget build(BuildContext context) { + return TextFormField( + controller: controller, + decoration: InputDecoration( + icon: Icon( + _icon, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: _label, + isDense: true, + contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: _inputType, + textInputAction: TextInputAction.next, + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart b/lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart new file mode 100644 index 0000000..de646ad --- /dev/null +++ b/lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart @@ -0,0 +1,53 @@ +import 'package:flutter/material.dart'; + +class CancelTransferButton extends StatelessWidget { + const CancelTransferButton( + {Key? key, + required double deviceBlockSize, + required this.color, + required this.onTap}) + : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final Color color; + final VoidCallback onTap; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.close, + color: color, + ), + SizedBox( + width: 5.0, + ), + Text( + 'Let me think again', + style: TextStyle( + color: color, + fontSize: 4 * _deviceBlockSize, + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart new file mode 100644 index 0000000..026df36 --- /dev/null +++ b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart @@ -0,0 +1,536 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/config/routes.dart'; +import 'package:cssd/models/item_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/items.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class MyItemsDetailsDataBox extends StatelessWidget { + const MyItemsDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + required this.push, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final ItemDetailObject datas; + final double _deviceBlockSize; + final VoidCallback push; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + print(datas.status); + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Item Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kDarkBlue, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createdAt, + ), + ), + style: TextStyle( + color: kDarkBlue, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kDarkBlue, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Item Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.name.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Size', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.size.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Specific', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.specific.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'User', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.userName.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'UDI', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.udi.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas.createdAt, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.description.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospital, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Status', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.status == 1 ? 'Success' : 'Failure', + style: TextStyle( + fontWeight: FontWeight.w700, + color: datas.status == 1 ? kDarkBlue : kPink, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 20, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkBlue, + secondColor: kDarkBlueSub, + text: 'Transfer', + onTap: () { + push(); + }, + ), + SizedBox( + height: 10.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kPink, + secondColor: kPinkSub, + text: 'Destroy', + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text( + 'Are you sure to destroy this Item?', + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + content: SizedBox( + width: _deviceBlockSize, + height: 220, + child: Column( + children: [ + Text( + 'By approving, your item will be removed and it can not be used any more.', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + SizedBox( + height: 10.0, + ), + ItemCard(_deviceBlockSize), + SizedBox( + height: 20.0, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kPink, + secondColor: kPinkSub, + onTap: () { + Provider.of(context, + listen: false) + .removeItems(datas.id) + .then( + (value) { + Navigator.of(context).pop(); + Navigator.pushReplacementNamed( + context, + Routes.myItemsResultScreen, + ); + }, + ); + }, + text: 'Destroy', + ), + SizedBox( + height: 5.0, + ), + CancelTransferButton( + deviceBlockSize: _deviceBlockSize, + color: kDarkBlue, + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + ), + ); + }, + ); + }, + ), + SizedBox( + height: 20.0, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/Item/${datas.id.toString()}', + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ), + SizedBox( + height: 30, + ), + ], + ), + ); + } + + Container ItemCard(double _deviceBlockSize) { + return Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + borderRadius: BorderRadius.circular(5), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + datas.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + datas.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Size:', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + Text( + datas.size, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User:', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + datas.userName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart b/lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart new file mode 100644 index 0000000..fe6440b --- /dev/null +++ b/lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart @@ -0,0 +1,88 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/users_model.dart'; +import 'package:flutter/material.dart'; + +class TransferDataBox extends StatelessWidget { + final Users? user; + final Function(String)? onTap; + final bool isClicked; + + const TransferDataBox({ + Key? key, + required double deviceBlockSize, + this.user, + this.onTap, + this.isClicked = false, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + onTap!(user!.id); + }, + child: Card( + elevation: 1, + child: Container( + decoration: isClicked + ? BoxDecoration( + borderRadius: BorderRadius.all( + Radius.circular(10), + ), + border: Border.all(color: kDarkBlue, width: 2.0), + ) + : BoxDecoration(), + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + user!.id.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 30 * _deviceBlockSize, + child: Text( + user!.userName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Text( + user!.phoneNumber, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + color: Colors.grey, + ), + ), + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart b/lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart new file mode 100644 index 0000000..cca5b33 --- /dev/null +++ b/lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart @@ -0,0 +1,47 @@ +import 'package:flutter/material.dart'; + +class TransferDestroyButton extends StatelessWidget { + const TransferDestroyButton({ + Key? key, + required double deviceBlockSize, + required this.firstColor, + required this.secondColor, + required this.onTap, + required this.text, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + final double _deviceBlockSize; + final Color firstColor; + final Color secondColor; + final String text; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [firstColor, secondColor], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + text, + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart b/lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart new file mode 100644 index 0000000..f52a7c9 --- /dev/null +++ b/lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart @@ -0,0 +1,72 @@ +import 'package:cssd/providers/my_items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyItemFilterChip extends StatelessWidget { + const MyItemFilterChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String name, + required String udi, + required String size, + required String specific, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _id = id, + _name = name, + _udi = udi, + _size = size, + _specific = specific, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _id; + final String _name; + final String _udi; + final String _size; + final String _specific; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var itemProvider = + Provider.of(context, listen: false); + itemProvider.setFilters( + _id, + _name, + _udi, + _size, + _specific, + ); + itemProvider.setLoading(); + itemProvider.getMyItems().then( + (_) { + itemProvider.resetLoading(); + }, + ); + }, + ), + ], + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart b/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart new file mode 100644 index 0000000..914bee0 --- /dev/null +++ b/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart @@ -0,0 +1,85 @@ +import 'package:cssd/providers/my_items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyItemFilterSaveButton extends StatelessWidget { + const MyItemFilterSaveButton({ + Key? key, + required this.idCTRL, + required this.nameCTRL, + required this.udiCTRL, + required this.sizeCTRL, + required this.specificCTRL, + required this.firstColor, + required this.secondColor, + required this.push, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController idCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final TextEditingController sizeCTRL; + final TextEditingController specificCTRL; + final Color firstColor; + final Color secondColor; + final String push; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + Provider.of(context, listen: false).setFilters( + idCTRL.text, + nameCTRL.text, + udiCTRL.text, + sizeCTRL.text, + specificCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(push); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + firstColor, + secondColor, + ], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart b/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart new file mode 100644 index 0000000..a52dae2 --- /dev/null +++ b/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart @@ -0,0 +1,61 @@ +import 'package:cssd/models/my_item_model.dart'; +import 'package:flutter/material.dart'; + +class ItemHistoryDate extends StatelessWidget { + const ItemHistoryDate({ + super.key, + required double deviceBlockSize, + required this.items, + }) : _deviceBlockSize = deviceBlockSize; + + final double _deviceBlockSize; + final MyItemResultObject items; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Text( + 'From', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + SizedBox( + width: 6.0, + ), + Text( + items.fromDate!.toString(), + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + Spacer(), + Icon( + Icons.keyboard_arrow_right, + color: Colors.grey, + ), + Spacer(), + Text( + 'To', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + SizedBox( + width: 6.0, + ), + Text( + items.toDate!.toString(), + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart b/lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart new file mode 100644 index 0000000..a8d32cc --- /dev/null +++ b/lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart @@ -0,0 +1,236 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/my_item_model.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class RequestsDataBox extends StatelessWidget { + final MyItemResultObject? item; + + const RequestsDataBox({ + Key? key, + required double deviceBlockSize, + required this.isAdmin, + this.item, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final bool isAdmin; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.myItemsDetailScreen, + arguments: item!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + item!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + item!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Size: ', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + Text( + item!.size, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ), + if (isAdmin) + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + item!.userName.toString(), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Accept'), + content: Text( + 'Are you sure for approve this item?', + ), + actions: [ + TextButton( + onPressed: () async { + Provider.of(context, + listen: false) + .verifyItemRequests( + item!.id, 'approved') + .then((result) { + if (result) { + print('true'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.myItemsResultScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 8 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kDarkBlue, + ), + child: Icon( + Icons.check, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 3, + ), + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Reject'), + content: Text( + 'Are you sure for reject this item?', + ), + actions: [ + TextButton( + onPressed: () async { + Provider.of(context, + listen: false) + .verifyItemRequests( + item!.id, 'rejected') + .then((result) { + if (result) { + print('false'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.myItemsResultScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 8 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kPink, + ), + child: Icon( + Icons.close, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: _deviceBlockSize, + ), + ], + ) + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart b/lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart new file mode 100644 index 0000000..bda34a6 --- /dev/null +++ b/lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart @@ -0,0 +1,176 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/my_item_model.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +import '../../../config/routes.dart'; + +class MyItemsItemDataBox extends StatelessWidget { + final MyItemResultObject? items; + final bool hasHistoryBtn; + final VoidCallback? push; + + const MyItemsItemDataBox({ + Key? key, + required double deviceBlockSize, + this.push, + required this.isAdmin, + this.items, + this.hasHistoryBtn = true, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final bool isAdmin; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.myItemsDetailScreen, + arguments: items!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + items!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + items!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Size: ', + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + Text( + items!.size, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ), + if (isAdmin) + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + items!.userName.toString(), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + if (hasHistoryBtn) + InkWell( + customBorder: CircleBorder(), + onTap: () { + push!(); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kDarkBlue, + ), + child: Icon( + FontAwesomeIcons.history, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.myItemsDetailScreen, + arguments: items!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart b/lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart new file mode 100644 index 0000000..5a979de --- /dev/null +++ b/lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart @@ -0,0 +1,449 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/config/routes.dart'; +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class MyPackageDetailsDataBox extends StatelessWidget { + const MyPackageDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + required this.push, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final PackageDetailObject datas; + final double _deviceBlockSize; + final VoidCallback push; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Package Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kDarkPurple, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + color: kDarkPurple, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kDarkPurple, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Package Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.name.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'UDI', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.udi.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.description.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospitalName, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 30, + ), + Text( + 'Items included', + style: TextStyle( + color: kPurple, + letterSpacing: 3, + fontWeight: FontWeight.w700, + fontSize: 4.5 * _deviceBlockSize, + ), + ), + Container( + width: double.infinity, + padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + border: Border.all( + color: Colors.grey, + ), + ), + child: ListView.separated( + shrinkWrap: true, + itemBuilder: (ctx, index) => RichText( + text: TextSpan( + text: 'Item ID ', + style: TextStyle( + color: Colors.grey, + fontFamily: 'montserrat', + ), + children: [ + TextSpan( + text: datas.items[index], + style: TextStyle( + fontWeight: FontWeight.bold, + color: kDarkPurple, + ), + ), + ], + ), + ), + separatorBuilder: (ctx, index) => Divider(), + itemCount: datas.items.length, + ), + ), + ], + ), + ), + SizedBox( + height: 20, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kDarkPurple, + secondColor: kDarkPurpleSub, + text: 'Transfer', + onTap: () { + push(); + }, + ), + SizedBox( + height: 10.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kPink, + secondColor: kPinkSub, + text: 'Destroy', + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text( + 'Are you sure to destroy this Package?', + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + ), + ), + content: SizedBox( + width: _deviceBlockSize, + height: 220, + child: Column( + children: [ + Text( + 'By approving, your package will be removed and it can not be used any more.', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + SizedBox( + height: 10.0, + ), + PackageCard(_deviceBlockSize), + SizedBox( + height: 20.0, + ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kPink, + secondColor: kPinkSub, + onTap: () { + Provider.of(context, + listen: false) + .removePackages(datas.id) + .then( + (value) { + Navigator.of(context).pop(); + Navigator.pushReplacementNamed( + context, + Routes.myPackagesResultScreen, + ); + }, + ); + }, + text: 'Destroy', + ), + SizedBox( + height: 5.0, + ), + CancelTransferButton( + deviceBlockSize: _deviceBlockSize, + color: kDarkPurple, + onTap: () { + Navigator.pop(context); + }, + ), + ], + ), + ), + ); + }, + ); + }, + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/Package/${datas.id.toString()}', + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ), + SizedBox( + height: 30, + ), + ], + ), + ); + } + + Container PackageCard(double _deviceBlockSize) { + return Container( + decoration: BoxDecoration( + border: Border.all(color: Colors.grey), + borderRadius: BorderRadius.circular(5), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + datas.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + datas.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + // Container( + // width: 30 * _deviceBlockSize, + // child: Row( + // children: [ + // Text( + // 'User:', + // style: TextStyle( + // color: Colors.grey, + // fontSize: 3 * _deviceBlockSize, + // ), + // ), + // Text( + // datas.userName, + // style: TextStyle( + // fontSize: 3 * _deviceBlockSize, + // fontWeight: FontWeight.w700, + // ), + // ), + // ], + // ), + // ), + ], + ), + ], + ), + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart b/lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart new file mode 100644 index 0000000..af655af --- /dev/null +++ b/lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart @@ -0,0 +1,64 @@ +import 'package:cssd/providers/my_packages.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyPackageFilterChip extends StatelessWidget { + const MyPackageFilterChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String name, + required String udi, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _id = id, + _name = name, + _udi = udi, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _id; + final String _name; + final String _udi; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var packageProvider = + Provider.of(context, listen: false); + packageProvider.setFilters( + _id, + _name, + _udi, + ); + packageProvider.setLoading(); + packageProvider.getMyPackages().then( + (_) { + packageProvider.resetLoading(); + }, + ); + }, + ), + ], + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart b/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart new file mode 100644 index 0000000..c87774d --- /dev/null +++ b/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart @@ -0,0 +1,79 @@ +import 'package:cssd/providers/my_packages.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class MyPackagesFilterSaveButton extends StatelessWidget { + const MyPackagesFilterSaveButton({ + Key? key, + required this.idCTRL, + required this.nameCTRL, + required this.udiCTRL, + required this.firstColor, + required this.secondColor, + required this.push, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController idCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final Color firstColor; + final Color secondColor; + final String push; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + Provider.of(context, listen: false).setFilters( + idCTRL.text, + nameCTRL.text, + udiCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(push); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + firstColor, + secondColor, + ], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart b/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart new file mode 100644 index 0000000..20a9e12 --- /dev/null +++ b/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart @@ -0,0 +1,61 @@ +import 'package:cssd/models/my_package_model.dart'; +import 'package:flutter/material.dart'; + +class PackageHistoryDate extends StatelessWidget { + const PackageHistoryDate({ + super.key, + required double deviceBlockSize, + required this.packages, + }) : _deviceBlockSize = deviceBlockSize; + + final double _deviceBlockSize; + final MyPackageResultObject packages; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + Text( + 'From', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + SizedBox( + width: 6.0, + ), + Text( + packages.fromDate!, + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + Spacer(), + Icon( + Icons.keyboard_arrow_right, + color: Colors.grey, + ), + Spacer(), + Text( + 'To', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + SizedBox( + width: 6.0, + ), + Text( + packages.toDate!, + style: TextStyle( + fontSize: 4 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart b/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart new file mode 100644 index 0000000..082675b --- /dev/null +++ b/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart @@ -0,0 +1,153 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/my_package_model.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +import '../../../../config/routes.dart'; + +class MyPackagesItemDataBox extends StatelessWidget { + final MyPackageResultObject? packages; + final bool hasHistoryBtn; + final VoidCallback? push; + + const MyPackagesItemDataBox({ + Key? key, + required double deviceBlockSize, + this.push, + required this.isAdmin, + this.packages, + this.hasHistoryBtn = true, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final bool isAdmin; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.myPackagesDetailScreen, + arguments: packages!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + packages!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + packages!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + if (isAdmin) + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + packages!.userName.toString(), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + if (hasHistoryBtn) + InkWell( + customBorder: CircleBorder(), + onTap: () { + push!(); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kDarkBlue, + ), + child: Icon( + FontAwesomeIcons.history, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.myPackagesDetailScreen, + arguments: packages!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart b/lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart new file mode 100644 index 0000000..58278f2 --- /dev/null +++ b/lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart @@ -0,0 +1,213 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/my_package_model.dart'; +import 'package:cssd/providers/my_items.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class PackageRequestsDataBox extends StatelessWidget { + final MyPackageResultObject? package; + + const PackageRequestsDataBox({ + Key? key, + required double deviceBlockSize, + required this.isAdmin, + this.package, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + final bool isAdmin; + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.myPackagesDetailScreen, + arguments: package!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + package!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40 * _deviceBlockSize, + child: Text( + package!.name, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + if (isAdmin) + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'User: ', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + package!.userName.toString(), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ], + ), + ), + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Accept'), + content: Text( + 'Are you sure for approve this item?', + ), + actions: [ + TextButton( + onPressed: () async { + Provider.of(context, + listen: false) + .verifyItemRequests( + package!.id, 'approved') + .then((result) { + if (result) { + print('true'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.myItemsResultScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 8 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kDarkBlue, + ), + child: Icon( + Icons.check, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 3, + ), + InkWell( + onTap: () { + showDialog( + context: context, + builder: (ctx) => AlertDialog( + title: Text('Reject'), + content: Text( + 'Are you sure for reject this item?', + ), + actions: [ + TextButton( + onPressed: () async { + Provider.of(context, + listen: false) + .verifyItemRequests( + package!.id, 'rejected') + .then((result) { + if (result) { + print('false'); + } + Navigator.of(ctx).pop(); + Navigator.of(context).popAndPushNamed( + Routes.myItemsResultScreen); + }); + }, + child: Text('Yes'), + ), + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('No'), + ), + ], + ), + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 8 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kPink, + ), + child: Icon( + Icons.close, + size: 4 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: _deviceBlockSize, + ), + ], + ) + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/PackageScreens/Add/package_save_button.dart b/lib/widgets/PackageScreens/Add/package_save_button.dart new file mode 100644 index 0000000..29786ac --- /dev/null +++ b/lib/widgets/PackageScreens/Add/package_save_button.dart @@ -0,0 +1,93 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class PackageAddSaveButton extends StatelessWidget { + const PackageAddSaveButton({ + Key? key, + required GlobalKey form, + required this.itemValues, + required this.nameCTRL, + required this.descriptionCTRL, + required this.udiCTRL, + required this.dateValue, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final List itemValues; + final TextEditingController nameCTRL; + final TextEditingController descriptionCTRL; + final TextEditingController udiCTRL; + final String dateValue; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + + List items = []; + for (TextEditingController item in itemValues) { + items.add(item.text); + } + Provider.of(context, listen: false) + .createPackageResult( + nameCTRL.text, + udiCTRL.text, + items, + descriptionCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Package added.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context) + .pushReplacementNamed(Routes.packageResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPurple, kPurpleSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Save', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/PackageScreens/Add/package_update_button.dart b/lib/widgets/PackageScreens/Add/package_update_button.dart new file mode 100644 index 0000000..4058810 --- /dev/null +++ b/lib/widgets/PackageScreens/Add/package_update_button.dart @@ -0,0 +1,89 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/packages.dart'; + +import '../../../config/routes.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class PackageUpdateButton extends StatelessWidget { + const PackageUpdateButton({ + Key? key, + required GlobalKey form, + required this.id, + required this.descriptionCTRL, + required this.nameCTRL, + required this.udiCTRL, + required this.itemCTRL, + required double deviceBlockSize, + }) : _form = form, + _deviceBlockSize = deviceBlockSize, + super(key: key); + + final GlobalKey _form; + final String id; + final TextEditingController descriptionCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final TextEditingController itemCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + if (!_form.currentState!.validate()) { + return; + } + Provider.of(context, listen: false) + .updatePackageResult( + id, + nameCTRL.text, + udiCTRL.text, + descriptionCTRL.text, + int.parse(itemCTRL.text), + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Package updated.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context) + .pushReplacementNamed(Routes.packageResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + // margin: + // EdgeInsets.symmetric(horizontal: 35, vertical: 15), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [kPurple, kPurpleSub], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Update', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/PackageScreens/Details/package_detail_box.dart b/lib/widgets/PackageScreens/Details/package_detail_box.dart new file mode 100644 index 0000000..d87dd90 --- /dev/null +++ b/lib/widgets/PackageScreens/Details/package_detail_box.dart @@ -0,0 +1,290 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/models/package_model.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class PackageDetailsDataBox extends StatelessWidget { + const PackageDetailsDataBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final PackageDetailObject datas; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Package Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(235, 235, 235, 1), + border: Border( + left: BorderSide( + color: kPurple, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + color: kPurple, + ), + ), + Divider(), + Text( + 'ID: ${datas.id}', + style: TextStyle( + color: kPurple, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Package Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.name.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas.createDate, + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'UDI', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.udi.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.description.toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital Name', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas.hospitalName, + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 30, + ), + Text( + 'Items included', + style: TextStyle( + color: kPurple, + letterSpacing: 3, + fontWeight: FontWeight.w700, + fontSize: 4.5 * _deviceBlockSize, + ), + ), + Container( + width: double.infinity, + padding: EdgeInsets.symmetric(vertical: 10, horizontal: 20), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + border: Border.all( + color: Colors.grey, + ), + ), + child: ListView.separated( + shrinkWrap: true, + itemBuilder: (ctx, index) => RichText( + text: TextSpan( + text: 'Item ID ', + style: TextStyle( + color: Colors.grey, + fontFamily: 'montserrat', + ), + children: [ + TextSpan( + text: datas.items[index], + style: TextStyle( + fontWeight: FontWeight.bold, + color: kPurple, + ), + ), + ], + ), + ), + separatorBuilder: (ctx, index) => Divider(), + itemCount: datas.items.length, + ), + ), + SizedBox( + height: 50, + ) + ], + ), + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/Package/${datas.id.toString()}', + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ), + SizedBox( + height: 30, + ), + ], + ), + ); + } +} diff --git a/lib/widgets/PackageScreens/Filter/filter_button.dart b/lib/widgets/PackageScreens/Filter/filter_button.dart new file mode 100644 index 0000000..be226da --- /dev/null +++ b/lib/widgets/PackageScreens/Filter/filter_button.dart @@ -0,0 +1,89 @@ +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class PackageFilterSaveButton extends StatelessWidget { + const PackageFilterSaveButton({ + Key? key, + required this.hospitalVals, + required this.hospitalCTRL, + required this.idCTRL, + required this.nameCTRL, + required this.udiCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final List> hospitalVals; + final TextEditingController hospitalCTRL; + final TextEditingController idCTRL; + final TextEditingController nameCTRL; + final TextEditingController udiCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () { + String? hospitalID; + hospitalVals.forEach( + (hospital) { + if (hospital['name'] == hospitalCTRL.text) { + hospitalID = hospital['id']!; + } + }, + ); + Provider.of(context, listen: false).setFilters( + idCTRL.text, + nameCTRL.text, + hospitalID, + udiCTRL.text, + ); + showDialog( + context: context, + builder: (ctx) => AlertDialog( + content: Text('Filters changed.'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(ctx).pop(); + }, + child: Text('Ok'), + ) + ], + ), + ).then((_) { + Navigator.of(context).popAndPushNamed(Routes.packageResultScreen); + }); + }, + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 5 * _deviceBlockSize, + vertical: 10, + ), + decoration: BoxDecoration( + gradient: LinearGradient( + colors: [ + kPurple, + kPurpleSub, + ], + ), + borderRadius: BorderRadius.circular(7), + ), + child: Align( + alignment: Alignment.center, + child: Text( + 'Filter', + style: TextStyle( + color: Colors.white, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + ), + ); + } +} diff --git a/lib/widgets/PackageScreens/Filter/package_filter_object.dart b/lib/widgets/PackageScreens/Filter/package_filter_object.dart new file mode 100644 index 0000000..4d4ff6a --- /dev/null +++ b/lib/widgets/PackageScreens/Filter/package_filter_object.dart @@ -0,0 +1,68 @@ +import 'package:cssd/providers/packages.dart'; +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +class PackageFilterChip extends StatelessWidget { + const PackageFilterChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String name, + required String hospital, + required String udi, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + _id = id, + _name = name, + _hospital = hospital, + _udi = udi, + super(key: key); + + final double _deviceBlockSize; + final String _label; + final String _id; + final String _name; + final String _hospital; + final String _udi; + + @override + Widget build(BuildContext context) { + return Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var packageProvider = + Provider.of(context, listen: false); + packageProvider.setFilters( + _id, + _name, + _hospital, + _udi, + ); + packageProvider.setLoading(); + packageProvider.getPackageResults().then( + (_) { + packageProvider.resetLoading(); + }, + ); + }, + ), + ], + ); + } +} diff --git a/lib/widgets/PackageScreens/Result/package_data_box.dart b/lib/widgets/PackageScreens/Result/package_data_box.dart new file mode 100644 index 0000000..42d9a85 --- /dev/null +++ b/lib/widgets/PackageScreens/Result/package_data_box.dart @@ -0,0 +1,204 @@ +import 'package:cssd/models/package_model.dart'; +import 'package:cssd/providers/auth.dart'; +import 'package:cssd/providers/packages.dart'; +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; + +class PackageItemBox extends StatelessWidget { + final PackageResultObject? item; + + const PackageItemBox({ + Key? key, + required double deviceBlockSize, + this.item, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; + return GestureDetector( + onTap: () => Navigator.of(context).pushNamed( + Routes.packageDetailScreen, + arguments: item!.id, + ), + child: Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + item!.id, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + ), + ), + SizedBox( + width: 3 * _deviceBlockSize, + ), + // Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 30 * _deviceBlockSize, + child: Text( + 'Package Name:', + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + color: Colors.grey, + ), + ), + ), + Container( + width: 40 * _deviceBlockSize, + child: Text( + item!.name, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 3 * _deviceBlockSize, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Row( + children: [ + Text( + 'Date:', + style: TextStyle( + color: Colors.grey, + fontSize: 3 * _deviceBlockSize, + ), + ), + Text( + DateFormat('y-M-d').format( + DateTime.parse( + item!.createdAt, + ), + ), + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + ), + ), + ], + ), + ) + ], + ), + Spacer(), + Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.packageUpdateScreen, + arguments: item!.id, + ); + }, + child: Icon( + Icons.edit, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + userData['roles']?.contains('User') ?? false + ? Container() + : InkWell( + customBorder: CircleBorder(), + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: Text('Delete'), + content: Text( + 'Are you sure you want delete this Package?', + ), + actions: [ + TextButton( + child: Text('Yes'), + onPressed: () { + Navigator.of(context).pop(); + Provider.of( + context, + listen: false) + .removePackages(item!.id); + }, + ), + TextButton( + child: Text('No'), + onPressed: () { + Navigator.of(context).pop(); + }, + ), + ], + ); + }, + ); + }, + child: Icon( + Icons.delete, + size: 5 * _deviceBlockSize, + color: Colors.black, + ), + ), + SizedBox( + width: 5.0, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed( + Routes.packageDetailScreen, + arguments: item!.id, + ); + }, + child: Container( + padding: EdgeInsets.all(7), + width: 9 * _deviceBlockSize, + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + FontAwesomeIcons.fileAlt, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ), + ], + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Add/capture_image.dart b/lib/widgets/TestResultScreens/Add/capture_image.dart index 877c82f..25ffab8 100644 --- a/lib/widgets/TestResultScreens/Add/capture_image.dart +++ b/lib/widgets/TestResultScreens/Add/capture_image.dart @@ -1,320 +1,328 @@ -import 'dart:async'; -import 'dart:io'; - -import 'package:camera/camera.dart'; -import 'package:file_picker/file_picker.dart'; -import 'package:flutter/material.dart'; -import 'package:path_provider/path_provider.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/test_results.dart'; - -class CaptureImage extends StatefulWidget { - @override - _CaptureImageState createState() { - return _CaptureImageState(); - } -} - -/// Returns a suitable camera icon for [direction]. -IconData getCameraLensIcon(CameraLensDirection direction) { - switch (direction) { - case CameraLensDirection.back: - return Icons.camera_rear; - case CameraLensDirection.front: - return Icons.camera_front; - case CameraLensDirection.external: - return Icons.camera; - } - throw ArgumentError('Unknown lens direction'); -} - -void logError(String code, String message) => - print('Error: $code\nError Message: $message'); - -class _CaptureImageState extends State - with WidgetsBindingObserver { - CameraController controller; - String imagePath; - // String videoPath; - VoidCallback videoPlayerListener; - bool isInit = true; - int curCamera = 0; - var cameras; - @override - void initState() { - super.initState(); - WidgetsBinding.instance.addObserver(this); - } - - @override - void didChangeDependencies() async { - if (isInit) { - cameras = await availableCameras(); - onNewCameraSelected(cameras[curCamera]); - setState(() { - isInit = false; - }); - } - super.didChangeDependencies(); - } - - @override - void dispose() { - WidgetsBinding.instance.removeObserver(this); - super.dispose(); - } - - @override - void didChangeAppLifecycleState(AppLifecycleState state) { - // App state changed before we got the chance to initialize. - if (controller == null || !controller.value.isInitialized) { - return; - } - if (state == AppLifecycleState.inactive) { - controller?.dispose(); - } else if (state == AppLifecycleState.resumed) { - if (controller != null) { - onNewCameraSelected(controller.description); - } - } - } - - final GlobalKey _scaffoldKey = GlobalKey(); - - @override - Widget build(BuildContext context) { - return SafeArea( - child: Scaffold( - key: _scaffoldKey, - // appBar: AppBar( - // title: const Text('Take Picture'), - // ), - body: isInit - ? Center( - child: CircularProgressIndicator(), - ) - : Stack(children: [ - _cameraPreviewWidget(), - Positioned( - bottom: 100, left: 100, child: _captureControlRowWidget()), - Positioned( - bottom: 100, - right: 100, - child: InkWell( - onTap: () { - if (curCamera == 0) { - try { - onNewCameraSelected(cameras[1]); - setState(() { - curCamera = 1; - }); - } catch (e) {} - } else { - onNewCameraSelected(cameras[0]); - setState(() { - curCamera = 0; - }); - } - }, - child: Icon( - curCamera == 0 ? Icons.camera_rear : Icons.camera_front, - size: 40, - color: Colors.white, - ), - ), - ), - // _cameraTogglesRowWidget(cameras), - ]), - ), - ); - } - - /// Display the preview from the camera (or a message if the preview is not available). - Widget _cameraPreviewWidget() { - if (controller == null || !controller.value.isInitialized) { - return const Text( - 'Tap a camera', - style: TextStyle( - color: Colors.white, - fontSize: 24.0, - fontWeight: FontWeight.w900, - ), - ); - } else { - return Container( - width: double.infinity, - child: CameraPreview(controller), - ); - } - } - - /// Toggle recording audio - - /// Display the control bar with buttons to take pictures and record videos. - Widget _captureControlRowWidget() { - return Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - mainAxisSize: MainAxisSize.max, - children: [ - IconButton( - icon: const Icon( - Icons.camera_alt, - size: 40, - color: Colors.white, - ), - // color: Colors.blue, - onPressed: controller != null && - controller.value.isInitialized && - !controller.value.isRecordingVideo - ? onTakePictureButtonPressed - : null, - ), - ], - ); - } - - getCameras() async { - return await availableCameras(); - } - - /// Display a row of toggle to select the camera (or a message if no camera is available). - // Widget _cameraTogglesRowWidget(var cameras) { - // final List toggles = []; - - // if (cameras.isEmpty) { - // return const Text('No camera found'); - // } else { - // for (CameraDescription cameraDescription in cameras) { - // print("${cameraDescription.name}"); - // toggles.add( - // SizedBox( - // width: 90.0, - // child: RadioListTile( - // title: Icon(getCameraLensIcon(cameraDescription.lensDirection)), - // groupValue: controller?.description, - // value: cameraDescription, - // onChanged: controller != null && controller.value.isRecordingVideo - // ? null - // : onNewCameraSelected, - // ), - // ), - // ); - // } - // } - - // return Row(children: toggles); - // } - - String timestamp() => DateTime.now().millisecondsSinceEpoch.toString(); - - void showInSnackBar(String message) { - _scaffoldKey.currentState.showSnackBar(SnackBar(content: Text(message))); - } - - void onNewCameraSelected(CameraDescription cameraDescription) async { - print(cameraDescription.lensDirection.toString()); - if (controller != null) { - await controller.dispose(); - } - controller = CameraController( - cameraDescription, - ResolutionPreset.medium, - // enableAudio: enableAudio, - ); - - // If the controller is updated then update the UI. - controller.addListener(() { - if (mounted) setState(() {}); - if (controller.value.hasError) { - showInSnackBar('Camera error ${controller.value.errorDescription}'); - } - }); - - try { - await controller.initialize(); - } on CameraException catch (e) { - _showCameraException(e); - } - - if (mounted) { - setState(() {}); - } - } - - void onTakePictureButtonPressed() { - takePicture().then((String filePath) { - if (mounted) { - setState(() { - imagePath = filePath; - var profileProviderObject = - Provider.of(context, listen: false); - List files = profileProviderObject.catchImages; - print(imagePath); - files.add(PlatformFile( - name: 'test', - size: 0, - path: imagePath, - bytes: File(imagePath).readAsBytesSync())); - profileProviderObject.setCatchImages(files); - profileProviderObject.setImages(); - print(imagePath); - }); - if (filePath != null) { - Navigator.of(context).pop(); - // showInSnackBar('Picture saved to $filePath'); - } - } - }); - } - - Future takePicture() async { - if (!controller.value.isInitialized) { - showInSnackBar('Error: select a camera first.'); - return null; - } - final Directory extDir = await getApplicationDocumentsDirectory(); - final String dirPath = '${extDir.path}/Pictures/flutter_test'; - await Directory(dirPath).create(recursive: true); - final String filePath = '$dirPath/${timestamp()}.jpg'; - - if (controller.value.isTakingPicture) { - // A capture is already pending, do nothing. - return null; - } - - try { - await controller.takePicture(filePath); - } on CameraException catch (e) { - _showCameraException(e); - return null; - } - return filePath; - } - - void _showCameraException(CameraException e) { - logError(e.code, e.description); - showInSnackBar('Error: ${e.code}\n${e.description}'); - } -} - -// class CameraApp extends StatelessWidget { -// @override -// Widget build(BuildContext context) { -// return MaterialApp( -// home: CaptureImage(), -// ); -// } -// } - -// List cameras = []; - -// Future main() async { -// // Fetch the available cameras before initializing the app. -// try { -// WidgetsFlutterBinding.ensureInitialized(); -// } on CameraException catch (e) { -// logError(e.code, e.description); -// } -// runApp(CameraApp()); -// } +// ignore_for_file: dead_code + +import 'dart:async'; +import 'dart:io'; + +import 'package:camera/camera.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; +import 'package:path_provider/path_provider.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/test_results.dart'; + +class CaptureImage extends StatefulWidget { + @override + _CaptureImageState createState() { + return _CaptureImageState(); + } +} + +/// Returns a suitable camera icon for [direction]. +IconData getCameraLensIcon(CameraLensDirection direction) { + switch (direction) { + case CameraLensDirection.back: + return Icons.camera_rear; + case CameraLensDirection.front: + return Icons.camera_front; + case CameraLensDirection.external: + return Icons.camera; + } + throw ArgumentError('Unknown lens direction'); +} + +void logError(String code, String message) => + print('Error: $code\nError Message: $message'); + +class _CaptureImageState extends State + with WidgetsBindingObserver { + CameraController? controller; + String? imagePath; + // String videoPath; + VoidCallback? videoPlayerListener; + bool isInit = true; + int curCamera = 0; + var cameras; + @override + void initState() { + super.initState(); + WidgetsBinding.instance.addObserver(this); + } + + @override + void didChangeDependencies() async { + if (isInit) { + cameras = await availableCameras(); + onNewCameraSelected(cameras[curCamera]); + setState(() { + isInit = false; + }); + } + super.didChangeDependencies(); + } + + @override + void dispose() { + WidgetsBinding.instance.removeObserver(this); + super.dispose(); + } + + @override + void didChangeAppLifecycleState(AppLifecycleState state) { + // App state changed before we got the chance to initialize. + if (controller == null || !controller!.value.isInitialized) { + return; + } + if (state == AppLifecycleState.inactive) { + controller?.dispose(); + } else if (state == AppLifecycleState.resumed) { + if (controller != null) { + onNewCameraSelected(controller!.description); + } + } + } + + final GlobalKey _scaffoldKey = GlobalKey(); + + @override + Widget build(BuildContext context) { + return SafeArea( + child: Scaffold( + key: _scaffoldKey, + // appBar: AppBar( + // title: const Text('Take Picture'), + // ), + body: isInit + ? Center( + child: CircularProgressIndicator( + color: Colors.black, + ), + ) + : Stack(children: [ + _cameraPreviewWidget(), + Positioned( + bottom: 100, left: 100, child: _captureControlRowWidget()), + Positioned( + bottom: 100, + right: 100, + child: InkWell( + onTap: () { + if (curCamera == 0) { + try { + onNewCameraSelected(cameras[1]); + setState(() { + curCamera = 1; + }); + } catch (e) {} + } else { + onNewCameraSelected(cameras[0]); + setState(() { + curCamera = 0; + }); + } + }, + child: Icon( + curCamera == 0 ? Icons.camera_rear : Icons.camera_front, + size: 40, + color: Colors.white, + ), + ), + ), + // _cameraTogglesRowWidget(cameras), + ]), + ), + ); + } + + /// Display the preview from the camera (or a message if the preview is not available). + Widget _cameraPreviewWidget() { + if (controller == null || !controller!.value.isInitialized) { + return const Text( + 'Tap a camera', + style: TextStyle( + color: Colors.white, + fontSize: 24.0, + fontWeight: FontWeight.w900, + ), + ); + } else { + return Container( + width: double.infinity, + child: CameraPreview(controller!), + ); + } + } + + /// Toggle recording audio + + /// Display the control bar with buttons to take pictures and record videos. + Widget _captureControlRowWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisSize: MainAxisSize.max, + children: [ + IconButton( + icon: const Icon( + Icons.camera_alt, + size: 40, + color: Colors.white, + ), + // color: Colors.blue, + onPressed: controller != null && + controller!.value.isInitialized && + !controller!.value.isRecordingVideo + ? onTakePictureButtonPressed + : null, + ), + ], + ); + } + + getCameras() async { + return await availableCameras(); + } + + /// Display a row of toggle to select the camera (or a message if no camera is available). + // Widget _cameraTogglesRowWidget(var cameras) { + // final List toggles = []; + + // if (cameras.isEmpty) { + // return const Text('No camera found'); + // } else { + // for (CameraDescription cameraDescription in cameras) { + // print("${cameraDescription.name}"); + // toggles.add( + // SizedBox( + // width: 90.0, + // child: RadioListTile( + // title: Icon(getCameraLensIcon(cameraDescription.lensDirection)), + // groupValue: controller?.description, + // value: cameraDescription, + // onChanged: controller != null && controller.value.isRecordingVideo + // ? null + // : onNewCameraSelected, + // ), + // ), + // ); + // } + // } + + // return Row(children: toggles); + // } + + String timestamp() => DateTime.now().millisecondsSinceEpoch.toString(); + + void showInSnackBar(String message) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(message), + ), + ); + } + + void onNewCameraSelected(CameraDescription cameraDescription) async { + print(cameraDescription.lensDirection.toString()); + if (controller != null) { + await controller!.dispose(); + } + controller = CameraController( + cameraDescription, + ResolutionPreset.medium, + // enableAudio: enableAudio, + ); + + // If the controller is updated then update the UI. + controller!.addListener(() { + if (mounted) setState(() {}); + if (controller!.value.hasError) { + showInSnackBar('Camera error ${controller!.value.errorDescription}'); + } + }); + + try { + await controller!.initialize(); + } on CameraException catch (e) { + _showCameraException(e); + } + + if (mounted) { + setState(() {}); + } + } + + void onTakePictureButtonPressed() { + takePicture().then((String? filePath) { + if (mounted) { + setState(() { + imagePath = filePath; + var profileProviderObject = + Provider.of(context, listen: false); + List files = profileProviderObject.catchImages; + print(imagePath); + files.add(PlatformFile( + name: 'test', + size: 0, + path: imagePath, + bytes: File(imagePath!).readAsBytesSync())); + profileProviderObject.setCatchImages(files); + profileProviderObject.setImages(); + print(imagePath); + }); + if (filePath != null) { + Navigator.of(context).pop(); + // showInSnackBar('Picture saved to $filePath'); + } + } + }); + } + + Future takePicture() async { + if (!controller!.value.isInitialized) { + showInSnackBar('Error: select a camera first.'); + return null; + } + final Directory extDir = await getApplicationDocumentsDirectory(); + final String dirPath = '${extDir.path}/Pictures/flutter_test'; + await Directory(dirPath).create(recursive: true); + final String filePath = '$dirPath/${timestamp()}.jpg'; + + if (controller!.value.isTakingPicture) { + // A capture is already pending, do nothing. + return null; + } + + try { + await controller!.takePicture(); + } on CameraException catch (e) { + _showCameraException(e); + return null; + } + return filePath; + } + + void _showCameraException(CameraException e) { + logError(e.code, e.description!); + showInSnackBar('Error: ${e.code}\n${e.description}'); + } +} + +// class CameraApp extends StatelessWidget { +// @override +// Widget build(BuildContext context) { +// return MaterialApp( +// home: CaptureImage(), +// ); +// } +// } + +// List cameras = []; + +// Future main() async { +// // Fetch the available cameras before initializing the app. +// try { +// WidgetsFlutterBinding.ensureInitialized(); +// } on CameraException catch (e) { +// logError(e.code, e.description); +// } +// runApp(CameraApp()); +// } diff --git a/lib/widgets/TestResultScreens/Add/form_creator.dart b/lib/widgets/TestResultScreens/Add/form_creator.dart index 5181356..24cce32 100644 --- a/lib/widgets/TestResultScreens/Add/form_creator.dart +++ b/lib/widgets/TestResultScreens/Add/form_creator.dart @@ -1,724 +1,744 @@ -import 'package:barcode_scan2/barcode_scan2.dart'; -import 'package:file_picker/file_picker.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; -import 'package:flutter/services.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:image_picker_gallery_camera/image_picker_gallery_camera.dart'; -import 'package:meta/meta.dart'; -import 'package:multiselect_formfield/multiselect_formfield.dart'; -import 'package:provider/provider.dart'; - -import '../../../config/routes.dart'; -import '../../../providers/test_results.dart'; - -class FormCreator extends StatefulWidget { - const FormCreator({ - @required this.form, - @required this.onChanged, - this.padding, - }); - - final dynamic form; - final double padding; - final ValueChanged onChanged; - - @override - _FormCreatorState createState() => _FormCreatorState(form); -} - -class _FormCreatorState extends State { - final dynamic formItems; - DateTime selectedDate = DateTime.now(); - - int rangeValue; - String selectValue; - - Future _selectDate() async { - final DateTime picked = await showDatePicker( - context: context, - initialDate: selectedDate, - firstDate: DateTime(2015, 8), - lastDate: DateTime(2101)); - if (picked != null && picked != selectedDate) - setState(() { - selectedDate = picked; - }); - } - - List jsonToForm() { - List listWidgets = List(); - - for (var count = 0; count < formItems.length; count++) { - Map item = formItems[count]; - - if (item['type'] == "Date") { - selectedDate = formItems[count]['value']; - listWidgets.add( - OutlineButton( - onPressed: () { - _selectDate().then((_) { - formItems[count]['value'] = selectedDate; - _handleChanged(); - }); - }, - child: Text( - 'Date: ${selectedDate.year}/${selectedDate.month}/${selectedDate.day}'), - padding: EdgeInsets.symmetric(vertical: 20), - ), - ); - } - if (item['type'] == 'Image') { - final testProviderObject = Provider.of(context); - final mediaData = MediaQuery.of(context); - final deviceWidth = mediaData.size.width; - final _deviceBlockSize = deviceWidth / 100; - listWidgets.insert( - 3, - Container( - // height: 70, - child: Directionality( - textDirection: TextDirection.rtl, - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Container( - margin: EdgeInsets.only(top: 20), - height: testProviderObject.catchImages.length != 0 ? 60 : 0, - child: ImageBox( - deviceBlockSize: _deviceBlockSize, - testProvider: testProviderObject, - ), - ), - SizedBox( - height: testProviderObject.catchImages.length != 0 ? 10 : 0, - ), - InkWell( - onTap: () async { - await loadAssets(context); - }, - child: Container( - width: MediaQuery.of(context).size.width - 40, - padding: - EdgeInsets.symmetric(vertical: 10, horizontal: 30), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - color: Colors.black, - ), - child: Text( - '+ Add an image or file from device', - textDirection: TextDirection.ltr, - style: TextStyle(color: Colors.white), - textAlign: TextAlign.center, - ), - ), - ), - SizedBox( - height: 10, - ), - InkWell( - onTap: () async { - await Navigator.of(context) - .pushNamed(Routes.captureImageScreen); - // await captureImage(context); - }, - child: Container( - width: MediaQuery.of(context).size.width - 40, - padding: - EdgeInsets.symmetric(vertical: 10, horizontal: 30), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - color: Colors.black, - ), - child: Text( - '+ Add an image from camera', - textDirection: TextDirection.ltr, - style: TextStyle(color: Colors.white), - textAlign: TextAlign.center, - ), - ), - ), - ], - ), - ), - ), - ); - } - if (item['type'] == "Label") { - listWidgets.add( - Container( - decoration: BoxDecoration( - border: Border.all(), - borderRadius: BorderRadius.circular(30), - color: Colors.black, - ), - padding: EdgeInsets.only(top: 20, bottom: 20), - margin: EdgeInsets.only(bottom: 20), - child: Text( - item['name'], - textAlign: TextAlign.center, - style: TextStyle(color: Colors.white, fontSize: 20), - ), - ), - ); - } - - if (item['type'] == "Text") { - // print(item['require_scanner'].toString()); - TextEditingController idCTRL = new TextEditingController(); - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - listWidgets.add( - Padding( - padding: const EdgeInsets.all(8.0), - child: item['require_scanner'].toString() != '1' - ? TextFormField( - controller: idCTRL, - decoration: InputDecoration( - labelText: item['name'] ?? "", - border: UnderlineInputBorder(), - contentPadding: EdgeInsets.all(0), - ), - // initialValue: item['value'] ?? '', - onChanged: (String value) { - formItems[count]['value'] = value; - _handleChanged(); - }, - ) - : Container( - child: Row( - children: [ - Flexible( - flex: 8, - child: TextFormField( - controller: idCTRL, - decoration: InputDecoration( - labelText: item['name'] ?? "", - border: UnderlineInputBorder(), - contentPadding: EdgeInsets.all(0), - ), - // initialValue: item['value'] ?? '', - onChanged: (String value) { - formItems[count]['value'] = value; - _handleChanged(); - }, - ), - ), - Flexible( - flex: 1, - child: InkWell( - onTap: () { - scan().then( - (String result) { - if (result == 'cancel') { - print('cancel'); - } else if (result == 'error') { - print('error'); - } else if (result == 'access') { - print('access'); - } else { - print(result); - idCTRL.text = result; - formItems[count]['value'] = result; - _handleChanged(); - // Navigator.of(context).pushNamed( - // CycleDetailScreen.route, - // arguments: result, - // ); - } - }, - ); - }, - child: Container( - padding: EdgeInsets.all(8), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 5 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ), - ], - ), - ), - ), - ); - } - - if (item['type'] == "Range" || - item['type'] == "Temperature" || - item['type'] == "Pressure") { - double startValue, endValue; - if (item['type'] == "Range") { - startValue = double.parse(item['options'][0]['title']); - endValue = double.parse(item['options'][1]['title']); - } else { - startValue = item['type'] == "Temperature" ? 0.0 : -1.0; - endValue = item['type'] == "Temperature" ? 200.0 : 3.0; - } - - formItems[count]['value'] = formItems[count]['value'] ?? startValue; - // int divisions = (endValue - startValue).round(); - listWidgets.add( - Padding( - padding: EdgeInsets.only(top: 35, left: 10, right: 10), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text(item['type']), - Text(formItems[count]['value'].toString()), - ], - ), - Slider( - min: startValue, - max: endValue, - value: formItems[count]['value'], - // label: '${formItems[count]['value'].round()}', - // divisions: divisions, - onChanged: (double value) { - setState(() { - formItems[count]['value'] = - double.parse(value.toStringAsFixed(2)); - }); - // print(formItems[count]['value']); - }, - // semanticFormatterCallback: (double newValue) { - // return '${newValue.round()}'; - // }, - ), - ], - )), - ); - } - - if (item['type'] == "Time") { - listWidgets.add( - Padding( - padding: const EdgeInsets.all(8.0), - child: TextFormField( - inputFormatters: [ - LengthLimitingTextInputFormatter(5), - WhitelistingTextInputFormatter.digitsOnly, - // BlacklistingTextInputFormatter.singleLineFormatter, - TextInputFormatter.withFunction( - (TextEditingValue oldValue, TextEditingValue newValue) { - final int newTextLength = newValue.text.length; - int selectionIndex = newValue.selection.end; - int usedSubstringIndex = 0; - final StringBuffer newText = StringBuffer(); - if (newTextLength >= 2) { - newText.write( - newValue.text.substring(0, usedSubstringIndex = 2) + - ':'); - if (newValue.selection.end >= 2) selectionIndex++; - } - // Dump the rest. - if (newTextLength >= usedSubstringIndex) - newText.write(newValue.text.substring(usedSubstringIndex)); - return TextEditingValue( - text: newText.toString(), - selection: TextSelection.collapsed(offset: selectionIndex), - ); - }) - ], - keyboardType: TextInputType.datetime, - decoration: InputDecoration( - labelText: item['name'] ?? "", - border: UnderlineInputBorder(), - contentPadding: EdgeInsets.all(0), - ), - // initialValue: item['value'] ?? '', - onChanged: (String value) { - formItems[count]['value'] = value; - _handleChanged(); - }, - ), - ), - ); - } - - if (item['type'] == "Select") { - var listItems = item['options'] as List; - listWidgets.add(MultiSelectFormField( - autovalidate: false, - titleText: item['name'], - dataSource: listItems, - textField: 'title', - valueField: 'id', - okButtonLabel: 'OK', - cancelButtonLabel: 'CANCEL', - hintText: 'Please choose one or more', - value: item['value'], - onSaved: (value) { - if (value == null) return; - setState(() { - item['value'] = value; - }); - _handleChanged(); - }, - )); - - // listWidgets.add( - // DropdownButtonFormField( - // items: listItems.map((dynamic value) { - // String stringValue = value['id'].toString(); - // String textValue = value['title'].toString(); - // return DropdownMenuItem( - // value: stringValue, - // child: Text(textValue), - // ); - // }).toList(), - // isDense: true, - // value: item['value'], - // hint: Text(item['name']), - - // onChanged: (String value) { - // this.setState( - // () { - // _setInput(item['name'], value); - // formItems[count]['value'] = value; - // _handleChanged(); - // }, - // ); - // }, - // ), - // ); - } - - if (item['type'] == "Radiobutton") { - listWidgets.add( - Container( - margin: EdgeInsets.only(top: 14.0, bottom: 0), - child: Text( - item['name'], - style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), - ), - ), - ); - var valueOrFirst = - formItems[count]['value'] ?? formItems[count]['options'][0]['id']; - for (var i = 0; i < item['options'].length; i++) { - var isSelected = formItems[count]['options'][i]['id'] == valueOrFirst; - formItems[count]['value'] = valueOrFirst; - listWidgets.add( - RadioListTile( - dense: true, - controlAffinity: ListTileControlAffinity.trailing, - title: Text(formItems[count]['options'][i]['title']), - value: formItems[count]['options'][i]['id'], - selected: isSelected, - groupValue: formItems[count]['value'], - onChanged: (int value) { - this.setState( - () { - _setInput(item['name'], value.toString()); - formItems[count]['value'] = value; - _handleChanged(); - }, - ); - }, - ), - ); - } - } - - if (item['type'] == "Switch") { - listWidgets.add(SwitchListTile( - activeColor: Colors.green, - inactiveTrackColor: Colors.red.withAlpha(150), - inactiveThumbColor: Colors.red, - title: Text(item['name']), - value: item['value'] ?? false, - onChanged: (bool value) { - this.setState(() { - formItems[count]['value'] = value; - _handleChanged(); - }); - })); - } - - if (item['type'] == "Form") { - listWidgets.add( - Container( - margin: EdgeInsets.symmetric(vertical: 10), - decoration: BoxDecoration(border: Border.all()), - child: Column( - children: [ - Container( - margin: EdgeInsets.only(top: 10), - child: Text( - item['name'], - style: - TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), - ), - ), - FormCreator( - form: item['children'], - padding: 4, - onChanged: (value) { - // _handleChanged(); - }, - ), - ], - ), - ), - ); - } - - if (item['type'] == "Checkbox") { - formItems[count]['value'] = formItems[count]['value'] ?? []; - listWidgets.add( - Container( - margin: EdgeInsets.only(top: 14.0, bottom: 0), - child: Text( - item['name'], - style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), - ), - ), - ); - for (var i = 0; i < item['options'].length; i++) { - listWidgets.add( - CheckboxListTile( - title: Text(formItems[count]['options'][i]['title']), - value: (formItems[count]['value'] ?? []) - .contains(formItems[count]['options'][i]['id']), - onChanged: (bool value) { - this.setState( - () { - setState(() { - if (value) { - (formItems[count]['value'] as List) - .add(formItems[count]['options'][i]['id']); - } else { - (formItems[count]['value'] as List) - .remove(formItems[count]['options'][i]['id']); - } - }); - _handleChanged(); - }, - ); - }, - ), - ); - } - } - // listWidgets.add( - // TestResultAddSaveButton( - // deviceBlockSize: null, - // ), - // ); - } - - return listWidgets; - } - - Future captureImage(BuildContext context) async { - var profileProviderObject = - Provider.of(context, listen: false); - List files = profileProviderObject.catchImages; - try { - files.add( - await ImagePickerGC.pickImage( - context: context, - source: ImgSource.Camera, - cameraIcon: Icon( - Icons.camera_alt, - color: Colors.red, - ), //cameraIcon and galleryIcon can change. If no icon provided default icon will be present - cameraText: Text( - "From Camera", - style: TextStyle(color: Colors.red), - ), - ), - ); - } catch (e) {} - profileProviderObject.setCatchImages(files); - profileProviderObject.setImages(); - } - - Future loadAssets(BuildContext context) async { - var profileProviderObject = - Provider.of(context, listen: false); - List files = profileProviderObject.catchImages; - try { - var datas = await FilePicker.platform.pickFiles( - type: FileType.custom, - allowedExtensions: ['jpg', 'png', 'bmp', 'jpeg', 'pdf', 'docx', 'doc'], - withData: true, - withReadStream: true, - ); - files += datas.files; - // files += - - // print(files); - } catch (_) {} - - profileProviderObject.setCatchImages(files); - profileProviderObject.setImages(); - // profileProviderObject.addImage(); - } - - _FormCreatorState(this.formItems); - - void _handleChanged() { - widget.onChanged(formItems); - } - - void _setInput(String key, String value) {} - - @override - Widget build(BuildContext context) { - return ListView.builder( - padding: EdgeInsets.all(widget.padding ?? 16.0), - itemCount: jsonToForm().length, - itemBuilder: (context, index) { - return jsonToForm()[index]; - }, - shrinkWrap: true, - controller: ScrollController(keepScrollOffset: false), - ); - } -} - -class ImageBox extends StatelessWidget { - const ImageBox({ - Key key, - @required double deviceBlockSize, - @required TestResultsProvider testProvider, - }) : _deviceBlockSize = deviceBlockSize, - _testProvider = testProvider, - super(key: key); - - final double _deviceBlockSize; - final TestResultsProvider _testProvider; - - @override - Widget build(BuildContext context) { - return ListView.separated( - shrinkWrap: true, - scrollDirection: Axis.horizontal, - itemBuilder: (ctx, index) { - bool isPdf = _testProvider.catchImages[index].path.endsWith('pdf'); - bool isWord = _testProvider.catchImages[index].path.endsWith('docx') || - _testProvider.catchImages[index].path.endsWith('doc'); - - // print(_testProvider.catchImages[index].path.endsWith('jpg')); - // .substring(_testProvider.catchImages[index].path.length - 4)); - return ClipRRect( - borderRadius: BorderRadius.circular(5), - child: Container( - width: 60, - height: 60, - child: Stack( - children: [ - Positioned( - top: 10, - left: 0, - child: GestureDetector( - onTap: () => isPdf - ? print('pdf') - : isWord - ? print('word') - : Navigator.of(context).push( - MaterialPageRoute( - builder: (_) => Container( - color: Colors.white, - child: Center( - child: Image.memory( - _testProvider.catchImages[index].bytes, - fit: BoxFit.contain, - ), - ), - ), - ), - ), - child: isPdf - ? Image.asset( - 'assets/Images/pdf.png', - width: 60, - height: 60, - fit: BoxFit.fill, - ) - : isWord - ? Image.asset( - 'assets/Images/word.png', - width: 60, - height: 60, - fit: BoxFit.fill, - ) - : Image.memory( - _testProvider.catchImages[index].bytes, - // asset: _images[index], - width: 60, - height: 60, - fit: BoxFit.contain, - ), - ), - ), - Positioned( - top: 0, - right: 0, - child: GestureDetector( - onTap: () { - // setState(() { - _testProvider.removeImage(index); - // }); - }, - child: CircleAvatar( - backgroundColor: Colors.red, - radius: 10, - child: Icon( - Icons.close, - size: 12, - color: Colors.white, - ), - ), - ), - ) - ], - ), - ), - ); - }, - itemCount: _testProvider.catchImages.length, - separatorBuilder: (BuildContext context, int index) => SizedBox( - width: 3 * _deviceBlockSize, - ), - ); - } -} - -Future scan() async { - try { - var barcode = await BarcodeScanner.scan(); - if (barcode.type.name == 'Cancelled') { - return 'cancel'; - } else if (barcode.type.name == 'Failed') { - return 'error'; - } - try { - var id = barcode.rawContent.contains('www.cssd-doc.com') - ? barcode.rawContent.split('/')[5] - : barcode.rawContent; - - return id; - } catch (_) { - return 'null'; - } - } on PlatformException catch (_) { - return 'access'; - } catch (_) { - return 'error'; - } -} +import 'package:barcode_scan2/barcode_scan2.dart'; +import 'package:cssd/config/colors.dart'; +import 'package:cssd/providers/input.dart'; +import 'package:file_picker/file_picker.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:image_picker_gallery_camera/image_picker_gallery_camera.dart'; +import 'package:multiselect_formfield/multiselect_formfield.dart'; +import 'package:provider/provider.dart'; + +import '../../../config/routes.dart'; +import '../../../providers/test_results.dart'; + +class FormCreator extends StatefulWidget { + const FormCreator({ + required this.form, + required this.onChanged, + this.padding, + }); + + final dynamic form; + final double? padding; + final ValueChanged onChanged; + + @override + _FormCreatorState createState() => _FormCreatorState(form); +} + +class _FormCreatorState extends State { + List formItems = []; + DateTime selectedDate = DateTime.now(); + + int? rangeValue; + String? selectValue; + + _FormCreatorState(form); + + Future _selectDate() async { + final DateTime? picked = await showDatePicker( + context: context, + initialDate: selectedDate, + firstDate: DateTime(2015, 8), + lastDate: DateTime(2101)); + if (picked != null && picked != selectedDate) + setState(() { + selectedDate = picked; + }); + } + + List jsonToForm() { + var items = Provider.of(context).inputItems; + List listWidgets = []; + formItems = items; + + for (var count = 0; count < formItems.length; count++) { + Map item = formItems[count]; + + if (item['type'] == "Date") { + selectedDate = formItems[count]['value']; + listWidgets.add( + Padding( + padding: const EdgeInsets.symmetric(vertical: 20), + child: OutlinedButton( + onPressed: () { + _selectDate().then((_) { + formItems[count]['value'] = selectedDate; + _handleChanged(); + }); + }, + child: Text( + 'Date: ${selectedDate.year}/${selectedDate.month}/${selectedDate.day}'), + ), + ), + ); + } + if (item['type'] == 'Image') { + final testProviderObject = Provider.of(context); + final mediaData = MediaQuery.of(context); + final deviceWidth = mediaData.size.width; + final _deviceBlockSize = deviceWidth / 100; + listWidgets.insert( + 3, + Container( + // height: 70, + child: Directionality( + textDirection: TextDirection.rtl, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Container( + margin: EdgeInsets.only(top: 20), + height: testProviderObject.catchImages.length != 0 ? 60 : 0, + child: ImageBox( + deviceBlockSize: _deviceBlockSize, + testProvider: testProviderObject, + ), + ), + SizedBox( + height: testProviderObject.catchImages.length != 0 ? 10 : 0, + ), + InkWell( + onTap: () async { + await loadAssets(context); + }, + child: Container( + width: MediaQuery.of(context).size.width - 40, + padding: + EdgeInsets.symmetric(vertical: 10, horizontal: 30), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + color: Colors.black, + ), + child: Text( + '+ Add an image or file from device', + textDirection: TextDirection.ltr, + style: TextStyle(color: Colors.white), + textAlign: TextAlign.center, + ), + ), + ), + SizedBox( + height: 10, + ), + InkWell( + onTap: () async { + await Navigator.of(context) + .pushNamed(Routes.captureImageScreen); + // await captureImage(context); + }, + child: Container( + width: MediaQuery.of(context).size.width - 40, + padding: + EdgeInsets.symmetric(vertical: 10, horizontal: 30), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + color: Colors.black, + ), + child: Text( + '+ Add an image from camera', + textDirection: TextDirection.ltr, + style: TextStyle(color: Colors.white), + textAlign: TextAlign.center, + ), + ), + ), + ], + ), + ), + ), + ); + } + if (item['type'] == "Label") { + listWidgets.add( + Container( + decoration: BoxDecoration( + border: Border.all(), + borderRadius: BorderRadius.circular(30), + color: Colors.black, + ), + padding: EdgeInsets.only(top: 20, bottom: 20), + margin: EdgeInsets.only(bottom: 20), + child: Text( + item['name'], + textAlign: TextAlign.center, + style: TextStyle(color: Colors.white, fontSize: 20), + ), + ), + ); + } + + if (item['type'] == "Text") { + // print(item['require_scanner'].toString()); + TextEditingController idCTRL = new TextEditingController(); + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + listWidgets.add( + Padding( + padding: const EdgeInsets.all(8.0), + child: item['require_scanner'].toString() != '1' + ? TextFormField( + controller: idCTRL, + decoration: InputDecoration( + labelText: item['name'] ?? "", + border: UnderlineInputBorder(), + contentPadding: EdgeInsets.all(0), + ), + // initialValue: item['value'] ?? '', + onChanged: (String value) { + formItems[count]['value'] = value; + _handleChanged(); + }, + ) + : Container( + child: Row( + children: [ + Flexible( + flex: 8, + child: TextFormField( + controller: idCTRL, + decoration: InputDecoration( + labelText: item['name'] ?? "", + border: UnderlineInputBorder(), + contentPadding: EdgeInsets.all(0), + ), + // initialValue: item['value'] ?? '', + onChanged: (String value) { + formItems[count]['value'] = value; + _handleChanged(); + }, + ), + ), + Flexible( + flex: 1, + child: InkWell( + onTap: () { + scan().then( + (String result) { + if (result == 'cancel') { + print('cancel'); + } else if (result == 'error') { + print('error'); + } else if (result == 'access') { + print('access'); + } else { + print(result); + idCTRL.text = result; + formItems[count]['value'] = result; + _handleChanged(); + // Navigator.of(context).pushNamed( + // CycleDetailScreen.route, + // arguments: result, + // ); + } + }, + ); + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 5 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ), + ], + ), + ), + ), + ); + } + + if (item['type'] == "Range" || + item['type'] == "Temperature" || + item['type'] == "Pressure") { + double startValue, endValue; + if (item['type'] == "Range") { + startValue = double.parse(item['options'][0]['title']); + endValue = double.parse(item['options'][1]['title']); + } else { + startValue = item['type'] == "Temperature" ? 0.0 : -1.0; + endValue = item['type'] == "Temperature" ? 200.0 : 3.0; + } + + formItems[count]['value'] = formItems[count]['value'] ?? startValue; + // int divisions = (endValue - startValue).round(); + listWidgets.add( + Padding( + padding: EdgeInsets.only(top: 35, left: 10, right: 10), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(item['type']), + Text(formItems[count]['value'].toString()), + ], + ), + Slider( + min: startValue, + max: endValue, + value: formItems[count]['value'], + // label: '${formItems[count]['value'].round()}', + // divisions: divisions, + onChanged: (double value) { + setState(() { + formItems[count]['value'] = + double.parse(value.toStringAsFixed(2)); + }); + // print(formItems[count]['value']); + }, + // semanticFormatterCallback: (double newValue) { + // return '${newValue.round()}'; + // }, + ), + ], + ), + ), + ); + } + + if (item['type'] == "Time") { + listWidgets.add( + Padding( + padding: const EdgeInsets.all(8.0), + child: TextFormField( + inputFormatters: [ + LengthLimitingTextInputFormatter(5), + FilteringTextInputFormatter.digitsOnly, + // BlacklistingTextInputFormatter.singleLineFormatter, + TextInputFormatter.withFunction( + (TextEditingValue oldValue, TextEditingValue newValue) { + final int newTextLength = newValue.text.length; + int selectionIndex = newValue.selection.end; + int usedSubstringIndex = 0; + final StringBuffer newText = StringBuffer(); + if (newTextLength >= 2) { + newText.write( + newValue.text.substring(0, usedSubstringIndex = 2) + + ':'); + if (newValue.selection.end >= 2) selectionIndex++; + } + // Dump the rest. + if (newTextLength >= usedSubstringIndex) + newText.write(newValue.text.substring(usedSubstringIndex)); + return TextEditingValue( + text: newText.toString(), + selection: TextSelection.collapsed(offset: selectionIndex), + ); + }) + ], + keyboardType: TextInputType.datetime, + decoration: InputDecoration( + labelText: item['name'] ?? "", + border: UnderlineInputBorder(), + contentPadding: EdgeInsets.all(0), + ), + // initialValue: item['value'] ?? '', + onChanged: (String value) { + formItems[count]['value'] = value; + _handleChanged(); + }, + ), + ), + ); + } + + if (item['type'] == "Select") { + var listItems = item['options'] as List; + listWidgets.add(MultiSelectFormField( + autovalidate: AutovalidateMode.disabled, + title: Text(item['name']), + dataSource: listItems, + textField: 'title', + valueField: 'id', + okButtonLabel: 'OK', + cancelButtonLabel: 'CANCEL', + errorText: 'Please choose one or more', + validator: (value) { + if (value == null || value.isEmpty) { + return 'Please choose one or more options.'; + } + return null; // Return null if validation succeeds + }, + onSaved: (value) { + if (value == null) return; + setState(() { + item['value'] = value; + }); + _handleChanged(); + }, + )); + + // listWidgets.add( + // DropdownButtonFormField( + // items: listItems.map((dynamic value) { + // String stringValue = value['id'].toString(); + // String textValue = value['title'].toString(); + // return DropdownMenuItem( + // value: stringValue, + // child: Text(textValue), + // ); + // }).toList(), + // isDense: true, + // value: item['value'], + // hint: Text(item['name']), + + // onChanged: (String? value) { + // this.setState( + // () { + // _setInput(item['name'], value!); + // formItems[count]['value'] = value; + // _handleChanged(); + // }, + // ); + // }, + // ), + // ); + } + + if (item['type'] == "Radiobutton") { + listWidgets.add( + Container( + margin: EdgeInsets.only(top: 14.0, bottom: 0), + child: Text( + item['name'], + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), + ), + ), + ); + var valueOrFirst = + formItems[count]['value'] ?? formItems[count]['options'][0]['id']; + for (var i = 0; i < item['options'].length; i++) { + var isSelected = formItems[count]['options'][i]['id'] == valueOrFirst; + formItems[count]['value'] = valueOrFirst; + listWidgets.add( + RadioListTile( + dense: true, + controlAffinity: ListTileControlAffinity.trailing, + title: Text(formItems[count]['options'][i]['title']), + value: formItems[count]['options'][i]['id'], + selected: isSelected, + groupValue: formItems[count]['value'], + onChanged: (int? value) { + this.setState( + () { + _setInput(item['name'], value.toString()); + formItems[count]['value'] = value; + _handleChanged(); + }, + ); + }, + ), + ); + } + } + + if (item['type'] == "Switch") { + listWidgets.add( + SwitchListTile( + activeColor: kBlue, + inactiveTrackColor: kPink.withAlpha(150), + inactiveThumbColor: kPink, + title: Text(item['name']), + value: item['value'] ?? false, + onChanged: (bool value) { + this.setState(() { + formItems[count]['value'] = value; + _handleChanged(); + }); + }, + ), + ); + } + + // if (item['type'] == "Form") { + // List children = item['children']; + // print(children); + // listWidgets.add( + // Container( + // margin: EdgeInsets.symmetric(vertical: 10), + // decoration: BoxDecoration(border: Border.all()), + // child: Column( + // children: [ + // Container( + // margin: EdgeInsets.only(top: 10), + // child: Text( + // item['name'], + // style: + // TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), + // ), + // ), + // Container( + // height: 200, + // width: double.infinity, + // child: FormCreator( + // form: item['children'], + // padding: 4, + // onChanged: (value) { + // // _handleChanged(); + // }, + // ), + // ), + // ], + // ), + // ), + // ); + // } + + if (item['type'] == "Checkbox") { + formItems[count]['value'] = formItems[count]['value'] ?? []; + listWidgets.add( + Container( + margin: EdgeInsets.only(top: 14.0, bottom: 0), + child: Text( + item['name'], + style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16.0), + ), + ), + ); + for (var i = 0; i < item['options'].length; i++) { + listWidgets.add( + CheckboxListTile( + title: Text(formItems[count]['options'][i]['title']), + value: (formItems[count]['value'] ?? []) + .contains(formItems[count]['options'][i]['id']), + onChanged: (bool? value) { + this.setState( + () { + setState(() { + if (value!) { + (formItems[count]['value'] as List) + .add(formItems[count]['options'][i]['id']); + } else { + (formItems[count]['value'] as List) + .remove(formItems[count]['options'][i]['id']); + } + }); + _handleChanged(); + }, + ); + }, + ), + ); + } + } + // listWidgets.add( + // TestResultAddSaveButton( + // deviceBlockSize: null, + // ), + // ); + } + + return listWidgets; + } + + Future captureImage(BuildContext context) async { + var profileProviderObject = + Provider.of(context, listen: false); + List files = profileProviderObject.catchImages; + try { + files.add( + await ImagePickerGC.pickImage( + context: context, + source: ImgSource.Camera, + cameraIcon: Icon( + Icons.camera_alt, + color: Colors.red, + ), //cameraIcon and galleryIcon can change. If no icon provided default icon will be present + cameraText: Text( + "From Camera", + style: TextStyle(color: Colors.red), + ), + ), + ); + } catch (e) {} + profileProviderObject.setCatchImages(files); + profileProviderObject.setImages(); + } + + Future loadAssets(BuildContext context) async { + var profileProviderObject = + Provider.of(context, listen: false); + List files = profileProviderObject.catchImages; + try { + var datas = await FilePicker.platform.pickFiles( + type: FileType.custom, + allowedExtensions: ['jpg', 'png', 'bmp', 'jpeg', 'pdf', 'docx', 'doc'], + withData: true, + withReadStream: true, + ); + files += datas!.files; + // files += + + // print(files); + } catch (_) {} + + profileProviderObject.setCatchImages(files); + profileProviderObject.setImages(); + // profileProviderObject.addImage(); + } + + // _FormCreatorState(this.formItems); + + void _handleChanged() { + widget.onChanged(formItems); + } + + void _setInput(String key, String value) {} + + @override + Widget build(BuildContext context) { + return ListView.builder( + padding: EdgeInsets.all(widget.padding ?? 16.0), + itemCount: jsonToForm().length, + itemBuilder: (context, index) { + return jsonToForm()[index]; + }, + shrinkWrap: true, + controller: ScrollController(keepScrollOffset: false), + ); + } +} + +class ImageBox extends StatelessWidget { + const ImageBox({ + Key? key, + required double deviceBlockSize, + required TestResultsProvider testProvider, + }) : _deviceBlockSize = deviceBlockSize, + _testProvider = testProvider, + super(key: key); + + final double _deviceBlockSize; + final TestResultsProvider _testProvider; + + @override + Widget build(BuildContext context) { + return ListView.separated( + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemBuilder: (ctx, index) { + bool isPdf = _testProvider.catchImages[index].path!.endsWith('pdf'); + bool isWord = _testProvider.catchImages[index].path!.endsWith('docx') || + _testProvider.catchImages[index].path!.endsWith('doc'); + + // print(_testProvider.catchImages[index].path.endsWith('jpg')); + // .substring(_testProvider.catchImages[index].path.length - 4)); + return ClipRRect( + borderRadius: BorderRadius.circular(5), + child: Container( + width: 60, + height: 60, + child: Stack( + children: [ + Positioned( + top: 10, + left: 0, + child: GestureDetector( + onTap: () => isPdf + ? print('pdf') + : isWord + ? print('word') + : Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => Container( + color: Colors.white, + child: Center( + child: Image.memory( + _testProvider.catchImages[index].bytes!, + fit: BoxFit.contain, + ), + ), + ), + ), + ), + child: isPdf + ? Image.asset( + 'assets/Images/pdf.png', + width: 60, + height: 60, + fit: BoxFit.fill, + ) + : isWord + ? Image.asset( + 'assets/Images/word.png', + width: 60, + height: 60, + fit: BoxFit.fill, + ) + : Image.memory( + _testProvider.catchImages[index].bytes!, + // asset: _images[index], + width: 60, + height: 60, + fit: BoxFit.contain, + ), + ), + ), + Positioned( + top: 0, + right: 0, + child: GestureDetector( + onTap: () { + // setState(() { + _testProvider.removeImage(index); + // }); + }, + child: CircleAvatar( + backgroundColor: Colors.red, + radius: 10, + child: Icon( + Icons.close, + size: 12, + color: Colors.white, + ), + ), + ), + ) + ], + ), + ), + ); + }, + itemCount: _testProvider.catchImages.length, + separatorBuilder: (BuildContext context, int index) => SizedBox( + width: 3 * _deviceBlockSize, + ), + ); + } +} + +Future scan() async { + try { + var barcode = await BarcodeScanner.scan(); + if (barcode.type.name == 'Cancelled') { + return 'cancel'; + } else if (barcode.type.name == 'Failed') { + return 'error'; + } + try { + var id = barcode.rawContent.contains('www.cssd-doc.com') + ? barcode.rawContent.split('/')[5] + : barcode.rawContent; + + return id; + } catch (_) { + return 'null'; + } + } on PlatformException catch (_) { + return 'access'; + } catch (_) { + return 'error'; + } +} diff --git a/lib/widgets/TestResultScreens/Add/save_button.dart b/lib/widgets/TestResultScreens/Add/save_button.dart index ce0537e..005e26d 100644 --- a/lib/widgets/TestResultScreens/Add/save_button.dart +++ b/lib/widgets/TestResultScreens/Add/save_button.dart @@ -1,57 +1,57 @@ -import 'package:flutter/material.dart'; - -import '../../../config/routes.dart'; - -class TestResultAddSaveButton extends StatelessWidget { - const TestResultAddSaveButton({ - Key key, - // @required GlobalKey form, - // @required this.idCTRL, - @required double deviceBlockSize, - }) : - // _form = form, - _deviceBlockSize = deviceBlockSize, - super(key: key); - - // final GlobalKey _form; - // final TextEditingController idCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () { - // if (! _form.currentState.validate()) { - // return; - // } - Navigator.of(context).pushNamed( - Routes.labelDetailScreen, - // arguments: idCTRL.text, - ); - }, - child: Container( - padding: EdgeInsets.symmetric( - horizontal: 5 * _deviceBlockSize, - vertical: 10, - ), - margin: EdgeInsets.symmetric(horizontal: 20), - decoration: BoxDecoration( - gradient: LinearGradient( - colors: [Colors.blue, Colors.green], - ), - borderRadius: BorderRadius.circular(7), - ), - child: Align( - alignment: Alignment.center, - child: Text( - 'GO!', - style: TextStyle( - color: Colors.white, - fontSize: 5 * _deviceBlockSize, - ), - ), - ), - ), - ); - } -} +// import 'package:flutter/material.dart'; + +// import '../../../config/routes.dart'; + +// class TestResultAddSaveButton extends StatelessWidget { +// const TestResultAddSaveButton({ +// Key? key, +// // @required GlobalKey form, +// // @required this.idCTRL, +// required double deviceBlockSize, +// }) : +// // _form = form, +// _deviceBlockSize = deviceBlockSize, +// super(key: key); + +// // final GlobalKey _form; +// // final TextEditingController idCTRL; +// final double _deviceBlockSize; + +// @override +// Widget build(BuildContext context) { +// return InkWell( +// onTap: () { +// // if (! _form.currentState.validate()) { +// // return; +// // } +// Navigator.of(context).pushNamed( +// Routes.labelDetailScreen, +// // arguments: idCTRL.text, +// ); +// }, +// child: Container( +// padding: EdgeInsets.symmetric( +// horizontal: 5 * _deviceBlockSize, +// vertical: 10, +// ), +// margin: EdgeInsets.symmetric(horizontal: 20), +// decoration: BoxDecoration( +// gradient: LinearGradient( +// colors: [Colors.blue, Colors.green], +// ), +// borderRadius: BorderRadius.circular(7), +// ), +// child: Align( +// alignment: Alignment.center, +// child: Text( +// 'GO!', +// style: TextStyle( +// color: Colors.white, +// fontSize: 5 * _deviceBlockSize, +// ), +// ), +// ), +// ), +// ); +// } +// } diff --git a/lib/widgets/TestResultScreens/Add/selector_box.dart b/lib/widgets/TestResultScreens/Add/selector_box.dart index 477ad5a..a8e65f5 100644 --- a/lib/widgets/TestResultScreens/Add/selector_box.dart +++ b/lib/widgets/TestResultScreens/Add/selector_box.dart @@ -1,132 +1,137 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class TestResultAddSelectorBox extends StatefulWidget { - const TestResultAddSelectorBox({ - Key key, - @required double deviceBlockSize, - @required this.dataCTRL, - @required this.dataVals, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController dataCTRL; - final List dataVals; - final String _label; - - @override - _TestResultAddSelectorBoxState createState() => - _TestResultAddSelectorBoxState(); -} - -class _TestResultAddSelectorBoxState extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 6 * widget._deviceBlockSize, - ), - SizedBox( - width: 4 * widget._deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - widget._label, - style: TextStyle( - fontSize: 3 * widget._deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w100, - ), - ), - ], - ), - Container( - height: 40, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only(left: 0), - // border: InputBorder.none, - ), - iconSize: 7 * widget._deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric(horizontal: 0), - child: Text( - widget.dataCTRL.text, - // textDirection: TextDirection.rtl, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 3 * widget._deviceBlockSize, - ), - ), - // TextFormField( - // controller: widget.dataCTRL, - // decoration: InputDecoration( - // contentPadding: EdgeInsets.only(bottom: 15), - // isDense: true, - // ), - // style: TextStyle( - // fontWeight: FontWeight.w700, - // color: Colors.black, - // ), - // // minLines: 1, - // // maxLines: 3, - // ), - ), - isDense: true, - items: widget.dataVals.map((val) { - return new DropdownMenuItem( - value: val, - child: Container( - child: Text( - val, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 3 * widget._deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - widget.dataCTRL.text = val; - }); - }, - ), - ), - ]), - ), - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class TestResultAddSelectorBox extends StatefulWidget { + const TestResultAddSelectorBox({ + Key? key, + required double deviceBlockSize, + required this.dataCTRL, + required this.dataVals, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController dataCTRL; + final List dataVals; + final String _label; + + @override + _TestResultAddSelectorBoxState createState() => + _TestResultAddSelectorBoxState(); +} + +class _TestResultAddSelectorBoxState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 6 * widget._deviceBlockSize, + ), + SizedBox( + width: 4 * widget._deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + widget._label, + style: TextStyle( + fontSize: 3 * widget._deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, + ), + ), + ], + ), + Container( + height: 40, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only(left: 0), + // border: InputBorder.none, + ), + iconSize: 7 * widget._deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric(horizontal: 0), + child: Text( + widget.dataCTRL.text, + // textDirection: TextDirection.rtl, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 3 * widget._deviceBlockSize, + ), + ), + // TextFormField( + // controller: widget.dataCTRL, + // decoration: InputDecoration( + // contentPadding: EdgeInsets.only(bottom: 15), + // isDense: true, + // ), + // style: TextStyle( + // fontWeight: FontWeight.w700, + // color: Colors.black, + // ), + // // minLines: 1, + // // maxLines: 3, + // ), + ), + isDense: true, + items: widget.dataVals.map( + (val) { + return new DropdownMenuItem( + value: val, + child: Container( + child: Text( + val, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 3 * widget._deviceBlockSize, + ), + ), + ), + ); + }, + ).toList(), + onChanged: (val) { + setState( + () { + widget.dataCTRL.text = val!; + }, + ); + }, + ), + ), + ], + ), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Details/datas_box.dart b/lib/widgets/TestResultScreens/Details/datas_box.dart index 0f1edf8..53b861c 100644 --- a/lib/widgets/TestResultScreens/Details/datas_box.dart +++ b/lib/widgets/TestResultScreens/Details/datas_box.dart @@ -1,259 +1,276 @@ -import 'package:flutter/material.dart'; -import 'package:intl/intl.dart'; -import 'package:url_launcher/url_launcher.dart'; - -class DatasBox extends StatelessWidget { - const DatasBox({ - Key key, - @required this.datas, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final Map datas; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Padding( - padding: EdgeInsets.all(20), - child: ListView( - children: [ - Container( - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - color: Color.fromRGBO(230, 230, 230, 1), - border: Border( - left: BorderSide( - color: Colors.pink, - width: 2, - ), - ), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Text( - DateFormat.yMMMd().format( - DateTime.parse( - datas['date'], - ), - ), - style: TextStyle( - color: Colors.red, - ), - ), - Divider(), - Text( - datas['test_type_name'], - style: TextStyle( - color: Colors.red, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 30, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Test Register ID', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas['id'].toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Autoclave ID', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas['auto_cleave_id'].toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Hospital', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas['hospital'].toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Date', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - DateFormat('d-M-y').format( - DateTime.parse( - datas['date'], - ), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Status', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas['accepted'] == 'Accepted' - ? 'Accepted' - : 'Rejected', - style: TextStyle( - fontWeight: FontWeight.w700, - color: datas['accepted'] == 'Accepted' - ? Colors.green - : Colors.red, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - SizedBox( - height: 5, - ), - Row( - children: [ - Container( - width: 35 * _deviceBlockSize, - child: Text( - 'Description', - style: TextStyle( - color: Colors.grey, - ), - ), - ), - Container( - width: 45 * _deviceBlockSize, - child: Text( - datas['description'].toString(), - style: TextStyle( - fontWeight: FontWeight.w700, - ), - overflow: TextOverflow.clip, - ), - ), - ], - ), - Divider(), - ], - ), - ), - SizedBox(height: 20,), - InkWell( - onTap: () async=> await launch( - 'https://cssd-doc.com/Show/TestResult/${datas['id'].toString()}', - // 'https://cssd-doc.com/api/TestResults/${datas['id'].toString()}', - - // forceSafariVC: true, - // forceWebView: true, - // headers: {'my_header_key': 'my_header_value'}, - // child: Text('Show Full Details'), - ), - child: Container( - padding: EdgeInsets.symmetric(vertical: 20), - width: double.infinity, - decoration: BoxDecoration( - color: Color.fromRGBO(230, 230, 230, 1), - borderRadius: BorderRadius.circular(25), - ), - child: Center( - child: Text( - 'Show More Details', - style: TextStyle(fontWeight: FontWeight.w700), - ), - ), - ), - ) - ], - ), - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; +import 'package:url_launcher/url_launcher.dart'; + +class DatasBox extends StatelessWidget { + const DatasBox({ + Key? key, + required this.datas, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final Map datas; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsets.all(20), + child: ListView( + children: [ + SizedBox( + height: 10, + ), + Text( + 'Test Result Details', + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + letterSpacing: 3, + ), + ), + SizedBox( + height: 10, + ), + Container( + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + border: Border( + left: BorderSide( + color: datas['accepted'] == 'Accepted' ? kLightBlue : kPink, + width: 2, + ), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + DateFormat.yMMMd().format( + DateTime.parse( + datas['date'], + ), + ), + style: TextStyle( + color: datas['accepted'] == 'Accepted' ? kLightBlue : kPink, + ), + ), + Divider(), + Text( + datas['test_type_name'], + style: TextStyle( + color: datas['accepted'] == 'Accepted' ? kLightBlue : kPink, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 30, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Test Register ID', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas['id'].toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Autoclave ID', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas['auto_cleave_id'].toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Hospital', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas['hospital'].toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Date', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + DateFormat('d-M-y').format( + DateTime.parse( + datas['date'], + ), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Status', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas['accepted'] == 'Accepted' || + datas['verified'] == 'Verified' + ? 'Accepted' + : 'Rejected', + style: TextStyle( + fontWeight: FontWeight.w700, + color: datas['accepted'] == 'Accepted' + ? kLightBlue + : kPink, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + Divider(), + SizedBox( + height: 5, + ), + Row( + children: [ + Container( + width: 35 * _deviceBlockSize, + child: Text( + 'Description', + style: TextStyle( + color: Colors.grey, + ), + ), + ), + Container( + width: 45 * _deviceBlockSize, + child: Text( + datas['description'].toString(), + style: TextStyle( + fontWeight: FontWeight.w700, + ), + overflow: TextOverflow.clip, + ), + ), + ], + ), + ], + ), + ), + SizedBox( + height: 20, + ), + InkWell( + onTap: () async => await launch( + 'https://cssd-doc.com/Show/TestResult/${datas['id'].toString()}', + // 'https://cssd-doc.com/api/TestResults/${datas['id'].toString()}', + + // forceSafariVC: true, + // forceWebView: true, + // headers: {'my_header_key': 'my_header_value'}, + // child: Text('Show Full Details'), + ), + child: Container( + padding: EdgeInsets.symmetric(vertical: 20), + width: double.infinity, + decoration: BoxDecoration( + color: Color.fromRGBO(230, 230, 230, 1), + borderRadius: BorderRadius.circular(25), + ), + child: Center( + child: Text( + 'Show More Details', + style: TextStyle(fontWeight: FontWeight.w700), + ), + ), + ), + ) + ], + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Filter/date_picker.dart b/lib/widgets/TestResultScreens/Filter/date_picker.dart index f7d7de7..6683532 100644 --- a/lib/widgets/TestResultScreens/Filter/date_picker.dart +++ b/lib/widgets/TestResultScreens/Filter/date_picker.dart @@ -1,74 +1,76 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:intl/intl.dart' as DateEditor; - -class TestResultFilterDatePicker extends StatefulWidget { - TestResultFilterDatePicker({ - Key key, - @required this.dateCTRL, - @required double deviceBlockSize, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final TextEditingController dateCTRL; - final double _deviceBlockSize; - final String _label; - - @override - _TestResultFilterDatePickerState createState() => _TestResultFilterDatePickerState(); -} - -class _TestResultFilterDatePickerState extends State { - @override - Widget build(BuildContext context) { - return InkWell( - onTap: () async { - var res = await showDatePicker( - context: context, - initialDate: DateTime.now(), - firstDate: DateTime(2010, 1), - lastDate: DateTime(2101), - ); - if (res != null) { - setState( - () { - widget.dateCTRL.text = DateEditor.DateFormat('y-M-d').format(res); - // sDateValue = - // DateEditor.DateFormat('y-M-d').format( - // dateTimeS, - // ); // baraye tavize makane gharar giri baraye api - }, - ); - } - }, - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Expanded( - child: TextField( - enabled: false, - controller: widget.dateCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.calendarAlt, - size: 7 * widget._deviceBlockSize, - ), - labelText: widget._label, - isDense: true, - contentPadding: EdgeInsets.only(bottom: 12, right: 3, left: 3), - // border: InputBorder.none, - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * widget._deviceBlockSize, - ), - ), - ), - Icon(FontAwesomeIcons.angleDown) - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:intl/intl.dart' as DateEditor; + +class TestResultFilterDatePicker extends StatefulWidget { + TestResultFilterDatePicker({ + Key? key, + required this.dateCTRL, + required double deviceBlockSize, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final TextEditingController dateCTRL; + final double _deviceBlockSize; + final String _label; + + @override + _TestResultFilterDatePickerState createState() => + _TestResultFilterDatePickerState(); +} + +class _TestResultFilterDatePickerState + extends State { + @override + Widget build(BuildContext context) { + return InkWell( + onTap: () async { + var res = await showDatePicker( + context: context, + initialDate: DateTime.now(), + firstDate: DateTime(2010, 1), + lastDate: DateTime(2101), + ); + if (res != null) { + setState( + () { + widget.dateCTRL.text = DateEditor.DateFormat('y-M-d').format(res); + // sDateValue = + // DateEditor.DateFormat('y-M-d').format( + // dateTimeS, + // ); // baraye tavize makane gharar giri baraye api + }, + ); + } + }, + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Expanded( + child: TextField( + enabled: false, + controller: widget.dateCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.calendarAlt, + size: 7 * widget._deviceBlockSize, + ), + labelText: widget._label, + isDense: true, + contentPadding: EdgeInsets.only(bottom: 12, right: 3, left: 3), + // border: InputBorder.none, + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * widget._deviceBlockSize, + ), + ), + ), + Icon(FontAwesomeIcons.angleDown) + ], + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Filter/drop_down_box.dart b/lib/widgets/TestResultScreens/Filter/drop_down_box.dart index ba41556..340ed67 100644 --- a/lib/widgets/TestResultScreens/Filter/drop_down_box.dart +++ b/lib/widgets/TestResultScreens/Filter/drop_down_box.dart @@ -1,88 +1,87 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class DropDownBox extends StatefulWidget { - - DropDownBox({ - Key key, - @required this.values, - }) : super(key: key); - - final List values; - - @override - _DropDownBoxState createState() => _DropDownBoxState(); -} - -class _DropDownBoxState extends State { - String _curValue; - - @override - void initState() { - _curValue = widget.values[0]; - super.initState(); - } - - @override - Widget build(BuildContext context) { - // _curValue = widget.values[0]; - // final ThemeData _theme = Theme.of(context); - // final Color _mainFontColor = _theme.textSelectionColor; - final _media = MediaQuery.of(context); - // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); - final double _devicewidth = _media.size.width; - final double _deviceBlockSize = _devicewidth / 100; - return Row( - // width: double.infinity, - children: [ - Icon( - FontAwesomeIcons.sortNumericDown, - color: Colors.grey, - size: 4 * _deviceBlockSize, - ), - SizedBox( - width: _deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: DropdownButton( - focusColor: Colors.red, - icon: Icon(FontAwesomeIcons.angleDown), - isExpanded: true, - hint: Padding( - padding: const EdgeInsets.symmetric(horizontal: 4), - child: Text( - _curValue, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - // color: _mainFontColor, - fontSize: 3.5 * _deviceBlockSize, - ), - ), - ), - isDense: true, - items: widget.values.map((String value) { - return new DropdownMenuItem( - value: value, - child: Container( - child: Text( - value, - style: TextStyle( - // color: _mainFontColor, - fontSize: 4 * _deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - _curValue = val; - }); - }, - ), - ), - ]); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class DropDownBox extends StatefulWidget { + DropDownBox({ + Key? key, + required this.values, + }) : super(key: key); + + final List values; + + @override + _DropDownBoxState createState() => _DropDownBoxState(); +} + +class _DropDownBoxState extends State { + String? _curValue; + + @override + void initState() { + _curValue = widget.values[0]; + super.initState(); + } + + @override + Widget build(BuildContext context) { + // _curValue = widget.values[0]; + // final ThemeData _theme = Theme.of(context); + // final Color _mainFontColor = _theme.textSelectionColor; + final _media = MediaQuery.of(context); + // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); + final double _devicewidth = _media.size.width; + final double _deviceBlockSize = _devicewidth / 100; + return Row( + // width: double.infinity, + children: [ + Icon( + FontAwesomeIcons.sortNumericDown, + color: Colors.grey, + size: 4 * _deviceBlockSize, + ), + SizedBox( + width: _deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: DropdownButton( + focusColor: Colors.red, + icon: Icon(FontAwesomeIcons.angleDown), + isExpanded: true, + hint: Padding( + padding: const EdgeInsets.symmetric(horizontal: 4), + child: Text( + _curValue!, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + // color: _mainFontColor, + fontSize: 3.5 * _deviceBlockSize, + ), + ), + ), + isDense: true, + items: widget.values.map((String value) { + return new DropdownMenuItem( + value: value, + child: Container( + child: Text( + value, + style: TextStyle( + // color: _mainFontColor, + fontSize: 4 * _deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState(() { + _curValue = val; + }); + }, + ), + ), + ]); + } +} diff --git a/lib/widgets/TestResultScreens/Filter/selector_box.dart b/lib/widgets/TestResultScreens/Filter/selector_box.dart index 56a3507..81c3b03 100644 --- a/lib/widgets/TestResultScreens/Filter/selector_box.dart +++ b/lib/widgets/TestResultScreens/Filter/selector_box.dart @@ -1,130 +1,130 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -class TestResultFilterSelectorBox extends StatefulWidget { - const TestResultFilterSelectorBox({ - Key key, - @required double deviceBlockSize, - @required this.dataCTRL, - @required this.dataVals, - @required String label, - }) : _deviceBlockSize = deviceBlockSize, - _label = label, - super(key: key); - - final double _deviceBlockSize; - final TextEditingController dataCTRL; - final List dataVals; - final String _label; - - @override - _TestResultFilterSelectorBoxState createState() => - _TestResultFilterSelectorBoxState(); -} - -class _TestResultFilterSelectorBoxState - extends State { - @override - Widget build(BuildContext context) { - return Container( - padding: EdgeInsets.symmetric(vertical: 5), - // height: 65, - child: Row( - // width: double.infinity, - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - FontAwesomeIcons.alignLeft, - color: Colors.grey, - size: 7 * widget._deviceBlockSize, - ), - SizedBox( - width: 4 * widget._deviceBlockSize, - ), - Expanded( - // width: MediaQuery.of(context).size.width - 70, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - widget._label, - style: TextStyle( - fontSize: 3.5 * widget._deviceBlockSize, - color: Colors.grey, - fontWeight: FontWeight.w100, - ), - ), - ], - ), - Container( - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only(left: 0), - // border: InputBorder.none, - ), - iconSize: 7 * widget._deviceBlockSize, - icon: Icon( - FontAwesomeIcons.angleDown, - color: Colors.black, - ), - isExpanded: true, - hint: Container( - // width: 100, - height: 70, - padding: const EdgeInsets.symmetric(horizontal: 0), - child: Text( - widget.dataCTRL.text, - // textDirection: TextDirection.rtl, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.w700, - color: Colors.black, - fontSize: 5 * widget._deviceBlockSize), - ), - // TextFormField( - // controller: widget.dataCTRL, - // decoration: InputDecoration( - // contentPadding: EdgeInsets.only(bottom: 15), - // isDense: true, - // ), - // style: TextStyle( - // fontWeight: FontWeight.w700, - // color: Colors.black, - // ), - // // minLines: 1, - // // maxLines: 3, - // ), - ), - isDense: true, - items: widget.dataVals.map((val) { - return new DropdownMenuItem( - value: val, - child: Container( - child: Text( - val, - style: TextStyle( - // color: _mainFontColor, - fontSize: 4 * widget._deviceBlockSize, - ), - ), - ), - ); - }).toList(), - onChanged: (val) { - setState(() { - widget.dataCTRL.text = val; - }); - }, - ), - ), - ]), - ), - ], - ), - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; + +class TestResultFilterSelectorBox extends StatefulWidget { + const TestResultFilterSelectorBox({ + Key? key, + required double deviceBlockSize, + required this.dataCTRL, + required this.dataVals, + required String label, + }) : _deviceBlockSize = deviceBlockSize, + _label = label, + super(key: key); + + final double _deviceBlockSize; + final TextEditingController dataCTRL; + final List dataVals; + final String _label; + + @override + _TestResultFilterSelectorBoxState createState() => + _TestResultFilterSelectorBoxState(); +} + +class _TestResultFilterSelectorBoxState + extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: EdgeInsets.symmetric(vertical: 5), + // height: 65, + child: Row( + // width: double.infinity, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: [ + Icon( + FontAwesomeIcons.alignLeft, + color: Colors.grey, + size: 7 * widget._deviceBlockSize, + ), + SizedBox( + width: 4 * widget._deviceBlockSize, + ), + Expanded( + // width: MediaQuery.of(context).size.width - 70, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + widget._label, + style: TextStyle( + fontSize: 3.5 * widget._deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, + ), + ), + ], + ), + Container( + // height: 30, + child: DropdownButtonFormField( + decoration: InputDecoration( + contentPadding: EdgeInsets.only(left: 0), + // border: InputBorder.none, + ), + iconSize: 7 * widget._deviceBlockSize, + icon: Icon( + FontAwesomeIcons.angleDown, + color: Colors.black, + ), + isExpanded: true, + hint: Container( + // width: 100, + height: 70, + padding: const EdgeInsets.symmetric(horizontal: 0), + child: Text( + widget.dataCTRL.text, + // textDirection: TextDirection.rtl, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.w700, + color: Colors.black, + fontSize: 5 * widget._deviceBlockSize), + ), + // TextFormField( + // controller: widget.dataCTRL, + // decoration: InputDecoration( + // contentPadding: EdgeInsets.only(bottom: 15), + // isDense: true, + // ), + // style: TextStyle( + // fontWeight: FontWeight.w700, + // color: Colors.black, + // ), + // // minLines: 1, + // // maxLines: 3, + // ), + ), + isDense: true, + items: widget.dataVals.map((val) { + return new DropdownMenuItem( + value: val, + child: Container( + child: Text( + val, + style: TextStyle( + // color: _mainFontColor, + fontSize: 4 * widget._deviceBlockSize, + ), + ), + ), + ); + }).toList(), + onChanged: (val) { + setState(() { + widget.dataCTRL.text = val!; + }); + }, + ), + ), + ]), + ), + ], + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Main/add_button.dart b/lib/widgets/TestResultScreens/Main/add_button.dart index 150e83d..f60f716 100644 --- a/lib/widgets/TestResultScreens/Main/add_button.dart +++ b/lib/widgets/TestResultScreens/Main/add_button.dart @@ -1,35 +1,35 @@ -import 'package:flutter/material.dart'; - -import '../../../config/routes.dart'; - -class TestResultAddButton extends StatelessWidget { - const TestResultAddButton({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed(Routes.testResultAddScreen); - }, - child: Container( - padding: EdgeInsets.all(5), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.redAccent, - ), - child: Icon( - Icons.add, - size: 10 * _deviceBlockSize, - color: Colors.white, - ), - ), - ); - } -} +import 'package:flutter/material.dart'; + +import '../../../config/routes.dart'; + +class TestResultAddButton extends StatelessWidget { + const TestResultAddButton({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.testResultAddScreen); + }, + child: Container( + padding: EdgeInsets.all(5), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.redAccent, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ); + } +} diff --git a/lib/widgets/TestResultScreens/Main/filter_chip_box.dart b/lib/widgets/TestResultScreens/Main/filter_chip_box.dart index 864af12..2c1316e 100644 --- a/lib/widgets/TestResultScreens/Main/filter_chip_box.dart +++ b/lib/widgets/TestResultScreens/Main/filter_chip_box.dart @@ -1,76 +1,77 @@ -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/test_results.dart'; - -class TestResultChip extends StatelessWidget { - const TestResultChip({ - Key key, - @required double deviceBlockSize, - @required String label, - @required String id, - @required String labelID, - @required String testType, - @required String hospital, - @required String username, - @required String fDate, - @required String uDate, - }) : _deviceBlockSize = deviceBlockSize, - _id = id, - _labelID = labelID, - _testType = testType, - _hispotal = hospital, - _label = label, - _username = username, - _fDate = fDate, - _uDate = uDate, - super(key: key); - - final double _deviceBlockSize; - final String _id; - final String _labelID; - final String _testType; - final String _hispotal; - final String _label; - final String _username; - final String _fDate; - final String _uDate; - - @override - Widget build(BuildContext context) { - return Row(children: [ - SizedBox( - width: _deviceBlockSize, - ), - Chip( - backgroundColor: Colors.black, - label: Text( - _label, - style: TextStyle( - color: Colors.white, - ), - ), - deleteIcon: Icon( - Icons.close, - color: Colors.white, - ), - onDeleted: () { - var labelProviderObject = Provider.of(context); - labelProviderObject.setFilters( - _id, - _labelID, - _username, - _testType, - _hispotal, - _fDate, - _uDate, - ); - labelProviderObject.setLoading(); - labelProviderObject.getTestResults().then((_) { - labelProviderObject.resetLoading(); - }); - }, - ), - ]); - } -} +import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/test_results.dart'; + +class TestResultChip extends StatelessWidget { + const TestResultChip({ + Key? key, + required double deviceBlockSize, + required String label, + required String id, + required String labelID, + required String testType, + required String hospital, + required String username, + required String fDate, + required String uDate, + }) : _deviceBlockSize = deviceBlockSize, + _id = id, + _labelID = labelID, + _testType = testType, + _hispotal = hospital, + _label = label, + _username = username, + _fDate = fDate, + _uDate = uDate, + super(key: key); + + final double _deviceBlockSize; + final String _id; + final String _labelID; + final String _testType; + final String _hispotal; + final String _label; + final String _username; + final String _fDate; + final String _uDate; + + @override + Widget build(BuildContext context) { + return Row(children: [ + SizedBox( + width: _deviceBlockSize, + ), + Chip( + backgroundColor: Colors.black, + label: Text( + _label, + style: TextStyle( + color: Colors.white, + ), + ), + deleteIcon: Icon( + Icons.close, + color: Colors.white, + ), + onDeleted: () { + var labelProviderObject = + Provider.of(context, listen: false); + labelProviderObject.setFilters( + _id, + _labelID, + _username, + _testType, + _hispotal, + _fDate, + _uDate, + ); + labelProviderObject.setLoading(); + labelProviderObject.getTestResults().then((_) { + labelProviderObject.resetLoading(); + }); + }, + ), + ]); + } +} diff --git a/lib/widgets/TestResultScreens/Main/floating_button.dart b/lib/widgets/TestResultScreens/Main/floating_button.dart index 968d5eb..f9056d3 100644 --- a/lib/widgets/TestResultScreens/Main/floating_button.dart +++ b/lib/widgets/TestResultScreens/Main/floating_button.dart @@ -1,93 +1,63 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; - -import '../../../config/routes.dart'; - -// class TestResultFloatingButton extends StatelessWidget { -// const TestResultFloatingButton({ -// Key key, -// @required double deviceBlockSize, -// }) : _deviceBlockSize = deviceBlockSize, -// super(key: key); - -// final double _deviceBlockSize; - -// @override -// Widget build(BuildContext context) { -// return InkWell( -// onTap: () { -// Navigator.of(context).popAndPushNamed(Routes.testResultAddScreen); -// }, -// child: Container( -// padding: EdgeInsets.all(5), -// decoration: BoxDecoration( -// shape: BoxShape.circle, -// color: Color.fromRGBO(0, 190, 190, 1), -// ), -// child: Icon( -// Icons.add, -// size: 10 * _deviceBlockSize, -// color: Colors.white, -// ), -// ), -// ); -// } -// } - -class TestResultFloatingButton extends StatelessWidget { - const TestResultFloatingButton({ - Key key, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushNamed(Routes.testScanScreen); - }, - child: Container( - padding: EdgeInsets.all(2.5 * _deviceBlockSize), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - FontAwesomeIcons.barcode, - size: 7.1 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - SizedBox( - width: 2 * _deviceBlockSize, - ), - InkWell( - customBorder: CircleBorder(), - onTap: () { - Navigator.of(context).pushReplacementNamed(Routes.testResultAddScreen); - }, - child: Container( - padding: EdgeInsets.all(_deviceBlockSize), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Color.fromRGBO(0, 190, 190, 1), - ), - child: Icon( - Icons.add, - size: 10 * _deviceBlockSize, - color: Colors.white, - ), - ), - ), - ], - ); - } -} +import 'package:cssd/config/colors.dart'; +import 'package:flutter/material.dart'; + +import '../../../config/routes.dart'; + +class TestResultFloatingButton extends StatelessWidget { + const TestResultFloatingButton({ + Key? key, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context).pushNamed(Routes.testScanScreen); + }, + child: Container( + padding: EdgeInsets.all(2.5 * _deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.qr_code_scanner, + size: 7.1 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + SizedBox( + width: 2 * _deviceBlockSize, + ), + InkWell( + customBorder: CircleBorder(), + onTap: () { + Navigator.of(context) + .pushReplacementNamed(Routes.testResultAddScreen); + }, + child: Container( + padding: EdgeInsets.all(_deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: kLightBlue, + ), + child: Icon( + Icons.add, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), + ), + ), + ], + ); + } +} diff --git a/lib/widgets/TestResultScreens/Main/search_box.dart b/lib/widgets/TestResultScreens/Main/search_box.dart index dba563c..0113011 100644 --- a/lib/widgets/TestResultScreens/Main/search_box.dart +++ b/lib/widgets/TestResultScreens/Main/search_box.dart @@ -1,48 +1,48 @@ -import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:provider/provider.dart'; - -import '../../../providers/test_results.dart'; - -class TestResultSearchBox extends StatelessWidget { - const TestResultSearchBox({ - Key key, - @required this.searchCTRL, - @required double deviceBlockSize, - }) : _deviceBlockSize = deviceBlockSize, - super(key: key); - - final TextEditingController searchCTRL; - final double _deviceBlockSize; - - @override - Widget build(BuildContext context) { - return TextField( - onEditingComplete: () { - FocusScope.of(context).unfocus(); - }, - onChanged: (value) { - Provider.of(context, listen: false).search(value); - }, - controller: searchCTRL, - decoration: InputDecoration( - icon: Icon( - FontAwesomeIcons.search, - size: 6 * _deviceBlockSize, - ), - labelStyle: TextStyle( - fontWeight: FontWeight.w100, - fontSize: 4 * _deviceBlockSize, - ), - labelText: 'Search by test name', - isDense: true, - contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), - ), - style: TextStyle( - fontWeight: FontWeight.w700, - fontSize: 5 * _deviceBlockSize, - ), - keyboardType: TextInputType.visiblePassword, - ); - } -} +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:provider/provider.dart'; + +import '../../../providers/test_results.dart'; + +class TestResultSearchBox extends StatelessWidget { + const TestResultSearchBox({ + Key? key, + required this.searchCTRL, + required double deviceBlockSize, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final TextEditingController searchCTRL; + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return TextField( + onEditingComplete: () { + FocusScope.of(context).unfocus(); + }, + onChanged: (value) { + Provider.of(context, listen: false).search(value); + }, + controller: searchCTRL, + decoration: InputDecoration( + icon: Icon( + FontAwesomeIcons.search, + size: 6 * _deviceBlockSize, + ), + labelStyle: TextStyle( + fontWeight: FontWeight.w100, + fontSize: 4 * _deviceBlockSize, + ), + labelText: 'Search by test name', + isDense: true, + contentPadding: EdgeInsets.symmetric(vertical: 2, horizontal: 3), + ), + style: TextStyle( + fontWeight: FontWeight.w700, + fontSize: 5 * _deviceBlockSize, + ), + keyboardType: TextInputType.visiblePassword, + ); + } +} diff --git a/macos/.gitignore b/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..4b81f9b --- /dev/null +++ b/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..5caa9d1 --- /dev/null +++ b/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..7fd61bc --- /dev/null +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,18 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import connectivity_macos +import path_provider_foundation +import shared_preferences_foundation +import url_launcher_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin")) + PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) + UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) +} diff --git a/macos/Podfile b/macos/Podfile new file mode 100644 index 0000000..c795730 --- /dev/null +++ b/macos/Podfile @@ -0,0 +1,43 @@ +platform :osx, '10.14' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\"" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_macos_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_macos_build_settings(target) + end +end diff --git a/macos/Podfile.lock b/macos/Podfile.lock new file mode 100644 index 0000000..76d2a42 --- /dev/null +++ b/macos/Podfile.lock @@ -0,0 +1,49 @@ +PODS: + - connectivity_macos (0.0.1): + - FlutterMacOS + - Reachability + - FlutterMacOS (1.0.0) + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + - Reachability (3.2) + - shared_preferences_foundation (0.0.1): + - Flutter + - FlutterMacOS + - url_launcher_macos (0.0.1): + - FlutterMacOS + +DEPENDENCIES: + - connectivity_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos`) + - FlutterMacOS (from `Flutter/ephemeral`) + - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) + - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + +SPEC REPOS: + trunk: + - Reachability + +EXTERNAL SOURCES: + connectivity_macos: + :path: Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos + FlutterMacOS: + :path: Flutter/ephemeral + path_provider_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + shared_preferences_foundation: + :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin + url_launcher_macos: + :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + +SPEC CHECKSUMS: + connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 + url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 + +PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 + +COCOAPODS: 1.13.0 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..64d9ba4 --- /dev/null +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,791 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 01882A8F1B03AA37E8F134D9 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E49B7937AB78ECF1C85FAC3C /* Pods_Runner.framework */; }; + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; }; + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 72DAF9C82785A4E248FEF6B3 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 659CE87A2DF6C2B4D8AE5741 /* Pods_RunnerTests.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC10EC2044A3C60003C045; + remoteInfo = Runner; + }; + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* cssd.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = cssd.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 4624B36C291F9CEBB36776B6 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + 4CAC533A880473CE5F2EF1FA /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + 659CE87A2DF6C2B4D8AE5741 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 65DB3E62D2B2F9A21F94EA87 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; + A949F98DEA319FA1D427C5C0 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + E49B7937AB78ECF1C85FAC3C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + EA2D22D937799F6D7C2F48FE /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; + EDDB523B0E8A982104154610 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 331C80D2294CF70F00263BE5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 72DAF9C82785A4E248FEF6B3 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 01882A8F1B03AA37E8F134D9 /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C80D6294CF71000263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C80D7294CF71000263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 331C80D6294CF71000263BE5 /* RunnerTests */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + 69724AF2FBD7540CCD08568D /* Pods */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* cssd.app */, + 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + 69724AF2FBD7540CCD08568D /* Pods */ = { + isa = PBXGroup; + children = ( + 4CAC533A880473CE5F2EF1FA /* Pods-Runner.debug.xcconfig */, + EDDB523B0E8A982104154610 /* Pods-Runner.release.xcconfig */, + 65DB3E62D2B2F9A21F94EA87 /* Pods-Runner.profile.xcconfig */, + A949F98DEA319FA1D427C5C0 /* Pods-RunnerTests.debug.xcconfig */, + 4624B36C291F9CEBB36776B6 /* Pods-RunnerTests.release.xcconfig */, + EA2D22D937799F6D7C2F48FE /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + E49B7937AB78ECF1C85FAC3C /* Pods_Runner.framework */, + 659CE87A2DF6C2B4D8AE5741 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C80D4294CF70F00263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + B5DEC323D3581BB6443C1D42 /* [CP] Check Pods Manifest.lock */, + 331C80D1294CF70F00263BE5 /* Sources */, + 331C80D2294CF70F00263BE5 /* Frameworks */, + 331C80D3294CF70F00263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C80DA294CF71000263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C80D5294CF71000263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 2FADE5A4EF50582361027EB3 /* [CP] Check Pods Manifest.lock */, + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + 4501F9D449D460C52F0B20B7 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* cssd.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1430; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C80D4294CF70F00263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 33CC10EC2044A3C60003C045; + }; + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 331C80D4294CF70F00263BE5 /* RunnerTests */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C80D3294CF70F00263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 2FADE5A4EF50582361027EB3 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; + 4501F9D449D460C52F0B20B7 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B5DEC323D3581BB6443C1D42 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C80D1294CF70F00263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C80DA294CF71000263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC10EC2044A3C60003C045 /* Runner */; + targetProxy = 331C80D9294CF71000263BE5 /* PBXContainerItemProxy */; + }; + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 331C80DB294CF71000263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = A949F98DEA319FA1D427C5C0 /* Pods-RunnerTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/cssd.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/cssd"; + }; + name = Debug; + }; + 331C80DC294CF71000263BE5 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 4624B36C291F9CEBB36776B6 /* Pods-RunnerTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/cssd.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/cssd"; + }; + name = Release; + }; + 331C80DD294CF71000263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = EA2D22D937799F6D7C2F48FE /* Pods-RunnerTests.profile.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/cssd.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/cssd"; + }; + name = Profile; + }; + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C80DE294CF71000263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C80DB294CF71000263BE5 /* Debug */, + 331C80DC294CF71000263BE5 /* Release */, + 331C80DD294CF71000263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..d7a5670 --- /dev/null +++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..21a3cc1 --- /dev/null +++ b/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..d53ef64 --- /dev/null +++ b/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..82b6f9d9a33e198f5747104729e1fcef999772a5 GIT binary patch literal 102994 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ⅅ8MglG&ER{i5lN315cO?EdHNLrg? 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 z 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 Pe7HEdAEg|=c=LY&YVNkY literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..13b35eba55c6dabc3aac36f33d859266c18fa0d0 GIT binary patch literal 5680 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3f5fa40fb3d1e0710331a48de5d256da3f275d GIT binary patch literal 520 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 literal 0 HcmV?d00001 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1632cfddf3d9dade342351e627a0a75609fb46 GIT binary patch literal 2218 zcmV;b2vzrqP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuE6iGxuRCodHTWf3-RTMruyW6Fu zQYeUM04eX6D5c0FCjKKPrco1(K`<0SL=crI{PC3-^hZU0kQie$gh-5!7z6SH6Q0J% zqot*`H1q{R5fHFYS}dje@;kG=v$L0(yY0?wY2%*c?A&{2?!D*x?m71{of2gv!$5|C z3>qG_BW}7K_yUcT3A5C6QD<+{aq?x;MAUyAiJn#Jv8_zZtQ{P zTRzbL3U9!qVuZzS$xKU10KiW~Bgdcv1-!uAhQxf3a7q+dU6lj?yoO4Lq4TUN4}h{N z*fIM=SS8|C2$(T>w$`t@3Tka!(r!7W`x z-isCVgQD^mG-MJ;XtJuK3V{Vy72GQ83KRWsHU?e*wrhKk=ApIYeDqLi;JI1e zuvv}5^Dc=k7F7?nm3nIw$NVmU-+R>> zyqOR$-2SDpJ}Pt;^RkJytDVXNTsu|mI1`~G7yw`EJR?VkGfNdqK9^^8P`JdtTV&tX4CNcV4 z&N06nZa??Fw1AgQOUSE2AmPE@WO(Fvo`%m`cDgiv(fAeRA%3AGXUbsGw{7Q`cY;1BI#ac3iN$$Hw z0LT0;xc%=q)me?Y*$xI@GRAw?+}>=9D+KTk??-HJ4=A>`V&vKFS75@MKdSF1JTq{S zc1!^8?YA|t+uKigaq!sT;Z!&0F2=k7F0PIU;F$leJLaw2UI6FL^w}OG&!;+b%ya1c z1n+6-inU<0VM-Y_s5iTElq)ThyF?StVcebpGI znw#+zLx2@ah{$_2jn+@}(zJZ{+}_N9BM;z)0yr|gF-4=Iyu@hI*Lk=-A8f#bAzc9f z`Kd6K--x@t04swJVC3JK1cHY-Hq+=|PN-VO;?^_C#;coU6TDP7Bt`;{JTG;!+jj(` zw5cLQ-(Cz-Tlb`A^w7|R56Ce;Wmr0)$KWOUZ6ai0PhzPeHwdl0H(etP zUV`va_i0s-4#DkNM8lUlqI7>YQLf)(lz9Q3Uw`)nc(z3{m5ZE77Ul$V%m)E}3&8L0 z-XaU|eB~Is08eORPk;=<>!1w)Kf}FOVS2l&9~A+@R#koFJ$Czd%Y(ENTV&A~U(IPI z;UY+gf+&6ioZ=roly<0Yst8ck>(M=S?B-ys3mLdM&)ex!hbt+ol|T6CTS+Sc0jv(& z7ijdvFwBq;0a{%3GGwkDKTeG`b+lyj0jjS1OMkYnepCdoosNY`*zmBIo*981BU%%U z@~$z0V`OVtIbEx5pa|Tct|Lg#ZQf5OYMUMRD>Wdxm5SAqV2}3!ceE-M2 z@O~lQ0OiKQp}o9I;?uxCgYVV?FH|?Riri*U$Zi_`V2eiA>l zdSm6;SEm6#T+SpcE8Ro_f2AwxzI z44hfe^WE3!h@W3RDyA_H440cpmYkv*)6m1XazTqw%=E5Xv7^@^^T7Q2wxr+Z2kVYr + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..5a23593 --- /dev/null +++ b/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = cssd + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.cssd + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2023 com.example. All rights reserved. diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..c946719 --- /dev/null +++ b/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,14 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + com.apple.security.network.client + + + diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..3cc05eb --- /dev/null +++ b/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements new file mode 100644 index 0000000..48271ac --- /dev/null +++ b/macos/Runner/Release.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + + diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..5418c9f --- /dev/null +++ b/macos/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import FlutterMacOS +import Cocoa +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} diff --git a/pubspec.lock b/pubspec.lock index 335d9be..e3d122a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,579 +1,802 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.13" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.0" - async: - dependency: transitive - description: - name: async - url: "https://pub.dartlang.org" - source: hosted - version: "2.6.1" - barcode_scan2: - dependency: "direct main" - description: - name: barcode_scan2 - url: "https://pub.dartlang.org" - source: hosted - version: "4.1.3" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - camera: - dependency: "direct main" - description: - name: camera - url: "https://pub.dartlang.org" - source: hosted - version: "0.5.8+2" - characters: - dependency: transitive - description: - name: characters - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - clock: - dependency: transitive - description: - name: clock - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - collection: - dependency: transitive - description: - name: collection - url: "https://pub.dartlang.org" - source: hosted - version: "1.15.0" - connectivity: - dependency: "direct main" - description: - name: connectivity - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.6" - connectivity_for_web: - dependency: transitive - description: - name: connectivity_for_web - url: "https://pub.dartlang.org" - source: hosted - version: "0.4.0" - connectivity_macos: - dependency: transitive - description: - name: connectivity_macos - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - connectivity_platform_interface: - dependency: transitive - description: - name: connectivity_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.5" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - dio: - dependency: "direct main" - description: - name: dio - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.0" - double_back_to_close_app: - dependency: "direct main" - description: - name: double_back_to_close_app - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - fake_async: - dependency: transitive - description: - name: fake_async - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - ffi: - dependency: transitive - description: - name: ffi - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.2" - file: - dependency: transitive - description: - name: file - url: "https://pub.dartlang.org" - source: hosted - version: "6.1.2" - file_picker: - dependency: "direct main" - description: - name: file_picker - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.2+2" - fixnum: - dependency: transitive - description: - name: fixnum - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_launcher_icons: - dependency: "direct dev" - description: - name: flutter_launcher_icons - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.5" - flutter_phoenix: - dependency: "direct main" - description: - name: flutter_phoenix - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - font_awesome_flutter: - dependency: "direct main" - description: - name: font_awesome_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "8.8.1" - http: - dependency: "direct main" - description: - name: http - url: "https://pub.dartlang.org" - source: hosted - version: "0.13.3" - http_parser: - dependency: transitive - description: - name: http_parser - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.14" - image_picker: - dependency: transitive - description: - name: image_picker - url: "https://pub.dartlang.org" - source: hosted - version: "0.7.5+4" - image_picker_for_web: - dependency: transitive - description: - name: image_picker_for_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - image_picker_gallery_camera: - dependency: "direct main" - description: - name: image_picker_gallery_camera - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.2" - image_picker_platform_interface: - dependency: transitive - description: - name: image_picker_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - intl: - dependency: "direct main" - description: - name: intl - url: "https://pub.dartlang.org" - source: hosted - version: "0.16.1" - js: - dependency: transitive - description: - name: js - url: "https://pub.dartlang.org" - source: hosted - version: "0.6.3" - matcher: - dependency: transitive - description: - name: matcher - url: "https://pub.dartlang.org" - source: hosted - version: "0.12.10" - meta: - dependency: transitive - description: - name: meta - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - multiselect_formfield: - dependency: "direct main" - description: - name: multiselect_formfield - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.2" - nested: - dependency: transitive - description: - name: nested - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.0" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0" - path_provider: - dependency: "direct main" - description: - name: path_provider - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.4" - platform: - dependency: transitive - description: - name: platform - url: "https://pub.dartlang.org" - source: hosted - version: "3.0.0" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.1" - protobuf: - dependency: transitive - description: - name: protobuf - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - provider: - dependency: "direct main" - description: - name: provider - url: "https://pub.dartlang.org" - source: hosted - version: "5.0.0" - random_string: - dependency: "direct main" - description: - name: random_string - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.6" - shared_preferences_linux: - dependency: transitive - description: - name: shared_preferences_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_platform_interface: - dependency: transitive - description: - name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_web: - dependency: transitive - description: - name: shared_preferences_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - shared_preferences_windows: - dependency: transitive - description: - name: shared_preferences_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - url: "https://pub.dartlang.org" - source: hosted - version: "1.10.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" - test_api: - dependency: transitive - description: - name: test_api - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" - url_launcher: - dependency: "direct main" - description: - name: url_launcher - url: "https://pub.dartlang.org" - source: hosted - version: "6.0.6" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.3" - url_launcher_web: - dependency: transitive - description: - name: url_launcher_web - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" - vector_math: - dependency: transitive - description: - name: vector_math - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.0" - win32: - dependency: transitive - description: - name: win32 - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - url: "https://pub.dartlang.org" - source: hosted - version: "0.2.0" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.0" - yaml: - dependency: transitive - description: - name: yaml - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.1" -sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + archive: + dependency: transitive + description: + name: archive + sha256: e0902a06f0e00414e4e3438a084580161279f137aeb862274710f29ec10cf01e + url: "https://pub.dev" + source: hosted + version: "3.3.9" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: transitive + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + barcode_scan2: + dependency: "direct main" + description: + name: barcode_scan2 + sha256: "0b0625d27841a21e36e896195d86b2aada335e3c486f63647cce701495718e16" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + camera: + dependency: "direct main" + description: + name: camera + sha256: f63f2687fb1795c36f7c57b18a03071880eabb0fd8b5291b0fcd3fb979cb0fb1 + url: "https://pub.dev" + source: hosted + version: "0.10.5+4" + camera_android: + dependency: transitive + description: + name: camera_android + sha256: ed4f645848074166fc3b8e20350f83ca07e09a2becc1e185040ee561f955d4df + url: "https://pub.dev" + source: hosted + version: "0.10.8+8" + camera_avfoundation: + dependency: transitive + description: + name: camera_avfoundation + sha256: "718b60ed2e22b4067fe6e2c0e9ebe2856c2de5c8b1289ba95d10db85b0b00bc2" + url: "https://pub.dev" + source: hosted + version: "0.9.13+4" + camera_platform_interface: + dependency: transitive + description: + name: camera_platform_interface + sha256: "8734d1c682f034bdb12d0d6ff379b0535a9b8e44266b530025bf8266d6a62f28" + url: "https://pub.dev" + source: hosted + version: "2.5.2" + camera_web: + dependency: transitive + description: + name: camera_web + sha256: d4c2c571c7af04f8b10702ca16bb9ed2a26e64534171e8f75c9349b2c004d8f1 + url: "https://pub.dev" + source: hosted + version: "0.3.2+3" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + url: "https://pub.dev" + source: hosted + version: "0.4.0" + clock: + dependency: transitive + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + collection: + dependency: transitive + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + connectivity: + dependency: "direct main" + description: + name: connectivity + sha256: a8e91263cf3e25fb5cc95e19dfde4999e32a648ac3b9e8a558a28165731678f8 + url: "https://pub.dev" + source: hosted + version: "3.0.6" + connectivity_for_web: + dependency: transitive + description: + name: connectivity_for_web + sha256: "01a390c1d5adc2ed1fa1f52d120c07fe9fd01166a93f965a832fd6cfc0ea6482" + url: "https://pub.dev" + source: hosted + version: "0.4.0+1" + connectivity_macos: + dependency: transitive + description: + name: connectivity_macos + sha256: "51ae08d5162eca9669b9d8951ed83ce19c5355a81149f94e4dee2740beb93628" + url: "https://pub.dev" + source: hosted + version: "0.2.1+2" + connectivity_platform_interface: + dependency: transitive + description: + name: connectivity_platform_interface + sha256: "2d82e942df9d49f29a24bb07fb5ce085d4a53e47818c62364d2b6deb9e0d7a8e" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: fd832b5384d0d6da4f6df60b854d33accaaeb63aa9e10e736a87381f08dee2cb + url: "https://pub.dev" + source: hosted + version: "0.3.3+5" + crypto: + dependency: transitive + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + url: "https://pub.dev" + source: hosted + version: "1.0.6" + dio: + dependency: "direct main" + description: + name: dio + sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197 + url: "https://pub.dev" + source: hosted + version: "5.3.2" + double_back_to_close_app: + dependency: "direct main" + description: + name: double_back_to_close_app + sha256: d19ce4e2f8d2cb9f35bdbc90eecd5c731cc0e6216f5e8f14e7d1e076dafb344a + url: "https://pub.dev" + source: hosted + version: "2.1.0" + equatable: + dependency: "direct main" + description: + name: equatable + sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 + url: "https://pub.dev" + source: hosted + version: "2.0.5" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: be325344c1f3070354a1d84a231a1ba75ea85d413774ec4bdf444c023342e030 + url: "https://pub.dev" + source: hosted + version: "5.5.0" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" + flutter_lints: + dependency: "direct main" + description: + name: flutter_lints + sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + url: "https://pub.dev" + source: hosted + version: "2.0.3" + flutter_phoenix: + dependency: "direct main" + description: + name: flutter_phoenix + sha256: "39589dac934ea476d0e43fb60c1ddfba58f14960743640c8250dea11c4333378" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: f185ac890306b5779ecbd611f52502d8d4d63d27703ef73161ca0407e815f02c + url: "https://pub.dev" + source: hosted + version: "2.0.16" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + font_awesome_flutter: + dependency: "direct main" + description: + name: font_awesome_flutter + sha256: "5fb789145cae1f4c3245c58b3f8fb287d055c26323879eab57a7bf0cfd1e45f3" + url: "https://pub.dev" + source: hosted + version: "10.5.0" + http: + dependency: "direct main" + description: + name: http + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" + source: hosted + version: "4.0.17" + image_picker: + dependency: transitive + description: + name: image_picker + sha256: b4f02353277b39f350093a2460b32b43eafaa3bfc4f92e8d90926698d8d78df6 + url: "https://pub.dev" + source: hosted + version: "0.7.5+4" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + image_picker_gallery_camera: + dependency: "direct main" + description: + name: image_picker_gallery_camera + sha256: "8fedbb3ed82f5bf39c1370234b092ccedf0e01a741cc68a36ba9ea2982d8ca01" + url: "https://pub.dev" + source: hosted + version: "0.2.2" + image_picker_platform_interface: + dependency: transitive + description: + name: image_picker_platform_interface + sha256: ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514 + url: "https://pub.dev" + source: hosted + version: "2.9.1" + intl: + dependency: "direct main" + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + lints: + dependency: transitive + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" + source: hosted + version: "0.5.0" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + multiselect_formfield: + dependency: "direct main" + description: + name: multiselect_formfield + sha256: "3a28c41093a53b4dc30ee0e4f73f67169a8be883dd3b17a4561467185ce1adf8" + url: "https://pub.dev" + source: hosted + version: "0.1.7" + nested: + dependency: transitive + description: + name: nested + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + path: + dependency: transitive + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + path_provider: + dependency: "direct main" + description: + name: path_provider + sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa + url: "https://pub.dev" + source: hosted + version: "2.1.1" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" + source: hosted + version: "2.2.1" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + platform: + dependency: transitive + description: + name: platform + sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + url: "https://pub.dev" + source: hosted + version: "2.1.6" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" + protobuf: + dependency: transitive + description: + name: protobuf + sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + provider: + dependency: "direct main" + description: + name: provider + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" + source: hosted + version: "6.0.5" + quiver: + dependency: transitive + description: + name: quiver + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" + source: hosted + version: "3.2.1" + random_string: + dependency: "direct main" + description: + name: random_string + sha256: "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac + url: "https://pub.dev" + source: hosted + version: "2.2.1" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" + url: "https://pub.dev" + source: hosted + version: "2.3.4" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a + url: "https://pub.dev" + source: hosted + version: "2.3.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + url: "https://pub.dev" + source: hosted + version: "2.3.1" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + url: "https://pub.dev" + source: hosted + version: "2.2.1" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f + url: "https://pub.dev" + source: hosted + version: "2.3.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" + url: "https://pub.dev" + source: hosted + version: "6.1.14" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 + url: "https://pub.dev" + source: hosted + version: "6.1.0" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" + url: "https://pub.dev" + source: hosted + version: "6.1.5" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e + url: "https://pub.dev" + source: hosted + version: "3.0.6" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 + url: "https://pub.dev" + source: hosted + version: "3.0.7" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5" + url: "https://pub.dev" + source: hosted + version: "2.0.20" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" + url: "https://pub.dev" + source: hosted + version: "3.0.8" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" + win32: + dependency: transitive + description: + name: win32 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" + url: "https://pub.dev" + source: hosted + version: "5.0.7" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + url: "https://pub.dev" + source: hosted + version: "1.0.3" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/pubspec.yaml b/pubspec.yaml index 35e1b9b..610e444 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,93 +1,94 @@ -name: cssd -description: A new Flutter project. - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.7.1+7 - -environment: - sdk: ">=2.7.0 <3.0.0" - -dependencies: - flutter: - sdk: flutter - barcode_scan2: ^4.1.3 - camera: ^0.5.8+2 - connectivity: ^3.0.6 - cupertino_icons: ^1.0.3 - dio: ^4.0.0 - double_back_to_close_app: ^2.0.1 - file_picker: ^3.0.2+2 - flutter_phoenix: ^1.0.0 - font_awesome_flutter: ^8.8.1 - http: ^0.13.3 - image_picker_gallery_camera: ^0.2.2 - intl: ^0.16.1 - multiselect_formfield: ^0.1.2 - path_provider: ^2.0.2 - provider: ^5.0.0 - random_string: ^2.0.1 - shared_preferences: ^2.0.6 - url_launcher: ^6.0.6 - # video_player: ^0.10.11+2 - -dev_dependencies: - flutter_test: - sdk: flutter - flutter_launcher_icons: ^0.7.5 - -flutter_icons: - image_path: "assets/Images/icon.png" - android: true - ios: true -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec -# The following section is specific to Flutter. -flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. - uses-material-design: true - - # To add assets to your application, add an assets section, like this: - assets: - - assets/Images/ - # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - fonts: - - family: montserrat - fonts: - - asset: assets/Fonts/Montserrat-Regular.ttf - - asset: assets/Fonts/Montserrat-Bold.ttf - weight: 700 - - family: montserratlight - fonts: - - asset: assets/Fonts/Montserrat-Light.ttf - - asset: assets/Fonts/Montserrat-Bold.ttf - weight: 700 - - family: montserratmedium - fonts: - - asset: assets/Fonts/Montserrat-Medium.ttf - - asset: assets/Fonts/Montserrat-Bold.ttf - weight: 700 - # - asset: assets/Fonts/Montserrat-Light.ttf - # - asset: assets/Fonts/Montserrat-Italic.ttf - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages +name: cssd +description: A new Flutter project. + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +version: 1.7.1+7 + +environment: + sdk: ">=3.0.5 <4.0.0" + +dependencies: + flutter: + sdk: flutter + barcode_scan2: ^4.1.3 + camera: ^0.10.5+4 + connectivity: ^3.0.6 + cupertino_icons: ^1.0.3 + dio: ^5.3.2 + double_back_to_close_app: ^2.0.1 + file_picker: ^5.5.0 + flutter_phoenix: ^1.0.0 + font_awesome_flutter: ^10.5.0 + http: ^1.1.0 + image_picker_gallery_camera: ^0.2.2 + intl: ^0.18.1 + multiselect_formfield: ^0.1.2 + path_provider: ^2.0.2 + provider: ^6.0.5 + random_string: ^2.0.1 + shared_preferences: ^2.0.6 + url_launcher: ^6.0.6 + equatable: ^2.0.5 + flutter_lints: ^2.0.3 + # video_player: ^0.10.11+2 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_launcher_icons: ^0.13.1 + +flutter_icons: + image_path: "assets/Images/icon.png" + android: true + ios: true +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec +# The following section is specific to Flutter. +flutter: + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + assets: + - assets/Images/ + # - images/a_dot_ham.jpeg + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware. + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + fonts: + - family: montserrat + fonts: + - asset: assets/Fonts/Montserrat-Regular.ttf + - asset: assets/Fonts/Montserrat-Bold.ttf + weight: 700 + - family: montserratlight + fonts: + - asset: assets/Fonts/Montserrat-Light.ttf + - asset: assets/Fonts/Montserrat-Bold.ttf + weight: 700 + - family: montserratmedium + fonts: + - asset: assets/Fonts/Montserrat-Medium.ttf + - asset: assets/Fonts/Montserrat-Bold.ttf + weight: 700 + # - asset: assets/Fonts/Montserrat-Light.ttf + # - asset: assets/Fonts/Montserrat-Italic.ttf + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/test/widget_test.dart b/test/widget_test.dart index f0d60ac..63b4df0 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -1,30 +1,30 @@ -// // This is a basic Flutter widget test. -// // -// // To perform an interaction with a widget in your test, use the WidgetTester -// // utility that Flutter provides. For example, you can send tap and scroll -// // gestures. You can also use WidgetTester to find child widgets in the widget -// // tree, read text, and verify that the values of widget properties are correct. - -// import 'package:flutter/material.dart'; -// import 'package:flutter_test/flutter_test.dart'; - -// import 'package:cssd/main.dart'; - -// void main() { -// testWidgets('Counter increments smoke test', (WidgetTester tester) async { -// // Build our app and trigger a frame. -// await tester.pumpWidget(MyApp()); - -// // Verify that our counter starts at 0. -// expect(find.text('0'), findsOneWidget); -// expect(find.text('1'), findsNothing); - -// // Tap the '+' icon and trigger a frame. -// await tester.tap(find.byIcon(Icons.add)); -// await tester.pump(); - -// // Verify that our counter has incremented. -// expect(find.text('0'), findsNothing); -// expect(find.text('1'), findsOneWidget); -// }); -// } +// // This is a basic Flutter widget test. +// // +// // To perform an interaction with a widget in your test, use the WidgetTester +// // utility that Flutter provides. For example, you can send tap and scroll +// // gestures. You can also use WidgetTester to find child widgets in the widget +// // tree, read text, and verify that the values of widget properties are correct. + +// import 'package:flutter/material.dart'; +// import 'package:flutter_test/flutter_test.dart'; + +// import 'package:cssd/main.dart'; + +// void main() { +// testWidgets('Counter increments smoke test', (WidgetTester tester) async { +// // Build our app and trigger a frame. +// await tester.pumpWidget(MyApp()); + +// // Verify that our counter starts at 0. +// expect(find.text('0'), findsOneWidget); +// expect(find.text('1'), findsNothing); + +// // Tap the '+' icon and trigger a frame. +// await tester.tap(find.byIcon(Icons.add)); +// await tester.pump(); + +// // Verify that our counter has incremented. +// expect(find.text('0'), findsNothing); +// expect(find.text('1'), findsOneWidget); +// }); +// } diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 zcmeFZ_gj-)&^4Nb2tlbLMU<{!p(#yjqEe+=0IA_oih%ScH9@5#MNp&}Y#;;(h=A0@ zh7{>lT2MkSQ344eAvrhici!td|HJuyvJm#Y_w1Q9Yu3!26dNlO-oxUDK_C#XnW^Co z5C{VN6#{~B0)K2j7}*1Xq(Nqemv23A-6&=ZpEijkVnSwVGqLv40?n0=p;k3-U5e5+ z+z3>aS`u9DS=!wg8ROu?X4TFoW6CFLL&{GzoVT)ldhLekLM|+j3tIxRd|*5=c{=s&*vfPdBr(Fyj(v@%eQj1Soy7m4^@VRl1~@-PV7y+c!xz$8436WBn$t{=}mEdK#k`aystimGgI{(IBx$!pAwFoE9Y`^t^;> zKAD)C(Dl^s%`?q5$P|fZf8Xymrtu^Pv(7D`rn>Z-w$Ahs!z9!94WNVxrJuXfHAaxg zC6s@|Z1$7R$(!#t%Jb{{s6(Y?NoQXDYq)!}X@jKPhe`{9KQ@sAU8y-5`xt?S9$jKH zoi}6m5PcG*^{kjvt+kwPpyQzVg4o)a>;LK`aaN2x4@itBD3Aq?yWTM20VRn1rrd+2 zKO=P0rMjEGq_UqpMa`~7B|p?xAN1SCoCp}QxAv8O`jLJ5CVh@umR%c%i^)6!o+~`F zaalSTQcl5iwOLC&H)efzd{8(88mo`GI(56T<(&p7>Qd^;R1hn1Y~jN~tApaL8>##U zd65bo8)79CplWxr#z4!6HvLz&N7_5AN#x;kLG?zQ(#p|lj<8VUlKY=Aw!ATqeL-VG z42gA!^cMNPj>(`ZMEbCrnkg*QTsn*u(nQPWI9pA{MQ=IsPTzd7q5E#7+z>Ch=fx$~ z;J|?(5jTo5UWGvsJa(Sx0?S#56+8SD!I^tftyeh_{5_31l6&Hywtn`bbqYDqGZXI( zCG7hBgvksX2ak8+)hB4jnxlO@A32C_RM&g&qDSb~3kM&)@A_j1*oTO@nicGUyv+%^ z=vB)4(q!ykzT==Z)3*3{atJ5}2PV*?Uw+HhN&+RvKvZL3p9E?gHjv{6zM!A|z|UHK z-r6jeLxbGn0D@q5aBzlco|nG2tr}N@m;CJX(4#Cn&p&sLKwzLFx1A5izu?X_X4x8r@K*d~7>t1~ zDW1Mv5O&WOxbzFC`DQ6yNJ(^u9vJdj$fl2dq`!Yba_0^vQHXV)vqv1gssZYzBct!j zHr9>ydtM8wIs}HI4=E}qAkv|BPWzh3^_yLH(|kdb?x56^BlDC)diWyPd*|f!`^12_U>TD^^94OCN0lVv~Sgvs94ecpE^}VY$w`qr_>Ue zTfH~;C<3H<0dS5Rkf_f@1x$Gms}gK#&k()IC0zb^QbR!YLoll)c$Agfi6MKI0dP_L z=Uou&u~~^2onea2%XZ@>`0x^L8CK6=I{ge;|HXMj)-@o~h&O{CuuwBX8pVqjJ*o}5 z#8&oF_p=uSo~8vn?R0!AMWvcbZmsrj{ZswRt(aEdbi~;HeVqIe)-6*1L%5u$Gbs}| zjFh?KL&U(rC2izSGtwP5FnsR@6$-1toz?RvLD^k~h9NfZgzHE7m!!7s6(;)RKo2z} zB$Ci@h({l?arO+vF;s35h=|WpefaOtKVx>l399}EsX@Oe3>>4MPy%h&^3N_`UTAHJ zI$u(|TYC~E4)|JwkWW3F!Tib=NzjHs5ii2uj0^m|Qlh-2VnB#+X~RZ|`SA*}}&8j9IDv?F;(Y^1=Z0?wWz;ikB zewU>MAXDi~O7a~?jx1x=&8GcR-fTp>{2Q`7#BE#N6D@FCp`?ht-<1|y(NArxE_WIu zP+GuG=Qq>SHWtS2M>34xwEw^uvo4|9)4s|Ac=ud?nHQ>ax@LvBqusFcjH0}{T3ZPQ zLO1l<@B_d-(IS682}5KA&qT1+{3jxKolW+1zL4inqBS-D>BohA!K5++41tM@ z@xe<-qz27}LnV#5lk&iC40M||JRmZ*A##K3+!j93eouU8@q-`W0r%7N`V$cR&JV;iX(@cS{#*5Q>~4BEDA)EikLSP@>Oo&Bt1Z~&0d5)COI%3$cLB_M?dK# z{yv2OqW!al-#AEs&QFd;WL5zCcp)JmCKJEdNsJlL9K@MnPegK23?G|O%v`@N{rIRa zi^7a}WBCD77@VQ-z_v{ZdRsWYrYgC$<^gRQwMCi6);%R~uIi31OMS}=gUTE(GKmCI z$zM>mytL{uNN+a&S38^ez(UT=iSw=l2f+a4)DyCA1Cs_N-r?Q@$3KTYosY!;pzQ0k zzh1G|kWCJjc(oZVBji@kN%)UBw(s{KaYGy=i{g3{)Z+&H8t2`^IuLLKWT6lL<-C(! zSF9K4xd-|VO;4}$s?Z7J_dYqD#Mt)WCDnsR{Kpjq275uUq6`v0y*!PHyS(}Zmv)_{>Vose9-$h8P0|y;YG)Bo}$(3Z%+Gs0RBmFiW!^5tBmDK-g zfe5%B*27ib+7|A*Fx5e)2%kIxh7xWoc3pZcXS2zik!63lAG1;sC1ja>BqH7D zODdi5lKW$$AFvxgC-l-)!c+9@YMC7a`w?G(P#MeEQ5xID#<}W$3bSmJ`8V*x2^3qz zVe<^^_8GHqYGF$nIQm0Xq2kAgYtm#UC1A(=&85w;rmg#v906 zT;RyMgbMpYOmS&S9c38^40oUp?!}#_84`aEVw;T;r%gTZkWeU;;FwM@0y0adt{-OK z(vGnPSlR=Nv2OUN!2=xazlnHPM9EWxXg2EKf0kI{iQb#FoP>xCB<)QY>OAM$Dcdbm zU6dU|%Mo(~avBYSjRc13@|s>axhrPl@Sr81{RSZUdz4(=|82XEbV*JAX6Lfbgqgz584lYgi0 z2-E{0XCVON$wHfvaLs;=dqhQJ&6aLn$D#0i(FkAVrXG9LGm3pSTf&f~RQb6|1_;W> z?n-;&hrq*~L=(;u#jS`*Yvh@3hU-33y_Kv1nxqrsf>pHVF&|OKkoC)4DWK%I!yq?P z=vXo8*_1iEWo8xCa{HJ4tzxOmqS0&$q+>LroMKI*V-rxhOc%3Y!)Y|N6p4PLE>Yek>Y(^KRECg8<|%g*nQib_Yc#A5q8Io z6Ig&V>k|~>B6KE%h4reAo*DfOH)_01tE0nWOxX0*YTJgyw7moaI^7gW*WBAeiLbD?FV9GSB zPv3`SX*^GRBM;zledO`!EbdBO_J@fEy)B{-XUTVQv}Qf~PSDpK9+@I`7G7|>Dgbbu z_7sX9%spVo$%qwRwgzq7!_N;#Td08m5HV#?^dF-EV1o)Q=Oa+rs2xH#g;ykLbwtCh znUnA^dW!XjspJ;otq$yV@I^s9Up(5k7rqhQd@OLMyyxVLj_+$#Vc*}Usevp^I(^vH zmDgHc0VMme|K&X?9&lkN{yq_(If)O`oUPW8X}1R5pSVBpfJe0t{sPA(F#`eONTh_) zxeLqHMfJX#?P(@6w4CqRE@Eiza; z;^5)Kk=^5)KDvd9Q<`=sJU8rjjxPmtWMTmzcH={o$U)j=QBuHarp?=}c??!`3d=H$nrJMyr3L-& zA#m?t(NqLM?I3mGgWA_C+0}BWy3-Gj7bR+d+U?n*mN$%5P`ugrB{PeV>jDUn;eVc- zzeMB1mI4?fVJatrNyq|+zn=!AiN~<}eoM#4uSx^K?Iw>P2*r=k`$<3kT00BE_1c(02MRz4(Hq`L^M&xt!pV2 zn+#U3@j~PUR>xIy+P>51iPayk-mqIK_5rlQMSe5&tDkKJk_$i(X&;K(11YGpEc-K= zq4Ln%^j>Zi_+Ae9eYEq_<`D+ddb8_aY!N;)(&EHFAk@Ekg&41ABmOXfWTo)Z&KotA zh*jgDGFYQ^y=m)<_LCWB+v48DTJw*5dwMm_YP0*_{@HANValf?kV-Ic3xsC}#x2h8 z`q5}d8IRmqWk%gR)s~M}(Qas5+`np^jW^oEd-pzERRPMXj$kS17g?H#4^trtKtq;C?;c ztd|%|WP2w2Nzg@)^V}!Gv++QF2!@FP9~DFVISRW6S?eP{H;;8EH;{>X_}NGj^0cg@ z!2@A>-CTcoN02^r6@c~^QUa={0xwK0v4i-tQ9wQq^=q*-{;zJ{Qe%7Qd!&X2>rV@4 z&wznCz*63_vw4>ZF8~%QCM?=vfzW0r_4O^>UA@otm_!N%mH)!ERy&b!n3*E*@?9d^ zu}s^By@FAhG(%?xgJMuMzuJw2&@$-oK>n z=UF}rt%vuaP9fzIFCYN-1&b#r^Cl6RDFIWsEsM|ROf`E?O(cy{BPO2Ie~kT+^kI^i zp>Kbc@C?}3vy-$ZFVX#-cx)Xj&G^ibX{pWggtr(%^?HeQL@Z( zM-430g<{>vT*)jK4aY9(a{lSy{8vxLbP~n1MXwM527ne#SHCC^F_2@o`>c>>KCq9c(4c$VSyMl*y3Nq1s+!DF| z^?d9PipQN(mw^j~{wJ^VOXDCaL$UtwwTpyv8IAwGOg<|NSghkAR1GSNLZ1JwdGJYm zP}t<=5=sNNUEjc=g(y)1n5)ynX(_$1-uGuDR*6Y^Wgg(LT)Jp><5X|}bt z_qMa&QP?l_n+iVS>v%s2Li_;AIeC=Ca^v1jX4*gvB$?H?2%ndnqOaK5-J%7a} zIF{qYa&NfVY}(fmS0OmXA70{znljBOiv5Yod!vFU{D~*3B3Ka{P8?^ zfhlF6o7aNT$qi8(w<}OPw5fqA7HUje*r*Oa(YV%*l0|9FP9KW@U&{VSW{&b0?@y)M zs%4k1Ax;TGYuZ9l;vP5@?3oQsp3)rjBeBvQQ>^B;z5pc=(yHhHtq6|0m(h4envn_j787fizY@V`o(!SSyE7vlMT zbo=Z1c=atz*G!kwzGB;*uPL$Ei|EbZLh8o+1BUMOpnU(uX&OG1MV@|!&HOOeU#t^x zr9=w2ow!SsTuJWT7%Wmt14U_M*3XiWBWHxqCVZI0_g0`}*^&yEG9RK9fHK8e+S^m? zfCNn$JTswUVbiC#>|=wS{t>-MI1aYPLtzO5y|LJ9nm>L6*wpr_m!)A2Fb1RceX&*|5|MwrvOk4+!0p99B9AgP*9D{Yt|x=X}O% zgIG$MrTB=n-!q%ROT|SzH#A$Xm;|ym)0>1KR}Yl0hr-KO&qMrV+0Ej3d@?FcgZ+B3 ztEk16g#2)@x=(ko8k7^Tq$*5pfZHC@O@}`SmzT1(V@x&NkZNM2F#Q-Go7-uf_zKC( zB(lHZ=3@dHaCOf6C!6i8rDL%~XM@rVTJbZL09?ht@r^Z_6x}}atLjvH^4Vk#Ibf(^LiBJFqorm?A=lE zzFmwvp4bT@Nv2V>YQT92X;t9<2s|Ru5#w?wCvlhcHLcsq0TaFLKy(?nzezJ>CECqj zggrI~Hd4LudM(m{L@ezfnpELsRFVFw>fx;CqZtie`$BXRn#Ns%AdoE$-Pf~{9A8rV zf7FbgpKmVzmvn-z(g+&+-ID=v`;6=)itq8oM*+Uz**SMm_{%eP_c0{<%1JGiZS19o z@Gj7$Se~0lsu}w!%;L%~mIAO;AY-2i`9A*ZfFs=X!LTd6nWOZ7BZH2M{l2*I>Xu)0 z`<=;ObglnXcVk!T>e$H?El}ra0WmPZ$YAN0#$?|1v26^(quQre8;k20*dpd4N{i=b zuN=y}_ew9SlE~R{2+Rh^7%PA1H5X(p8%0TpJ=cqa$65XL)$#ign-y!qij3;2>j}I; ziO@O|aYfn&up5F`YtjGw68rD3{OSGNYmBnl?zdwY$=RFsegTZ=kkzRQ`r7ZjQP!H( zp4>)&zf<*N!tI00xzm-ME_a{_I!TbDCr;8E;kCH4LlL-tqLxDuBn-+xgPk37S&S2^ z2QZumkIimwz!c@!r0)j3*(jPIs*V!iLTRl0Cpt_UVNUgGZzdvs0(-yUghJfKr7;=h zD~y?OJ-bWJg;VdZ^r@vlDoeGV&8^--!t1AsIMZ5S440HCVr%uk- z2wV>!W1WCvFB~p$P$$_}|H5>uBeAe>`N1FI8AxM|pq%oNs;ED8x+tb44E) zTj{^fbh@eLi%5AqT?;d>Es5D*Fi{Bpk)q$^iF!!U`r2hHAO_?#!aYmf>G+jHsES4W zgpTKY59d?hsb~F0WE&dUp6lPt;Pm zcbTUqRryw^%{ViNW%Z(o8}dd00H(H-MmQmOiTq{}_rnwOr*Ybo7*}3W-qBT!#s0Ie z-s<1rvvJx_W;ViUD`04%1pra*Yw0BcGe)fDKUK8aF#BwBwMPU;9`!6E(~!043?SZx z13K%z@$$#2%2ovVlgFIPp7Q6(vO)ud)=*%ZSucL2Dh~K4B|%q4KnSpj#n@(0B})!9 z8p*hY@5)NDn^&Pmo;|!>erSYg`LkO?0FB@PLqRvc>4IsUM5O&>rRv|IBRxi(RX(gJ ztQ2;??L~&Mv;aVr5Q@(?y^DGo%pO^~zijld41aA0KKsy_6FeHIn?fNHP-z>$OoWer zjZ5hFQTy*-f7KENRiCE$ZOp4|+Wah|2=n@|W=o}bFM}Y@0e62+_|#fND5cwa3;P{^pEzlJbF1Yq^}>=wy8^^^$I2M_MH(4Dw{F6hm+vrWV5!q;oX z;tTNhz5`-V={ew|bD$?qcF^WPR{L(E%~XG8eJx(DoGzt2G{l8r!QPJ>kpHeOvCv#w zr=SSwMDaUX^*~v%6K%O~i)<^6`{go>a3IdfZ8hFmz&;Y@P%ZygShQZ2DSHd`m5AR= zx$wWU06;GYwXOf(%MFyj{8rPFXD};JCe85Bdp4$YJ2$TzZ7Gr#+SwCvBI1o$QP0(c zy`P51FEBV2HTisM3bHqpmECT@H!Y2-bv2*SoSPoO?wLe{M#zDTy@ujAZ!Izzky~3k zRA1RQIIoC*Mej1PH!sUgtkR0VCNMX(_!b65mo66iM*KQ7xT8t2eev$v#&YdUXKwGm z7okYAqYF&bveHeu6M5p9xheRCTiU8PFeb1_Rht0VVSbm%|1cOVobc8mvqcw!RjrMRM#~=7xibH&Fa5Imc|lZ{eC|R__)OrFg4@X_ ze+kk*_sDNG5^ELmHnZ7Ue?)#6!O)#Nv*Dl2mr#2)w{#i-;}0*_h4A%HidnmclH#;Q zmQbq+P4DS%3}PpPm7K_K3d2s#k~x+PlTul7+kIKol0@`YN1NG=+&PYTS->AdzPv!> zQvzT=)9se*Jr1Yq+C{wbK82gAX`NkbXFZ)4==j4t51{|-v!!$H8@WKA={d>CWRW+g z*`L>9rRucS`vbXu0rzA1#AQ(W?6)}1+oJSF=80Kf_2r~Qm-EJ6bbB3k`80rCv(0d` zvCf3;L2ovYG_TES%6vSuoKfIHC6w;V31!oqHM8-I8AFzcd^+_86!EcCOX|Ta9k1!s z_Vh(EGIIsI3fb&dF$9V8v(sTBC%!#<&KIGF;R+;MyC0~}$gC}}= zR`DbUVc&Bx`lYykFZ4{R{xRaUQkWCGCQlEc;!mf=+nOk$RUg*7 z;kP7CVLEc$CA7@6VFpsp3_t~m)W0aPxjsA3e5U%SfY{tp5BV5jH-5n?YX7*+U+Zs%LGR>U- z!x4Y_|4{gx?ZPJobISy991O znrmrC3otC;#4^&Rg_iK}XH(XX+eUHN0@Oe06hJk}F?`$)KmH^eWz@@N%wEc)%>?Ft z#9QAroDeyfztQ5Qe{m*#R#T%-h*&XvSEn@N$hYRTCMXS|EPwzF3IIysD2waj`vQD{ zv_#^Pgr?s~I*NE=acf@dWVRNWTr(GN0wrL)Z2=`Dr>}&ZDNX|+^Anl{Di%v1Id$_p zK5_H5`RDjJx`BW7hc85|> zHMMsWJ4KTMRHGu+vy*kBEMjz*^K8VtU=bXJYdhdZ-?jTXa$&n)C?QQIZ7ln$qbGlr zS*TYE+ppOrI@AoPP=VI-OXm}FzgXRL)OPvR$a_=SsC<3Jb+>5makX|U!}3lx4tX&L z^C<{9TggZNoeX!P1jX_K5HkEVnQ#s2&c#umzV6s2U-Q;({l+j^?hi7JnQ7&&*oOy9 z(|0asVTWUCiCnjcOnB2pN0DpuTglKq;&SFOQ3pUdye*eT<2()7WKbXp1qq9=bhMWlF-7BHT|i3TEIT77AcjD(v=I207wi-=vyiw5mxgPdTVUC z&h^FEUrXwWs9en2C{ywZp;nvS(Mb$8sBEh-*_d-OEm%~p1b2EpcwUdf<~zmJmaSTO zSX&&GGCEz-M^)G$fBvLC2q@wM$;n4jp+mt0MJFLuJ%c`tSp8$xuP|G81GEd2ci$|M z4XmH{5$j?rqDWoL4vs!}W&!?!rtj=6WKJcE>)?NVske(p;|#>vL|M_$as=mi-n-()a*OU3Okmk0wC<9y7t^D(er-&jEEak2!NnDiOQ99Wx8{S8}=Ng!e0tzj*#T)+%7;aM$ z&H}|o|J1p{IK0Q7JggAwipvHvko6>Epmh4RFRUr}$*2K4dz85o7|3#Bec9SQ4Y*;> zXWjT~f+d)dp_J`sV*!w>B%)#GI_;USp7?0810&3S=WntGZ)+tzhZ+!|=XlQ&@G@~3 z-dw@I1>9n1{+!x^Hz|xC+P#Ab`E@=vY?3%Bc!Po~e&&&)Qp85!I|U<-fCXy*wMa&t zgDk!l;gk;$taOCV$&60z+}_$ykz=Ea*)wJQ3-M|p*EK(cvtIre0Pta~(95J7zoxBN zS(yE^3?>88AL0Wfuou$BM{lR1hkrRibz=+I9ccwd`ZC*{NNqL)3pCcw^ygMmrG^Yp zn5f}Xf>%gncC=Yq96;rnfp4FQL#{!Y*->e82rHgY4Zwy{`JH}b9*qr^VA{%~Z}jtp z_t$PlS6}5{NtTqXHN?uI8ut8rOaD#F1C^ls73S=b_yI#iZDOGz3#^L@YheGd>L;<( z)U=iYj;`{>VDNzIxcjbTk-X3keXR8Xbc`A$o5# zKGSk-7YcoBYuAFFSCjGi;7b<;n-*`USs)IX z=0q6WZ=L!)PkYtZE-6)azhXV|+?IVGTOmMCHjhkBjfy@k1>?yFO3u!)@cl{fFAXnRYsWk)kpT?X{_$J=|?g@Q}+kFw|%n!;Zo}|HE@j=SFMvT8v`6Y zNO;tXN^036nOB2%=KzxB?n~NQ1K8IO*UE{;Xy;N^ZNI#P+hRZOaHATz9(=)w=QwV# z`z3+P>9b?l-@$@P3<;w@O1BdKh+H;jo#_%rr!ute{|YX4g5}n?O7Mq^01S5;+lABE+7`&_?mR_z7k|Ja#8h{!~j)| zbBX;*fsbUak_!kXU%HfJ2J+G7;inu#uRjMb|8a){=^))y236LDZ$$q3LRlat1D)%7K0!q5hT5V1j3qHc7MG9 z_)Q=yQ>rs>3%l=vu$#VVd$&IgO}Za#?aN!xY>-<3PhzS&q!N<=1Q7VJBfHjug^4|) z*fW^;%3}P7X#W3d;tUs3;`O&>;NKZBMR8au6>7?QriJ@gBaorz-+`pUWOP73DJL=M z(33uT6Gz@Sv40F6bN|H=lpcO z^AJl}&=TIjdevuDQ!w0K*6oZ2JBOhb31q!XDArFyKpz!I$p4|;c}@^bX{>AXdt7Bm zaLTk?c%h@%xq02reu~;t@$bv`b3i(P=g}~ywgSFpM;}b$zAD+=I!7`V~}ARB(Wx0C(EAq@?GuxOL9X+ffbkn3+Op0*80TqmpAq~EXmv%cq36celXmRz z%0(!oMp&2?`W)ALA&#|fu)MFp{V~~zIIixOxY^YtO5^FSox8v$#d0*{qk0Z)pNTt0QVZ^$`4vImEB>;Lo2!7K05TpY-sl#sWBz_W-aDIV`Ksabi zvpa#93Svo!70W*Ydh)Qzm{0?CU`y;T^ITg-J9nfWeZ-sbw)G@W?$Eomf%Bg2frfh5 zRm1{|E0+(4zXy){$}uC3%Y-mSA2-^I>Tw|gQx|7TDli_hB>``)Q^aZ`LJC2V3U$SABP}T)%}9g2pF9dT}aC~!rFFgkl1J$ z`^z{Arn3On-m%}r}TGF8KQe*OjSJ=T|caa_E;v89A{t@$yT^(G9=N9F?^kT*#s3qhJq!IH5|AhnqFd z0B&^gm3w;YbMNUKU>naBAO@fbz zqw=n!@--}o5;k6DvTW9pw)IJVz;X}ncbPVrmH>4x);8cx;q3UyiML1PWp%bxSiS|^ zC5!kc4qw%NSOGQ*Kcd#&$30=lDvs#*4W4q0u8E02U)7d=!W7+NouEyuF1dyH$D@G& zaFaxo9Ex|ZXA5y{eZT*i*dP~INSMAi@mvEX@q5i<&o&#sM}Df?Og8n8Ku4vOux=T% zeuw~z1hR}ZNwTn8KsQHKLwe2>p^K`YWUJEdVEl|mO21Bov!D0D$qPoOv=vJJ`)|%_ z>l%`eexY7t{BlVKP!`a^U@nM?#9OC*t76My_E_<16vCz1x_#82qj2PkWiMWgF8bM9 z(1t4VdHcJ;B~;Q%x01k_gQ0>u2*OjuEWNOGX#4}+N?Gb5;+NQMqp}Puqw2HnkYuKA zzKFWGHc&K>gwVgI1Sc9OT1s6fq=>$gZU!!xsilA$fF`kLdGoX*^t}ao@+^WBpk>`8 z4v_~gK|c2rCq#DZ+H)$3v~Hoi=)=1D==e3P zpKrRQ+>O^cyTuWJ%2}__0Z9SM_z9rptd*;-9uC1tDw4+A!=+K%8~M&+Zk#13hY$Y$ zo-8$*8dD5@}XDi19RjK6T^J~DIXbF5w&l?JLHMrf0 zLv0{7*G!==o|B%$V!a=EtVHdMwXLtmO~vl}P6;S(R2Q>*kTJK~!}gloxj)m|_LYK{ zl(f1cB=EON&wVFwK?MGn^nWuh@f95SHatPs(jcwSY#Dnl1@_gkOJ5=f`%s$ZHljRH0 z+c%lrb=Gi&N&1>^L_}#m>=U=(oT^vTA&3!xXNyqi$pdW1BDJ#^{h|2tZc{t^vag3& zAD7*8C`chNF|27itjBUo^CCDyEpJLX3&u+(L;YeeMwnXEoyN(ytoEabcl$lSgx~Ltatn}b$@j_yyMrBb03)shJE*$;Mw=;mZd&8e>IzE+4WIoH zCSZE7WthNUL$|Y#m!Hn?x7V1CK}V`KwW2D$-7&ODy5Cj;!_tTOOo1Mm%(RUt)#$@3 zhurA)t<7qik%%1Et+N1?R#hdBB#LdQ7{%-C zn$(`5e0eFh(#c*hvF>WT*07fk$N_631?W>kfjySN8^XC9diiOd#s?4tybICF;wBjp zIPzilX3{j%4u7blhq)tnaOBZ_`h_JqHXuI7SuIlNTgBk9{HIS&3|SEPfrvcE<@}E` zKk$y*nzsqZ{J{uWW9;#n=de&&h>m#A#q)#zRonr(?mDOYU&h&aQWD;?Z(22wY?t$U3qo`?{+amA$^TkxL+Ex2dh`q7iR&TPd0Ymwzo#b? zP$#t=elB5?k$#uE$K>C$YZbYUX_JgnXA`oF_Ifz4H7LEOW~{Gww&3s=wH4+j8*TU| zSX%LtJWqhr-xGNSe{;(16kxnak6RnZ{0qZ^kJI5X*It_YuynSpi(^-}Lolr{)#z_~ zw!(J-8%7Ybo^c3(mED`Xz8xecP35a6M8HarxRn%+NJBE;dw>>Y2T&;jzRd4FSDO3T zt*y+zXCtZQ0bP0yf6HRpD|WmzP;DR^-g^}{z~0x~z4j8m zucTe%k&S9Nt-?Jb^gYW1w6!Y3AUZ0Jcq;pJ)Exz%7k+mUOm6%ApjjSmflfKwBo6`B zhNb@$NHTJ>guaj9S{@DX)!6)b-Shav=DNKWy(V00k(D!v?PAR0f0vDNq*#mYmUp6> z76KxbFDw5U{{qx{BRj(>?|C`82ICKbfLxoldov-M?4Xl+3;I4GzLHyPOzYw7{WQST zPNYcx5onA%MAO9??41Po*1zW(Y%Zzn06-lUp{s<3!_9vv9HBjT02On0Hf$}NP;wF) zP<`2p3}A^~1YbvOh{ePMx$!JGUPX-tbBzp3mDZMY;}h;sQ->!p97GA)9a|tF(Gh{1$xk7 zUw?ELkT({Xw!KIr);kTRb1b|UL`r2_`a+&UFVCdJ)1T#fdh;71EQl9790Br0m_`$x z9|ZANuchFci8GNZ{XbP=+uXSJRe(;V5laQz$u18#?X*9}x7cIEbnr%<=1cX3EIu7$ zhHW6pe5M(&qEtsqRa>?)*{O;OJT+YUhG5{km|YI7I@JL_3Hwao9aXneiSA~a* z|Lp@c-oMNyeAEuUz{F?kuou3x#C*gU?lon!RC1s37gW^0Frc`lqQWH&(J4NoZg3m8 z;Lin#8Q+cFPD7MCzj}#|ws7b@?D9Q4dVjS4dpco=4yX5SSH=A@U@yqPdp@?g?qeia zH=Tt_9)G=6C2QIPsi-QipnK(mc0xXIN;j$WLf@n8eYvMk;*H-Q4tK%(3$CN}NGgO8n}fD~+>?<3UzvsrMf*J~%i;VKQHbF%TPalFi=#sgj)(P#SM^0Q=Tr>4kJVw8X3iWsP|e8tj}NjlMdWp z@2+M4HQu~3!=bZpjh;;DIDk&X}=c8~kn)FWWH z2KL1w^rA5&1@@^X%MjZ7;u(kH=YhH2pJPFQe=hn>tZd5RC5cfGYis8s9PKaxi*}-s6*W zRA^PwR=y^5Z){!(4D9-KC;0~;b*ploznFOaU`bJ_7U?qAi#mTo!&rIECRL$_y@yI27x2?W+zqDBD5~KCVYKFZLK+>ABC(Kj zeAll)KMgIlAG`r^rS{loBrGLtzhHY8$)<_S<(Dpkr(Ym@@vnQ&rS@FC*>2@XCH}M+an74WcRDcoQ+a3@A z9tYhl5$z7bMdTvD2r&jztBuo37?*k~wcU9GK2-)MTFS-lux-mIRYUuGUCI~V$?s#< z?1qAWb(?ZLm(N>%S%y10COdaq_Tm5c^%ooIxpR=`3e4C|@O5wY+eLik&XVi5oT7oe zmxH)Jd*5eo@!7t`x8!K=-+zJ-Sz)B_V$)s1pW~CDU$=q^&ABvf6S|?TOMB-RIm@CoFg>mjIQE)?+A1_3s6zmFU_oW&BqyMz1mY*IcP_2knjq5 zqw~JK(cVsmzc7*EvTT2rvpeqhg)W=%TOZ^>f`rD4|7Z5fq*2D^lpCttIg#ictgqZ$P@ru6P#f$x#KfnfTZj~LG6U_d-kE~`;kU_X)`H5so@?C zWmb!7x|xk@0L~0JFall*@ltyiL^)@3m4MqC7(7H0sH!WidId1#f#6R{Q&A!XzO1IAcIx;$k66dumt6lpUw@nL2MvqJ5^kbOVZ<^2jt5-njy|2@`07}0w z;M%I1$FCoLy`8xp8Tk)bFr;7aJeQ9KK6p=O$U0-&JYYy8woV*>b+FB?xLX`=pirYM z5K$BA(u)+jR{?O2r$c_Qvl?M{=Ar{yQ!UVsVn4k@0!b?_lA;dVz9uaQUgBH8Oz(Sb zrEs;&Ey>_ex8&!N{PmQjp+-Hlh|OA&wvDai#GpU=^-B70V0*LF=^bi+Nhe_o|azZ%~ZZ1$}LTmWt4aoB1 zPgccm$EwYU+jrdBaQFxQfn5gd(gM`Y*Ro1n&Zi?j=(>T3kmf94vdhf?AuS8>$Va#P zGL5F+VHpxdsCUa}+RqavXCobI-@B;WJbMphpK2%6t=XvKWWE|ruvREgM+|V=i6;;O zx$g=7^`$XWn0fu!gF=Xe9cMB8Z_SelD>&o&{1XFS`|nInK3BXlaeD*rc;R-#osyIS zWv&>~^TLIyBB6oDX+#>3<_0+2C4u2zK^wmHXXDD9_)kmLYJ!0SzM|%G9{pi)`X$uf zW}|%%#LgyK7m(4{V&?x_0KEDq56tk|0YNY~B(Sr|>WVz-pO3A##}$JCT}5P7DY+@W z#gJv>pA5>$|E3WO2tV7G^SuymB?tY`ooKcN3!vaQMnBNk-WATF{-$#}FyzgtJ8M^; zUK6KWSG)}6**+rZ&?o@PK3??uN{Q)#+bDP9i1W&j)oaU5d0bIWJ_9T5ac!qc?x66Q z$KUSZ`nYY94qfN_dpTFr8OW~A?}LD;Yty-BA)-be5Z3S#t2Io%q+cAbnGj1t$|qFR z9o?8B7OA^KjCYL=-!p}w(dkC^G6Nd%_I=1))PC0w5}ZZGJxfK)jP4Fwa@b-SYBw?% zdz9B-<`*B2dOn(N;mcTm%Do)rIvfXRNFX&1h`?>Rzuj~Wx)$p13nrDlS8-jwq@e@n zNIj_|8or==8~1h*Ih?w*8K7rYkGlwlTWAwLKc5}~dfz3y`kM&^Q|@C%1VAp_$wnw6zG~W4O+^ z>i?NY?oXf^Puc~+fDM$VgRNBpOZj{2cMP~gCqWAX4 z7>%$ux8@a&_B(pt``KSt;r+sR-$N;jdpY>|pyvPiN)9ohd*>mVST3wMo)){`B(&eX z1?zZJ-4u9NZ|~j1rdZYq4R$?swf}<6(#ex%7r{kh%U@kT)&kWuAszS%oJts=*OcL9 zaZwK<5DZw%1IFHXgFplP6JiL^dk8+SgM$D?8X+gE4172hXh!WeqIO>}$I9?Nry$*S zQ#f)RuH{P7RwA3v9f<-w>{PSzom;>(i&^l{E0(&Xp4A-*q-@{W1oE3K;1zb{&n28dSC2$N+6auXe0}e4b z)KLJ?5c*>@9K#I^)W;uU_Z`enquTUxr>mNq z1{0_puF-M7j${rs!dxxo3EelGodF1TvjV;Zpo;s{5f1pyCuRp=HDZ?s#IA4f?h|-p zGd|Mq^4hDa@Bh!c4ZE?O&x&XZ_ptZGYK4$9F4~{%R!}G1leCBx`dtNUS|K zL-7J5s4W@%mhXg1!}a4PD%!t&Qn%f_oquRajn3@C*)`o&K9o7V6DwzVMEhjVdDJ1fjhr#@=lp#@4EBqi=CCQ>73>R(>QKPNM&_Jpe5G`n4wegeC`FYEPJ{|vwS>$-`fuRSp3927qOv|NC3T3G-0 zA{K`|+tQy1yqE$ShWt8ny&5~)%ITb@^+x$w0)f&om;P8B)@}=Wzy59BwUfZ1vqw87 za2lB8J(&*l#(V}Id8SyQ0C(2amzkz3EqG&Ed0Jq1)$|&>4_|NIe=5|n=3?siFV0fI z{As5DLW^gs|B-b4C;Hd(SM-S~GQhzb>HgF2|2Usww0nL^;x@1eaB)=+Clj+$fF@H( z-fqP??~QMT$KI-#m;QC*&6vkp&8699G3)Bq0*kFZXINw=b9OVaed(3(3kS|IZ)CM? zJdnW&%t8MveBuK21uiYj)_a{Fnw0OErMzMN?d$QoPwkhOwcP&p+t>P)4tHlYw-pPN z^oJ=uc$Sl>pv@fZH~ZqxSvdhF@F1s=oZawpr^-#l{IIOGG=T%QXjtwPhIg-F@k@uIlr?J->Ia zpEUQ*=4g|XYn4Gez&aHr*;t$u3oODPmc2Ku)2Og|xjc%w;q!Zz+zY)*3{7V8bK4;& zYV82FZ+8?v)`J|G1w4I0fWdKg|2b#iaazCv;|?(W-q}$o&Y}Q5d@BRk^jL7#{kbCK zSgkyu;=DV+or2)AxCBgq-nj5=@n^`%T#V+xBGEkW4lCqrE)LMv#f;AvD__cQ@Eg3`~x| zW+h9mofSXCq5|M)9|ez(#X?-sxB%Go8};sJ?2abp(Y!lyi>k)|{M*Z$c{e1-K4ky` MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..d1ca6f1 --- /dev/null +++ b/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + cssd + + + + + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..a6d5072 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "cssd", + "short_name": "cssd", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..ec4098a --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..67ca5d2 --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,102 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(cssd LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "cssd") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..3f71e17 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..4f78848 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..88b22e5 --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + url_launcher_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..2041a04 --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 0000000..30c3f56 --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "cssd" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "cssd" "\0" + VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "cssd.exe" "\0" + VALUE "ProductName", "cssd" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..c819cb0 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 0000000..28c2383 --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 0000000..86db046 --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"cssd", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 0000000..ddc7f3e --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..157e871 --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 0000000..fc55c57 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length <= 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 0000000..3f0e05c --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 0000000..b5ba2a0 --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 0000000..49b847f --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_