jens/TimeTrack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attribute name fix.

Browse Source
This commit is contained in:
Jens Luedicke
2025-07-03 09:17:26 +02:00
parent 00a4cdb84e
commit d10f5547a5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app.py
View File

@@ -2210,7 +2210,7 @@ def system_admin_dashboard():
recent_users = User.query.filter(User.created_at >= week_ago).count() recent_users = User.query.filter(User.created_at >= week_ago).count()
recent_companies = Company.query.filter(Company.created_at >= week_ago).count() recent_companies = Company.query.filter(Company.created_at >= week_ago).count()
recent_time_entries = TimeEntry.query.filter(TimeEntry.start_time >= week_ago).count() recent_time_entries = TimeEntry.query.filter(TimeEntry.arrival_time >= week_ago).count()
# Top companies by user count # Top companies by user count
top_companies = db.session.query( top_companies = db.session.query(
@@ -2424,7 +2424,7 @@ def system_admin_company_detail(company_id):
week_ago = datetime.now() - timedelta(days=7) week_ago = datetime.now() - timedelta(days=7)
recent_time_entries = TimeEntry.query.join(User).filter( recent_time_entries = TimeEntry.query.join(User).filter(
User.company_id == company.id, User.company_id == company.id,
TimeEntry.start_time >= week_ago TimeEntry.arrival_time >= week_ago
).count() ).count()
# Role distribution # Role distribution
@@ -2464,8 +2464,8 @@ def system_admin_time_entries():
Project.name.label('project_name') Project.name.label('project_name')
).outerjoin(Project) ).outerjoin(Project)
# Order by start time (newest first) # Order by arrival time (newest first)
query = query.order_by(TimeEntry.start_time.desc()) query = query.order_by(TimeEntry.arrival_time.desc())
# Paginate # Paginate
entries = query.paginate(page=page, per_page=per_page, error_out=False) entries = query.paginate(page=page, per_page=per_page, error_out=False)