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

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

Browse Source
This commit is contained in:
Goddard
2024-02-22 23:05:25 -05:00
committed by GitHub
parent c8f535ee48 a1352869ad
commit 53a0fc7993
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/scoreboard/process_data.py
View File

@@ -108,11 +108,11 @@ def calculate_game_priority(game):
away_total = away_team_standings["league_sequence"] + away_team_standings["league_l10_sequence"] away_total = away_team_standings["league_sequence"] + away_team_standings["league_l10_sequence"]
# Calculate the matchup adjustment factor # 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 matchup_adjustment = (home_total + away_total) * matchup_multiplier
# Calculate the base priority based on period # 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 # Adjust base priority based on score difference
score_differential_adjustment = 0 score_differential_adjustment = 0
@@ -130,8 +130,18 @@ def calculate_game_priority(game):
base_priority -= score_differential_adjustment 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 period == 3 and time_remaining <= 720:
if score_difference == 0:
base_priority += 100 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 # Calculate time priority
time_multiplier = {4: 2, 3: 2, 2: 1.5}.get(period, 0.75) time_multiplier = {4: 2, 3: 2, 2: 1.5}.get(period, 0.75)

6
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(650, Math.max(0, score)); score = Math.min(700, Math.max(0, score));
// Calculate the gauge width as a percentage // Calculate the gauge width as a percentage
var gaugeWidth = (score / 650) * 100; var gaugeWidth = (score / 700) * 100;
// Set the width of the gauge // Set the width of the gauge
gauge.style.width = gaugeWidth + '%'; gauge.style.width = gaugeWidth + '%';
if (score <=300) { if (score <=300) {
gauge.style.backgroundColor = '#4A90E2' gauge.style.backgroundColor = '#4A90E2'
} else if (score <= 500) { } else if (score <= 550) {
gauge.style.backgroundColor = '#FF4500' gauge.style.backgroundColor = '#FF4500'
} else { } else {
gauge.style.backgroundColor = '#FF0033' gauge.style.backgroundColor = '#FF0033'