From ed4f7c71e76be90e56b4b5329e12f616bb19028e Mon Sep 17 00:00:00 2001
From: shunmugam <sundaram.blaze@gmail.com>
Date: Fri, 3 Apr 2020 10:42:16 +0530
Subject: [PATCH] Commit for add excess in explorer

---
 server/controllers/BlockchainBlock.ts         |  2 +-
 server/i18n/de.json                           |  1 +
 server/i18n/en.json                           |  1 +
 .../block-detail/block-detail.component.html  | 29 ++++++++++++-------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts
index b042e25..3f4c0ee 100644
--- a/server/controllers/BlockchainBlock.ts
+++ b/server/controllers/BlockchainBlock.ts
@@ -817,7 +817,7 @@ export class BlockchainBlockController {
       const BlockchainBlockKernalFetchQuery = await getConnection(Global.network).getRepository(
         BlockchainKernel,
       ).find({
-        select: ['Features', 'Fee', 'LockHeight'],
+        select: ['Features', 'Fee', 'LockHeight' , 'Excess'],
         where: { BlockId: BlockchainBlockFetchQuery.Hash },
       });
 
diff --git a/server/i18n/de.json b/server/i18n/de.json
index 9fde0f2..3105e45 100644
--- a/server/i18n/de.json
+++ b/server/i18n/de.json
@@ -17,6 +17,7 @@
         "TIMETAKEN": "Verbrachte Zeit (sek)",
         "COUNTDOWN": "Mainnet-Countdown",
         "EXPLORE_IT": "MEHR",
+        "EXCESS":"Überschuss",
         "blocks-by-algorithm" : "Blöcke nach Algorithmus",
         "VIEWALL": "Alle Diagramme anzeigen",
         "BLOCKCHAIN_HEIGHT": "Blockchain Höhe",
diff --git a/server/i18n/en.json b/server/i18n/en.json
index 4b90c32..6bc3773 100644
--- a/server/i18n/en.json
+++ b/server/i18n/en.json
@@ -16,6 +16,7 @@
         "HEADER_TEXT": "You are on Beta",
         "COUNTDOWN": "Mainnet Countdown",
         "TIMETAKEN": "Time Taken (sec)",
+        "EXCESS":"Excess",
         "EXPLORE_IT": "Explore",
         "blocks-by-algorithm" : "Blocks by Algorithm",
         "VIEWALL": "View All Charts",
diff --git a/src/app/view/block-view/block-detail/block-detail.component.html b/src/app/view/block-view/block-detail/block-detail.component.html
index 306461f..d9bc79d 100644
--- a/src/app/view/block-view/block-detail/block-detail.component.html
+++ b/src/app/view/block-view/block-detail/block-detail.component.html
@@ -232,10 +232,13 @@
             <div class="card-body">
                 <div class="view_moble_tble web_hdng">
                     <div class="row">
-                        <div class="col-lg-4">
+                        <div class="col-lg-2">
                          <div class="block_div"><h5 class="mb-0">{{'home.FEATURES' | translate}}</h5></div>
                         </div>
-                        <div class="col-lg-4 ">
+                        <div class="col-lg-4">
+                          <div class="block_div"><h5 class="mb-0">{{'home.EXCESS' | translate}}</h5></div>
+                         </div>
+                        <div class="col-lg-2 ">
                           <div class="block_div"><h5 class="mb-0">{{'home.BLOCK' | translate}} {{'home.HEIGHT' | translate}}</h5></div>
                         </div>
                         <div class="col-lg-4 ">
@@ -244,17 +247,21 @@
 
                       </div>
                 </div>
-                  <div class="view_moble_tble"  *ngFor="let hashkernel of hashdata.BlockchainBlockKernalFetchQuery">
+                  <div class="view_moble_tble"  *ngFor="let hashkernel  of hashdata.BlockchainBlockKernalFetchQuery">
                       <div class="row">
-                        <div class="col-12 col-sm-4 col-md-4 col-lg-4">
-                         <div class="block_div"><h6>{{'home.FEATURES' | translate}}</h6><span class="blck_value">{{ hashkernel.Features }}</span></div>
+                        <div class="col-12 col-sm-2 col-md-2 col-lg-2">
+                         <div class="block_div"><h6>{{'home.FEATURES' | translate}}</h6><span class="blck_value">{{ hashkernel .Features }}</span></div>
                         </div>
 
                         <div class="col-12 col-sm-4 col-md-4 col-lg-4">
-                          <div class="block_div"><h6>{{'home.BLOCK' | translate}} {{'home.HEIGHT' | translate}}</h6><span class="blck_value">{{ hashkernel.LockHeight }}</span></div>
+                          <div class="block_div"><h6>{{'home.EXCESS' | translate}} </h6><span class="blck_value">{{ hashkernel | json }}</span></div>
+                        </div>
+
+                        <div class="col-12 col-sm-2 col-md-2 col-lg-2">
+                          <div class="block_div"><h6>{{'home.BLOCK' | translate}} {{'home.HEIGHT' | translate}}</h6><span class="blck_value">{{ hashkernel .LockHeight }}</span></div>
                         </div>
                         <div class="col-12 col-sm-4 col-md-4 col-lg-4">
-                            <div class="block_div"><h6>{{'home.FEE' | translate}}</h6><span class="blck_value">{{ hashkernel.Fee }} Epic</span></div>
+                            <div class="block_div"><h6>{{'home.FEE' | translate}}</h6><span class="blck_value">{{ hashkernel .Fee }} Epic</span></div>
                           </div>
 
 
@@ -268,12 +275,12 @@
                       <td>Fee</td>
                       <td>Lock Height</td>
                     </tr>
-                    <tr *ngFor="let hashkernel of hashdata.BlockchainBlockKernalFetchQuery">
-                      <td>{{ hashkernel.Features }}</td>
+                    <tr *ngFor="let hashkernel  of hashdata.BlockchainBlockKernalFetchQuery">
+                      <td>{{ hashkernel .Features }}</td>
                       <td>
-                        {{ hashkernel.Fee }}
+                        {{ hashkernel .Fee }}
                       </td>
-                      <td>{{ hashkernel.LockHeight }}</td>
+                      <td>{{ hashkernel .LockHeight }}</td>
                     </tr>
                   </tbody>
                 </table>