chelsea/Synculous-2
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
chelsea
2026-02-14 20:06:39 -06:00
parent 04ea648950
commit 3ccd11153c
7 changed files with 131 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
api/routes/medications.py
View File

@@ -342,18 +342,26 @@ def register(app):
all_logs = postgres.select(
"med_logs",
where={"medication_id": med["id"], "action": "taken"},
where={"medication_id": med["id"]},
)
today_taken = [
log.get("scheduled_time", "")
for log in all_logs
if str(log.get("created_at", ""))[:10] == today_str
if log.get("action") == "taken"
and str(log.get("created_at", ""))[:10] == today_str
]
today_skipped = [
log.get("scheduled_time", "")
for log in all_logs
if log.get("action") == "skipped"
and str(log.get("created_at", ""))[:10] == today_str
]
result.append({
"medication": med,
"scheduled_times": [] if is_prn else med.get("times", []),
"taken_times": today_taken,
"skipped_times": today_skipped,
"is_prn": is_prn,
})
seen_med_ids.add(med["id"])
@@ -378,18 +386,26 @@ def register(app):
all_logs = postgres.select(
"med_logs",
where={"medication_id": med["id"], "action": "taken"},
where={"medication_id": med["id"]},
)
tomorrow_taken = [
log.get("scheduled_time", "")
for log in all_logs
if str(log.get("created_at", ""))[:10] == tomorrow_str
if log.get("action") == "taken"
and str(log.get("created_at", ""))[:10] == tomorrow_str
]
tomorrow_skipped = [
log.get("scheduled_time", "")
for log in all_logs
if log.get("action") == "skipped"
and str(log.get("created_at", ""))[:10] == tomorrow_str
]
result.append({
"medication": med,
"scheduled_times": early_times,
"taken_times": tomorrow_taken,
"skipped_times": tomorrow_skipped,
"is_prn": False,
"is_next_day": True,
})
@@ -415,18 +431,26 @@ def register(app):
all_logs = postgres.select(
"med_logs",
where={"medication_id": med["id"], "action": "taken"},
where={"medication_id": med["id"]},
)
yesterday_taken = [
log.get("scheduled_time", "")
for log in all_logs
if str(log.get("created_at", ""))[:10] == yesterday_str
if log.get("action") == "taken"
and str(log.get("created_at", ""))[:10] == yesterday_str
]
yesterday_skipped = [
log.get("scheduled_time", "")
for log in all_logs
if log.get("action") == "skipped"
and str(log.get("created_at", ""))[:10] == yesterday_str
]
result.append({
"medication": med,
"scheduled_times": late_times,
"taken_times": yesterday_taken,
"skipped_times": yesterday_skipped,
"is_prn": False,
"is_previous_day": True,
})