andre/olympics-calendar
1
0
Fork 0
mirror of https://github.com/fabrice404/olympics-calendar.git synced 2025-12-13 06:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

consitent medals sorting

Browse Source
This commit is contained in:
Fabrice Lamant
2024-08-07 08:05:21 +02:00
parent af6cb0ac4f
commit 0f23942ea3
6 changed files with 127 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
docs/ja/medals.html
View File

@ -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>

50
docs/ko/medals.html
View File

@ -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>

42
docs/medals.html
View File

@ -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>

52
docs/ru/medals.html
View File

@ -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>

42
docs/zh/medals.html
View File

@ -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>

14
src/calendar.ts
View File

@ -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>`);