${t(entry.type, L)}
+ ${entry.phase_id ? html`${ctx.phaseNames?.[entry.phase_id] || entry.phase_id}` : nothing}
${entry.auto ? html`${t("history_auto", L)}` : nothing}
${editable
? html`
`, ctx)
: nothing}
+ ${renderPhasesCard(task, ctx)}
${renderChecklistCard(task, ctx)}
${renderRecentActivities(task, ctx)}
${this._error}
` : nothing}
${this.checklist.length > 0 ? html`
@@ -473,6 +477,12 @@ export class MaintenanceCompleteDialog extends LitElement {
font-weight: 500;
padding-bottom: 12px;
}
+ .phase-line {
+ margin-top: -8px;
+ padding-bottom: 12px;
+ font-size: 13px;
+ color: var(--secondary-text-color);
+ }
.content {
display: flex;
flex-direction: column;
diff --git a/custom_components/maintenance_supporter/frontend-src/components/task-dialog.ts b/custom_components/maintenance_supporter/frontend-src/components/task-dialog.ts
index d26010cb..47fcf158 100644
--- a/custom_components/maintenance_supporter/frontend-src/components/task-dialog.ts
+++ b/custom_components/maintenance_supporter/frontend-src/components/task-dialog.ts
@@ -260,6 +260,18 @@ export class MaintenanceTaskDialog extends LitElement {
// Checklist (newline-separated steps, one per line)
@state() private _checklistText = "";
+ // Task phases (#139): editable defs + the cycle order. The v1 editor keeps
+ // each phase to name + checklist + at most ONE own-object part (the mower
+ // "14 new blades" case); richer per-phase config exists at the WS level.
+ // `carry` holds def fields the editor has no form for (notes,
+ // required_completion_fields, future keys) and `extraParts` any links
+ // beyond the first — both re-merged on save so a no-op edit never wipes
+ // them (#106 pattern; same passthrough idea as trigger_config's carry).
+ @state() private _phaseDefs: Array<{
+ id: string; name: string; checklistText: string; partId: string; partQty: string;
+ extraParts: TaskPartLink[]; carry: Record${t("phases_section", L)}
+${t("phases_hint", L)}
+ ${this._phaseDefs.map((d) => html`
+
+
+ `)}
+
+ this._patchPhaseDef(d.id, { name: (e.target as HTMLInputElement).value })}
+ >
+ ${this.parts.length ? html`
+
+ ${d.partId ? html`
+ this._patchPhaseDef(d.id, { partQty: (e.target as HTMLInputElement).value })} />
+ ` : nothing}
+ ` : nothing}
+ this._removePhaseDef(d.id)}>
+
+
+ ${this.checklistsEnabled ? html`
+
+ ` : nothing}
+ ${t("phase_sequence_label", L)}
+
+ ${this._phaseSeq.map((id, i) => html`
+
+ ${i + 1}. ${defName(id)}
+
+
+ `)}
+
+
+ ` : nothing}
+ `;
+ }
+
private async _save(): Promise${t("checklist_help", L)}
` : nothing}
+ ${this._renderPhasesEditor(L)}
${t("require_on_completion", L)}
${REQUIRED_COMPLETION_KEYS.map((field) => html`
@@ -2742,6 +2888,82 @@ export class MaintenanceTaskDialog extends LitElement {
gap: 8px;
padding: 2px 0;
}
+ .phase-def {
+ border: 1px solid var(--divider-color);
+ border-radius: 6px;
+ padding: 8px;
+ margin: 6px 0;
+ }
+ .phase-def-head {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ }
+ .phase-def-head ms-textfield {
+ flex: 1;
+ min-width: 0;
+ }
+ .phase-part {
+ max-width: 160px;
+ padding: 6px;
+ border: 1px solid var(--divider-color);
+ border-radius: 4px;
+ background: var(--card-background-color);
+ color: var(--primary-text-color);
+ }
+ .phase-qty {
+ width: 64px;
+ padding: 6px;
+ border: 1px solid var(--divider-color);
+ border-radius: 4px;
+ background: var(--card-background-color);
+ color: var(--primary-text-color);
+ }
+ .phase-checklist {
+ min-height: 56px;
+ margin-top: 6px;
+ }
+ .phase-remove {
+ --mdc-icon-button-size: 36px;
+ color: var(--secondary-text-color);
+ }
+ .phase-seq-label {
+ font-size: 12px;
+ color: var(--secondary-text-color);
+ margin-top: 8px;
+ }
+ .phase-seq {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 6px;
+ padding: 4px 0;
+ }
+ .phase-chip {
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+ padding: 2px 8px;
+ border-radius: 12px;
+ background: var(--secondary-background-color);
+ font-size: 13px;
+ }
+ .phase-chip-x {
+ border: none;
+ background: none;
+ color: var(--secondary-text-color);
+ cursor: pointer;
+ padding: 0 2px;
+ font-size: 12px;
+ }
+ .phase-seq-add {
+ padding: 4px 8px;
+ border: 1px dashed var(--divider-color);
+ border-radius: 12px;
+ background: transparent;
+ color: var(--secondary-text-color);
+ font-size: 13px;
+ }
.consumes-check {
display: flex;
align-items: center;
diff --git a/custom_components/maintenance_supporter/frontend-src/components/task-quick-actions-dialog.ts b/custom_components/maintenance_supporter/frontend-src/components/task-quick-actions-dialog.ts
index d145b38a..f1227a83 100644
--- a/custom_components/maintenance_supporter/frontend-src/components/task-quick-actions-dialog.ts
+++ b/custom_components/maintenance_supporter/frontend-src/components/task-quick-actions-dialog.ts
@@ -18,6 +18,7 @@ import { sharedStyles, t, STATUS_COLORS, formatDate, formatDateTime, formatInter
import { describeWsError } from "../ws-errors";
import { isoDateLocal } from "../helpers/calendar-bucket";
import { partsForCompletion } from "../helpers/shared-parts";
+import { effectivePhase, phaseLabel } from "../helpers/phases";
import { renderWeibullSection } from "../renderers/weibull";
import { renderPredictionSection } from "../renderers/prediction";
import { renderRecommendationBars } from "../renderers/recommendation";
@@ -158,13 +159,17 @@ export class MaintenanceTaskQuickActionsDialog extends LitElement {
import("../dialog-mount").then(async ({ openCompleteDialog }) => {
const task = this._task!;
const isBuy = !!(task as { part_ref?: string }).part_ref;
+ // #139: a phased task completes the phase currently due, so the phase's
+ // checklist/parts/required fields replace the task-level ones here.
+ const phase = effectivePhase(task);
+ const links = phase ? phase.consumesParts : (task.consumes_parts || []);
let parts: Parameters[0]["parts"] = [];
if (!isBuy) {
try {
const r = await this.hass.connection.sendMessagePromise<{
objects: MaintenanceObjectResponse[];
}>({ type: "maintenance_supporter/objects", compact: true });
- parts = partsForCompletion(task, this._entryId!, r.objects || [], this._lang);
+ parts = partsForCompletion({ consumes_parts: links }, this._entryId!, r.objects || [], this._lang);
} catch {
// Parts stay empty — the dialog still completes without them.
}
@@ -173,13 +178,14 @@ export class MaintenanceTaskQuickActionsDialog extends LitElement {
entry_id: this._entryId!,
task_id: this._taskId!,
task_name: task.name,
- checklist: task.checklist || [],
+ checklist: phase ? phase.checklist : (task.checklist || []),
adaptive_enabled: !!task.adaptive_config?.enabled,
- required_completion_fields: task.required_completion_fields || [],
+ required_completion_fields: phase ? phase.requiredFields : (task.required_completion_fields || []),
task_type: task.type || "",
reading_unit: (task as { reading_unit?: string }).reading_unit || "",
parts,
- consumes_parts: isBuy ? [] : (task.consumes_parts || []),
+ consumes_parts: isBuy ? [] : links,
+ phase_label: phaseLabel(task),
});
if (ok) {
this._notifyChanged("complete");
@@ -542,6 +548,9 @@ export class MaintenanceTaskQuickActionsDialog extends LitElement {
${(task.schedule?.kind && !["manual", "one_time"].includes(task.schedule.kind)) || task.interval_days != null
? html`${t("interval", L) || "Interval"}: ${formatRecurrence(task, L)}`
: nothing}
+ ${phaseLabel(task)
+ ? html`${t("phase_current", L)}: ${phaseLabel(task)}`
+ : nothing}