Fix add loading and home list issue

This commit is contained in:
fhkhd
2023-12-29 19:16:32 +03:30
parent 2a4d72c605
commit 6b99e16d95
3 changed files with 31 additions and 53 deletions
+1 -1
View File
@@ -45,7 +45,7 @@ class _ItemAddScreenState extends State<ItemAddScreen> {
void _saveForm(String name, String size, String specific, String udi,String description) { void _saveForm(String name, String size, String specific, String udi,String description) {
setState(() { setState(() {
isLoading = true; isLoading = false;
}); });
if (!_form.currentState!.validate()) { if (!_form.currentState!.validate()) {
return; return;
+22 -20
View File
@@ -24,7 +24,6 @@ import 'TestPages/test_verify_screen.dart';
class HomePage extends StatelessWidget { class HomePage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final userData = Provider.of<Auth>(context, listen: false).user;
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
drawer: Selector<ConnectivityProvider, String>( drawer: Selector<ConnectivityProvider, String>(
@@ -34,7 +33,12 @@ class HomePage extends StatelessWidget {
), ),
appBar: AppBar( appBar: AppBar(
centerTitle: true, centerTitle: true,
title: Text('CSSD', style: TextStyle(color: Colors.white,),), title: Text(
'CSSD',
style: TextStyle(
color: Colors.white,
),
),
backgroundColor: Colors.black, backgroundColor: Colors.black,
iconTheme: IconThemeData(color: Colors.white), iconTheme: IconThemeData(color: Colors.white),
actions: <Widget>[ actions: <Widget>[
@@ -258,24 +262,22 @@ class HomePage extends StatelessWidget {
), ),
), ),
Divider(height: 2), Divider(height: 2),
userData['roles']?.contains('User') ?? false SelectionItem(
? Container() firstLine: 'TEST TO VERIFY',
: SelectionItem( secondLine: 'Verify and reject Test Results',
firstLine: 'TEST TO VERIFY', onTap: () => Navigator.push(
secondLine: 'Verify and reject Test Results', context,
onTap: () => Navigator.push( MaterialPageRoute(
context, builder: (context) {
MaterialPageRoute( return Consumer<Auth>(
builder: (context) { builder: (ctx, auth, _) {
return Consumer<Auth>( return TestVerifyScreen();
builder: (ctx, auth, _) { },
return TestVerifyScreen(); );
}, },
); ),
}, ),
), ),
),
),
BarcodeSelectionItem(), BarcodeSelectionItem(),
], ],
), ),
+8 -32
View File
@@ -472,22 +472,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.8.1" 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: lints:
dependency: transitive dependency: transitive
description: description:
@@ -508,18 +492,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.8.0" version: "0.5.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.11.0" version: "1.10.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@@ -961,10 +945,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: uuid name: uuid
sha256: bb55f38968b9427ce5dcdb8aaaa41049282195e0cfa4cf48593572fa3d1f36bc sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "4.3.1" version: "4.2.2"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
@@ -973,22 +957,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" 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: web:
dependency: transitive dependency: transitive
description: description:
name: web name: web
sha256: edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.4.0" version: "0.3.0"
win32: win32:
dependency: transitive dependency: transitive
description: description: