diff --git a/src/assets/icons/refresh_icon.png b/src/assets/icons/refresh_icon.png index 59323d0..f2934fd 100644 Binary files a/src/assets/icons/refresh_icon.png and b/src/assets/icons/refresh_icon.png differ diff --git a/src/buyer/bit-list/bit-list.component.html b/src/buyer/bit-list/bit-list.component.html index 7e03de5..1df8722 100644 --- a/src/buyer/bit-list/bit-list.component.html +++ b/src/buyer/bit-list/bit-list.component.html @@ -22,12 +22,19 @@
+
+
Reload +
+
- + @@ -37,8 +44,9 @@ - + diff --git a/src/buyer/bit-list/bit-list.component.ts b/src/buyer/bit-list/bit-list.component.ts index 81a48c7..2f4a935 100644 --- a/src/buyer/bit-list/bit-list.component.ts +++ b/src/buyer/bit-list/bit-list.component.ts @@ -33,10 +33,15 @@ export class BitListComponent implements OnInit { } ngOnInit(): void { + + this.getData(); + } + + getData(){ this.spinnerService.show(); this.eventService.getAllEvents().subscribe((events: any) => { - if (events && events.length > 0) { + this.auctions = []; events.forEach((event: any) => { var event_: Auction = { name: event.name, @@ -54,8 +59,7 @@ export class BitListComponent implements OnInit { } this.dataSource.data = this.auctions; this.spinnerService.hide(); - }) - + }); } eventClicked(auction: Auction) { @@ -63,6 +67,10 @@ export class BitListComponent implements OnInit { console.log(auction) } + reloadData() { + this.getData(); + } + navClicked(auction: Auction) { window.open(`${window.location.origin}/auction/${auction.id}`, "_blank") console.log(auction) diff --git a/src/buyer/buyer-live/auction-chart/auction-chart.component.ts b/src/buyer/buyer-live/auction-chart/auction-chart.component.ts index 21f312c..3338d84 100644 --- a/src/buyer/buyer-live/auction-chart/auction-chart.component.ts +++ b/src/buyer/buyer-live/auction-chart/auction-chart.component.ts @@ -9,7 +9,7 @@ import { last } from 'lodash'; }) export class AuctionChartComponent implements OnInit { @Input("config") config:any; - chart: any = [] + chart: Chart | undefined = undefined; constructor() { } diff --git a/src/buyer/buyer-live/buyer-live.component.html b/src/buyer/buyer-live/buyer-live.component.html index 6ea8a3e..80f3189 100644 --- a/src/buyer/buyer-live/buyer-live.component.html +++ b/src/buyer/buyer-live/buyer-live.component.html @@ -14,7 +14,7 @@
Status {{auctionHeaderInfo.displayStatus}} + class="text-lg {{auctionHeaderInfo.statusCode == 5 ? 'bg-slate-600' : 'bg-green-700'}} text-white font-medium px-2 rounded-lg">{{auctionHeaderInfo.displayStatus}}
Remaining Time diff --git a/src/supplier/supplier-auctions/supplier-auction.component.html b/src/supplier/supplier-auctions/supplier-auction.component.html index 8f88317..03ae413 100644 --- a/src/supplier/supplier-auctions/supplier-auction.component.html +++ b/src/supplier/supplier-auctions/supplier-auction.component.html @@ -19,6 +19,10 @@
+
+
Reload +
+
Name {{element.name}} {{element.name}}
diff --git a/src/supplier/supplier-auctions/supplier-auction.component.ts b/src/supplier/supplier-auctions/supplier-auction.component.ts index ea5b3ed..babe3d6 100644 --- a/src/supplier/supplier-auctions/supplier-auction.component.ts +++ b/src/supplier/supplier-auctions/supplier-auction.component.ts @@ -38,10 +38,15 @@ export class SupplierAuctionComponent { } ngOnInit(): void { + + this.getData(); + } + + getData() { this.spinnerService.show(); this.supplierService.getInvitedEvents().subscribe((events: any) => { - if (events && events.length > 0) { + this.auctions = []; events.forEach((event: any) => { var event_: SupplierAuction = { name: event.name, @@ -61,7 +66,6 @@ export class SupplierAuctionComponent { this.masterAuctions = this.auctions; this.spinnerService.hide(); }) - } accepted(auction: any) { @@ -95,4 +99,8 @@ export class SupplierAuctionComponent { var targetUrl = window.location.origin + `/auction/${auction.id}` window.open(targetUrl, "_blank"); } + + reloadData() { + this.getData(); + } } diff --git a/src/supplier/supplier-live/bid-header/bid-header.component.html b/src/supplier/supplier-live/bid-header/bid-header.component.html index 74445bf..cb3b635 100644 --- a/src/supplier/supplier-live/bid-header/bid-header.component.html +++ b/src/supplier/supplier-live/bid-header/bid-header.component.html @@ -33,7 +33,7 @@
Status - {{config.displayStatus}} + {{config.displayStatus}}
Best Bid diff --git a/src/supplier/supplier-live/bid-header/bid-header.component.ts b/src/supplier/supplier-live/bid-header/bid-header.component.ts index 3d94e99..46c4428 100644 --- a/src/supplier/supplier-live/bid-header/bid-header.component.ts +++ b/src/supplier/supplier-live/bid-header/bid-header.component.ts @@ -81,7 +81,7 @@ export class BidHeaderComponent implements OnInit { this.enableChatNotification = true; message["isSent"] = false; this.activeMessagePanel.chats.push(message); - this.toastr.show(message.text, message.sentBy + " sent a message"); + this.toastr.show(message.text, "ProcureHub Admin sent a message"); } }); } diff --git a/src/supplier/supplier-live/supplier-live.component.html b/src/supplier/supplier-live/supplier-live.component.html index 949d794..b04960d 100644 --- a/src/supplier/supplier-live/supplier-live.component.html +++ b/src/supplier/supplier-live/supplier-live.component.html @@ -28,7 +28,7 @@
- +