From 6b99e16d95fc8d51a342e15b88d05d708217495a Mon Sep 17 00:00:00 2001 From: fhkhd Date: Fri, 29 Dec 2023 19:16:32 +0330 Subject: [PATCH] Fix add loading and home list issue --- lib/pages/ItemPages/item_add_screen.dart | 2 +- lib/pages/home_screen.dart | 42 +++++++++++++----------- pubspec.lock | 40 +++++----------------- 3 files changed, 31 insertions(+), 53 deletions(-) diff --git a/lib/pages/ItemPages/item_add_screen.dart b/lib/pages/ItemPages/item_add_screen.dart index 4c47082..a4aa655 100755 --- a/lib/pages/ItemPages/item_add_screen.dart +++ b/lib/pages/ItemPages/item_add_screen.dart @@ -45,7 +45,7 @@ class _ItemAddScreenState extends State { void _saveForm(String name, String size, String specific, String udi,String description) { setState(() { - isLoading = true; + isLoading = false; }); if (!_form.currentState!.validate()) { return; diff --git a/lib/pages/home_screen.dart b/lib/pages/home_screen.dart index 1cbf892..e1bae7a 100755 --- a/lib/pages/home_screen.dart +++ b/lib/pages/home_screen.dart @@ -24,7 +24,6 @@ import 'TestPages/test_verify_screen.dart'; class HomePage extends StatelessWidget { @override Widget build(BuildContext context) { - final userData = Provider.of(context, listen: false).user; return SafeArea( child: Scaffold( drawer: Selector( @@ -34,7 +33,12 @@ class HomePage extends StatelessWidget { ), appBar: AppBar( centerTitle: true, - title: Text('CSSD', style: TextStyle(color: Colors.white,),), + title: Text( + 'CSSD', + style: TextStyle( + color: Colors.white, + ), + ), backgroundColor: Colors.black, iconTheme: IconThemeData(color: Colors.white), actions: [ @@ -258,24 +262,22 @@ class HomePage extends StatelessWidget { ), ), Divider(height: 2), - userData['roles']?.contains('User') ?? false - ? Container() - : SelectionItem( - firstLine: 'TEST TO VERIFY', - secondLine: 'Verify and reject Test Results', - onTap: () => Navigator.push( - context, - MaterialPageRoute( - builder: (context) { - return Consumer( - builder: (ctx, auth, _) { - return TestVerifyScreen(); - }, - ); - }, - ), - ), - ), + SelectionItem( + firstLine: 'TEST TO VERIFY', + secondLine: 'Verify and reject Test Results', + onTap: () => Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return Consumer( + builder: (ctx, auth, _) { + return TestVerifyScreen(); + }, + ); + }, + ), + ), + ), BarcodeSelectionItem(), ], ), diff --git a/pubspec.lock b/pubspec.lock index d56db3e..f886f08 100755 --- a/pubspec.lock +++ b/pubspec.lock @@ -472,22 +472,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.8.1" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "04be76c4a4bb50f14904e64749237e541e7c7bcf7ec0b196907322ab5d2fc739" - url: "https://pub.dev" - source: hosted - version: "9.0.16" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff - url: "https://pub.dev" - source: hosted - version: "1.0.5" lints: dependency: transitive description: @@ -508,18 +492,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.10.0" mime: dependency: transitive description: @@ -961,10 +945,10 @@ packages: dependency: transitive description: name: uuid - sha256: bb55f38968b9427ce5dcdb8aaaa41049282195e0cfa4cf48593572fa3d1f36bc + sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f" url: "https://pub.dev" source: hosted - version: "4.3.1" + version: "4.2.2" vector_math: dependency: transitive description: @@ -973,22 +957,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 - url: "https://pub.dev" - source: hosted - version: "13.0.0" web: dependency: transitive description: name: web - sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.3.0" win32: dependency: transitive description: