fix: auto-mark intakes at due time and show robot marker (#261)
* fix: auto-mark intakes at due time and show robot marker * test: add taken_source to integration schema * test: align e2e route schema with taken_source
This commit is contained in:
@@ -8,10 +8,12 @@ export interface UseDosesReturn {
|
||||
takenDoses: Set<string>;
|
||||
setTakenDoses: React.Dispatch<React.SetStateAction<Set<string>>>;
|
||||
takenDoseTimestamps: Map<string, number>;
|
||||
takenDoseSources: Map<string, "manual" | "automatic">;
|
||||
dismissedDoses: Set<string>;
|
||||
showClearMissedConfirm: boolean;
|
||||
setShowClearMissedConfirm: (show: boolean) => void;
|
||||
getDoseId: (baseDoseId: string, person: string | null) => string;
|
||||
isDoseTakenAutomatically: (doseId: string) => boolean;
|
||||
countTakenDoses: (doses: Array<{ id: string; takenBy: string[] }>) => { total: number; taken: number };
|
||||
markDoseTaken: (doseId: string) => Promise<void>;
|
||||
undoDoseTaken: (doseId: string) => Promise<void>;
|
||||
@@ -21,6 +23,7 @@ export interface UseDosesReturn {
|
||||
export function useDoses(): UseDosesReturn {
|
||||
const [takenDoses, setTakenDoses] = useState<Set<string>>(new Set());
|
||||
const [takenDoseTimestamps, setTakenDoseTimestamps] = useState<Map<string, number>>(new Map());
|
||||
const [takenDoseSources, setTakenDoseSources] = useState<Map<string, "manual" | "automatic">>(new Map());
|
||||
const [dismissedDoses, setDismissedDoses] = useState<Set<string>>(new Set());
|
||||
const [showClearMissedConfirm, setShowClearMissedConfirm] = useState(false);
|
||||
|
||||
@@ -42,6 +45,7 @@ export function useDoses(): UseDosesReturn {
|
||||
const data = await res.json();
|
||||
const taken = new Set<string>();
|
||||
const timestamps = new Map<string, number>();
|
||||
const sources = new Map<string, "manual" | "automatic">();
|
||||
const dismissed = new Set<string>();
|
||||
for (const d of data.doses) {
|
||||
if (d.dismissed) {
|
||||
@@ -49,10 +53,12 @@ export function useDoses(): UseDosesReturn {
|
||||
} else {
|
||||
taken.add(d.doseId);
|
||||
timestamps.set(d.doseId, d.takenAt);
|
||||
sources.set(d.doseId, d.takenSource === "automatic" ? "automatic" : "manual");
|
||||
}
|
||||
}
|
||||
setTakenDoses(taken);
|
||||
setTakenDoseTimestamps(timestamps);
|
||||
setTakenDoseSources(sources);
|
||||
setDismissedDoses(dismissed);
|
||||
}
|
||||
// Don't reset on error - keep current state
|
||||
@@ -75,6 +81,13 @@ export function useDoses(): UseDosesReturn {
|
||||
return person ? `${baseDoseId}-${person}` : baseDoseId;
|
||||
}, []);
|
||||
|
||||
const isDoseTakenAutomatically = useCallback(
|
||||
(doseId: string): boolean => {
|
||||
return takenDoseSources.get(doseId) === "automatic";
|
||||
},
|
||||
[takenDoseSources]
|
||||
);
|
||||
|
||||
// Count taken doses for a day/item
|
||||
const countTakenDoses = useCallback(
|
||||
(doses: Array<{ id: string; takenBy: string[] }>): { total: number; taken: number } => {
|
||||
@@ -106,6 +119,11 @@ export function useDoses(): UseDosesReturn {
|
||||
next.set(doseId, Date.now());
|
||||
return next;
|
||||
});
|
||||
setTakenDoseSources((prev) => {
|
||||
const next = new Map(prev);
|
||||
next.set(doseId, "manual");
|
||||
return next;
|
||||
});
|
||||
|
||||
// Send to server
|
||||
try {
|
||||
@@ -127,6 +145,11 @@ export function useDoses(): UseDosesReturn {
|
||||
next.delete(doseId);
|
||||
return next;
|
||||
});
|
||||
setTakenDoseSources((prev) => {
|
||||
const next = new Map(prev);
|
||||
next.delete(doseId);
|
||||
return next;
|
||||
});
|
||||
} finally {
|
||||
mutationInFlightRef.current--;
|
||||
// Re-sync with server after mutation completes
|
||||
@@ -150,6 +173,11 @@ export function useDoses(): UseDosesReturn {
|
||||
next.delete(doseId);
|
||||
return next;
|
||||
});
|
||||
setTakenDoseSources((prev) => {
|
||||
const next = new Map(prev);
|
||||
next.delete(doseId);
|
||||
return next;
|
||||
});
|
||||
|
||||
// Send to server
|
||||
try {
|
||||
@@ -177,10 +205,12 @@ export function useDoses(): UseDosesReturn {
|
||||
takenDoses,
|
||||
setTakenDoses,
|
||||
takenDoseTimestamps,
|
||||
takenDoseSources,
|
||||
dismissedDoses,
|
||||
showClearMissedConfirm,
|
||||
setShowClearMissedConfirm,
|
||||
getDoseId,
|
||||
isDoseTakenAutomatically,
|
||||
countTakenDoses,
|
||||
markDoseTaken,
|
||||
undoDoseTaken,
|
||||
|
||||
Reference in New Issue
Block a user