mirror of
https://github.com/DRYTRIX/TimeTracker.git
synced 2026-04-30 09:19:46 -05:00
Dries Peeters
b6c0a79ffc
Add Pomodoro focus mode with session summaries Model: FocusSession; API: /api/focus-sessions/; UI: Focus modal on timer page Add estimates vs actuals with burndown and budget alerts Project fields: estimated_hours, budget_amount, budget_threshold_percent API: /api/projects/<id>/burndown; Charts in project view and project report Implement recurring time blocks/templates Model: RecurringBlock; API CRUD: /api/recurring-blocks; CLI: flask generate_recurring Add tagging and saved filters across views Model: SavedFilter; /api/entries supports tag and saved_filter_id Support billable rate overrides per project/member Model: RateOverride; invoicing uses effective rate resolution Also: Migration: 016_add_focus_recurring_rates_filters_and_project_budget.py Integrations and UI updates in projects view, timer page, and reports Docs updated (startup, invoice, task mgmt) and README feature list Added basic tests for new features
69 lines
2.6 KiB
Python
69 lines
2.6 KiB
Python
from datetime import datetime
|
|
from decimal import Decimal
|
|
from app import db
|
|
|
|
|
|
class RateOverride(db.Model):
|
|
"""Billable rate overrides per project and optionally per user.
|
|
|
|
Resolution precedence (highest to lowest) for effective hourly rate:
|
|
- RateOverride for (project_id, user_id)
|
|
- RateOverride for (project_id, user_id=None) # project default override
|
|
- Project.hourly_rate
|
|
- Client.default_hourly_rate
|
|
- 0
|
|
"""
|
|
|
|
__tablename__ = 'rate_overrides'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
project_id = db.Column(db.Integer, db.ForeignKey('projects.id'), nullable=False, index=True)
|
|
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True, index=True)
|
|
hourly_rate = db.Column(db.Numeric(9, 2), nullable=False)
|
|
effective_from = db.Column(db.Date, nullable=True)
|
|
effective_to = db.Column(db.Date, nullable=True)
|
|
|
|
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)
|
|
|
|
__table_args__ = (
|
|
db.UniqueConstraint('project_id', 'user_id', 'effective_from', name='ux_rate_override_unique_window'),
|
|
)
|
|
|
|
@classmethod
|
|
def resolve_rate(cls, project, user_id=None, on_date=None):
|
|
"""Resolve effective hourly rate for a project/user at a given date."""
|
|
if not project:
|
|
return Decimal('0')
|
|
|
|
# Step 1: specific user override
|
|
q = cls.query.filter_by(project_id=project.id, user_id=user_id)
|
|
if on_date:
|
|
q = q.filter((cls.effective_from.is_(None) | (cls.effective_from <= on_date)) & (cls.effective_to.is_(None) | (cls.effective_to >= on_date)))
|
|
user_ovr = q.order_by(cls.effective_from.desc().nullslast()).first()
|
|
if user_ovr:
|
|
return Decimal(user_ovr.hourly_rate)
|
|
|
|
# Step 2: project-level override
|
|
q = cls.query.filter_by(project_id=project.id, user_id=None)
|
|
if on_date:
|
|
q = q.filter((cls.effective_from.is_(None) | (cls.effective_from <= on_date)) & (cls.effective_to.is_(None) | (cls.effective_to >= on_date)))
|
|
proj_ovr = q.order_by(cls.effective_from.desc().nullslast()).first()
|
|
if proj_ovr:
|
|
return Decimal(proj_ovr.hourly_rate)
|
|
|
|
# Step 3: project rate
|
|
if project.hourly_rate:
|
|
return Decimal(project.hourly_rate)
|
|
|
|
# Step 4: client default
|
|
try:
|
|
if project.client_obj and project.client_obj.default_hourly_rate:
|
|
return Decimal(project.client_obj.default_hourly_rate)
|
|
except Exception:
|
|
pass
|
|
|
|
return Decimal('0')
|
|
|
|
|