From ffd4d36ac2d7f91dbe909ea46bd8dfaa39c67834 Mon Sep 17 00:00:00 2001 From: "hanie.khodkari" Date: Sat, 17 May 2025 21:28:30 +0330 Subject: [PATCH] Fix loading bug in pages and some search bug --- .../Result/my_packages_mine_screen.dart | 1 + lib/pages/PackagePages/package_result_screen.dart | 1 + lib/pages/TestPages/test_form_page.dart | 8 +++++++- lib/widgets/CycleScreens/Add/save_button.dart | 8 +++++++- lib/widgets/LabelScreens/Add/save_button.dart | 8 +++++++- lib/widgets/LabelScreens/Result/search_box.dart | 2 +- .../PackageScreens/Add/package_save_button.dart | 12 ++++++++++-- lib/widgets/TestResultScreens/Main/search_box.dart | 4 ++-- 8 files changed, 36 insertions(+), 8 deletions(-) diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart index 5680fe9..f17eb5c 100755 --- a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart +++ b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart @@ -142,6 +142,7 @@ class _MyPackagesMineScreenState extends State { myPackages.setLoading(); await myPackages.searchMyPackages(searchVal ?? ""); }, + textInputType: TextInputType.text, ), SizedBox( height: 20, diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart index b3012a4..1843dfa 100755 --- a/lib/pages/PackagePages/package_result_screen.dart +++ b/lib/pages/PackagePages/package_result_screen.dart @@ -211,6 +211,7 @@ class _PackageResultScreenState extends State { packages.setLoading(); await packages.search(searchVal ?? ""); }, + textInputType: TextInputType.text, ), SizedBox( height: 20, diff --git a/lib/pages/TestPages/test_form_page.dart b/lib/pages/TestPages/test_form_page.dart index b7209a6..975d5e0 100755 --- a/lib/pages/TestPages/test_form_page.dart +++ b/lib/pages/TestPages/test_form_page.dart @@ -49,7 +49,13 @@ class _FormPageState extends State { _isLoadingButton = false; }); if (result == 'done') { - Navigator.of(context).popAndPushNamed(Routes.testResultScreen); + // Navigator.of(context).popAndPushNamed(Routes.testResultScreen); + Navigator.of(context).pop(); + prvObject.setLoading(); + prvObject.resetPageNumber(); + prvObject + .getTestResults() + .then((value) => {prvObject.resetLoading()}); Fluttertoast.showToast( msg: "Test added.", toastLength: Toast.LENGTH_SHORT, diff --git a/lib/widgets/CycleScreens/Add/save_button.dart b/lib/widgets/CycleScreens/Add/save_button.dart index d9413c5..7bbf36d 100755 --- a/lib/widgets/CycleScreens/Add/save_button.dart +++ b/lib/widgets/CycleScreens/Add/save_button.dart @@ -49,7 +49,13 @@ class CycleAddSaveButton extends StatelessWidget { descriptionCTRL.text, striizerIdCTRL.text, ); - Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen); + // Navigator.of(context).pushReplacementNamed(Routes.cycleResultScreen); + Navigator.of(context).pop(); + var cycles = + await Provider.of(context, listen: false); + cycles.setLoading(); + cycles.resetPageNumber(); + cycles.getCycleResults().then((value) => {cycles.resetLoading()}); Fluttertoast.showToast( msg: "Cycle added.", toastLength: Toast.LENGTH_SHORT, diff --git a/lib/widgets/LabelScreens/Add/save_button.dart b/lib/widgets/LabelScreens/Add/save_button.dart index 3bb506e..b5bf192 100755 --- a/lib/widgets/LabelScreens/Add/save_button.dart +++ b/lib/widgets/LabelScreens/Add/save_button.dart @@ -54,7 +54,13 @@ class LabelAddSaveButton extends StatelessWidget { // eDateValue, striizerIdCTRL.text, ); - Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); + // Navigator.of(context).pushReplacementNamed(Routes.labelResultScreen); + Navigator.of(context).pop(); + var labels = + await Provider.of(context, listen: false); + labels.setLoading(); + labels.resetPageNumber(); + labels.getLabelResults().then((value) => {labels.resetLoading()}); Fluttertoast.showToast( msg: "Label added.", toastLength: Toast.LENGTH_SHORT, diff --git a/lib/widgets/LabelScreens/Result/search_box.dart b/lib/widgets/LabelScreens/Result/search_box.dart index d1753a9..663cfab 100755 --- a/lib/widgets/LabelScreens/Result/search_box.dart +++ b/lib/widgets/LabelScreens/Result/search_box.dart @@ -46,7 +46,7 @@ class LabelSearchBox extends StatelessWidget { fontWeight: FontWeight.w700, fontSize: 5 * _deviceBlockSize, ), - keyboardType: TextInputType.number, + keyboardType: TextInputType.text, ), ), InkWell( diff --git a/lib/widgets/PackageScreens/Add/package_save_button.dart b/lib/widgets/PackageScreens/Add/package_save_button.dart index 031a4ea..0aea0bb 100755 --- a/lib/widgets/PackageScreens/Add/package_save_button.dart +++ b/lib/widgets/PackageScreens/Add/package_save_button.dart @@ -59,8 +59,16 @@ class PackageAddSaveButton extends StatelessWidget { items, descriptionCTRL.text, ); - Navigator.of(context) - .pushReplacementNamed(Routes.packageResultScreen); + // Navigator.of(context) + // .pushReplacementNamed(Routes.packageResultScreen); + Navigator.of(context).pop(); + var packages = + await Provider.of(context, listen: false); + packages.setLoading(); + packages.resetPageNumber(); + packages + .getPackageResults() + .then((value) => {packages.resetLoading()}); Fluttertoast.showToast( msg: "Package added.", toastLength: Toast.LENGTH_SHORT, diff --git a/lib/widgets/TestResultScreens/Main/search_box.dart b/lib/widgets/TestResultScreens/Main/search_box.dart index bd6f460..843d0df 100755 --- a/lib/widgets/TestResultScreens/Main/search_box.dart +++ b/lib/widgets/TestResultScreens/Main/search_box.dart @@ -46,7 +46,7 @@ class TestResultSearchBox extends StatelessWidget { fontWeight: FontWeight.w700, fontSize: 5 * _deviceBlockSize, ), - keyboardType: TextInputType.number, + keyboardType: TextInputType.text, ), ), InkWell( @@ -54,7 +54,7 @@ class TestResultSearchBox extends StatelessWidget { var testResults = await Provider.of(context, listen: false); testResults.setLoading(); - await testResults.search(textVal); + await testResults.search(textVal ?? ""); }, child: Container( padding: EdgeInsets.all(7),