diff --git a/lib/pages/TestPages/test_result_screen.dart b/lib/pages/TestPages/test_result_screen.dart index 0836b6c..e3811f1 100755 --- a/lib/pages/TestPages/test_result_screen.dart +++ b/lib/pages/TestPages/test_result_screen.dart @@ -362,16 +362,14 @@ class TestItemBox extends StatelessWidget { SizedBox( height: 15, ), - (item!.verified == 'NotVerified' && - item!.result == 'Not Accepted') + (item!.verified == 'NotVerified') ? Text( 'Rejected', style: TextStyle( color: kPink, ), ) - : (item!.verified == 'Verified' && - item!.result == 'Accepted') + : (item!.verified == 'Verified') ? Text( 'Accepted', style: TextStyle( @@ -399,7 +397,6 @@ class TestItemBox extends StatelessWidget { children: [ (userData['roles']?.contains('User') && item!.verified == 'NotVerified' && - item!.result == 'Not Accepted' && item!.hospital .contains(userData['medical_center'])) ? InkWell( @@ -441,8 +438,7 @@ class TestItemBox extends StatelessWidget { ), ) : (userData['roles']?.contains('Supervisor') && - item!.verified == 'NotVerified' && - item!.result == 'Not Accepted') + item!.verified == 'NotVerified') ? InkWell( customBorder: CircleBorder(), onTap: () { diff --git a/lib/widgets/TestResultScreens/Details/datas_box.dart b/lib/widgets/TestResultScreens/Details/datas_box.dart index 06ec23c..3056d2f 100755 --- a/lib/widgets/TestResultScreens/Details/datas_box.dart +++ b/lib/widgets/TestResultScreens/Details/datas_box.dart @@ -42,11 +42,9 @@ class DatasBox extends StatelessWidget { color: Color.fromRGBO(230, 230, 230, 1), border: Border( left: BorderSide( - color: datas['accepted'] == 'Accepted' && - datas['verified'] == 'Verified' + color: datas['verified'] == 'Verified' ? kLightBlue - : datas['accepted'] == 'Not Accepted' && - datas['verified'] == 'NotVerified' + : datas['verified'] == 'NotVerified' ? kPink : Colors.grey, width: 2, @@ -64,11 +62,9 @@ class DatasBox extends StatelessWidget { ), ), style: TextStyle( - color: datas['accepted'] == 'Accepted' && - datas['verified'] == 'Verified' + color: datas['verified'] == 'Verified' ? kLightBlue - : datas['accepted'] == 'Not Accepted' && - datas['verified'] == 'NotVerified' + : datas['verified'] == 'NotVerified' ? kPink : Colors.grey, ), @@ -77,11 +73,9 @@ class DatasBox extends StatelessWidget { Text( datas['test_type_name'], style: TextStyle( - color: datas['accepted'] == 'Accepted' && - datas['verified'] == 'Verified' + color: datas['verified'] == 'Verified' ? kLightBlue - : datas['accepted'] == 'Not Accepted' && - datas['verified'] == 'NotVerified' + : datas['verified'] == 'NotVerified' ? kPink : Colors.grey, fontWeight: FontWeight.w700, @@ -216,20 +210,16 @@ class DatasBox extends StatelessWidget { Container( width: 45 * _deviceBlockSize, child: Text( - datas['accepted'] == 'Accepted' && - datas['verified'] == 'Verified' + datas['verified'] == 'Verified' ? 'Accepted' - : datas['accepted'] == 'Not Accepted' && - datas['verified'] == 'NotVerified' + : datas['verified'] == 'NotVerified' ? 'Rejected' : 'Pending..', style: TextStyle( fontWeight: FontWeight.w700, - color: datas['accepted'] == 'Accepted' && - datas['verified'] == 'Verified' + color: datas['verified'] == 'Verified' ? kLightBlue - : datas['accepted'] == 'Not Accepted' && - datas['verified'] == 'NotVerified' + : datas['verified'] == 'NotVerified' ? kPink : Colors.grey, ),