Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v0.4.2 Release Candidate #13

Merged
merged 4 commits into from
Oct 30, 2022
Merged

v0.4.2 Release Candidate #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e20477a
Correct %s showing instead of 0
vasqued2 Oct 30, 2022
fb7b9fb
Honor Time Format selected in user profile
vasqued2 Oct 30, 2022
c52b1eb
Added try/catch in case locale doesn't exist
vasqued2 Oct 30, 2022
80ebaf5
Fixed defect w/ system format
vasqued2 Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions dist/ha-teamtracker-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,42 @@ class TeamTrackerCard extends LitElement {
const stateObj = this.hass.states[this._config.entity];
const outline = this._config.outline;
const outlineColor = this._config.outline_color;
var teamProb = (stateObj.attributes.team_win_probability * 100).toFixed(0);
var oppoProb = (stateObj.attributes.opponent_win_probability * 100).toFixed(0);
var teamProb = 0;
if (stateObj.attributes.team_win_probability) {
var teamProb = (stateObj.attributes.team_win_probability * 100).toFixed(0);
}
var oppoProb = 0;
if (stateObj.attributes.opponent_win_probability) {
oppoProb = (stateObj.attributes.opponent_win_probability * 100).toFixed(0);
}
var tScr = stateObj.attributes.team_score;
var oScr = stateObj.attributes.opponent_score;

var lang = this.hass.selectedLanguage || this.hass.language || navigator.language || "en"

var time_format = "language";
try {
time_format = this.hass.locale["time_format"] || "language";
}
catch (e) {
time_format = "language"
}

var t = new Translator(lang);

var dateForm = new Date (stateObj.attributes.date);
var gameDay = dateForm.toLocaleDateString(lang, { weekday: 'long' });
var gameTime = dateForm.toLocaleTimeString(lang, { hour: '2-digit', minute:'2-digit' });
if (time_format == "24") {
gameTime = dateForm.toLocaleTimeString(lang, { hour: '2-digit', minute:'2-digit', hour12:false });
}
if (time_format == "12") {
gameTime = dateForm.toLocaleTimeString(lang, { hour: '2-digit', minute:'2-digit', hour12:true });
}
if (time_format == "system") {
var sys_lang = navigator.language || "en"
gameTime = dateForm.toLocaleTimeString(sys_lang, { hour: '2-digit', minute:'2-digit' });
}
var gameMonth = dateForm.toLocaleDateString(lang, { month: 'short' });
var gameDate = dateForm.toLocaleDateString(lang, { day: '2-digit' });
var outColor = outlineColor;
Expand Down Expand Up @@ -113,7 +138,7 @@ class TeamTrackerCard extends LitElement {

var overUnder = '';
if (stateObj.attributes.overunder) {
overUnder = t.translate(sport + ".overUnder", "%s", stateObj.attributes.overunder);
overUnder = t.translate(sport + ".overUnder", "%s", String(stateObj.attributes.overunder));
}
var gameStat1 = '';
if (stateObj.attributes.down_distance_text) {
Expand Down Expand Up @@ -185,9 +210,9 @@ class TeamTrackerCard extends LitElement {
var onThirdOp = 0.2;
}
if (sport.includes("baseball")) {
gameStat1 = t.translate("baseball.gameStat1", "%s", stateObj.attributes.balls);
gameStat2 = t.translate("baseball.gameStat2", "%s", stateObj.attributes.strikes);
gameStat3 = t.translate("baseball.gameStat3", "%s", stateObj.attributes.outs);
gameStat1 = t.translate("baseball.gameStat1", "%s", String(stateObj.attributes.balls));
gameStat2 = t.translate("baseball.gameStat2", "%s", String(stateObj.attributes.strikes));
gameStat3 = t.translate("baseball.gameStat3", "%s", String(stateObj.attributes.outs));
outsDisplay = 'inherit';
timeoutsDisplay = 'none';
basesDisplay = 'inherit';
Expand All @@ -212,8 +237,8 @@ class TeamTrackerCard extends LitElement {
gameBar = t.translate("volleyball.gameBar", "%s", stateObj.attributes.clock);
teamProb = stateObj.attributes.team_score;
oppoProb = stateObj.attributes.opponent_score;
teamBarLabel = t.translate("volleyball.teamBarLabel", "%s", stateObj.attributes.team_score);
oppoBarLabel = t.translate("volleyball.oppoBarLabel", "%s", stateObj.attributes.opponent_score);
teamBarLabel = t.translate("volleyball.teamBarLabel", "%s", String(stateObj.attributes.team_score));
oppoBarLabel = t.translate("volleyball.oppoBarLabel", "%s", String(stateObj.attributes.opponent_score));
teamTimeouts = stateObj.attributes.team_sets_won;
oppoTimeouts = stateObj.attributes.opponent_sets_won;
timeoutsDisplay = 'inline';
Expand All @@ -232,8 +257,8 @@ class TeamTrackerCard extends LitElement {
if (sport.includes("hockey")) {
teamProb = stateObj.attributes.team_shots_on_target;
oppoProb = stateObj.attributes.opponent_shots_on_target;
teamBarLabel = t.translate("hockey.teamBarLabel", "%s", stateObj.attributes.team_shots_on_target);
oppoBarLabel = t.translate("hockey.oppoBarLabel", "%s", stateObj.attributes.opponent_shots_on_target);
teamBarLabel = t.translate("hockey.teamBarLabel", "%s", String(stateObj.attributes.team_shots_on_target));
oppoBarLabel = t.translate("hockey.oppoBarLabel", "%s", String(stateObj.attributes.opponent_shots_on_target));

timeoutsDisplay = 'none';
}
Expand Down