From bc3e61ce5a446df65ca3d40f68d3cc17d5c56c54 Mon Sep 17 00:00:00 2001 From: Max Adulyanukosol Date: Wed, 27 Mar 2019 15:15:49 +0700 Subject: [PATCH] Fix party list map tooltip on historical data --- src/components/ElectionMapTooltip.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/ElectionMapTooltip.js b/src/components/ElectionMapTooltip.js index cd7c903..1474303 100644 --- a/src/components/ElectionMapTooltip.js +++ b/src/components/ElectionMapTooltip.js @@ -76,9 +76,11 @@ export default function ElectionMapTooltip({ positionId, positions }) { markColor = partyColor(getPartyById(candidate.partyId)) } } - } else if (seat) { - const partyStats = nationwidePartyStatsFromSummaryJSON(data) - partyStat = _.find(partyStats, { party: { id: party.id } }) + } else if (seat && completed) { + if (!!party) { + const partyStats = nationwidePartyStatsFromSummaryJSON(data) + partyStat = _.find(partyStats, { party: { id: party.id } }) + } markColor = party ? party.color : "#ccc" } @@ -113,8 +115,14 @@ export default function ElectionMapTooltip({ positionId, positions }) {
ส.ส. บัญชีรายชื่อ
-
{party ? `พรรค${party.name}` : null}
-
{partyStat.partyListSeats} ที่นั่ง
+ {party && completed ? ( +
+
{party ? `พรรค${party.name}` : null}
+
{partyStat.partyListSeats} ที่นั่ง
+
+ ) : ( +
อันดับที่ {seat.no}
+ )} )}