Compare commits

4 Commits

Author SHA1 Message Date
sheppy 34378a66b5 fix: rename status_list/recen_entries
ci / docker (push) Successful in 3m27s
2026-04-29 11:24:47 +02:00
sheppy 1e1458c0f3 fix: add desc import 2026-04-29 11:21:26 +02:00
sheppy 35bf34a406 fix: reuse status_list_query 2026-04-29 11:19:16 +02:00
sheppy a40f12a5d6 fix: prefer displaying last 14 days 2026-04-29 11:15:12 +02:00
+11 -2
View File
@@ -16,7 +16,7 @@ from flask_wtf import FlaskForm
from wtforms import StringField, SubmitField, BooleanField, DecimalField, HiddenField, SelectField from wtforms import StringField, SubmitField, BooleanField, DecimalField, HiddenField, SelectField
from wtforms.validators import DataRequired, Length from wtforms.validators import DataRequired, Length
from sqlalchemy import Column, Integer, String, Boolean, or_, and_ from sqlalchemy import Column, Integer, String, Boolean, or_, and_, desc
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError
from sqlalchemy.sql import func from sqlalchemy.sql import func
@@ -198,8 +198,17 @@ def service_details():
if service.owner and str(service.owner) != user: if service.owner and str(service.owner) != user:
return ("Services is not owned by {}".format(user)) return ("Services is not owned by {}".format(user))
two_weeks_ago_ts = int((datetime.datetime.now() - datetime.timedelta(days=14)).timestamp())
status_list_query = db.session.query(Status).filter(Status.service==service.service) status_list_query = db.session.query(Status).filter(Status.service==service.service)
status_list = status_list_query.order_by(sqlalchemy.desc(Status.timestamp)).limit(200).all() recent_query = (
status_list_query
.filter(Status.timestamp >= two_weeks_ago_ts, Status.service==service.service)
.order_by(desc(Status.timestamp))
).limit(1000)
status_list = recent_query.all()
if not status_list:
status_list = status_list_query.order_by(sqlalchemy.desc(Status.timestamp)).limit(1000).all()
# build status tupel (repeats, status) # # build status tupel (repeats, status) #
current_tupel = None current_tupel = None