mirror of
https://github.com/DRYTRIX/TimeTracker.git
synced 2025-12-30 07:40:51 -06:00
88656c3d34
Implement comprehensive enhancements to the Report Builder system with support
for iterative report generation, flexible email distribution, and improved
error handling.
Features:
- Add iterative report generation: generate one report per custom field value
- Add email distribution modes: mapping, template, and single recipient modes
- Add recipient email templates with {value} placeholder support
- Enhance scheduled reports with better error handling and validation
- Add fix endpoint for invalid scheduled reports
- Improve report builder UI with iterative generation options
- Add comprehensive management views for report schemes
Fixes:
- Fix template errors in iterative report view (dict access issues)
- Fix empty report builder when editing saved reports
- Fix PWA install toast notification handling
- Fix migration revision ID length issue (shortened to fit 32 char limit)
- Add idempotent migration checks to prevent duplicate column errors
- Improve error handling in scheduled reports list view
Database Changes:
- Add iterative_report_generation and iterative_custom_field_name to saved_report_views
- Add email_distribution_mode and recipient_email_template to report_email_schedules
- Migration 090_report_builder_iteration (idempotent)
UI/UX Improvements:
- Display iterative generation status in saved views list
- Show distribution mode and template in scheduled reports
- Add error badges and fix buttons for invalid schedules
- Improve report builder form loading for saved configurations
Technical:
- Enhance ScheduledReportService with recipient resolution logic
- Add validation for report configurations
- Improve error handling and logging throughout
- Update templates to use safe dictionary access patterns
52 lines
2.8 KiB
Python
52 lines
2.8 KiB
Python
from datetime import datetime
|
|
from app import db
|
|
|
|
|
|
class SavedReportView(db.Model):
|
|
"""Saved configurations for the custom report builder."""
|
|
|
|
__tablename__ = "saved_report_views"
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
name = db.Column(db.String(120), nullable=False)
|
|
owner_id = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False, index=True)
|
|
scope = db.Column(db.String(20), default="private", nullable=False) # private, team, public
|
|
config_json = db.Column(db.Text, nullable=False) # JSON for filters, columns, groupings
|
|
iterative_report_generation = db.Column(db.Boolean, default=False, nullable=False) # Generate one report per custom field value
|
|
iterative_custom_field_name = db.Column(db.String(50), nullable=True) # Custom field name for iteration (e.g., 'salesman')
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
|
|
|
def __repr__(self):
|
|
return f"<SavedReportView {self.name} ({self.scope})>"
|
|
|
|
|
|
class ReportEmailSchedule(db.Model):
|
|
"""Schedules to email saved reports on a cadence."""
|
|
|
|
__tablename__ = "report_email_schedules"
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
saved_view_id = db.Column(db.Integer, db.ForeignKey("saved_report_views.id"), nullable=False, index=True)
|
|
recipients = db.Column(db.Text, nullable=False) # comma-separated
|
|
cadence = db.Column(db.String(20), nullable=False) # daily, weekly, monthly, custom-cron
|
|
cron = db.Column(db.String(120), nullable=True)
|
|
timezone = db.Column(db.String(50), nullable=True)
|
|
next_run_at = db.Column(db.DateTime, nullable=True)
|
|
last_run_at = db.Column(db.DateTime, nullable=True)
|
|
active = db.Column(db.Boolean, default=True, nullable=False)
|
|
split_by_salesman = db.Column(db.Boolean, default=False, nullable=False) # Split report by salesman
|
|
salesman_field_name = db.Column(db.String(50), nullable=True) # Custom field name for salesman (default: 'salesman')
|
|
email_distribution_mode = db.Column(db.String(20), nullable=True) # 'mapping', 'template', 'single'
|
|
recipient_email_template = db.Column(db.String(255), nullable=True) # e.g., '{value}@test.de' for template mode
|
|
created_by = db.Column(db.Integer, db.ForeignKey("users.id"), nullable=False)
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
|
|
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False)
|
|
|
|
# Relationships
|
|
saved_view = db.relationship("SavedReportView", backref="schedules")
|
|
creator = db.relationship("User", foreign_keys=[created_by])
|
|
|
|
def __repr__(self):
|
|
return f"<ReportEmailSchedule view={self.saved_view_id} cadence={self.cadence}>"
|