diff --git a/src/admin/components/PlanGrid.tsx b/src/admin/components/PlanGrid.tsx
index 46483a0..13aa9fe 100644
--- a/src/admin/components/PlanGrid.tsx
+++ b/src/admin/components/PlanGrid.tsx
@@ -1,9 +1,11 @@
import { GridData, ResolvedCell } from "../lib/queries/plan";
+import type { Project } from "../lib/queries/projects";
import PlanRangeChips from "./PlanRangeChips";
interface Props {
data: GridData | undefined;
canEdit: boolean;
+ projects: Project[];
onCellClick: (
userId: number,
date: string,
@@ -32,7 +34,12 @@ function isWeekend(dateStr: string): boolean {
return day === 0 || day === 6;
}
-export default function PlanGrid({ data, canEdit, onCellClick }: Props) {
+export default function PlanGrid({
+ data,
+ canEdit,
+ projects,
+ onCellClick,
+}: Props) {
if (!data)
return (
@@ -72,7 +79,16 @@ export default function PlanGrid({ data, canEdit, onCellClick }: Props) {
className={cls}
onClick={() => onCellClick(u.id, date, cell)}
>
-
+
p.id === cell.project_id) ??
+ null)
+ : null
+ }
+ readonly={!canEdit}
+ />
);
diff --git a/src/admin/components/PlanRangeChips.tsx b/src/admin/components/PlanRangeChips.tsx
index 16ec9d7..796b49d 100644
--- a/src/admin/components/PlanRangeChips.tsx
+++ b/src/admin/components/PlanRangeChips.tsx
@@ -1,7 +1,9 @@
import { ResolvedCell } from "../lib/queries/plan";
+import type { Project } from "../lib/queries/projects";
interface Props {
cell: ResolvedCell | null;
+ project: Project | null;
readonly?: boolean;
}
@@ -15,19 +17,32 @@ const CATEGORY_LABELS: Record = {
other: "Jiné",
};
-export default function PlanRangeChips({ cell, readonly }: Props) {
+export default function PlanRangeChips({ cell, project, readonly }: Props) {
+ void readonly;
if (!cell) return null;
+ const projectLabel = project
+ ? project.project_number
+ ? `${project.project_number} — ${project.name}`
+ : project.name
+ : null;
+ const projectTitle = project
+ ? project.project_number
+ ? `${project.project_number} — ${project.name}`
+ : project.name
+ : undefined;
return (
-
-
- {CATEGORY_LABELS[cell.category] ?? cell.category}
-
- {cell.project_id && (
-
- {`#${cell.project_id}`}
+
+
+
+ {CATEGORY_LABELS[cell.category] ?? cell.category}
- )}
- {cell.note && {cell.note}}
+ {projectLabel && (
+
+ {projectLabel}
+
+ )}
+
+ {cell.note &&
{cell.note}
}
);
}
diff --git a/src/admin/pages/PlanWork.tsx b/src/admin/pages/PlanWork.tsx
index d7c4415..456af20 100644
--- a/src/admin/pages/PlanWork.tsx
+++ b/src/admin/pages/PlanWork.tsx
@@ -448,7 +448,12 @@ export default function PlanWork() {
)}
-
+