merge develop into main for v4.1.8 (#43)

app/scoreboard/process_data.py

@@ -1,6 +1,14 @@
 import sqlite3
 from datetime import datetime, timedelta
 
+def process_record(record):
+    if record == "N/A":
+        return "N/A"
+    else:
+        parts = record.split("-")
+        formatted_parts = [part.zfill(2) for part in parts]
+        return "-".join(formatted_parts)
+
 def extract_game_info(scoreboard_data):
     if not scoreboard_data:
         return []
@@ -22,8 +30,8 @@ def extract_game_info(scoreboard_data):
             "Intermission": game["clock"]["inIntermission"] if game_state == "LIVE" else "N/A",
             "Priority": calculate_game_priority(game),
             "Start Time": process_start_time(game),
-            "Home Record": game["homeTeam"]["record"] if game["gameState"] in ["PRE", "FUT"] else "N/A",
-            "Away Record": game["awayTeam"]["record"] if game["gameState"] in ["PRE", "FUT"] else "N/A",
+            "Home Record": process_record(game["homeTeam"]["record"]) if game["gameState"] in ["PRE", "FUT"] else "N/A",
+            "Away Record": process_record(game["awayTeam"]["record"]) if game["gameState"] in ["PRE", "FUT"] else "N/A",
             "Home Shots": game["homeTeam"]["sog"] if game["gameState"] not in ["PRE", "FUT"] else 0,
             "Away Shots": game["awayTeam"]["sog"] if game["gameState"] not in ["PRE", "FUT"] else 0,
             "Home Power Play": get_power_play_info(game, game["homeTeam"]["name"]["default"]),
@@ -58,7 +66,11 @@ def process_time_remaining(game):
 def process_start_time(game):
     if game["gameState"] in ["PRE", "FUT"]:
         utc_time = game["startTimeUTC"]
-        return utc_to_est_time(utc_time)
+        est_time = utc_to_est_time(utc_time)
+        # Check if the hour starts with a zero
+        if est_time.startswith("0"):
+            est_time = est_time[1:]  # Drop the leading zero
+        return est_time
     else:
         return "N/A"
 
@@ -96,11 +108,11 @@ def calculate_game_priority(game):
     away_total = away_team_standings["league_sequence"] + away_team_standings["league_l10_sequence"]
 
     # Calculate the matchup adjustment factor
-    matchup_multiplier = {5: 1, 4: 1, 3: 1.25, 2: 1.50, 1: 2}.get(period)
+    matchup_multiplier = {5: 1, 4: 1, 3: 1.50, 2: 1.65, 1: 2}.get(period)
     matchup_adjustment = (home_total + away_total) * matchup_multiplier
 
     # Calculate the base priority based on period
-    base_priority = {5: 650, 4: 600, 3: 300, 2: 200}.get(period, 100)
+    base_priority = {5: 650, 4: 600, 3: 300, 2: 200}.get(period, 150)
 
     # Adjust base priority based on score difference
     score_differential_adjustment = 0
@@ -118,8 +130,18 @@ def calculate_game_priority(game):
     base_priority -= score_differential_adjustment       
 
     # Adjust base priority based on certain conditions
-    if score_difference == 0 and period == 3 and time_remaining <= 600:
+    if period == 3 and time_remaining <= 720:
+        if score_difference == 0:
             base_priority += 100
+        elif score_difference == 1:
+            base_priority += 60
+
+    if period == 3 and time_remaining <= 360:
+        if score_difference == 0:
+            base_priority += 50
+        elif score_difference == 1:
+            base_priority += 30
+
 
     # Calculate time priority
     time_multiplier = {4: 2, 3: 2, 2: 1.5}.get(period, 0.75)

app/static/script.js

@@ -95,17 +95,17 @@ function updateGauge() {
         var score = parseInt(gauge.getAttribute('data-score'));
 
         // Clamp the score value between 0 and 700
-        score = Math.min(650, Math.max(0, score));
+        score = Math.min(700, Math.max(0, score));
 
         // Calculate the gauge width as a percentage
-        var gaugeWidth = (score / 650) * 100;
+        var gaugeWidth = (score / 700) * 100;
 
         // Set the width of the gauge
         gauge.style.width = gaugeWidth + '%';
 
         if (score <=300) {
             gauge.style.backgroundColor = '#4A90E2'
-        } else if (score <= 500) {
+        } else if (score <= 550) {
             gauge.style.backgroundColor = '#FF4500'
         } else {
             gauge.style.backgroundColor = '#FF0033'