Skip to content

Fix history showing extra points. #350

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

Merged
balloob merged 1 commit into from
Jul 24, 2017
Merged

Fix history showing extra points. #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 8 additions & 39 deletions src/components/state-history-chart-line.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,17 @@
dataTable.addColumn({ type: 'datetime', id: 'Time' });

function pushData(values, noInterpolationValues) {
var timestamp = values[0];
if (timestamp > endTime) {
// Drop datapoints that are after the requested endTime. This could happen if
// endTime is "now" and client time is not in sync with server time.
return;
}
if (prevValues && noInterpolationValues) {
// if we have to prevent interpolation, we add an old value for each
// value that should not be interpolated at the same time that our new
// line will be published.
data.push([values[0]].concat(prevValues.slice(1).map(
data.push([timestamp].concat(prevValues.slice(1).map(
function (val, index) {
return noInterpolationValues[index] ? val : null;
})));
Expand All @@ -160,44 +166,7 @@
prevValues = values;
}

if (domain === 'thermostat') {
Copy link
Copy Markdown
Member

@balloob balloob Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this? This means that for thermostats we are no longer plotting target and current temperatures

Copy link
Copy Markdown
Member

@balloob balloob Jul 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh gosh, I see now that the code was duplicated.

// We differentiate between thermostats that have a target temperature
// range versus ones that have just a target temperature
hasTargetRange = states.reduce(
function (cum, cur) {
return cum || cur.attributes.target_temp_high !== cur.attributes.target_temp_low;
}, false);

dataTable.addColumn('number', name + ' current temperature');

if (hasTargetRange) {
dataTable.addColumn('number', name + ' target temperature high');
dataTable.addColumn('number', name + ' target temperature low');

noInterpolations = [false, true, true];

processState = function (state) {
var curTemp = saveParseFloat(state.attributes.current_temperature);
var targetHigh = saveParseFloat(state.attributes.target_temp_high);
var targetLow = saveParseFloat(state.attributes.target_temp_low);
pushData(
[new Date(state.last_updated), curTemp, targetHigh, targetLow],
noInterpolations);
};
} else {
dataTable.addColumn('number', name + ' target temperature');

noInterpolations = [false, true];

processState = function (state) {
var curTemp = saveParseFloat(state.attributes.current_temperature);
var target = saveParseFloat(state.attributes.temperature);
pushData([new Date(state.last_updated), curTemp, target], noInterpolations);
};
}

states.forEach(processState);
} else if (domain === 'climate') {
if (domain === 'thermostat' || domain === 'climate') {
// We differentiate between thermostats that have a target temperature
// range versus ones that have just a target temperature
hasTargetRange = states.reduce(
Expand Down
6 changes: 6 additions & 0 deletions src/components/state-history-chart-timeline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@
entityDisplay = window.hassUtil.computeStateName(stateInfo[0]);

stateInfo.forEach(function (state) {
var timeStamp = new Date(state.last_changed);
if (timeStamp > endTime) {
// Drop datapoints that are after the requested endTime. This could happen if
// endTime is "now" and client time is not in sync with server time.
return;
}
if (prevState !== null && state.state !== prevState) {
newLastChanged = new Date(state.last_changed);

Expand Down
14 changes: 3 additions & 11 deletions src/data/ha-state-history-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var DATE_CACHE = {};
var RECENT_CACHE = {};

function computeHistory(stateHistory, endTime) {
function computeHistory(stateHistory) {
var lineChartDevices = {};
var timelineDevices = [];
var unitStates;
Expand All @@ -23,14 +23,6 @@
return;
}

// Duplicate the last state to the selected endTime so the chart expands
// to the end of the selected time. (If no additional state changes were
// found, the state was still the last state as of the end time.
var lastState = Object.assign({}, stateInfo[stateInfo.length - 1]);
lastState.last_changed = endTime;
lastState.last_updated = endTime;
stateInfo.push(lastState);

stateWithUnit = stateInfo.find(
function (state) { return 'unit_of_measurement' in state.attributes; });

Expand Down Expand Up @@ -145,7 +137,7 @@

var prom = this.hass.callApi('GET', url).then(
function (stateHistory) {
return computeHistory(stateHistory, Date.now());
return computeHistory(stateHistory);
},
function () {
RECENT_CACHE[entityId] = false;
Expand All @@ -166,7 +158,7 @@
if (!DATE_CACHE[filter]) {
DATE_CACHE[filter] = this.hass.callApi('GET', 'history/period/' + filter).then(
function (stateHistory) {
return computeHistory(stateHistory, endTime);
return computeHistory(stateHistory);
},
function () {
DATE_CACHE[filter] = false;
Expand Down