From 2709a7893dff5146d5a2b665cb2c0edc8874969d Mon Sep 17 00:00:00 2001
From: piratefinn <toyou1995@gmail.com>
Date: Fri, 13 Apr 2018 16:37:26 +0100
Subject: [PATCH] various fixes

---
 .../dashboard/dashboard-customer.component.ts |  5 +-
 .../dashboard/transaction-log.component.html  | 86 +++++++++----------
 src/app/layouts/full-layout.component.html    |  8 ++
 src/app/layouts/full-layout.component.ts      |  1 -
 src/app/panels/pie-panel.component.ts         |  1 -
 5 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts
index d70a901..0d17e88 100644
--- a/src/app/dashboard/dashboard-customer.component.ts
+++ b/src/app/dashboard/dashboard-customer.component.ts
@@ -6,6 +6,8 @@ import { GraphWidget } from '../widgets/graph-widget.component';
 import { CustBarSnippetComponent } from '../snippets/cust-snippet-bar.component';
 import { PiePanel } from '../panels/pie-panel.component';
 import { DataType } from '../shared/data-types.enum';
+import * as moment from 'moment';
+import 'rxjs/add/operator/map';
 
 @Component({
   templateUrl: 'dashboard-customer.component.html'
@@ -25,7 +27,7 @@ export class DashboardCustomerComponent implements OnInit {
 
   public chartType = 'doughnut';
   public chartLegend = true;
-  public doughnutChartDataCategory: number[] = [];
+  public doughnutChartDataCategory: any[] = [];
   public doughnutChartLabelsCategory: string[] = [];
 
   public doughtnutChartOptionsCategory:any = {
@@ -293,7 +295,6 @@ export class DashboardCustomerComponent implements OnInit {
     var dataset = data.datasets[tooltipItem.datasetIndex];
     var value = dataset.data[tooltipItem.index];
     return this.currencyPipe.transform(value, 'GBP', 'symbol', '1.2-2');
-    return value || '0';
   }
 
   // events
diff --git a/src/app/dashboard/transaction-log.component.html b/src/app/dashboard/transaction-log.component.html
index 424897e..9b07ec1 100644
--- a/src/app/dashboard/transaction-log.component.html
+++ b/src/app/dashboard/transaction-log.component.html
@@ -1,49 +1,6 @@
 <div class="animated fadeIn">
   <div class="row">
     <div class="col-lg-12">
-      <div class="card">
-        <div class="card-header">
-          <strong>Log of Outgoing Transactions</strong>
-          <small>This lists all purchases that have been submitted.</small>
-        </div>
-        <div *ngIf="!noTransactionList" class="card-block">
-          <table class="table table-striped table-hover">
-            <thead>
-              <tr>
-                <th>Seller</th>
-                <th>Value</th>
-                <th>Purchase Time</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr transaction-result *ngFor="let transaction of transactionList | paginate: paginateConfig" [transaction]="transaction"></tr>
-            </tbody>
-          </table>
-          <pagination-template #p="paginationApi"
-          [id]="paginateConfig.id"
-          (pageChange)="loadTransactions($event)">
-          <ul class="pagination">
-             <li class="page-item" [class.disabled]="p.isFirstPage()">
-               <a class="page-link clickable" *ngIf="!p.isFirstPage()" (click)="p.previous()">Prev</a>
-             </li>
-             <li *ngFor="let page of p.pages" class="page-item" [class.active]="p.getCurrent() === page.value">
-                <a class="page-link clickable" (click)="p.setCurrent(page.value)" *ngIf="p.getCurrent() !== page.value">
-                    <span>{{ page.label }}</span>
-                </a>
-                <div class="page-link" *ngIf="p.getCurrent() === page.value">
-                    <span>{{ page.label }}</span>
-                </div>
-            </li>
-            <li class="page-item" [class.disabled]="p.isLastPage()">
-              <a class="page-link clickable" *ngIf="!p.isLastPage()" (click)="p.next()">Next</a>
-            </li>
-          </ul>
-          </pagination-template>
-        </div>
-        <div *ngIf="noTransactionList" class="card-block">
-          No Transactions available.
-        </div>
-      </div>
       <div class="card">
         <div class="card-header">
           <strong>Recurring Transactions</strong>
@@ -140,6 +97,49 @@
           No Recurring Transactions.
         </div>
       </div>
+      <div class="card">
+        <div class="card-header">
+          <strong>Log of Outgoing Transactions</strong>
+          <small>This lists all purchases that have been submitted.</small>
+        </div>
+        <div *ngIf="!noTransactionList" class="card-block">
+          <table class="table table-striped table-hover">
+            <thead>
+              <tr>
+                <th>Seller</th>
+                <th>Value</th>
+                <th>Purchase Time</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr transaction-result *ngFor="let transaction of transactionList | paginate: paginateConfig" [transaction]="transaction"></tr>
+            </tbody>
+          </table>
+          <pagination-template #p="paginationApi"
+          [id]="paginateConfig.id"
+          (pageChange)="loadTransactions($event)">
+          <ul class="pagination">
+             <li class="page-item" [class.disabled]="p.isFirstPage()">
+               <a class="page-link clickable" *ngIf="!p.isFirstPage()" (click)="p.previous()">Prev</a>
+             </li>
+             <li *ngFor="let page of p.pages" class="page-item" [class.active]="p.getCurrent() === page.value">
+                <a class="page-link clickable" (click)="p.setCurrent(page.value)" *ngIf="p.getCurrent() !== page.value">
+                    <span>{{ page.label }}</span>
+                </a>
+                <div class="page-link" *ngIf="p.getCurrent() === page.value">
+                    <span>{{ page.label }}</span>
+                </div>
+            </li>
+            <li class="page-item" [class.disabled]="p.isLastPage()">
+              <a class="page-link clickable" *ngIf="!p.isLastPage()" (click)="p.next()">Next</a>
+            </li>
+          </ul>
+          </pagination-template>
+        </div>
+        <div *ngIf="noTransactionList" class="card-block">
+          No Transactions available.
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html
index 8e4d931..13887c7 100644
--- a/src/app/layouts/full-layout.component.html
+++ b/src/app/layouts/full-layout.component.html
@@ -97,6 +97,14 @@
             </div>
           </a>
         </li>
+        <li class="nav-item">
+          <a class="nav-link">
+            <div class="row no-gutters align-items-center">
+              <div class="col-2"><i class="icon-logout"></i></div>
+              <div class="col-10">Click to Close Menu</div>
+            </div>
+          </a>
+        </li>
       </ul>
     </nav>
   </div>
diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts
index 453a8df..ff74ceb 100644
--- a/src/app/layouts/full-layout.component.ts
+++ b/src/app/layouts/full-layout.component.ts
@@ -39,7 +39,6 @@ export class FullLayoutComponent implements OnInit {
     .logout()
     .subscribe(
       result => {
-        console.log('Logged out!');
         localStorage.clear();
         this.router.navigate(['/login']);
       }
diff --git a/src/app/panels/pie-panel.component.ts b/src/app/panels/pie-panel.component.ts
index 3b8b39c..80f64e1 100644
--- a/src/app/panels/pie-panel.component.ts
+++ b/src/app/panels/pie-panel.component.ts
@@ -3,7 +3,6 @@ import { ApiService } from '../providers/api-service';
 import { CustPiesService } from '../providers/cust-pies.service';
 import { DataType } from '../shared/data-types.enum';
 import { ChartData } from '../_interfaces/chart-data';
-import * as moment from 'moment';
 import 'rxjs/add/operator/map';
 
 @Component({