Skip to content

Commit

Permalink
Code consolidation, cleanup, bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@rgc99
rgc99 committed Jun 30, 2024
1 parent f54d0dd commit 3ef5e0f
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 91 deletions.
19 changes: 10 additions & 9 deletions src/irrigation-unlimited-card.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export class IrrigationUnlimitedCard extends LitElement {
const stateObj = this.hass.states[controller.entity_id];
const status = stateObj.attributes.status;
const isOn = stateObj.state === "on";
const isDelay = status === "delay";
const isEnabled = stateObj.attributes.enabled;
const suspended = stateObj.attributes.suspended;
const isHidden = !(
Expand All @@ -116,7 +117,7 @@ export class IrrigationUnlimitedCard extends LitElement {
this.config.show_controllers
?.replace(/\s/g, "")
.split(",")
.includes(controller.index + 1 + ""))
.includes(controller.id1 + ""))
);
const zonesHidden = !this.config.always_show_zones;
const sequencesHidden = !this.config.always_show_sequences;
Expand Down Expand Up @@ -145,6 +146,7 @@ export class IrrigationUnlimitedCard extends LitElement {
if (isOn) classes.push("iu-on");
if (isEnabled) classes.push("iu-enabled");
if (suspended) classes.push("iu-suspended");
if (isDelay) classes.push("iu-delay");

const zonesClasses: Array<string> = ["iu-zones iu-content"];
if (zonesHidden) zonesClasses.push("iu-hidden");
Expand All @@ -153,15 +155,15 @@ export class IrrigationUnlimitedCard extends LitElement {
if (sequencesHidden) sequencesClasses.push("iu-hidden");

return html`
<div class=${classes.join(" ")} iu-key="${controller.index + 1}.0.0.0">
<div class=${classes.join(" ")} iu-key="${controller.id1}.0.0.0">
<hr />
<div class="iu-controller-row iu-td">
<div class="iu-td1"></div>
<div class="iu-td2">
<ha-icon .icon=${stateObj.attributes.icon}></ha-icon>
</div>
<div class="iu-td3">
<span>${controller.index + 1}</span>
<span>${controller.id1}</span>
<span class="iu-name">${controller.name}</span>
</div>
<div class="iu-td4">
Expand Down Expand Up @@ -266,7 +268,7 @@ export class IrrigationUnlimitedCard extends LitElement {
return html`
<div
class=${classes.join(" ")}
iu-key="${controller.index + 1}.${zone.index + 1}.0.0"
iu-key="${controller.id1}.${zone.id1}.0.0"
>
<div class="iu-collapsible iu-hidden">
<div class="iu-zone-row iu-td">
Expand All @@ -279,7 +281,7 @@ export class IrrigationUnlimitedCard extends LitElement {
</div>
<div class="iu-td3">
<span style="color: ${this._selectColour(zone.index)}"
>${zone.index + 1}</span
>${zone.id1}</span
>
<span class="iu-name">${stateObj.attributes.friendly_name}</span>
</div>
Expand Down Expand Up @@ -438,7 +440,7 @@ export class IrrigationUnlimitedCard extends LitElement {
return html`
<div
class=${classes.join(" ")}
iu-key="${controller.index + 1}.0.${sequence.index + 1}.0"
iu-key="${controller.id1}.0.${sequence.id1}.0"
>
<div class="iu-collapsible iu-hidden">
<div class="iu-sequence-row iu-td">
Expand All @@ -453,7 +455,7 @@ export class IrrigationUnlimitedCard extends LitElement {
></ha-icon>
</div>
<div class="iu-td3" @click="${this._toggleCollapse}">
<span>${sequence.index + 1}</span>
<span>${sequence.id1}</span>
<span class="iu-name">${sequence.name}</span>
</div>
<div class="iu-td4">
Expand Down Expand Up @@ -533,8 +535,7 @@ export class IrrigationUnlimitedCard extends LitElement {
return html`
<div
class=${classes.join(" ")}
iu-key="${controller.index + 1}.0.${sequence.index +
1}.${sequenceZone.index + 1}"
iu-key="${controller.id1}.0.${sequence.id1}.${sequenceZone.id1}"
>
<div class="iu-sequence-zone-row iu-td">
<div class="iu-td1"></div>
Expand Down
169 changes: 87 additions & 82 deletions src/iu.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,42 +42,84 @@ interface GetInfo {
controllers: [ControllerInfo];
}

interface IUSequenceZoneStatus {
index: number;
enabled: boolean;
status: string;
start: string | null;
duration: string;
suspended: string | null;
icon: string;
adjustment: string;
zone_ids: string[];
}

const enum IUUpdateStatus {
None = 0,
EntityUpdated = 1 << 0,
TimerRequired = 1 << 1,
}

class IUEntity {
public index: number;
public name: string;
public entity_id: string;
class IUBase {
public start: Date | undefined = undefined;
protected status: string | undefined = undefined;
protected duration: number | undefined = undefined;
public status: string | undefined = undefined;
protected _duration: number | undefined = undefined;
protected _remaining: number | undefined = undefined;
private last_updated: Date | undefined = undefined;
private _percent_completed: number | undefined = undefined;

constructor(data: EntityInfo) {
this.index = data.index;
this.name = data.name;
this.entity_id = data.entity_id;
public get duration(): string | undefined {
return secs_to_hms(this._duration);
}

protected set duration(value: string | undefined) {
this._duration = hms_to_secs(value);
return;
}

public get remaining(): string | undefined {
return secs_to_hms(this._remaining);
}

protected set remaining(value: string | undefined) {
public set remaining(value: string) {
this._remaining = hms_to_secs(value);
return;
}

public get percent_completed(): number | undefined {
return this._percent_completed;
}

public update_stats(now: Date): void {
if (this.start && this._duration) {
if (this.status === "on" || this.status === "delay") {
const elapsed = elapsed_secs(now, this.start);
this._remaining = this._duration - elapsed;
this._percent_completed = percent_completed(elapsed, this._duration);
}
}
}

public clear_stats(): void {
this._remaining = this._percent_completed = undefined;
}
}

class IUEntity extends IUBase {
public index: number;
public name: string;
public entity_id: string;
private last_updated: Date | undefined = undefined;

public get id1(): number {
return this.index + 1;
}

constructor(data: EntityInfo) {
super();
this.index = data.index;
this.name = data.name;
this.entity_id = data.entity_id;
}

public update(hass: HomeAssistant): number {
let result: number = IUUpdateStatus.None;
const entity = hass.states[this.entity_id];
Expand All @@ -93,74 +135,60 @@ class IUEntity {
this.status === "paused"
) {
this.start = new Date(entity.attributes.current_start);
this.duration = hms_to_secs(entity.attributes.current_duration);
this.duration = entity.attributes.current_duration;
this.remaining = entity.attributes.time_remaining;
} else this.duration = this.start = this._remaining = undefined;
} else {
this.start = undefined;
this.clear_stats();
}
}
if (this.status === "on" || this.status === "delay")
result |= IUUpdateStatus.TimerRequired;
return result;
}

public timer(now: Date): void {
if (!this.start || !this.duration) return;
if (this.status === "on" || this.status === "delay") {
const elapsed = elapsed_secs(now, this.start);
this._remaining = this.duration - elapsed;
this._percent_completed = percent_completed(elapsed, this.duration);
}
if (this.status === "on" || this.status === "delay") this.update_stats(now);
}
}

export class IUSequenceZone {
export class IUSequenceZone extends IUBase {
public index: number;
public zone_ids: string[];
public enabled: boolean = true;
public status?: string;
public suspended: Date | null = null;
public icon?: string;
public adjustment?: string;
public start?: Date;
public _duration?: number;
public _remaining?: number;
public percent_completed?: number;

public get id1(): number {
return this.index + 1;
}

constructor(data: SequenceZoneInfo) {
super();
this.index = data.index;
this.zone_ids = data.zone_ids;
}

public get remaining(): string | undefined {
return secs_to_hms(this._remaining);
}

protected set remaining(value: string | undefined) {
this._remaining = hms_to_secs(value);
return;
}

public get duration(): string | undefined {
return secs_to_hms(this._duration);
}

protected set duration(value: string | undefined) {
this._remaining = hms_to_secs(value);
return;
public assign(szs: IUSequenceZoneStatus) {
this.icon = szs.icon;
this.enabled = szs.enabled;
this.suspended = szs.suspended ? new Date(szs.suspended) : null;
this.adjustment = szs.adjustment;
if (szs.start) {
this.start = new Date(szs.start);
this.duration = szs.duration;
} else {
this.start = undefined;
this.duration = "0:00:00";
}
if (this.status === "off" && szs.status === "on") {
this._remaining = this._duration;
} else if (szs.status === "off") this._remaining = undefined;
this.status = szs.status;
}
}

interface IUSequenceZoneStatus {
index: number;
enabled: boolean;
status: string;
start: string;
duration: string;
suspended: string | null;
icon: string;
adjustment: string;
zone_ids: string[];
}

export interface IUTimeline {
start: string;
end: string;
Expand All @@ -181,40 +209,16 @@ export class IUSequence extends IUEntity {
let result = super.update(hass);
if ((result & IUUpdateStatus.EntityUpdated) !== 0) {
const entity = hass.states[this.entity_id];
for (const z of entity.attributes.zones as [IUSequenceZoneStatus]) {
const zone = this.zones[z.index];
zone.icon = z.icon;
zone.enabled = z.enabled;
zone.suspended = z.suspended ? new Date(z.suspended) : null;
zone.adjustment = z.adjustment;
if (z.start) {
zone.start = new Date(z.start);
zone._duration = hms_to_secs(z.duration);
} else {
zone.start = undefined;
zone._duration = 0;
}
if (zone.status === "off" && z.status === "on") {
zone._remaining = zone._duration;
zone.percent_completed = 0;
} else if (z.status === "off")
zone._remaining = zone.percent_completed = undefined;
zone.status = z.status;
}
for (const szs of entity.attributes.zones as [IUSequenceZoneStatus])
this.zones[szs.index].assign(szs);
}
return result;
}

public override timer(now: Date): void {
super.timer(now);
if (this.status === "on")
for (const z of this.zones) {
if (z.start && z._duration && z.status === "on") {
const elapsed = elapsed_secs(now, z.start);
z._remaining = z._duration - elapsed;
z.percent_completed = percent_completed(elapsed, z._duration);
}
}
for (const z of this.zones) if (z.status === "on") z.update_stats(now);
}
}

Expand Down Expand Up @@ -297,6 +301,7 @@ export class IUCoordinator {
public update(hass: HomeAssistant): boolean {
if (!this.initialised) return false;
let result = IUUpdateStatus.None;
const now = new Date();
for (const c of this.controllers) result |= c.update(hass);
if (
this.timer_id === undefined &&
Expand Down
2 changes: 2 additions & 0 deletions src/styles.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export const styles = css`
.iu-controller.iu-on .iu-controller-row .iu-duration,
.iu-zone.iu-on .iu-zone-row .iu-duration,
.iu-sequence.iu-on .iu-sequence-row .iu-duration,
.iu-sequence.iu-delay .iu-sequence-row .iu-duration,
.iu-sequence.iu-on .iu-sequence-zone-row .iu-duration {
color: var(--state-on-color, #66a61e);
}
Expand Down Expand Up @@ -175,6 +176,7 @@ export const styles = css`
}
.iu-controller.iu-on .iu-controller-row .iu-td2 ha-icon,
.iu-controller.iu-delay .iu-controller-row .iu-td2 ha-icon,
.iu-zone.iu-on .iu-zone-row .iu-td2 ha-icon,
.iu-sequence.iu-on .iu-sequence-row .iu-td2 ha-icon,
.iu-sequence.iu-paused .iu-sequence-row .iu-td2 ha-icon,
Expand Down

0 comments on commit 3ef5e0f

Please sign in to comment.