([]);
const [note, setNote] = useState("");
+ const [aveta, setAveta] = useState(false);
const [search, setSearch] = useState("");
useEffect(() => {
@@ -44,8 +48,9 @@ export function ServiceNotesDialog({
}
setSel([pm, ...(extraServices ?? [])].filter((p, i, a) => !!p && a.indexOf(p) === i));
setNote(serviceNotes ?? "");
+ setAveta(Boolean(avetaRequired));
setSearch("");
- }, [open, pm, extraServices, serviceNotes]);
+ }, [open, pm, extraServices, serviceNotes, avetaRequired]);
const toggle = (value: string) => {
setSel((cur) => (cur.includes(value) ? cur.filter((x) => x !== value) : [...cur, value]));
@@ -87,6 +92,8 @@ export function ServiceNotesDialog({
setNote={setNote}
search={search}
setSearch={setSearch}
+ avetaRequired={aveta}
+ onAvetaRequiredChange={setAveta}
/>
@@ -116,6 +123,7 @@ export function ServiceNotesDialog({
pm: sel[0] ?? "",
extraServices: sel.slice(1),
serviceNotes: note,
+ avetaRequired: aveta,
});
onOpenChange(false);
}}
diff --git a/src/app/(protected)/workorders/_components/list/table/cells/wo-counter-pills.tsx b/src/app/(protected)/workorders/_components/list/table/cells/wo-counter-pills.tsx
new file mode 100644
index 00000000..3dad9c2d
--- /dev/null
+++ b/src/app/(protected)/workorders/_components/list/table/cells/wo-counter-pills.tsx
@@ -0,0 +1,79 @@
+import { RefreshCw } from "lucide-react";
+import { Tooltip } from "@mui/material";
+import { formatRescheduleHover } from "@/domain/work-orders/utils/reschedule-indicator";
+
+const RESCHEDULE_PILL_STYLE = {
+ background: "#f5f3ff",
+ color: "#7c3aed",
+ border: "1px solid #ddd6fe",
+} as const;
+
+const MUTED_PILL_STYLE = {
+ background: "var(--color-bg-muted)",
+ color: "var(--color-text-secondary)",
+ border: "1px solid var(--color-border)",
+} as const;
+
+const ADDON_PILL_STYLE = {
+ background: "var(--type-addon-bg)",
+ color: "var(--type-addon-text)",
+} as const;
+
+export function RescheduleCounterPill({
+ count,
+ originalDate,
+}: {
+ count: number;
+ originalDate?: string;
+}) {
+ if (count < 2) {
+ return null;
+ }
+
+ const hover = formatRescheduleHover(count, originalDate);
+
+ return (
+
+
+
+ {count}
+
+
+ );
+}
+
+export function CarriedOverCounterPill({ count }: { count: number }) {
+ if (count < 2) {
+ return null;
+ }
+
+ return (
+
+ {count}
+
+ );
+}
+
+export function AddOnPill({ when }: { when: boolean }) {
+ if (!when) {
+ return null;
+ }
+
+ return (
+
+ Add-On
+
+ );
+}
diff --git a/src/app/(protected)/workorders/_components/list/table/wo-table-inline-row-cells.tsx b/src/app/(protected)/workorders/_components/list/table/wo-table-inline-row-cells.tsx
index 11ecf728..8f6482ea 100644
--- a/src/app/(protected)/workorders/_components/list/table/wo-table-inline-row-cells.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/wo-table-inline-row-cells.tsx
@@ -178,6 +178,7 @@ export function WoTableInlineRowCells({
pmTypes={pmTypes}
serviceNotes={draft.serviceNotes}
extraServices={draft.extraServices}
+ avetaRequired={draft.avetaRequired}
woNumber={draft.woNumber}
onSave={(pm) => onPatch({ pm })}
onSaveDetails={(d) =>
@@ -185,6 +186,7 @@ export function WoTableInlineRowCells({
pm: d.pm,
extraServices: d.extraServices,
serviceNotes: d.serviceNotes,
+ avetaRequired: d.avetaRequired,
})
}
/>
diff --git a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
index 3e64f0cc..bb904aaa 100644
--- a/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/wo-table-row-cells.tsx
@@ -81,6 +81,7 @@ export function WoTableRowCells({
rescheduleCount={row.rescheduleCount}
carriedOver={row.carriedOver}
isAddOn={row.isAddOn}
+ originalDate={row.originalDate}
q={search}
currentId={row.id}
allOrders={allRows}
diff --git a/src/app/(protected)/workorders/_components/list/table/wo-table-row-service-cells.tsx b/src/app/(protected)/workorders/_components/list/table/wo-table-row-service-cells.tsx
index 3d3e3fc6..1c6ac5ae 100644
--- a/src/app/(protected)/workorders/_components/list/table/wo-table-row-service-cells.tsx
+++ b/src/app/(protected)/workorders/_components/list/table/wo-table-row-service-cells.tsx
@@ -49,6 +49,7 @@ export function WoTableRowServiceCells({
q={search}
serviceNotes={row.serviceNotes}
extraServices={row.extraServices}
+ avetaRequired={row.avetaRequired}
woNumber={row.woNumber}
viewOnly={viewOnly}
onSave={(pm) => onPatchRow({ pm })}
@@ -57,6 +58,7 @@ export function WoTableRowServiceCells({
pm: d.pm,
extraServices: d.extraServices,
serviceNotes: d.serviceNotes,
+ avetaRequired: d.avetaRequired,
})
}
/>
diff --git a/src/app/(protected)/workorders/_components/wizard/wizard-service-notes-fields.tsx b/src/app/(protected)/workorders/_components/wizard/wizard-service-notes-fields.tsx
index 505a2f7c..1f0dafc2 100644
--- a/src/app/(protected)/workorders/_components/wizard/wizard-service-notes-fields.tsx
+++ b/src/app/(protected)/workorders/_components/wizard/wizard-service-notes-fields.tsx
@@ -1,6 +1,7 @@
import type { ReactNode } from "react";
import { Check } from "lucide-react";
import { getPmTypeIcon } from "@/app/(protected)/workorders/_components/list/table/pm-type-icons";
+import { AvetaCheckbox } from "@/app/(protected)/workorders/_components/list/table/cells/aveta-checkbox";
import {
DLG_INPUT_CLS,
DLG_INPUT_STYLE,
@@ -14,6 +15,8 @@ type WizardServiceNotesFieldsProps = {
setNote: (v: string) => void;
search: string;
setSearch: (v: string) => void;
+ avetaRequired?: boolean;
+ onAvetaRequiredChange?: (value: boolean) => void;
};
function SvcSectionLabel({ children }: { children: ReactNode }) {
@@ -43,6 +46,8 @@ export function WizardServiceNotesFields({
setNote,
search,
setSearch,
+ avetaRequired = false,
+ onAvetaRequiredChange,
}: WizardServiceNotesFieldsProps) {
const filtered = search
? services.filter((s) => s.value.toLowerCase().includes(search.toLowerCase()))
@@ -124,6 +129,11 @@ export function WizardServiceNotesFields({
)}
+ {onAvetaRequiredChange != null && (
+
+ )}
Notes / Issue Detail