Merge pull request #55 from Hypercubers/leaderboard-tweaks

Leaderboard tweaks

Author: blobinaticuber

docs/javascripts/leaderboards.js

@@ -0,0 +1,43 @@
+
+var shortList = document.getElementsByClassName("shorttime");
+var longList = document.getElementsByClassName("longtime");
+
+function LongTime() {
+    // switches to the long time format
+    for (var i = 0; i < shortList.length; i++) {
+        shortList[i].style.display = "none";
+        longList[i].style.display = "block";
+    } 
+    document.getElementById("long-time-format").classList.add("md-button--primary"); 
+    document.getElementById("wca-time-format").classList.remove("md-button--primary"); 
+    sessionStorage.setItem("timeFormat", "long");
+}
+
+function ShortTime() {
+    // switches to the short time format
+    for (var i = 0; i < longList.length; i++) {
+        longList[i].style.display = "none";
+        shortList[i].style.display = "block";
+    }  
+    document.getElementById("long-time-format").classList.remove("md-button--primary"); 
+    document.getElementById("wca-time-format").classList.add("md-button--primary"); 
+    sessionStorage.setItem("timeFormat", "short");
+    
+}
+
+
+
+document.addEventListener("DOMContentLoaded", load);
+document.addEventListener("hashchange", load);
+
+function load() {
+    console.log("loaded thing");
+    var format = sessionStorage.getItem("timeFormat");
+    if (format == "short") {
+        ShortTime();
+    } else {
+        LongTime();
+    }
+}
+
+load();

docs/leaderboards/other-leaderboards.md

@@ -0,0 +1,27 @@
+---
+title: Other Leaderboards
+---
+
+# Other Leaderboards
+
+
+[Magic Cube 4D Hall of Fame](https://superliminal.com/cube/halloffame.htm)
+- The original Hall of Fame. New submissions are no longer accepted due to reaching 500 solvers.
+
+[Magic Cube 4D Extended Records](http://wiki.superliminal.com/wiki/MC4D_Records)
+- Records for many other puzzles found in [MC4D](/software/magiccube4d.md).
+
+[Magic Cube 5D Hall of Insanity](http://www.gravitation3d.com/magiccube5d/hallofinsanity.html)
+- List of everyone who has solved 2^5^-7^5^, and also FMC solutions.
+
+[Magic Cube 7D Solvers](https://superliminal.com/andrey/mc7d/)
+- List of 6D and 7D solvers in MC7D.
+
+[Magic 120 Cell Solvers](http://www.gravitation3d.com/magic120cell/index.html)
+- List of 120 cell solvers in M120C or MPU.
+
+[MagicTile Klein Bottle challenge](http://roice3.org/magictile/mathologer/)
+- List of the first 100 people to solve the Klein Bottle Rubik's Cube from a [competition video](https://www.youtube.com/watch?v=DvZnh7-nslo) made by [Mathologer](https://www.youtube.com/@Mathologer).
+
+[Speedsolving Wiki List of Unofficial World Records](https://www.speedsolving.com/wiki/index.php?title=List_of_Unofficial_World_Records#High_Dimensional_Puzzles)
+- List of a few speedsolving and FMC records.

leaderboards/generate_leaderboards.py

@@ -40,9 +40,27 @@ def get_template(filename):
 
 def format_time(duration) -> str:  # duration: timedelta | int
     # duration can be timedelta (time) or int (movecount for fmc)
+
+    # gets the time in a short format (ex: 8:48:23.15)
+    # converts duration into a string. Then it chops off leading 0's because a TimeDelta object has those for some reason 
+    shortTime = str(duration)
+    if (shortTime.find(".") != -1):   # if the string has a decimal point
+        shortTime = shortTime[0:-4] # chop off the extra four 0's at the end if the time includes a non-integer number of seconds
+    if (shortTime.find(".") == -1):   # if the string does not have a decimal point, add ".00" to the end
+        shortTime += ".00"
+
+    while shortTime[0:1] == "0":  # while there are leading 0's to chop off
+        shortTime = shortTime[1:len(shortTime)]   # chop off leading 0
+        if shortTime[0:1] == ":":             # if next character is a colon
+            shortTime = shortTime[1:len(shortTime)]   # chop off colon
+
+    returnString = "<a class='shorttime'>" + shortTime + "</a><a class='longtime'>"
+
+    # code for geting time string in long format (ex: 8h 4m 32s 592ms)
     def unit(s):
         return f'<small>{s}</small>'
 
+    # this is if duration is actually FMC movecount, I think
     if isinstance(duration, int):
         return f"{duration:,}".replace(',', '\u2009')
 
@@ -52,20 +70,27 @@ def unit(s):
 
     minutes, seconds = divmod(seconds, 60)
     if minutes == 0:
-        return f"{seconds}{unit('s')} {millis_str}"
+        longTime = f"{seconds}{unit('s')} {millis_str}"
+        return [longTime, shortTime]
     seconds_str = f"{seconds:02}{unit('s')}"
 
     hours, minutes = divmod(int(minutes), 60)
     if hours == 0:
-        return f"{minutes}{unit('m')} {seconds_str} {millis_str}"
+        longTime = f"{minutes}{unit('m')} {seconds_str} {millis_str}"
+        return [longTime, shortTime]
     minutes_str = f"{minutes:02}{unit('m')}"
 
     days, hours = divmod(int(hours), 24)
     if days == 0:
-        return f"{hours}{unit('h')} {minutes_str} {seconds_str} {millis_str}"
+        longTime = f"{hours}{unit('h')} {minutes_str} {seconds_str} {millis_str}"
+        return [longTime, shortTime]
     hours_str = f"{minutes:02}{unit('h')}"
 
-    return f"{days:,}{unit('d')} {hours_str} {minutes_str} {seconds_str} {millis_str}".replace(',', '\u2009')
+    longTime = f"{days:,}{unit('d')} {hours_str} {minutes_str} {seconds_str} {millis_str}".replace(',', '\u2009')
+    # return "<p class='shorttime'>" + shortTime + "</p><p class='longtime'>" + longTime + "</p>"
+    # return returnString + longTime + "</a>"
+    return [longTime, shortTime]
+
 
 
 class Solve:
@@ -93,7 +118,7 @@ def __init__(self,
         formatted_time = format_time(self.time)
         self._cell_contents = {
             'date': self.date,
-            'time': f'[{formatted_time}]({self.link})' if link else formatted_time,
+            'time': f'<a class=\'longtime\' href={self.link}>{formatted_time[0]}</a><a style=\'display: none\' class=\'shorttime\' href={self.link}>{formatted_time[1]}</a>' if link else formatted_time,
             'event': self.event.name,
             'program': self.program,
             'solver': f'[{self.solver.name}]({self.solver.relative_file_path})',
@@ -104,12 +129,6 @@ def cell_contents(self, header):
             if self.rank is None:
                 return ''
             emoji = ''
-            # if 1 <= self.rank <= 3:
-            #     emoji = [
-            #         ':first_place: ',
-            #         ':second_place: ',
-            #         ':third_place: ',
-            #     ][self.rank-1]
             if self.rank == 1:
                 emoji = ':trophy-gold-hypercube: '
             elif self.rank == 2:

leaderboards/templates/history.md

@@ -5,3 +5,11 @@ search:
 ---
 
 # World Record History
+
+<script src="/javascripts/leaderboards.js"></script>
+
+??? note "View Options"
+    | Time Format |
+    | -------     |
+    | <input type="button" id="long-time-format" class="md-button md-button--primary" value="Long (1m 00s 000ms)" onclick="LongTime()"/> |
+    | <input type="button" id="wca-time-format" class="md-button" value="WCA (1:00.00)" onclick="ShortTime()"/> |

leaderboards/templates/leaderboards.md

@@ -10,22 +10,22 @@ search:
 <meta property="og:url" content="https://hypercubing.xyz/" />
 <meta property="og:image" content="https://assets.hypercubing.xyz/img/virt/mc4d_3x3x3x3.png" />
 
+<script src="/javascripts/leaderboards.js"></script>
+
 # Leaderboards
 
-World record database for higher dimensional twisty puzzle speedsolving! Verification is done by the moderator team of the Hypercubers Discord. Please read the [submission rules](rules.md) carefully before submitting a request to add your time.
 
-??? abstract "Other places that various records are kept:"
-    - [Magic Cube 4D Hall of Fame](https://superliminal.com/cube/halloffame.htm)
-    - [Magic Cube 4D Extended Records](http://wiki.superliminal.com/wiki/MC4D_Records)
-    - [Magic Cube 5D Hall of Insanity](http://www.gravitation3d.com/magiccube5d/hallofinsanity.html)
-    - [Magic Cube 7D Solvers](https://superliminal.com/andrey/mc7d/)
-    - [Magic 120 Cell Solvers](http://www.gravitation3d.com/magic120cell/index.html)
-    - [MagicTile Klein Bottle challenge](http://roice3.org/magictile/mathologer/)
-    - [Speedsolving Wiki List of Unofficial World Records](https://www.speedsolving.com/wiki/index.php?title=List_of_Unofficial_World_Records#High_Dimensional_Puzzles)
+
+
+World record database for higher dimensional twisty puzzle speedsolving!
+
 
 [:material-format-list-numbered: Rules](https://hypercubing.xyz/leaderboards/rules/){{.md-button .md-button--primary}}
 [:material-plus-circle: Submit](https://forms.gle/Y7Vpi3pb8989Ay8W8){{.md-button .md-button--primary}}
 
+??? note "View Options"
+    | Time Format |
+    | -------     |
+    | <input type="button" id="long-time-format" class="md-button md-button--primary" value="Long (1m 00s 000ms)" onclick="LongTime()"/> |
+    | <input type="button" id="wca-time-format" class="md-button" value="WCA (1:00.00)" onclick="ShortTime()"/> |
 
-
-Happy hypercubing!

leaderboards/templates/records.md

@@ -5,3 +5,11 @@ search:
 ---
 
 # Current World Records :trophy-gold-hypercube:
+
+<script src="/javascripts/leaderboards.js"></script>
+
+??? note "View Options"
+    | Time Format |
+    | -------     |
+    | <input type="button" id="long-time-format" class="md-button md-button--primary" value="Long (1m 00s 000ms)" onclick="LongTime()"/> |
+    | <input type="button" id="wca-time-format" class="md-button" value="WCA (1:00.00)" onclick="ShortTime()"/> |

leaderboards/templates/solver.md

@@ -3,3 +3,11 @@ title: {name}
 search:
   boost: 1
 ---
+
+<script src="/javascripts/leaderboards.js"></script>
+
+??? note "View Options"
+    | Time Format |
+    | -------     |
+    | <input type="button" id="long-time-format" class="md-button md-button--primary" value="Long (1m 00s 000ms)" onclick="LongTime()"/> |
+    | <input type="button" id="wca-time-format" class="md-button" value="WCA (1:00.00)" onclick="ShortTime()"/> |

leaderboards/test.csv

@@ -0,0 +1,5 @@
+date,       link,                  time, program,   solver,             puzzle, format
+2048-01-01, 2xx_2XNxxfA,    12:08:16.71, HSC,       rowan,            hemimegaminx, single
+2048-01-02, 2xx_2XNxxfA,     3:21:22.23, M120C,     vin,            hemimegaminx, single
+2048-01-03, 2xx_2XNxxfA,        8:16.71, HSC,       hactar,              hemimegaminx, single
+2048-01-04, 2xx_2XNxxfA,           1.01, HSC,       grant,              hemimegaminx, single