From cd3b1080f5e7638e6b699acc02391465c1abe3d0 Mon Sep 17 00:00:00 2001 From: Odein Date: Wed, 22 Nov 2023 14:53:35 +0430 Subject: [PATCH] 2.2.0 --- ._.DS_Store | Bin 4096 -> 0 bytes .gitignore | 0 .metadata | 0 .vscode/launch.json | 0 README.md | 0 analysis_options.yaml | 0 android/.gitignore | 0 android/app/build.gradle | 0 android/app/lint-baseline.xml | 0 android/app/src/debug/AndroidManifest.xml | 0 android/app/src/main/AndroidManifest.xml | 0 .../kotlin/com/example/cssd/MainActivity.kt | 0 .../main/res/drawable/launch_background.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin android/app/src/main/res/values/styles.xml | 0 android/app/src/profile/AndroidManifest.xml | 0 android/build.gradle | 0 android/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 android/settings.gradle | 0 android/settings_aar.gradle | 0 assets/Fonts/IRANYekanMobileBold.ttf | Bin assets/Fonts/IRANYekanMobileLight.ttf | Bin assets/Fonts/IRANYekanMobileMedium.ttf | Bin assets/Fonts/IRANYekanMobileRegular.ttf | Bin assets/Fonts/Montserrat-Bold.ttf | Bin assets/Fonts/Montserrat-Light.ttf | Bin assets/Fonts/Montserrat-Medium.ttf | Bin assets/Fonts/Montserrat-Regular.ttf | Bin assets/Icons/cable.svg | 0 assets/Icons/calendar.svg | 0 assets/Icons/comment.svg | 0 assets/Icons/homeheart.svg | 0 assets/Icons/shop.svg | 0 assets/Icons/user.svg | 0 assets/Images/icon.png | Bin assets/Images/pdf.png | Bin assets/Images/word.png | Bin ios/.gitignore | 0 ios/Flutter/AppFrameworkInfo.plist | 0 ios/Flutter/Debug.xcconfig | 0 ios/Flutter/Release.xcconfig | 0 ios/Podfile | 0 ios/Runner.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 ios/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Icon-App-1024x1024@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin .../AppIcon.appiconset/Icon-App-50x50@1x.png | Bin .../AppIcon.appiconset/Icon-App-50x50@2x.png | Bin .../AppIcon.appiconset/Icon-App-57x57@1x.png | Bin .../AppIcon.appiconset/Icon-App-57x57@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin .../AppIcon.appiconset/Icon-App-72x72@1x.png | Bin .../AppIcon.appiconset/Icon-App-72x72@2x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin .../Icon-App-83.5x83.5@2x.png | Bin .../LaunchImage.imageset/Contents.json | 0 .../LaunchImage.imageset/LaunchImage.png | Bin .../LaunchImage.imageset/LaunchImage@2x.png | Bin .../LaunchImage.imageset/LaunchImage@3x.png | Bin .../LaunchImage.imageset/README.md | 0 ios/Runner/Base.lproj/LaunchScreen.storyboard | 0 ios/Runner/Base.lproj/Main.storyboard | 0 ios/Runner/Info.plist | 0 ios/Runner/Runner-Bridging-Header.h | 0 lib/config/colors.dart | 0 lib/config/routes.dart | 0 lib/config/urls.dart | 8 +- lib/config/user.dart | 0 lib/main.dart | 0 lib/models/cycles_models.dart | 1 - lib/models/item_model.dart | 3 + lib/models/label_models.dart | 1 - lib/models/my_item_model.dart | 39 ++- lib/models/my_package_model.dart | 38 ++- lib/models/package_model.dart | 0 lib/models/test_result_models.dart | 0 lib/models/users_model.dart | 0 lib/pages/CyclePages/cycle_add_screen.dart | 4 + lib/pages/CyclePages/cycle_detail_screen.dart | 0 lib/pages/CyclePages/cycle_filter_screen.dart | 0 lib/pages/CyclePages/cycle_result_screen.dart | 0 lib/pages/CyclePages/cycle_scan_screen.dart | 0 lib/pages/CyclePages/cycle_update_screen.dart | 0 lib/pages/ItemPages/item_add_screen.dart | 0 lib/pages/ItemPages/item_detail_screen.dart | 0 lib/pages/ItemPages/item_filter_screen.dart | 0 lib/pages/ItemPages/item_result_screen.dart | 21 ++ lib/pages/ItemPages/item_scan_screen.dart | 0 lib/pages/ItemPages/item_update_screen.dart | 0 lib/pages/LabelPages/label_add_screen.dart | 23 +- lib/pages/LabelPages/label_detail_screen.dart | 0 lib/pages/LabelPages/label_filter_screen.dart | 0 lib/pages/LabelPages/label_result_screen.dart | 0 lib/pages/LabelPages/label_scan_screen.dart | 0 lib/pages/LabelPages/label_update_screen.dart | 0 .../forget_pass_screen.dart | 0 .../LoginRegisterPages/login_screen.dart | 0 .../LoginRegisterPages/rePass_screen.dart | 0 lib/pages/LoginRegisterPages/register.dart | 0 .../verify_pass_screen.dart | 0 .../Result/my_items_mine_screen.dart | 10 +- .../Result/my_items_requests_screen.dart | 0 .../Result/my_items_result_screen.dart | 0 .../MyItemsPages/my_items_detail_screen.dart | 0 .../MyItemsPages/my_items_filter_screen.dart | 0 .../MyItemsPages/my_items_history_screen.dart | 27 +- .../MyItemsPages/my_items_scan_screen.dart | 0 .../my_items_transfer_screen.dart | 2 + .../Result/my_packages_mine_screen.dart | 0 .../Result/my_packages_requests_screen.dart | 0 .../Result/my_packages_result_screen.dart | 0 .../my_packages_detail_screen.dart | 0 .../my_packages_filter_screen.dart | 0 .../my_packages_history_screen.dart | 27 +- .../my_packages_scan_screen.dart | 0 .../my_packages_transfer_screen.dart | 4 +- .../PackagePages/package_add_screen.dart | 25 ++ .../PackagePages/package_detail_screen.dart | 16 +- .../PackagePages/package_filter_screen.dart | 0 .../PackagePages/package_result_screen.dart | 0 .../PackagePages/package_scan_screen.dart | 0 .../PackagePages/package_update_screen.dart | 0 lib/pages/TestPages/test_add_screen.dart | 24 +- lib/pages/TestPages/test_detail_screen.dart | 0 lib/pages/TestPages/test_filter_screen.dart | 0 lib/pages/TestPages/test_form_page.dart | 46 ++-- lib/pages/TestPages/test_result_screen.dart | 0 lib/pages/TestPages/test_scan_screen.dart | 0 lib/pages/TestPages/test_verify_screen.dart | 0 lib/pages/home_screen.dart | 76 +++--- lib/pages/my_info_screen.dart | 0 lib/providers/auth.dart | 0 lib/providers/connectivity.dart | 0 lib/providers/cycles.dart | 8 + lib/providers/input.dart | 0 lib/providers/items.dart | 25 +- lib/providers/labels.dart | 18 +- lib/providers/my_info.dart | 0 lib/providers/my_items.dart | 40 ++- lib/providers/my_packages.dart | 35 ++- lib/providers/packages.dart | 41 +++- lib/providers/test_results.dart | 5 + lib/providers/users.dart | 4 + lib/utils/scan.dart | 0 .../CycleScreens/Add/add_label_box.dart | 231 ++++++++++-------- .../CycleScreens/Add/cycle_update_button.dart | 0 lib/widgets/CycleScreens/Add/date_picker.dart | 0 lib/widgets/CycleScreens/Add/save_button.dart | 0 .../CycleScreens/Details/datas_box.dart | 0 .../CycleScreens/Filter/date_picker.dart | 0 .../CycleScreens/Filter/save_button.dart | 0 .../CycleScreens/Filter/selector_box.dart | 0 lib/widgets/CycleScreens/Result/banner.dart | 0 lib/widgets/CycleScreens/Result/data_box.dart | 0 .../CycleScreens/Result/filter_objects.dart | 0 .../CycleScreens/Result/search_box.dart | 4 +- lib/widgets/Global/drawer.dart | 121 +++++---- lib/widgets/Global/input_box.dart | 0 lib/widgets/Global/internet_error.dart | 0 lib/widgets/Global/page_header.dart | 0 lib/widgets/Global/splash_screen.dart | 0 .../ItemScreens/Add/item_save_button.dart | 0 .../ItemScreens/Add/item_update_button.dart | 0 lib/widgets/ItemScreens/Add/upload_image.dart | 49 +++- .../ItemScreens/Details/item_detail_box.dart | 2 +- .../Filter/item_filter_button.dart | 0 .../Filter/item_filter_object.dart | 0 .../ItemScreens/Result/item_data_box.dart | 5 +- .../LabelScreens/Add/add_package_box.dart | 0 lib/widgets/LabelScreens/Add/date_picker.dart | 0 lib/widgets/LabelScreens/Add/save_button.dart | 0 .../LabelScreens/Add/selector_box.dart | 0 .../LabelScreens/Add/update_button.dart | 0 .../LabelScreens/Detail/datas_box.dart | 0 lib/widgets/LabelScreens/Detail/header.dart | 0 .../LabelScreens/Filter/save_button.dart | 0 .../LabelScreens/Filter/selector_box.dart | 0 lib/widgets/LabelScreens/Result/data_box.dart | 0 .../LabelScreens/Result/filter_chip_box.dart | 0 .../LabelScreens/Result/floating_buttons.dart | 0 .../LabelScreens/Result/search_box.dart | 0 lib/widgets/LabelScreens/Scan/input_box.dart | 0 .../LabelScreens/Scan/save_button.dart | 0 lib/widgets/LabelScreens/Scan/scan_box.dart | 0 lib/widgets/MyInfo/input_box.dart | 0 .../Detail/cancel_transfer_button.dart | 0 .../Detail/my_items_detail_box_widget.dart | 2 +- .../Detail/transfer_data_box.dart | 0 .../Detail/transfer_destroy_button.dart | 0 .../Filter/my_items_chip_widget.dart | 0 .../Filter/my_items_filter_button.dart | 0 .../History/my_items_history_date_widget.dart | 12 +- .../History/user_item_history_box.dart | 70 ++++++ .../Result/item_requests_data_box.dart | 0 .../Result/my_items_data_box_widget.dart | 0 .../Detail/my_packages_detail_box_widget.dart | 0 .../Filter/my_packages_chip_widget.dart | 0 .../Filter/my_packages_filter_button.dart | 0 .../my_packages_history_date_widget.dart | 6 +- .../History/user_package_history_box.dart | 70 ++++++ .../Result/my_packages_data_box_widget.dart | 0 .../Result/package_requests_data_box.dart | 0 .../PackageScreens/Add/add_item_box.dart | 36 ++- .../Add/package_save_button.dart | 0 .../Add/package_update_button.dart | 0 .../Details/package_detail_box.dart | 31 +-- .../PackageScreens/Filter/filter_button.dart | 0 .../Filter/package_filter_object.dart | 0 .../Result/package_data_box.dart | 0 .../TestResultScreens/Add/capture_image.dart | 0 .../TestResultScreens/Add/form_creator.dart | 0 .../TestResultScreens/Add/save_button.dart | 0 .../TestResultScreens/Add/selector_box.dart | 0 .../TestResultScreens/Details/datas_box.dart | 0 .../TestResultScreens/Filter/date_picker.dart | 0 .../Filter/drop_down_box.dart | 0 .../Filter/selector_box.dart | 0 .../TestResultScreens/Main/add_button.dart | 0 .../Main/filter_chip_box.dart | 0 .../Main/floating_button.dart | 0 .../TestResultScreens/Main/search_box.dart | 0 macos/.gitignore | 0 macos/Flutter/Flutter-Debug.xcconfig | 0 macos/Flutter/Flutter-Release.xcconfig | 0 macos/Flutter/GeneratedPluginRegistrant.swift | 0 macos/Podfile | 0 macos/Podfile.lock | 0 macos/Runner.xcodeproj/project.pbxproj | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/xcschemes/Runner.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 macos/Runner/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/app_icon_1024.png | Bin .../AppIcon.appiconset/app_icon_128.png | Bin .../AppIcon.appiconset/app_icon_16.png | Bin .../AppIcon.appiconset/app_icon_256.png | Bin .../AppIcon.appiconset/app_icon_32.png | Bin .../AppIcon.appiconset/app_icon_512.png | Bin .../AppIcon.appiconset/app_icon_64.png | Bin macos/Runner/Base.lproj/MainMenu.xib | 0 macos/Runner/Configs/AppInfo.xcconfig | 0 macos/Runner/Configs/Debug.xcconfig | 0 macos/Runner/Configs/Release.xcconfig | 0 macos/Runner/Configs/Warnings.xcconfig | 0 macos/Runner/DebugProfile.entitlements | 0 macos/Runner/Info.plist | 0 macos/Runner/MainFlutterWindow.swift | 0 macos/Runner/Release.entitlements | 0 macos/RunnerTests/RunnerTests.swift | 0 pubspec.lock | 2 +- pubspec.yaml | 1 + test/widget_test.dart | 0 web/favicon.png | Bin web/icons/Icon-192.png | Bin web/icons/Icon-512.png | Bin web/icons/Icon-maskable-192.png | Bin web/icons/Icon-maskable-512.png | Bin web/index.html | 0 web/manifest.json | 0 windows/.gitignore | 0 windows/CMakeLists.txt | 0 windows/flutter/CMakeLists.txt | 0 .../flutter/generated_plugin_registrant.cc | 0 windows/flutter/generated_plugin_registrant.h | 0 windows/flutter/generated_plugins.cmake | 0 windows/runner/CMakeLists.txt | 0 windows/runner/Runner.rc | 0 windows/runner/flutter_window.cpp | 0 windows/runner/flutter_window.h | 0 windows/runner/main.cpp | 0 windows/runner/resource.h | 0 windows/runner/resources/app_icon.ico | Bin windows/runner/runner.exe.manifest | 0 windows/runner/utils.cpp | 0 windows/runner/utils.h | 0 windows/runner/win32_window.cpp | 0 windows/runner/win32_window.h | 0 298 files changed, 800 insertions(+), 413 deletions(-) delete mode 100644 ._.DS_Store mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .metadata mode change 100644 => 100755 .vscode/launch.json mode change 100644 => 100755 README.md mode change 100644 => 100755 analysis_options.yaml mode change 100644 => 100755 android/.gitignore mode change 100644 => 100755 android/app/build.gradle mode change 100644 => 100755 android/app/lint-baseline.xml mode change 100644 => 100755 android/app/src/debug/AndroidManifest.xml mode change 100644 => 100755 android/app/src/main/AndroidManifest.xml mode change 100644 => 100755 android/app/src/main/kotlin/com/example/cssd/MainActivity.kt mode change 100644 => 100755 android/app/src/main/res/drawable/launch_background.xml mode change 100644 => 100755 android/app/src/main/res/mipmap-hdpi/ic_launcher.png mode change 100644 => 100755 android/app/src/main/res/mipmap-mdpi/ic_launcher.png mode change 100644 => 100755 android/app/src/main/res/mipmap-xhdpi/ic_launcher.png mode change 100644 => 100755 android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png mode change 100644 => 100755 android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png mode change 100644 => 100755 android/app/src/main/res/values/styles.xml mode change 100644 => 100755 android/app/src/profile/AndroidManifest.xml mode change 100644 => 100755 android/build.gradle mode change 100644 => 100755 android/gradle.properties mode change 100644 => 100755 android/gradle/wrapper/gradle-wrapper.properties mode change 100644 => 100755 android/settings.gradle mode change 100644 => 100755 android/settings_aar.gradle mode change 100644 => 100755 assets/Fonts/IRANYekanMobileBold.ttf mode change 100644 => 100755 assets/Fonts/IRANYekanMobileLight.ttf mode change 100644 => 100755 assets/Fonts/IRANYekanMobileMedium.ttf mode change 100644 => 100755 assets/Fonts/IRANYekanMobileRegular.ttf mode change 100644 => 100755 assets/Fonts/Montserrat-Bold.ttf mode change 100644 => 100755 assets/Fonts/Montserrat-Light.ttf mode change 100644 => 100755 assets/Fonts/Montserrat-Medium.ttf mode change 100644 => 100755 assets/Fonts/Montserrat-Regular.ttf mode change 100644 => 100755 assets/Icons/cable.svg mode change 100644 => 100755 assets/Icons/calendar.svg mode change 100644 => 100755 assets/Icons/comment.svg mode change 100644 => 100755 assets/Icons/homeheart.svg mode change 100644 => 100755 assets/Icons/shop.svg mode change 100644 => 100755 assets/Icons/user.svg mode change 100644 => 100755 assets/Images/icon.png mode change 100644 => 100755 assets/Images/pdf.png mode change 100644 => 100755 assets/Images/word.png mode change 100644 => 100755 ios/.gitignore mode change 100644 => 100755 ios/Flutter/AppFrameworkInfo.plist mode change 100644 => 100755 ios/Flutter/Debug.xcconfig mode change 100644 => 100755 ios/Flutter/Release.xcconfig mode change 100644 => 100755 ios/Podfile mode change 100644 => 100755 ios/Runner.xcodeproj/project.pbxproj mode change 100644 => 100755 ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme mode change 100644 => 100755 ios/Runner.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 ios/Runner/AppDelegate.swift mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json mode change 100644 => 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png mode change 100644 => 100755 ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md mode change 100644 => 100755 ios/Runner/Base.lproj/LaunchScreen.storyboard mode change 100644 => 100755 ios/Runner/Base.lproj/Main.storyboard mode change 100644 => 100755 ios/Runner/Info.plist mode change 100644 => 100755 ios/Runner/Runner-Bridging-Header.h mode change 100644 => 100755 lib/config/colors.dart mode change 100644 => 100755 lib/config/routes.dart mode change 100644 => 100755 lib/config/urls.dart mode change 100644 => 100755 lib/config/user.dart mode change 100644 => 100755 lib/main.dart mode change 100644 => 100755 lib/models/cycles_models.dart mode change 100644 => 100755 lib/models/item_model.dart mode change 100644 => 100755 lib/models/label_models.dart mode change 100644 => 100755 lib/models/my_item_model.dart mode change 100644 => 100755 lib/models/my_package_model.dart mode change 100644 => 100755 lib/models/package_model.dart mode change 100644 => 100755 lib/models/test_result_models.dart mode change 100644 => 100755 lib/models/users_model.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_add_screen.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_detail_screen.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_filter_screen.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_result_screen.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_scan_screen.dart mode change 100644 => 100755 lib/pages/CyclePages/cycle_update_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_add_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_detail_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_filter_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_result_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_scan_screen.dart mode change 100644 => 100755 lib/pages/ItemPages/item_update_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_add_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_detail_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_filter_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_result_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_scan_screen.dart mode change 100644 => 100755 lib/pages/LabelPages/label_update_screen.dart mode change 100644 => 100755 lib/pages/LoginRegisterPages/forget_pass_screen.dart mode change 100644 => 100755 lib/pages/LoginRegisterPages/login_screen.dart mode change 100644 => 100755 lib/pages/LoginRegisterPages/rePass_screen.dart mode change 100644 => 100755 lib/pages/LoginRegisterPages/register.dart mode change 100644 => 100755 lib/pages/LoginRegisterPages/verify_pass_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/Result/my_items_mine_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/Result/my_items_requests_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/Result/my_items_result_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/my_items_detail_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/my_items_filter_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/my_items_history_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/my_items_scan_screen.dart mode change 100644 => 100755 lib/pages/MyItemsPages/my_items_transfer_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/my_packages_detail_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/my_packages_filter_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/my_packages_history_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/my_packages_scan_screen.dart mode change 100644 => 100755 lib/pages/MyPackagesPages/my_packages_transfer_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_add_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_detail_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_filter_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_result_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_scan_screen.dart mode change 100644 => 100755 lib/pages/PackagePages/package_update_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_add_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_detail_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_filter_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_form_page.dart mode change 100644 => 100755 lib/pages/TestPages/test_result_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_scan_screen.dart mode change 100644 => 100755 lib/pages/TestPages/test_verify_screen.dart mode change 100644 => 100755 lib/pages/home_screen.dart mode change 100644 => 100755 lib/pages/my_info_screen.dart mode change 100644 => 100755 lib/providers/auth.dart mode change 100644 => 100755 lib/providers/connectivity.dart mode change 100644 => 100755 lib/providers/cycles.dart mode change 100644 => 100755 lib/providers/input.dart mode change 100644 => 100755 lib/providers/items.dart mode change 100644 => 100755 lib/providers/labels.dart mode change 100644 => 100755 lib/providers/my_info.dart mode change 100644 => 100755 lib/providers/my_items.dart mode change 100644 => 100755 lib/providers/my_packages.dart mode change 100644 => 100755 lib/providers/packages.dart mode change 100644 => 100755 lib/providers/test_results.dart mode change 100644 => 100755 lib/providers/users.dart mode change 100644 => 100755 lib/utils/scan.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Add/add_label_box.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Add/cycle_update_button.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Add/date_picker.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Add/save_button.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Details/datas_box.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Filter/date_picker.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Filter/save_button.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Filter/selector_box.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Result/banner.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Result/data_box.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Result/filter_objects.dart mode change 100644 => 100755 lib/widgets/CycleScreens/Result/search_box.dart mode change 100644 => 100755 lib/widgets/Global/drawer.dart mode change 100644 => 100755 lib/widgets/Global/input_box.dart mode change 100644 => 100755 lib/widgets/Global/internet_error.dart mode change 100644 => 100755 lib/widgets/Global/page_header.dart mode change 100644 => 100755 lib/widgets/Global/splash_screen.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Add/item_save_button.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Add/item_update_button.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Add/upload_image.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Details/item_detail_box.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Filter/item_filter_button.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Filter/item_filter_object.dart mode change 100644 => 100755 lib/widgets/ItemScreens/Result/item_data_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Add/add_package_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Add/date_picker.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Add/save_button.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Add/selector_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Add/update_button.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Detail/datas_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Detail/header.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Filter/save_button.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Filter/selector_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Result/data_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Result/filter_chip_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Result/floating_buttons.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Result/search_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Scan/input_box.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Scan/save_button.dart mode change 100644 => 100755 lib/widgets/LabelScreens/Scan/scan_box.dart mode change 100644 => 100755 lib/widgets/MyInfo/input_box.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart create mode 100755 lib/widgets/MyItemsScreens/History/user_item_history_box.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart mode change 100644 => 100755 lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart create mode 100755 lib/widgets/MyPackagesScreens/History/user_package_history_box.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart mode change 100644 => 100755 lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Add/add_item_box.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Add/package_save_button.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Add/package_update_button.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Details/package_detail_box.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Filter/filter_button.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Filter/package_filter_object.dart mode change 100644 => 100755 lib/widgets/PackageScreens/Result/package_data_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Add/capture_image.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Add/form_creator.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Add/save_button.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Add/selector_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Details/datas_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Filter/date_picker.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Filter/drop_down_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Filter/selector_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Main/add_button.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Main/filter_chip_box.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Main/floating_button.dart mode change 100644 => 100755 lib/widgets/TestResultScreens/Main/search_box.dart mode change 100644 => 100755 macos/.gitignore mode change 100644 => 100755 macos/Flutter/Flutter-Debug.xcconfig mode change 100644 => 100755 macos/Flutter/Flutter-Release.xcconfig mode change 100644 => 100755 macos/Flutter/GeneratedPluginRegistrant.swift mode change 100644 => 100755 macos/Podfile mode change 100644 => 100755 macos/Podfile.lock mode change 100644 => 100755 macos/Runner.xcodeproj/project.pbxproj mode change 100644 => 100755 macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist mode change 100644 => 100755 macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme mode change 100644 => 100755 macos/Runner.xcworkspace/contents.xcworkspacedata mode change 100644 => 100755 macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist mode change 100644 => 100755 macos/Runner/AppDelegate.swift mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png mode change 100644 => 100755 macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png mode change 100644 => 100755 macos/Runner/Base.lproj/MainMenu.xib mode change 100644 => 100755 macos/Runner/Configs/AppInfo.xcconfig mode change 100644 => 100755 macos/Runner/Configs/Debug.xcconfig mode change 100644 => 100755 macos/Runner/Configs/Release.xcconfig mode change 100644 => 100755 macos/Runner/Configs/Warnings.xcconfig mode change 100644 => 100755 macos/Runner/DebugProfile.entitlements mode change 100644 => 100755 macos/Runner/Info.plist mode change 100644 => 100755 macos/Runner/MainFlutterWindow.swift mode change 100644 => 100755 macos/Runner/Release.entitlements mode change 100644 => 100755 macos/RunnerTests/RunnerTests.swift mode change 100644 => 100755 pubspec.lock mode change 100644 => 100755 pubspec.yaml mode change 100644 => 100755 test/widget_test.dart mode change 100644 => 100755 web/favicon.png mode change 100644 => 100755 web/icons/Icon-192.png mode change 100644 => 100755 web/icons/Icon-512.png mode change 100644 => 100755 web/icons/Icon-maskable-192.png mode change 100644 => 100755 web/icons/Icon-maskable-512.png mode change 100644 => 100755 web/index.html mode change 100644 => 100755 web/manifest.json mode change 100644 => 100755 windows/.gitignore mode change 100644 => 100755 windows/CMakeLists.txt mode change 100644 => 100755 windows/flutter/CMakeLists.txt mode change 100644 => 100755 windows/flutter/generated_plugin_registrant.cc mode change 100644 => 100755 windows/flutter/generated_plugin_registrant.h mode change 100644 => 100755 windows/flutter/generated_plugins.cmake mode change 100644 => 100755 windows/runner/CMakeLists.txt mode change 100644 => 100755 windows/runner/Runner.rc mode change 100644 => 100755 windows/runner/flutter_window.cpp mode change 100644 => 100755 windows/runner/flutter_window.h mode change 100644 => 100755 windows/runner/main.cpp mode change 100644 => 100755 windows/runner/resource.h mode change 100644 => 100755 windows/runner/resources/app_icon.ico mode change 100644 => 100755 windows/runner/runner.exe.manifest mode change 100644 => 100755 windows/runner/utils.cpp mode change 100644 => 100755 windows/runner/utils.h mode change 100644 => 100755 windows/runner/win32_window.cpp mode change 100644 => 100755 windows/runner/win32_window.h diff --git a/._.DS_Store b/._.DS_Store deleted file mode 100644 index 9ad849cdb9e467065f3aa98e6e57ed2552be42dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIhYCu0iY;W;207T zWIgNTe~1o-3apAo1xG_*Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLx9R5zz8%C zguy^ABqOs}p(wRDzqBYhRUs|EC|e;juOv0EBr`uRF(;=|AtyDhL?J0BF)tg~)rIOB Q(iE!y;a-tpko*510KSwTa{vGU diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.metadata b/.metadata old mode 100644 new mode 100755 diff --git a/.vscode/launch.json b/.vscode/launch.json old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/analysis_options.yaml b/analysis_options.yaml old mode 100644 new mode 100755 diff --git a/android/.gitignore b/android/.gitignore old mode 100644 new mode 100755 diff --git a/android/app/build.gradle b/android/app/build.gradle old mode 100644 new mode 100755 diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml old mode 100644 new mode 100755 diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt b/android/app/src/main/kotlin/com/example/cssd/MainActivity.kt old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/android/build.gradle b/android/build.gradle old mode 100644 new mode 100755 diff --git a/android/gradle.properties b/android/gradle.properties old mode 100644 new mode 100755 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 diff --git a/android/settings.gradle b/android/settings.gradle old mode 100644 new mode 100755 diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle old mode 100644 new mode 100755 diff --git a/assets/Fonts/IRANYekanMobileBold.ttf b/assets/Fonts/IRANYekanMobileBold.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/IRANYekanMobileLight.ttf b/assets/Fonts/IRANYekanMobileLight.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/IRANYekanMobileMedium.ttf b/assets/Fonts/IRANYekanMobileMedium.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/IRANYekanMobileRegular.ttf b/assets/Fonts/IRANYekanMobileRegular.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/Montserrat-Bold.ttf b/assets/Fonts/Montserrat-Bold.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/Montserrat-Light.ttf b/assets/Fonts/Montserrat-Light.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/Montserrat-Medium.ttf b/assets/Fonts/Montserrat-Medium.ttf old mode 100644 new mode 100755 diff --git a/assets/Fonts/Montserrat-Regular.ttf b/assets/Fonts/Montserrat-Regular.ttf old mode 100644 new mode 100755 diff --git a/assets/Icons/cable.svg b/assets/Icons/cable.svg old mode 100644 new mode 100755 diff --git a/assets/Icons/calendar.svg b/assets/Icons/calendar.svg old mode 100644 new mode 100755 diff --git a/assets/Icons/comment.svg b/assets/Icons/comment.svg old mode 100644 new mode 100755 diff --git a/assets/Icons/homeheart.svg b/assets/Icons/homeheart.svg old mode 100644 new mode 100755 diff --git a/assets/Icons/shop.svg b/assets/Icons/shop.svg old mode 100644 new mode 100755 diff --git a/assets/Icons/user.svg b/assets/Icons/user.svg old mode 100644 new mode 100755 diff --git a/assets/Images/icon.png b/assets/Images/icon.png old mode 100644 new mode 100755 diff --git a/assets/Images/pdf.png b/assets/Images/pdf.png old mode 100644 new mode 100755 diff --git a/assets/Images/word.png b/assets/Images/word.png old mode 100644 new mode 100755 diff --git a/ios/.gitignore b/ios/.gitignore old mode 100644 new mode 100755 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist old mode 100644 new mode 100755 diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig old mode 100644 new mode 100755 diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig old mode 100644 new mode 100755 diff --git a/ios/Podfile b/ios/Podfile old mode 100644 new mode 100755 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj old mode 100644 new mode 100755 diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme old mode 100644 new mode 100755 diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png old mode 100644 new mode 100755 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md old mode 100644 new mode 100755 diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard old mode 100644 new mode 100755 diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard old mode 100644 new mode 100755 diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist old mode 100644 new mode 100755 diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h old mode 100644 new mode 100755 diff --git a/lib/config/colors.dart b/lib/config/colors.dart old mode 100644 new mode 100755 diff --git a/lib/config/routes.dart b/lib/config/routes.dart old mode 100644 new mode 100755 diff --git a/lib/config/urls.dart b/lib/config/urls.dart old mode 100644 new mode 100755 index b564718..a756b12 --- a/lib/config/urls.dart +++ b/lib/config/urls.dart @@ -11,8 +11,6 @@ class Url { 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'; @@ -29,9 +27,9 @@ class Url { static const String addImage = '$baseUrl/UploadFile'; - // static String getUserMedicalCenterId(int id) { - // return '$baseUrl/users?medical_center_id=$id'; - // } + static const String exportItems = '$baseUrl/export/items'; + + static const String exportPackages = '$baseUrl/export/packages'; static String testResults(int id) { return '$baseUrl/TestResults?page=$id'; diff --git a/lib/config/user.dart b/lib/config/user.dart old mode 100644 new mode 100755 diff --git a/lib/main.dart b/lib/main.dart old mode 100644 new mode 100755 diff --git a/lib/models/cycles_models.dart b/lib/models/cycles_models.dart old mode 100644 new mode 100755 index 26a9bc9..aef7c27 --- a/lib/models/cycles_models.dart +++ b/lib/models/cycles_models.dart @@ -24,7 +24,6 @@ class CycleDetailObject extends Equatable { final String description; final String createDate; final String hospitalName; - final String date; final String sterileId; final String cycleNumber; diff --git a/lib/models/item_model.dart b/lib/models/item_model.dart old mode 100644 new mode 100755 index fde73d5..6d97d2d --- a/lib/models/item_model.dart +++ b/lib/models/item_model.dart @@ -8,6 +8,7 @@ class ItemResultObject extends Equatable { final String userName; final int status; final String? batchId; + final String? udi; ItemResultObject({ required this.id, @@ -16,6 +17,7 @@ class ItemResultObject extends Equatable { required this.userName, required this.status, this.batchId, + this.udi, }); @override @@ -26,6 +28,7 @@ class ItemResultObject extends Equatable { userName, status, batchId!, + udi!, ]; @override diff --git a/lib/models/label_models.dart b/lib/models/label_models.dart old mode 100644 new mode 100755 index 5509f5a..a530de8 --- a/lib/models/label_models.dart +++ b/lib/models/label_models.dart @@ -26,7 +26,6 @@ class LabelDetailsObject extends Equatable { final String package; final String packageId; final String hospitalName; - final String createDate; final String expireDate; final String sterileDate; diff --git a/lib/models/my_item_model.dart b/lib/models/my_item_model.dart old mode 100644 new mode 100755 index c44addc..9814525 --- a/lib/models/my_item_model.dart +++ b/lib/models/my_item_model.dart @@ -1,3 +1,4 @@ +// ignore_for_file: public_member_api_docs, sort_constructors_first import 'package:equatable/equatable.dart'; class MyItemResultObject extends Equatable { @@ -5,20 +6,14 @@ class MyItemResultObject extends Equatable { final String name; final String size; final String? userName; - final String? fromDate; - final String? toDate; final String? requestId; - final String? userHistory; MyItemResultObject({ required this.id, required this.name, required this.size, this.userName, - this.fromDate, - this.toDate, this.requestId, - this.userHistory, }); @override @@ -27,10 +22,7 @@ class MyItemResultObject extends Equatable { name, size, userName!, - fromDate!, - toDate!, requestId!, - userHistory!, ]; @override @@ -66,3 +58,32 @@ class MyItemFilterObject extends Equatable { @override bool get stringify => true; } + +class ItemHistoryObject extends Equatable { + final String fromDate; + final String toDate; + final String userHistoryName; + final String userHistoryId; + final String userHistoryPhon; + ItemHistoryObject({ + required this.fromDate, + required this.toDate, + required this.userHistoryName, + required this.userHistoryId, + required this.userHistoryPhon, + }); + + @override + List get props { + return [ + fromDate, + toDate, + userHistoryName, + userHistoryId, + userHistoryPhon, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/my_package_model.dart b/lib/models/my_package_model.dart old mode 100644 new mode 100755 index bef16d9..35c254c --- a/lib/models/my_package_model.dart +++ b/lib/models/my_package_model.dart @@ -5,20 +5,14 @@ class MyPackageResultObject extends Equatable { final String name; final String createdAt; final String? userName; - final String? fromDate; - final String? toDate; final String? requestId; - final String? userHistory; MyPackageResultObject({ required this.id, required this.name, required this.createdAt, this.userName, - this.fromDate, - this.toDate, this.requestId, - this.userHistory, }); @override @@ -27,10 +21,7 @@ class MyPackageResultObject extends Equatable { name, createdAt, userName!, - fromDate!, - toDate!, requestId!, - userHistory!, ]; @override @@ -60,3 +51,32 @@ class MyPackageFilterObject extends Equatable { @override bool get stringify => true; } + +class PackageHistoryObject extends Equatable { + final String fromDate; + final String toDate; + final String userHistoryName; + final String userHistoryId; + final String userHistoryPhon; + PackageHistoryObject({ + required this.fromDate, + required this.toDate, + required this.userHistoryName, + required this.userHistoryId, + required this.userHistoryPhon, + }); + + @override + List get props { + return [ + fromDate, + toDate, + userHistoryName, + userHistoryId, + userHistoryPhon, + ]; + } + + @override + bool get stringify => true; +} diff --git a/lib/models/package_model.dart b/lib/models/package_model.dart old mode 100644 new mode 100755 diff --git a/lib/models/test_result_models.dart b/lib/models/test_result_models.dart old mode 100644 new mode 100755 diff --git a/lib/models/users_model.dart b/lib/models/users_model.dart old mode 100644 new mode 100755 diff --git a/lib/pages/CyclePages/cycle_add_screen.dart b/lib/pages/CyclePages/cycle_add_screen.dart old mode 100644 new mode 100755 index 01fdb49..f08fc9f --- a/lib/pages/CyclePages/cycle_add_screen.dart +++ b/lib/pages/CyclePages/cycle_add_screen.dart @@ -277,6 +277,10 @@ class _CycleAddScreenState extends State { initialLabelValue: cycleProvider.initialLabelValue, index: index, + hasRemoveButton: + cycleProvider.labelValues.length > 1 + ? true + : false, ), itemCount: cycleProvider.labelValues.length, diff --git a/lib/pages/CyclePages/cycle_detail_screen.dart b/lib/pages/CyclePages/cycle_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/CyclePages/cycle_filter_screen.dart b/lib/pages/CyclePages/cycle_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/CyclePages/cycle_result_screen.dart b/lib/pages/CyclePages/cycle_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/CyclePages/cycle_scan_screen.dart b/lib/pages/CyclePages/cycle_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/CyclePages/cycle_update_screen.dart b/lib/pages/CyclePages/cycle_update_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/ItemPages/item_add_screen.dart b/lib/pages/ItemPages/item_add_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/ItemPages/item_detail_screen.dart b/lib/pages/ItemPages/item_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/ItemPages/item_filter_screen.dart b/lib/pages/ItemPages/item_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/ItemPages/item_result_screen.dart b/lib/pages/ItemPages/item_result_screen.dart old mode 100644 new mode 100755 index 3e8c5b8..d658b93 --- a/lib/pages/ItemPages/item_result_screen.dart +++ b/lib/pages/ItemPages/item_result_screen.dart @@ -249,6 +249,27 @@ class ItemResultFloatingButton extends StatelessWidget { return Row( mainAxisAlignment: MainAxisAlignment.end, children: [ + // InkWell( + // customBorder: CircleBorder(), + // onTap: () { + // Provider.of(context, listen: false).exportItems(); + // }, + // child: Container( + // padding: EdgeInsets.all(_deviceBlockSize), + // decoration: BoxDecoration( + // shape: BoxShape.circle, + // color: Colors.black, + // ), + // child: Icon( + // Icons.import_export, + // size: 10 * _deviceBlockSize, + // color: Colors.white, + // ), + // ), + // ), + // SizedBox( + // width: 2 * _deviceBlockSize, + // ), InkWell( customBorder: CircleBorder(), onTap: () { diff --git a/lib/pages/ItemPages/item_scan_screen.dart b/lib/pages/ItemPages/item_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/ItemPages/item_update_screen.dart b/lib/pages/ItemPages/item_update_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LabelPages/label_add_screen.dart b/lib/pages/LabelPages/label_add_screen.dart old mode 100644 new mode 100755 index b72a545..3f18275 --- a/lib/pages/LabelPages/label_add_screen.dart +++ b/lib/pages/LabelPages/label_add_screen.dart @@ -30,9 +30,6 @@ class _LabelAddScreenState extends State { DateTime? dateTimeS; final _form = GlobalKey(); - - List> packageVals = []; - List packageValue = []; bool isInit = true; // String? packageId; // String? previousRoute; @@ -49,15 +46,7 @@ class _LabelAddScreenState extends State { @override void didChangeDependencies() async { if (isInit) { - // final pastRoute = ModalRoute.of(context)!.settings.name; - // previousRoute = pastRoute; - // print(previousRoute); var labelProviderObject = Provider.of(context); - // var arguments = ModalRoute.of(context)!.settings.arguments; - // if (arguments != null && arguments is Map) { - // packageId = arguments['id']; - // } - // print(packageId); labelProviderObject.resetPackageVals(); labelProviderObject.getPackageFilters().then( (result) { @@ -68,7 +57,12 @@ class _LabelAddScreenState extends State { ); }, ); + var arguments = ModalRoute.of(context)!.settings.arguments; + if (arguments != null && arguments is Map) { + labelProviderObject.packageId = arguments['id']; + } } + super.didChangeDependencies(); } @@ -298,13 +292,6 @@ class _LabelAddScreenState extends State { ), Consumer( builder: (ctx, labelProvider, _) { - // if (previousRoute == - // '/PackageDetailScreen') { - // initialLabelValue = packageId!; - // } else { - // initialLabelValue = - // labelProvider.initialPackageValue; - // } return ListView.builder( physics: NeverScrollableScrollPhysics(), shrinkWrap: true, diff --git a/lib/pages/LabelPages/label_detail_screen.dart b/lib/pages/LabelPages/label_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LabelPages/label_filter_screen.dart b/lib/pages/LabelPages/label_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LabelPages/label_result_screen.dart b/lib/pages/LabelPages/label_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LabelPages/label_scan_screen.dart b/lib/pages/LabelPages/label_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LabelPages/label_update_screen.dart b/lib/pages/LabelPages/label_update_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LoginRegisterPages/forget_pass_screen.dart b/lib/pages/LoginRegisterPages/forget_pass_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LoginRegisterPages/login_screen.dart b/lib/pages/LoginRegisterPages/login_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LoginRegisterPages/rePass_screen.dart b/lib/pages/LoginRegisterPages/rePass_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LoginRegisterPages/register.dart b/lib/pages/LoginRegisterPages/register.dart old mode 100644 new mode 100755 diff --git a/lib/pages/LoginRegisterPages/verify_pass_screen.dart b/lib/pages/LoginRegisterPages/verify_pass_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart old mode 100644 new mode 100755 index dfb569c..3c702b3 --- a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart +++ b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart @@ -218,10 +218,12 @@ class _MyItemsMineScreenState extends State { items: itemResults.hospitalItems?[index], push: () { - Navigator.pushNamed(context, - Routes.myItemsHistoryScreen, - arguments: itemResults - .hospitalItems?[index]); + Navigator.pushNamed( + context, + Routes.myItemsHistoryScreen, + arguments: itemResults + .hospitalItems?[index], + ); }, ); } diff --git a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/Result/my_items_result_screen.dart b/lib/pages/MyItemsPages/Result/my_items_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/my_items_detail_screen.dart b/lib/pages/MyItemsPages/my_items_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/my_items_filter_screen.dart b/lib/pages/MyItemsPages/my_items_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/my_items_history_screen.dart b/lib/pages/MyItemsPages/my_items_history_screen.dart old mode 100644 new mode 100755 index 1141594..fa056de --- a/lib/pages/MyItemsPages/my_items_history_screen.dart +++ b/lib/pages/MyItemsPages/my_items_history_screen.dart @@ -2,6 +2,7 @@ import 'package:cssd/models/my_item_model.dart'; import 'package:cssd/providers/auth.dart'; import 'package:cssd/providers/my_items.dart'; import 'package:cssd/widgets/MyItemsScreens/History/my_items_history_date_widget.dart'; +import 'package:cssd/widgets/MyItemsScreens/History/user_item_history_box.dart'; import 'package:cssd/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart'; import '../../config/routes.dart'; @@ -26,6 +27,7 @@ class _MyItemsHistoryScreenState extends State { bool _isInit = true; ScrollController? sc; MyItemResultObject? itemData; + ItemHistoryObject? historyData; @override void initState() { @@ -117,8 +119,8 @@ class _MyItemsHistoryScreenState extends State { ), Expanded( child: Consumer( - builder: (context, userResults, child) { - return userResults.isloading + builder: (context, itemResults, child) { + return itemResults.isloading ? Center( child: CircularProgressIndicator( color: Colors.black, @@ -132,15 +134,18 @@ class _MyItemsHistoryScreenState extends State { itemBuilder: (context, index) { return Column( children: [ - ItemHistoryDate( - deviceBlockSize: _deviceBlockSize, - items: itemData!, - ), SizedBox( height: 20.0, ), - Text( - itemData!.userHistory.toString(), + ItemHistoryDate( + deviceBlockSize: _deviceBlockSize, + items: itemResults + .itemHistory![index], + ), + UserItemDataBox( + deviceBlockSize: _deviceBlockSize, + user: itemResults + .itemHistory![index], ), SizedBox( height: 20.0, @@ -148,13 +153,13 @@ class _MyItemsHistoryScreenState extends State { ], ); }, - itemCount: userResults - .originalItemHistory!.length, + itemCount: + itemResults.itemHistory!.length, shrinkWrap: true, ); }, ), - ) + ), ], ), ) diff --git a/lib/pages/MyItemsPages/my_items_scan_screen.dart b/lib/pages/MyItemsPages/my_items_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyItemsPages/my_items_transfer_screen.dart b/lib/pages/MyItemsPages/my_items_transfer_screen.dart old mode 100644 new mode 100755 index 46037af..1ce6781 --- a/lib/pages/MyItemsPages/my_items_transfer_screen.dart +++ b/lib/pages/MyItemsPages/my_items_transfer_screen.dart @@ -45,6 +45,7 @@ class _ItemsTransferScreenState extends State { itemData = ModalRoute.of(context)!.settings.arguments as ItemDetailObject?; var userResults = Provider.of(context); + userResults.resetSelectedUser(); userResults.setLoading(); String medicalCenterId = await userResults.getUserMedicalCenter() as String; @@ -121,6 +122,7 @@ class _ItemsTransferScreenState extends State { text: 'user', text2: 'name or ID', deviceBlockSize: _deviceBlockSize, + textInputType: TextInputType.name, onChanged: (value) { Provider.of(context, listen: false) .searchUsers(value); diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/my_packages_detail_screen.dart b/lib/pages/MyPackagesPages/my_packages_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/my_packages_filter_screen.dart b/lib/pages/MyPackagesPages/my_packages_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/my_packages_history_screen.dart b/lib/pages/MyPackagesPages/my_packages_history_screen.dart old mode 100644 new mode 100755 index ae5cf89..4d4aeb8 --- a/lib/pages/MyPackagesPages/my_packages_history_screen.dart +++ b/lib/pages/MyPackagesPages/my_packages_history_screen.dart @@ -2,6 +2,7 @@ import 'package:cssd/models/my_package_model.dart'; import 'package:cssd/providers/auth.dart'; import 'package:cssd/providers/my_packages.dart'; import 'package:cssd/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart'; +import 'package:cssd/widgets/MyPackagesScreens/History/user_package_history_box.dart'; import 'package:cssd/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart'; import '../../config/routes.dart'; @@ -118,8 +119,8 @@ class _MyPackagesHistoryScreenState extends State { ), Expanded( child: Consumer( - builder: (context, userResults, child) { - return userResults.isloading + builder: (context, packageResults, child) { + return packageResults.isloading ? Center( child: CircularProgressIndicator( color: Colors.black, @@ -133,16 +134,18 @@ class _MyPackagesHistoryScreenState extends State { itemBuilder: (context, index) { return Column( children: [ - PackageHistoryDate( - deviceBlockSize: _deviceBlockSize, - packages: packageData!, - ), SizedBox( height: 20.0, ), - Text( - packageData!.userHistory - .toString(), + PackageHistoryDate( + deviceBlockSize: _deviceBlockSize, + packages: packageResults + .packageHistory![index], + ), + UserPackageDataBox( + deviceBlockSize: _deviceBlockSize, + user: packageResults + .packageHistory![index], ), SizedBox( height: 20.0, @@ -150,13 +153,13 @@ class _MyPackagesHistoryScreenState extends State { ], ); }, - itemCount: userResults - .originalPackageHistory!.length, + itemCount: + packageResults.packageHistory!.length, shrinkWrap: true, ); }, ), - ) + ), ], ), ) diff --git a/lib/pages/MyPackagesPages/my_packages_scan_screen.dart b/lib/pages/MyPackagesPages/my_packages_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart b/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart old mode 100644 new mode 100755 index de8af4e..2364bfb --- a/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart +++ b/lib/pages/MyPackagesPages/my_packages_transfer_screen.dart @@ -44,6 +44,7 @@ class _PackageTransferScreenState extends State { packageData = ModalRoute.of(context)!.settings.arguments as PackageDetailObject?; var userResults = Provider.of(context); + userResults.resetSelectedUser(); userResults.setLoading(); String medicalCenterId = await userResults.getUserMedicalCenter() as String; @@ -115,8 +116,9 @@ class _PackageTransferScreenState extends State { ResultSearchBox( searchCTRL: searchCTRL, text: 'user', - text2: 'name', + text2: 'name or ID', deviceBlockSize: _deviceBlockSize, + textInputType: TextInputType.name, onChanged: (value) { Provider.of(context, listen: false) .searchUsers(value); diff --git a/lib/pages/PackagePages/package_add_screen.dart b/lib/pages/PackagePages/package_add_screen.dart old mode 100644 new mode 100755 index e330cef..a931177 --- a/lib/pages/PackagePages/package_add_screen.dart +++ b/lib/pages/PackagePages/package_add_screen.dart @@ -24,6 +24,7 @@ class _PackageAddScreenState extends State { // TextEditingController udiCTRL = new TextEditingController(); TextEditingController nameCTRL = new TextEditingController(); TextEditingController dateCTRL = new TextEditingController(); + final _form = GlobalKey(); bool isInit = true; PackageFilterObject? filters; @@ -47,6 +48,23 @@ class _PackageAddScreenState extends State { (result) { setState( () { + // itemVals = [ + // {'id': '', 'name-udi': ''} + // ]; + // for (var item in result) { + // itemVals.add(item); + // packageProviderObject.itemVals = itemVals; + // } + // initialItemValue.text = itemVals[1]['name-udi']; + // packageProviderObject.initialItemValue = initialItemValue.text; + + // itemVals.forEach( + // (item) { + // if (item['id'] == '') { + // selectedItemsCTRL.text = item['name']!; + // } + // }, + // ); isInit = false; }, ); @@ -215,6 +233,13 @@ class _PackageAddScreenState extends State { initialItemValue: packageProvider.initialItemValue, index: index, + filteredItems: + packageProvider.filteredItems!, + hasRemoveButton: + packageProvider.itemValues.length > + 1 + ? true + : false, ), itemCount: packageProvider.itemValues.length, diff --git a/lib/pages/PackagePages/package_detail_screen.dart b/lib/pages/PackagePages/package_detail_screen.dart old mode 100644 new mode 100755 index 856c096..0c1e597 --- a/lib/pages/PackagePages/package_detail_screen.dart +++ b/lib/pages/PackagePages/package_detail_screen.dart @@ -1,3 +1,4 @@ +import 'package:cssd/config/routes.dart'; import 'package:cssd/models/package_model.dart'; import 'package:cssd/providers/packages.dart'; import 'package:cssd/widgets/PackageScreens/Details/package_detail_box.dart'; @@ -8,12 +9,6 @@ import '../../providers/connectivity.dart'; import '../../widgets/Global/internet_error.dart'; class PackageDetailScreen extends StatefulWidget { - final String? testResultId; - - PackageDetailScreen({ - this.testResultId, - }); - @override _PackageDetailScreenState createState() => _PackageDetailScreenState(); } @@ -80,6 +75,15 @@ class _PackageDetailScreenState extends State { : PackageDetailsDataBox( datas: datas!, deviceBlockSize: _deviceBlockSize, + goToAddLabelPage: () { + Navigator.pushNamed( + context, + Routes.labelAddScreen, + arguments: { + "id": datas!.id, + }, + ); + }, ) : ConnectionErrorBox(); }, diff --git a/lib/pages/PackagePages/package_filter_screen.dart b/lib/pages/PackagePages/package_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/PackagePages/package_scan_screen.dart b/lib/pages/PackagePages/package_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/PackagePages/package_update_screen.dart b/lib/pages/PackagePages/package_update_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/TestPages/test_add_screen.dart b/lib/pages/TestPages/test_add_screen.dart old mode 100644 new mode 100755 index 6fe14f5..051c0f7 --- a/lib/pages/TestPages/test_add_screen.dart +++ b/lib/pages/TestPages/test_add_screen.dart @@ -11,7 +11,6 @@ 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(); @@ -29,6 +28,7 @@ class _TestResultAddScreenState extends State { if (isInit) { var testResultProviderObject = Provider.of(context, listen: false); + testResultProviderObject.resetTests(); testResultProviderObject.getFilterItems().then((result) { for (var testType in result[1].keys) { testTypeVals.add(testType); @@ -128,6 +128,10 @@ class _TestResultAddScreenState extends State { } else if (result == 'access') { print('access'); } else { + Provider.of( + context, + listen: false, + ).testCode = result; Navigator.pushNamed( context, Routes.formTestResultScreen, @@ -174,14 +178,18 @@ class _TestResultAddScreenState extends State { child: TextFormField( onChanged: (val) { if (val != '') { - setState(() { - testTypeCTRL.text = ''; - }); + setState( + () { + testTypeCTRL.text = ''; + }, + ); } else { - setState(() { - testTypeCTRL.text = - testTypeVals[0]; - }); + setState( + () { + testTypeCTRL.text = + testTypeVals[0]; + }, + ); } }, controller: testCodeCTRL, diff --git a/lib/pages/TestPages/test_detail_screen.dart b/lib/pages/TestPages/test_detail_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/TestPages/test_filter_screen.dart b/lib/pages/TestPages/test_filter_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/TestPages/test_form_page.dart b/lib/pages/TestPages/test_form_page.dart old mode 100644 new mode 100755 index 902dde4..fc7bf2c --- a/lib/pages/TestPages/test_form_page.dart +++ b/lib/pages/TestPages/test_form_page.dart @@ -41,28 +41,30 @@ class _FormPageState extends State { 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)); - } - }); + 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)); + } + }, + ); } } diff --git a/lib/pages/TestPages/test_result_screen.dart b/lib/pages/TestPages/test_result_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/TestPages/test_scan_screen.dart b/lib/pages/TestPages/test_scan_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/TestPages/test_verify_screen.dart b/lib/pages/TestPages/test_verify_screen.dart old mode 100644 new mode 100755 diff --git a/lib/pages/home_screen.dart b/lib/pages/home_screen.dart old mode 100644 new mode 100755 index 66574fd..f653c9d --- a/lib/pages/home_screen.dart +++ b/lib/pages/home_screen.dart @@ -183,26 +183,24 @@ class HomePage extends StatelessWidget { Divider( height: 2, ), - userData['roles']?.contains('User') ?? false - ? Container() - : 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: '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', @@ -224,26 +222,24 @@ class HomePage extends StatelessWidget { Divider( height: 2, ), - userData['roles']?.contains('User') ?? false - ? Container() - : 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: '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', diff --git a/lib/pages/my_info_screen.dart b/lib/pages/my_info_screen.dart old mode 100644 new mode 100755 diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart old mode 100644 new mode 100755 diff --git a/lib/providers/connectivity.dart b/lib/providers/connectivity.dart old mode 100644 new mode 100755 diff --git a/lib/providers/cycles.dart b/lib/providers/cycles.dart old mode 100644 new mode 100755 index a6319c8..e98bafb --- a/lib/providers/cycles.dart +++ b/lib/providers/cycles.dart @@ -28,6 +28,14 @@ class CyclesProvider extends ChangeNotifier { notifyListeners(); } + removeLabelVal() { + curLabelVal -= 1; + TextEditingController lbl = new TextEditingController(); + lbl.text = initialLabelValue; + labelValues.removeLast(); + notifyListeners(); + } + changeLabelVal(String value, int index) { labelValues[index].text = value; notifyListeners(); diff --git a/lib/providers/input.dart b/lib/providers/input.dart old mode 100644 new mode 100755 diff --git a/lib/providers/items.dart b/lib/providers/items.dart old mode 100644 new mode 100755 index 7f96fa8..87f1267 --- a/lib/providers/items.dart +++ b/lib/providers/items.dart @@ -93,13 +93,13 @@ class ItemProvider extends ChangeNotifier { Future addImage(String batchId, dynamic file, String fileName) async { var imageListInt = file.cast(); - var dio = Dio(); + var dio = new Dio(); dio.options.headers = { 'Authorization': User.token, 'X-Requested-With': 'XMLHttpRequest', 'Content-Type': 'application/json', }; - FormData formData = FormData.fromMap( + FormData formData = new FormData.fromMap( { "batch_id": batchId, 'model_type': 'Item', @@ -111,6 +111,10 @@ class ItemProvider extends ChangeNotifier { Url.addImage, data: formData, ); + // print(response.statusCode); + // print(response.statusMessage); + // print(response.data); + return 'Added'; } @@ -122,7 +126,7 @@ class ItemProvider extends ChangeNotifier { note, batchId, ) async { - batchId = randomString(10); + final batchId = randomString(10); for (var image in catchImages) { await addImage(batchId, image.bytes, image.path!); @@ -264,12 +268,12 @@ class ItemProvider extends ChangeNotifier { }, ); - var testResultData = json.decode(response.body); + var itemsData = json.decode(response.body); if (pageNumber == 1) { originalItems = []; } - for (var item in testResultData['data']['data']) { + for (var item in itemsData['data']['data']) { originalItems!.add( ItemResultObject( name: item['name'], @@ -345,4 +349,15 @@ class ItemProvider extends ChangeNotifier { return false; } } + + Future exportItems() async { + var response = await http.get( + Uri.parse( + Url.exportItems, + ), + headers: {'Authorization': User.token}, + ); + print(response.body); + return true; + } } diff --git a/lib/providers/labels.dart b/lib/providers/labels.dart old mode 100644 new mode 100755 index bdbe1d1..1f0bd48 --- a/lib/providers/labels.dart +++ b/lib/providers/labels.dart @@ -14,23 +14,25 @@ class LabelsProvider extends ChangeNotifier { List packageVals = []; List packageValues = []; String initialPackageValue = ''; + String? packageId; int curPackageVal = 1; resetPackageVals() { packageVals = []; packageValues = []; initialPackageValue = ''; + packageId = null; curPackageVal = 1; // notifyListeners(); } - addPackageVal() { - curPackageVal += 1; - TextEditingController lbl = new TextEditingController(); - lbl.text = initialPackageValue; - packageValues.add(lbl); - notifyListeners(); - } + // addPackageVal() { + // curPackageVal += 1; + // TextEditingController lbl = new TextEditingController(); + // lbl.text = initialPackageValue; + // packageValues.add(lbl); + // notifyListeners(); + // } changePackageVal(String value, int index) { packageValues[index].text = value; @@ -91,7 +93,7 @@ class LabelsProvider extends ChangeNotifier { result.add(package['id'].toString()); } packageVals = result; - initialPackageValue = packageVals[0]; + initialPackageValue = packageId ?? packageVals[0]; TextEditingController newLbl = new TextEditingController(); newLbl.text = initialPackageValue; packageValues.add(newLbl); diff --git a/lib/providers/my_info.dart b/lib/providers/my_info.dart old mode 100644 new mode 100755 diff --git a/lib/providers/my_items.dart b/lib/providers/my_items.dart old mode 100644 new mode 100755 index 25f1910..0bc2769 --- a/lib/providers/my_items.dart +++ b/lib/providers/my_items.dart @@ -19,7 +19,7 @@ class MyItemProvider extends ChangeNotifier { List? originalMyItemsRequests; List? originalHospitalItemsRequests; - List? originalItemHistory; + List? itemHistory; MyItemFilterObject? filters = MyItemFilterObject( id: '', @@ -120,7 +120,7 @@ class MyItemProvider extends ChangeNotifier { originalMyItems = []; } - for (var item in itemsData['data']) { + for (var item in itemsData['data']['data']) { originalMyItems!.add( MyItemResultObject( name: item['name'], @@ -157,15 +157,13 @@ class MyItemProvider extends ChangeNotifier { headers: {'Authorization': User.token, "Accept": "application/json"}, ); - print(response.body); - var itemsData = json.decode(response.body); if (pageNumber == 1) { originalHospitalItems = []; } - for (var item in itemsData['data']) { + for (var item in itemsData['data']['data']) { originalHospitalItems!.add( MyItemResultObject( name: item['name'], @@ -188,28 +186,22 @@ class MyItemProvider extends ChangeNotifier { var itemsData = json.decode(response.body)['data']; - String fromDate = ''; - String toDate = ''; - String userHistory = ''; + itemHistory = []; + for (var transfer in itemsData['transfers']) { - fromDate = - transfer['from_date'] != null ? transfer['from_date'].toString() : ''; - toDate = - transfer['to_date'] != null ? transfer['to_date'].toString() : ''; - userHistory = transfer['user']['name'].toString(); - } - if (itemsData.isNotEmpty) { - originalItemHistory!.add( - MyItemResultObject( - name: itemsData['name'], - id: itemsData['id'].toString(), - size: itemsData['size'].toString(), - fromDate: fromDate, - toDate: toDate, - userHistory: userHistory, + itemHistory!.add( + ItemHistoryObject( + fromDate: transfer['from_date'] != null + ? transfer['from_date'].toString() + : '', + toDate: transfer['to_date'] != null + ? transfer['to_date'].toString() + : 'Now', + userHistoryName: transfer['user']['name'].toString(), + userHistoryId: transfer['user']['id'].toString(), + userHistoryPhon: transfer['user']['cell_number'].toString(), ), ); - originalItemHistory!.reversed.toList(); } } diff --git a/lib/providers/my_packages.dart b/lib/providers/my_packages.dart old mode 100644 new mode 100755 index c505d35..d6f1e66 --- a/lib/providers/my_packages.dart +++ b/lib/providers/my_packages.dart @@ -19,7 +19,7 @@ class MyPackageProvider extends ChangeNotifier { List? originalMyPackagesRequests; List? originalHospitalPackagesRequests; - List? originalPackageHistory; + List? packageHistory; MyPackageFilterObject? filters = MyPackageFilterObject( id: '', @@ -210,29 +210,24 @@ class MyPackageProvider extends ChangeNotifier { ); var packagesData = json.decode(response.body)['data']; + print(packagesData); + + packageHistory = []; - String fromDate = ''; - String toDate = ''; - String userHistory = ''; for (var transfer in packagesData['transfers']) { - fromDate = - transfer['from_date'] != null ? transfer['from_date'].toString() : ''; - toDate = - transfer['to_date'] != null ? transfer['to_date'].toString() : ''; - userHistory = transfer['user']['name'].toString(); - } - if (packagesData.isNotEmpty) { - originalPackageHistory!.add( - MyPackageResultObject( - name: packagesData['name'], - id: packagesData['id'].toString(), - createdAt: packagesData['created_at'].toString(), - fromDate: fromDate, - toDate: toDate, - userHistory: userHistory, + packageHistory!.add( + PackageHistoryObject( + fromDate: transfer['from_date'] != null + ? transfer['from_date'].toString() + : '', + toDate: transfer['to_date'] != null + ? transfer['to_date'].toString() + : 'Now', + userHistoryName: transfer['user']['name'].toString(), + userHistoryId: transfer['user']['id'].toString(), + userHistoryPhon: transfer['user']['cell_number'].toString(), ), ); - originalPackageHistory!.reversed.toList(); } } diff --git a/lib/providers/packages.dart b/lib/providers/packages.dart old mode 100644 new mode 100755 index 79e0911..57de38b --- a/lib/providers/packages.dart +++ b/lib/providers/packages.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +import 'package:cssd/models/item_model.dart'; import 'package:cssd/models/package_model.dart'; import '../config/urls.dart'; @@ -8,7 +9,10 @@ import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; class PackageProvider extends ChangeNotifier { + List? filteredItems; + // List> itemVals = []; List itemVals = []; + List itemValues = []; String initialItemValue = ''; int curItemVal = 1; @@ -18,7 +22,6 @@ class PackageProvider extends ChangeNotifier { itemValues = []; initialItemValue = ''; curItemVal = 1; - // notifyListeners(); } addItemVal() { @@ -29,11 +32,28 @@ class PackageProvider extends ChangeNotifier { notifyListeners(); } + removeItemVal() { + curItemVal -= 1; + TextEditingController lbl = new TextEditingController(); + lbl.text = initialItemValue; + itemValues.removeLast(); + notifyListeners(); + } + changeItemVal(String value, int index) { itemValues[index].text = value; notifyListeners(); } + changeItemValByScan(String value, int index) { + for (var item in filteredItems!) { + if (item.udi == value) { + itemValues[index].text = item.id; + } + } + notifyListeners(); + } + String searchBoxValue = ''; bool filterOn = false; List? items; @@ -84,11 +104,28 @@ class PackageProvider extends ChangeNotifier { 'Authorization': User.token, }, ); + // List> result = []; List result = []; + filteredItems = []; var filterData = json.decode(response.body); for (var item in filterData['data']) { // result.add("${item['name']} - ${item['udi'] != null ? item['udi'] : ''}"); result.add(item['id'].toString()); + // result.add({ + // 'name-udi': + // "${item['name']} - ${item['udi'] != null ? item['udi'] : ''}", + // 'id': item['id'].toString() + // }); + filteredItems!.add( + ItemResultObject( + name: item['name'], + id: item['id'].toString(), + size: item['size'].toString(), + userName: item['user'] != null ? item['user']['name'] : '', + status: item['status'], + udi: item['udi'] != null ? item['udi'] : '', + ), + ); } itemVals = result; initialItemValue = itemVals[0]; @@ -105,7 +142,7 @@ class PackageProvider extends ChangeNotifier { items, note, ) async { - List> itms = []; + List> itms = []; for (var item in items) { itms.add({'id': item}); } diff --git a/lib/providers/test_results.dart b/lib/providers/test_results.dart old mode 100644 new mode 100755 index e5cf297..55a0bd7 --- a/lib/providers/test_results.dart +++ b/lib/providers/test_results.dart @@ -19,6 +19,11 @@ class TestResultsProvider with ChangeNotifier { String testType = ''; String testCode = ''; + resetTests() { + testCode = ''; + testType = ''; + } + setImages() async { images = []; for (var image in catchImages) { diff --git a/lib/providers/users.dart b/lib/providers/users.dart old mode 100644 new mode 100755 index aa7a696..cde6957 --- a/lib/providers/users.dart +++ b/lib/providers/users.dart @@ -36,6 +36,10 @@ class UsersProvider extends ChangeNotifier { notifyListeners(); } + void resetSelectedUser() { + selectedUserIndex = null; + } + void searchUsers(String value) { usersBox = []; searchBoxValue = value; diff --git a/lib/utils/scan.dart b/lib/utils/scan.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Add/add_label_box.dart b/lib/widgets/CycleScreens/Add/add_label_box.dart old mode 100644 new mode 100755 index 5616262..41f34f0 --- a/lib/widgets/CycleScreens/Add/add_label_box.dart +++ b/lib/widgets/CycleScreens/Add/add_label_box.dart @@ -15,6 +15,7 @@ class AddLabelBox extends StatelessWidget { required this.index, required this.text, this.iconColor, + required this.hasRemoveButton, }) : _deviceBlockSize = deviceBlockSize, super(key: key); @@ -25,6 +26,7 @@ class AddLabelBox extends StatelessWidget { final int index; final String text; final Color? iconColor; + final bool hasRemoveButton; @override Widget build(BuildContext context) { @@ -67,119 +69,120 @@ class AddLabelBox extends StatelessWidget { Expanded( // width: MediaQuery.of(context).size.width - 70, child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - SizedBox( - width: _deviceBlockSize, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + SizedBox( + width: _deviceBlockSize, + ), + Text( + text, + style: TextStyle( + fontSize: 3.5 * _deviceBlockSize, + color: Colors.grey, + fontWeight: FontWeight.w100, ), - 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, ), - ), - ], - ), - Row( - children: [ - Container( - width: MediaQuery.of(context).size.width - - (40 * _deviceBlockSize), - // height: 30, - child: DropdownButtonFormField( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: _deviceBlockSize, + 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, ), - 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, - ), + 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, - ), + ), + 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); - } - }, + ), ); + }).toList(), + onChanged: (val) { + Provider.of(context, + listen: false) + .changeLabelVal(val!, 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, - ), + ), + ), + 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, + ), + ), + ) + ], + ), + ], + ), ), ], ), @@ -206,6 +209,28 @@ class AddLabelBox extends StatelessWidget { ), ), ), + if (hasRemoveButton) + Positioned( + bottom: 15, + right: 50, + child: InkWell( + onTap: () { + Provider.of(context, listen: false) + .removeLabelVal(); + }, + child: Container( + padding: EdgeInsets.all(3), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: iconColor, + ), + child: Icon( + Icons.remove, + color: Colors.white, + ), + ), + ), + ), ], ), ); diff --git a/lib/widgets/CycleScreens/Add/cycle_update_button.dart b/lib/widgets/CycleScreens/Add/cycle_update_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Add/date_picker.dart b/lib/widgets/CycleScreens/Add/date_picker.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Add/save_button.dart b/lib/widgets/CycleScreens/Add/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Details/datas_box.dart b/lib/widgets/CycleScreens/Details/datas_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Filter/date_picker.dart b/lib/widgets/CycleScreens/Filter/date_picker.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Filter/save_button.dart b/lib/widgets/CycleScreens/Filter/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Filter/selector_box.dart b/lib/widgets/CycleScreens/Filter/selector_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Result/banner.dart b/lib/widgets/CycleScreens/Result/banner.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Result/data_box.dart b/lib/widgets/CycleScreens/Result/data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Result/filter_objects.dart b/lib/widgets/CycleScreens/Result/filter_objects.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/CycleScreens/Result/search_box.dart b/lib/widgets/CycleScreens/Result/search_box.dart old mode 100644 new mode 100755 index e2a4a5f..9ca0b88 --- a/lib/widgets/CycleScreens/Result/search_box.dart +++ b/lib/widgets/CycleScreens/Result/search_box.dart @@ -9,6 +9,7 @@ class ResultSearchBox extends StatelessWidget { required this.text, required this.onChanged, this.text2 = 'ID', + this.textInputType = TextInputType.number, }) : _deviceBlockSize = deviceBlockSize, super(key: key); @@ -17,6 +18,7 @@ class ResultSearchBox extends StatelessWidget { final String text; final String text2; final dynamic onChanged; + final TextInputType textInputType; @override Widget build(BuildContext context) { @@ -43,7 +45,7 @@ class ResultSearchBox extends StatelessWidget { fontWeight: FontWeight.w700, fontSize: 5 * _deviceBlockSize, ), - keyboardType: TextInputType.number, + keyboardType: textInputType, ); } } diff --git a/lib/widgets/Global/drawer.dart b/lib/widgets/Global/drawer.dart old mode 100644 new mode 100755 index be83272..0fedd62 --- a/lib/widgets/Global/drawer.dart +++ b/lib/widgets/Global/drawer.dart @@ -24,7 +24,6 @@ class _AppDrawerState extends State { @override Widget build(BuildContext context) { - final userData = Provider.of(context, listen: false).user; return SafeArea( child: SizedBox( width: 250, @@ -193,39 +192,35 @@ class _AppDrawerState extends State { ), ), ), - userData['roles']?.contains('User') ?? false - ? Container() - : 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.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) @@ -256,39 +251,35 @@ class _AppDrawerState extends State { ), ), ), - userData['roles']?.contains('User') ?? false - ? Container() - : 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.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); diff --git a/lib/widgets/Global/input_box.dart b/lib/widgets/Global/input_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/Global/internet_error.dart b/lib/widgets/Global/internet_error.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/Global/page_header.dart b/lib/widgets/Global/page_header.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/Global/splash_screen.dart b/lib/widgets/Global/splash_screen.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/ItemScreens/Add/item_save_button.dart b/lib/widgets/ItemScreens/Add/item_save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/ItemScreens/Add/item_update_button.dart b/lib/widgets/ItemScreens/Add/item_update_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/ItemScreens/Add/upload_image.dart b/lib/widgets/ItemScreens/Add/upload_image.dart old mode 100644 new mode 100755 index aee2bd4..d4e2e97 --- a/lib/widgets/ItemScreens/Add/upload_image.dart +++ b/lib/widgets/ItemScreens/Add/upload_image.dart @@ -1,10 +1,14 @@ -import 'package:cssd/config/routes.dart'; +// ignore_for_file: invalid_use_of_visible_for_testing_member, deprecated_member_use + +import 'dart:io'; + import 'package:cssd/providers/items.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; +import 'package:image_picker/image_picker.dart'; import 'package:provider/provider.dart'; -class UploaderImage extends StatelessWidget { +class UploaderImage extends StatefulWidget { final double deviceBlockSize; final ItemProvider providerObject; const UploaderImage({ @@ -13,6 +17,11 @@ class UploaderImage extends StatelessWidget { required this.providerObject, }); + @override + State createState() => _UploaderImageState(); +} + +class _UploaderImageState extends State { @override Widget build(BuildContext context) { return Container( @@ -24,18 +33,18 @@ class UploaderImage extends StatelessWidget { children: [ Container( margin: EdgeInsets.only(top: 20), - height: providerObject.catchImages.length != 0 ? 60 : 0, + height: widget.providerObject.catchImages.length != 0 ? 60 : 0, child: ImageBox( - deviceBlockSize: deviceBlockSize, - itemProvider: providerObject, + deviceBlockSize: widget.deviceBlockSize, + itemProvider: widget.providerObject, ), ), SizedBox( - height: providerObject.catchImages.length != 0 ? 10 : 0, + height: widget.providerObject.catchImages.length != 0 ? 10 : 0, ), InkWell( onTap: () async { - await loadAssets(context); + await loadAssetsFromFilePicker(context); }, child: Container( width: MediaQuery.of(context).size.width - 40, @@ -57,9 +66,7 @@ class UploaderImage extends StatelessWidget { ), InkWell( onTap: () async { - await Navigator.of(context) - .pushNamed(Routes.captureImageScreen); - // await captureImage(context); + await loadAssetsFromCamera(context); }, child: Container( width: MediaQuery.of(context).size.width - 40, @@ -82,7 +89,7 @@ class UploaderImage extends StatelessWidget { ); } - Future loadAssets(BuildContext context) async { + Future loadAssetsFromFilePicker(BuildContext context) async { var providerObject = Provider.of(context, listen: false); List files = providerObject.catchImages; try { @@ -98,6 +105,26 @@ class UploaderImage extends StatelessWidget { providerObject.setCatchImages(files); providerObject.setImages(); } + + Future loadAssetsFromCamera(BuildContext context) async { + var providerObject = Provider.of(context, listen: false); + List _catchImages = []; + var image = await ImagePicker.platform.pickImage( + source: ImageSource.camera, + ); + if (image != null) { + _catchImages.add( + PlatformFile( + path: image.path, + name: "item_image", + bytes: File(image.path).readAsBytesSync(), + size: File(image.path).lengthSync(), + ), + ); + providerObject.setCatchImages(_catchImages); + providerObject.setImages(); + } + } } class ImageBox extends StatelessWidget { diff --git a/lib/widgets/ItemScreens/Details/item_detail_box.dart b/lib/widgets/ItemScreens/Details/item_detail_box.dart old mode 100644 new mode 100755 index aacbeff..1f08047 --- a/lib/widgets/ItemScreens/Details/item_detail_box.dart +++ b/lib/widgets/ItemScreens/Details/item_detail_box.dart @@ -306,7 +306,7 @@ class ItemDetailsDataBox extends StatelessWidget { Container( width: 45 * _deviceBlockSize, child: Text( - datas.status == 1 ? 'Success' : 'Failure', + datas.status == 1 ? 'Confirmed' : 'Rejected', style: TextStyle( fontWeight: FontWeight.w700, color: datas.status == 1 ? kBlue : kPink, diff --git a/lib/widgets/ItemScreens/Filter/item_filter_button.dart b/lib/widgets/ItemScreens/Filter/item_filter_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/ItemScreens/Filter/item_filter_object.dart b/lib/widgets/ItemScreens/Filter/item_filter_object.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/ItemScreens/Result/item_data_box.dart b/lib/widgets/ItemScreens/Result/item_data_box.dart old mode 100644 new mode 100755 index 7f0867c..894be66 --- a/lib/widgets/ItemScreens/Result/item_data_box.dart +++ b/lib/widgets/ItemScreens/Result/item_data_box.dart @@ -125,7 +125,10 @@ class ItemItemBox extends StatelessWidget { builder: (context) { return AlertDialog( title: Text( - 'Do you want to change the status of the item?'), + item!.status == 1 + ? 'Are you Reject this item?' + : 'Are you Confirm this item?', + ), actions: [ TextButton( onPressed: () { diff --git a/lib/widgets/LabelScreens/Add/add_package_box.dart b/lib/widgets/LabelScreens/Add/add_package_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Add/date_picker.dart b/lib/widgets/LabelScreens/Add/date_picker.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Add/save_button.dart b/lib/widgets/LabelScreens/Add/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Add/selector_box.dart b/lib/widgets/LabelScreens/Add/selector_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Add/update_button.dart b/lib/widgets/LabelScreens/Add/update_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Detail/datas_box.dart b/lib/widgets/LabelScreens/Detail/datas_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Detail/header.dart b/lib/widgets/LabelScreens/Detail/header.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Filter/save_button.dart b/lib/widgets/LabelScreens/Filter/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Filter/selector_box.dart b/lib/widgets/LabelScreens/Filter/selector_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Result/data_box.dart b/lib/widgets/LabelScreens/Result/data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Result/filter_chip_box.dart b/lib/widgets/LabelScreens/Result/filter_chip_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Result/floating_buttons.dart b/lib/widgets/LabelScreens/Result/floating_buttons.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Result/search_box.dart b/lib/widgets/LabelScreens/Result/search_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Scan/input_box.dart b/lib/widgets/LabelScreens/Scan/input_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Scan/save_button.dart b/lib/widgets/LabelScreens/Scan/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/LabelScreens/Scan/scan_box.dart b/lib/widgets/LabelScreens/Scan/scan_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyInfo/input_box.dart b/lib/widgets/MyInfo/input_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart b/lib/widgets/MyItemsScreens/Detail/cancel_transfer_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart old mode 100644 new mode 100755 index 8209ad8..1d7a45f --- a/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart +++ b/lib/widgets/MyItemsScreens/Detail/my_items_detail_box_widget.dart @@ -364,7 +364,7 @@ class MyItemsDetailsDataBox extends StatelessWidget { ), content: SizedBox( width: _deviceBlockSize, - height: 250, + height: 220, child: Column( children: [ Text( diff --git a/lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart b/lib/widgets/MyItemsScreens/Detail/transfer_data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart b/lib/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart b/lib/widgets/MyItemsScreens/Filter/my_items_chip_widget.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart b/lib/widgets/MyItemsScreens/Filter/my_items_filter_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart b/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart old mode 100644 new mode 100755 index ed078f2..c96e8bb --- a/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart +++ b/lib/widgets/MyItemsScreens/History/my_items_history_date_widget.dart @@ -9,7 +9,7 @@ class ItemHistoryDate extends StatelessWidget { }) : _deviceBlockSize = deviceBlockSize; final double _deviceBlockSize; - final MyItemResultObject items; + final ItemHistoryObject items; @override Widget build(BuildContext context) { @@ -22,6 +22,16 @@ class ItemHistoryDate extends StatelessWidget { color: Colors.grey, ), ), + // Text( + // DateFormat.yMMMd().format( + // DateTime.parse( + // datas.createdAt, + // ), + // ), + // style: TextStyle( + // color: kDarkBlue, + // ), + // ), SizedBox( width: 6.0, ), diff --git a/lib/widgets/MyItemsScreens/History/user_item_history_box.dart b/lib/widgets/MyItemsScreens/History/user_item_history_box.dart new file mode 100755 index 0000000..cbe8545 --- /dev/null +++ b/lib/widgets/MyItemsScreens/History/user_item_history_box.dart @@ -0,0 +1,70 @@ +import 'package:cssd/models/my_item_model.dart'; +import 'package:flutter/material.dart'; + +class UserItemDataBox extends StatelessWidget { + final ItemHistoryObject? user; + + const UserItemDataBox({ + Key? key, + required double deviceBlockSize, + this.user, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + user!.userHistoryId.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!.userHistoryName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Text( + user!.userHistoryPhon, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + color: Colors.grey, + ), + ), + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart b/lib/widgets/MyItemsScreens/Result/item_requests_data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart b/lib/widgets/MyItemsScreens/Result/my_items_data_box_widget.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart b/lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart b/lib/widgets/MyPackagesScreens/Filter/my_packages_chip_widget.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart b/lib/widgets/MyPackagesScreens/Filter/my_packages_filter_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart b/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart old mode 100644 new mode 100755 index e1f94b4..82cbca2 --- a/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart +++ b/lib/widgets/MyPackagesScreens/History/my_packages_history_date_widget.dart @@ -9,7 +9,7 @@ class PackageHistoryDate extends StatelessWidget { }) : _deviceBlockSize = deviceBlockSize; final double _deviceBlockSize; - final MyPackageResultObject packages; + final PackageHistoryObject packages; @override Widget build(BuildContext context) { @@ -26,7 +26,7 @@ class PackageHistoryDate extends StatelessWidget { width: 6.0, ), Text( - packages.fromDate!, + packages.fromDate, style: TextStyle( fontSize: 3 * _deviceBlockSize, fontWeight: FontWeight.w700, @@ -49,7 +49,7 @@ class PackageHistoryDate extends StatelessWidget { width: 6.0, ), Text( - packages.toDate!, + packages.toDate, style: TextStyle( fontSize: 3 * _deviceBlockSize, fontWeight: FontWeight.w700, diff --git a/lib/widgets/MyPackagesScreens/History/user_package_history_box.dart b/lib/widgets/MyPackagesScreens/History/user_package_history_box.dart new file mode 100755 index 0000000..dc589b7 --- /dev/null +++ b/lib/widgets/MyPackagesScreens/History/user_package_history_box.dart @@ -0,0 +1,70 @@ +import 'package:cssd/models/my_package_model.dart'; +import 'package:flutter/material.dart'; + +class UserPackageDataBox extends StatelessWidget { + final PackageHistoryObject? user; + + const UserPackageDataBox({ + Key? key, + required double deviceBlockSize, + this.user, + }) : _deviceBlockSize = deviceBlockSize, + super(key: key); + + final double _deviceBlockSize; + + @override + Widget build(BuildContext context) { + return Card( + elevation: 1, + child: Container( + padding: EdgeInsets.all(8), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + padding: const EdgeInsets.all(6.0), + child: Text( + user!.userHistoryId.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!.userHistoryName, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + ), + ), + ), + Container( + width: 30 * _deviceBlockSize, + child: Text( + user!.userHistoryPhon, + style: TextStyle( + fontSize: 3 * _deviceBlockSize, + fontWeight: FontWeight.w700, + color: Colors.grey, + ), + ), + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart b/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart b/lib/widgets/MyPackagesScreens/Result/package_requests_data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/PackageScreens/Add/add_item_box.dart b/lib/widgets/PackageScreens/Add/add_item_box.dart old mode 100644 new mode 100755 index 42f5c81..fc39e7a --- a/lib/widgets/PackageScreens/Add/add_item_box.dart +++ b/lib/widgets/PackageScreens/Add/add_item_box.dart @@ -1,3 +1,4 @@ +import 'package:cssd/models/item_model.dart'; import 'package:cssd/providers/packages.dart'; import 'package:cssd/utils/scan.dart'; import 'package:flutter/material.dart'; @@ -13,20 +14,29 @@ class AddItemBox extends StatelessWidget { required this.initialItemValue, required this.index, required this.text, + // required this.scanUdi, this.iconColor, + required this.filteredItems, + required this.hasRemoveButton, }) : _deviceBlockSize = deviceBlockSize, super(key: key); final double _deviceBlockSize; final TextEditingController values; + // final List> vals; final List vals; + final String initialItemValue; final int index; final String text; final Color? iconColor; + final bool hasRemoveButton; + final List filteredItems; + // final String scanUdi; @override Widget build(BuildContext context) { + bool isEnabled = true; return Container( height: 150, child: Stack( @@ -125,6 +135,7 @@ class AddItemBox extends StatelessWidget { isDense: true, items: vals.map((val) { return new DropdownMenuItem( + enabled: isEnabled, value: val, child: Container( child: Text( @@ -158,7 +169,8 @@ class AddItemBox extends StatelessWidget { print(result); Provider.of(context, listen: false) - .changeItemVal(result, index); + .changeItemValByScan(result, index); + isEnabled = false; } }, ); @@ -206,6 +218,28 @@ class AddItemBox extends StatelessWidget { ), ), ), + if (hasRemoveButton) + Positioned( + bottom: 15, + right: 50, + child: InkWell( + onTap: () { + Provider.of(context, listen: false) + .removeItemVal(); + }, + child: Container( + padding: EdgeInsets.all(3), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: iconColor, + ), + child: Icon( + Icons.remove, + color: Colors.white, + ), + ), + ), + ), ], ), ); diff --git a/lib/widgets/PackageScreens/Add/package_save_button.dart b/lib/widgets/PackageScreens/Add/package_save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/PackageScreens/Add/package_update_button.dart b/lib/widgets/PackageScreens/Add/package_update_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/PackageScreens/Details/package_detail_box.dart b/lib/widgets/PackageScreens/Details/package_detail_box.dart old mode 100644 new mode 100755 index 10b7d22..ca079bc --- a/lib/widgets/PackageScreens/Details/package_detail_box.dart +++ b/lib/widgets/PackageScreens/Details/package_detail_box.dart @@ -1,5 +1,6 @@ import 'package:cssd/config/colors.dart'; import 'package:cssd/models/package_model.dart'; +import 'package:cssd/widgets/MyItemsScreens/Detail/transfer_destroy_button.dart'; import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -9,11 +10,13 @@ class PackageDetailsDataBox extends StatelessWidget { Key? key, required this.datas, required double deviceBlockSize, + required this.goToAddLabelPage, }) : _deviceBlockSize = deviceBlockSize, super(key: key); final PackageDetailObject datas; final double _deviceBlockSize; + final VoidCallback goToAddLabelPage; @override Widget build(BuildContext context) { @@ -255,24 +258,16 @@ class PackageDetailsDataBox extends StatelessWidget { SizedBox( height: 50, ), - // TransferDestroyButton( - // deviceBlockSize: _deviceBlockSize, - // firstColor: kPurple, - // secondColor: kPurpleSub, - // onTap: () { - // Navigator.pushNamed( - // context, - // Routes.labelAddScreen, - // arguments: { - // 'id': datas.id, - // }, - // ); - // }, - // text: 'Make a Label For Package', - // ), - // SizedBox( - // height: 5.0, - // ), + TransferDestroyButton( + deviceBlockSize: _deviceBlockSize, + firstColor: kPurple, + secondColor: kPurpleSub, + onTap: goToAddLabelPage, + text: 'Make a Label For Package', + ), + SizedBox( + height: 5.0, + ), ], ), ), diff --git a/lib/widgets/PackageScreens/Filter/filter_button.dart b/lib/widgets/PackageScreens/Filter/filter_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/PackageScreens/Filter/package_filter_object.dart b/lib/widgets/PackageScreens/Filter/package_filter_object.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/PackageScreens/Result/package_data_box.dart b/lib/widgets/PackageScreens/Result/package_data_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Add/capture_image.dart b/lib/widgets/TestResultScreens/Add/capture_image.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Add/form_creator.dart b/lib/widgets/TestResultScreens/Add/form_creator.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Add/save_button.dart b/lib/widgets/TestResultScreens/Add/save_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Add/selector_box.dart b/lib/widgets/TestResultScreens/Add/selector_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Details/datas_box.dart b/lib/widgets/TestResultScreens/Details/datas_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Filter/date_picker.dart b/lib/widgets/TestResultScreens/Filter/date_picker.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Filter/drop_down_box.dart b/lib/widgets/TestResultScreens/Filter/drop_down_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Filter/selector_box.dart b/lib/widgets/TestResultScreens/Filter/selector_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Main/add_button.dart b/lib/widgets/TestResultScreens/Main/add_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Main/filter_chip_box.dart b/lib/widgets/TestResultScreens/Main/filter_chip_box.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Main/floating_button.dart b/lib/widgets/TestResultScreens/Main/floating_button.dart old mode 100644 new mode 100755 diff --git a/lib/widgets/TestResultScreens/Main/search_box.dart b/lib/widgets/TestResultScreens/Main/search_box.dart old mode 100644 new mode 100755 diff --git a/macos/.gitignore b/macos/.gitignore old mode 100644 new mode 100755 diff --git a/macos/Flutter/Flutter-Debug.xcconfig b/macos/Flutter/Flutter-Debug.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Flutter/Flutter-Release.xcconfig b/macos/Flutter/Flutter-Release.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift old mode 100644 new mode 100755 diff --git a/macos/Podfile b/macos/Podfile old mode 100644 new mode 100755 diff --git a/macos/Podfile.lock b/macos/Podfile.lock old mode 100644 new mode 100755 diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj old mode 100644 new mode 100755 diff --git a/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist old mode 100644 new mode 100755 diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme old mode 100644 new mode 100755 diff --git a/macos/Runner.xcworkspace/contents.xcworkspacedata b/macos/Runner.xcworkspace/contents.xcworkspacedata old mode 100644 new mode 100755 diff --git a/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist old mode 100644 new mode 100755 diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png old mode 100644 new mode 100755 diff --git a/macos/Runner/Base.lproj/MainMenu.xib b/macos/Runner/Base.lproj/MainMenu.xib old mode 100644 new mode 100755 diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Runner/Configs/Debug.xcconfig b/macos/Runner/Configs/Debug.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Runner/Configs/Release.xcconfig b/macos/Runner/Configs/Release.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Runner/Configs/Warnings.xcconfig b/macos/Runner/Configs/Warnings.xcconfig old mode 100644 new mode 100755 diff --git a/macos/Runner/DebugProfile.entitlements b/macos/Runner/DebugProfile.entitlements old mode 100644 new mode 100755 diff --git a/macos/Runner/Info.plist b/macos/Runner/Info.plist old mode 100644 new mode 100755 diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift old mode 100644 new mode 100755 diff --git a/macos/Runner/Release.entitlements b/macos/Runner/Release.entitlements old mode 100644 new mode 100755 diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift old mode 100644 new mode 100755 diff --git a/pubspec.lock b/pubspec.lock old mode 100644 new mode 100755 index e3d122a..37c2d90 --- a/pubspec.lock +++ b/pubspec.lock @@ -329,7 +329,7 @@ packages: source: hosted version: "4.0.17" image_picker: - dependency: transitive + dependency: "direct main" description: name: image_picker sha256: b4f02353277b39f350093a2460b32b43eafaa3bfc4f92e8d90926698d8d78df6 diff --git a/pubspec.yaml b/pubspec.yaml old mode 100644 new mode 100755 index 610e444..5726be7 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ dependencies: url_launcher: ^6.0.6 equatable: ^2.0.5 flutter_lints: ^2.0.3 + image_picker: ^0.7.5+4 # video_player: ^0.10.11+2 dev_dependencies: diff --git a/test/widget_test.dart b/test/widget_test.dart old mode 100644 new mode 100755 diff --git a/web/favicon.png b/web/favicon.png old mode 100644 new mode 100755 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png old mode 100644 new mode 100755 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png old mode 100644 new mode 100755 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png old mode 100644 new mode 100755 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png old mode 100644 new mode 100755 diff --git a/web/index.html b/web/index.html old mode 100644 new mode 100755 diff --git a/web/manifest.json b/web/manifest.json old mode 100644 new mode 100755 diff --git a/windows/.gitignore b/windows/.gitignore old mode 100644 new mode 100755 diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc old mode 100644 new mode 100755 diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h old mode 100644 new mode 100755 diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake old mode 100644 new mode 100755 diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc old mode 100644 new mode 100755 diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp old mode 100644 new mode 100755 diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h old mode 100644 new mode 100755 diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp old mode 100644 new mode 100755 diff --git a/windows/runner/resource.h b/windows/runner/resource.h old mode 100644 new mode 100755 diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico old mode 100644 new mode 100755 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest old mode 100644 new mode 100755 diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp old mode 100644 new mode 100755 diff --git a/windows/runner/utils.h b/windows/runner/utils.h old mode 100644 new mode 100755 diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp old mode 100644 new mode 100755 diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h old mode 100644 new mode 100755