25 Commits

Author SHA1 Message Date
d285314a28 hotfix: define font size for more consistent look 2024-02-21 01:00:03 -05:00
1cd6c7314b Merge develop into main for v4.0.0 (#34) 2024-02-21 00:43:41 -05:00
93b53b86b9 feature: adds hype meter to replace game score (#33) 2024-02-21 00:41:18 -05:00
53f0e69cc5 feature: adds hype meter to replace game score 2024-02-21 00:40:35 -05:00
4b6e8615b1 fix: weigh overtime heavier to compensate for time priority loss 2024-02-20 22:10:07 -05:00
31b4846287 fix: styles.css adjust live games 2024-02-20 22:09:45 -05:00
a329c2e8b2 fix: styles.css adjustments 2024-02-20 14:32:17 -05:00
24de212b98 remove unnecessary comments 2024-02-20 01:35:24 -05:00
6abcd2e448 fix: change spacing between rows 2024-02-20 01:27:19 -05:00
b3a09b27c0 fix: adjust game box spacing 2024-02-20 00:50:35 -05:00
8900bf0d14 fix: adjust sizing to fit space better 2024-02-20 00:47:29 -05:00
3d6afe0df3 fix: adjust styles 2024-02-20 00:41:49 -05:00
d4f5e4c991 fix: make elements more consistent across screen sizes 2024-02-19 21:57:02 -05:00
59fe338658 fix: drop leading zero oin start time 2024-02-19 21:56:06 -05:00
28265af13f fix: resize game boxes and space out (#32) 2024-02-19 19:11:58 -05:00
1fb7673aa4 fix: resize game boxes and space out 2024-02-19 19:10:56 -05:00
5bac025624 Merge develop into main for v3.0.7 (#31) 2024-02-19 16:33:48 -05:00
0d3921e7cf fix: game priority update (#30) 2024-02-19 16:31:49 -05:00
f17e221ad3 fix: game priority update 2024-02-19 16:31:15 -05:00
1c2028fa85 fix: shootout is period 5 and gets top priority (#29) 2024-02-19 16:24:13 -05:00
9fe94057ff fix: shootout is period 5 and gets top priority 2024-02-19 16:23:34 -05:00
e355693613 fix: live game state and time spacing and size (#28) 2024-02-19 16:21:45 -05:00
468a03e646 fix: live game state and time spacing and size 2024-02-19 16:20:21 -05:00
d89d674b2a hotfix: process_data.py fix incorrect database ref (#25) 2024-02-19 13:13:51 -05:00
7b5bde447a hotfix: process_data.py fix incorrect database ref 2024-02-19 13:13:29 -05:00
4 changed files with 279 additions and 105 deletions

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@
/__pycache__ /__pycache__
/app/__pycache__ /app/__pycache__
/app/scoreboard/__pycache__ /app/scoreboard/__pycache__
nhl_standings.db

View File

@@ -96,10 +96,10 @@ 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) * 20 score_total = (home_score + away_score) * 25
# Calculate the base priority based on period # Calculate the base priority based on period
base_priority = {4: 400, 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
if score_difference > 3: if score_difference > 3:
@@ -114,7 +114,9 @@ def calculate_game_priority(game):
base_priority += 100 base_priority += 100
# Calculate time priority # Calculate time priority
time_priority = (1200 - time_remaining) / 20 time_multiplier = {4: 2, 3: 2, 2: 1.5}.get(period, 0.75)
time_priority = ((1200 - time_remaining) / 20) * time_multiplier
# Calculate the final priority # Calculate the final priority
final_priority = int(base_priority + time_priority - matchup_adjustment + score_total) final_priority = int(base_priority + time_priority - matchup_adjustment + score_total)
@@ -122,7 +124,7 @@ def calculate_game_priority(game):
return final_priority return final_priority
def get_team_standings(team_name): def get_team_standings(team_name):
conn = sqlite3.connect("nhl_standings.db") conn = sqlite3.connect("app/data/nhl_standings.db")
cursor = conn.cursor() cursor = conn.cursor()
cursor.execute(""" cursor.execute("""
SELECT league_sequence, league_l10_sequence SELECT league_sequence, league_l10_sequence
@@ -137,4 +139,4 @@ def utc_to_est_time(utc_time):
utc_datetime = datetime.strptime(utc_time, "%Y-%m-%dT%H:%M:%SZ") utc_datetime = datetime.strptime(utc_time, "%Y-%m-%dT%H:%M:%SZ")
est_offset = timedelta(hours=-5) est_offset = timedelta(hours=-5)
est_datetime = utc_datetime + est_offset est_datetime = utc_datetime + est_offset
return est_datetime.strftime("%I:%M %p") return est_datetime.strftime("%#I:%M %p")

View File

@@ -85,6 +85,32 @@ function updateScoreboard(data) {
finalGamesSection.innerHTML = ''; finalGamesSection.innerHTML = '';
} }
} }
updateGauge()
}
function updateGauge() {
document.querySelectorAll('.gauge').forEach(function(gauge) {
// Get the score value from the data-score attribute
var score = parseInt(gauge.getAttribute('data-score'));
// Clamp the score value between 0 and 700
score = Math.min(700, Math.max(0, score));
// Calculate the gauge width as a percentage
var gaugeWidth = (score / 700) * 100;
// Set the width of the gauge
gauge.style.width = gaugeWidth + '%';
if (score <=350) {
gauge.style.backgroundColor = '#4A90E2'
} else if (score <= 560) {
gauge.style.backgroundColor = '#FF4500'
} else {
gauge.style.backgroundColor = '#FF0033'
}
});
} }
// Function to generate HTML for game boxes // Function to generate HTML for game boxes
@@ -147,9 +173,18 @@ function generateGameBoxes(games, state) {
html += '<div class="live-time">' + game['Time Remaining'] + '</div>'; html += '<div class="live-time">' + game['Time Remaining'] + '</div>';
} }
html += '</div>'; html += '</div>';
html += '<div class="game-info">'; if (!game['Intermission']) {
html += '<strong>Game Score: </strong>' + game['Priority']; html += '<div class="hype-meter-label">';
html += '<strong>Hype Meter</strong>';
html += '</div>'; html += '</div>';
html += '<div class="game-score-gauge">';
html += '<div class="gauge" data-score="' + game['Priority'] + '"></div>';
html += '</div>';
html += '</div>';
}
html += '</div>'; html += '</div>';
} else if (state === 'PRE') { } else if (state === 'PRE') {
html += '<div class="pre-state">' + game['Start Time'] + '</div>'; html += '<div class="pre-state">' + game['Start Time'] + '</div>';

View File

@@ -1,14 +1,16 @@
body { body {
background-color: #121212; /* Dark background color */ background-color: #121212;
font-family: Arial, sans-serif; /* Use a common sans-serif font */ font-family: Arial, sans-serif;
color: #fff; /* White text color */ color: #fff;
margin: 0;
} }
h1 { h1 {
text-align: center; text-align: center;
margin-top: 15px; margin-top: 15px;
margin-bottom: 25px; margin-bottom: 25px;
color: #f2f2f2; /* Lighten the text color */ color: #f2f2f2;
font-size: 2em;
} }
.scoreboard { .scoreboard {
@@ -19,22 +21,23 @@ h1 {
} }
.game-box { .game-box {
background-color: #333; /* Dark background color for game boxes */ background-color: #333;
border-radius: 12px; /* Rounded corners */ border-radius: 12px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Add a subtle shadow */ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
padding: 20px; padding: 1%;
margin-bottom: 20px; width: 16%;
margin-left: 20px; max-width: 300px;
margin-right: 20px; position: relative;
width: 300px; margin-left: 1%;
position: relative; /* Position relative for absolute positioning */ margin-right: 1%;
margin-bottom: 1.15%;
} }
.team-info { .team-info {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 7px; margin-bottom: 2%;
margin-top: 25px; /* Added margin-top */ margin-top: 9%;
} }
.team-info-column { .team-info-column {
@@ -43,48 +46,66 @@ h1 {
} }
.team-logo { .team-logo {
width: 50px; width: 18%;
height: auto; height: auto;
margin-right: 10px; margin-right: 2.25%;
} }
.team-name { .team-name {
font-size: 18px; font-size: 90%;
font-weight: bold; font-weight: bold;
} }
/* Add a media query for screens between 769px and 900px */
@media only screen and (max-width: 950px) and (min-width: 769px) {
.team-name {
font-size: 0.55rem; /* Adjusted font size for screens between 769px and 900px */
}
}
.team-score { .team-score {
font-size: 25px; font-size: 130%;
font-weight: bold; font-weight: bold;
margin-left: auto; margin-left: auto;
} }
.team-record { .team-record {
font-size: 12px; font-size: 0.75rem;
margin-left: auto;
font-weight: bold; font-weight: bold;
margin-left: auto;
}
/* Add a media query for screens between 769px and 900px */
@media only screen and (max-width: 950px) and (min-width: 769px) {
.team-record {
font-size: 0.45rem; /* Adjusted font size for screens between 769px and 900px */
}
} }
.team-sog { .team-sog {
font-size: 12px; /* Adjust font size as needed */ font-size: 65%;
color: #ddd; /* Lighter text color */ color: #ddd;
} }
.team-power-play { .team-power-play {
font-size: 12px; /* Adjust font size as needed */ font-size: 12px;
color: red; /* Set color to red */ color: red;
margin-left: 10px; /* Add some margin for spacing */ margin-left: 10px;
} }
.game-info { .game-info {
margin-top: 12px; margin-top: 12px;
color: #aaa; /* Lighten the text color */ color: #aaa;
text-align: center; text-align: center;
font-size: 14px; font-size: 80%;
} }
.game-info strong { .hype-meter-label {
margin-right: 5px; margin-top: 3%;
color: #aaa;
text-align: center;
font-size: 80%;
margin-bottom: 3%;
} }
.live-dot { .live-dot {
@@ -99,78 +120,112 @@ h1 {
.pre-state { .pre-state {
position: absolute; position: absolute;
top: 10px; top: 5%;
left: 10px; /* Adjusted left position */ left: 3%;
background-color: #444; /* Darker background color for pre state */ background-color: #444;
padding: 5px; padding: 1.5%;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 0.65rem;
color: #fff; /* White text color for live state */ color: #fff;
font-weight: bolder; /* Bold text for live state */ font-weight: bolder;
z-index: 1; /* Ensure the live state box is above other content */ z-index: 1;
width: auto;
height: 10%;
display: flex;
justify-content: space-evenly;
align-items: center;
}
/* Add a media query for screens between 769px and 900px */
@media only screen and (max-width: 950px) and (min-width: 769px) {
.pre-state {
font-size: 0.55rem; /* Adjusted font size for screens between 769px and 900px */
}
} }
.final-state { .final-state {
position: absolute; position: absolute;
top: 10px; top: 5%;
left: 10px; /* Adjusted left position */ left: 3%;
background-color: #444; /* Darker background color for final state */ background-color: #444;
padding: 5px; padding: 1.5%;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 65%;
color: #ddd; /* Lighter text color for final state */ color: #ddd;
z-index: 1; /* Ensure the final state box is above other content */ z-index: 1;
font-weight: bold; font-weight: bold;
width: auto;
height: 7.5%;
} }
.live-state { .live-state {
position: absolute; position: absolute;
top: 10px; top: 4%;
left: 10px; /* Adjusted left position */ left: 4%;
background-color: #0b6e31; /* Darker green background color for live state */ background-color: #0b6e31;
padding: 5px; padding: 1.5%;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 80%;
color: #fff; /* White text color for live state */ color: #fff;
font-weight: bolder; /* Bold text for live state */ font-weight: bolder;
z-index: 1; /* Ensure the live state box is above other content */ z-index: 1;
} width: 7.2%;
height: 7.5%;
.live-state-intermission { display: flex;
position: absolute; justify-content: space-evenly;
top: 10px; align-items: center;
left: 10px; /* Adjusted left position */
background-color: #444; /* Darker green background color for live state */
padding: 5px;
border-radius: 5px;
font-size: 12px;
color: #fff; /* White text color for live state */
font-weight: bolder; /* Bold text for live state */
z-index: 1; /* Ensure the live state box is above other content */
} }
.live-time { .live-time {
position: absolute; position: absolute;
top: 10px; top: 4%;
left: 45px; /* Adjusted left position */ left: 16%;
background-color: #444; /* Darker background color for time box */ background-color: #444;
padding: 5px; padding: 1.5%;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 80%;
color: #ddd; /* Lighter text color for time box */ color: #ddd;
z-index: 1; /* Ensure the time box is above other content */ z-index: 1;
display: flex;
justify-content: space-evenly;
align-items: center;
width: 10%;
height: 7.5%;
}
.live-state-intermission {
position: absolute;
top: 5%;
left: 4%;
background-color: #444;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
color: #fff;
font-weight: bolder;
z-index: 1;
width: 13%;
height: 7.5%;
display: flex;
justify-content: space-evenly;
align-items: center;
} }
.live-time-intermission { .live-time-intermission {
position: absolute; position: absolute;
top: 10px; top: 5%;
left: 60px; /* Adjusted left position */ left: 21.5%;
background-color: #444; /* Darker background color for time box */ background-color: #444;
padding: 5px; padding: 1.5%;
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 80%;
color: #ddd; /* Lighter text color for time box */ color: #ddd;
z-index: 1; /* Ensure the time box is above other content */ z-index: 1;
width: 12.5%;
height: 7.5%;
display: flex;
justify-content: space-evenly;
align-items: center;
} }
#live-games-section { #live-games-section {
@@ -194,7 +249,19 @@ h1 {
justify-content: flex-start; justify-content: flex-start;
} }
/* Existing CSS styles */ /* Add styles for the game score gauge */
.game-score-gauge {
height: 1%;
background-color: #ccc;
border-radius: 5px;
overflow: hidden;
}
.gauge {
height: 10px; /* Adjust height as needed */
/*#8A2BE2*/
/*#6699CC*/
}
/* Add media query for smaller screens */ /* Add media query for smaller screens */
@media only screen and (max-width: 768px) { @media only screen and (max-width: 768px) {
@@ -204,39 +271,108 @@ h1 {
} }
.game-box { .game-box {
width: 90%; /* Adjust width for better fit on smaller screens */ width: 90%;
margin: 10px; /* Adjust margins */ padding: 4%;
margin-bottom: 4%;
margin-left: 2%;
margin-right: 2%;
max-width: 1000px;
} }
.team-info { .team-info {
align-items: center; /* Center align items */ align-items: center;
margin-top: 26px; /* Adjust top margin */ margin-top: 10%;
margin-bottom: 5px; /* Adjust bottom margin */ margin-bottom: 2%;
} }
.team-logo { .team-logo {
width: 36px; /* Adjust logo size */ width: 12%;
height: 36px; height: auto;
} }
.team-name { .team-name {
font-size: 16px; /* Decrease font size for better readability */ font-size: 100%;
font-weight: bold; font-weight: bold;
} }
.team-score { .team-score {
font-size: 24px; /* Decrease font size for better readability */ font-size: 140%;
font-weight: bold; font-weight: bold;
} }
.game-info { .team-sog {
font-size: 12px; /* Decrease font size for better readability */ font-size: 70%;
} }
.live-state, .game-info {
.live-time, font-size: 90%;
.pre-state,
.final-state {
font-size: 12px; /* Decrease font size for better readability */
} }
.live-state {
top: 5%;
left: 3.5%;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
width: 5.5%;
height: 7.2%;
}
.live-time {
top: 5%;
left: 13%;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
display: flex;
justify-content: space-evenly;
align-items: center;
width: 7%;
height: 7.2%;
}
.live-state-intermission {
top: 5%;
left: 3.5%;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
width: 11%;
height: 7.5%;
display: flex;
justify-content: space-evenly;
align-items: center;
}
.live-time-intermission {
top: 5%;
left: 18.5%;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
width: 8%;
height: 7.5%;
display: flex;
justify-content: space-evenly;
align-items: center;
}
.final-state {
top: 5%;
left: 3.5%;
padding: 1.5%;
border-radius: 5px;
font-size: 72%;
width: auto;
height: 7.5%;
}
.pre-state {
top: 5%;
left: 3.5%;
padding: 1.5%;
border-radius: 5px;
font-size: 80%;
}
} }