diff --git a/lib/pages/TestPages/test_filter_screen.dart b/lib/pages/TestPages/test_filter_screen.dart index b1b1db4..e2e919f 100755 --- a/lib/pages/TestPages/test_filter_screen.dart +++ b/lib/pages/TestPages/test_filter_screen.dart @@ -6,6 +6,7 @@ import 'package:provider/provider.dart'; import '../../config/routes.dart'; import '../../models/test_result_models.dart'; +import '../../providers/auth.dart'; import '../../providers/connectivity.dart'; import '../../providers/test_results.dart'; import '../../widgets/Global/internet_error.dart'; @@ -28,6 +29,7 @@ class _TestFilterScreenState extends State { TextEditingController uDateCTRL = new TextEditingController(); TextEditingController usernameCTRL = new TextEditingController(); + // TextEditingController dateFrom = new TextEditingController(); // TextEditingController dateUntil = new TextEditingController(); DateTime? dateTimeFrom; @@ -48,6 +50,7 @@ class _TestFilterScreenState extends State { 'Implant ID', // 'None', ]; + // String curLabelIDVal; final List testTypeVals = []; @@ -55,9 +58,11 @@ class _TestFilterScreenState extends State { final List hospitalVals = []; Map hospitals = {}; + // String curhospitalVal; bool isInit = true; + // final List labelIDVals = ['Washer ID']; // String curLabelIDVal; @@ -118,6 +123,7 @@ class _TestFilterScreenState extends State { @override Widget build(BuildContext context) { + final userData = Provider.of(context, listen: false).user; final _media = MediaQuery.of(context); // final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5); final double _devicewidth = _media.size.width; @@ -138,7 +144,12 @@ class _TestFilterScreenState extends State { child: Scaffold( appBar: AppBar( titleSpacing: -10, - title: Text('Test Results', style: TextStyle(color: Colors.white,),), + title: Text( + 'Test Results', + style: TextStyle( + color: Colors.white, + ), + ), backgroundColor: Colors.black, leading: IconButton( icon: Icon( @@ -298,16 +309,21 @@ class _TestFilterScreenState extends State { SizedBox( height: 25, ), - TestResultFilterSelectorBox( - deviceBlockSize: _deviceBlockSize, - dataCTRL: hospitalCTRL, - dataVals: hospitalVals, - label: 'Hospital', - ), - SizedBox( - height: 25, - ), - + userData['roles']?.contains('User') ?? false + ? Container() + : Column( + children: [ + TestResultFilterSelectorBox( + deviceBlockSize: _deviceBlockSize, + dataCTRL: hospitalCTRL, + dataVals: hospitalVals, + label: 'Hospital', + ), + SizedBox( + height: 25, + ), + ], + ), TestResultFilterDatePicker( dateCTRL: fDateCTRL, deviceBlockSize: _deviceBlockSize,