Commit 7c9aaf1b authored by jcorvi's avatar jcorvi
Browse files

Merge branch 'draft_version' into 'develop'

order columns

See merge request !16
parents b0c4d3f4 565309b1
Pipeline #25981 passed with stage
in 1 minute and 2 seconds
...@@ -86,7 +86,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit { ...@@ -86,7 +86,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
srpcnt : srDomainFinding.srpcnt, srpcnt : srDomainFinding.srpcnt,
srsigf : srDomainFinding.srsigf, srsigf : srDomainFinding.srsigf,
srtrtef : srDomainFinding.srpcnt, srtrtef : srDomainFinding.srtrtef,
srcomnt : srDomainFinding.srsigf, srcomnt : srDomainFinding.srsigf,
export: srDomainFinding.export, export: srDomainFinding.export,
...@@ -188,7 +188,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit { ...@@ -188,7 +188,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
}else if(data.status=="rejected"){ }else if(data.status=="rejected"){
return '<i class="fa fa-times" style="color:red" aria-hidden="true" title="Reject Evidence"> </i>'; return '<i class="fa fa-times" style="color:red" aria-hidden="true" title="Reject Evidence"> </i>';
} else { } 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, {width: 5, hozAlign: 'center', headerSort: false,
...@@ -229,6 +229,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit { ...@@ -229,6 +229,7 @@ export class SrdomaintemplateTabulatorComponent implements OnInit {
formatter: function(cell, formatterParams, onRendered){ formatter: function(cell, formatterParams, onRendered){
return '<i class="fa fa-eye" style="color:blue" aria-hidden="true" title="Show Evidence"> </i>'; 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', field: 'srfndg', headerSort: true , headerFilter: false},//SRFNDG
//{title: 'Finding (Free Text)', field: 'srores', headerSort: true , headerFilter: false},//SRORES //{title: 'Finding (Free Text)', field: 'srores', headerSort: true , headerFilter: false},//SRORES
{title: 'Test Name', field: 'srtstcd', headerSort: true , headerFilter: false},//SRTSTCD {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