From 0f23942ea36a94113a113d4b8e1c341ccb653e67 Mon Sep 17 00:00:00 2001
From: Fabrice Lamant <flamant@shutterstock.com>
Date: Wed, 7 Aug 2024 08:05:21 +0200
Subject: [PATCH] consitent medals sorting

---
 docs/ja/medals.html | 42 ++++++++++++++++++------------------
 docs/ko/medals.html | 50 +++++++++++++++++++++----------------------
 docs/medals.html    | 42 ++++++++++++++++++------------------
 docs/ru/medals.html | 52 ++++++++++++++++++++++-----------------------
 docs/zh/medals.html | 42 ++++++++++++++++++------------------
 src/calendar.ts     | 14 +++++++++++-
 6 files changed, 127 insertions(+), 115 deletions(-)

diff --git a/docs/ja/medals.html b/docs/ja/medals.html
index 0f3ac8a2b..7f422dc09 100644
--- a/docs/ja/medals.html
+++ b/docs/ja/medals.html
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div role="alert" class="alert my-4">
+    <div role="alert" class="alert my-4 hidden">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
@@ -345,13 +345,13 @@
       <td>競泳 - 女子200mバタフライ決勝</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Sunisa LEE</td>
+      <td class="gold">&#9679;</td>
+      <td>Simone BILES</td>
       <td>体操競技 - 女子個人総合決勝</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Simone BILES</td>
+      <td class="bronze">&#9679;</td>
+      <td>Sunisa LEE</td>
       <td>体操競技 - 女子個人総合決勝</td>
     </tr>
     <tr>
@@ -454,13 +454,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Lauren SCRUGGS</td>
+      <td class="gold">&#9679;</td>
+      <td>Lee KIEFER</td>
       <td>フェンシング - 女子フルーレ個人決勝</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Lee KIEFER</td>
+      <td class="silver">&#9679;</td>
+      <td>Lauren SCRUGGS</td>
       <td>フェンシング - 女子フルーレ個人決勝</td>
     </tr>
     <tr>
@@ -663,13 +663,13 @@
       <td>テニス - 女子シングルス決勝戦</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>SUN Yingsha</td>
+      <td class="gold">&#9679;</td>
+      <td>CHEN Meng</td>
       <td>卓球 - 女子シングルス決勝戦</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>CHEN Meng</td>
+      <td class="silver">&#9679;</td>
+      <td>SUN Yingsha</td>
       <td>卓球 - 女子シングルス決勝戦</td>
     </tr>
     <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
@@ -741,13 +741,13 @@
       <td>競泳 - 男子100m自由形決勝</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>XIAO Ruoteng</td>
+      <td class="silver">&#9679;</td>
+      <td>ZHANG Boheng</td>
       <td>体操競技 - 男子個人総合決勝</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>ZHANG Boheng</td>
+      <td class="bronze">&#9679;</td>
+      <td>XIAO Ruoteng</td>
       <td>体操競技 - 男子個人総合決勝</td>
     </tr>
     <tr>
@@ -1218,13 +1218,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sara BALZER</td>
+      <td class="gold">&#9679;</td>
+      <td>Manon APITHY-BRUNET</td>
       <td>フェンシング - 女子サーブル個人決勝</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manon APITHY-BRUNET</td>
+      <td class="silver">&#9679;</td>
+      <td>Sara BALZER</td>
       <td>フェンシング - 女子サーブル個人決勝</td>
     </tr>
     <tr>
diff --git a/docs/ko/medals.html b/docs/ko/medals.html
index 8485feea9..f6250e0ee 100644
--- a/docs/ko/medals.html
+++ b/docs/ko/medals.html
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div role="alert" class="alert my-4">
+    <div role="alert" class="alert my-4 hidden">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
@@ -345,13 +345,13 @@
       <td>경영 - 여자 200m 접영 결승</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Sunisa LEE</td>
+      <td class="gold">&#9679;</td>
+      <td>Simone BILES</td>
       <td>기계체조 - 여자 종합 결승</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Simone BILES</td>
+      <td class="bronze">&#9679;</td>
+      <td>Sunisa LEE</td>
       <td>기계체조 - 여자 종합 결승</td>
     </tr>
     <tr>
@@ -454,13 +454,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Lauren SCRUGGS</td>
+      <td class="gold">&#9679;</td>
+      <td>Lee KIEFER</td>
       <td>펜싱 - 여자 플뢰레 개인 금메달 결정전</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Lee KIEFER</td>
+      <td class="silver">&#9679;</td>
+      <td>Lauren SCRUGGS</td>
       <td>펜싱 - 여자 플뢰레 개인 금메달 결정전</td>
     </tr>
     <tr>
@@ -663,13 +663,13 @@
       <td>테니스 - 여자 단식 금메달 결정전</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>SUN Yingsha</td>
+      <td class="gold">&#9679;</td>
+      <td>CHEN Meng</td>
       <td>탁구 - 여자 단식 금메달 결정전</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>CHEN Meng</td>
+      <td class="silver">&#9679;</td>
+      <td>SUN Yingsha</td>
       <td>탁구 - 여자 단식 금메달 결정전</td>
     </tr>
     <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
@@ -741,13 +741,13 @@
       <td>경영 - 남자 100m 자유형 결승</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>XIAO Ruoteng</td>
+      <td class="silver">&#9679;</td>
+      <td>ZHANG Boheng</td>
       <td>기계체조 - 남자 종합 결승</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>ZHANG Boheng</td>
+      <td class="bronze">&#9679;</td>
+      <td>XIAO Ruoteng</td>
       <td>기계체조 - 남자 종합 결승</td>
     </tr>
     <tr>
@@ -1218,13 +1218,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sara BALZER</td>
+      <td class="gold">&#9679;</td>
+      <td>Manon APITHY-BRUNET</td>
       <td>펜싱 - 여자 사브르 개인 금메달 결정전</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manon APITHY-BRUNET</td>
+      <td class="silver">&#9679;</td>
+      <td>Sara BALZER</td>
       <td>펜싱 - 여자 사브르 개인 금메달 결정전</td>
     </tr>
     <tr>
@@ -1472,13 +1472,13 @@
     </tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>영국</td>
-      <td>조정 - 여자 쿼드러플스컬 결승 A</td>
+      <td>Alex YEE</td>
+      <td>트라이애슬론 - 남자 개인</td>
     </tr>
     <tr>
       <td class="gold">&#9679;</td>
-      <td>Alex YEE</td>
-      <td>트라이애슬론 - 남자 개인</td>
+      <td>영국</td>
+      <td>조정 - 여자 쿼드러플스컬 결승 A</td>
     </tr>
     <tr>
       <td class="bronze">&#9679;</td>
diff --git a/docs/medals.html b/docs/medals.html
index be5be58e4..5e25ba1ff 100644
--- a/docs/medals.html
+++ b/docs/medals.html
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div role="alert" class="alert my-4">
+    <div role="alert" class="alert my-4 hidden">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
@@ -345,13 +345,13 @@
       <td>Swimming - Women's 200m Butterfly Final</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Sunisa LEE</td>
+      <td class="gold">&#9679;</td>
+      <td>Simone BILES</td>
       <td>Artistic Gymnastics - Women's All-Around Final</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Simone BILES</td>
+      <td class="bronze">&#9679;</td>
+      <td>Sunisa LEE</td>
       <td>Artistic Gymnastics - Women's All-Around Final</td>
     </tr>
     <tr>
@@ -454,13 +454,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Lauren SCRUGGS</td>
+      <td class="gold">&#9679;</td>
+      <td>Lee KIEFER</td>
       <td>Fencing - Women's Foil Individual Gold Medal Bout</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Lee KIEFER</td>
+      <td class="silver">&#9679;</td>
+      <td>Lauren SCRUGGS</td>
       <td>Fencing - Women's Foil Individual Gold Medal Bout</td>
     </tr>
     <tr>
@@ -663,13 +663,13 @@
       <td>Tennis - Women's Singles Gold Medal Match</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>SUN Yingsha</td>
+      <td class="gold">&#9679;</td>
+      <td>CHEN Meng</td>
       <td>Table Tennis - Women's Singles Gold Medal Match</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>CHEN Meng</td>
+      <td class="silver">&#9679;</td>
+      <td>SUN Yingsha</td>
       <td>Table Tennis - Women's Singles Gold Medal Match</td>
     </tr>
     <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
@@ -741,13 +741,13 @@
       <td>Swimming - Men's 100m Freestyle Final</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>XIAO Ruoteng</td>
+      <td class="silver">&#9679;</td>
+      <td>ZHANG Boheng</td>
       <td>Artistic Gymnastics - Men's All-Around Final</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>ZHANG Boheng</td>
+      <td class="bronze">&#9679;</td>
+      <td>XIAO Ruoteng</td>
       <td>Artistic Gymnastics - Men's All-Around Final</td>
     </tr>
     <tr>
@@ -1218,13 +1218,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sara BALZER</td>
+      <td class="gold">&#9679;</td>
+      <td>Manon APITHY-BRUNET</td>
       <td>Fencing - Women's Sabre Individual Gold Medal Bout</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manon APITHY-BRUNET</td>
+      <td class="silver">&#9679;</td>
+      <td>Sara BALZER</td>
       <td>Fencing - Women's Sabre Individual Gold Medal Bout</td>
     </tr>
     <tr>
diff --git a/docs/ru/medals.html b/docs/ru/medals.html
index bc5462f80..8d3e4b5c9 100644
--- a/docs/ru/medals.html
+++ b/docs/ru/medals.html
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div role="alert" class="alert my-4">
+    <div role="alert" class="alert my-4 hidden">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
@@ -74,11 +74,6 @@
   <div class="collapse-content">
   <table class="table-full">
     <tr><td colspan="3" class="font-medium">2024-08-06</td></tr>
-    <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Omari JONES</td>
-      <td>Бокс - Полуфинал, до 71кг (м)</td>
-    </tr>
     <tr>
       <td class="gold">&#9679;</td>
       <td>Gabrielle THOMAS</td>
@@ -89,6 +84,11 @@
       <td>Brittany BROWN</td>
       <td>Легкая атлетика - 200м, финал (ж)</td>
     </tr>
+    <tr>
+      <td class="bronze">&#9679;</td>
+      <td>Omari JONES</td>
+      <td>Бокс - Полуфинал, до 71кг (м)</td>
+    </tr>
     <tr>
       <td class="silver">&#9679;</td>
       <td>Annette Nneka ECHIKUNWOKE</td>
@@ -345,13 +345,13 @@
       <td>Плавание - 200м баттерфляем, финал (ж)</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Sunisa LEE</td>
+      <td class="gold">&#9679;</td>
+      <td>Simone BILES</td>
       <td>Спортивная гимнастика - Многоборье, финал (ж)</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Simone BILES</td>
+      <td class="bronze">&#9679;</td>
+      <td>Sunisa LEE</td>
       <td>Спортивная гимнастика - Многоборье, финал (ж)</td>
     </tr>
     <tr>
@@ -454,13 +454,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Lauren SCRUGGS</td>
+      <td class="gold">&#9679;</td>
+      <td>Lee KIEFER</td>
       <td>Фехтование - Личная рапира, финал (ж)</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Lee KIEFER</td>
+      <td class="silver">&#9679;</td>
+      <td>Lauren SCRUGGS</td>
       <td>Фехтование - Личная рапира, финал (ж)</td>
     </tr>
     <tr>
@@ -663,13 +663,13 @@
       <td>Теннис - Финал, одиночный разряд (ж)</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>SUN Yingsha</td>
+      <td class="gold">&#9679;</td>
+      <td>CHEN Meng</td>
       <td>Настольный теннис - Финал, одиночный разряд (ж)</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>CHEN Meng</td>
+      <td class="silver">&#9679;</td>
+      <td>SUN Yingsha</td>
       <td>Настольный теннис - Финал, одиночный разряд (ж)</td>
     </tr>
     <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
@@ -741,13 +741,13 @@
       <td>Плавание - 100м вольным стилем, финал (м)</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>XIAO Ruoteng</td>
+      <td class="silver">&#9679;</td>
+      <td>ZHANG Boheng</td>
       <td>Спортивная гимнастика - Многоборье, финал (м)</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>ZHANG Boheng</td>
+      <td class="bronze">&#9679;</td>
+      <td>XIAO Ruoteng</td>
       <td>Спортивная гимнастика - Многоборье, финал (м)</td>
     </tr>
     <tr>
@@ -1218,13 +1218,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sara BALZER</td>
+      <td class="gold">&#9679;</td>
+      <td>Manon APITHY-BRUNET</td>
       <td>Фехтование - Личная сабля, финал (ж)</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manon APITHY-BRUNET</td>
+      <td class="silver">&#9679;</td>
+      <td>Sara BALZER</td>
       <td>Фехтование - Личная сабля, финал (ж)</td>
     </tr>
     <tr>
diff --git a/docs/zh/medals.html b/docs/zh/medals.html
index 64d897ff0..2d485d188 100644
--- a/docs/zh/medals.html
+++ b/docs/zh/medals.html
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div role="alert" class="alert my-4">
+    <div role="alert" class="alert my-4 hidden">
       <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info h-6 w-6 shrink-0">
         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
           d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
@@ -345,13 +345,13 @@
       <td>游泳 - 女子200米蝶泳决赛</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>Sunisa LEE</td>
+      <td class="gold">&#9679;</td>
+      <td>Simone BILES</td>
       <td>竞技体操 - 女子全能决赛</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Simone BILES</td>
+      <td class="bronze">&#9679;</td>
+      <td>Sunisa LEE</td>
       <td>竞技体操 - 女子全能决赛</td>
     </tr>
     <tr>
@@ -454,13 +454,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-28</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Lauren SCRUGGS</td>
+      <td class="gold">&#9679;</td>
+      <td>Lee KIEFER</td>
       <td>击剑 - 女子个人花剑金牌赛</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Lee KIEFER</td>
+      <td class="silver">&#9679;</td>
+      <td>Lauren SCRUGGS</td>
       <td>击剑 - 女子个人花剑金牌赛</td>
     </tr>
     <tr>
@@ -663,13 +663,13 @@
       <td>网球 - 女子单打金牌赛</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>SUN Yingsha</td>
+      <td class="gold">&#9679;</td>
+      <td>CHEN Meng</td>
       <td>乒乓球 - 女子单打金牌赛</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>CHEN Meng</td>
+      <td class="silver">&#9679;</td>
+      <td>SUN Yingsha</td>
       <td>乒乓球 - 女子单打金牌赛</td>
     </tr>
     <tr><td colspan="3" class="font-medium">2024-08-02</td></tr>
@@ -741,13 +741,13 @@
       <td>游泳 - 男子100米自由泳决赛</td>
     </tr>
     <tr>
-      <td class="bronze">&#9679;</td>
-      <td>XIAO Ruoteng</td>
+      <td class="silver">&#9679;</td>
+      <td>ZHANG Boheng</td>
       <td>竞技体操 - 男子全能决赛</td>
     </tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>ZHANG Boheng</td>
+      <td class="bronze">&#9679;</td>
+      <td>XIAO Ruoteng</td>
       <td>竞技体操 - 男子全能决赛</td>
     </tr>
     <tr>
@@ -1218,13 +1218,13 @@
     </tr>
     <tr><td colspan="3" class="font-medium">2024-07-29</td></tr>
     <tr>
-      <td class="silver">&#9679;</td>
-      <td>Sara BALZER</td>
+      <td class="gold">&#9679;</td>
+      <td>Manon APITHY-BRUNET</td>
       <td>击剑 - 女子个人佩剑金牌赛</td>
     </tr>
     <tr>
-      <td class="gold">&#9679;</td>
-      <td>Manon APITHY-BRUNET</td>
+      <td class="silver">&#9679;</td>
+      <td>Sara BALZER</td>
       <td>击剑 - 女子个人佩剑金牌赛</td>
     </tr>
     <tr>
diff --git a/src/calendar.ts b/src/calendar.ts
index 08f98070b..9274ec40a 100644
--- a/src/calendar.ts
+++ b/src/calendar.ts
@@ -487,7 +487,19 @@ export class Calendar {
       content.push(`  <table class="table-full">`);
 
       let lastDate = "";
-      for (const medal of this.medals.filter((m) => m.noc === noc.noc).sort((a, b) => a.date > b.date ? -1 : 1)) {
+      for (const medal of this.medals
+        .filter((m) => m.noc === noc.noc)
+        .sort((a, b) => {
+          if (a.date !== b.date) {
+            return a.date > b.date ? -1 : 1
+          }
+          const colors = ["gold", "silver", "bronze"];
+          if (a.color !== b.color) {
+            return colors.indexOf(a.color) > colors.indexOf(b.color) ? 1 : -1;
+          }
+          return a.name > b.name ? 1 : -1;
+        })
+      ) {
         let medalDate = medal.date.substring(0, 10);
         if (medalDate !== lastDate) {
           content.push(`    <tr><td colspan="3" class="font-medium">${medalDate}</td></tr>`);