diff --git a/common/data.ts b/common/data.ts index 1c3c79f..e70e802 100644 --- a/common/data.ts +++ b/common/data.ts @@ -15,6 +15,8 @@ export function computeStats(blocks: IBlock[]) { const currentSignallingRatio = currentNumberOfBlocks > 0 ? currentNumberOfSignallingBlocks / currentNumberOfBlocks : 0; const currentSignallingPercentage = (currentSignallingRatio * 100).toFixed(2); + const currentSignallingRatioToAll = currentNumberOfBlocks > 0 ? currentNumberOfSignallingBlocks / 2016 : 0; + const currentSignallingPercentageToAll = (currentSignallingRatioToAll * 100).toFixed(2); let willProbablyActivate: boolean | undefined = undefined; let estimatedSignallingBlocksLeft; if (currentNumberOfBlocks >= 144) { @@ -33,8 +35,10 @@ export function computeStats(blocks: IBlock[]) { currentPeriodFailed, willProbablyActivate, estimatedSignallingBlocksLeft, - currentSignallingPercentage, currentSignallingRatio, + currentSignallingRatioToAll, + currentSignallingPercentage, + currentSignallingPercentageToAll, }; } diff --git a/frontend/components/ProgressBar.tsx b/frontend/components/ProgressBar.tsx index 896c2eb..aee5118 100644 --- a/frontend/components/ProgressBar.tsx +++ b/frontend/components/ProgressBar.tsx @@ -107,8 +107,8 @@ function ProgressBar() { currentNumberOfBlocks, blocksLeftInThisPeriod, currentNumberOfSignallingBlocks, - currentSignallingRatio, - currentSignallingPercentage, + currentSignallingRatioToAll, + currentSignallingPercentageToAll, currentNumberOfNonSignallingBlocks, } = computeStats(blocks); @@ -121,7 +121,7 @@ function ProgressBar() { // Add rounding error leftovers to blocks left percentage const leftOver = 100 - - (Number.parseFloat(currentSignallingPercentage) + + (Number.parseFloat(currentSignallingPercentageToAll) + Number.parseFloat(nonSignallingPercentage) + Number.parseFloat(blocksLeftPercentage)); if (leftOver != 0) { @@ -137,9 +137,12 @@ function ProgressBar() { return ( - {currentSignallingRatio > 0 && ( - - {currentSignallingPercentage}% + {currentSignallingRatioToAll > 0 && ( + + {currentSignallingPercentageToAll}% )} {blocksLeftRatio > 0 && ( @@ -158,8 +161,8 @@ function ProgressBar() { )} - {currentSignallingRatio > 0 && ( - + {currentSignallingRatioToAll > 0 && ( + {currentNumberOfSignallingBlocks} signalling block{currentNumberOfSignallingBlocks > 1 && <>s} )}