cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-13 20:38:55 +03:30
Code Issues Packages Projects Releases Wiki Activity

Fix test results status

Browse Source
This commit is contained in:
fhkhd
2024-01-30 14:25:10 +03:30
parent 9dd9a908ed
commit dc944d9ce2
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/TestPages/test_result_screen.dart
+3 -7
View File
@@ -362,16 +362,14 @@ class TestItemBox extends StatelessWidget {
SizedBox( SizedBox(
height: 15, height: 15,
), ),
(item!.verified == 'NotVerified' && (item!.verified == 'NotVerified')
item!.result == 'Not Accepted')
? Text( ? Text(
'Rejected', 'Rejected',
style: TextStyle( style: TextStyle(
color: kPink, color: kPink,
), ),
) )
: (item!.verified == 'Verified' && : (item!.verified == 'Verified')
item!.result == 'Accepted')
? Text( ? Text(
'Accepted', 'Accepted',
style: TextStyle( style: TextStyle(
@@ -399,7 +397,6 @@ class TestItemBox extends StatelessWidget {
children: <Widget>[ children: <Widget>[
(userData['roles']?.contains('User') && (userData['roles']?.contains('User') &&
item!.verified == 'NotVerified' && item!.verified == 'NotVerified' &&
item!.result == 'Not Accepted' &&
item!.hospital item!.hospital
.contains(userData['medical_center'])) .contains(userData['medical_center']))
? InkWell( ? InkWell(
@@ -441,8 +438,7 @@ class TestItemBox extends StatelessWidget {
), ),
) )
: (userData['roles']?.contains('Supervisor') && : (userData['roles']?.contains('Supervisor') &&
item!.verified == 'NotVerified' && item!.verified == 'NotVerified')
item!.result == 'Not Accepted')
? InkWell( ? InkWell(
customBorder: CircleBorder(), customBorder: CircleBorder(),
onTap: () { onTap: () {
lib/widgets/TestResultScreens/Details/datas_box.dart
+9 -19
View File
@@ -42,11 +42,9 @@ class DatasBox extends StatelessWidget {
color: Color.fromRGBO(230, 230, 230, 1), color: Color.fromRGBO(230, 230, 230, 1),
border: Border( border: Border(
left: BorderSide( left: BorderSide(
color: datas['accepted'] == 'Accepted' && color: datas['verified'] == 'Verified'
datas['verified'] == 'Verified'
? kLightBlue ? kLightBlue
: datas['accepted'] == 'Not Accepted' && : datas['verified'] == 'NotVerified'
datas['verified'] == 'NotVerified'
? kPink ? kPink
: Colors.grey, : Colors.grey,
width: 2, width: 2,
@@ -64,11 +62,9 @@ class DatasBox extends StatelessWidget {
), ),
), ),
style: TextStyle( style: TextStyle(
color: datas['accepted'] == 'Accepted' && color: datas['verified'] == 'Verified'
datas['verified'] == 'Verified'
? kLightBlue ? kLightBlue
: datas['accepted'] == 'Not Accepted' && : datas['verified'] == 'NotVerified'
datas['verified'] == 'NotVerified'
? kPink ? kPink
: Colors.grey, : Colors.grey,
), ),
@@ -77,11 +73,9 @@ class DatasBox extends StatelessWidget {
Text( Text(
datas['test_type_name'], datas['test_type_name'],
style: TextStyle( style: TextStyle(
color: datas['accepted'] == 'Accepted' && color: datas['verified'] == 'Verified'
datas['verified'] == 'Verified'
? kLightBlue ? kLightBlue
: datas['accepted'] == 'Not Accepted' && : datas['verified'] == 'NotVerified'
datas['verified'] == 'NotVerified'
? kPink ? kPink
: Colors.grey, : Colors.grey,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@@ -216,20 +210,16 @@ class DatasBox extends StatelessWidget {
Container( Container(
width: 45 * _deviceBlockSize, width: 45 * _deviceBlockSize,
child: Text( child: Text(
datas['accepted'] == 'Accepted' &&
datas['verified'] == 'Verified' datas['verified'] == 'Verified'
? 'Accepted' ? 'Accepted'
: datas['accepted'] == 'Not Accepted' && : datas['verified'] == 'NotVerified'
datas['verified'] == 'NotVerified'
? 'Rejected' ? 'Rejected'
: 'Pending..', : 'Pending..',
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
color: datas['accepted'] == 'Accepted' && color: datas['verified'] == 'Verified'
datas['verified'] == 'Verified'
? kLightBlue ? kLightBlue
: datas['accepted'] == 'Not Accepted' && : datas['verified'] == 'NotVerified'
datas['verified'] == 'NotVerified'
? kPink ? kPink
: Colors.grey, : Colors.grey,
), ),