fixed up automation time

This commit is contained in:
ari committed 2022-05-18 10:37:41 -04:00
1 parent 5192c09681
commit ea47b3e1eb
13 files changed
+313 -33

No files matched your search

@@ -253,6 +253,201 @@ FewAutos.args = {
}
],
"tags": {}
},
{
"metadata": {
"id": "1649726828269",
"alias": "Climate Heat Mode Settings",
"description": "Ensures that the climate is always in sync with the house settings",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "state",
"entity_id": "climate.main_floor",
"id": "main"
},
{
"platform": "state",
"entity_id": "climate.second_floor",
"id": "second"
},
{
"platform": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"id": "setting"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "setting"
}
],
"sequence": [
{
"service": "climate.turn_off",
"data": {},
"target": {
"device_id": [
"d88dcfe82bc9a1c0f2b77b871848155e",
"ef2d47fdeef19f8984b85f92f2597f73"
]
}
}
]
},
{
"conditions": [
{
"condition": "state",
"entity_id": "input_boolean.thermostats_house_is_heating",
"state": "on"
}
],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'heat' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "heat"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"default": [
{
"choose": [
{
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'cool' }}"
},
{
"condition": "template",
"value_template": "{{ trigger.to_state.state != 'off' }}"
}
]
}
],
"sequence": [
{
"service": "climate.set_hvac_mode",
"data": {
"hvac_mode": "cool"
},
"target": {
"entity_id": "{{ trigger.entity_id }}"
}
}
]
}
]
}
]
}
],
"tags": {}
},
{
"metadata": {
"id": "1628024070687",
"alias": "Baby Light Setting",
"description": "Configures max/min light settings for the baby ",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "time",
"at": "21:00:00",
"id": "night"
},
{
"platform": "time",
"at": "07:30:00",
"id": "day"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "night"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": "15"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "day"
}
],
"sequence": [
{
"service": "zwave_js.set_config_parameter",
"data": {
"parameter": "5",
"value": 100
}
}
]
}
],
"default": []
}
],
"tags": {}
}
],
}
@@ -209,7 +209,7 @@ const addChooseNode = (
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
+1 -1
View File
@@ -68,7 +68,7 @@ export const makeSequenceUpdater = (
)
} else {
return makeSequenceUpdater(
node.default,
node.default ?? [],
seq => this.updateNode(i, {
...node,
default: seq
+10 -6
View File
@@ -1,14 +1,15 @@
import { PropsWithChildren, useState } from "react";
import { AutomationTime } from "types/automations/common";
import { AutomationTime, AutomationTimeObject } from "types/automations/common";
import { milisecondsToObject } from "utils/time";
import InputWrapper from "./InputWrapper";
import { useInputTimeStyles } from "./styles";
import { convertStringToAutomationTimeObject } from 'utils/time';
export interface Props {
textBoxFor?: string;
label: string;
value?: AutomationTime;
onChange: (v?: AutomationTime) => void;
onChange: (v?: AutomationTimeObject) => void;
onEnter?: () => void;
}
export default function InputTime({
@@ -21,11 +22,14 @@ export default function InputTime({
}: PropsWithChildren<Props>) {
let cleanValue = '';
if (value) {
if (typeof value === 'string') {
value = convertStringToAutomationTimeObject(value);
}
const {
hours,
minutes,
seconds,
milliseconds,
hours = 0,
minutes = 0,
seconds = 0,
milliseconds = 0,
} = value;
cleanValue = [hours, minutes, seconds].map(x => String(x).padStart(2, '0')).join(':') + `.${String(milliseconds).padStart(3, '0')}`;
}
@@ -1,13 +1,14 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerTime } from 'types/automations/triggers';
import InputTime from 'components/Inputs/InputTime';
import { convertObjectToAutomationTimeString } from 'utils/time';
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
defaultState: () => ({
"alias": "",
"platform": 'time',
"at": {},
"at": "",
}),
isReady: ({ alias }) => {
return (alias !== '')
@@ -19,7 +20,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
value={state.at}
onChange={_at => setState({
...state,
at: _at ?? {},
at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
})}
/>
</>