+
+
+
+ {{ $t("maintenance.list.select_item") }}
+
+
+
+
+
+
+
+
+
+
@@ -194,10 +318,22 @@
+
+
+
+
+
+ {{ $t("maintenance.list.overdue_since") }}
+
+
+
+ {{ $t("maintenance.list.overdue") }}
+
+
@@ -220,7 +356,7 @@
size="sm"
@click="
openDialog(DialogID.EditMaintenance, {
- params: { type: 'update', maintenanceEntry: e },
+ params: { type: 'update', maintenanceEntry: e, itemId: props.currentItemId ?? undefined },
onClose: result => {
if (result) {
refreshList();
diff --git a/frontend/components/ui/dialog-provider/DialogProvider.vue b/frontend/components/ui/dialog-provider/DialogProvider.vue
index 47e417820..f0a6bfc70 100644
--- a/frontend/components/ui/dialog-provider/DialogProvider.vue
+++ b/frontend/components/ui/dialog-provider/DialogProvider.vue
@@ -8,7 +8,8 @@
const activeDialog = ref(null);
const activeAlerts = reactive([]);
- const openDialogCallbacks = new Map void>();
+ /** Multiple components may register for the same dialog (e.g. two MaintenanceEditModal trees); invoke all. */
+ const openDialogCallbacks = new Map void>>();
// onClose for the currently-open dialog (only one dialog can be active)
let activeOnCloseCallback: ((result?: any) => void) | undefined;
@@ -17,9 +18,22 @@
dialogId: T,
callback: (params?: T extends keyof DialogParamsMap ? DialogParamsMap[T] : undefined) => void
) => {
- openDialogCallbacks.set(dialogId, callback as (params: any) => void);
+ const cb = callback as (params: any) => void;
+ let set = openDialogCallbacks.get(dialogId);
+ if (!set) {
+ set = new Set();
+ openDialogCallbacks.set(dialogId, set);
+ }
+ set.add(cb);
return () => {
- openDialogCallbacks.delete(dialogId);
+ const s = openDialogCallbacks.get(dialogId);
+ if (!s) {
+ return;
+ }
+ s.delete(cb);
+ if (s.size === 0) {
+ openDialogCallbacks.delete(dialogId);
+ }
};
};
@@ -29,9 +43,11 @@
activeDialog.value = dialogId;
activeOnCloseCallback = options?.onClose;
- const openCallback = openDialogCallbacks.get(dialogId);
- if (openCallback) {
- openCallback(options?.params);
+ const callbacks = openDialogCallbacks.get(dialogId);
+ if (callbacks) {
+ for (const openCallback of callbacks) {
+ openCallback(options?.params);
+ }
}
};
diff --git a/frontend/components/ui/dialog-provider/utils.ts b/frontend/components/ui/dialog-provider/utils.ts
index fed5e5b98..568f6f372 100644
--- a/frontend/components/ui/dialog-provider/utils.ts
+++ b/frontend/components/ui/dialog-provider/utils.ts
@@ -68,7 +68,7 @@ export type DialogParamsMap = {
[DialogID.ProductImport]?: { barcode?: string };
[DialogID.EditMaintenance]:
| { type: "create"; itemId: string | string[] }
- | { type: "update"; maintenanceEntry: MaintenanceEntry | MaintenanceEntryWithDetails }
+ | { type: "update"; maintenanceEntry: MaintenanceEntry | MaintenanceEntryWithDetails; itemId?: string }
| { type: "duplicate"; maintenanceEntry: MaintenanceEntry | MaintenanceEntryWithDetails; itemId: string };
[DialogID.ItemChangeDetails]: {
items: EntitySummary[];
diff --git a/frontend/lib/api/classes/items.ts b/frontend/lib/api/classes/items.ts
index 64fa3f308..8518ea8db 100644
--- a/frontend/lib/api/classes/items.ts
+++ b/frontend/lib/api/classes/items.ts
@@ -11,6 +11,8 @@ import type {
MaintenanceEntry,
MaintenanceEntryCreate,
MaintenanceEntryWithDetails,
+ MaintenancePlan,
+ MaintenancePlanCreate,
TreeItem,
} from "../types/data-contracts";
import type { AttachmentTypes } from "../types/non-generated";
@@ -102,6 +104,19 @@ export class ItemMaintenanceAPI extends BaseAPI {
body: data,
});
}
+
+ getPlans(itemId: string) {
+ return this.http.get({
+ url: route(`/entities/${itemId}/maintenance/plans`),
+ });
+ }
+
+ createPlan(itemId: string, data: MaintenancePlanCreate) {
+ return this.http.post({
+ url: route(`/entities/${itemId}/maintenance/plans`),
+ body: data,
+ });
+ }
}
export class ItemsApi extends BaseAPI {
diff --git a/frontend/lib/api/classes/maintenance.ts b/frontend/lib/api/classes/maintenance.ts
index 22e9b0791..2ebb38bcd 100644
--- a/frontend/lib/api/classes/maintenance.ts
+++ b/frontend/lib/api/classes/maintenance.ts
@@ -1,6 +1,8 @@
import { BaseAPI, route } from "../base";
import type {
MaintenanceEntry,
+ MaintenancePlan,
+ MaintenancePlanUpdate,
MaintenanceEntryUpdate,
MaintenanceEntryWithDetails,
MaintenanceFilterStatus,
@@ -27,4 +29,15 @@ export class MaintenanceAPI extends BaseAPI {
body: data,
});
}
+
+ updatePlan(id: string, data: MaintenancePlanUpdate) {
+ return this.http.put({
+ url: route(`/maintenance/plans/${id}`),
+ body: data,
+ });
+ }
+
+ deletePlan(id: string) {
+ return this.http.delete({ url: route(`/maintenance/plans/${id}`) });
+ }
}
diff --git a/frontend/lib/api/types/data-contracts.ts b/frontend/lib/api/types/data-contracts.ts
index 5417d8e30..5d3e4fdc7 100644
--- a/frontend/lib/api/types/data-contracts.ts
+++ b/frontend/lib/api/types/data-contracts.ts
@@ -26,10 +26,19 @@ export enum TemplatefieldType {
export enum MaintenanceFilterStatus {
MaintenanceFilterStatusScheduled = "scheduled",
+ MaintenanceFilterStatusOverdue = "overdue",
MaintenanceFilterStatusCompleted = "completed",
MaintenanceFilterStatusBoth = "both",
}
+export enum MaintenancePlanIntervalUnit {
+ Hour = "hour",
+ Day = "day",
+ Week = "week",
+ Month = "month",
+ Year = "year",
+}
+
export enum EntityPathType {
EntityPathTypeLocation = "location",
EntityPathTypeItem = "item",
@@ -1100,7 +1109,9 @@ export interface MaintenanceEntry {
cost: string;
description: string;
id: string;
+ isOverdue: boolean;
name: string;
+ planID?: string;
scheduledDate: Date | string;
}
@@ -1110,6 +1121,7 @@ export interface MaintenanceEntryCreate {
cost: string;
description: string;
name: string;
+ planID?: string;
scheduledDate: Date | string;
}
@@ -1119,6 +1131,7 @@ export interface MaintenanceEntryUpdate {
cost: string;
description: string;
name: string;
+ planID?: string;
scheduledDate: Date | string;
}
@@ -1128,12 +1141,48 @@ export interface MaintenanceEntryWithDetails {
cost: string;
description: string;
id: string;
+ isOverdue: boolean;
itemID: string;
itemName: string;
name: string;
+ planID?: string;
scheduledDate: Date | string;
}
+export interface MaintenancePlan {
+ active: boolean;
+ description: string;
+ id: string;
+ intervalUnit: MaintenancePlanIntervalUnit;
+ intervalValue: number;
+ itemID: string;
+ lastCompletedAt: Date | string;
+ name: string;
+ nextDueAt: Date | string;
+}
+
+export interface MaintenancePlanCreate {
+ active: boolean;
+ description: string;
+ intervalUnit: MaintenancePlanIntervalUnit;
+ intervalValue: number;
+ name: string;
+ /** Date-only string (YYYY-MM-DD) or Date; normalized server-side to UTC calendar date */
+ startDate: Date | string;
+ /** When set, links this maintenance entry to the new plan instead of auto-creating a duplicate open entry */
+ linkExistingEntryID?: string;
+}
+
+export interface MaintenancePlanUpdate {
+ active: boolean;
+ description: string;
+ intervalUnit: MaintenancePlanIntervalUnit;
+ intervalValue: number;
+ name: string;
+ /** Omitted to keep the plan’s current next due when only name/description/active change */
+ nextDueAt?: Date | string;
+}
+
export interface NotifierCreate {
isActive: boolean;
/**
diff --git a/frontend/lib/maintenance/recurrence.test.ts b/frontend/lib/maintenance/recurrence.test.ts
new file mode 100644
index 000000000..62dfb08bf
--- /dev/null
+++ b/frontend/lib/maintenance/recurrence.test.ts
@@ -0,0 +1,44 @@
+import { describe, expect, it } from "vitest";
+import { MaintenancePlanIntervalUnit } from "~~/lib/api/types/data-contracts";
+import { getNextNDueDates } from "./recurrence";
+
+describe("getNextNDueDates", () => {
+ it("includes scheduled date as the first due date", () => {
+ const scheduledDate = new Date("2026-03-10T09:30:00Z");
+ const dueDates = getNextNDueDates(scheduledDate, 1, MaintenancePlanIntervalUnit.Week, 3);
+
+ expect(dueDates).toHaveLength(3);
+ const [firstDueDate, secondDueDate, thirdDueDate] = dueDates;
+ expect(firstDueDate?.toISOString()).toBe("2026-03-10T09:30:00.000Z");
+ expect(secondDueDate?.toISOString()).toBe("2026-03-17T09:30:00.000Z");
+ expect(thirdDueDate?.toISOString()).toBe("2026-03-24T09:30:00.000Z");
+ });
+
+ it("applies month interval consistently", () => {
+ const scheduledDate = new Date("2026-01-15T00:00:00Z");
+ const dueDates = getNextNDueDates(scheduledDate, 1, MaintenancePlanIntervalUnit.Month, 3);
+
+ const [firstDueDate, secondDueDate, thirdDueDate] = dueDates;
+ expect(firstDueDate?.toISOString()).toBe("2026-01-15T00:00:00.000Z");
+ expect(secondDueDate?.toISOString()).toBe("2026-02-15T00:00:00.000Z");
+ expect(thirdDueDate?.toISOString()).toBe("2026-03-15T00:00:00.000Z");
+ });
+
+ it("clamps end-of-month when adding months (Jan 31 → Feb)", () => {
+ const scheduledDate = new Date("2026-01-31T12:00:00Z");
+ const dueDates = getNextNDueDates(scheduledDate, 1, MaintenancePlanIntervalUnit.Month, 2);
+
+ const [firstDueDate, secondDueDate] = dueDates;
+ expect(firstDueDate?.toISOString()).toBe("2026-01-31T12:00:00.000Z");
+ expect(secondDueDate?.toISOString()).toBe("2026-02-28T12:00:00.000Z");
+ });
+
+ it("clamps leap day when adding years (Feb 29 → non-leap)", () => {
+ const scheduledDate = new Date("2024-02-29T08:00:00Z");
+ const dueDates = getNextNDueDates(scheduledDate, 1, MaintenancePlanIntervalUnit.Year, 2);
+
+ const [firstDueDate, secondDueDate] = dueDates;
+ expect(firstDueDate?.toISOString()).toBe("2024-02-29T08:00:00.000Z");
+ expect(secondDueDate?.toISOString()).toBe("2025-02-28T08:00:00.000Z");
+ });
+});
diff --git a/frontend/lib/maintenance/recurrence.ts b/frontend/lib/maintenance/recurrence.ts
new file mode 100644
index 000000000..b121dfb2a
--- /dev/null
+++ b/frontend/lib/maintenance/recurrence.ts
@@ -0,0 +1,52 @@
+import { MaintenancePlanIntervalUnit } from "~~/lib/api/types/data-contracts";
+
+function addInterval(base: Date, intervalValue: number, intervalUnit: MaintenancePlanIntervalUnit): Date {
+ const next = new Date(base);
+ switch (intervalUnit) {
+ case MaintenancePlanIntervalUnit.Hour:
+ next.setHours(next.getHours() + intervalValue);
+ return next;
+ case MaintenancePlanIntervalUnit.Day:
+ next.setDate(next.getDate() + intervalValue);
+ return next;
+ case MaintenancePlanIntervalUnit.Week:
+ next.setDate(next.getDate() + intervalValue * 7);
+ return next;
+ case MaintenancePlanIntervalUnit.Month: {
+ const y = next.getUTCFullYear();
+ const m = next.getUTCMonth();
+ const day = next.getUTCDate();
+ const totalMonths = y * 12 + m + intervalValue;
+ const ty = Math.floor(totalMonths / 12);
+ const tm = totalMonths - ty * 12;
+ const lastDay = new Date(Date.UTC(ty, tm + 1, 0)).getUTCDate();
+ next.setUTCFullYear(ty, tm, Math.min(day, lastDay));
+ return next;
+ }
+ case MaintenancePlanIntervalUnit.Year: {
+ const y = next.getUTCFullYear() + intervalValue;
+ const m = next.getUTCMonth();
+ const day = next.getUTCDate();
+ const lastDay = new Date(Date.UTC(y, m + 1, 0)).getUTCDate();
+ next.setUTCFullYear(y, m, Math.min(day, lastDay));
+ return next;
+ }
+ default:
+ return next;
+ }
+}
+
+export function getNextNDueDates(
+ firstDueDate: Date,
+ intervalValue: number,
+ intervalUnit: MaintenancePlanIntervalUnit,
+ count: number
+): Date[] {
+ const result: Date[] = [];
+ let current = new Date(firstDueDate);
+ for (let i = 0; i < count; i++) {
+ result.push(new Date(current));
+ current = addInterval(current, intervalValue, intervalUnit);
+ }
+ return result;
+}
diff --git a/frontend/locales/en.json b/frontend/locales/en.json
index 85435aff3..9c11309d1 100644
--- a/frontend/locales/en.json
+++ b/frontend/locales/en.json
@@ -687,6 +687,7 @@
"filter": {
"both": "Both",
"completed": "Completed",
+ "overdue": "Overdue",
"scheduled": "Scheduled"
},
"list": {
@@ -695,7 +696,10 @@
"delete": "Delete",
"duplicate": "Duplicate",
"edit": "Edit",
- "new": "New"
+ "new": "New",
+ "overdue": "Overdue",
+ "overdue_since": "Overdue since",
+ "select_item": "Select Item"
},
"modal": {
"completed_date": "Completed Date",
@@ -704,9 +708,17 @@
"edit_action": "Update",
"edit_title": "Edit Entry",
"entry_name": "Entry Name",
+ "interval_day": "Day(s)",
+ "interval_hour": "Hour(s)",
+ "interval_month": "Month(s)",
+ "interval_value": "Every",
+ "interval_week": "Week(s)",
+ "interval_year": "Year(s)",
"new_action": "Create",
"new_title": "New Entry",
+ "next_scheduled_dates": "Next scheduled dates",
"notes": "Notes",
+ "recurring": "Recurring Plan",
"scheduled_date": "Scheduled Date"
},
"monthly_average": "Monthly Average",