feat: add matchup adjustment scaling. Earlier the period, the heavier… (#36)

app/scoreboard/process_data.py

@@ -76,9 +76,17 @@ def get_game_outcome(game, game_state):
 
 def calculate_game_priority(game):
     # Return 0 if game is in certain states
-    if game["gameState"] in ["FINAL", "OFF", "PRE", "FUT"] or game["clock"]["inIntermission"]:
+    if game["gameState"] in ["FINAL", "OFF", "PRE", "FUT"]:
         return 0
     
+    # Get period, time remaining, scores, and other relevant data
+    period = game.get("periodDescriptor", {}).get("number", 0)
+    time_remaining = game.get("clock", {}).get("secondsRemaining", 0)
+    home_score = game["homeTeam"]["score"]
+    away_score = game["awayTeam"]["score"]
+    score_difference = abs(home_score - away_score)
+    score_total = (home_score + away_score) * 25
+
     # Get standings for home and away teams
     home_team_standings = get_team_standings(game["homeTeam"]["name"]["default"])
     away_team_standings = get_team_standings(game["awayTeam"]["name"]["default"])
@@ -88,15 +96,8 @@ def calculate_game_priority(game):
     away_total = away_team_standings["league_sequence"] + away_team_standings["league_l10_sequence"]
 
     # Calculate the matchup adjustment factor
-    matchup_adjustment = home_total + away_total 
+    matchup_multiplier = {5: 1, 4: 1, 3: 1.25, 2: 1.50, 1: 2}.get(period)
-
+    matchup_adjustment = (home_total + away_total) * matchup_multiplier
-    # Get period, time remaining, scores, and other relevant data
-    period = game.get("periodDescriptor", {}).get("number", 0)
-    time_remaining = game.get("clock", {}).get("secondsRemaining", 0)
-    home_score = game["homeTeam"]["score"]
-    away_score = game["awayTeam"]["score"]
-    score_difference = abs(home_score - away_score)
-    score_total = (home_score + away_score) * 25
 
     # Calculate the base priority based on period
     base_priority = {5: 650, 4: 600, 3: 300, 2: 200}.get(period, 100)
@@ -121,6 +122,10 @@ def calculate_game_priority(game):
     # Calculate the final priority
     final_priority = int(base_priority + time_priority - matchup_adjustment + score_total)
 
+    # Pushes the games that are in intermission to the bottom, but retains their sort
+    if game["clock"]["inIntermission"]:
+        return (final_priority - 2000)
+
     return final_priority
 
 def get_team_standings(team_name):

app/static/styles.css

@@ -7,9 +7,10 @@ body {
 
 h1 {
     text-align: center;
-    margin-top: 15px;
+    margin-top: 0.8%;
-    margin-bottom: 25px;
+    margin-bottom: 1.5%;
     color: #f2f2f2;
+    font-size: 2.2em;
 }
 
 .scoreboard {
@@ -25,7 +26,7 @@ h1 {
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
     padding: 1%;
     width: 16%;
-    max-width: 300px;
+    max-width: 350px;
     position: relative;
     margin-left: 1%;
     margin-right: 1%;
@@ -51,7 +52,7 @@ h1 {
 }
 
 .team-name {
-    font-size: 90%;
+    font-size: 1rem;
     font-weight: bold;
 }
 
@@ -63,13 +64,13 @@ h1 {
 }
 
 .team-score {
-    font-size: 130%;
+    font-size: 1.35rem;
     font-weight: bold;
     margin-left: auto;
 }
 
 .team-record {
-    font-size: 0.75rem;
+    font-size: 0.8rem;
     font-weight: bold;
     margin-left: auto;
 }
@@ -82,7 +83,7 @@ h1 {
 }
 
 .team-sog {
-    font-size: 65%;
+    font-size: 0.75rem;
     color: #ddd;
 }
 
@@ -124,12 +125,12 @@ h1 {
     background-color: #444;
     padding: 1.5%;
     border-radius: 5px;
-    font-size: 0.65rem;
+    font-size: 0.75rem;
     color: #fff; 
     font-weight: bolder; 
     z-index: 1; 
     width: auto;
-    height: 10%;
+    height: 7%;
     display: flex;
     justify-content: space-evenly; 
     align-items: center;
@@ -149,12 +150,15 @@ h1 {
     background-color: #444;
     padding: 1.5%;
     border-radius: 5px;
-    font-size: 65%;
+    font-size: 0.7rem;
     color: #ddd;
     z-index: 1;
     font-weight: bold;
     width: auto;
-    height: 7.5%;
+    height: 7%;
+    display: flex; 
+    justify-content: space-evenly;
+    align-items: center;
 }
 
 .live-state {
@@ -164,12 +168,12 @@ h1 {
     background-color: #0b6e31; 
     padding: 1.5%;
     border-radius: 5px;
-    font-size: 80%;
+    font-size: 0.72rem;
     color: #fff; 
     font-weight: bolder; 
     z-index: 1; 
-    width: 7.2%;
+    width: 7%;
-    height: 7.5%;
+    height: 7%;
     display: flex; 
     justify-content: space-evenly;
     align-items: center;
@@ -178,23 +182,23 @@ h1 {
 .live-time {
     position: absolute;
     top: 4%;
-    left: 16%; 
+    left: 15%; 
     background-color: #444; 
     padding: 1.5%;
     border-radius: 5px;
-    font-size: 80%;
+    font-size: 0.75rem;
     color: #ddd; 
     z-index: 1; 
     display: flex; 
     justify-content: space-evenly;
     align-items: center;
     width: 10%;
-    height: 7.5%;
+    height: 7%;
 }
 
 .live-state-intermission {
     position: absolute;
-    top: 5%;
+    top: 4%;
     left: 4%; 
     background-color: #444;
     padding: 1.5%;
@@ -203,8 +207,8 @@ h1 {
     color: #fff;
     font-weight: bolder;
     z-index: 1;
-    width: 13%;
+    width: 11%;
-    height: 7.5%;
+    height: 8.5%;
     display: flex;
     justify-content: space-evenly;
     align-items: center;
@@ -212,16 +216,16 @@ h1 {
 
 .live-time-intermission {
     position: absolute;
-    top: 5%;
+    top: 4%;
-    left: 21.5%;
+    left: 19%;
     background-color: #444;
     padding: 1.5%;
     border-radius: 5px;
-    font-size: 80%;
+    font-size: 0.75rem;
     color: #ddd;
     z-index: 1;
-    width: 12.5%;
+    width: 10%;
-    height: 7.5%;
+    height: 8.5%;
     display: flex;
     justify-content: space-evenly;
     align-items: center;