2 files changed, 5 insertions, 4 deletions
diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html
index 8fcd44ac..52d50443 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.html
+++ b/frontend/src/app/_elements/datatable/datatable.component.html
@@ -1,11 +1,11 @@
-<div *ngIf="data">
+<div *ngIf="data && hasInput">
     <div class="table-responsive" style="height: 34rem; overflow: auto; border-radius: 5px;" class="mh-5">
         <div *ngIf="!loaded" style="background-color: #003459; width: 100%; height: 100%;"
             class="d-flex justify-content-center align-items-center">
             <app-loading></app-loading>
         </div>
         <div *ngIf="loaded">
-            <table *ngIf="hasHeader" class="table table-bordered table-light">
+            <table *ngIf="data.length > 0 && hasHeader && data[0].length > 0" class="table table-bordered table-light">
                 <thead>
                     <tr>
                         <th *ngFor="let item of data[0]; let i = index">{{item}}</th>
@@ -18,7 +18,7 @@
                 </tbody>
             </table>
 
-            <table *ngIf="data.length > 0 && !hasHeader" class="table table-bordered table-light">
+            <table *ngIf="data.length > 0 && !hasHeader && data[0].length > 0" class="table table-bordered table-light">
                 <tbody>
                     <tr *ngFor="let row of data">
                         <td *ngFor="let col of row">{{col}}</td>
@@ -28,7 +28,7 @@
         </div>
     </div>
 
-    <div id="info">
+    <div id="info" *ngIf="data.length > 0 && data[0].length > 0">
         <br>
         <span *ngIf="hasHeader">{{data.length - 1}} x {{data[0].length}}</span>
         <span *ngIf="!hasHeader">{{data.length}} x {{data[0].length}}</span>
diff --git a/frontend/src/app/_elements/datatable/datatable.component.ts b/frontend/src/app/_elements/datatable/datatable.component.ts
index 3343f6f0..19fb204e 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.ts
+++ b/frontend/src/app/_elements/datatable/datatable.component.ts
@@ -11,6 +11,7 @@ export class DatatableComponent implements OnInit {
 
   @Input() data?: any[] = [];
 
+  hasInput = false;
   loaded = false;
 
   constructor() { }