Compare commits
15
Commits
4f3bc36168
..
v1.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6de91fa6a9 | ||
|
|
a1a914ee4d | ||
|
|
824358f846 | ||
|
|
cb20abfb85 | ||
|
|
ca1e74154f | ||
|
|
4dd10240ce | ||
|
|
2a6d470a9a | ||
|
|
4898cce969 | ||
|
|
c7ef7b6f1f | ||
|
|
80156c8909 | ||
|
|
05560d766a | ||
|
|
1887de14e0 | ||
|
|
28a5df4f12 | ||
|
|
9d1ca55905 | ||
|
|
5b8a19b2ad |
@@ -0,0 +1,43 @@
|
||||
name: Refresh Showcase Data
|
||||
|
||||
on:
|
||||
schedule:
|
||||
# Run daily at 3 AM UTC
|
||||
- cron: "0 3 * * *"
|
||||
workflow_dispatch: # Allow manual triggering
|
||||
|
||||
jobs:
|
||||
refresh-data:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ vars.PYTHON_VERSION }}
|
||||
|
||||
- name: Install uv
|
||||
run: curl -LsSf https://astral.sh/uv/install.sh | sh
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
uv sync --no-dev --all-extras
|
||||
|
||||
- name: Run showcase data seeding script
|
||||
env:
|
||||
ADMIN_USERNAME: ${{ secrets.ADMIN_USERNAME }}
|
||||
ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
|
||||
POSTGRES_URI: ${{ secrets.POSTGRES_URI }}
|
||||
run: |
|
||||
uv run python scripts/seed_showcase_data.py
|
||||
|
||||
- name: Notify on success
|
||||
if: success()
|
||||
run: echo "✅ Showcase data refreshed successfully"
|
||||
|
||||
- name: Notify on failure
|
||||
if: failure()
|
||||
run: echo "❌ Failed to refresh showcase data"
|
||||
@@ -71,3 +71,7 @@ markers = [
|
||||
[[tool.mypy.overrides]]
|
||||
module = "redis.*"
|
||||
ignore_missing_imports = true
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = "showcase_data_definitions.*"
|
||||
ignore_missing_imports = true
|
||||
|
||||
@@ -0,0 +1,185 @@
|
||||
"""Seed test data into the database for demo purposes."""
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from datetime import datetime
|
||||
|
||||
# Add parent directory to path to import baby_monitor modules
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
|
||||
|
||||
# Import after path is set up
|
||||
from baby_monitor.repositories.dependencies.get_database import ( # noqa: E402
|
||||
get_database,
|
||||
init_db,
|
||||
)
|
||||
from baby_monitor.repositories.user.sqlite_user import ( # noqa: E402
|
||||
DatabaseUserRepository,
|
||||
)
|
||||
from baby_monitor.repositories.child.sqlite_child import ( # noqa: E402
|
||||
DatabaseChildRepository,
|
||||
)
|
||||
from baby_monitor.repositories.feeding.sqlite_feeding import ( # noqa: E402
|
||||
DatabaseFeedingRepository,
|
||||
)
|
||||
from baby_monitor.repositories.diaper_change.sqlite_diaper_change import ( # noqa: E402, E501
|
||||
DatabaseDiaperChangeRepository,
|
||||
)
|
||||
from baby_monitor.repositories.sleep.sqlite_sleep import ( # noqa: E402
|
||||
DatabaseSleepRepository,
|
||||
)
|
||||
from baby_monitor.routers.auth import hash_password # noqa: E402
|
||||
from showcase_data_definitions import generate_showcase_data # noqa: E402
|
||||
|
||||
|
||||
def seed_database(reference_time: datetime | None = None) -> None:
|
||||
"""
|
||||
Seed the database with test data.
|
||||
|
||||
This function is idempotent - it will check if test users exist
|
||||
and either create them or update timestamps of existing data.
|
||||
|
||||
Args:
|
||||
reference_time: The "now" time to use for generating timestamps.
|
||||
Defaults to current time.
|
||||
"""
|
||||
# Initialize database
|
||||
init_db()
|
||||
db = next(get_database())
|
||||
|
||||
try:
|
||||
# Initialize repositories
|
||||
user_repo = DatabaseUserRepository(db)
|
||||
child_repo = DatabaseChildRepository(db)
|
||||
feeding_repo = DatabaseFeedingRepository(db)
|
||||
diaper_repo = DatabaseDiaperChangeRepository(db)
|
||||
sleep_repo = DatabaseSleepRepository(db)
|
||||
|
||||
# Generate showcase data
|
||||
test_data = generate_showcase_data(reference_time)
|
||||
|
||||
print("Starting database seeding...")
|
||||
print(f"Reference time: {test_data['reference_time']}")
|
||||
|
||||
# Create or get showcase users
|
||||
user_ids = []
|
||||
for user_data in test_data["users"]:
|
||||
# Check if user exists
|
||||
existing_user = user_repo.get_by_username(user_data["username"])
|
||||
|
||||
if existing_user:
|
||||
print(f"✓ User '{user_data['username']}' already exists")
|
||||
user_ids.append(existing_user["id"])
|
||||
else:
|
||||
# Create new user
|
||||
hashed_pw = hash_password(user_data["password"])
|
||||
user_id = user_repo.create(
|
||||
username=user_data["username"],
|
||||
hashed_password=hashed_pw,
|
||||
)
|
||||
user_ids.append(user_id["id"])
|
||||
print(f"✓ Created user '{user_data['username']}'")
|
||||
|
||||
# Create or get shared child
|
||||
child_data = test_data["child"]
|
||||
|
||||
# Check if child exists for first user
|
||||
existing_children = child_repo.get_by_user_id(user_ids[0])
|
||||
child_id: int | None = None
|
||||
|
||||
# Look for existing child with matching name
|
||||
for child in existing_children:
|
||||
if child["name"] == child_data["name"]:
|
||||
child_id = child["id"]
|
||||
print(f"✓ Child '{child_data['name']}' already exists")
|
||||
break
|
||||
|
||||
if child_id is None:
|
||||
# Create new child
|
||||
created_child = child_repo.create(
|
||||
name=child_data["name"],
|
||||
birth_time=child_data["birth_time"],
|
||||
birth_weight=child_data["birth_weight"],
|
||||
user_id=user_ids[0],
|
||||
)
|
||||
child_id = created_child["id"]
|
||||
print(f"✓ Created child '{child_data['name']}'")
|
||||
|
||||
# Ensure child_id is set
|
||||
assert child_id is not None, "Child ID must be set at this point"
|
||||
|
||||
# Share child with second user if not already shared
|
||||
parent_ids = child_repo.get_parent_ids(child_id)
|
||||
if user_ids[1] not in parent_ids:
|
||||
child_repo.add_parent(child_id, user_ids[1])
|
||||
msg = f"✓ Shared child with '{test_data['users'][1]['username']}'"
|
||||
print(msg)
|
||||
|
||||
# Clear existing logs to avoid duplicates
|
||||
print("Clearing existing logs...")
|
||||
|
||||
# Get all logs for this child
|
||||
existing_feedings = feeding_repo.get_by_child_id(child_id)
|
||||
for feeding in existing_feedings:
|
||||
feeding_repo.delete(feeding["id"])
|
||||
|
||||
existing_diapers = diaper_repo.get_by_child_id(child_id)
|
||||
for diaper in existing_diapers:
|
||||
diaper_repo.delete(diaper["id"])
|
||||
|
||||
existing_sleep = sleep_repo.get_by_child_id(child_id)
|
||||
for sleep in existing_sleep:
|
||||
sleep_repo.delete(sleep["id"])
|
||||
|
||||
print("✓ Cleared existing logs")
|
||||
|
||||
# Add feeding logs
|
||||
print(f"Adding {len(test_data['feedings'])} feeding logs...")
|
||||
for feeding in test_data["feedings"]:
|
||||
feeding_repo.create(
|
||||
child_id=child_id,
|
||||
start_time=feeding["start_time"],
|
||||
end_time=feeding["end_time"],
|
||||
feeding_type=feeding["feeding_type"],
|
||||
)
|
||||
print(f"✓ Added {len(test_data['feedings'])} feedings")
|
||||
|
||||
# Add diaper changes
|
||||
print(f"Adding {len(test_data['diapers'])} diaper changes...")
|
||||
for diaper in test_data["diapers"]:
|
||||
diaper_repo.create(
|
||||
child_id=child_id,
|
||||
change_time=diaper["time"],
|
||||
poop_color=diaper.get("poop_color"),
|
||||
poop_amount=diaper.get("poop_amount"),
|
||||
pee_color=diaper.get("pee_color"),
|
||||
pee_amount=diaper.get("pee_amount"),
|
||||
)
|
||||
print(f"✓ Added {len(test_data['diapers'])} diaper changes")
|
||||
|
||||
# Add sleep sessions
|
||||
print(f"Adding {len(test_data['sleep'])} sleep sessions...")
|
||||
for sleep in test_data["sleep"]:
|
||||
sleep_repo.create(
|
||||
child_id=child_id,
|
||||
start_time=sleep["start_time"],
|
||||
end_time=sleep["end_time"],
|
||||
)
|
||||
print(f"✓ Added {len(test_data['sleep'])} sleep sessions")
|
||||
|
||||
db.commit()
|
||||
print("\n✅ Database seeding completed successfully!")
|
||||
print("\nTest user credentials:")
|
||||
print(f" Username: {test_data['users'][0]['username']}")
|
||||
print(f" Password: {test_data['users'][0]['password']}")
|
||||
print(" (Both users share the same password)")
|
||||
|
||||
except Exception as e:
|
||||
db.rollback()
|
||||
print(f"\n❌ Error seeding database: {e}")
|
||||
raise
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
seed_database()
|
||||
@@ -0,0 +1,278 @@
|
||||
"""Definition of showcase data to be used for presenting the app."""
|
||||
|
||||
from datetime import datetime, timedelta
|
||||
import random
|
||||
|
||||
# User credentials
|
||||
SHOWCASE_USERS = [
|
||||
{
|
||||
"username": "user",
|
||||
"password": "demo123", # Will be hashed when inserted
|
||||
},
|
||||
{
|
||||
"username": "user2",
|
||||
"password": "demo123", # Will be hashed when inserted
|
||||
},
|
||||
]
|
||||
|
||||
# Shared child (14 days old)
|
||||
CHILD_AGE_DAYS = 14
|
||||
|
||||
|
||||
def get_child_data(reference_time: datetime) -> dict:
|
||||
"""Get child data with birth time relative to reference time."""
|
||||
birth_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
|
||||
return {
|
||||
"name": "Emma Rose",
|
||||
"birth_time": birth_time,
|
||||
"birth_weight": 3420, # grams (7.5 lbs)
|
||||
}
|
||||
|
||||
|
||||
def get_feeding_schedule(reference_time: datetime) -> list[dict]:
|
||||
"""
|
||||
Generate realistic feeding schedule for the last 14 days.
|
||||
|
||||
Newborns feed every 2-3 hours initially, gradually spacing out
|
||||
to 3-4 hours.
|
||||
"""
|
||||
feedings: list[dict] = []
|
||||
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
|
||||
end_time = reference_time
|
||||
|
||||
feeding_types = ["left_breast", "right_breast", "bottle"]
|
||||
|
||||
# Day-by-day feeding patterns
|
||||
day_number = 0
|
||||
while current_time < end_time:
|
||||
age_in_days = day_number
|
||||
|
||||
# Newborns feed more frequently
|
||||
if age_in_days < 3:
|
||||
interval_hours = random.uniform(2, 2.5)
|
||||
duration_minutes = random.randint(15, 25)
|
||||
elif age_in_days < 7:
|
||||
interval_hours = random.uniform(2.5, 3)
|
||||
duration_minutes = random.randint(20, 30)
|
||||
else:
|
||||
interval_hours = random.uniform(3, 3.5)
|
||||
duration_minutes = random.randint(20, 35)
|
||||
|
||||
# Alternate between breasts and occasional bottle
|
||||
if random.random() < 0.2: # 20% bottle feeding
|
||||
feeding_type = "bottle"
|
||||
else:
|
||||
# Alternate breasts
|
||||
feeding_type = feeding_types[len(feedings) % 2]
|
||||
|
||||
start_time = current_time
|
||||
end_time_feeding = start_time + timedelta(minutes=duration_minutes)
|
||||
|
||||
feedings.append(
|
||||
{
|
||||
"start_time": start_time,
|
||||
"end_time": end_time_feeding,
|
||||
"feeding_type": feeding_type,
|
||||
}
|
||||
)
|
||||
|
||||
current_time += timedelta(hours=interval_hours)
|
||||
|
||||
# Move to next day
|
||||
prev_date = (current_time - timedelta(hours=interval_hours)).date()
|
||||
if current_time.date() != prev_date:
|
||||
day_number += 1
|
||||
|
||||
return feedings
|
||||
|
||||
|
||||
def get_diaper_changes(reference_time: datetime) -> list[dict]:
|
||||
"""
|
||||
Generate realistic diaper changes for the last 14 days.
|
||||
|
||||
- First 2-3 days: Black/dark (meconium), minimal pee
|
||||
- Days 3-5: Transition to yellow, more frequent
|
||||
- Days 5+: Regular yellow stools, normal pee patterns
|
||||
- 8-10 diaper changes per day initially, settling to 6-8
|
||||
"""
|
||||
diapers = []
|
||||
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
|
||||
end_time = reference_time
|
||||
|
||||
day_number = 0
|
||||
|
||||
while current_time < end_time:
|
||||
age_in_days = day_number
|
||||
|
||||
# Determine number of diaper changes per day based on age
|
||||
if age_in_days < 3:
|
||||
changes_per_day = random.randint(8, 10)
|
||||
elif age_in_days < 7:
|
||||
changes_per_day = random.randint(7, 9)
|
||||
else:
|
||||
changes_per_day = random.randint(6, 8)
|
||||
|
||||
# Distribute changes throughout the day
|
||||
day_start = current_time.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
day_end = day_start + timedelta(days=1)
|
||||
|
||||
for _ in range(changes_per_day):
|
||||
# Random time during the day
|
||||
random_seconds = random.randint(0, 86400)
|
||||
change_time = day_start + timedelta(seconds=random_seconds)
|
||||
|
||||
if change_time >= end_time:
|
||||
break
|
||||
|
||||
# Determine diaper contents
|
||||
has_poop = random.random() < 0.4 # 40% have poop
|
||||
# 90% have pee, or always if no poop
|
||||
has_pee = random.random() < 0.9 or not has_poop
|
||||
|
||||
diaper = {
|
||||
"time": change_time,
|
||||
"has_poop": has_poop,
|
||||
"has_pee": has_pee,
|
||||
}
|
||||
|
||||
# Poop characteristics based on age
|
||||
if has_poop:
|
||||
if age_in_days < 2:
|
||||
# Meconium phase
|
||||
diaper["poop_color"] = "black"
|
||||
diaper["poop_amount"] = "light"
|
||||
elif age_in_days < 4:
|
||||
# Transition phase
|
||||
colors = ["black", "green", "yellow"]
|
||||
diaper["poop_color"] = random.choice(colors)
|
||||
amounts = ["light", "medium"]
|
||||
diaper["poop_amount"] = random.choice(amounts)
|
||||
else:
|
||||
# Normal phase
|
||||
colors = ["yellow", "yellow", "yellow", "green"]
|
||||
diaper["poop_color"] = random.choice(colors)
|
||||
# Amount increases with age
|
||||
if age_in_days < 7:
|
||||
amounts = ["light", "medium"]
|
||||
diaper["poop_amount"] = random.choice(amounts)
|
||||
else:
|
||||
amounts = ["medium", "heavy"]
|
||||
diaper["poop_amount"] = random.choice(amounts)
|
||||
|
||||
# Pee characteristics based on age
|
||||
if has_pee:
|
||||
if age_in_days < 2:
|
||||
# Very light pee initially
|
||||
diaper["pee_amount"] = "light"
|
||||
diaper["pee_color"] = random.choice(["clear", "yellow"])
|
||||
elif age_in_days < 5:
|
||||
# Increasing output
|
||||
diaper["pee_amount"] = random.choice(["light", "medium"])
|
||||
diaper["pee_color"] = random.choice(["clear", "yellow"])
|
||||
else:
|
||||
# Normal output
|
||||
if age_in_days < 10:
|
||||
amounts = ["medium", "medium", "heavy"]
|
||||
diaper["pee_amount"] = random.choice(amounts)
|
||||
else:
|
||||
amounts = ["medium", "heavy", "heavy"]
|
||||
diaper["pee_amount"] = random.choice(amounts)
|
||||
colors = ["clear", "yellow", "yellow"]
|
||||
diaper["pee_color"] = random.choice(colors)
|
||||
|
||||
diapers.append(diaper)
|
||||
|
||||
day_number += 1
|
||||
current_time = day_end
|
||||
|
||||
# Sort by time (type: ignore for mypy - we know time is datetime)
|
||||
diapers.sort(
|
||||
key=lambda x: x["time"] # type: ignore[arg-type,return-value]
|
||||
)
|
||||
return diapers
|
||||
|
||||
|
||||
def get_sleep_sessions(reference_time: datetime) -> list[dict]:
|
||||
"""
|
||||
Generate realistic sleep patterns for the last 14 days.
|
||||
|
||||
Newborns sleep 16-18 hours per day in short bursts (30min - 4 hours).
|
||||
Sleep gradually consolidates over time.
|
||||
"""
|
||||
sleep_sessions = []
|
||||
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
|
||||
end_time = reference_time
|
||||
|
||||
day_number = 0
|
||||
|
||||
while current_time < end_time:
|
||||
age_in_days = day_number
|
||||
|
||||
# Sleep patterns evolve with age
|
||||
if age_in_days < 3:
|
||||
# Very short, frequent naps
|
||||
avg_wake_time = 1.5 # hours
|
||||
sleep_duration_range = (30, 120) # minutes
|
||||
elif age_in_days < 7:
|
||||
# Slightly longer sleep periods
|
||||
avg_wake_time = 2
|
||||
sleep_duration_range = (45, 180)
|
||||
else:
|
||||
# More consolidated sleep
|
||||
avg_wake_time = 2.5
|
||||
sleep_duration_range = (60, 240)
|
||||
|
||||
# Random wake time with variation
|
||||
wake_minutes = random.randint(int(avg_wake_time * 45), int(avg_wake_time * 75))
|
||||
|
||||
# Sleep start time
|
||||
start_time = current_time + timedelta(minutes=wake_minutes)
|
||||
|
||||
if start_time >= end_time:
|
||||
break
|
||||
|
||||
# Sleep duration
|
||||
duration_minutes = random.randint(*sleep_duration_range)
|
||||
|
||||
# Longer sleep at night
|
||||
if 20 <= start_time.hour or start_time.hour < 6:
|
||||
duration_minutes = int(duration_minutes * 1.3)
|
||||
|
||||
end_time_sleep = start_time + timedelta(minutes=duration_minutes)
|
||||
|
||||
sleep_sessions.append(
|
||||
{
|
||||
"start_time": start_time,
|
||||
"end_time": end_time_sleep,
|
||||
}
|
||||
)
|
||||
|
||||
current_time = end_time_sleep
|
||||
birth_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
|
||||
day_number = (current_time - birth_time).days
|
||||
|
||||
return sleep_sessions
|
||||
|
||||
|
||||
def generate_showcase_data(reference_time: datetime | None = None) -> dict:
|
||||
"""
|
||||
Generate all test data with timestamps relative to reference time.
|
||||
|
||||
Args:
|
||||
reference_time: The "now" time to use as reference.
|
||||
Defaults to current time.
|
||||
|
||||
Returns:
|
||||
Dictionary containing all test data
|
||||
"""
|
||||
if reference_time is None:
|
||||
reference_time = datetime.now()
|
||||
|
||||
return {
|
||||
"users": SHOWCASE_USERS,
|
||||
"child": get_child_data(reference_time),
|
||||
"feedings": get_feeding_schedule(reference_time),
|
||||
"diapers": get_diaper_changes(reference_time),
|
||||
"sleep": get_sleep_sessions(reference_time),
|
||||
"reference_time": reference_time,
|
||||
}
|
||||
@@ -20,3 +20,5 @@ class ChildResponse(BaseModel):
|
||||
birth_time: datetime
|
||||
birth_weight: float
|
||||
created_at: datetime
|
||||
parent_count: int | None = None
|
||||
parent_usernames: list[str] | None = None
|
||||
|
||||
@@ -11,10 +11,12 @@ from baby_monitor.routers.auth import verify_token
|
||||
from baby_monitor.repositories.interfaces import (
|
||||
ChildRepositoryInterface,
|
||||
ChildInvitationRepositoryInterface,
|
||||
UserRepositoryInterface,
|
||||
)
|
||||
from baby_monitor.repositories.dependencies import (
|
||||
get_child_repository,
|
||||
get_child_invitation_repository,
|
||||
get_user_repository,
|
||||
)
|
||||
|
||||
router = APIRouter(prefix="/api/children", tags=["children"])
|
||||
@@ -62,10 +64,29 @@ def create_child(
|
||||
def get_user_children(
|
||||
user_id: Annotated[int, Depends(verify_token)],
|
||||
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
|
||||
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
|
||||
) -> list[ChildResponse]:
|
||||
"""Get all children for the authenticated user."""
|
||||
children = child_repo.get_by_user_id(user_id)
|
||||
return [ChildResponse(**child) for child in children]
|
||||
|
||||
# Add parent information to each child
|
||||
result = []
|
||||
for child in children:
|
||||
child_data = child.copy()
|
||||
parent_ids = child_repo.get_parent_ids(child["id"])
|
||||
child_data["parent_count"] = len(parent_ids)
|
||||
|
||||
# Get usernames of all parents
|
||||
parent_usernames = []
|
||||
for parent_id in parent_ids:
|
||||
parent = user_repo.get_by_id(parent_id)
|
||||
if parent:
|
||||
parent_usernames.append(parent["username"])
|
||||
child_data["parent_usernames"] = parent_usernames
|
||||
|
||||
result.append(ChildResponse(**child_data))
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@router.get("/{child_id}", response_model=ChildResponse)
|
||||
|
||||
@@ -313,9 +313,9 @@
|
||||
: "Child added successfully!",
|
||||
"success",
|
||||
);
|
||||
// Redirect to home page after 1 second
|
||||
// Redirect to settings page if editing, otherwise home page
|
||||
setTimeout(() => {
|
||||
window.location.href = "/";
|
||||
window.location.href = isEditMode ? "/settings.html" : "/";
|
||||
}, 1000);
|
||||
} else {
|
||||
showMessage(
|
||||
@@ -338,7 +338,8 @@
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
window.location.href = "/";
|
||||
// Redirect to settings page if editing, otherwise home page
|
||||
window.location.href = isEditMode ? "/settings.html" : "/";
|
||||
}
|
||||
|
||||
function skipToHome() {
|
||||
|
||||
@@ -280,7 +280,7 @@
|
||||
let allChildren = [];
|
||||
let currentDaysRange =
|
||||
parseInt(localStorage.getItem("lastDiaperTimeRange")) || 7;
|
||||
let selectedChildId = null; // null means "All Children"
|
||||
let selectedChildId = null; // null means show first/only child
|
||||
|
||||
// Restore last selected child from localStorage
|
||||
const lastChildId = localStorage.getItem("lastDiaperChildFilter");
|
||||
@@ -321,6 +321,11 @@
|
||||
|
||||
if (response.ok) {
|
||||
allChildren = await response.json();
|
||||
|
||||
// Auto-select first child if no selection exists
|
||||
if (selectedChildId === null && allChildren.length > 0) {
|
||||
selectedChildId = allChildren[0].id;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error loading children:", error);
|
||||
@@ -334,8 +339,7 @@
|
||||
}
|
||||
|
||||
function onChildChange(event) {
|
||||
selectedChildId =
|
||||
event.target.value === "all" ? null : parseInt(event.target.value);
|
||||
selectedChildId = parseInt(event.target.value);
|
||||
localStorage.setItem("lastDiaperChildFilter", event.target.value);
|
||||
displayDiaperChanges(allDiaperChanges);
|
||||
}
|
||||
@@ -367,11 +371,25 @@
|
||||
|
||||
content.innerHTML = `
|
||||
<div class="controls">
|
||||
<label for="childFilter">Child:</label>
|
||||
<select id="childFilter" onchange="onChildChange(event)">
|
||||
<option value="all" ${selectedChildId === null ? "selected" : ""}>All Children</option>
|
||||
${childOptions}
|
||||
</select>
|
||||
${
|
||||
allChildren.length === 1
|
||||
? `
|
||||
<label for="childDisplay">Child:</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childDisplay"
|
||||
value="${allChildren[0].name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default; padding: 8px; border: 1px solid #ddd; border-radius: 4px; font-size: 14px;"
|
||||
/>
|
||||
`
|
||||
: `
|
||||
<label for="childFilter">Child:</label>
|
||||
<select id="childFilter" onchange="onChildChange(event)">
|
||||
${childOptions}
|
||||
</select>
|
||||
`
|
||||
}
|
||||
|
||||
<label for="daysRange">Time Range:</label>
|
||||
<select id="daysRange" onchange="onDaysRangeChange(event)">
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
let allChildren = [];
|
||||
let currentDaysRange =
|
||||
parseInt(localStorage.getItem("lastFeedingTimeRange")) || 7;
|
||||
let selectedChildId = null; // null means "All Children"
|
||||
let selectedChildId = null; // null means show first/only child
|
||||
let barChartInstance = null;
|
||||
|
||||
// Restore last selected child from localStorage
|
||||
@@ -359,6 +359,11 @@
|
||||
|
||||
if (response.ok) {
|
||||
allChildren = await response.json();
|
||||
|
||||
// Auto-select first child if no selection exists
|
||||
if (selectedChildId === null && allChildren.length > 0) {
|
||||
selectedChildId = allChildren[0].id;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Error loading children:", error);
|
||||
@@ -372,8 +377,7 @@
|
||||
}
|
||||
|
||||
function onChildChange(event) {
|
||||
selectedChildId =
|
||||
event.target.value === "all" ? null : parseInt(event.target.value);
|
||||
selectedChildId = parseInt(event.target.value);
|
||||
localStorage.setItem("lastFeedingChildFilter", event.target.value);
|
||||
displayFeedings(allFeedings);
|
||||
}
|
||||
@@ -405,11 +409,25 @@
|
||||
|
||||
content.innerHTML = `
|
||||
<div class="controls">
|
||||
<label for="childFilter">Child:</label>
|
||||
<select id="childFilter" onchange="onChildChange(event)">
|
||||
<option value="all" ${selectedChildId === null ? "selected" : ""}>All Children</option>
|
||||
${childOptions}
|
||||
</select>
|
||||
${
|
||||
allChildren.length === 1
|
||||
? `
|
||||
<label for="childDisplay">Child:</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childDisplay"
|
||||
value="${allChildren[0].name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default; padding: 8px; border: 1px solid #ddd; border-radius: 4px; font-size: 14px;"
|
||||
/>
|
||||
`
|
||||
: `
|
||||
<label for="childFilter">Child:</label>
|
||||
<select id="childFilter" onchange="onChildChange(event)">
|
||||
${childOptions}
|
||||
</select>
|
||||
`
|
||||
}
|
||||
|
||||
<label for="daysRange">Time Range:</label>
|
||||
<select id="daysRange" onchange="onDaysRangeChange(event)">
|
||||
|
||||
@@ -510,18 +510,40 @@
|
||||
const childSelect = document.getElementById("modalChildId");
|
||||
const typeSelect = document.getElementById("modalFeedingType");
|
||||
|
||||
// Clear and populate child select
|
||||
childSelect.innerHTML = '<option value="">Select a child</option>';
|
||||
userChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
// Clear and populate child select or show single child
|
||||
if (userChildren.length === 1) {
|
||||
// Single child: replace dropdown with text display
|
||||
const child = userChildren[0];
|
||||
const formGroup = childSelect.parentElement;
|
||||
formGroup.innerHTML = `
|
||||
<label for="modalChildName">Child</label>
|
||||
<input
|
||||
type="text"
|
||||
id="modalChildName"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default;"
|
||||
/>
|
||||
<input type="hidden" id="modalChildId" value="${child.id}" />
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown
|
||||
childSelect.innerHTML = '<option value="">Select a child</option>';
|
||||
userChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
|
||||
// Set defaults based on last feeding
|
||||
// Set defaults based on last feeding
|
||||
if (lastFeeding) {
|
||||
childSelect.value = lastFeeding.child_id;
|
||||
}
|
||||
}
|
||||
|
||||
// Set default feeding type based on last feeding
|
||||
if (lastFeeding) {
|
||||
childSelect.value = lastFeeding.child_id;
|
||||
typeSelect.value = lastFeeding.feeding_type;
|
||||
}
|
||||
|
||||
@@ -633,18 +655,36 @@
|
||||
const modal = document.getElementById("startSleepModal");
|
||||
const childSelect = document.getElementById("modalSleepChildId");
|
||||
|
||||
// Clear and populate child select
|
||||
childSelect.innerHTML = '<option value="">Select a child</option>';
|
||||
userChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
// Clear and populate child select or show single child
|
||||
if (userChildren.length === 1) {
|
||||
// Single child: replace dropdown with text display
|
||||
const child = userChildren[0];
|
||||
const formGroup = childSelect.parentElement;
|
||||
formGroup.innerHTML = `
|
||||
<label for="modalSleepChildName">Child</label>
|
||||
<input
|
||||
type="text"
|
||||
id="modalSleepChildName"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default;"
|
||||
/>
|
||||
<input type="hidden" id="modalSleepChildId" value="${child.id}" />
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown
|
||||
childSelect.innerHTML = '<option value="">Select a child</option>';
|
||||
userChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
|
||||
// Set default based on last sleep
|
||||
if (lastSleep) {
|
||||
childSelect.value = lastSleep.child_id;
|
||||
// Set default based on last sleep
|
||||
if (lastSleep) {
|
||||
childSelect.value = lastSleep.child_id;
|
||||
}
|
||||
}
|
||||
|
||||
modal.classList.add("show");
|
||||
|
||||
@@ -235,7 +235,7 @@
|
||||
<button
|
||||
type="button"
|
||||
class="button secondary"
|
||||
onclick="window.location.href='/'"
|
||||
onclick="window.location.href=getReturnUrl()"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
@@ -249,6 +249,16 @@
|
||||
window.location.href = "/login.html";
|
||||
}
|
||||
|
||||
// Determine return URL based on referrer
|
||||
function getReturnUrl() {
|
||||
const referrer = document.referrer;
|
||||
if (referrer.includes("/diapers.html")) {
|
||||
return "/diapers.html";
|
||||
}
|
||||
// Default to home page
|
||||
return "/";
|
||||
}
|
||||
|
||||
// Check if we're in edit mode
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const diaperChangeId = urlParams.get("id");
|
||||
@@ -277,12 +287,32 @@
|
||||
children = await response.json();
|
||||
const select = document.getElementById("childSelect");
|
||||
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
select.appendChild(option);
|
||||
});
|
||||
// Populate select dropdown or show single child
|
||||
if (children.length === 1) {
|
||||
// Single child: replace dropdown with text display
|
||||
const child = children[0];
|
||||
const formGroup = select.parentElement;
|
||||
formGroup.innerHTML = `
|
||||
<label for="childName">Child *</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childName"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default;"
|
||||
/>
|
||||
<input type="hidden" id="childSelect" name="childSelect" value="${child.id}" />
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown (clear the placeholder first)
|
||||
select.innerHTML = "";
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
select.appendChild(option);
|
||||
});
|
||||
}
|
||||
|
||||
// If editing, load the diaper change data
|
||||
if (isEditMode) {
|
||||
@@ -295,14 +325,16 @@
|
||||
.toISOString()
|
||||
.slice(0, 16);
|
||||
|
||||
// Load last used child from localStorage
|
||||
const lastDiaperChange = JSON.parse(
|
||||
localStorage.getItem("lastDiaperChange") || "{}",
|
||||
);
|
||||
// Load last used child from localStorage (only for multiple children)
|
||||
if (children.length > 1) {
|
||||
const lastDiaperChange = JSON.parse(
|
||||
localStorage.getItem("lastDiaperChange") || "{}",
|
||||
);
|
||||
|
||||
if (lastDiaperChange.child_id) {
|
||||
document.getElementById("childSelect").value =
|
||||
lastDiaperChange.child_id;
|
||||
if (lastDiaperChange.child_id) {
|
||||
document.getElementById("childSelect").value =
|
||||
lastDiaperChange.child_id;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -431,7 +463,7 @@
|
||||
"success",
|
||||
);
|
||||
setTimeout(() => {
|
||||
window.location.href = "/";
|
||||
window.location.href = getReturnUrl();
|
||||
}, 1000);
|
||||
} else {
|
||||
const errorData = await response.json();
|
||||
|
||||
@@ -206,6 +206,16 @@
|
||||
window.location.href = "/login.html";
|
||||
}
|
||||
|
||||
// Determine return URL based on referrer
|
||||
function getReturnUrl() {
|
||||
const referrer = document.referrer;
|
||||
if (referrer.includes("/feedings.html")) {
|
||||
return "/feedings.html";
|
||||
}
|
||||
// Default to home page
|
||||
return "/";
|
||||
}
|
||||
|
||||
const form = document.getElementById("logFeedingForm");
|
||||
const messageDiv = document.getElementById("message");
|
||||
const submitBtn = document.getElementById("submitBtn");
|
||||
@@ -259,13 +269,32 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Populate select dropdown
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
// Populate select dropdown or show single child
|
||||
if (children.length === 1) {
|
||||
// Single child: replace dropdown with text display
|
||||
const child = children[0];
|
||||
const formGroup = childSelect.parentElement;
|
||||
formGroup.innerHTML = `
|
||||
<label for="childName">Child</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childName"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default;"
|
||||
/>
|
||||
<input type="hidden" id="childId" name="childId" value="${child.id}" />
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown (clear placeholder first)
|
||||
childSelect.innerHTML = "";
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
}
|
||||
|
||||
// Show form, hide loading
|
||||
loadingDiv.style.display = "none";
|
||||
@@ -369,9 +398,9 @@
|
||||
: "Feeding logged successfully!",
|
||||
"success",
|
||||
);
|
||||
// Redirect to feedings page after 1 second
|
||||
// Redirect to appropriate page after 1 second
|
||||
setTimeout(() => {
|
||||
window.location.href = "/feedings.html";
|
||||
window.location.href = getReturnUrl();
|
||||
}, 1000);
|
||||
} else {
|
||||
showMessage(
|
||||
@@ -394,7 +423,7 @@
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
window.location.href = "/";
|
||||
window.location.href = getReturnUrl();
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@@ -196,6 +196,16 @@
|
||||
window.location.href = "/login.html";
|
||||
}
|
||||
|
||||
// Determine return URL based on referrer
|
||||
function getReturnUrl() {
|
||||
const referrer = document.referrer;
|
||||
if (referrer.includes("/sleep.html")) {
|
||||
return "/sleep.html";
|
||||
}
|
||||
// Default to home page
|
||||
return "/";
|
||||
}
|
||||
|
||||
const form = document.getElementById("logSleepForm");
|
||||
const messageDiv = document.getElementById("message");
|
||||
const submitBtn = document.getElementById("submitBtn");
|
||||
@@ -249,13 +259,32 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Populate select dropdown
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
// Populate select dropdown or show single child
|
||||
if (children.length === 1) {
|
||||
// Single child: replace dropdown with text display
|
||||
const child = children[0];
|
||||
const formGroup = childSelect.parentElement;
|
||||
formGroup.innerHTML = `
|
||||
<label for="childName">Child</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childName"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default;"
|
||||
/>
|
||||
<input type="hidden" id="childId" name="childId" value="${child.id}" />
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown (clear placeholder first)
|
||||
childSelect.innerHTML = "";
|
||||
children.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childSelect.appendChild(option);
|
||||
});
|
||||
}
|
||||
|
||||
// Show form, hide loading
|
||||
loadingDiv.style.display = "none";
|
||||
@@ -353,9 +382,9 @@
|
||||
: "Sleep logged successfully!",
|
||||
"success",
|
||||
);
|
||||
// Redirect to sleep page after 1 second
|
||||
// Redirect to appropriate page after 1 second
|
||||
setTimeout(() => {
|
||||
window.location.href = "/sleep.html";
|
||||
window.location.href = getReturnUrl();
|
||||
}, 1000);
|
||||
} else {
|
||||
showMessage(
|
||||
@@ -378,7 +407,7 @@
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
window.location.href = "/";
|
||||
window.location.href = getReturnUrl();
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@@ -533,14 +533,23 @@
|
||||
container.innerHTML = `
|
||||
<div class="children-list">
|
||||
${children
|
||||
.map(
|
||||
(child) => `
|
||||
.map((child) => {
|
||||
// Get list of other users (excluding current user)
|
||||
const otherUsers =
|
||||
child.parent_usernames && child.parent_usernames.length > 1
|
||||
? child.parent_usernames.filter(
|
||||
(username) => username !== currentUser.username,
|
||||
)
|
||||
: [];
|
||||
|
||||
return `
|
||||
<div class="child-card">
|
||||
<h3>👶 ${child.name}</h3>
|
||||
<h3 style="margin: 0;">👶 ${child.name}</h3>
|
||||
<div class="child-info">
|
||||
<p><strong>Birth Date:</strong> ${formatDate(child.birth_time)}</p>
|
||||
<p><strong>Birth Weight:</strong> ${child.birth_weight}g</p>
|
||||
<p><strong>Added:</strong> ${formatDate(child.created_at)}</p>
|
||||
${otherUsers.length > 0 ? `<p><strong>Shared with:</strong> ${otherUsers.join(", ")}</p>` : ""}
|
||||
</div>
|
||||
<div class="child-actions">
|
||||
<button class="button secondary" onclick="editChild(${child.id})">
|
||||
@@ -551,8 +560,8 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
`,
|
||||
)
|
||||
`;
|
||||
})
|
||||
.join("")}
|
||||
</div>
|
||||
`;
|
||||
@@ -568,12 +577,17 @@
|
||||
}
|
||||
|
||||
function editChild(childId) {
|
||||
// Redirect to a child edit page or show a modal
|
||||
// For now, just show an alert
|
||||
const child = children.find((c) => c.id === childId);
|
||||
if (child) {
|
||||
alert(`Edit functionality for ${child.name} coming soon!`);
|
||||
}
|
||||
if (!child) return;
|
||||
|
||||
// Redirect to add-child page with child data in query params
|
||||
const params = new URLSearchParams({
|
||||
id: child.id,
|
||||
name: child.name,
|
||||
birth_time: child.birth_time,
|
||||
birth_weight: child.birth_weight,
|
||||
});
|
||||
window.location.href = `/add-child.html?${params.toString()}`;
|
||||
}
|
||||
|
||||
async function shareChild(childId) {
|
||||
|
||||
@@ -328,19 +328,22 @@
|
||||
let allChildren = [];
|
||||
let selectedChildId = "";
|
||||
|
||||
// Filter change handlers
|
||||
document
|
||||
.getElementById("childFilter")
|
||||
.addEventListener("change", function () {
|
||||
selectedChildId = this.value;
|
||||
// Save selection to localStorage
|
||||
if (selectedChildId) {
|
||||
localStorage.setItem("lastSleepChildFilter", selectedChildId);
|
||||
} else {
|
||||
localStorage.removeItem("lastSleepChildFilter");
|
||||
}
|
||||
renderCharts();
|
||||
});
|
||||
// Filter change handlers (will be attached after children are loaded)
|
||||
function attachChildFilterListener() {
|
||||
const childFilter = document.getElementById("childFilter");
|
||||
if (childFilter) {
|
||||
childFilter.addEventListener("change", function () {
|
||||
selectedChildId = this.value;
|
||||
// Save selection to localStorage
|
||||
if (selectedChildId) {
|
||||
localStorage.setItem("lastSleepChildFilter", selectedChildId);
|
||||
} else {
|
||||
localStorage.removeItem("lastSleepChildFilter");
|
||||
}
|
||||
renderCharts();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
document
|
||||
.getElementById("timeRangeFilter")
|
||||
@@ -365,19 +368,52 @@
|
||||
|
||||
allChildren = await childrenResponse.json();
|
||||
|
||||
// Populate child filter
|
||||
const childFilter = document.getElementById("childFilter");
|
||||
childFilter.innerHTML = '<option value="">All Children</option>';
|
||||
allChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childFilter.appendChild(option);
|
||||
});
|
||||
// Auto-select first child if available
|
||||
if (allChildren.length > 0 && !selectedChildId) {
|
||||
selectedChildId = allChildren[0].id;
|
||||
}
|
||||
|
||||
// Populate child filter or show single child
|
||||
const childFilterContainer = document.querySelector(".controls");
|
||||
if (allChildren.length === 1) {
|
||||
// Single child: show as read-only text
|
||||
const child = allChildren[0];
|
||||
childFilterContainer.innerHTML = `
|
||||
<label for="childDisplay">Child:</label>
|
||||
<input
|
||||
type="text"
|
||||
id="childDisplay"
|
||||
value="${child.name}"
|
||||
readonly
|
||||
style="background-color: #f5f5f5; cursor: default; padding: 8px; border: 1px solid #ddd; border-radius: 4px; font-size: 14px;"
|
||||
/>
|
||||
|
||||
<label for="timeRangeFilter">Time Range:</label>
|
||||
<select id="timeRangeFilter">
|
||||
<option value="1">Last 24 hours</option>
|
||||
<option value="3">Last 3 days</option>
|
||||
<option value="7" selected>Last 7 days</option>
|
||||
<option value="14">Last 14 days</option>
|
||||
<option value="30">Last 30 days</option>
|
||||
<option value="90">Last 90 days</option>
|
||||
</select>
|
||||
`;
|
||||
} else {
|
||||
// Multiple children: show dropdown
|
||||
const childFilter = document.getElementById("childFilter");
|
||||
childFilter.innerHTML = "";
|
||||
allChildren.forEach((child) => {
|
||||
const option = document.createElement("option");
|
||||
option.value = child.id;
|
||||
option.textContent = child.name;
|
||||
childFilter.appendChild(option);
|
||||
});
|
||||
}
|
||||
|
||||
// Restore last selected child from localStorage
|
||||
const lastChildId = localStorage.getItem("lastSleepChildFilter");
|
||||
if (lastChildId) {
|
||||
if (lastChildId && allChildren.length > 1) {
|
||||
const childFilter = document.getElementById("childFilter");
|
||||
childFilter.value = lastChildId;
|
||||
selectedChildId = lastChildId;
|
||||
}
|
||||
@@ -402,6 +438,11 @@
|
||||
|
||||
allSleeps = await sleepResponse.json();
|
||||
|
||||
// Attach event listener for child filter if multiple children
|
||||
if (allChildren.length > 1) {
|
||||
attachChildFilterListener();
|
||||
}
|
||||
|
||||
renderCharts();
|
||||
} catch (error) {
|
||||
console.error("Error loading data:", error);
|
||||
|
||||
Reference in New Issue
Block a user