WIP #120 History widget improvements
This commit is contained in:
Yegor Vialov
86
lib/entity_widgets/history_chart/entity_history.dart
Normal file
86
lib/entity_widgets/history_chart/entity_history.dart
Normal file
@ -0,0 +1,86 @@
|
||||
part of '../../main.dart';
|
||||
|
||||
class EntityHistoryWidgetType {
|
||||
static const int simplest = 0;
|
||||
static const int valueToTime = 1;
|
||||
}
|
||||
|
||||
class EntityHistoryWidget extends StatefulWidget {
|
||||
|
||||
final int type;
|
||||
|
||||
const EntityHistoryWidget({Key key, @required this.type}) : super(key: key);
|
||||
|
||||
@override
|
||||
_EntityHistoryWidgetState createState() {
|
||||
return new _EntityHistoryWidgetState();
|
||||
}
|
||||
}
|
||||
|
||||
class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
|
||||
|
||||
List _history;
|
||||
bool _needToUpdateHistory;
|
||||
int _selectedId = -1;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_needToUpdateHistory = true;
|
||||
}
|
||||
|
||||
void _loadHistory(HomeAssistant ha, String entityId) {
|
||||
ha.getHistory(entityId).then((history){
|
||||
setState(() {
|
||||
_history = history.isNotEmpty ? history[0] : [];
|
||||
_needToUpdateHistory = false;
|
||||
});
|
||||
}).catchError((e) {
|
||||
TheLogger.error("Error loading $entityId history: $e");
|
||||
setState(() {
|
||||
_history = [];
|
||||
_needToUpdateHistory = false;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final HomeAssistantModel homeAssistantModel = HomeAssistantModel.of(context);
|
||||
final EntityModel entityModel = EntityModel.of(context);
|
||||
final Entity entity = entityModel.entity;
|
||||
if (!_needToUpdateHistory) {
|
||||
_needToUpdateHistory = true;
|
||||
} else {
|
||||
_loadHistory(homeAssistantModel.homeAssistant, entity.entityId);
|
||||
}
|
||||
return _buildChart();
|
||||
}
|
||||
|
||||
Widget _buildChart() {
|
||||
List<Widget> children = [];
|
||||
if (_history == null) {
|
||||
children.add(
|
||||
Text("Loading history...")
|
||||
);
|
||||
} else if (_history.isEmpty) {
|
||||
children.add(
|
||||
Text("No history for last 24h")
|
||||
);
|
||||
} else {
|
||||
children.add(
|
||||
SimpleStateHistoryChartWidget(
|
||||
rawHistory: _history
|
||||
)
|
||||
);
|
||||
}
|
||||
children.add(Divider());
|
||||
return Padding(
|
||||
padding: EdgeInsets.fromLTRB(0.0, Entity.rowPadding, 0.0, Entity.rowPadding),
|
||||
child: Column(
|
||||
children: children,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
197
lib/entity_widgets/history_chart/simple_state_history_chart.dart
Normal file
197
lib/entity_widgets/history_chart/simple_state_history_chart.dart
Normal file
@ -0,0 +1,197 @@
|
||||
part of '../../main.dart';
|
||||
|
||||
class SimpleStateHistoryChartWidget extends StatefulWidget {
|
||||
final rawHistory;
|
||||
|
||||
const SimpleStateHistoryChartWidget({Key key, this.rawHistory}) : super(key: key);
|
||||
|
||||
|
||||
@override
|
||||
State<StatefulWidget> createState() {
|
||||
return new _SimpleStateHistoryChartWidgetState();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class _SimpleStateHistoryChartWidgetState extends State<SimpleStateHistoryChartWidget> {
|
||||
|
||||
int _selectedId = -1;
|
||||
List<charts.Series<SimpleEntityStateHistoryMoment, DateTime>> _parsedHistory;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
_parsedHistory = _parseHistory();
|
||||
DateTime selectedTimeStart;
|
||||
DateTime selectedTimeEnd;
|
||||
String selectedState;
|
||||
if ((_selectedId > -1) && (_parsedHistory != null) && (_parsedHistory.first.data.length >= (_selectedId + 1))) {
|
||||
selectedTimeStart = _parsedHistory.first.data[_selectedId].startTime;
|
||||
selectedTimeEnd = _parsedHistory.first.data[_selectedId].endTime;
|
||||
selectedState = _parsedHistory.first.data[_selectedId].state;
|
||||
}
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
HistoryControlWidget(
|
||||
selectedTimeStart: selectedTimeStart,
|
||||
selectedTimeEnd: selectedTimeEnd,
|
||||
selectedState: selectedState,
|
||||
onPrevTap: () => _selectPrev(),
|
||||
onNextTap: () => _selectNext(),
|
||||
),
|
||||
SizedBox(
|
||||
height: 70.0,
|
||||
child: charts.TimeSeriesChart(
|
||||
_parsedHistory,
|
||||
animate: false,
|
||||
dateTimeFactory: const charts.LocalDateTimeFactory(),
|
||||
primaryMeasureAxis: charts.NumericAxisSpec(
|
||||
renderSpec: charts.NoneRenderSpec()
|
||||
),
|
||||
selectionModels: [
|
||||
new charts.SelectionModelConfig(
|
||||
type: charts.SelectionModelType.info,
|
||||
listener: (model) => _onSelectionChanged(model),
|
||||
)
|
||||
],
|
||||
behaviors: [
|
||||
charts.PanAndZoomBehavior(),
|
||||
],
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
List<charts.Series<SimpleEntityStateHistoryMoment, DateTime>> _parseHistory() {
|
||||
List<SimpleEntityStateHistoryMoment> data = [];
|
||||
DateTime now = DateTime.now();
|
||||
for (var i = 0; i < widget.rawHistory.length; i++) {
|
||||
var stateData = widget.rawHistory[i];
|
||||
DateTime startTime = DateTime.tryParse(stateData["last_updated"])?.toLocal();
|
||||
DateTime endTime;
|
||||
if (i < (widget.rawHistory.length - 1)) {
|
||||
endTime = DateTime.tryParse(widget.rawHistory[i+1]["last_updated"])?.toLocal();
|
||||
} else {
|
||||
endTime = now;
|
||||
}
|
||||
data.add(SimpleEntityStateHistoryMoment(stateData["state"], startTime, endTime, i));
|
||||
}
|
||||
data.add(SimpleEntityStateHistoryMoment(data.last.state, now, null, widget.rawHistory.length));
|
||||
return [
|
||||
new charts.Series<SimpleEntityStateHistoryMoment, DateTime>(
|
||||
id: 'State',
|
||||
strokeWidthPxFn: (SimpleEntityStateHistoryMoment historyMoment, __) => (historyMoment.id == _selectedId) ? 70.0 : 40.0,
|
||||
colorFn: (SimpleEntityStateHistoryMoment historyMoment, __) => EntityColors.historyStateColor(historyMoment.state),
|
||||
domainFn: (SimpleEntityStateHistoryMoment historyMoment, _) => historyMoment.startTime,
|
||||
measureFn: (SimpleEntityStateHistoryMoment historyMoment, _) => 0,
|
||||
data: data,
|
||||
)
|
||||
];
|
||||
}
|
||||
|
||||
void _selectPrev() {
|
||||
if (_selectedId > 0) {
|
||||
setState(() {
|
||||
_selectedId -= 1;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _selectNext() {
|
||||
if (_selectedId < (_parsedHistory.first.data.length - 2)) {
|
||||
setState(() {
|
||||
_selectedId += 1;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _onSelectionChanged(charts.SelectionModel model) {
|
||||
final selectedDatum = model.selectedDatum;
|
||||
|
||||
int selectedId;
|
||||
|
||||
if ((selectedDatum.isNotEmpty) &&(selectedDatum.first.datum.endTime != null)) {
|
||||
selectedId = selectedDatum.first.datum.id;
|
||||
setState(() {
|
||||
_selectedId = selectedId;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class HistoryControlWidget extends StatelessWidget {
|
||||
|
||||
final Function onPrevTap;
|
||||
final Function onNextTap;
|
||||
final DateTime selectedTimeStart;
|
||||
final DateTime selectedTimeEnd;
|
||||
final String selectedState;
|
||||
|
||||
const HistoryControlWidget({Key key, this.onPrevTap, this.onNextTap, this.selectedTimeStart, this.selectedTimeEnd, this.selectedState}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (selectedTimeStart != null) {
|
||||
return
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
IconButton(
|
||||
icon: Icon(Icons.chevron_left),
|
||||
padding: EdgeInsets.all(0.0),
|
||||
iconSize: 40.0,
|
||||
onPressed: onPrevTap,
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(right: 10.0),
|
||||
child: Text(
|
||||
"$selectedState",
|
||||
textAlign: TextAlign.right,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
color: EntityColors.stateColor(selectedState),
|
||||
fontSize: 22.0
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: <Widget>[
|
||||
Text("${formatDate(selectedTimeStart, [M, ' ', d, ', ', HH, ':', nn, ':', ss])}", textAlign: TextAlign.left,),
|
||||
Text("${formatDate(selectedTimeEnd ?? selectedTimeStart, [M, ' ', d, ', ', HH, ':', nn, ':', ss])}", textAlign: TextAlign.left,),
|
||||
],
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
icon: Icon(Icons.chevron_right),
|
||||
padding: EdgeInsets.all(0.0),
|
||||
iconSize: 40.0,
|
||||
onPressed: onNextTap,
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
} else {
|
||||
return Container(height: 32.0);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class SimpleEntityStateHistoryMoment {
|
||||
final DateTime startTime;
|
||||
final DateTime endTime;
|
||||
final String state;
|
||||
final int id;
|
||||
|
||||
SimpleEntityStateHistoryMoment(this.state, this.startTime, this.endTime, this.id);
|
||||
}
|
||||
Reference in New Issue
Block a user