diff --git a/app/models/__init__.py b/app/models/__init__.py index a65dd34..3d60abd 100644 --- a/app/models/__init__.py +++ b/app/models/__init__.py @@ -21,6 +21,7 @@ from .project_cost import ProjectCost from .kanban_column import KanbanColumn from .time_entry_template import TimeEntryTemplate from .activity import Activity +from .user_favorite_project import UserFavoriteProject __all__ = [ "User", @@ -50,4 +51,5 @@ __all__ = [ "KanbanColumn", "TimeEntryTemplate", "Activity", + "UserFavoriteProject", ] diff --git a/app/models/project.py b/app/models/project.py index b412d6c..f37e720 100644 --- a/app/models/project.py +++ b/app/models/project.py @@ -260,9 +260,19 @@ class Project(db.Model): self.updated_at = datetime.utcnow() db.session.commit() - def to_dict(self): + def is_favorited_by(self, user): + """Check if this project is favorited by a specific user""" + from .user import User + if isinstance(user, int): + user_id = user + return self.favorited_by.filter_by(id=user_id).count() > 0 + elif isinstance(user, User): + return self.favorited_by.filter_by(id=user.id).count() > 0 + return False + + def to_dict(self, user=None): """Convert project to dictionary for API responses""" - return { + data = { 'id': self.id, 'name': self.name, 'code': self.code, @@ -287,3 +297,7 @@ class Project(db.Model): 'total_billable_costs': self.total_billable_costs, 'total_project_value': self.total_project_value, } + # Include favorite status if user is provided + if user: + data['is_favorite'] = self.is_favorited_by(user) + return data diff --git a/app/models/user.py b/app/models/user.py index ae21fda..be69b93 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -40,6 +40,7 @@ class User(UserMixin, db.Model): # Relationships time_entries = db.relationship('TimeEntry', backref='user', lazy='dynamic', cascade='all, delete-orphan') project_costs = db.relationship('ProjectCost', backref='user', lazy='dynamic', cascade='all, delete-orphan') + favorite_projects = db.relationship('Project', secondary='user_favorite_projects', lazy='dynamic', backref=db.backref('favorited_by', lazy='dynamic')) def __init__(self, username, role='user', email=None, full_name=None): self.username = username.lower().strip() @@ -137,3 +138,33 @@ class User(UserMixin, db.Model): """Check whether the user's avatar file exists on disk""" path = self.get_avatar_path() return bool(path and os.path.exists(path)) + + # Favorite projects helpers + def add_favorite_project(self, project): + """Add a project to user's favorites""" + if not self.is_project_favorite(project): + self.favorite_projects.append(project) + db.session.commit() + + def remove_favorite_project(self, project): + """Remove a project from user's favorites""" + if self.is_project_favorite(project): + self.favorite_projects.remove(project) + db.session.commit() + + def is_project_favorite(self, project): + """Check if a project is in user's favorites""" + from .project import Project + if isinstance(project, int): + project_id = project + return self.favorite_projects.filter_by(id=project_id).count() > 0 + elif isinstance(project, Project): + return self.favorite_projects.filter_by(id=project.id).count() > 0 + return False + + def get_favorite_projects(self, status='active'): + """Get user's favorite projects, optionally filtered by status""" + query = self.favorite_projects + if status: + query = query.filter_by(status=status) + return query.order_by('name').all() diff --git a/app/models/user_favorite_project.py b/app/models/user_favorite_project.py new file mode 100644 index 0000000..48d6a51 --- /dev/null +++ b/app/models/user_favorite_project.py @@ -0,0 +1,30 @@ +from datetime import datetime +from app import db + +class UserFavoriteProject(db.Model): + """Association table for user favorite projects""" + + __tablename__ = 'user_favorite_projects' + + id = db.Column(db.Integer, primary_key=True) + user_id = db.Column(db.Integer, db.ForeignKey('users.id', ondelete='CASCADE'), nullable=False, index=True) + project_id = db.Column(db.Integer, db.ForeignKey('projects.id', ondelete='CASCADE'), nullable=False, index=True) + created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False) + + # Unique constraint to prevent duplicate favorites + __table_args__ = ( + db.UniqueConstraint('user_id', 'project_id', name='uq_user_project_favorite'), + ) + + def __repr__(self): + return f'' + + def to_dict(self): + """Convert to dictionary for API responses""" + return { + 'id': self.id, + 'user_id': self.user_id, + 'project_id': self.project_id, + 'created_at': self.created_at.isoformat() if self.created_at else None, + } + diff --git a/app/routes/projects.py b/app/routes/projects.py index d10dee7..fe535bf 100644 --- a/app/routes/projects.py +++ b/app/routes/projects.py @@ -2,7 +2,7 @@ from flask import Blueprint, render_template, request, redirect, url_for, flash, from flask_babel import gettext as _ from flask_login import login_required, current_user from app import db, log_event, track_event -from app.models import Project, TimeEntry, Task, Client, ProjectCost, KanbanColumn, ExtraGood, Activity +from app.models import Project, TimeEntry, Task, Client, ProjectCost, KanbanColumn, ExtraGood, Activity, UserFavoriteProject from datetime import datetime from decimal import Decimal from app.utils.db import safe_commit @@ -28,14 +28,28 @@ def list_projects(): status = request.args.get('status', 'active') client_name = request.args.get('client', '').strip() search = request.args.get('search', '').strip() + favorites_only = request.args.get('favorites', '').lower() == 'true' query = Project.query + + # Filter by favorites if requested + if favorites_only: + # Join with user_favorite_projects table + query = query.join( + UserFavoriteProject, + db.and_( + UserFavoriteProject.project_id == Project.id, + UserFavoriteProject.user_id == current_user.id + ) + ) + + # Filter by status (use Project.status to be explicit) if status == 'active': - query = query.filter_by(status='active') + query = query.filter(Project.status == 'active') elif status == 'archived': - query = query.filter_by(status='archived') + query = query.filter(Project.status == 'archived') elif status == 'inactive': - query = query.filter_by(status='inactive') + query = query.filter(Project.status == 'inactive') if client_name: query = query.join(Client).filter(Client.name == client_name) @@ -49,21 +63,27 @@ def list_projects(): ) ) - projects = query.order_by(Project.name).paginate( + # Get all projects for the current page + projects_pagination = query.order_by(Project.name).paginate( page=page, per_page=20, error_out=False ) + # Get user's favorite project IDs for quick lookup in template + favorite_project_ids = {p.id for p in current_user.favorite_projects.all()} + # Get clients for filter dropdown clients = Client.get_active_clients() client_list = [c.name for c in clients] return render_template( 'projects/list.html', - projects=projects.items, + projects=projects_pagination.items, status=status, - clients=client_list + clients=client_list, + favorite_project_ids=favorite_project_ids, + favorites_only=favorites_only ) @projects_bp.route('/projects/create', methods=['GET', 'POST']) @@ -637,6 +657,98 @@ def bulk_status_change(): return redirect(url_for('projects.list_projects')) +# ===== FAVORITE PROJECTS ROUTES ===== + +@projects_bp.route('/projects//favorite', methods=['POST']) +@login_required +def favorite_project(project_id): + """Add a project to user's favorites""" + project = Project.query.get_or_404(project_id) + + try: + # Check if already favorited + if current_user.is_project_favorite(project): + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': False, 'message': _('Project is already in favorites')}), 200 + flash(_('Project is already in favorites'), 'info') + else: + # Add to favorites + current_user.add_favorite_project(project) + + # Log activity + Activity.log( + user_id=current_user.id, + action='favorited', + entity_type='project', + entity_id=project.id, + entity_name=project.name, + description=f'Added project "{project.name}" to favorites', + ip_address=request.remote_addr, + user_agent=request.headers.get('User-Agent') + ) + + # Track event + log_event("project.favorited", user_id=current_user.id, project_id=project.id) + track_event(current_user.id, "project.favorited", {"project_id": project.id}) + + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': True, 'message': _('Project added to favorites')}), 200 + flash(_('Project added to favorites'), 'success') + except Exception as e: + current_app.logger.error(f"Error favoriting project: {e}") + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': False, 'message': _('Failed to add project to favorites')}), 500 + flash(_('Failed to add project to favorites'), 'error') + + # Redirect back to referrer or project list + return redirect(request.referrer or url_for('projects.list_projects')) + + +@projects_bp.route('/projects//unfavorite', methods=['POST']) +@login_required +def unfavorite_project(project_id): + """Remove a project from user's favorites""" + project = Project.query.get_or_404(project_id) + + try: + # Check if not favorited + if not current_user.is_project_favorite(project): + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': False, 'message': _('Project is not in favorites')}), 200 + flash(_('Project is not in favorites'), 'info') + else: + # Remove from favorites + current_user.remove_favorite_project(project) + + # Log activity + Activity.log( + user_id=current_user.id, + action='unfavorited', + entity_type='project', + entity_id=project.id, + entity_name=project.name, + description=f'Removed project "{project.name}" from favorites', + ip_address=request.remote_addr, + user_agent=request.headers.get('User-Agent') + ) + + # Track event + log_event("project.unfavorited", user_id=current_user.id, project_id=project.id) + track_event(current_user.id, "project.unfavorited", {"project_id": project.id}) + + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': True, 'message': _('Project removed from favorites')}), 200 + flash(_('Project removed from favorites'), 'success') + except Exception as e: + current_app.logger.error(f"Error unfavoriting project: {e}") + if request.headers.get('X-Requested-With') == 'XMLHttpRequest': + return jsonify({'success': False, 'message': _('Failed to remove project from favorites')}), 500 + flash(_('Failed to remove project from favorites'), 'error') + + # Redirect back to referrer or project list + return redirect(request.referrer or url_for('projects.list_projects')) + + # ===== PROJECT COSTS ROUTES ===== @projects_bp.route('/projects//costs') diff --git a/app/routes/reports.py b/app/routes/reports.py index f69c3b5..2cd356e 100644 --- a/app/routes/reports.py +++ b/app/routes/reports.py @@ -1,8 +1,9 @@ from flask import Blueprint, render_template, request, redirect, url_for, flash, send_file from flask_login import login_required, current_user from app import db, log_event, track_event -from app.models import User, Project, TimeEntry, Settings, Task, ProjectCost +from app.models import User, Project, TimeEntry, Settings, Task, ProjectCost, Client from datetime import datetime, timedelta +from sqlalchemy import or_ import csv import io import pytz @@ -283,16 +284,48 @@ def user_report(): selected_user=user_id, selected_project=project_id) +@reports_bp.route('/reports/export/form') +@login_required +def export_form(): + """Display CSV export form with filter options""" + # Get all users (for admin) + users = [] + if current_user.is_admin: + users = User.query.filter_by(is_active=True).order_by(User.username).all() + + # Get all active projects + projects = Project.query.filter_by(status='active').order_by(Project.name).all() + + # Get all active clients + clients = Client.query.filter_by(status='active').order_by(Client.name).all() + + # Set default date range (last 30 days) + default_end_date = datetime.utcnow().strftime('%Y-%m-%d') + default_start_date = (datetime.utcnow() - timedelta(days=30)).strftime('%Y-%m-%d') + + return render_template('reports/export_form.html', + users=users, + projects=projects, + clients=clients, + default_start_date=default_start_date, + default_end_date=default_end_date) + @reports_bp.route('/reports/export/csv') @login_required def export_csv(): - """Export time entries as CSV""" + """Export time entries as CSV with enhanced filters""" start_time = time.time() # Start performance tracking + # Get all filter parameters start_date = request.args.get('start_date') end_date = request.args.get('end_date') user_id = request.args.get('user_id', type=int) project_id = request.args.get('project_id', type=int) + task_id = request.args.get('task_id', type=int) + client_id = request.args.get('client_id', type=int) + billable = request.args.get('billable') # 'yes', 'no', or 'all' + source = request.args.get('source') # 'manual', 'auto', or 'all' + tags = request.args.get('tags', '').strip() # Parse dates if not start_date: @@ -336,11 +369,11 @@ def export_csv(): output = io.StringIO() writer = csv.writer(output, delimiter=delimiter) - # Write header + # Write header with task column writer.writerow([ - 'ID', 'User', 'Project', 'Client', 'Start Time', 'End Time', + 'ID', 'User', 'Project', 'Client', 'Task', 'Start Time', 'End Time', 'Duration (hours)', 'Duration (formatted)', 'Notes', 'Tags', - 'Source', 'Billable', 'Created At' + 'Source', 'Billable', 'Created At', 'Updated At' ]) # Write data @@ -350,6 +383,7 @@ def export_csv(): entry.user.display_name, entry.project.name, entry.project.client, + entry.task.name if entry.task else '', entry.start_time.isoformat(), entry.end_time.isoformat() if entry.end_time else '', entry.duration_hours, @@ -358,24 +392,47 @@ def export_csv(): entry.tags or '', entry.source, 'Yes' if entry.billable else 'No', - entry.created_at.isoformat() + entry.created_at.isoformat(), + entry.updated_at.isoformat() if entry.updated_at else '' ]) output.seek(0) - # Create filename - filename = f'timetracker_export_{start_date}_to_{end_date}.csv' + # Create filename with filters indication + filename_parts = [f'timetracker_export_{start_date}_to_{end_date}'] + if project_id: + filename_parts.append('project') + if client_id: + filename_parts.append('client') + if task_id: + filename_parts.append('task') + filename = '_'.join(filename_parts) + '.csv' - # Track CSV export event + # Track CSV export event with enhanced metadata log_event("export.csv", user_id=current_user.id, export_type="time_entries", num_rows=len(entries), - date_range_days=(end_dt - start_dt).days) + date_range_days=(end_dt - start_dt).days, + filters_applied={ + 'user_id': user_id, + 'project_id': project_id, + 'task_id': task_id, + 'client_id': client_id, + 'billable': billable, + 'source': source, + 'tags': tags + }) track_event(current_user.id, "export.csv", { "export_type": "time_entries", "num_rows": len(entries), - "date_range_days": (end_dt - start_dt).days + "date_range_days": (end_dt - start_dt).days, + "has_project_filter": project_id is not None, + "has_client_filter": client_id is not None, + "has_task_filter": task_id is not None, + "has_billable_filter": billable is not None and billable != 'all', + "has_source_filter": source is not None and source != 'all', + "has_tags_filter": bool(tags) }) # Track performance diff --git a/templates/admin/oidc_debug.html b/app/templates/admin/oidc_debug.html similarity index 100% rename from templates/admin/oidc_debug.html rename to app/templates/admin/oidc_debug.html diff --git a/templates/admin/oidc_user_detail.html b/app/templates/admin/oidc_user_detail.html similarity index 100% rename from templates/admin/oidc_user_detail.html rename to app/templates/admin/oidc_user_detail.html diff --git a/templates/clients/create.html b/app/templates/clients/create.html similarity index 100% rename from templates/clients/create.html rename to app/templates/clients/create.html diff --git a/templates/clients/edit.html b/app/templates/clients/edit.html similarity index 100% rename from templates/clients/edit.html rename to app/templates/clients/edit.html diff --git a/templates/main/about.html b/app/templates/main/about.html similarity index 100% rename from templates/main/about.html rename to app/templates/main/about.html diff --git a/templates/main/help.html b/app/templates/main/help.html similarity index 100% rename from templates/main/help.html rename to app/templates/main/help.html diff --git a/templates/projects/create.html b/app/templates/projects/create.html similarity index 100% rename from templates/projects/create.html rename to app/templates/projects/create.html diff --git a/templates/projects/edit.html b/app/templates/projects/edit.html similarity index 100% rename from templates/projects/edit.html rename to app/templates/projects/edit.html diff --git a/app/templates/projects/list.html b/app/templates/projects/list.html index d115bed..0faac94 100644 --- a/app/templates/projects/list.html +++ b/app/templates/projects/list.html @@ -16,7 +16,7 @@

Filter Projects

-
+
@@ -39,8 +39,15 @@ {% endfor %}
+
+ + +
- +
@@ -78,6 +85,7 @@ {% endif %} + Name Client Status @@ -89,13 +97,24 @@ {% for project in projects %} - + {% if current_user.is_admin %} {% endif %} - {{ project.name }} + + {% set is_fav = favorite_project_ids and project.id in favorite_project_ids %} + + + {{ project.name }} {{ project.client }} {% if project.status == 'active' %} @@ -246,5 +265,118 @@ function submitBulkStatusChange(){ }); form.submit(); } + +// Favorite project functionality +function toggleFavorite(projectId, button) { + // Font Awesome converts to , so we need to look for either + const icon = button.querySelector('i, svg'); + + // Safety check + if (!icon) { + console.error('Star icon not found in button'); + console.log('Button HTML:', button.innerHTML); + return; + } + + // Check if favorited by looking at classes (works for both and ) + const isFavorited = icon.classList.contains('fa-star') && + (icon.classList.contains('fas') || icon.getAttribute('data-prefix') === 'fas'); + const action = isFavorited ? 'unfavorite' : 'favorite'; + + // Disable button to prevent double clicks + button.disabled = true; + + // Optimistic UI update - toggle classes + if (isFavorited) { + // Change to unfilled star + icon.classList.remove('fas', 'text-yellow-500'); + icon.classList.add('far', 'text-gray-400'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'far'); + } + button.title = 'Add to favorites'; + } else { + // Change to filled star + icon.classList.remove('far', 'text-gray-400'); + icon.classList.add('fas', 'text-yellow-500'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'fas'); + } + button.title = 'Remove from favorites'; + } + + // Send AJAX request + fetch(`/projects/${projectId}/${action}`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-Requested-With': 'XMLHttpRequest', + 'X-CSRFToken': document.querySelector('meta[name="csrf-token"]')?.content || '' + }, + credentials: 'same-origin' + }) + .then(response => response.json()) + .then(data => { + if (data.success) { + // Success - show toast notification + const message = action === 'favorite' ? 'Project added to favorites' : 'Project removed from favorites'; + if (window.toastManager) { + window.toastManager.success(message, 'Success', 3000); + } else if (window.showToast) { + window.showToast(message, 'success'); + } + } else { + // Revert UI on error + if (isFavorited) { + icon.classList.remove('far', 'text-gray-400'); + icon.classList.add('fas', 'text-yellow-500'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'fas'); + } + button.title = 'Remove from favorites'; + } else { + icon.classList.remove('fas', 'text-yellow-500'); + icon.classList.add('far', 'text-gray-400'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'far'); + } + button.title = 'Add to favorites'; + } + if (window.showAlert) { + window.showAlert(data.message || 'Failed to update favorite status'); + } else { + alert(data.message || 'Failed to update favorite status'); + } + } + }) + .catch(error => { + console.error('Error toggling favorite:', error); + // Revert UI on error + if (isFavorited) { + icon.classList.remove('far', 'text-gray-400'); + icon.classList.add('fas', 'text-yellow-500'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'fas'); + } + button.title = 'Remove from favorites'; + } else { + icon.classList.remove('fas', 'text-yellow-500'); + icon.classList.add('far', 'text-gray-400'); + if (icon.tagName === 'svg') { + icon.setAttribute('data-prefix', 'far'); + } + button.title = 'Add to favorites'; + } + if (window.showAlert) { + window.showAlert('Failed to update favorite status'); + } else { + alert('Failed to update favorite status'); + } + }) + .finally(() => { + // Re-enable button + button.disabled = false; + }); +} {% endblock %} diff --git a/app/templates/reports/export_form.html b/app/templates/reports/export_form.html index e69de29..89327e1 100644 --- a/app/templates/reports/export_form.html +++ b/app/templates/reports/export_form.html @@ -0,0 +1,336 @@ +{% extends "base.html" %} + +{% block content %} +
+
+

+ + Export Time Entries to CSV +

+ + Back to Reports + +
+ + +
+
+
+ +
+
+

+ Use the filters below to customize your CSV export. All filters are optional - leave blank to include all entries within the date range. +

+
+
+
+ + +
+
+ + +
+

+ + Date Range +

+
+
+ + +
+
+ + +
+
+
+ +
+ + +
+

+ + Filters +

+
+ + {% if current_user.is_admin %} + +
+ + +
+ {% endif %} + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +

+ Enter tags separated by commas. Entries matching any of the tags will be included. +

+
+
+
+ +
+ + +
+ + +
+
+
+ + +
+

+ + Export Preview +

+
+

CSV Format:

+
+
+ ID, User, Project, Client, Task, Start Time, End Time, Duration (hours), Duration (formatted), Notes, Tags, Source, Billable, Created At, Updated At +
+
+

+ + The CSV file will be downloaded with a filename indicating the date range and applied filters. +

+
+
+
+ + + +{% endblock %} + diff --git a/app/templates/reports/index.html b/app/templates/reports/index.html index 38659e1..f6da103 100644 --- a/app/templates/reports/index.html +++ b/app/templates/reports/index.html @@ -20,7 +20,9 @@ User Report Summary Report Task Report - Export CSV + + Export CSV + Export Excel diff --git a/docs/FAVORITE_PROJECTS_FEATURE.md b/docs/FAVORITE_PROJECTS_FEATURE.md new file mode 100644 index 0000000..b379a5e --- /dev/null +++ b/docs/FAVORITE_PROJECTS_FEATURE.md @@ -0,0 +1,365 @@ +# Favorite Projects Feature + +## Overview + +The Favorite Projects feature allows users to mark frequently used projects as favorites for quick access. This feature enhances user productivity by providing easy access to the projects they work with most often. + +## Features + +- **Star Icon**: Each project in the project list has a star icon that can be clicked to favorite/unfavorite +- **Quick Filter**: Filter to show only favorite projects +- **Per-User**: Each user has their own set of favorite projects +- **Real-time Updates**: Favorite status updates immediately via AJAX +- **Status Awareness**: Favorites work with all project statuses (active, inactive, archived) + +## User Guide + +### Marking a Project as Favorite + +1. Navigate to the Projects list page (`/projects`) +2. Find the project you want to favorite +3. Click the star icon (☆) next to the project name +4. The star will turn yellow/gold (★) indicating it's now a favorite + +### Removing a Project from Favorites + +1. Navigate to the Projects list page +2. Find the favorited project (marked with a gold star ★) +3. Click the star icon +4. The star will become hollow (☆) indicating it's no longer a favorite + +### Filtering by Favorites + +1. Navigate to the Projects list page +2. In the filters section, find the "Filter" dropdown +3. Select "Favorites Only" +4. Click "Filter" +5. The list will show only your favorite projects + +### Combining Filters + +You can combine the favorites filter with other filters: +- **Status Filter**: Show only active favorites, archived favorites, etc. +- **Client Filter**: Show favorites for a specific client +- **Search**: Search within your favorite projects + +## Technical Implementation + +### Database Schema + +A new association table `user_favorite_projects` was created with the following structure: + +```sql +CREATE TABLE user_favorite_projects ( + id INTEGER PRIMARY KEY, + user_id INTEGER NOT NULL, + project_id INTEGER NOT NULL, + created_at DATETIME NOT NULL, + FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE, + FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE, + UNIQUE (user_id, project_id) +); +CREATE INDEX ix_user_favorite_projects_user_id ON user_favorite_projects(user_id); +CREATE INDEX ix_user_favorite_projects_project_id ON user_favorite_projects(project_id); +``` + +### Model Relationships + +#### User Model + +New methods added to `app/models/user.py`: + +- `add_favorite_project(project)`: Add a project to favorites +- `remove_favorite_project(project)`: Remove a project from favorites +- `is_project_favorite(project)`: Check if a project is favorited +- `get_favorite_projects(status='active')`: Get list of favorite projects + +New relationship: +```python +favorite_projects = db.relationship('Project', + secondary='user_favorite_projects', + lazy='dynamic', + backref=db.backref('favorited_by', lazy='dynamic')) +``` + +#### Project Model + +New method added to `app/models/project.py`: + +- `is_favorited_by(user)`: Check if project is favorited by a specific user + +Updated method: +- `to_dict(user=None)`: Now includes `is_favorite` field when user is provided + +### API Endpoints + +#### POST /projects//favorite + +Mark a project as favorite. + +**Authentication**: Required +**Method**: POST +**Parameters**: None +**Returns**: JSON response + +**Example Request:** +```bash +curl -X POST https://timetracker.example.com/projects/123/favorite \ + -H "X-Requested-With: XMLHttpRequest" \ + -H "Cookie: session=..." +``` + +**Example Response (Success):** +```json +{ + "success": true, + "message": "Project added to favorites" +} +``` + +**Example Response (Error):** +```json +{ + "success": false, + "message": "Project is already in favorites" +} +``` + +#### POST /projects//unfavorite + +Remove a project from favorites. + +**Authentication**: Required +**Method**: POST +**Parameters**: None +**Returns**: JSON response + +**Example Request:** +```bash +curl -X POST https://timetracker.example.com/projects/123/unfavorite \ + -H "X-Requested-With: XMLHttpRequest" \ + -H "Cookie: session=..." +``` + +**Example Response (Success):** +```json +{ + "success": true, + "message": "Project removed from favorites" +} +``` + +### Routes + +#### GET /projects?favorites=true + +List projects filtered by favorites. + +**Authentication**: Required +**Method**: GET +**Parameters**: +- `favorites`: "true" to show only favorites +- `status`: Filter by status (active/inactive/archived) +- `client`: Filter by client name +- `search`: Search in project name/description + +**Example:** +``` +GET /projects?favorites=true&status=active +``` + +### Frontend Implementation + +#### JavaScript + +The `toggleFavorite(projectId, button)` function handles the star icon clicks: + +1. Performs optimistic UI update (changes star immediately) +2. Sends AJAX POST request to favorite/unfavorite endpoint +3. Reverts UI if request fails +4. Shows success/error message + +#### UI Components + +- **Star Icon**: FontAwesome icons (`fas fa-star` for favorited, `far fa-star` for not favorited) +- **Color Coding**: Yellow/gold for favorited, muted gray for not favorited +- **Filter Dropdown**: Added "Favorites Only" option to the filters form + +## Migration + +### Running the Migration + +To add the favorite projects table to an existing database: + +```bash +# Using Alembic +alembic upgrade head + +# Or using the migration management script +python migrations/manage_migrations.py upgrade +``` + +### Rollback + +To rollback the favorite projects feature: + +```bash +alembic downgrade -1 +``` + +## Activity Logging + +The following activities are logged: + +- `project.favorited`: When a user adds a project to favorites +- `project.unfavorited`: When a user removes a project from favorites + +These activities can be viewed in: +- User activity logs +- System audit trail +- Analytics dashboards (if enabled) + +## Testing + +Comprehensive test coverage is provided in `tests/test_favorite_projects.py`: + +### Test Categories + +1. **Model Tests**: Testing the `UserFavoriteProject` model +2. **Method Tests**: Testing User and Project model methods +3. **Route Tests**: Testing API endpoints +4. **Filtering Tests**: Testing the favorites filter +5. **Relationship Tests**: Testing cascade delete behavior +6. **Smoke Tests**: End-to-end workflow tests + +### Running Tests + +```bash +# Run all favorite projects tests +pytest tests/test_favorite_projects.py -v + +# Run specific test class +pytest tests/test_favorite_projects.py::TestUserFavoriteProjectModel -v + +# Run with coverage +pytest tests/test_favorite_projects.py --cov=app.models --cov=app.routes -v +``` + +## Performance Considerations + +### Database Indexes + +The feature includes indexes on both `user_id` and `project_id` columns in the `user_favorite_projects` table for optimal query performance. + +### Query Optimization + +- Favorites are loaded once per page load and stored in a set for O(1) lookup +- The favorites filter uses an efficient JOIN query +- Lazy loading is used for relationships to avoid N+1 queries + +### Scalability + +The feature is designed to scale: +- Indexes ensure fast lookups even with thousands of projects +- Per-user favorites don't impact other users +- AJAX requests are lightweight (no page reloads) + +## Security Considerations + +- **Authentication Required**: All favorite endpoints require user login +- **User Isolation**: Users can only manage their own favorites +- **CSRF Protection**: All POST requests use CSRF tokens +- **Input Validation**: Project IDs are validated before database operations +- **Cascade Delete**: Favorites are automatically cleaned up when users/projects are deleted + +## Browser Compatibility + +The feature works in all modern browsers: +- Chrome 90+ +- Firefox 88+ +- Safari 14+ +- Edge 90+ + +Required browser features: +- Fetch API for AJAX requests +- ES6 JavaScript (arrow functions, const/let) +- CSS3 for animations + +## Future Enhancements + +Potential improvements for future versions: + +1. **Favorite Count Badge**: Show number of favorites in summary cards +2. **Recently Used**: Track and show recently accessed projects +3. **Favorite Ordering**: Allow users to reorder their favorites +4. **Quick Access Menu**: Add favorites to navigation menu +5. **Keyboard Shortcuts**: Add keyboard shortcut to favorite/unfavorite +6. **Bulk Favorite**: Select and favorite multiple projects at once +7. **Favorites Dashboard**: Dedicated dashboard showing favorite project metrics +8. **Export Favorites**: Export list of favorite projects +9. **Favorite Teams**: Share favorite project lists with team members +10. **Smart Favorites**: Auto-suggest favorites based on usage patterns + +## Troubleshooting + +### Star Icon Not Appearing + +**Symptom**: Star icon column is missing in project list + +**Solution**: +- Clear browser cache and reload +- Verify template file is up to date +- Check browser console for JavaScript errors + +### Favorite Not Saving + +**Symptom**: Clicking star doesn't persist the favorite + +**Solution**: +- Check browser console for network errors +- Verify CSRF token is present in page +- Check database migration was applied +- Review server logs for errors + +### Migration Fails + +**Symptom**: Migration script fails to create table + +**Solution**: +- Check database user has CREATE TABLE permissions +- Verify Alembic is up to date +- Check for conflicting table names +- Review migration logs for specific errors + +## Support + +For issues or questions about this feature: + +1. Check the [FAQ](../README.md#faq) section +2. Review the [test cases](../../tests/test_favorite_projects.py) for usage examples +3. Check [GitHub Issues](https://github.com/yourusername/TimeTracker/issues) +4. Contact the development team + +## Changelog + +### Version 1.0.0 (2025-10-23) + +**Added:** +- Initial implementation of favorite projects feature +- Star icon for each project in project list +- Favorites filter in projects page +- User model methods for managing favorites +- Project model methods for checking favorite status +- API endpoints for favorite/unfavorite actions +- Comprehensive test coverage +- Documentation + +**Database:** +- Added `user_favorite_projects` table +- Migration script: `023_add_user_favorite_projects.py` + +**Security:** +- CSRF protection on all favorite endpoints +- User authentication required +- Per-user favorite isolation + diff --git a/logs/app.jsonl b/logs/app.jsonl index f3063f2..1b477ed 100644 --- a/logs/app.jsonl +++ b/logs/app.jsonl @@ -60,3 +60,7 @@ {"asctime": "2025-10-23 20:18:13,808", "levelname": "INFO", "name": "timetracker", "message": "timer.duplicated", "taskName": null, "request_id": "01a0cac0-5466-4e22-8f05-46352eeafb55", "event": "timer.duplicated", "user_id": 1, "time_entry_id": 1, "project_id": 1, "task_id": null} {"asctime": "2025-10-23 20:18:15,922", "levelname": "INFO", "name": "timetracker", "message": "timer.duplicated", "taskName": null, "request_id": "5762bce5-cb10-4b59-a16d-aa40af773ec5", "event": "timer.duplicated", "user_id": 1, "time_entry_id": 1, "project_id": 1, "task_id": null} {"asctime": "2025-10-23 20:18:18,704", "levelname": "INFO", "name": "timetracker", "message": "timer.duplicated", "taskName": null, "request_id": "c19ff3aa-1113-4e2c-81ad-72abf5cbc736", "event": "timer.duplicated", "user_id": 1, "time_entry_id": 1, "project_id": 1, "task_id": null} +{"asctime": "2025-10-23 20:43:18,241", "levelname": "INFO", "name": "timetracker", "message": "project.favorited", "taskName": null, "request_id": "d87e4ea4-4219-4edb-99d4-81829e4c157d", "event": "project.favorited", "user_id": 1, "project_id": 1} +{"asctime": "2025-10-23 20:43:20,050", "levelname": "INFO", "name": "timetracker", "message": "project.unfavorited", "taskName": null, "request_id": "8a0369d4-a457-4bee-bbe9-a21ef7f00056", "event": "project.unfavorited", "user_id": 1, "project_id": 1} +{"asctime": "2025-10-23 20:44:25,411", "levelname": "INFO", "name": "timetracker", "message": "project.favorited", "taskName": null, "request_id": "a64b6ad2-badd-4879-bdc7-ae8b0e94fe3d", "event": "project.favorited", "user_id": 1, "project_id": 1} +{"asctime": "2025-10-23 20:44:26,386", "levelname": "INFO", "name": "timetracker", "message": "project.unfavorited", "taskName": null, "request_id": "73d9bd58-61e5-431d-9963-6a57e2b63e61", "event": "project.unfavorited", "user_id": 1, "project_id": 1} diff --git a/migrations/versions/023_add_user_favorite_projects.py b/migrations/versions/023_add_user_favorite_projects.py new file mode 100644 index 0000000..a354379 --- /dev/null +++ b/migrations/versions/023_add_user_favorite_projects.py @@ -0,0 +1,65 @@ +"""Add user favorite projects functionality + +Revision ID: 024 +Revises: 023 +Create Date: 2025-10-23 00:00:00 + +""" +from alembic import op +import sqlalchemy as sa +from datetime import datetime + + +# revision identifiers, used by Alembic. +revision = '024' +down_revision = '023' +branch_labels = None +depends_on = None + + +def upgrade(): + """Create user_favorite_projects association table""" + bind = op.get_bind() + dialect_name = bind.dialect.name if bind else 'generic' + + # Create the user_favorite_projects table + try: + op.create_table( + 'user_favorite_projects', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('user_id', sa.Integer(), nullable=False), + sa.Column('project_id', sa.Integer(), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=False, server_default=sa.text('CURRENT_TIMESTAMP')), + sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'), + sa.ForeignKeyConstraint(['project_id'], ['projects.id'], ondelete='CASCADE'), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('user_id', 'project_id', name='uq_user_project_favorite') + ) + + # Create indexes for faster lookups + op.create_index('ix_user_favorite_projects_user_id', 'user_favorite_projects', ['user_id']) + op.create_index('ix_user_favorite_projects_project_id', 'user_favorite_projects', ['project_id']) + + print("✓ Created user_favorite_projects table") + except Exception as e: + print(f"⚠ Warning creating user_favorite_projects table: {e}") + + +def downgrade(): + """Drop user_favorite_projects association table""" + try: + op.drop_index('ix_user_favorite_projects_project_id', table_name='user_favorite_projects') + except Exception: + pass + + try: + op.drop_index('ix_user_favorite_projects_user_id', table_name='user_favorite_projects') + except Exception: + pass + + try: + op.drop_table('user_favorite_projects') + print("✓ Dropped user_favorite_projects table") + except Exception as e: + print(f"⚠ Warning dropping user_favorite_projects table: {e}") + diff --git a/templates/admin/create_user.html b/templates/admin/create_user.html deleted file mode 100644 index 3e7958e..0000000 --- a/templates/admin/create_user.html +++ /dev/null @@ -1,78 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('New User') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-
- -

- {{ _('New User') }} -

-
- -
-
-
- -
-
-
-
-
- {{ _('User Information') }} -
-
-
-
- -
-
-
- - -
{{ _('Lowercase; must be unique.') }}
-
-
-
-
- - -
-
-
- -
- - {{ _('Cancel') }} - - -
-
-
-
-
-
-
-{% endblock %} - - diff --git a/templates/admin/dashboard.html b/templates/admin/dashboard.html deleted file mode 100644 index 09873b1..0000000 --- a/templates/admin/dashboard.html +++ /dev/null @@ -1,276 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Admin Dashboard') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('System Info') }} - - - {{ _('Create Backup') }} - - - {{ _('Restore') }} - - - {{ _('OIDC Debug') }} - - {% endset %} - {{ page_header('fas fa-cogs', _('Admin Dashboard'), _('Manage users, system settings, and core operations at a glance.'), actions) }} -
-
- - -
-
- {% from "_components.html" import summary_card %} - {{ summary_card('fas fa-users', 'primary', 'Total Users', stats.total_users) }} -
-
- {{ summary_card('fas fa-project-diagram', 'success', 'Total Projects', stats.total_projects) }} -
-
- {{ summary_card('fas fa-clock', 'info', 'Time Entries', stats.total_entries) }} -
-
- {{ summary_card('fas fa-stopwatch', 'warning', 'Total Hours', "%.1f"|format(stats.total_hours) ~ 'h') }} -
-
- - -
-
-
-
-
-
- {{ _('OIDC Authentication Status') }} -
- - {{ _('Debug Dashboard') }} - -
-
-
-
-
-
- {% if oidc_enabled %} -
- -
-

{{ _('ENABLED') }}

- {% else %} -
- -
-

{{ _('DISABLED') }}

- {% endif %} - {{ _('OIDC SSO') }} -
-
-
- - - - - - - - - - - - - - - -
{{ _('Auth Method') }}: - - {{ oidc_auth_method|upper }} - -
{{ _('Configuration') }}: - {% if oidc_configured %} - - {{ _('Complete') }} - - {% elif oidc_enabled %} - - {{ _('Incomplete') }} - - {% else %} - - {{ _('Not configured') }} - - {% endif %} -
{{ _('OIDC Users') }}: - {{ oidc_users_count }} {{ _('user(s)') }} -
-
-
-
- {% if oidc_enabled %} - - {{ _('Test Config') }} - - - {{ _('View Details') }} - - {% else %} - - {{ _('Set AUTH_METHOD=oidc to enable') }} - - - {{ _('Setup Guide') }} - - {% endif %} -
-
-
- {% if oidc_enabled and not oidc_configured %} -
- - {{ _('Configuration Incomplete:') }} - {{ _('OIDC is enabled but missing required environment variables. Check the') }} - {{ _('Debug Dashboard') }} - {{ _('for details.') }} -
- {% endif %} -
-
-
-
- - -
-
-
-
-
- {{ _('User Management') }} -
-
-
-
- - {{ _('Manage Users') }} - - - {{ _('Create New User') }} - -
-
-
-
-
-
-
-
- {{ _('System Settings') }} -
-
-
-
- - {{ _('Configure Settings') }} - - - {{ _('Create Backup') }} - -
-
-
-
-
- - -
-
-
-
-
- {{ _('Recent Activity') }} -
-
-
- {% if recent_entries %} -
- - - - - - - - - - - - {% for entry in recent_entries %} - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Project') }}{{ _('Date') }}{{ _('Duration') }}{{ _('Status') }}
{{ entry.user.display_name }} - - {{ entry.project.name }} - - {{ entry.start_time.strftime('%Y-%m-%d %H:%M') }}{{ entry.duration_formatted }} - {% if entry.end_time %} - {{ _('Completed') }} - {% else %} - {{ _('Running') }} - {% endif %} -
-
- {% else %} -
-
- -
{{ _('No recent activity') }}
-

{{ _('No time entries have been recorded recently.') }}

-
-
- {% endif %} -
-
-
- -
-
-
-
- {{ _('Quick Actions') }} -
-
-
-
- - {{ _('New Project') }} - - - {{ _('View Reports') }} - - - {{ _('System Info') }} - - - {{ _('OIDC Debug') }} - -
-
-
-
-
-
-{% endblock %} diff --git a/templates/admin/settings.html b/templates/admin/settings.html deleted file mode 100644 index c08981e..0000000 --- a/templates/admin/settings.html +++ /dev/null @@ -1,595 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Settings') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-

- {{ _('System Settings') }} -

- - {{ _('Back to Dashboard') }} - -
-
-
- -
-
-
-
-
-
{{ _('Configuration') }}
- - {{ _('Edit PDF Layout') }} - -
-
-
-
- -
-
- - - - {{ _('Select your local timezone for proper time display. Times shown include DST adjustments.') }} -
-
- - -
- - - -
- - -
-
- - -
- -
- - -
-
- - -
- -
- - -
- -
-
- - -
-
- - -
-
- -
- -
- - -
-
-
- Company Branding (for Invoices) -
-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- {% if settings and settings.has_logo() %} - - {% endif %} - -
- - - {{ _('Supported formats: PNG, JPG, JPEG, GIF, WEBP (Max size: 5MB)') }} - - -
- -
-
- - -
-
- -
- - - {{ _('This will appear on invoices for payment instructions') }} -
-
- - -
-
-
- {{ _('Invoice Defaults') }} -
-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
- - -
-
-
- {{ _('Privacy & Analytics') }} -
-
- -
-
- - -
- - {{ _('When enabled, basic system information (OS, version, etc.) may be shared for analytics purposes.') }} - {{ _('Core functionality will continue to work regardless of this setting.') }} -
{{ _('This helps improve the application.') }} -
-
-
-
- -
-
-
-
- - {{ _('Current Time:') }} - {{ _('Loading...') }} -
-
- - {{ _('in') }} {{ settings.timezone if settings else 'Europe/Rome' }} {{ _('timezone') }} - -
-
-
-
-
- - - {{ _('This time updates every second and shows the current time in your selected timezone') }} - -
-
- - - {{ _('Current offset:') }} -- - -
-
-
-
-
-
- -
-
-
- -
-
-
-
{{ _('Help') }}
-
-
-

{{ _('Configure application-wide settings such as timezone, currency, timer behavior, data export options, and company branding for invoices.') }}

-
    -
  • {{ _('Rounding affects how durations are rounded when displayed.') }}
    • -
  • {{ _('Single Active Timer stops any running timer when a new one is started.') }}
    • -
  • {{ _('Self Register allows new usernames to be created on login.') }}
    • -
  • {{ _('Company branding settings are used for PDF invoice generation.') }}
    • -
  • {{ _('Company logos can be uploaded directly through the interface (PNG, JPG, JPEG, GIF, SVG, WEBP formats supported).') }}
    • -
  • {{ _('Analytics setting controls whether system information is shared for analytics purposes.') }}
    • -
  • {{ _('Core functionality will continue to work regardless of the analytics setting.') }}
    • -
-
-
-
-
-
- - - -{% endblock %} - - diff --git a/templates/admin/system_info.html b/templates/admin/system_info.html deleted file mode 100644 index d86c535..0000000 --- a/templates/admin/system_info.html +++ /dev/null @@ -1,95 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('System Info') }} - {{ app_name }}{% endblock %} - -{% block content %} -{% from "_components.html" import page_header %} -
-
-
- {{ page_header('fas fa-info-circle', _('System Information'), _('System status and metrics'), None) }} -
-
- -
-
-
-
-
-
-
{{ _('Total Users') }}
-
{{ total_users }}
-
-
-
-
-
-
-
-
-
-
{{ _('Total Projects') }}
-
{{ total_projects }}
-
-
-
-
-
-
-
-
-
-
{{ _('Time Entries') }}
-
{{ total_entries }}
-
-
-
-
-
-
-
-
-
-
{{ _('Active Timers') }}
-
{{ active_timers }}
-
-
-
-
-
- -
-
-
-
- {{ _('System Details') }} -
-
-
-
{{ _('Total Users') }}
-
{{ total_users }}
-
-
-
{{ _('Total Projects') }}
-
{{ total_projects }}
-
-
-
{{ _('Time Entries') }}
-
{{ total_entries }}
-
-
-
{{ _('Active Timers') }}
-
{{ active_timers }}
-
-
-
{{ _('Database Size') }}
-
{{ db_size_mb }} MB
-
-
-
-
-
-
-{% endblock %} - - diff --git a/templates/admin/user_form.html b/templates/admin/user_form.html deleted file mode 100644 index cc78865..0000000 --- a/templates/admin/user_form.html +++ /dev/null @@ -1,196 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ (user and _('Edit') or _('New')) }} {{ _('User') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('Back to Users') }} - - {% endset %} - {{ page_header('fas fa-user', (user and _('Edit User') or _('New User')), _('Create or update user accounts'), actions) }} -
-
- -
-
-
-
-
- {{ _('User Information') }} -
-
-
-
- -
-
-
- - {% if user %} - - - {% else %} - - {% endif %} -
-
-
-
- - -
-
-
- -
-
- {% set active_checked = (user.is_active if user else (request.form.get('is_active', 'on') in ['on','true','1'])) %} - - -
-
- -
- - {{ _('Cancel') }} - - -
-
-
-
-
- -
-
-
-
- {{ _('Help') }} -
-
-
-
{{ _('Username') }}
-

{{ _('Choose a unique username for the user. This will be used for login.') }}

- -
{{ _('Role') }}
-

- {{ _('User:') }} {{ _('Can track time, view projects, and generate reports.') }}
- {{ _('Admin:') }} {{ _('Can manage users, projects, and system settings.') }} -

- -
{{ _('Active Status') }}
-

{{ _('Inactive users cannot log in or access the system.') }}

- - {% if user %} -
-
{{ _('User Statistics') }}
-
-
-
{{ "%.1f"|format(user.total_hours) }}
- {{ _('Total Hours') }} -
-
-
{{ user.time_entries.count() }}
- {{ _('Time Entries') }} -
-
- -
-
{{ _('Account Information') }}
- -
{{ _('Created:') }} {{ user.created_at.strftime('%Y-%m-%d %H:%M') }}
- {% if user.last_login %} -
{{ _('Last Login:') }} {{ user.last_login.strftime('%Y-%m-%d %H:%M') }}
- {% else %} -
{{ _('Last Login: Never') }}
- {% endif %} - -
- {% endif %} -
-
- - {% if user and user.id != current_user.id %} -
-
-
- {{ _('Danger Zone') }} -
-
-
-

{{ _('These actions cannot be undone.') }}

- -
-
- {% endif %} -
-
-
- - - - - -{% endblock %} diff --git a/templates/admin/users.html b/templates/admin/users.html deleted file mode 100644 index 4c6f1ea..0000000 --- a/templates/admin/users.html +++ /dev/null @@ -1,238 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('User Management') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('New User') }} - - {% endset %} - {{ page_header('fas fa-users', _('User Management'), _('Manage users') ~ ' • ' ~ (users|length) ~ ' ' ~ _('total'), actions) }} -
-
- - -
-
-
-
-
- -
-

{{ stats.total_users }}

-

{{ _('Total Users') }}

-
-
-
-
-
-
- -

{{ stats.active_users }}

-

{{ _('Active Users') }}

-
-
-
-
-
-
- -

{{ stats.admin_users }}

-

{{ _('Admin Users') }}

-
-
-
-
-
-
- -

{{ "%.1f"|format(stats.total_hours) }}h

-

{{ _('Total Hours') }}

-
-
-
-
- - -
-
-
-
-
-
- {{ _('All Users') }} -
-
-
- - - - -
-
-
-
-
- {% if users %} -
- - - - - - - - - - - - - - {% for user in users %} - - - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Role') }}{{ _('Status') }}{{ _('Created') }}{{ _('Last Login') }}{{ _('Total Hours') }}{{ _('Actions') }}
-
- {{ user.display_name }} - {% if user.active_timer %} -
- {{ _('Timer Running') }} - - {% endif %} -
- 		- {% if user.role == 'admin' %} - {{ _('Admin') }} - {% else %} - {{ _('User') }} - {% endif %} - - {% if user.is_active %} - {{ _('Active') }} - {% else %} - {{ _('Inactive') }} - {% endif %} - {{ user.created_at.strftime('%Y-%m-%d') }} - {% if user.last_login %} - {{ user.last_login.strftime('%Y-%m-%d %H:%M') }} - {% else %} - {{ _('Never') }} - {% endif %} - - {{ "%.1f"|format(user.total_hours) }}h - -
- - - - {% if user.id != current_user.id %} - - {% endif %} -
-
-
- {% else %} -
-
- -
{{ _('No users found') }}
-

{{ _('Create your first user to get started with administration.') }}

- - {{ _('Create First User') }} - -
-
- {% endif %} -
-
-
-
-
- - - - - -{% endblock %} diff --git a/templates/clients/list.html b/templates/clients/list.html deleted file mode 100644 index e517ed4..0000000 --- a/templates/clients/list.html +++ /dev/null @@ -1,436 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Clients') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - {% if current_user.is_admin %} - - {{ _('New Client') }} - - {% endif %} - {% endset %} - {{ page_header('fas fa-building', _('Clients'), _('Manage customers and contacts') ~ ' • ' ~ (clients|length) ~ ' ' ~ _('total'), actions) }} -
-
- - -
-
-
-
-
-
- {{ _('All Clients') }} -
-
-
- - - - -
- {% if current_user.is_admin %} -
- - -
- {% endif %} -
-
-
-
- {% if clients %} -
- - - - {% if current_user.is_admin %} - - {% endif %} - - - - - - - - - - - - {% for client in clients %} - - {% if current_user.is_admin %} - - {% endif %} - - - - - - - - - - {% endfor %} - -
- - {{ _('Name') }}{{ _('Contact Person') }}{{ _('Email') }}{{ _('Phone') }}{{ _('Default Rate') }}{{ _('Projects') }}{{ _('Status') }}{{ _('Actions') }}
- - - - {{ client.name }} - - {% if client.description %} -
{{ client.description[:50] }}{% if client.description|length > 50 %}...{% endif %} - {% endif %} - 		{{ client.contact_person or '-' }} - {% if client.email %} - {{ client.email }} - {% else %} - - - {% endif %} - {{ client.phone or '-' }} - {% if client.default_hourly_rate %} - {{ "%.2f"|format(client.default_hourly_rate) }} {{ currency }} - {% else %} - - - {% endif %} - - {{ client.total_projects }} - {% if client.active_projects > 0 %} -
{{ client.active_projects }} {{ _('active') }} - {% endif %} - 		- {% set status_map = { - 'active': {'bg': 'bg-success', 'label': _('Active')}, - 'inactive': {'bg': 'bg-secondary', 'label': _('Inactive')} - } %} - {% set sc = status_map.get(client.status, status_map['inactive']) %} - {{ sc.label }} - -
- - - - {% if current_user.is_admin %} - - - - {% if client.status == 'active' %} - - {% else %} - - {% endif %} - {% if client.total_projects == 0 %} - - {% endif %} - {% endif %} -
-
-
- {% else %} -
- -

{{ _('No Clients Found') }}

-

{{ _('Get started by creating your first client.') }}

- {% if current_user.is_admin %} - - {{ _('Create First Client') }} - - {% endif %} -
- {% endif %} -
-
-
-
-
- - - -
- -
- -
- - -
- - - - - - - -{% block extra_js %} - - - -{% endblock %} -{% endblock %} diff --git a/templates/clients/view.html b/templates/clients/view.html deleted file mode 100644 index daeddd4..0000000 --- a/templates/clients/view.html +++ /dev/null @@ -1,339 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ client.name }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - {% if current_user.is_admin %} - - {{ _('Edit Client') }} - - {% endif %} - - {{ _('Back to Clients') }} - - {% endset %} - {{ page_header('fas fa-building', client.name, _('Client details and project overview'), actions) }} -
-
- -
-
-
-
-
- -
-
-
{{ _('Total Projects') }}
-
{{ client.total_projects }}
-
-
-
-
-
-
-
-
- -
-
-
{{ _('Active Projects') }}
-
{{ client.active_projects }}
-
-
-
-
-
-
-
-
- -
-
-
{{ _('Total Hours') }}
-
{{ "%.1f"|format(client.total_hours) }}
-
-
-
-
-
-
-
-
- -
-
-
{{ _('Est. Total Cost') }}
-
{{ "%.2f"|format(client.estimated_total_cost) }} {{ currency }}
-
-
-
-
-
- -
- -
-
-
-
- {{ _('Client Information') }} -
-
-
-
-
- {{ _('Status') }} - - {% if client.status == 'active' %} - {{ _('Active') }} - {% else %} - {{ _('Archived') }} - {% endif %} - -
-
- {% if client.description %} -
-
{{ _('Description') }}
-
{{ client.description | markdown | safe }}
-
- {% endif %} - {% if client.contact_person %} -
-
- {{ _('Contact Person') }} - {{ client.contact_person }} -
-
- {% endif %} - {% if client.email %} -
-
- {{ _('Email') }} - {{ client.email }} -
-
- {% endif %} - {% if client.phone %} -
-
- {{ _('Phone') }} - {{ client.phone }} -
-
- {% endif %} - {% if client.address %} -
-
{{ _('Address') }}
-
{{ client.address }}
-
- {% endif %} - {% if client.default_hourly_rate %} -
-
- {{ _('Default Hourly Rate') }} - {{ "%.2f"|format(client.default_hourly_rate) }} {{ currency }} -
-
- {% endif %} -
-
- - -
-
-
- {{ _('Statistics') }} -
-
-
-
-
-

{{ client.total_projects }}

- {{ _('Total Projects') }} -
-
-

{{ client.active_projects }}

- {{ _('Active Projects') }} -
-
-
-
-
-

{{ "%.1f"|format(client.total_hours) }}

- {{ _('Total Hours') }} -
-
-

{{ "%.2f"|format(client.estimated_total_cost) }}

- {{ _('Est. Total Cost') }} -
-
-
-
- - - {% if current_user.is_admin %} -
-
-
- {{ _('Status & Actions') }} -
-
-
- {% if client.status == 'active' %} -
- - -
- {% else %} -
- - -
- {% endif %} - - {% if client.total_projects == 0 %} -
- -
- {% endif %} -
-
- {% endif %} -
- - -
-
-
-
- {{ _('Projects') }} - {{ projects|length }} {{ _('total') }} -
- {% if current_user.is_admin %} - - {{ _('New Project') }} - - {% endif %} -
-
- {% if projects %} -
- - - - - - - - - - - - - - {% for project in projects %} - - - - - - - - - - {% endfor %} - -
{{ _('Project') }}{{ _('Status') }}{{ _('Billable') }}{{ _('Hourly Rate') }}{{ _('Total Hours') }}{{ _('Est. Cost') }}{{ _('Actions') }}
- - {{ project.name }} - - {% if project.code_display %} - {{ project.code_display }} - {% endif %} - {% if project.description %} -
{{ project.description[:50] }}{% if project.description|length > 50 %}...{% endif %} - {% endif %} - 		- {% if project.status == 'active' %} - {{ _('Active') }} - {% else %} - {{ _('Archived') }} - {% endif %} - - {% if project.billable %} - {{ _('Yes') }} - {% else %} - {{ _('No') }} - {% endif %} - - {% if project.hourly_rate %} - {{ "%.2f"|format(project.hourly_rate) }} {{ currency }} - {% else %} - - - {% endif %} - {{ "%.1f"|format(project.total_hours) }} - {% if project.billable and project.hourly_rate %} - {{ "%.2f"|format(project.estimated_cost) }} {{ currency }} - {% else %} - - - {% endif %} - -
- - - - {% if current_user.is_admin %} - - - - {% endif %} -
-
-
- {% else %} -
-
- -
{{ _('No projects found') }}
-

{{ _("This client doesn't have any projects yet.") }}

- {% if current_user.is_admin %} - - {{ _('Create First Project') }} - - {% endif %} -
-
- {% endif %} -
-
-
-
-
- - -{% endblock %} diff --git a/templates/errors/400.html b/templates/errors/400.html deleted file mode 100644 index 3f6c5c3..0000000 --- a/templates/errors/400.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('400 Bad Request') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-
-

- {{ _('400 Bad Request') }} -

-
-
-
{{ _('Invalid Request') }}
-

- {{ _('The request you made is invalid or contains errors. This could be due to:') }} -

-
    -
  • {{ _('Missing or invalid form data') }}
    • -
  • {{ _('Malformed request parameters') }}
    • -
-
- - {{ _('Go to Dashboard') }} - - -
-
-
-
-
-
-{% endblock %} diff --git a/templates/errors/403.html b/templates/errors/403.html deleted file mode 100644 index 77a3ef2..0000000 --- a/templates/errors/403.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('403 Forbidden') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-
-

- {{ _('403 Forbidden') }} -

-
-
-
{{ _('Access Denied') }}
-

- {{ _("You don't have permission to access this resource. This could be due to:") }} -

-
    -
  • {{ _('Insufficient privileges') }}
    • -
  • {{ _('Not logged in') }}
    • -
  • {{ _('Resource access restrictions') }}
    • -
-
- - {{ _('Go to Dashboard') }} - - - {{ _('Login') }} - -
-
-
-
-
-
-{% endblock %} diff --git a/templates/errors/404.html b/templates/errors/404.html deleted file mode 100644 index f0f7f68..0000000 --- a/templates/errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Page Not Found') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
- -

404

-

{{ _('Page Not Found') }}

-

- {{ _("The page you're looking for doesn't exist or has been moved.") }} -

-
- - {{ _('Go to Dashboard') }} - - - {{ _('Go Back') }} - -
-
-
-
-
-{% endblock %} diff --git a/templates/errors/500.html b/templates/errors/500.html deleted file mode 100644 index 02b1f69..0000000 --- a/templates/errors/500.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Server Error') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
- -

500

-

{{ _('Server Error') }}

-

- {{ _('Something went wrong on our end. Please try again later.') }} -

-
- - {{ _('Go to Dashboard') }} - - - {{ _('Try Again') }} - -
-
-
-
-
-{% endblock %} diff --git a/templates/invoices/create.html b/templates/invoices/create.html deleted file mode 100644 index aae9e7e..0000000 --- a/templates/invoices/create.html +++ /dev/null @@ -1,735 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Create Invoice') }} - TimeTracker{% endblock %} - -{% block content %} -
-
-
- -
-
-

- - {{ _('Create New Invoice') }} -

-
-
-
-
- - {{ _('Back to Invoices') }} - -
- - -
-
-
-
-
-
-
1
- {{ _('Basic Info') }} -
-
-
-
2
- {{ _('Client Details') }} -
-
-
-
3
- {{ _('Settings') }} -
-
-
-
4
- {{ _('Review') }} -
-
-
-
-
-
- -
- -
-
- -
-
-
- {{ _('Step 1: Basic Information') }} -
-
-
-
-
-
- - -
- - {{ _('Select the project this invoice is for') }} -
-
-
-
-
- - -
- - {{ _('When payment is due') }} -
-
-
-
- -
- -
-
-
- - - - - - - - - -
- -
- -
-
-
- Project Information -
-
-
-
-
-
Client
-
-
-
-
-
Hourly Rate
-
{{ settings.currency or 'EUR' }}0.00
-
-
-
Billable
-
-
-
-
-
- -
{{ _('Select a project to see details') }}
-
-
-
- - -
-
-
- {{ _('Quick Tips') }} -
-
-
-
-
- -
-
- {{ _('Time Integration') }} -

- {{ _('Generate line items from tracked time entries after creation') }} -

-
-
- -
-
- -
-
- {{ _('Auto Calculations') }} -

- {{ _('Tax and totals computed automatically') }} -

-
-
- -
-
- -
-
- {{ _('Export Options') }} -

- {{ _('CSV export and PDF generation available') }} -

-
-
-
-
-
-
-
-
-
-
- - -{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/templates/invoices/edit.html b/templates/invoices/edit.html deleted file mode 100644 index 6905e57..0000000 --- a/templates/invoices/edit.html +++ /dev/null @@ -1,380 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Edit Invoice') }} {{ invoice.invoice_number }} - TimeTracker{% endblock %} - -{% block content %} -
-
-
-
-

- - {{ _('Edit Invoice') }} {{ invoice.invoice_number }} -

-
- - {{ _('View') }} - - - {{ _('Back') }} - -
-
- -
- -
-
- -
-
-
{{ _('Invoice Details') }}
-
-
-
-
-
- - -
-
-
-
- - -
-
-
- -
- - -
- -
-
-
- - -
-
-
-
- - -
-
-
- -
- - -
- -
- - -
-
-
- - -
-
-
{{ _('Invoice Items') }}
- -
-
-
- - - - - - - - - - - - {% for item in invoice.items %} - - - - - - - - {% endfor %} - - - - - - - - - - - - - - - - - - -
{{ _('Description *') }}{{ _('Quantity (Hours) *') }}{{ _('Unit Price *') }}{{ _('Total') }}{{ _('Actions') }}
- - - - - - - - - - -
{{ _('Subtotal:') }} - -
- {{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%): - - -
{{ _('Total Amount:') }} - -
-
-
-
-
- -
- -
-
-
{{ _('Project Information') }}
-
-
-
- {{ _('Project:') }}
- {{ invoice.project.name }} -
-
- {{ _('Client:') }}
- {{ invoice.project.client }} -
-
- {{ _('Hourly Rate:') }}
- - {% if invoice.project.hourly_rate %} - {{ "%.2f"|format(invoice.project.hourly_rate) }} {{ currency }} - {% else %} - {{ _('Not set') }} - {% endif %} - -
-
- {{ _('Billing Reference:') }}
- {{ invoice.project.billing_ref or 'None' }} -
-
-
- - -
-
-
{{ _('Quick Actions') }}
-
-
-
- - {{ _('Generate from Time Entries') }} - -
-
- -
-
- -
-
-
- - -
-
-
{{ _('Totals Summary') }}
-
-
-
-
{{ _('Subtotal:') }}
-
- {{ "%.2f"|format(invoice.subtotal) }} {{ currency }} -
-
-
-
{{ _('Tax:') }}
-
- {{ "%.2f"|format(invoice.tax_amount) }} {{ currency }} -
-
-
-
-
{{ _('Total:') }}
-
- {{ "%.2f"|format(invoice.total_amount) }} {{ currency }} -
-
-
-
-
-
- - -
-
-
-
-
- - {{ _('Cancel') }} - - -
-
-
-
-
-
-
-
-
-{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/templates/invoices/generate_from_time.html b/templates/invoices/generate_from_time.html deleted file mode 100644 index 6fc9210..0000000 --- a/templates/invoices/generate_from_time.html +++ /dev/null @@ -1,586 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Generate Invoice from Time') }} - TimeTracker{% endblock %} - -{% block content %} -
-
-
- -
-
-

- - {{ _('Generate Invoice Items from Time Entries') }} -

- {{ _('Invoice #') }}{{ invoice.invoice_number }} -
- - {{ _('Back to Invoice') }} - -
- - -
-
-
-
-
-
-
-
{{ _('Client') }}
-
{{ invoice.client_name }}
-
-
-
-
-
{{ _('Project') }}
-
{{ invoice.project.name }}
-
-
-
-
-
{{ _('Hourly Rate') }}
-
{{ "%.2f"|format(invoice.project.hourly_rate or 0) }} {{ currency }}
-
-
-
-
-
{{ _('Available Hours') }}
-
{{ "%.2f"|format(total_available_hours) }}h
-
-
-
-
-
-
-
- -
-
-
-
-
-
- {{ _('Select Time Entries') }} -
-
- - -
-
-
-
- {% if time_entries %} -
- - -
-
-
- - -
-
- - - 0 {{ _('selected') }} - - - - 0.00 {{ _('hours') }} - -
-
-
- - -
- - - - - - - - - - - - - {% for entry in time_entries %} - - - - - - - - - {% endfor %} - -
{{ _('Select') }}{{ _('Date') }}{{ _('User') }}{{ _('Task') }}{{ _('Duration') }}{{ _('Notes') }}
-
- -
- 		-
-
{{ entry.start_time.strftime('%b %d') }}
- {{ entry.start_time.strftime('%Y') }} -
- 		- - - {% if entry.task %} - {{ entry.task.name }} - {% else %} - {{ entry.project.name }} - {% endif %} - - {{ "%.2f"|format(entry.duration_hours) }}h - - {% if entry.notes %} -
-
{{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %}
- {% if entry.notes|length > 50 %} - {{ _('Click to view full notes') }} - {% endif %} -
- {% else %} - {{ _('No notes') }} - {% endif %} -
-
- - -
-
- -
- {{ _('Summary:') }} - 0 {{ _('entries selected,') }} - 0.00 {{ _('hours total') }} -
- - {{ _("Selected entries will be converted to invoice line items with the project's hourly rate.") }} - -
-
-
-
- - -
- - {{ _('Cancel') }} - - -
-
- {% else %} -
-
- -
{{ _('No time entries found') }}
-

- {{ _('There are no time entries available for this project to generate invoice items from.') }} -

-
- - {{ _('Back to Invoice') }} - - - {{ _('Add Time Entry') }} - -
-
-
- {% endif %} -
-
-
- -
- -
-
-
- {{ _('Quick Actions') }} -
-
-
-
- - - - -
-
-
- - -
-
-
- {{ _('Tips') }} -
-
-
-
-
- -
-
- {{ _('Smart Selection') }} -

- {{ _('Use quick actions to select time entries by date ranges or task types') }} -

-
-
- -
-
- -
-
- {{ _('Automatic Calculation') }} -

- {{ _("Line items are automatically calculated using the project's hourly rate") }} -

-
-
- -
-
- -
-
- {{ _('Review & Edit') }} -

- {{ _('You can edit generated items before finalizing the invoice') }} -

-
-
-
-
-
-
-
-
-
- - -{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/templates/invoices/list.html b/templates/invoices/list.html deleted file mode 100644 index b2f628c..0000000 --- a/templates/invoices/list.html +++ /dev/null @@ -1,412 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Invoices') }} - TimeTracker{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('Create Invoice') }} - - {% endset %} - {{ page_header('fas fa-file-invoice-dollar', _('Invoices'), _('Billing overview') ~ ' • ' ~ summary.total_invoices ~ ' ' ~ _('total'), actions) }} -
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Total Invoices') }}
-
{{ summary.total_invoices }}
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
{{ _('Total Amount') }}
-
{{ "%.2f"|format(summary.total_amount) }} {{ currency }}
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
{{ _('Outstanding') }}
-
{{ "%.2f"|format(summary.outstanding_amount) }} {{ currency }}
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
{{ _('Overdue') }}
-
{{ "%.2f"|format(summary.overdue_amount) }} {{ currency }}
-
-
-
-
-
-
- - -
-
-
-
- {{ _('All Invoices') }} -
-
-
- - - - - -
-
- - - - -
-
-
-
-
- {% if invoices %} -
- - - - - - - - - - - - - - - - {% for invoice in invoices %} - - - - - - - - - - - - {% endfor %} - -
{{ _('Invoice #') }}{{ _('Client') }}{{ _('Project') }}{{ _('Issue Date') }}{{ _('Due Date') }}{{ _('Amount') }}{{ _('Status') }}{{ _('Payment') }}{{ _('Actions') }}
-
-
- {{ invoice.invoice_number }} -
-
- 		-
-
{{ invoice.client_name }}
- {% if invoice.client_email %} - {{ invoice.client_email }} - {% endif %} -
- 		- {{ invoice.project.name }} - -
-
{{ invoice.issue_date.strftime('%b %d, %Y') }}
- {{ invoice.issue_date.strftime('%Y-%m-%d') }} -
- 		- {% if invoice.is_overdue %} -
-
- {{ invoice.due_date.strftime('%b %d, %Y') }} -
- - - {{ invoice.days_overdue }} {{ _('days overdue') }} - -
- {% else %} -
-
{{ invoice.due_date.strftime('%b %d, %Y') }}
- {{ invoice.due_date.strftime('%Y-%m-%d') }} -
- {% endif %} - 		-
-
{{ "%.2f"|format(invoice.total_amount) }} {{ currency }}
-
- 		- {% set status_config = { - 'draft': {'color': 'secondary', 'icon': 'edit', 'bg': 'bg-secondary', 'label': _('Draft')}, - 'sent': {'color': 'info', 'icon': 'paper-plane', 'bg': 'bg-info', 'label': _('Sent')}, - 'paid': {'color': 'success', 'icon': 'check-circle', 'bg': 'bg-success', 'label': _('Paid')}, - 'overdue': {'color': 'danger', 'icon': 'exclamation-triangle', 'bg': 'bg-danger', 'label': _('Overdue')}, - 'cancelled': {'color': 'dark', 'icon': 'times-circle', 'bg': 'bg-dark', 'label': _('Cancelled')} - } %} - {% set config = status_config.get(invoice.status, status_config.draft) %} - - - {{ config.label }} - - -
- {% if invoice.payment_status == 'unpaid' %} - - {{ _('Unpaid') }} - - {% elif invoice.payment_status == 'partially_paid' %} - - {{ _('Partial') }} - -
-
-
-
- {{ "%.0f"|format(invoice.payment_percentage) }}% -
- {% elif invoice.payment_status == 'fully_paid' %} - - {{ _('Paid') }} - - {% if invoice.payment_date %} -
- {{ invoice.payment_date.strftime('%b %d') }} -
- {% endif %} - {% elif invoice.payment_status == 'overpaid' %} - - {{ _('Overpaid') }} - - {% endif %} -
- 		-
- - - - - - - - -
-
-
- {% else %} -
-
- -
{{ _('No invoices found') }}
-

{{ _('Create your first invoice to get started with billing.') }}

- - {{ _('Create Your First Invoice') }} - -
-
- {% endif %} -
-
-
- -{% endblock %} -{% block extra_js %} - - - - - - -{% endblock %} diff --git a/templates/invoices/record_payment.html b/templates/invoices/record_payment.html deleted file mode 100644 index 8fa37b9..0000000 --- a/templates/invoices/record_payment.html +++ /dev/null @@ -1,230 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Record Payment') }} - {{ invoice.invoice_number }} - TimeTracker{% endblock %} - -{% block content %} -
-
-
- -
-
- - - -

- - {{ _('Record Payment') }} -

-
-
- -
- -
-
-
-
- - {{ _('Payment Details') }} -
-
-
-
- -
-
-
- -
- - - - -
-
- {{ _('Outstanding amount:') }} {{ "%.2f"|format(invoice.outstanding_amount) }} -
-
-
-
-
- - -
-
-
- -
-
-
- - -
-
-
-
- - -
-
-
- -
- - -
- -
- - {{ _('Cancel') }} - - -
-
-
-
-
- - -
-
-
-
- - {{ _('Invoice Summary') }} -
-
-
-
-
- {{ _('Invoice Number:') }} - {{ invoice.invoice_number }} -
-
- {{ _('Client:') }} - {{ invoice.client_name }} -
-
- {{ _('Total Amount:') }} - {{ "%.2f"|format(invoice.total_amount) }} -
-
- {{ _('Amount Paid:') }} - {{ "%.2f"|format(invoice.amount_paid or 0) }} -
-
-
- {{ _('Outstanding:') }} - {{ "%.2f"|format(invoice.outstanding_amount) }} -
-
- - -
-
- {% if invoice.payment_status == 'unpaid' %} - - {{ _('Unpaid') }} - - {% elif invoice.payment_status == 'partially_paid' %} - - {{ _('Partially Paid') }} - - {% elif invoice.payment_status == 'fully_paid' %} - - {{ _('Fully Paid') }} - - {% elif invoice.payment_status == 'overpaid' %} - - {{ _('Overpaid') }} - - {% endif %} -
- - {% if invoice.payment_percentage > 0 %} -
-
-
-
- {{ "%.1f"|format(invoice.payment_percentage) }}% {{ _('paid') }} - {% endif %} -
-
-
-
-
-
-
-
- - -{% endblock %} diff --git a/templates/invoices/view.html b/templates/invoices/view.html deleted file mode 100644 index da268fc..0000000 --- a/templates/invoices/view.html +++ /dev/null @@ -1,774 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Invoice') }} {{ invoice.invoice_number }} - TimeTracker{% endblock %} - -{% block content %} -
-
-
- -
-
-

- - {{ _('Invoice') }} {{ invoice.invoice_number }} -

- {% set status_config = { - 'draft': {'color': 'secondary', 'icon': 'edit', 'bg': 'bg-secondary', 'label': _('Draft')}, - 'sent': {'color': 'info', 'icon': 'paper-plane', 'bg': 'bg-info', 'label': _('Sent')}, - 'paid': {'color': 'success', 'icon': 'check-circle', 'bg': 'bg-success', 'label': _('Paid')}, - 'overdue': {'color': 'danger', 'icon': 'exclamation-triangle', 'bg': 'bg-danger', 'label': _('Overdue')}, - 'cancelled': {'color': 'dark', 'icon': 'times-circle', 'bg': 'bg-dark', 'label': _('Cancelled')} - } %} - {% set config = status_config.get(invoice.status, status_config.draft) %} - - - {{ config.label }} - -
-
- - {{ _('Edit') }} - - - {% if invoice.payment_status != 'fully_paid' %} - - {{ _('Record Payment') }} - - {% endif %} -
- - -
- - {{ _('Duplicate') }} - - - {{ _('Back') }} - -
-
- - -
-
-
-
-
-
-
-
- {{ _('Bill To') }} -
-
-
{{ invoice.client_name }}
- {% if invoice.client_email %} -
- - {{ invoice.client_email }} -
- {% endif %} - {% if invoice.client_address %} -
- - {{ invoice.client_address|nl2br }} -
- {% endif %} -
-
-
-
-
-
- {{ _('Invoice Details') }} -
-
-
- {{ _('Invoice #:') }} - {{ invoice.invoice_number }} -
-
- {{ _('Project:') }} - {{ invoice.project.name }} -
-
- {{ _('Issue Date:') }} - {{ invoice.issue_date.strftime('%B %d, %Y') }} -
-
- {{ _('Due Date:') }} - - {{ invoice.due_date.strftime('%B %d, %Y') }} - {% if invoice.is_overdue %} - - - {{ invoice.days_overdue }} {{ _('days overdue') }} - - {% endif %} - -
-
-
-
-
-
-
-
- -
-
-
-
- {{ _('Status & Actions') }} -
-
-
-
- {% if invoice.status == 'draft' %} -
- - {{ _('Generate from Time') }} - -
- {% endif %} - -
- -
- -
-
-
{{ _('Created by') }}
-
{{ invoice.creator.display_name }}
-
-
-
{{ _('Created') }}
-
{{ invoice.created_at.strftime('%B %d, %Y') }}
-
-
-
{{ _('Last Modified') }}
-
{{ invoice.updated_at.strftime('%B %d, %Y') }}
-
-
-
-
-
-
-
- - {% set tax_present = invoice.tax_rate > 0 %} - -
-
-
-
-
-
-
{{ _('Subtotal') }}
-
{{ "%.2f"|format(invoice.subtotal) }} {{ currency }}
-
-
-
-
- {% if tax_present %} -
-
-
-
-
-
{{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%)
-
{{ "%.2f"|format(invoice.tax_amount) }} {{ currency }}
-
-
-
-
- {% endif %} -
-
-
-
-
-
{{ _('Total Amount') }}
-
{{ "%.2f"|format(invoice.total_amount) }} {{ currency }}
-
-
-
-
-
- - -
-
-
-
-
-
-
{{ _('Amount Paid') }}
-
{{ "%.2f"|format(invoice.amount_paid or 0) }} {{ currency }}
-
-
-
-
- -
-
-
-
-
-
{{ _('Outstanding') }}
-
{{ "%.2f"|format(invoice.outstanding_amount) }} {{ currency }}
-
-
-
-
- -
-
-
- {% if invoice.payment_status == 'unpaid' %} -
- {% elif invoice.payment_status == 'partially_paid' %} -
- {% elif invoice.payment_status == 'fully_paid' %} -
- {% elif invoice.payment_status == 'overpaid' %} -
- {% endif %} -
-
{{ _('Payment Status') }}
-
- {% if invoice.payment_status == 'unpaid' %} - {{ _('Unpaid') }} - {% elif invoice.payment_status == 'partially_paid' %} - {{ _('Partially Paid') }} - {% elif invoice.payment_status == 'fully_paid' %} - {{ _('Fully Paid') }} - {% elif invoice.payment_status == 'overpaid' %} - {{ _('Overpaid') }} - {% endif %} -
-
-
-
-
- -
-
-
-
{{ _('Payment Progress') }}
-
-
-
-
- {{ "%.1f"|format(invoice.payment_percentage) }}% {{ _('paid') }} -
-
-
-
- - - {% if invoice.payment_date or invoice.payment_method or invoice.payment_reference or invoice.payment_notes %} -
-
-
-
-
- - {{ _('Payment Details') }} -
-
-
-
- {% if invoice.payment_date %} -
-
- {{ _('Payment Date:') }} - {{ invoice.payment_date.strftime('%B %d, %Y') }} -
-
- {% endif %} - - {% if invoice.payment_method %} -
-
- {{ _('Payment Method:') }} - - {% if invoice.payment_method == 'cash' %}{{ _('Cash') }} - {% elif invoice.payment_method == 'check' %}{{ _('Check') }} - {% elif invoice.payment_method == 'bank_transfer' %}{{ _('Bank Transfer') }} - {% elif invoice.payment_method == 'credit_card' %}{{ _('Credit Card') }} - {% elif invoice.payment_method == 'debit_card' %}{{ _('Debit Card') }} - {% elif invoice.payment_method == 'paypal' %}{{ _('PayPal') }} - {% elif invoice.payment_method == 'stripe' %}{{ _('Stripe') }} - {% elif invoice.payment_method == 'wire_transfer' %}{{ _('Wire Transfer') }} - {% else %}{{ invoice.payment_method|title }}{% endif %} - -
-
- {% endif %} - - {% if invoice.payment_reference %} -
-
- {{ _('Payment Reference:') }} - {{ invoice.payment_reference }} -
-
- {% endif %} -
- - {% if invoice.payment_notes %} -
-
-
- {{ _('Payment Notes:') }} -
{{ invoice.payment_notes|nl2br }}
-
-
-
- {% endif %} -
-
-
-
- {% endif %} - - -
-
-
-
-
- {{ _('Invoice Items') }} - {{ invoice.items.count() }} {{ _('items') }} -
- {% if invoice.status == 'draft' %} - - {{ _('Edit Items') }} - - {% endif %} -
-
- {% if invoice.items.count() > 0 %} -
- - - - - - - - - - - {% for item in invoice.items %} - - - - - - - {% endfor %} - - - - - - - {% if invoice.tax_rate > 0 %} - - - - - {% endif %} - - - - - -
{{ _('Description') }}{{ _('Quantity (Hours)') }}{{ _('Unit Price') }}{{ _('Total Amount') }}
-
-
{{ item.description }}
- {% if item.time_entry_ids %} -
- - {{ _('Generated from') }} {{ item.time_entry_ids.split(',')|length }} {{ _('time entries') }} -
- {% endif %} -
- 		- {{ "%.2f"|format(item.quantity) }}h - - {{ "%.2f"|format(item.unit_price) }} {{ currency }} - - {{ "%.2f"|format(item.total_amount) }} {{ currency }} -
- {{ _('Subtotal:') }} - - {{ "%.2f"|format(invoice.subtotal) }} {{ currency }} -
- {{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%): - - {{ "%.2f"|format(invoice.tax_amount) }} {{ currency }} -
- {{ _('Total Amount:') }} - - {{ "%.2f"|format(invoice.total_amount) }} {{ currency }} -
-
- {% else %} -
-
- -
{{ _('No invoice items') }}
-

{{ _('Add items to this invoice to generate totals.') }}

- {% if invoice.status == 'draft' %} - - {{ _('Add Items') }} - - {% endif %} -
-
- {% endif %} -
-
-
-
- - - {% if invoice.notes or invoice.terms %} -
-
-
-
-
- {{ _('Additional Information') }} -
-
-
-
- {% if invoice.notes %} -
-
{{ _('Notes') }}
-
- {{ invoice.notes|nl2br }} -
-
- {% endif %} - {% if invoice.terms %} -
-
{{ _('Terms & Conditions') }}
-
- {{ invoice.terms|nl2br }} -
-
- {% endif %} -
-
-
-
-
- {% endif %} -
-
-
- - - - - -{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/templates/projects/client_view.html b/templates/projects/client_view.html deleted file mode 100644 index 57b2ba3..0000000 --- a/templates/projects/client_view.html +++ /dev/null @@ -1,88 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Client') }} - {{ client_name }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-

- {{ client_name }} -

- - {{ _('Back to Clients') }} - -
-
-
- -
-
-
-
-
{{ _('Projects') }} ({{ projects|length }})
-
-
- {% if projects %} -
- - - - - - - - - - - - {% for project in projects %} - - - - - - - - {% endfor %} - -
{{ _('Project') }}{{ _('Status') }}{{ _('Total Hours') }}{{ _('Billable Hours') }}{{ _('Actions') }}
- - {{ project.name }} - - {% if project.description %} -
{{ project.description[:100] }}{% if project.description|length > 100 %}...{% endif %} - {% endif %} - 		- {% if project.status == 'active' %} - {{ _('Active') }} - {% else %} - {{ _('Archived') }} - {% endif %} - {{ "%.1f"|format(project.total_hours) }}h - {% if project.billable %} - {{ "%.1f"|format(project.total_billable_hours) }}h - {% else %} - - - {% endif %} - - - {{ _('View') }} - -
-
- {% else %} -
- -

{{ _('No Projects for this Client') }}

-
- {% endif %} -
-
-
-
-
-{% endblock %} - - diff --git a/templates/projects/clients.html b/templates/projects/clients.html deleted file mode 100644 index 6a832cb..0000000 --- a/templates/projects/clients.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Clients') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-

- {{ _('Clients') }} -

-
-
-
- -
-
-
-
-
{{ _('Client List') }} ({{ clients|length }})
-
-
- {% if clients %} -
- {% for client in clients %} -
- -
-
-
{{ client.name }}
- {% if client.description %} -

{{ client.description[:50] }}{% if client.description|length > 50 %}...{% endif %}

- {% endif %} -
- {{ client.total_projects }} {{ _('projects') }} - {% if client.default_hourly_rate %} - {{ "%.2f"|format(client.default_hourly_rate) }} {{ currency }}/{{ _('hr') }} - {% endif %} -
-
-
- -
- {% endfor %} -
- {% else %} -
- -

{{ _('No Clients Found') }}

-
- {% endif %} -
-
-
-
-
-{% endblock %} - - diff --git a/templates/projects/form.html b/templates/projects/form.html deleted file mode 100644 index 5c2c8f8..0000000 --- a/templates/projects/form.html +++ /dev/null @@ -1,246 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{% if project %}{{ _('Edit') }}{% else %}{{ _('New') }}{% endif %} {{ _('Project') }} - {{ app_name }}{% endblock %} - -{% block content %} -
-
-
-
-
- -

- - {% if project %}{{ _('Edit Project') }}{% else %}{{ _('New Project') }}{% endif %} -

-
- -
-
-
- -
-
-
-
-
- {{ _('Project Information') }} -
-
-
-
- {{ form.hidden_tag() }} - -
-
-
- {{ form.name.label(class="form-label") }} - {{ form.name(class="form-control" + (" is-invalid" if form.name.errors else "")) }} - {% if form.name.errors %} -
- {% for error in form.name.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
-
-
-
- {{ form.client.label(class="form-label") }} - {{ form.client(class="form-control" + (" is-invalid" if form.client.errors else "")) }} - {% if form.client.errors %} -
- {% for error in form.client.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
-
-
- -
- {{ form.description.label(class="form-label") }} - {{ form.description(class="form-control", rows="3" + (" is-invalid" if form.description.errors else "")) }} - {% if form.description.errors %} -
- {% for error in form.description.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
- -
-
-
-
- {{ form.billable(class="form-check-input") }} - {{ form.billable.label(class="form-check-label") }} -
- {% if form.billable.errors %} -
- {% for error in form.billable.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
-
-
-
- {{ form.status.label(class="form-label") }} - {{ form.status(class="form-select" + (" is-invalid" if form.status.errors else "")) }} - {% if form.status.errors %} -
- {% for error in form.status.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
-
-
- -
-
-
- {{ form.hourly_rate.label(class="form-label") }} -
- {{ currency }} - {{ form.hourly_rate(class="form-control" + (" is-invalid" if form.hourly_rate.errors else "")) }} -
- {% if form.hourly_rate.errors %} -
- {% for error in form.hourly_rate.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
{{ _('Leave empty for non-billable projects') }}
-
-
-
-
- {{ form.billing_ref.label(class="form-label") }} - {{ form.billing_ref(class="form-control" + (" is-invalid" if form.billing_ref.errors else "")) }} - {% if form.billing_ref.errors %} -
- {% for error in form.billing_ref.errors %} - {{ error }} - {% endfor %} -
- {% endif %} -
Optional billing reference
-
-
-
- -
- - {{ _('Cancel') }} - - -
-
-
-
-
- -
-
-
-
- {{ _('Help') }} -
-
-
-
{{ _('Project Name') }}
-

{{ _('Choose a descriptive name that clearly identifies the project.') }}

- -
{{ _('Client') }}
-

{{ _('Optional client name for organization. You can group projects by client.') }}

- -
{{ _('Description') }}
-

{{ _('Provide details about the project scope, objectives, or any relevant information.') }}

- -
{{ _('Billable') }}
-

{{ _('Check this if time spent on this project should be tracked for billing purposes.') }}

- -
{{ _('Hourly Rate') }}
-

{{ _('Set the hourly rate for billable time. Leave empty for non-billable projects.') }}

- -
{{ _('Billing Reference') }}
-

{{ _('Optional reference number or code for billing systems.') }}

- -
{{ _('Status') }}
-

{{ _('Active projects can have time tracked. Archived projects are hidden from timers but retain data.') }}

-
-
- - {% if project %} -
-
-
- {{ _('Current Statistics') }} -
-
-
-
-
-
{{ "%.1f"|format(project.total_hours) }}
- {{ _('Total Hours') }} -
-
-
{{ "%.1f"|format(project.total_billable_hours) }}
- {{ _('Billable Hours') }} -
- {% if project.billable and project.hourly_rate %} -
-
{{ currency }} {{ "%.2f"|format(project.estimated_cost) }}
- {{ _('Estimated Cost') }} -
- {% endif %} -
-
-
- {% endif %} -
-
-
-{% endblock %} - -{% block scripts %} - -{% endblock %} diff --git a/templates/projects/list.html b/templates/projects/list.html deleted file mode 100644 index ac8977e..0000000 --- a/templates/projects/list.html +++ /dev/null @@ -1,744 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Projects') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - {% if current_user.is_admin %} - - {{ _('New Project') }} - - {% endif %} - {% endset %} - {{ page_header('fas fa-project-diagram', _('Projects'), _('Manage all projects') ~ ' • ' ~ (projects|length) ~ ' ' ~ _('total'), actions) }} -
-
- - {# Summary cards similar to invoices #} - {% set _active = 0 %} - {% set _inactive = 0 %} - {% set _archived = 0 %} - {% set _total_hours = 0 %} - {% for p in projects %} - {% if p.status == 'active' %}{% set _active = _active + 1 %}{% endif %} - {% if p.status == 'inactive' %}{% set _inactive = _inactive + 1 %}{% endif %} - {% if p.status == 'archived' %}{% set _archived = _archived + 1 %}{% endif %} - {% set _total_hours = _total_hours + (p.total_hours or 0) %} - {% endfor %} -
-
-
-
-
-
-
{{ _('Total Projects') }}
-
{{ projects|length }}
-
-
-
-
-
-
-
-
-
-
{{ _('Active') }}
-
{{ _active }}
-
-
-
-
-
-
-
-
-
-
{{ _('Inactive') }}
-
{{ _inactive }}
-
-
-
-
-
-
-
-
-
-
{{ _('Archived') }}
-
{{ _archived }}
-
-
-
-
-
- - -
-
-
-
-
-
- {{ _('Filters') }} -
- -
-
-
-
-
- - -
-
- - -
-
- - -
-
- - - {{ _('Clear') }} - -
-
-
-
-
-
- - -
-
-
-
-
-
- {{ _('All Projects') }} -
-
-
- - - - -
- {% if current_user.is_admin %} - - {% endif %} -
-
-
-
- {% if projects %} -
- - - - {% if current_user.is_admin %} - - {% endif %} - - - - - - - - - - {% for project in projects %} - - {% if current_user.is_admin %} - - {% endif %} - - - - - - - - {% endfor %} - -
- - {{ _('Project') }}{{ _('Client') }}{{ _('Status') }}{{ _('Hours') }}{{ _('Rate') }}{{ _('Actions') }}
- - -
- - {{ project.name }} - - {% if project.description %} -
{{ project.description[:100] }}{% if project.description|length > 100 %}...{% endif %} - {% endif %} -
- 		- {{ project.client }} - - {% if project.status == 'active' %} - {{ _('Active') }} - {% elif project.status == 'inactive' %} - {{ _('Inactive') }} - {% else %} - {{ _('Archived') }} - {% endif %} - - {% set total_h = (project.total_hours or 0) %} - {% set billable_h = (project.billable_hours or 0) %} - {% set pct = (billable_h / total_h * 100) if total_h > 0 else 0 %} -
- {{ "%.1f"|format(total_h) }} h - {{ "%.1f"|format(billable_h) }} h {{ _('billable') }} -
-
-
-
- 		- {% if project.hourly_rate %} - {{ currency }}{{ "%.2f"|format(project.hourly_rate) }}/h - {% else %} - - - {% endif %} - -
- - - - {% if current_user.is_admin %} - - - - {% if project.status == 'active' %} - - - {% elif project.status == 'inactive' %} - - - {% else %} - - {% endif %} - - {% endif %} -
-
-
- {% else %} -
-
- -
{{ _('No projects found') }}
-

{{ _('Create your first project to get started.') }}

- {% if current_user.is_admin %} - - {{ _('Create Project') }} - - {% endif %} -
-
- {% endif %} -
-
-
-
-
- - -
- -
- -
- - -
- - - - - - - - - - - - -{% endblock %} diff --git a/templates/projects/view.html b/templates/projects/view.html deleted file mode 100644 index 59ebd65..0000000 --- a/templates/projects/view.html +++ /dev/null @@ -1,706 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ project.name }} - {{ app_name }}{% endblock %} - -{% block head_extra %} - - - - -{% endblock %} - -{% block content %} -
-
-
-
-
-
- -

- - {{ project.name }} -

-
-
- {% if project.status == 'active' %} - {{ _('Active') }} - {% else %} - {{ _('Archived') }} - {% endif %} -
-
-
- {% if current_user.is_admin %} - - {{ _('Edit') }} - - {% if project.status == 'active' %} -
- - -
- {% else %} -
- - -
- {% endif %} - {% endif %} - - {{ _('Back') }} - - -
-
-
-
- - -
-
-
-
-
-
-
-
- {{ _('General') }} -
-
{{ _('Name') }}{{ project.name }}
-
{{ _('Client') }} - - {% if project.client_obj %} - {{ project.client_obj.name }} - {% else %}-{% endif %} - -
-
{{ _('Status') }} - {% if project.status == 'active' %}{{ _('Active') }}{% else %}{{ _('Archived') }}{% endif %} -
-
{{ _('Created') }}{{ project.created_at.strftime('%B %d, %Y') }}
-
-
-
-
-
- {{ _('Billing') }} -
-
{{ _('Billable') }} - {% if project.billable %}{{ _('Yes') }}{% else %}{{ _('No') }}{% endif %} -
- {% if project.billable and project.hourly_rate %} -
{{ _('Hourly Rate') }}{{ currency }} {{ "%.2f"|format(project.hourly_rate) }}
- {% endif %} - {% if project.billing_ref %} -
{{ _('Billing Ref') }}{{ project.billing_ref }}
- {% endif %} -
{{ _('Last Updated') }}{{ project.updated_at.strftime('%B %d, %Y') }}
-
-
-
- - {% if project.description %} -
-
{{ _('Description') }}
-
{{ project.description | markdown | safe }}
-
- {% endif %} -
-
-
- -
-
-
-
- {{ _('Statistics') }} -
-
-
-
-
-
{{ "%.1f"|format(project.total_hours) }}
- {{ _('Total Hours') }} -
-
-
{{ "%.1f"|format(project.total_billable_hours) }}
- {{ _('Billable Hours') }} -
- {% if project.estimated_hours %} -
-
{{ "%.1f"|format(project.estimated_hours) }}
- {{ _('Estimated Hours') }} -
- {% endif %} -
-
{{ currency }} {{ "%.2f"|format(project.total_costs) }}
- {{ _('Total Costs') }} -
- {% if project.budget_amount %} -
-
{{ currency }} {{ "%.2f"|format(project.budget_consumed_amount) }}
- {{ _('Budget Used (Hours)') }} -
- {% endif %} - {% if project.billable and project.hourly_rate %} -
-
{{ currency }} {{ "%.2f"|format(project.total_project_value) }}
- {{ _('Total Project Value') }} -
- {% endif %} -
- {% if project.budget_amount %} -
-
- {% set pct = (project.budget_consumed_amount / project.budget_amount * 100) | round(0, 'floor') %} -
{{ pct }}%
-
-
- {{ _('Budget') }}: {{ currency }} {{ "%.2f"|format(project.budget_amount) }} - {{ _('Threshold') }}: {{ project.budget_threshold_percent }}% -
-
- {% endif %} -
-
- - {% if project.billable and project.hourly_rate %} -
-
-
- {{ _('User Breakdown') }} -
-
-
- {% for user_total in project.get_user_totals() %} -
- {{ user_total.username }} - {{ "%.1f"|format(user_total.total_hours) }}h -
- {% endfor %} -
-
- {% endif %} -
-
- - -
-
-
-
-
- {{ _('Tasks') }} -
- -
-
- {% set project_tasks = tasks %} - {% include 'tasks/_kanban.html' with context %} - {% if not tasks %} -
- {% from "_components.html" import empty_state %} - {% set actions %} - - {{ _('Create First Task') }} - - {% endset %} - {{ empty_state('fas fa-tasks', _('No Tasks Yet'), _('Break down this project into manageable tasks to track progress.'), actions) }} -
- {% endif %} -
-
-
-
- - -
-
-
-
-
- {{ _('Project Costs & Expenses') }} -
- - {{ _('Add Cost') }} - -
-
- {% if total_costs_count > 0 %} -
-
-
-
{{ currency }} {{ "%.2f"|format(project.total_costs) }}
- {{ _('Total Costs') }} -
-
-
-
-
{{ currency }} {{ "%.2f"|format(project.total_billable_costs) }}
- {{ _('Billable Costs') }} -
-
-
-
-
{{ currency }} {{ "%.2f"|format(project.total_project_value) }}
- {{ _('Total Project Value') }} -
-
-
-
- - - - - - - - - - - - - {% for cost in recent_costs %} - - - - - - - - - {% endfor %} - -
{{ _('Date') }}{{ _('Description') }}{{ _('Category') }}{{ _('Amount') }}{{ _('Billable') }}{{ _('Actions') }}
{{ cost.cost_date.strftime('%Y-%m-%d') if cost.cost_date else 'N/A' }} - {{ cost.description if cost.description else 'No description' }} - {% if cost.notes %} - - {% endif %} - - {{ _(cost.category.title() if cost.category else 'Other') }} - - {{ cost.currency_code if cost.currency_code else 'EUR' }} {{ "%.2f"|format(cost.amount if cost.amount else 0) }} - - {% if cost.billable %} - {{ _('Yes') }} - {% else %} - {{ _('No') }} - {% endif %} - -
- - - - {% if current_user.is_admin or cost.user_id == current_user.id %} - {% if not cost.is_invoiced %} - - {% endif %} - {% endif %} -
-
-
- {% if total_costs_count > 5 %} -
- - {{ _('View All Costs') }} ({{ total_costs_count }}) - -
- {% endif %} - {% if not recent_costs %} -
- {{ _('Recent costs will appear here. Total costs for this project: ') }}{{ total_costs_count }} -
- {% endif %} - {% else %} - {% from "_components.html" import empty_state %} - {% set actions %} - - {{ _('Add First Cost') }} - - {% endset %} - {{ empty_state('fas fa-receipt', _('No Costs Yet'), _('Track project expenses like travel, materials, and services.'), actions) }} - {% endif %} -
-
-
-
- - -
-
-
-
-
- {{ _('Rate Overrides') }} -
- {{ _('Manage') }} -
-
-
{{ _('Effective rates are applied in this order: user-specific override, project default override, project hourly rate, client default rate.') }}
-
- {% if project.hourly_rate %} -
{{ _('Project rate') }}: {{ currency }} {{ "%.2f"|format(project.hourly_rate) }}
- {% else %} -
{{ _('Project has no hourly rate; relying on overrides or client default.') }}
- {% endif %} -
-
-
-
-
- - -
-
-
-
-
- {{ _('Project Comments') }} -
-
-
- {% include 'comments/_comments_section.html' with context %} -
-
-
-
- - -
-
-
-
-
- {{ _('Time Entries') }} -
-
- - {{ _('View Report') }} - - -
-
-
- - {% if entries %} -
- - - - - - - - - - - - - - - {% for entry in entries %} - - - - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Date') }}{{ _('Time') }}{{ _('Duration') }}{{ _('Notes') }}{{ _('Tags') }}{{ _('Billable') }}{{ _('Actions') }}
{{ entry.user.display_name }}{{ entry.start_time.strftime('%Y-%m-%d') }} - {{ entry.start_time.strftime('%H:%M') }} - - {% if entry.end_time %} - {{ entry.end_time.strftime('%H:%M') }} - {% else %} - {{ _('Running') }} - {% endif %} - - {{ entry.duration_formatted }} - - {% if entry.notes %} - {{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if entry.tag_list %} - {% for tag in entry.tag_list %} - {{ tag }} - {% endfor %} - {% else %} - - - {% endif %} - - {% if entry.billable %} - {{ _('Yes') }} - {% else %} - {{ _('No') }} - {% endif %} - -
- - - - {% if current_user.is_admin or entry.user_id == current_user.id %} - - {% endif %} -
-
-
- - - {% if pagination.pages > 1 %} - - {% endif %} - {% else %} - {% from "_components.html" import empty_state %} - {{ empty_state('fas fa-clock', _('No Time Entries'), _('No time has been tracked for this project yet.')) }} - {% endif %} -
-
-
-
-
-{% endblock %} - - - - - - - - - - -{% block extra_js %} - - -{% endblock %} diff --git a/templates/reports/index.html b/templates/reports/index.html deleted file mode 100644 index a9b4cf0..0000000 --- a/templates/reports/index.html +++ /dev/null @@ -1,274 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Reports') }} - {{ app_name }}{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('Export CSV') }} - - {% endset %} - {{ page_header('fas fa-chart-line', _('Reports'), _('Analytics and summaries at a glance'), actions) }} -
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Total Hours') }}
-
{{ "%.1f"|format(summary.total_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Billable Hours') }}
-
{{ "%.1f"|format(summary.billable_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Active Projects') }}
-
{{ summary.active_projects }}
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Users') }}
-
{{ summary.total_users }}
-
-
-
-
-
-
- - -
-
-
-
-
- {{ _('Available Reports') }} -
-
-
-
- - -
- -
-
-
{{ _('Project Report') }}
-

{{ _('Time breakdown by project with detailed statistics') }}

-
-
- -
- - - - -
- -
-
-
{{ _('User Report') }}
-

{{ _('Track time by user with productivity metrics') }}

-
-
- -
- - - - -
- -
-
-
{{ _('Task Report') }}
-

{{ _('Completed tasks with time spent analysis') }}

-
-
- -
- - - - -
- -
-
-
{{ _('Summary Report') }}
-

{{ _('Quick overview of key metrics and trends') }}

-
-
- -
- - - - -
- -
-
-
{{ _('Visual Analytics') }}
-

{{ _('Interactive charts and data visualization') }}

-
-
- -
- - - - -
- -
-
-
{{ _('Data Export') }}
-

{{ _('Export time entries to CSV format') }}

-
-
- -
- -
-
-
-
-
- - -
-
-
-
-
- {{ _('Recent Activity') }} -
-
-
- {% if recent_entries %} -
- - - - - - - - - - - - - - {% for entry in recent_entries %} - - - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Project') }}{{ _('Task') }}{{ _('Date') }}{{ _('Duration') }}{{ _('Notes') }}{{ _('Billable') }}
{{ entry.user.display_name }} - - {{ entry.project.name }} - - - {% if entry.task %} - - {{ entry.task.name }} - - {% else %} - - - {% endif %} - {{ entry.start_time.strftime('%Y-%m-%d') }} - {{ entry.duration_formatted }} - - {% if entry.notes %} - {{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if entry.billable %} - {{ _('Yes') }} - {% else %} - {{ _('No') }} - {% endif %} -
-
- {% else %} -
-
- -
{{ _('No Recent Activity') }}
-

{{ _('No time entries have been recorded recently.') }}

-
-
- {% endif %} -
-
-
-
-
-{% endblock %} diff --git a/templates/reports/project_report.html b/templates/reports/project_report.html deleted file mode 100644 index ce60239..0000000 --- a/templates/reports/project_report.html +++ /dev/null @@ -1,523 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Project Report') }} - {{ app_name }}{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
-
-
-
-
- -

- {{ _('Project Report') }} -

-
- -
-
-
- - -
-
-
-
-
- {{ _('Filters') }} -
-
-
- -
- - {{ _('Quick Date Ranges') }} - -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - {{ _('Clear') }} - -
- -
- - -
-
- - -
- - {{ _('CSV') }} - - -
-
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Total Hours') }}
-
{{ "%.1f"|format(summary.total_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Billable Hours') }}
-
{{ "%.1f"|format(summary.billable_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Billable Amount') }}
-
{{ currency }} {{ "%.2f"|format(summary.total_billable_amount) }}
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Projects') }}
-
{{ summary.projects_count }}
-
-
-
-
-
-
- - - {% if projects_data|length > 0 %} -
-
-
-
-
- {{ _('Project Hours Comparison') }} -
-
- - -
-
- -
-
-
- {% endif %} - - -
-
-
-
-
- {{ _('Project Breakdown') }} ({{ projects_data|length }}) -
-
- -
-
-
- {% if projects_data|length > 0 and selected_project %} -
- -
- {% endif %} - {% if projects_data %} -
- - - - - - - - - - - - - - {% for project in projects_data %} - - - - - - - - - - {% endfor %} - -
{{ _('Project') }}{{ _('Client') }}{{ _('Total Hours') }}{{ _('Billable Hours') }}{{ _('Billable Amount') }}{{ _('Users') }}{{ _('Actions') }}
-
- {{ project.name }} - {% if project.description %} -
{{ project.description[:50] }}{% if project.description|length > 50 %}...{% endif %} - {% endif %} -
- 		- {% if project.client %} - {{ project.client }} - {% else %} - {{ _('-') }} - {% endif %} - - {{ "%.1f"|format(project.total_hours) }}h - - {% if project.billable %} - {{ "%.1f"|format(project.billable_hours) }}h - {% else %} - {{ _('-') }} - {% endif %} - - {% if project.billable and project.billable_amount > 0 %} - {{ currency }} {{ "%.2f"|format(project.billable_amount) }} - {% else %} - {{ _('-') }} - {% endif %} - -
- {% for user_total in project.user_totals %} - - {{ user_total.username }}: {{ "%.1f"|format(user_total.hours) }}h - - {% endfor %} -
- 		-
- - - - - - -
-
-
- {% else %} -
-
- -
{{ _('No Data Found') }}
-

- {% if request.args.get('start_date') or request.args.get('end_date') or request.args.get('project_id') or request.args.get('user_id') %} - {{ _('Try adjusting your filters or') }} - {{ _('view all projects') }}. - {% else %} - {{ _('No time entries have been recorded yet.') }} - {% endif %} -

-
-
- {% endif %} -
-
-
-
- - - {% if entries %} -
-
-
-
-
- {{ _('Time Entries') }} ({{ entries|length }}) -
-
- -
-
-
-
- - - - - - - - - - - - - - - - {% for entry in entries %} - - - - - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Project') }}{{ _('Task') }}{{ _('Date') }}{{ _('Time') }}{{ _('Duration') }}{{ _('Notes') }}{{ _('Tags') }}{{ _('Billable') }}
{{ entry.user.display_name }} - - {{ entry.project.name }} - - - {% if entry.task %} - - {{ entry.task.name }} - - {% else %} - {{ _('No task') }} - {% endif %} - {{ entry.start_time.strftime('%Y-%m-%d') }} - {{ entry.start_time.strftime('%H:%M') }} - - {% if entry.end_time %} - {{ entry.end_time.strftime('%H:%M') }} - {% else %} - {{ _('Running') }} - {% endif %} - - {{ entry.duration_formatted }} - - {% if entry.notes %} - {{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if entry.tag_list %} - {% for tag in entry.tag_list %} - {{ tag }} - {% endfor %} - {% else %} - - - {% endif %} - - {% if entry.billable %} - Yes - {% else %} - No - {% endif %} -
-
-
-
-
-
-{% block extra_js %} - - - -{% endblock %} - {% endif %} -
-{% endblock %} diff --git a/templates/reports/summary.html b/templates/reports/summary.html deleted file mode 100644 index a23d55f..0000000 --- a/templates/reports/summary.html +++ /dev/null @@ -1,319 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Summary Report') }} - {{ app_name %}{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
-
-
-
-
- -

- {{ _('Summary Report') }} -

-

{{ _('Quick overview of your time tracking metrics') }}

-
-
- -
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Today') }}
-
{{ "%.1f"|format(today_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Last 7 Days') }}
-
{{ "%.1f"|format(week_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Last 30 Days') }}
-
{{ "%.1f"|format(month_hours) }}h
-
-
-
-
-
-
-
-
-
- - - {% if project_stats %} -
-
-
-
-
- {{ _('Project Hours (Last 30 Days)') }} -
-
- -
-
-
-
-
-
- {{ _('Project Distribution') }} -
-
- -
-
-
- {% endif %} - - -
-
-
-
-
- {{ _('Top Projects') }} ({{ project_stats|length }}) -
- -
-
- {% if project_stats %} -
- - - - - - - - - - - - - {% set total_hours = project_stats | sum(attribute='hours') %} - {% for item in project_stats %} - - - - - - - - - {% endfor %} - -
#{{ _('Project') }}{{ _('Client') }}{{ _('Total Hours') }}{{ _('% of Total') }}{{ _('Actions') }}
{{ loop.index }} - - {{ item.project.name }} - - - {% if item.project.client %} - {{ item.project.client }} - {% else %} - - - {% endif %} - {{ "%.1f"|format(item.hours) }}h - {% set percentage = (item.hours / total_hours * 100) if total_hours > 0 else 0 %} -
-
-
-
- {{ "%.1f"|format(percentage) }}% -
- 		- - - -
-
- {% else %} -
-
- -
{{ _('No Data Found') }}
-

{{ _('No time entries available for the selected period.') }}

-
-
- {% endif %} -
-
-
-
-
-{% endblock %} - -{% block extra_js %} - - - -{% endblock %} - - diff --git a/templates/reports/task_report.html b/templates/reports/task_report.html deleted file mode 100644 index 52bc674..0000000 --- a/templates/reports/task_report.html +++ /dev/null @@ -1,322 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Finished Tasks Report') }} - {{ app_name }}{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
-
-
-
-
- -

- {{ _('Finished Tasks Report') }} -

-
-
-
-
- - -
-
-
-
-
- {{ _('Filters') }} -
-
-
- -
- - {{ _('Quick Date Ranges') }} - -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - {{ _('Clear') }} - - - -
- - -
-
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Finished Tasks') }}
-
{{ summary.tasks_count }}
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Total Hours') }}
-
{{ "%.2f"|format(summary.total_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Avg Hours/Task') }}
-
- {% if summary.tasks_count > 0 %} - {{ "%.1f"|format(summary.total_hours / summary.tasks_count) }}h - {% else %} - 0h - {% endif %} -
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Completion Rate') }}
-
100%
-
-
-
-
-
-
- - - {% if tasks|length > 0 %} -
-
-
-
-
- {{ _('Top Tasks by Hours') }} -
-
- -
-
-
- {% endif %} - - -
-
-
-
-
- {{ _('Finished Tasks') }} ({{ tasks|length }}) -
-
- -
-
-
- {% if tasks %} -
- - - - - - - - - - - - - - {% for row in tasks %} - - - - - - - - - - {% endfor %} - -
{{ _('Task') }}{{ _('Project') }}{{ _('Assignee') }}{{ _('Completed') }}{{ _('Hours') }}{{ _('Entries') }}{{ _('Actions') }}
-
- {{ row.task.name }} - {% if row.task.description %} -
{{ row.task.description[:60] }}{% if row.task.description|length > 60 %}...{% endif %} - {% endif %} -
- 		- - {{ row.project.name }} - - - {% if row.assignee %} - {{ row.assignee.display_name }} - {% else %} - {{ _('Unassigned') }} - {% endif %} - - {% if row.completed_at %} - {{ row.completed_at.strftime('%Y-%m-%d') }} - {% else %} - - - {% endif %} - {{ "%.2f"|format(row.hours) }}h{{ row.entries_count }} - - - -
-
- {% else %} -
-
- -
{{ _('No Finished Tasks Found') }}
-

{{ _('Try adjusting your filters.') }}

-
-
- {% endif %} -
-
-
-
-
-{% endblock %} - -{% block extra_js %} - - - -{% endblock %} - - diff --git a/templates/reports/user_report.html b/templates/reports/user_report.html deleted file mode 100644 index 3630cd4..0000000 --- a/templates/reports/user_report.html +++ /dev/null @@ -1,511 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('User Report') }} - {{ app_name }}{% endblock %} - -{% block extra_css %} - -{% endblock %} - -{% block content %} -
-
-
-
-
- -

- {{ _('User Report') }} -

-
- -
-
-
- - -
-
-
-
-
- {{ _('Filters') }} -
-
-
- -
- - {{ _('Quick Date Ranges') }} - -
-
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - {{ _('Clear') }} - -
- -
- - -
-
- - -
- - {{ _('CSV') }} - - -
-
-
-
-
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
{{ _('Total Hours') }}
-
{{ "%.1f"|format(summary.total_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Billable Hours') }}
-
{{ "%.1f"|format(summary.billable_hours) }}h
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Users') }}
-
{{ summary.users_count }}
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
{{ _('Projects') }}
-
{{ summary.projects_count }}
-
-
-
-
-
-
- - - {% if user_totals|length > 0 %} -
-
-
-
-
- {{ _('User Hours Distribution') }} -
-
- -
-
-
-
-
-
- {{ _('User Share') }} -
-
- -
-
-
- {% endif %} - - -
-
-
-
-
- {{ _('User Breakdown') }} ({{ user_totals|length }}) -
-
- -
-
-
- {% if user_totals %} -
- - - - - - - - - - - {% for username, totals in user_totals.items() %} - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Total Hours') }}{{ _('Billable Hours') }}{{ _('Billable %') }}
{{ username }}{{ "%.1f"|format(totals.hours) }}h - {% if totals.billable_hours > 0 %} - {{ "%.1f"|format(totals.billable_hours) }}h - {% else %} - - - {% endif %} - - {% if totals.hours > 0 %} - {% set billable_percentage = (totals.billable_hours / totals.hours * 100) %} -
-
-
-
- {{ "%.0f"|format(billable_percentage) }}% -
- {% else %} - - - {% endif %} -
-
- {% else %} -
-
- -
{{ _('No Data Found') }}
-

{{ _('Try adjusting your filters.') }}

-
-
- {% endif %} -
-
-
-
- - - {% if entries %} -
-
-
-
-
- {{ _('Time Entries') }} ({{ entries|length }}) -
-
- -
-
-
-
- - - - - - - - - - - - - - - - {% for entry in entries %} - - - - - - - - - - - - {% endfor %} - -
{{ _('User') }}{{ _('Project') }}{{ _('Task') }}{{ _('Date') }}{{ _('Time') }}{{ _('Duration') }}{{ _('Notes') }}{{ _('Tags') }}{{ _('Billable') }}
{{ entry.user.display_name }} - - {{ entry.project.name }} - - - {% if entry.task %} - - {{ entry.task.name }} - - {% else %} - {{ _('No task') }} - {% endif %} - {{ entry.start_time.strftime('%Y-%m-%d') }} - {{ entry.start_time.strftime('%H:%M') }} - - {% if entry.end_time %} - {{ entry.end_time.strftime('%H:%M') }} - {% else %} - {{ _('Running') }} - {% endif %} - - {{ entry.duration_formatted }} - - {% if entry.notes %} - {{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %} - {% else %} - - - {% endif %} - - {% if entry.tag_list %} - {% for tag in entry.tag_list %} - {{ tag }} - {% endfor %} - {% else %} - - - {% endif %} - - {% if entry.billable %} - {{ _('Yes') }} - {% else %} - {{ _('No') }} - {% endif %} -
-
-
-
-
-
- {% endif %} -
-{% endblock %} - -{% block extra_js %} - - - -{% endblock %} - - diff --git a/templates/timer/manual_entry.html b/templates/timer/manual_entry.html deleted file mode 100644 index 15d033e..0000000 --- a/templates/timer/manual_entry.html +++ /dev/null @@ -1,363 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Log Time') }} - {{ app_name }}{% endblock %} - -{% block content %} -{% block extra_css %} - -{% endblock %} -
- {% from "_components.html" import page_header %} -
-
- {% set actions %} - - {{ _('Back') }} - - {% endset %} - {{ page_header('fas fa-clock', _('Log Time'), _('Create a manual time entry'), actions) }} -
-
- -
-
-
-
-
- {{ _('Manual Entry') }} -
-
- - {{ _('Reset') }} - -
-
-
-
- -
-
-
- - -
{{ _('Select the project to log time for') }}
-
-
-
- {% set preselected_task_id = request.form.get('task_id') or request.args.get('task_id') %} -
- - -
{{ _('Tasks load after selecting a project') }}
-
-
-
- -
-
-
-
-
{{ _('Start') }} *
-
-
- - -
-
- - -
-
-
-
-
-
-
-
-
{{ _('End') }} *
-
-
- - -
-
- - -
-
-
-
-
-
- -
- - -
- -
-
-
- - -
{{ _('Separate tags with commas') }}
-
-
-
-
- -
- - {{ _('Include in invoices') }} -
-
-
-
- -
- - {{ _('Back') }} - -
- - -
-
-
-
-
-
- -
-
-
-
- {{ _('Quick Tips') }} -
-
-
-
-
-
- {{ _('Use Tasks') }} -

{{ _('Categorize time by selecting a task after choosing a project.') }}

-
-
-
-
-
- {{ _('Billable Time') }} -

{{ _('Enable billable to include this entry in invoices.') }}

-
-
-
-
-
- {{ _('Tag Entries') }} -

{{ _('Add tags to filter entries in reports later.') }}

-
-
-
-
-
-
-
- - - - - -{% endblock %} - - diff --git a/templates/timer/timer.html b/templates/timer/timer.html deleted file mode 100644 index f037f94..0000000 --- a/templates/timer/timer.html +++ /dev/null @@ -1,876 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _('Timer') }} - {{ app_name }}{% endblock %} - -{% block content %} -
- -
-
-
-
-

- {{ _('Timer') }} -

-

{{ _('Track your time with precision') }}

-
-
- - - -
-
-
-
- - - - - -
-
-
-
-
- -
-

{{ _('No Active Timer') }}

-

{{ _('Start a timer to begin tracking your time effectively.') }}

- - -
-
-
-
- - -
-
-
-
-
- {{ _('Recent Time Entries') }} -
-
-
-
- -
-
-
-
-
-
- - - - - - - - - - - -{% endblock %} - -{% block extra_js %} - -{% endblock %} diff --git a/tests/test_favorite_projects.py b/tests/test_favorite_projects.py new file mode 100644 index 0000000..4bb5b25 --- /dev/null +++ b/tests/test_favorite_projects.py @@ -0,0 +1,552 @@ +""" +Comprehensive tests for Favorite Projects functionality. + +This module tests: +- UserFavoriteProject model creation and validation +- Relationships between User and Project models +- Favorite/unfavorite routes and API endpoints +- Filtering projects by favorites +- User permissions and access control +""" + +import pytest +from datetime import datetime +from decimal import Decimal +from app import create_app, db +from app.models import User, Project, Client, UserFavoriteProject + + +@pytest.fixture +def app(): + """Create and configure a test application instance.""" + app = create_app({ + 'TESTING': True, + 'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:', + 'WTF_CSRF_ENABLED': False, + 'SECRET_KEY': 'test-secret-key-do-not-use-in-production', + 'SERVER_NAME': 'localhost:5000', + 'APPLICATION_ROOT': '/', + 'PREFERRED_URL_SCHEME': 'http', + }) + + with app.app_context(): + db.create_all() + yield app + db.session.remove() + db.drop_all() + + +@pytest.fixture +def client_fixture(app): + """Create a test Flask client.""" + return app.test_client() + + +@pytest.fixture +def test_user(app): + """Create a test user.""" + with app.app_context(): + user = User(username='testuser', role='user') + db.session.add(user) + db.session.commit() + return user.id + + +@pytest.fixture +def test_admin(app): + """Create a test admin user.""" + with app.app_context(): + admin = User(username='admin', role='admin') + db.session.add(admin) + db.session.commit() + return admin.id + + +@pytest.fixture +def test_client(app): + """Create a test client.""" + with app.app_context(): + client = Client(name='Test Client', description='A test client') + db.session.add(client) + db.session.commit() + return client.id + + +@pytest.fixture +def test_project(app, test_client): + """Create a test project.""" + with app.app_context(): + project = Project( + name='Test Project', + client_id=test_client, + description='A test project', + billable=True, + hourly_rate=Decimal('100.00') + ) + db.session.add(project) + db.session.commit() + return project.id + + +@pytest.fixture +def test_project_2(app, test_client): + """Create a second test project.""" + with app.app_context(): + project = Project( + name='Test Project 2', + client_id=test_client, + description='Another test project', + billable=True, + hourly_rate=Decimal('150.00') + ) + db.session.add(project) + db.session.commit() + return project.id + + +# Model Tests + +class TestUserFavoriteProjectModel: + """Test UserFavoriteProject model creation, validation, and basic operations.""" + + def test_create_favorite(self, app, test_user, test_project): + """Test creating a favorite project entry.""" + with app.app_context(): + favorite = UserFavoriteProject() + favorite.user_id = test_user + favorite.project_id = test_project + + db.session.add(favorite) + db.session.commit() + + assert favorite.id is not None + assert favorite.user_id == test_user + assert favorite.project_id == test_project + assert favorite.created_at is not None + assert isinstance(favorite.created_at, datetime) + + def test_favorite_unique_constraint(self, app, test_user, test_project): + """Test that a user cannot favorite the same project twice.""" + with app.app_context(): + # Create first favorite + favorite1 = UserFavoriteProject() + favorite1.user_id = test_user + favorite1.project_id = test_project + db.session.add(favorite1) + db.session.commit() + + # Try to create duplicate + favorite2 = UserFavoriteProject() + favorite2.user_id = test_user + favorite2.project_id = test_project + db.session.add(favorite2) + + # Should raise IntegrityError + with pytest.raises(Exception): # SQLAlchemy will raise IntegrityError + db.session.commit() + + def test_favorite_to_dict(self, app, test_user, test_project): + """Test favorite project to_dict method.""" + with app.app_context(): + favorite = UserFavoriteProject() + favorite.user_id = test_user + favorite.project_id = test_project + db.session.add(favorite) + db.session.commit() + + data = favorite.to_dict() + assert 'id' in data + assert 'user_id' in data + assert 'project_id' in data + assert 'created_at' in data + assert data['user_id'] == test_user + assert data['project_id'] == test_project + + +class TestUserFavoriteProjectMethods: + """Test User model methods for managing favorite projects.""" + + def test_add_favorite_project(self, app, test_user, test_project): + """Test adding a project to user's favorites.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add to favorites + user.add_favorite_project(project) + + # Verify it was added + assert user.is_project_favorite(project) + assert project in user.favorite_projects.all() + + def test_add_favorite_project_idempotent(self, app, test_user, test_project): + """Test that adding a favorite twice doesn't cause errors.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add twice + user.add_favorite_project(project) + user.add_favorite_project(project) + + # Should still only have one favorite entry + favorites = UserFavoriteProject.query.filter_by( + user_id=test_user, + project_id=test_project + ).all() + assert len(favorites) == 1 + + def test_remove_favorite_project(self, app, test_user, test_project): + """Test removing a project from user's favorites.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add then remove + user.add_favorite_project(project) + assert user.is_project_favorite(project) + + user.remove_favorite_project(project) + assert not user.is_project_favorite(project) + + def test_is_project_favorite_with_id(self, app, test_user, test_project): + """Test checking if project is favorite using project ID.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Not a favorite yet + assert not user.is_project_favorite(test_project) + + # Add to favorites + user.add_favorite_project(project) + + # Check with ID + assert user.is_project_favorite(test_project) + + def test_get_favorite_projects(self, app, test_user, test_project, test_project_2): + """Test getting user's favorite projects.""" + with app.app_context(): + user = db.session.get(User, test_user) + project1 = db.session.get(Project, test_project) + project2 = db.session.get(Project, test_project_2) + + # Add both to favorites + user.add_favorite_project(project1) + user.add_favorite_project(project2) + + # Get favorites + favorites = user.get_favorite_projects() + assert len(favorites) == 2 + assert project1 in favorites + assert project2 in favorites + + def test_get_favorite_projects_filtered_by_status(self, app, test_user, test_project, test_project_2): + """Test getting favorite projects filtered by status.""" + with app.app_context(): + user = db.session.get(User, test_user) + project1 = db.session.get(Project, test_project) + project2 = db.session.get(Project, test_project_2) + + # Set different statuses + project1.status = 'active' + project2.status = 'archived' + db.session.commit() + + # Add both to favorites + user.add_favorite_project(project1) + user.add_favorite_project(project2) + + # Get only active favorites + active_favorites = user.get_favorite_projects(status='active') + assert len(active_favorites) == 1 + assert project1 in active_favorites + assert project2 not in active_favorites + + +class TestProjectFavoriteMethods: + """Test Project model methods for favorite functionality.""" + + def test_is_favorited_by_user(self, app, test_user, test_project): + """Test checking if project is favorited by a specific user.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Not favorited yet + assert not project.is_favorited_by(user) + + # Add to favorites + user.add_favorite_project(project) + + # Now should be favorited + assert project.is_favorited_by(user) + + def test_is_favorited_by_user_id(self, app, test_user, test_project): + """Test checking if project is favorited using user ID.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add to favorites + user.add_favorite_project(project) + + # Check with user ID + assert project.is_favorited_by(test_user) + + def test_project_to_dict_with_favorite_status(self, app, test_user, test_project): + """Test project to_dict includes favorite status when user provided.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Without user, no is_favorite field + data = project.to_dict() + assert 'is_favorite' not in data + + # With user, includes is_favorite + data_with_user = project.to_dict(user=user) + assert 'is_favorite' in data_with_user + assert data_with_user['is_favorite'] is False + + # Add to favorites + user.add_favorite_project(project) + + # Now should be True + data_favorited = project.to_dict(user=user) + assert data_favorited['is_favorite'] is True + + +# Route Tests + +class TestFavoriteProjectRoutes: + """Test favorite project routes and endpoints.""" + + def test_favorite_project_route(self, app, client_fixture, test_user, test_project): + """Test favoriting a project via POST route.""" + with app.app_context(): + # Login as test user + with client_fixture.session_transaction() as sess: + sess['_user_id'] = str(test_user) + + # Favorite the project + response = client_fixture.post( + f'/projects/{test_project}/favorite', + headers={'X-Requested-With': 'XMLHttpRequest'} + ) + + assert response.status_code == 200 + data = response.get_json() + assert data['success'] is True + + # Verify in database + user = db.session.get(User, test_user) + assert user.is_project_favorite(test_project) + + def test_unfavorite_project_route(self, app, client_fixture, test_user, test_project): + """Test unfavoriting a project via POST route.""" + with app.app_context(): + # Setup: Add to favorites first + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + user.add_favorite_project(project) + + # Login + with client_fixture.session_transaction() as sess: + sess['_user_id'] = str(test_user) + + # Unfavorite the project + response = client_fixture.post( + f'/projects/{test_project}/unfavorite', + headers={'X-Requested-With': 'XMLHttpRequest'} + ) + + assert response.status_code == 200 + data = response.get_json() + assert data['success'] is True + + # Verify in database + user = db.session.get(User, test_user) + assert not user.is_project_favorite(test_project) + + def test_favorite_nonexistent_project(self, app, client_fixture, test_user): + """Test favoriting a non-existent project returns 404.""" + with app.app_context(): + with client_fixture.session_transaction() as sess: + sess['_user_id'] = str(test_user) + + response = client_fixture.post('/projects/99999/favorite') + assert response.status_code == 404 + + def test_favorite_project_requires_login(self, app, client_fixture, test_project): + """Test that favoriting requires authentication.""" + with app.app_context(): + response = client_fixture.post(f'/projects/{test_project}/favorite') + # Should redirect to login + assert response.status_code in [302, 401] + + +class TestFavoriteProjectFiltering: + """Test filtering projects by favorites.""" + + def test_list_projects_with_favorites_filter(self, app, client_fixture, test_user, test_project, test_project_2): + """Test listing only favorite projects.""" + with app.app_context(): + # Setup: Favorite only one project + user = db.session.get(User, test_user) + project1 = db.session.get(Project, test_project) + user.add_favorite_project(project1) + + # Login + with client_fixture.session_transaction() as sess: + sess['_user_id'] = str(test_user) + + # Request favorites only + response = client_fixture.get('/projects?favorites=true') + + assert response.status_code == 200 + # Check that the response contains the favorite project + assert b'Test Project' in response.data + + def test_list_all_projects_without_filter(self, app, client_fixture, test_user, test_project, test_project_2): + """Test listing all projects without favorites filter.""" + with app.app_context(): + # Setup: Favorite only one project + user = db.session.get(User, test_user) + project1 = db.session.get(Project, test_project) + user.add_favorite_project(project1) + + # Login + with client_fixture.session_transaction() as sess: + sess['_user_id'] = str(test_user) + + # Request all projects + response = client_fixture.get('/projects') + + assert response.status_code == 200 + # Both projects should be in response + assert b'Test Project' in response.data + + +# Relationship Tests + +class TestFavoriteProjectRelationships: + """Test database relationships and cascade behavior.""" + + def test_delete_user_cascades_favorites(self, app, test_user, test_project): + """Test that deleting a user removes their favorite entries.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add to favorites + user.add_favorite_project(project) + + # Verify favorite exists + favorite_count = UserFavoriteProject.query.filter_by(user_id=test_user).count() + assert favorite_count == 1 + + # Delete user + db.session.delete(user) + db.session.commit() + + # Favorite should be deleted + favorite_count = UserFavoriteProject.query.filter_by(user_id=test_user).count() + assert favorite_count == 0 + + def test_delete_project_cascades_favorites(self, app, test_user, test_project): + """Test that deleting a project removes related favorite entries.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Add to favorites + user.add_favorite_project(project) + + # Verify favorite exists + favorite_count = UserFavoriteProject.query.filter_by(project_id=test_project).count() + assert favorite_count == 1 + + # Delete project + db.session.delete(project) + db.session.commit() + + # Favorite should be deleted + favorite_count = UserFavoriteProject.query.filter_by(project_id=test_project).count() + assert favorite_count == 0 + + def test_multiple_users_favorite_same_project(self, app, test_user, test_admin, test_project): + """Test that multiple users can favorite the same project.""" + with app.app_context(): + user = db.session.get(User, test_user) + admin = db.session.get(User, test_admin) + project = db.session.get(Project, test_project) + + # Both favorite the same project + user.add_favorite_project(project) + admin.add_favorite_project(project) + + # Verify both have it as favorite + assert user.is_project_favorite(project) + assert admin.is_project_favorite(project) + + # Verify database has 2 entries + favorite_count = UserFavoriteProject.query.filter_by(project_id=test_project).count() + assert favorite_count == 2 + + +# Smoke Tests + +class TestFavoriteProjectsSmoke: + """Smoke tests to verify basic favorite projects functionality.""" + + def test_complete_favorite_workflow(self, app, test_user, test_project): + """Test complete workflow: add favorite, check status, remove favorite.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Initially not favorited + assert not user.is_project_favorite(project) + + # Add to favorites + user.add_favorite_project(project) + assert user.is_project_favorite(project) + + # Get favorites list + favorites = user.get_favorite_projects() + assert len(favorites) == 1 + assert project in favorites + + # Remove from favorites + user.remove_favorite_project(project) + assert not user.is_project_favorite(project) + + # Favorites list should be empty + favorites = user.get_favorite_projects() + assert len(favorites) == 0 + + def test_favorite_with_archived_projects(self, app, test_user, test_project): + """Test that favoriting works with archived projects.""" + with app.app_context(): + user = db.session.get(User, test_user) + project = db.session.get(Project, test_project) + + # Favorite an active project + user.add_favorite_project(project) + + # Archive the project + project.status = 'archived' + db.session.commit() + + # Should still be favorited + assert user.is_project_favorite(project) + + # But won't appear in active favorites + active_favorites = user.get_favorite_projects(status='active') + assert len(active_favorites) == 0 + + # Will appear in archived favorites + archived_favorites = user.get_favorite_projects(status='archived') + assert len(archived_favorites) == 1 +