Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions print_history.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,14 @@ def get_prints_by_spool(spool_id: int):
Retrieves all print jobs that used a specific spool.
"""
conn = sqlite3.connect(db_config["db_path"])
conn.row_factory = sqlite3.Row
cursor = conn.cursor()
cursor.execute('''
SELECT DISTINCT p.* FROM prints p
JOIN filament_usage f ON p.id = f.print_id
WHERE f.spool_id = ?
''', (spool_id,))
prints = cursor.fetchall()
prints = [dict(row) for row in cursor.fetchall()]
conn.close()
return prints

Expand All @@ -264,9 +265,9 @@ def get_filament_for_slot(print_id: int, ams_slot: int):
WHERE print_id = ? AND ams_slot = ?
''', (print_id, ams_slot))

results = cursor.fetchone()
row = cursor.fetchone()
conn.close()
return results
return dict(row) if row else None

def _ensure_layer_tracking_entry(print_id: int):
conn = sqlite3.connect(db_config["db_path"])
Expand Down