diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index f11d074..ef36d58 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -150,7 +150,7 @@
+
+
+
+
+
+

Monthly Spending by Category

+
+
+
+ +
+
+
+
+
+
+
+
+
+

Weekly Purchase No.

+
+
+
+
    +
  • + This Week + {{ (weekPurchaseList.first || 0 ) }} + ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }}) +
    +
    +
    +
    +
    +
  • +
  • + Last Week + {{ weekPurchaseList.second || 0 }} + ({{ (weekPurchaseList.second || 0 ) / weekPurchaseList.max | percent:'1.0-0' }}) +
    +
    +
    +
    +
    +
  • +
  • + Week Maximum + {{ weekPurchaseList.max || 0 }} + (100%) +
    +
    +
    +
    +
    +
  • +
  • + Weekly Average + {{ (weekPurchaseList.sum / weekPurchaseList.count) || 0 | number:'1.0-0'}} + ({{ ((weekPurchaseList.sum / weekPurchaseList.count) || 0) / weekPurchaseList.max | percent:'1.0-0' }}) +
    +
    +
    +
    +
    +
  • +
+
+
+
+
+
+
+
+
+
+

All Purchases by Category

+
+
+
+ +
+
+
+
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index cf7032e..ca370a4 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -130,6 +130,7 @@ export class DashboardComponent { public barChartDataCategory:any[]=[]; public barChartLabelsCategory:string[] = []; + public lineChartDataSector: ChartDataSets[] = [ { data: [], label: '' }, ]; diff --git a/src/app/dashboard/suppliers.component.html b/src/app/dashboard/suppliers.component.html index fcf79dd..6dcdd54 100644 --- a/src/app/dashboard/suppliers.component.html +++ b/src/app/dashboard/suppliers.component.html @@ -1,33 +1,39 @@
-
- - - - - - - - - +
+
+ List of Suppliers + This lists all suppliers, their postcode and spend. +
+
+
NamePostcodeSpend
+ + + + + + + + - - - - - - - - - - - - - - - - - -
NamePostcodeSpend
Tom's Tippity Top Toenails Ltd.LA11LY£250,000.00
Selena's Scratching Sticks Inc.WS15PQ£5.00
Big Barry and Son's Balloon Store and Clown Outfits Corp.PF43RD£22.00
-
-
+ + + Tom's Tippity Top Toenails Ltd. + LA11LY + £250,000.00 + + + Selena's Scratching Sticks Inc. + WS15PQ + £5.00 + + + Big Barry and Son's Balloon Store and Clown Outfits Corp. + PF43RD + £22.00 + + + + + + diff --git a/src/scss/bootstrap/utilities/_spacing.scss b/src/scss/bootstrap/utilities/_spacing.scss index c89816b..f428be0 100644 --- a/src/scss/bootstrap/utilities/_spacing.scss +++ b/src/scss/bootstrap/utilities/_spacing.scss @@ -26,7 +26,7 @@ // Some special margin utils .m#{$infix}-auto { margin: auto !important; } .mt#{$infix}-auto { margin-top: auto !important; } - .mr#{$infix}-auto { margin-right: auto !important; } + .mr#{$infix}-auto { margin-right: 20px !important; } .mb#{$infix}-auto { margin-bottom: auto !important; } .ml#{$infix}-auto { margin-left: auto !important; } .mx#{$infix}-auto {