Final Testing 1.1

Naveen-Golla123 · Apr 23, 2024 · e1b0688 · e1b0688
1 parent b8b79e5
commit e1b0688
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 13 deletions.
diff --git a/src/assets/icons/refresh_icon.png b/src/assets/icons/refresh_icon.png
diff --git a/src/buyer/bit-list/bit-list.component.html b/src/buyer/bit-list/bit-list.component.html
@@ -22,12 +22,19 @@
     </div>
 
     <div class="p-10" id="gridSection">
+        <div class="w-full ">
+            <div class="float-right bg-white p-4 rounded-md my-3 cursor-pointer" (click)="reloadData()"><img src="../../assets/icons/refresh_icon.png" width="20px" class="mx-2 inline white" /> Reload
+            </div>
+        </div>
         <div>
             <table mat-table [dataSource]="dataSource">
 
                 <ng-container matColumnDef="name">
                     <th mat-header-cell *matHeaderCellDef> Name </th>
-                    <td mat-cell *matCellDef="let element"> <span class="text-black cursor-pointer hover:underline hover:font-medium" (click)="eventClicked(element)" [routerLink]="['../createauction']" [queryParams]="{ eventId: element.id }" skipLocationChange>{{element.name}}</span></td>
+                    <td mat-cell *matCellDef="let element"> <span
+                            class="text-black cursor-pointer hover:underline hover:font-medium"
+                            (click)="eventClicked(element)" [routerLink]="['../createauction']"
+                            [queryParams]="{ eventId: element.id }" skipLocationChange>{{element.name}}</span></td>
                 </ng-container>
 
                 <ng-container matColumnDef="displayStatusCode">
@@ -37,8 +44,9 @@
 
                 <ng-container matColumnDef="action">
                     <th mat-header-cell *matHeaderCellDef> </th>
-                    <td mat-cell *matCellDef="let element"><mat-icon (click)="navClicked(element)" class="cursor-pointer" aria-hidden="false"
-                            aria-label="edit" fontIcon="open_in_new"></mat-icon></td>
+                    <td mat-cell *matCellDef="let element"><mat-icon (click)="navClicked(element)"
+                            class="cursor-pointer" aria-hidden="false" aria-label="edit"
+                            fontIcon="open_in_new"></mat-icon></td>
                 </ng-container>
 
                 <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>

diff --git 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,15 +59,18 @@ export class BitListComponent implements OnInit {
       }
       this.dataSource.data = this.auctions;
       this.spinnerService.hide();
-    })
-
+    });
   }
 
   eventClicked(auction: Auction) {
     //window.open(`${window.location.origin}/auction/${auction.id}`, "_blank")
     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
@@ -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
@@ -14,7 +14,7 @@
                     <div class="flex-col p-2 border-[1px] border-slate-200 flex pr-10">
                         <span class="text-xs">Status</span>
                         <span
-                            class="text-lg bg-green-700 text-white font-medium px-2 rounded-lg">{{auctionHeaderInfo.displayStatus}}</span>
+                            class="text-lg {{auctionHeaderInfo.statusCode == 5 ? 'bg-slate-600' : 'bg-green-700'}} text-white font-medium px-2 rounded-lg">{{auctionHeaderInfo.displayStatus}}</span>
                     </div>
                     <div class="flex flex-col p-2 border-[1px] border-slate-200 flex-grow">
                         <span class="text-xs">Remaining Time</span>

diff --git a/src/supplier/supplier-auctions/supplier-auction.component.html b/src/supplier/supplier-auctions/supplier-auction.component.html
@@ -19,6 +19,10 @@
 
     <div class="p-10" id="gridSection">
         <div>
+            <div class="w-full ">
+                <div class="float-right bg-white p-4 rounded-md my-3 cursor-pointer" (click)="reloadData()"><img src="../../assets/icons/refresh_icon.png" width="20px" class="mx-2 inline white" /> Reload
+                </div>
+            </div>
             <table mat-table [dataSource]="dataSource">
 
                 <ng-container matColumnDef="name">

diff --git 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
@@ -33,7 +33,7 @@
         </div>
         <div class="flex-col p-2 border-[1px] border-slate-200 flex pr-10">
             <span class="text-xs">Status</span>
-            <span class="text-lg bg-green-700 text-white font-medium px-2 rounded-lg">{{config.displayStatus}}</span>
+            <span class="text-lg {{config.statusCode == 5 ? 'bg-slate-600' : 'bg-green-700'}} text-white font-medium px-2 rounded-lg">{{config.displayStatus}}</span>
         </div>
         <div class="flex flex-col p-2 border-[1px] border-slate-200 flex-grow">
             <span class="text-xs">Best Bid</span>

diff --git 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
@@ -28,7 +28,7 @@
 
                 <div class="flex justify-end bg-white rounded-sm p-5">
                     <button class="bg-white text-primary p-2 rounded-lg w-[200px] shadow-md hover:shadow-2xl mr-5">{{'Back to Auctions'}}</button> 
-                    <button class="bg-primary text-white p-2 rounded-lg w-[200px] shadow-md hover:shadow-2xl mr-5" (click)="placeBid()">{{'Place Bid'}}</button>
+                    <button class="{{auctionHeaderInfo.statusCode == 5 ? 'bg-slate-400 text-black pointer-events-none' : 'bg-primary text-white cursor-pointer'}}  p-2 rounded-lg w-[200px] shadow-md hover:shadow-2xl mr-5" (click)="placeBid()">{{'Place Bid'}}</button>
                 </div>
             </div>
         </div>