Invario/Inventarsystem
3
1
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases 216 Wiki Activity

Chaces to the Deleted Status, to reflekt the real active bookings in the menu

Browse Source
This commit is contained in:
AIIrondev
2026-08-02 15:14:46 +02:00
parent df5a3265a1
commit 756ff55b4c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/app.py
+12 -4
View File
@@ -9796,7 +9796,8 @@ def get_period_times(booking_date, period_num):
@app.route('/my_borrowed_items') @app.route('/my_borrowed_items')
def my_borrowed_items(): def my_borrowed_items():
""" """
Zeigt alle vom aktuellen Benutzer ausgeliehenen und geplanten Objekte an. Zeigt alle vom aktuellen Benutzer ausgeliehenen und geplanten Objekte an,
schließt jedoch soft-gelöschte Objekte (Deleted: True) aus.
""" """
if 'username' not in session: if 'username' not in session:
flash('Bitte melden Sie sich an, um Ihre ausgeliehenen Objekte anzuzeigen', 'error') flash('Bitte melden Sie sich an, um Ihre ausgeliehenen Objekte anzuzeigen', 'error')
@@ -9837,7 +9838,11 @@ def my_borrowed_items():
query_id = ObjectId(item_id) query_id = ObjectId(item_id)
else: else:
query_id = item_id query_id = item_id
item_obj = items_collection.find_one({'_id': query_id})
item_obj = items_collection.find_one({
'_id': query_id,
'Deleted': {'$ne': True}
})
except Exception: except Exception:
item_obj = None item_obj = None
@@ -9862,7 +9867,11 @@ def my_borrowed_items():
elif status == 'planned': elif status == 'planned':
planned_items.append(item_obj) planned_items.append(item_obj)
all_borrowed_items = list(items_collection.find({'Verfuegbar': False})) all_borrowed_items = list(items_collection.find({
'Verfuegbar': False,
'Deleted': {'$ne': True}
}))
for item in all_borrowed_items: for item in all_borrowed_items:
raw_item_user = item.get('User', '') raw_item_user = item.get('User', '')
try: try:
@@ -9879,7 +9888,6 @@ def my_borrowed_items():
client.close() client.close()
# DEBUG Logging
app.logger.info( app.logger.info(
f"Passing {len(active_items)} active items and {len(planned_items)} planned items to template for user {username}") f"Passing {len(active_items)} active items and {len(planned_items)} planned items to template for user {username}")