Merge branch 'draft_version' into 'develop'

order columns

See merge request !16

src/app/srdomaintemplate-tabulator/srdomaintemplate-tabulator.component.ts

@@ -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