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

Add support for showing the minimum and maximum values #10

Merged
merged 13 commits into from
Jun 15, 2019
Merged

Add support for showing the minimum and maximum values #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f665fb6
Add support for showing min and max values
TheLastProject Jun 14, 2019
e69d3f6
Wrap values into container
TheLastProject Jun 14, 2019
03eb096
Fix typo
TheLastProject Jun 14, 2019
ae3862a
Make directions behave for minmax
TheLastProject Jun 14, 2019
113aa55
Fix CSS
TheLastProject Jun 14, 2019
a9d92e3
Use correct value flex directions
TheLastProject Jun 14, 2019
8f8500b
Switch left and right directions
TheLastProject Jun 14, 2019
406ef6c
Support setting style only for minmax values
TheLastProject Jun 14, 2019
db21822
Add minmax to the README
TheLastProject Jun 14, 2019
4d92198
Reorder settings
TheLastProject Jun 14, 2019
f388506
Attempt to fix align split + icon
TheLastProject Jun 14, 2019
a452fc5
Another attempt
TheLastProject Jun 14, 2019
dc084ac
Fix typo
TheLastProject Jun 14, 2019
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Bar Card is a customizable animated card for the Home Assistant Lovelace front-e
| columns | number | none | Number of columns when using entities list.
| attribute | string | none | Attribute to be displayed.
| show_value | boolean | true | Hides value display when set to `false`.
| show_minmax | boolean | false | Hides the minimum and maximum value when set to `false`.
| unit_of_measurement | string | none | Unit of measurement to be displayed.
| color | string | var(--primary-color) | Color of the bar, can be any valid CSS color value or variable.
| title | string | friendly_name | Title displayed next to the bar.
Expand Down Expand Up @@ -50,6 +51,7 @@ Bar Card is a customizable animated card for the Home Assistant Lovelace front-e
| icon_style | object| none | A list of CSS styles applied to the icon.
| title_style | object | none | A list of CSS styles applied to the title.
| value_style | object | none | A list of CSS styles applied to the entity value.
| minmax_style | object | none | A list of CSS styles applied to the minimum and maximum values.
| background_style | object | none | A list of CSS styles applied to the bar background.


Expand Down
64 changes: 61 additions & 3 deletions bar-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class BarCard extends HTMLElement {
if (!config.color) config.color = 'var(--primary-color)'
if (!config.tap_action) config.tap_action = 'info'
if (!config.show_value) config.show_value = true
if (!config.show_minmax) config.show_minmax = false
if (!config.title) config.title = false
if (!config.severity) config.severity = false
if (!config.target) config.target = false
Expand All @@ -35,6 +36,7 @@ class BarCard extends HTMLElement {
if (!config.icon_style) config.icon_style = false
if (!config.title_style) config.title_style = false
if (!config.value_style) config.value_style = false
if (!config.minmax_style) config.minmax_style = false
if (!config.background_style) config.background_style = false
if (!config.visibility) config.visibility = false

Expand Down Expand Up @@ -177,8 +179,14 @@ class BarCard extends HTMLElement {
title.id = 'title_'+id
var titleBar = document.createElement('div')
titleBar.id = 'titleBar_'+id
const valueContainer = document.createElement('div')
valueContainer.id = 'value_container_'+id
const minValue = document.createElement('div')
minValue.id = 'min_value_'+id
const value = document.createElement('div')
value.id = 'value_'+id
const maxValue = document.createElement('div')
maxValue.id = 'max_value_'+id
var chargeBar = document.createElement('div')
chargeBar.id = 'chargeBar_'+id
var targetBar = document.createElement('div')
Expand Down Expand Up @@ -241,7 +249,14 @@ class BarCard extends HTMLElement {
case 'off':
container.appendChild(background)
}
contentBar.appendChild(value)
contentBar.appendChild(valueContainer)
if (config.show_minmax == true) {
valueContainer.appendChild(minValue)
}
valueContainer.appendChild(value)
if (config.show_minmax == true) {
valueContainer.appendChild(maxValue)
}
background.appendChild(contentBar)
card.appendChild(container)
card.appendChild(this._styleElements(config, id))
Expand All @@ -265,6 +280,7 @@ class BarCard extends HTMLElement {
_styleElements(config, id) {
const style = document.createElement('style');
if (config.value_style !== false) var valueStyle = this._customStyle(config.value_style)
if (config.minmax_style !== false) var minmaxStyle = this._customStyle(config.minmax_style)
if (config.title_style !== false) var titleStyle = this._customStyle(config.title_style)
if (config.icon_style !== false) var iconStyle = this._customStyle(config.icon_style)
if (config.background_style !== false) var backgroundStyle = this._customStyle(config.background_style)
Expand Down Expand Up @@ -319,6 +335,27 @@ class BarCard extends HTMLElement {
titleflexDirection = 'flex-direction: column-reverse;'
break
}

// Set value flex direction based on card direction
let valueflexDirection
switch (config.direction) {
case 'left':
case 'left-reverse':
valueflexDirection = 'flex-direction: row-reverse;'
break
case 'right':
case 'right-reverse':
valueflexDirection = 'flex-direction: row;'
break
case 'up':
case 'up-reverse':
valueflexDirection = 'flex-direction: column-reverse;'
break
case 'down':
case 'down-reverse':
valueflexDirection = 'flex-direction: column;'
break
}

// Set marker direction based on card direction
let markerDirection
Expand Down Expand Up @@ -559,15 +596,32 @@ class BarCard extends HTMLElement {
${titlePositionStyle}
${titleStyle};
}
#value_${id} {
#value_container_${id} {
position: relative;
display: ${config.show_minmax ? 'flex' : 'contents'};
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
${config.show_minmax ? 'text-align: center;' : ''};
${valueflexDirection};
}
#value_${id}, #min_value_${id}, #max_value_${id} {
position: relative;
font-weight: bold;
font-size: 13px;
color: #FFF;
text-shadow: 1px 1px #0007;
white-space: nowrap;
${config.show_minmax ? 'flex-grow: 1;' : ''};
${config.show_minmax ? 'text-align: center;' : ''};
}
#value_${id} {
${valueStyle}
}
#min_value_${id}, #max_value_${id} {
${minmaxStyle}
}
#titleBar_${id} {
position: relative;
display: flex;
Expand Down Expand Up @@ -991,6 +1045,10 @@ class BarCard extends HTMLElement {
this._updateTargetBar(entityState, configTarget, barColor, id, entity, index)
this._entityTarget[id] = configTarget
barElement.style.setProperty('--bar-color', barColor)
if (config.show_minmax == true) {
root.getElementById('min_value_'+id).textContent = `${configMin} ${measurement}`
root.getElementById('max_value_'+id).textContent = `${configMax} ${measurement}`
}
if (config.show_value == true) root.getElementById('value_'+id).textContent = `${entityState} ${measurement}`
if (config.animation !== 'off') root.getElementById('chargeBar_'+id).style.setProperty('--bar-color', barColor)
if (entityState == 'N/A') root.getElementById('backgroundBar_'+id).style.setProperty('--bar-color', '#666')
Expand Down Expand Up @@ -1107,4 +1165,4 @@ class BarCard extends HTMLElement {
}
}

customElements.define('bar-card', BarCard)
customElements.define('bar-card', BarCard)