From 11b61166c4480940718e63d581d1e8f24301f0a8 Mon Sep 17 00:00:00 2001 From: Patrick Sun Date: Tue, 3 Nov 2020 06:13:17 +1100 Subject: [PATCH] dialog order matters when popup --- src/app/dashboard/dashboard.component.html | 81 +++++++------------ src/app/dashboard/dashboard.component.ts | 4 +- src/app/dashboard/dist/dashboard.component.js | 4 +- src/index.html | 77 +++++++++--------- 4 files changed, 74 insertions(+), 92 deletions(-) diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html index 274757e..a62e5b4 100644 --- a/src/app/dashboard/dashboard.component.html +++ b/src/app/dashboard/dashboard.component.html @@ -2,7 +2,35 @@ -
+ + +
+ + + + + + + + + + + + + + + + + + + + + + +
@@ -65,53 +93,4 @@

Additional info

-
- -
-
-
-

ColorGradient

- -
-
-

ColorPalette

- -
-
-

ColorPicker

- -
-
-

MaskedTextBox

- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - +
\ No newline at end of file diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts index 047aaee..e894b20 100644 --- a/src/app/dashboard/dashboard.component.ts +++ b/src/app/dashboard/dashboard.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'; export const sampleProducts = [ { "ProductID": 1, - "ProductName": "Chai", + "ProductName": "Chai11", "SupplierID": 1, "CategoryID": 1, "QuantityPerUnit": "10 boxes x 20 bags", @@ -1424,7 +1424,7 @@ export const products = [{ styleUrls: ['./dashboard.component.scss'] }) export class DashboardComponent implements OnInit { - public gridData: any[] = products; + public gridData: any[] = sampleProducts; public dialogOpened = false; public windowOpened = false; diff --git a/src/app/dashboard/dist/dashboard.component.js b/src/app/dashboard/dist/dashboard.component.js index 367a977..5ffe5fa 100644 --- a/src/app/dashboard/dist/dashboard.component.js +++ b/src/app/dashboard/dist/dashboard.component.js @@ -11,7 +11,7 @@ var core_1 = require("@angular/core"); exports.sampleProducts = [ { "ProductID": 1, - "ProductName": "Chai", + "ProductName": "Chai11", "SupplierID": 1, "CategoryID": 1, "QuantityPerUnit": "10 boxes x 20 bags", @@ -1425,7 +1425,7 @@ exports.products = [{ }]; var DashboardComponent = /** @class */ (function () { function DashboardComponent() { - this.gridData = exports.products; + this.gridData = exports.sampleProducts; this.dialogOpened = false; this.windowOpened = false; } diff --git a/src/index.html b/src/index.html index cd2da5a..7228ee5 100644 --- a/src/index.html +++ b/src/index.html @@ -1,5 +1,6 @@ + SFM Advanced Broker Platform @@ -7,48 +8,50 @@ + - + - + + \ No newline at end of file