tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed sorting by remaining weight/length

Browse Source
This commit is contained in:
Donkie
2024-02-02 22:10:11 +01:00
parent b6b6fcf6bd
commit c2335366bb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spoolman/database/spool.py
View File

@@ -149,9 +149,8 @@ async def find(
if sort_by is not None: if sort_by is not None:
for fieldstr, order in sort_by.items(): for fieldstr, order in sort_by.items():
sorts = [] sorts = []
if fieldstr == "remaining_weight": if fieldstr in {"remaining_weight", "remaining_length"}:
stmt = stmt.add_columns((models.Filament.weight - models.Spool.used_weight).label("remaining_weight")) sorts.append(models.Filament.weight - models.Spool.used_weight)
sorts.append(sqlalchemy.column("remaining_weight"))
elif fieldstr == "filament.combined_name": elif fieldstr == "filament.combined_name":
sorts.append(models.Vendor.name) sorts.append(models.Vendor.name)
sorts.append(models.Filament.name) sorts.append(models.Filament.name)