Commit 0ecbee14 authored by jcorvi's avatar jcorvi
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !17
parents 231e8b6e 7c9aaf1b
Pipeline #27758 canceled with stage
in 34 seconds
......@@ -86,7 +86,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
srpcnt : srDomainFinding.srpcnt,
srsigf : srDomainFinding.srsigf,
srtrtef : srDomainFinding.srpcnt,
srtrtef : srDomainFinding.srtrtef,
srcomnt : srDomainFinding.srsigf,
export: srDomainFinding.export,
......@@ -188,7 +188,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
}else if(data.status=="rejected"){
return '<i class="fa fa-times" style="color:red" aria-hidden="true" title="Reject Evidence"> </i>';
} else {
return '<i class="fa fa-square" style="color:grey" aria-hidden="true" title="This finding will not be exported"> </i>';
return '<i class="fa fa-square" style="color:grey" aria-hidden="true" title="Waiting for curation"> </i>';
}
}},
{width: 5, hozAlign: 'center', headerSort: false,
......@@ -229,6 +229,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
formatter: function(cell, formatterParams, onRendered){
return '<i class="fa fa-eye" style="color:blue" aria-hidden="true" title="Show Evidence"> </i>';
}},
{width: 5, field: 'srDomainId'},//srDomainId to order
{title: 'Finding', field: 'srfndg', headerSort: true , headerFilter: false},//SRFNDG
//{title: 'Finding (Free Text)', field: 'srores', headerSort: true , headerFilter: false},//SRORES
{title: 'Test Name', field: 'srtstcd', headerSort: true , headerFilter: false},//SRTSTCD
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment