fix: bar chart in day modal shows that day's field values per subject
Previously showed cumulative success/failure counts across all days. Now shows the selected field's actual value for each subject on that specific day — numeric values only, subjects with empty or non-numeric values are excluded from the chart. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -48,32 +48,30 @@ function DayPanel({ date, animals, allStatuses, template, experimentId, selected
|
|||||||
return map;
|
return map;
|
||||||
}, [allStatuses, dateStr]);
|
}, [allStatuses, dateStr]);
|
||||||
|
|
||||||
const barData = useMemo(() => {
|
// Only show animals that have a status record for this day
|
||||||
if (!selectedField) return [];
|
const animalsWithData = animals.filter((a) => statusByAnimal[a.id]);
|
||||||
const isBuiltin = BUILTIN_KEYS_SET.has(selectedField);
|
|
||||||
return animals
|
|
||||||
.map((animal) => {
|
|
||||||
const statuses = allStatuses.filter((s) => s.animal_id === animal.id);
|
|
||||||
const total = statuses.length;
|
|
||||||
const success = statuses.filter((s) => {
|
|
||||||
const val = isBuiltin ? s[selectedField] : s.custom_fields?.[selectedField];
|
|
||||||
return val !== null && val !== undefined && String(val).trim() !== '';
|
|
||||||
}).length;
|
|
||||||
return {
|
|
||||||
name: animal.animal_name || animal.animal_id_string || animal.id.slice(0, 8),
|
|
||||||
total,
|
|
||||||
success,
|
|
||||||
failure: total - success,
|
|
||||||
pct: total > 0 ? Math.round((success / total) * 100) : 0,
|
|
||||||
};
|
|
||||||
})
|
|
||||||
.filter((d) => d.total > 0);
|
|
||||||
}, [animals, allStatuses, selectedField]);
|
|
||||||
|
|
||||||
const fieldLabel = fieldOptions.find((f) => f.value === selectedField)?.label;
|
const fieldLabel = fieldOptions.find((f) => f.value === selectedField)?.label;
|
||||||
|
|
||||||
// Only show animals that have a status record for this day
|
// Bar chart: this day's field value per subject (numeric fields only)
|
||||||
const animalsWithData = animals.filter((a) => statusByAnimal[a.id]);
|
const barData = useMemo(() => {
|
||||||
|
if (!selectedField) return [];
|
||||||
|
const isBuiltin = BUILTIN_KEYS_SET.has(selectedField);
|
||||||
|
return animalsWithData
|
||||||
|
.map((animal) => {
|
||||||
|
const status = statusByAnimal[animal.id];
|
||||||
|
if (!status) return null;
|
||||||
|
const raw = isBuiltin ? status[selectedField] : status.custom_fields?.[selectedField];
|
||||||
|
if (raw === null || raw === undefined || String(raw).trim() === '') return null;
|
||||||
|
const num = parseFloat(raw);
|
||||||
|
if (isNaN(num)) return null;
|
||||||
|
return {
|
||||||
|
name: animal.animal_name || animal.animal_id_string || animal.id.slice(0, 8),
|
||||||
|
value: num,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
.filter(Boolean);
|
||||||
|
}, [animalsWithData, statusByAnimal, selectedField]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-3 max-h-[80vh] overflow-y-auto pr-1">
|
<div className="space-y-3 max-h-[80vh] overflow-y-auto pr-1">
|
||||||
@@ -123,28 +121,17 @@ function DayPanel({ date, animals, allStatuses, template, experimentId, selected
|
|||||||
{barData.length > 0 && (
|
{barData.length > 0 && (
|
||||||
<div className="mt-4 pt-4 border-t border-gray-100">
|
<div className="mt-4 pt-4 border-t border-gray-100">
|
||||||
<h4 className="text-sm font-semibold text-gray-700 mb-3">
|
<h4 className="text-sm font-semibold text-gray-700 mb-3">
|
||||||
Overall completeness by subject
|
{fieldLabel ?? 'Field'} by subject
|
||||||
{fieldLabel && <span className="ml-2 font-normal text-gray-400">— {fieldLabel}</span>}
|
|
||||||
</h4>
|
</h4>
|
||||||
<ResponsiveContainer width="100%" height={200}>
|
<ResponsiveContainer width="100%" height={200}>
|
||||||
<BarChart data={barData} margin={{ top: 4, right: 16, left: 0, bottom: 4 }}>
|
<BarChart data={barData} margin={{ top: 4, right: 16, left: 0, bottom: 4 }}>
|
||||||
<CartesianGrid strokeDasharray="3 3" stroke="#f0f0f0" />
|
<CartesianGrid strokeDasharray="3 3" stroke="#f0f0f0" />
|
||||||
<XAxis dataKey="name" tick={{ fontSize: 11 }} />
|
<XAxis dataKey="name" tick={{ fontSize: 11 }} />
|
||||||
<YAxis tick={{ fontSize: 11 }} allowDecimals={false} />
|
<YAxis tick={{ fontSize: 11 }} />
|
||||||
<Tooltip />
|
<Tooltip formatter={(v) => [v, fieldLabel ?? 'Value']} />
|
||||||
<Legend wrapperStyle={{ fontSize: 11 }} />
|
<Bar dataKey="value" name={fieldLabel ?? 'Value'} fill="#6366f1" radius={[3, 3, 0, 0]} />
|
||||||
<Bar dataKey="total" name="Total" fill="#94a3b8" />
|
|
||||||
<Bar dataKey="success" name="Success" fill="#22c55e" />
|
|
||||||
<Bar dataKey="failure" name="Failure" fill="#f87171" minPointSize={2} />
|
|
||||||
</BarChart>
|
</BarChart>
|
||||||
</ResponsiveContainer>
|
</ResponsiveContainer>
|
||||||
<div className="mt-2 flex flex-wrap gap-4">
|
|
||||||
{barData.map((d) => (
|
|
||||||
<span key={d.name} className="text-xs text-gray-500">
|
|
||||||
<span className="font-medium text-gray-700">{d.name}</span>: {d.pct}% complete
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ describe('day click modal', () => {
|
|||||||
// ── Bar chart (inside day modal) ──────────────────────────────────────────────
|
// ── Bar chart (inside day modal) ──────────────────────────────────────────────
|
||||||
|
|
||||||
describe('bar chart inside day modal', () => {
|
describe('bar chart inside day modal', () => {
|
||||||
it('renders bar chart inside modal when animals have statuses', async () => {
|
it('renders bar chart for numeric field values on that day', async () => {
|
||||||
const dateStr = todayStr();
|
const dateStr = todayStr();
|
||||||
const statuses = [
|
const statuses = [
|
||||||
makeStatus('a1000000-0000-0000-0000-000000000001', dateStr, { 'ww000000-0000-0000-0000-000000000099': '325' }),
|
makeStatus('a1000000-0000-0000-0000-000000000001', dateStr, { 'ww000000-0000-0000-0000-000000000099': '325' }),
|
||||||
@@ -263,21 +263,16 @@ describe('bar chart inside day modal', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not render bar chart in modal when no animals have overall statuses', async () => {
|
it('does not render bar chart when selected field is non-numeric', async () => {
|
||||||
const dateStr = todayStr();
|
const dateStr = todayStr();
|
||||||
// Give Rat A a status today so the day is clickable, but use a different animal not in barData
|
// vitals is a text field — not numeric, so no bar chart
|
||||||
const statuses = [
|
const statuses = [makeStatus('a1000000-0000-0000-0000-000000000001', dateStr, {}, 'HR 72')];
|
||||||
makeStatus('a1000000-0000-0000-0000-000000000001', dateStr, { 'ww000000-0000-0000-0000-000000000099': '325' }),
|
|
||||||
];
|
|
||||||
// Use animals list with no matching statuses for barData by filtering to empty
|
|
||||||
render(
|
render(
|
||||||
<ExperimentCalendar experimentId={EXP_ID} template={TEMPLATE} allStatuses={statuses} animals={[]} />,
|
<ExperimentCalendar experimentId={EXP_ID} template={TEMPLATE} allStatuses={statuses} animals={ANIMALS} />,
|
||||||
);
|
|
||||||
// No days enabled since animals=[] means no bar chart, but day is also not enabled
|
|
||||||
// Just verify no bar chart on empty statuses/animals
|
|
||||||
render(
|
|
||||||
<ExperimentCalendar experimentId={EXP_ID} template={TEMPLATE} allStatuses={[]} animals={ANIMALS} />,
|
|
||||||
);
|
);
|
||||||
|
fireEvent.change(screen.getByTestId('field-select'), { target: { value: 'vitals' } });
|
||||||
|
fireEvent.click(screen.getByTestId(`day-${dateStr}`));
|
||||||
|
await waitFor(() => screen.getByRole('dialog'));
|
||||||
expect(screen.queryByTestId('bar-chart')).not.toBeInTheDocument();
|
expect(screen.queryByTestId('bar-chart')).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user