josh/NHL-Scoreboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge develop into main for v4.1.2 (#37)

Browse Source
This commit is contained in:
Goddard
2024-02-22 01:17:52 -05:00
committed by GitHub
parent 18ff48cc2c 94f9cced2e
commit 982fdfb3c1
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/scoreboard/process_data.py
View File

@@ -85,7 +85,7 @@ def calculate_game_priority(game):
home_score = game["homeTeam"]["score"] home_score = game["homeTeam"]["score"]
away_score = game["awayTeam"]["score"] away_score = game["awayTeam"]["score"]
score_difference = abs(home_score - away_score) score_difference = abs(home_score - away_score)
score_total = (home_score + away_score) * 25 score_total = (home_score + away_score) * 20
# Get standings for home and away teams # Get standings for home and away teams
home_team_standings = get_team_standings(game["homeTeam"]["name"]["default"]) home_team_standings = get_team_standings(game["homeTeam"]["name"]["default"])
@@ -103,12 +103,19 @@ def calculate_game_priority(game):
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, 100)
# Adjust base priority based on score difference # Adjust base priority based on score difference
score_differential_adjustment = 0
if score_difference > 3: if score_difference > 3:
base_priority -= 500 score_differential_adjustment += 500
elif score_difference > 2: elif score_difference > 2:
base_priority -= 350 score_differential_adjustment += 350
elif score_difference > 1: elif score_difference > 1:
base_priority -= 100 score_differential_adjustment += 100
if period == 3 and time_remaining <= 300:
score_differential_adjustment = score_differential_adjustment * 2
base_priority -= score_differential_adjustment
# Adjust base priority based on certain conditions # Adjust base priority based on certain conditions
if score_difference == 0 and period == 3 and time_remaining <= 600: if score_difference == 0 and period == 3 and time_remaining <= 600:
@@ -124,7 +131,7 @@ def calculate_game_priority(game):
# Pushes the games that are in intermission to the bottom, but retains their sort # Pushes the games that are in intermission to the bottom, but retains their sort
if game["clock"]["inIntermission"]: if game["clock"]["inIntermission"]:
return (final_priority - 2000) return (-2000 - time_remaining)
return final_priority return final_priority

8
app/static/script.js
View File

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