429 files

custom_components/maintenance_supporter/frontend-src/maintenance-card.ts

@@ -18,10 +18,11 @@ import type {
   SavedViewFilters,
 } from "./types";
 import { UserService } from "./user-service";
-import { partsForCompletion } from "./helpers/shared-parts";
-import { effectivePhase, phaseLabel } from "./helpers/phases";
+import { phaseLabel } from "./helpers/phases";
+import { buildCompleteDialogArgs, fillAndOpenCompleteDialog } from "./helpers/complete-dialog-args";
 import "./maintenance-card-editor";
 import "./components/complete-dialog";
+import type { MaintenanceCompleteDialog } from "./components/complete-dialog";
 // The Battery Fleet card ships in this globally-loaded bundle so it is
 // available on every dashboard without another extra_module_url entry.
 import "./components/battery-fleet-card";
@@ -514,32 +515,26 @@ export class MaintenanceSupporterCard extends LitElement {
                               @click=${(e: Event) => {
                                 // Stop the row's open-task handler from also firing
                                 e.stopPropagation();
-                                const dlg = this.shadowRoot!.querySelector("maintenance-complete-dialog") as any;
-                                // #139: a phased task completes the phase
-                                // currently due — its fields override the
-                                // task-level ones (fallthrough included).
-                                const phase = effectivePhase(task);
-                                dlg.entryId = entry_id;
-                                dlg.taskId = task.id;
-                                dlg.taskName = task.name;
-                                dlg.checklist = phase ? phase.checklist : (task.checklist || []);
-                                dlg.adaptiveEnabled = !!task.adaptive_config?.enabled;
-                                dlg.taskType = task.type || "";
-                                dlg.readingUnit = (task as any).reading_unit || "";
-                                dlg.requiredFields = phase ? phase.requiredFields : (task.required_completion_fields || []);
-                                dlg.phaseLabel = phaseLabel(task);
-                                dlg.lang = L;
-                                // #99: editable per-completion parts selection
-                                // (skip on buy tasks — those restock instead).
-                                // #111: the list also carries the shared pools
-                                // this task draws on, each named after its
-                                // owner — resolving against the object's own
-                                // parts alone left a foreign link invisible.
-                                const isBuy = !!(task as any).part_ref;
-                                const links = phase ? phase.consumesParts : (task.consumes_parts || []);
-                                dlg.parts = isBuy ? [] : partsForCompletion({ consumes_parts: links }, entry_id, this._objects, L);
-                                dlg.consumesParts = isBuy ? [] : links;
-                                dlg.open();
+                                const dlg = this.shadowRoot!.querySelector<MaintenanceCompleteDialog>("maintenance-complete-dialog")!;
+                                // The SAME derivation the panel uses (phase
+                                // override, parts incl. shared pools, tag-scan
+                                // gate, restock default, checklist ticks) — the
+                                // card used to forward a subset.
+                                fillAndOpenCompleteDialog(
+                                  dlg,
+                                  buildCompleteDialogArgs({
+                                    entryId: entry_id,
+                                    taskId: task.id,
+                                    taskName: task.name,
+                                    task,
+                                    objects: this._objects,
+                                    lang: L,
+                                    checklist: task.checklist || [],
+                                    adaptiveEnabled: !!task.adaptive_config?.enabled,
+                                    currencySymbol: this._stats?.budget?.currency_symbol || "",
+                                  }),
+                                  L,
+                                );
                               }}
                             >
                               <ha-icon icon="mdi:check"></ha-icon>