From 17bde715785700e80d99abf2976b43239c513b83 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Guhur <pierre-louis.guhur@laposte.net>
Date: Thu, 19 Jan 2023 11:21:22 +0100
Subject: [PATCH] fix: result dsiplay

---
 components/MeritProfile.tsx        |  1 +
 pages/results/[pid]/[[...tid]].tsx | 14 +++++++++-----
 services/majorityJudgment.ts       |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/components/MeritProfile.tsx b/components/MeritProfile.tsx
index b977988..0ca4e00 100644
--- a/components/MeritProfile.tsx
+++ b/components/MeritProfile.tsx
@@ -224,6 +224,7 @@ const MeritProfileBar = ({profile, grades}: MeritProfileBarInterface) => {
           >
             {values
               .filter((v) => v < majorityGrade.value)
+              .reverse()
               .map((v) => {
                 const index = values.indexOf(v);
                 const size =
diff --git a/pages/results/[pid]/[[...tid]].tsx b/pages/results/[pid]/[[...tid]].tsx
index 8fa22ef..8a8d44b 100644
--- a/pages/results/[pid]/[[...tid]].tsx
+++ b/pages/results/[pid]/[[...tid]].tsx
@@ -165,7 +165,7 @@ const ResultBanner = ({result}) => {
       {
         // DESKTOP
       }
-      <div className="w-100 bg-white p-5 d-md-flex d-none justify-content-between align-items-center">
+      <div className="w-100 bg-white gap-4 p-5 d-md-flex d-none justify-content-between align-items-center">
         <div className="text-muted">
           <div className="d-flex align-items-center">
             <Image alt="Calendar" src={calendar} className="me-2" />
@@ -440,7 +440,7 @@ const Podium = ({candidates}: PodiumInterface) => {
 
   if (numBest === 2) {
     return (
-      <div className="d-md-flex my-5 justify-content-center d-none">
+      <div className="d-md-flex my-5  text-center justify-content-center d-none">
         <CandidateRanked candidate={candidateByRank[1]} />
         <CandidateRanked candidate={candidateByRank[2]} />
       </div>
@@ -448,7 +448,7 @@ const Podium = ({candidates}: PodiumInterface) => {
   }
 
   return (
-    <div className="d-md-flex my-5 d-none justify-content-center">
+    <div className="d-md-flex my-5 d-none  text-center justify-content-center">
       <CandidateRanked candidate={candidateByRank[2]} />
       <CandidateRanked candidate={candidateByRank[1]} />
       <CandidateRanked candidate={candidateByRank[3]} />
@@ -544,11 +544,15 @@ const ResultPage = ({
       <TitleBanner electionRef={result.ref} token={token} name={result.name} />
       <ResultBanner result={result} />
 
-      <Podium candidates={result.candidates} />
+      <Container
+        style={{maxWidth: '1000px'}}
+      >
+        <Podium candidates={result.candidates} />
+      </Container>
 
       <Container
         style={{maxWidth: '750px'}}
-        className="mt-5 h-100 d-flex flex-fill flex-column justify-content-between"
+        className="my-5 h-100 d-flex flex-fill flex-column justify-content-between"
       >
         <div>
           <h5 className="text-white">{t('result.details')}</h5>
diff --git a/services/majorityJudgment.ts b/services/majorityJudgment.ts
index f892402..f659140 100644
--- a/services/majorityJudgment.ts
+++ b/services/majorityJudgment.ts
@@ -22,7 +22,7 @@ export const getMajorityGrade = (profile: MeritProfileInterface): number => {
     if (accBefore + profile[grade] > numVotes / 2 - 1e-5) {
       return grade;
     }
-    accBefore -= profile[grade];
+    accBefore += profile[grade];
   }
 
   return grades[grades.length - 1];