add field remark and tindak lanjut

src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.html

@@ -11,7 +11,11 @@
     <p style="font-size:18px;" class="text-muted"><i class="fas fa-spinner fa-spin"></i> Retrieving data</p>
   </div>
   <div class="col-12 col-sm-12 Table-Background" *ngIf="isTicketReportLoading == false && isTicketReportEmpty == false">
-    <span class="downloadExportReport" *ngIf="(ModelReportCategory.Count != 0) && (RoleID == _SP.PARAM_SPV || RoleID == _SP.PARAM_SERVICEDESK || TeamID == Env.Team.ServiceReport)" (click)="ReportExportToExcel()">Download Excel <i class="fas fa-download"></i></span>
+    <span class="downloadExportReport" *ngIf="(ModelReportCategory.Count != 0) 
+    && (isExcelTeam == true)" (click)="ReportExportToExcel()">
+    Download Excel 
+    <i class="fas fa-download"></i>
+    </span>
     <div class="table-responsive mt-4">
       <table class="table table-bordered table-striped table-sm">
         <thead>
@@ -143,8 +147,11 @@
               <td>{{data.customer_mobile_phone2}}</td>
               <td>{{data.customer_email}}</td>
               <td>{{data.penyebab_pengaduan }}</td>
+              <td>{{data.ticket_servicefamiliy_name}}</td>
               <td>{{data.ticket_service_name}}</td>
               <td>{{data.ticket_servicesubcategory_name}}</td>
+              <td>{{data.remark}}</td>
+              <td>{{data.tidak_lanjut}}</td>
               <td>{{data.ticket_description}}</td>
               <td>{{data.ticket_status}}
                 <div *ngIf="data.team_name == null">

src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.ts

@@ -53,8 +53,11 @@ export class AdminDashboardReportComponent implements OnInit {
     {name: 'customer_mobile_phone2', value: false, field: "Mobile Phone 2"},
     {name: 'customer_email', value: false, field: "Email"},
     {name: 'penyebab_pengaduan', value: false, field: "Penyebab Pengaduan"},
-    {name: 'ticket_service_name', value: false, field: "Topic"},
-    {name: 'ticket_servicesubcategory_name', value: false, field: "Sub Topic"},
+    {name: 'ticket_servicefamiliy_name', value: false, field: "Topic"},
+    {name: 'ticket_service_name', value: false, field: "Sub Topic"},
+    {name: 'ticket_servicesubcategory_name', value: false, field: "Category"},
+    {name: 'remark', value: false, field: "Private Log"},
+    {name: 'tidak_lanjut', value: false, field: "Public Log"},
     {name: 'ticket_description', value: false, field: "Description"},
     {name: 'ticket_status', value: false, field: "Status"},
     {name: 'ticket_resolved_date', value: false, field: "Resolved Date"},
@@ -86,6 +89,8 @@ export class AdminDashboardReportComponent implements OnInit {
     field_export: null
   }
 
+  isExcelTeam: boolean = false;
+
   constructor(injector: Injector,
     private _cRef: ChangeDetectorRef,
     private router: Router,
@@ -96,6 +101,13 @@ export class AdminDashboardReportComponent implements OnInit {
 
 
   ngOnInit() {
+    if (this.RoleID == this._SP.PARAM_SERVICEDESK ||
+      this.TeamID == this.Env.Team.EChanelSupportCardOpr
+      ) {
+        this.isExcelTeam = true;
+      } else {
+        this.isExcelTeam = false
+      }
   }
 
   ngOnInitAfter(_RequestList, _Model){