From 016fe5ead0dcab54753d31c4497e3eecf836d273 Mon Sep 17 00:00:00 2001 From: Dries Peeters Date: Fri, 12 Sep 2025 10:03:40 +0200 Subject: [PATCH] feat(ui): refresh templates and dashboards; improve admin and error pages - Update global layout and styles: `app/templates/base.html`, `app/static/base.css` - Modernize analytics dashboards (web + mobile) - Revamp auth pages: login, profile, edit profile - Refresh error pages: 400/403/404/500 and generic - Polish main dashboard and search - Enhance tasks views: create/edit/view, kanban, my/overdue - Update clients, projects, invoices, and reports pages - Refine timer pages (timer/edit/manual_entry) - Tweak admin routes and templates - Update license server util and integration docs - Refresh README and help/about content Notes: - UI-focused changes; no database migrations included. --- README.md | 18 + app/routes/admin.py | 40 +- app/static/base.css | 23 +- app/templates/analytics/dashboard.html | 81 ++-- app/templates/analytics/mobile_dashboard.html | 38 +- app/templates/auth/edit_profile.html | 28 +- app/templates/auth/login.html | 4 +- app/templates/auth/profile.html | 24 +- app/templates/base.html | 87 ++-- app/templates/errors/400.html | 16 +- app/templates/errors/403.html | 18 +- app/templates/errors/500.html | 10 +- app/templates/errors/generic.html | 6 +- app/templates/main/dashboard.html | 136 ++++--- app/templates/main/search.html | 47 ++- app/templates/tasks/_kanban.html | 28 +- app/templates/tasks/create.html | 122 +++--- app/templates/tasks/edit.html | 114 +++--- app/templates/tasks/my_tasks.html | 90 ++--- app/templates/tasks/overdue.html | 70 ++-- app/templates/tasks/view.html | 122 +++--- app/utils/license_server.py | 26 +- docs/LICENSE_SERVER_INTEGRATION.md | 77 ++-- templates/admin/create_user.html | 30 +- templates/admin/dashboard.html | 64 +-- templates/admin/license_status.html | 375 +++++++++--------- templates/admin/restore.html | 32 +- templates/admin/settings.html | 151 +++---- templates/admin/system_info.html | 24 +- templates/admin/user_form.html | 72 ++-- templates/clients/edit.html | 68 ++-- templates/clients/list.html | 21 +- templates/clients/view.html | 15 +- templates/errors/400.html | 16 +- templates/errors/403.html | 18 +- templates/errors/404.html | 10 +- templates/errors/500.html | 10 +- templates/invoices/create.html | 124 +++--- templates/invoices/edit.html | 80 ++-- templates/invoices/generate_from_time.html | 90 ++--- templates/invoices/list.html | 36 +- templates/invoices/view.html | 118 +++--- templates/main/about.html | 70 ++-- templates/main/help.html | 198 ++++----- templates/projects/create.html | 2 +- templates/projects/list.html | 27 +- templates/projects/view.html | 2 +- templates/reports/index.html | 68 ++-- templates/reports/project_report.html | 90 ++--- templates/reports/summary.html | 26 +- templates/reports/task_report.html | 52 +-- templates/reports/user_report.html | 72 ++-- templates/timer/edit_timer.html | 18 +- templates/timer/manual_entry.html | 9 +- templates/timer/timer.html | 154 +++---- 55 files changed, 1811 insertions(+), 1556 deletions(-) diff --git a/README.md b/README.md index 919dfac..76e8096 100644 --- a/README.md +++ b/README.md @@ -407,6 +407,24 @@ Detailed documentation is available in the `docs/` directory: - **Troubleshooting**: Common issues and solutions - **Deployment**: Setup and deployment instructions +### Metrics Server and Privacy + +This application can optionally communicate with a metrics server to help improve reliability and features. No license is required and the app works without it. + +- What is sent: + - App identifier and version + - Anonymous instance ID (UUID) + - Basic system info: OS, version, architecture, hostname, local IP, Python version + - Aggregate usage events (e.g., feature used). No time entry data or personal content +- Controls: + - Toggle analytics in Admin → System Settings → Privacy & Analytics + - View status in Admin → Metrics Status +- Configuration (env vars are optional and have sensible defaults): + - `METRICS_SERVER_URL` (or legacy `LICENSE_SERVER_BASE_URL`) + - `METRICS_SERVER_API_KEY` (or legacy `LICENSE_SERVER_API_KEY`) + - `METRICS_HEARTBEAT_SECONDS` (or legacy `LICENSE_HEARTBEAT_SECONDS`) + - `METRICS_SERVER_TIMEOUT_SECONDS` (or legacy `LICENSE_SERVER_TIMEOUT_SECONDS`) + ## 🚀 Deployment ### Docker Deployment diff --git a/app/routes/admin.py b/app/routes/admin.py index 1e73588..1d07d37 100644 --- a/app/routes/admin.py +++ b/app/routes/admin.py @@ -82,6 +82,18 @@ def admin_dashboard(): recent_entries=recent_entries ) +# Compatibility alias for code/templates that might reference 'admin.dashboard' +@admin_bp.route('/admin/dashboard') +@login_required +@admin_required +def admin_dashboard_alias(): + """Alias endpoint so url_for('admin.dashboard') remains valid. + + Some older references may use the endpoint name 'admin.dashboard'. + Redirect to the canonical admin dashboard endpoint. + """ + return redirect(url_for('admin.admin_dashboard')) + @admin_bp.route('/admin/users') @login_required @admin_required @@ -445,7 +457,7 @@ def system_info(): @login_required @admin_required def license_status(): - """Show license server client status""" + """Show metrics server client status""" try: from app.utils.license_server import get_license_client client = get_license_client() @@ -454,17 +466,17 @@ def license_status(): settings = Settings.get_settings() return render_template('admin/license_status.html', status=status, settings=settings) else: - flash('License server client not initialized', 'warning') - return redirect(url_for('admin.dashboard')) + flash('Metrics server client not initialized', 'warning') + return redirect(url_for('admin.admin_dashboard')) except Exception as e: - flash(f'Error getting license status: {e}', 'error') - return redirect(url_for('admin.dashboard')) + flash(f'Error getting metrics status: {e}', 'error') + return redirect(url_for('admin.admin_dashboard')) @admin_bp.route('/license-test') @login_required @admin_required def license_test(): - """Test license server communication""" + """Test metrics server communication""" try: from app.utils.license_server import get_license_client, send_usage_event client = get_license_client() @@ -475,11 +487,11 @@ def license_test(): # Test usage event usage_sent = send_usage_event("admin_test", {"admin": current_user.username}) - flash(f'Server Health: {"✓ Healthy" if server_healthy else "✗ Not Responding"}, Usage Event: {"✓ Sent" if usage_sent else "✗ Failed"}', 'info') + flash(f'Metrics Server: {"✓ Healthy" if server_healthy else "✗ Not Responding"}, Usage Event: {"✓ Sent" if usage_sent else "✗ Failed"}', 'info') else: - flash('License server client not initialized', 'warning') + flash('Metrics server client not initialized', 'warning') except Exception as e: - flash(f'Error testing license server: {e}', 'error') + flash(f'Error testing metrics server: {e}', 'error') return redirect(url_for('admin.license_status')) @@ -487,18 +499,18 @@ def license_test(): @login_required @admin_required def license_restart(): - """Restart the license server client""" + """Restart the metrics server client""" try: from app.utils.license_server import get_license_client, start_license_client client = get_license_client() if client: if start_license_client(): - flash('License server client restarted successfully', 'success') + flash('Metrics server client restarted successfully', 'success') else: - flash('Failed to restart license server client', 'error') + flash('Failed to restart metrics server client', 'error') else: - flash('License server client not initialized', 'warning') + flash('Metrics server client not initialized', 'warning') except Exception as e: - flash(f'Error restarting license server client: {e}', 'error') + flash(f'Error restarting metrics server client: {e}', 'error') return redirect(url_for('admin.license_status')) diff --git a/app/static/base.css b/app/static/base.css index f3e2e47..c1d6a27 100644 --- a/app/static/base.css +++ b/app/static/base.css @@ -1347,6 +1347,14 @@ main { gap: 0.75rem; } +/* Prevent very long app names from breaking the layout */ +.navbar-brand span { + max-width: 220px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + .navbar-brand img { transition: var(--transition); } @@ -1620,6 +1628,7 @@ h6 { font-size: 1rem; } pointer-events: auto; background-clip: padding-box; min-width: 200px; + max-width: clamp(220px, 90vw, 360px); padding: 0.5rem 0; } @@ -1653,6 +1662,10 @@ h6 { font-size: 1rem; } display: flex; align-items: center; font-weight: 500; + white-space: normal; /* allow wrapping for long translations */ + word-break: break-word; /* break long words/URLs if needed */ + hyphens: auto; /* hyphenate when possible */ + line-height: 1.25; } .dropdown-item:hover { @@ -1757,7 +1770,15 @@ h6 { font-size: 1rem; } gap: 0.5rem; } -.dropdown-item i { width: 1rem; text-align: center; } +.dropdown-item i { width: 1rem; text-align: center; flex: 0 0 auto; } + +/* Ensure user name in navbar doesn't overflow */ +.navbar .nav-item.dropdown .nav-link span { + max-width: 180px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} /* Enhanced Mobile Components */ .mobile-stack { diff --git a/app/templates/analytics/dashboard.html b/app/templates/analytics/dashboard.html index 879e104..3e98c38 100644 --- a/app/templates/analytics/dashboard.html +++ b/app/templates/analytics/dashboard.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Analytics Dashboard - {{ app_name }}{% endblock %} +{% block title %}{{ _('Analytics Dashboard') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,16 +9,16 @@
{% set actions %} {% endset %} - {{ page_header('fas fa-chart-line', 'Analytics Dashboard', 'Key metrics and insights', actions) }} + {{ page_header('fas fa-chart-line', _('Analytics Dashboard'), _('Key metrics and insights'), actions) }}
@@ -29,7 +29,7 @@

-

-

Total Hours

+

{{ _('Total Hours') }}

@@ -38,7 +38,7 @@

-

-

Billable Hours

+

{{ _('Billable Hours') }}

@@ -47,7 +47,7 @@

-

-

Active Projects

+

{{ _('Active Projects') }}

@@ -56,7 +56,7 @@

-

-

Avg Daily Hours

+

{{ _('Avg Daily Hours') }}

@@ -68,7 +68,7 @@
- Daily Hours Trend + {{ _('Daily Hours Trend') }}
@@ -82,7 +82,7 @@
- Billable vs Non-Billable + {{ _('Billable vs Non-Billable') }}
@@ -100,7 +100,7 @@
- Hours by Project + {{ _('Hours by Project') }}
@@ -114,7 +114,7 @@
- Weekly Trends + {{ _('Weekly Trends') }}
@@ -132,7 +132,7 @@
- Hours by Time of Day + {{ _('Hours by Time of Day') }}
@@ -146,7 +146,7 @@
- Project Efficiency + {{ _('Project Efficiency') }}
@@ -165,7 +165,7 @@
- User Performance + {{ _('User Performance') }}
@@ -182,11 +182,32 @@ {% endblock %} +{% block extra_head %} + + +{% endblock %} + {% block extra_js %} + {% endblock %} diff --git a/app/templates/tasks/_kanban.html b/app/templates/tasks/_kanban.html index 1439461..112d90f 100644 --- a/app/templates/tasks/_kanban.html +++ b/app/templates/tasks/_kanban.html @@ -1,9 +1,9 @@ {# Reusable Kanban board for tasks. Expects `tasks` in context. #} {% set kanban_statuses = [ - {'key': 'todo', 'label': 'To Do', 'icon': 'fas fa-list-check', 'accent': 'secondary'}, - {'key': 'in_progress', 'label': 'In Progress', 'icon': 'fas fa-spinner', 'accent': 'warning'}, - {'key': 'review', 'label': 'Review', 'icon': 'fas fa-user-check', 'accent': 'info'}, - {'key': 'done', 'label': 'Done', 'icon': 'fas fa-check-circle', 'accent': 'success'} + {'key': 'todo', 'label': _('To Do'), 'icon': 'fas fa-list-check', 'accent': 'secondary'}, + {'key': 'in_progress', 'label': _('In Progress'), 'icon': 'fas fa-spinner', 'accent': 'warning'}, + {'key': 'review', 'label': _('Review'), 'icon': 'fas fa-user-check', 'accent': 'info'}, + {'key': 'done', 'label': _('Done'), 'icon': 'fas fa-check-circle', 'accent': 'success'} ] %}
@@ -12,7 +12,7 @@
- Kanban Board + {{ _('Kanban Board') }}
@@ -43,11 +43,11 @@ {{ task.priority_display }} {% if current_user.active_timer and current_user.active_timer.task_id == task.id %} - Active + {{ _('Active') }} {% endif %} {% if task.is_overdue %} - Overdue + {{ _('Overdue') }} {% endif %}
@@ -143,7 +143,13 @@ const board = document.getElementById('kanbanBoard'); if (!board) return; - const statusLabels = { todo: 'To Do', in_progress: 'In Progress', review: 'Review', done: 'Done', cancelled: 'Cancelled' }; + const statusLabels = { + todo: '{{ _('To Do') }}', + in_progress: '{{ _('In Progress') }}', + review: '{{ _('Review') }}', + done: '{{ _('Done') }}', + cancelled: '{{ _('Cancelled') }}' + }; const updateUrlTemplate = "{{ url_for('tasks.api_update_status', task_id=0) }}"; // will replace 0 with actual id function showAlert(kind, msg) { @@ -220,13 +226,13 @@ body: JSON.stringify({ status: targetStatus }) }); if (!resp.ok) { - throw new Error('Failed to update status'); + throw new Error('{{ _('Failed to update status') }}'); } const data = await resp.json(); if (!data.success) { throw new Error(data.error || 'Update rejected'); } - showAlert('success', 'Task moved to ' + (statusLabels[targetStatus] || targetStatus)); + showAlert('success', '{{ _('Task moved to') }} ' + (statusLabels[targetStatus] || targetStatus)); } catch (err) { // revert if (originalParent) originalParent.appendChild(card); @@ -236,7 +242,7 @@ statusBadge.textContent = statusLabels[originalStatus] || originalStatus; } updateCounts(); - showAlert('error', err.message || 'Could not update task'); + showAlert('error', err.message || '{{ _('Could not update task') }}'); } }); }); diff --git a/app/templates/tasks/create.html b/app/templates/tasks/create.html index 6b0c051..deb9c61 100644 --- a/app/templates/tasks/create.html +++ b/app/templates/tasks/create.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Create Task - Time Tracker{% endblock %} +{% block title %}{{ _('Create Task') }} - Time Tracker{% endblock %} {% block extra_css %} @@ -19,8 +19,8 @@
-

Create New Task

-

Add a new task to your project to break down work into manageable components

+

{{ _('Create New Task') }}

+

{{ _('Add a new task to your project to break down work into manageable components') }}

@@ -34,7 +34,7 @@
- Task Information + {{ _('Task Information') }}
@@ -42,65 +42,65 @@
- Choose a clear, descriptive name that explains what needs to be done + value="{{ request.form.get('name', '') }}" placeholder="{{ _('Enter a descriptive task name') }}" required> + {{ _('Choose a clear, descriptive name that explains what needs to be done') }}
- +
- Optional: Add context, requirements, or specific instructions for the task + {{ _('Optional: Add context, requirements, or specific instructions for the task') }}
- Select the project this task belongs to + {{ _('Select the project this task belongs to') }}
@@ -109,45 +109,45 @@
- Optional: Set a deadline for this task + {{ _('Optional: Set a deadline for this task') }}
- Optional: Estimate how long this task will take + {{ _('Optional: Estimate how long this task will take') }}
- Optional: Assign this task to a team member + {{ _('Optional: Assign this task to a team member') }}
- Cancel + {{ _('Cancel') }}
@@ -161,7 +161,7 @@
- Task Creation Tips + {{ _('Task Creation Tips') }}
@@ -171,8 +171,8 @@
- Clear Naming - Use action verbs and be specific about what needs to be done + {{ _('Clear Naming') }} + {{ _('Use action verbs and be specific about what needs to be done') }}
@@ -183,8 +183,8 @@
- Realistic Estimates - Consider complexity and dependencies when estimating time + {{ _('Realistic Estimates') }} + {{ _('Consider complexity and dependencies when estimating time') }}
@@ -195,8 +195,8 @@
- Set Deadlines - Due dates help prioritize work and track progress + {{ _('Set Deadlines') }} + {{ _('Due dates help prioritize work and track progress') }}
@@ -207,8 +207,8 @@
- Priority Matters - Use priority levels to help team members focus on what's most important + {{ _('Priority Matters') }} + {{ _('Use priority levels to help team members focus on what\'s most important') }}
@@ -219,35 +219,35 @@
- Priority Guide + {{ _('Priority Guide') }}
- Low - Non-urgent, can be done later + {{ _('Low') }} + {{ _('Non-urgent, can be done later') }}
- Medium - Normal priority, standard timeline + {{ _('Medium') }} + {{ _('Normal priority, standard timeline') }}
- High - Important, needs attention soon + {{ _('High') }} + {{ _('Important, needs attention soon') }}
- Urgent - Critical, immediate attention required + {{ _('Urgent') }} + {{ _('Critical, immediate attention required') }}
@@ -257,35 +257,35 @@
- Status Guide + {{ _('Status Guide') }}
- To Do - Task is planned but not started + {{ _('To Do') }} + {{ _('Task is planned but not started') }}
- In Progress - Work has begun on the task + {{ _('In Progress') }} + {{ _('Work has begun on the task') }}
- Review - Task is ready for review/testing + {{ _('Review') }} + {{ _('Task is ready for review/testing') }}
- Done - Task is completed successfully + {{ _('Done') }} + {{ _('Task is completed successfully') }}
diff --git a/app/templates/tasks/edit.html b/app/templates/tasks/edit.html index a1fb6de..157a16a 100644 --- a/app/templates/tasks/edit.html +++ b/app/templates/tasks/edit.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Edit Task - {{ task.name }} - Time Tracker{% endblock %} +{% block title %}{{ _('Edit Task') }} - {{ task.name }} - Time Tracker{% endblock %} {% block extra_css %} @@ -19,8 +19,8 @@
-

Edit Task

-

Update task details and settings for "{{ task.name }}"

+

{{ _('Edit Task') }}

+

{{ _('Update task details and settings for "%(task)s"', task=task.name) }}

@@ -34,7 +34,7 @@
- Task Information + {{ _('Task Information') }}
@@ -42,65 +42,65 @@
- Choose a clear, descriptive name that explains what needs to be done + value="{{ task.name }}" placeholder="{{ _('Enter a descriptive task name') }}" required> + {{ _('Choose a clear, descriptive name that explains what needs to be done') }}
- +
- Optional: Add context, requirements, or specific instructions for the task + {{ _('Optional: Add context, requirements, or specific instructions for the task') }}
- Select the project this task belongs to + {{ _('Select the project this task belongs to') }}
@@ -109,45 +109,45 @@
- Optional: Set a deadline for this task + {{ _('Optional: Set a deadline for this task') }}
- Optional: Estimate how long this task will take + {{ _('Optional: Estimate how long this task will take') }}
- Optional: Assign this task to a team member + {{ _('Optional: Assign this task to a team member') }}
- Cancel + {{ _('Cancel') }}
@@ -161,26 +161,26 @@
- Current Task Info + {{ _('Current Task Info') }}
- Current Status + {{ _('Current Status') }} {{ task.status_display }}
- Current Priority + {{ _('Current Priority') }} {{ task.priority_display }}
- Project + {{ _('Project') }}
@@ -191,7 +191,7 @@ {% if task.assigned_user %}
- Currently Assigned To + {{ _('Currently Assigned To') }}
@@ -203,7 +203,7 @@ {% if task.due_date %}
- Current Due Date + {{ _('Current Due Date') }}
@@ -217,24 +217,24 @@ {% if task.estimated_hours %}
- Current Estimate + {{ _('Current Estimate') }}
- {{ task.estimated_hours }} hours + {{ task.estimated_hours }} {{ _('hours') }}
{% endif %} {% if task.total_hours > 0 %}
- Actual Hours + {{ _('Actual Hours') }}
- {{ task.total_hours }} hours + {{ task.total_hours }} {{ _('hours') }}
{% endif %} @@ -245,23 +245,23 @@
- Quick Actions + {{ _('Quick Actions') }}
- View Task + {{ _('View Task') }} {% if task.status == 'todo' or task.status == 'in_progress' %} - Start Timer + {{ _('Start Timer') }} {% endif %} - Back to Tasks + {{ _('Back to Tasks') }}
@@ -271,7 +271,7 @@
- Edit Tips + {{ _('Edit Tips') }}
@@ -281,8 +281,8 @@
- Status Changes - Changing status may affect time tracking and progress calculations + {{ _('Status Changes') }} + {{ _('Changing status may affect time tracking and progress calculations') }}
@@ -293,8 +293,8 @@
- Due Date Updates - Consider team workload when adjusting deadlines + {{ _('Due Date Updates') }} + {{ _('Consider team workload when adjusting deadlines') }}
@@ -305,8 +305,8 @@
- Assignment Changes - Notify team members when reassigning tasks + {{ _('Assignment Changes') }} + {{ _('Notify team members when reassigning tasks') }}
@@ -484,7 +484,7 @@ document.addEventListener('DOMContentLoaded', function() { previewStyle: 'vertical', usageStatistics: false, hideModeSwitch: false, - placeholder: 'Provide detailed information about the task, requirements, and any specific instructions...', + placeholder: '{{ _('Provide detailed information about the task, requirements, and any specific instructions...') }}', theme: theme, toolbarItems: [ ['heading', 'bold', 'italic', 'strike'], @@ -560,7 +560,7 @@ document.addEventListener('DOMContentLoaded', function() { // Show loading state const submitBtn = form.querySelector('button[type="submit"]'); const originalText = submitBtn.innerHTML; - submitBtn.innerHTML = 'Updating...'; + submitBtn.innerHTML = '{{ _('Updating...') }}'; submitBtn.disabled = true; // Re-enable after a delay (in case of validation errors) diff --git a/app/templates/tasks/my_tasks.html b/app/templates/tasks/my_tasks.html index 7cac2c6..27f32ce 100644 --- a/app/templates/tasks/my_tasks.html +++ b/app/templates/tasks/my_tasks.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}My Tasks - Time Tracker{% endblock %} +{% block title %}{{ _('My Tasks') }} - Time Tracker{% endblock %} {% block content %}
@@ -10,10 +10,10 @@
{% set actions %} - New Task + {{ _('New Task') }} {% endset %} - {{ page_header('fas fa-user', 'My Tasks', 'Tasks assigned to or created by you • ' ~ (tasks|length) ~ ' total', actions) }} + {{ page_header('fas fa-user', _('My Tasks'), _('Tasks assigned to or created by you') ~ ' • ' ~ (tasks|length) ~ ' ' ~ _('total'), actions) }}
@@ -30,7 +30,7 @@
-
To Do
+
{{ _('To Do') }}
{{ tasks|selectattr('status', 'equalto', 'todo')|list|length }}
@@ -47,7 +47,7 @@
-
In Progress
+
{{ _('In Progress') }}
{{ tasks|selectattr('status', 'equalto', 'in_progress')|list|length }}
@@ -64,7 +64,7 @@
-
Review
+
{{ _('Review') }}
{{ tasks|selectattr('status', 'equalto', 'review')|list|length }}
@@ -81,7 +81,7 @@
-
Completed
+
{{ _('Completed') }}
{{ tasks|selectattr('status', 'equalto', 'done')|list|length }}
@@ -94,44 +94,44 @@
- Filter My Tasks + {{ _('Filter My Tasks') }}
- +
+ value="{{ search }}" placeholder="{{ _('Task name or description') }}">
- +
- +
- +
- +
- Clear + {{ _('Clear') }}
@@ -278,7 +278,7 @@ {% if task.assigned_to == current_user.id %} Assigned to me {% else %} - Created by me + {{ _('Created by me') }} {% endif %}
@@ -288,7 +288,7 @@ {% if task.estimated_hours and task.total_hours > 0 %}
- Progress + {{ _('Progress') }} {{ task.progress_percentage }}%
@@ -306,17 +306,17 @@
- View Details + {{ _('View Details') }} {% if current_user.active_timer and current_user.active_timer.task_id == task.id %} {% elif not current_user.active_timer %} - Start Timer + {{ _('Start Timer') }} {% endif %}
@@ -328,12 +328,12 @@ {% if pagination.pages > 1 %} -
diff --git a/app/templates/tasks/overdue.html b/app/templates/tasks/overdue.html index 793996e..51df4d7 100644 --- a/app/templates/tasks/overdue.html +++ b/app/templates/tasks/overdue.html @@ -1,25 +1,25 @@ {% extends "base.html" %} -{% block title %}Overdue Tasks - Time Tracker{% endblock %} +{% block title %}{{ _('Overdue Tasks') }} - Time Tracker{% endblock %} {% block content %}
{% from "_components.html" import page_header %} {% set actions %} - Back to Tasks + {{ _('Back to Tasks') }} {% endset %} - {{ page_header('fas fa-exclamation-triangle', 'Overdue Tasks', 'Requires immediate attention • ' ~ (tasks|length) ~ ' items', actions) }} + {{ page_header('fas fa-exclamation-triangle', _('Overdue Tasks'), _('Requires immediate attention') ~ ' • ' ~ (tasks|length) ~ ' ' ~ _('items'), actions) }} @@ -31,7 +31,7 @@
- Overdue + {{ _('Overdue') }} {{ task.priority_display }} @@ -56,21 +56,21 @@ {% if task.assigned_user %} {{ task.assigned_user.display_name }} {% else %} - Unassigned + {{ _('Unassigned') }} {% endif %}
- Due: {{ task.due_date.strftime('%Y-%m-%d') }} + {{ _('Due:') }} {{ task.due_date.strftime('%Y-%m-%d') }} {% if task.estimated_hours %}
- Est: {{ task.estimated_hours }}h + {{ _('Est:') }} {{ task.estimated_hours }}h {% endif %} {% if task.total_hours > 0 %}
- Actual: {{ task.total_hours }}h + {{ _('Actual:') }} {{ task.total_hours }}h {% endif %}
@@ -89,16 +89,16 @@
- View + {{ _('View') }} {% if current_user.is_admin or task.created_by == current_user.id %} - Edit + {{ _('Edit') }} {% endif %} - Timer + {{ _('Timer') }}
@@ -134,35 +134,57 @@ {% else %}
-

No Overdue Tasks!

-

Great job! All tasks are currently on schedule.

+

{{ _('No Overdue Tasks!') }}

+

{{ _('Great job! All tasks are currently on schedule.') }}

- View All Tasks + {{ _('View All Tasks') }}
{% endif %}
+ diff --git a/app/templates/tasks/view.html b/app/templates/tasks/view.html index 709f775..128aea8 100644 --- a/app/templates/tasks/view.html +++ b/app/templates/tasks/view.html @@ -7,7 +7,7 @@ @@ -49,23 +49,23 @@ {% if current_user.active_timer and current_user.active_timer.task_id == task.id %}
{% elif not current_user.active_timer %} - Start Timer + {{ _('Start Timer') }} {% endif %} {% if current_user.is_admin or task.created_by == current_user.id %} - Edit Task + {{ _('Edit Task') }} {% endif %} - Back to Tasks + {{ _('Back to Tasks') }}
@@ -84,7 +84,7 @@
- Description + {{ _('Description') }}
@@ -109,7 +109,7 @@
{{ task.project.name }}
-

{{ task.project.description or 'No description available' }}

+

{{ task.project.description or _('No description available') }}

@@ -119,7 +119,7 @@
- Time Tracking + {{ _('Time Tracking') }}
@@ -128,7 +128,7 @@
{{ task.estimated_hours }}
- Estimated Hours + {{ _('Estimated Hours') }}
{% endif %} @@ -137,7 +137,7 @@
{{ task.total_hours }}
- Actual Hours + {{ _('Actual Hours') }}
{% endif %} @@ -146,7 +146,7 @@
{{ task.progress_percentage }}%
- Progress + {{ _('Progress') }}
{% endif %} @@ -154,7 +154,7 @@
{{ task.time_entries.count() }}
- Time Entries + {{ _('Time Entries') }}
@@ -162,8 +162,8 @@ {% if task.estimated_hours and task.total_hours > 0 %}
- Progress Overview - {{ task.progress_percentage }}% Complete + {{ _('Progress Overview') }} + {{ task.progress_percentage }}% {{ _('Complete') }}
- Recent Time Entries + {{ _('Recent Time Entries') }}
@@ -190,11 +190,11 @@ - - - - - + + + + + @@ -213,11 +213,11 @@
DateDurationNotesUserActions{{ _('Date') }}{{ _('Duration') }}{{ _('Notes') }}{{ _('User') }}{{ _('Actions') }}
+ class="btn btn-sm btn-action btn-action--edit touch-target" title="{{ _('Edit entry') }}"> {% if current_user.is_admin or entry.user_id == current_user.id %} - @@ -231,13 +231,13 @@
{% if task.time_entries.count() > 10 %}
- Showing 10 of {{ task.time_entries.count() }} entries + {{ _('Showing') }} 10 {{ _('of') }} {{ task.time_entries.count() }} {{ _('entries') }}
@@ -253,19 +253,19 @@
- Task Details + {{ _('Task Details') }}
- Status + {{ _('Status') }} {{ task.status_display }}
- Priority + {{ _('Priority') }} {{ task.priority_display }} @@ -273,7 +273,7 @@ {% if task.assigned_user %}
- Assigned To + {{ _('Assigned To') }}
@@ -284,7 +284,7 @@ {% endif %}
- Created By + {{ _('Created By') }}
@@ -295,7 +295,7 @@ {% if task.due_date %}
- Due Date + {{ _('Due Date') }}
@@ -309,7 +309,7 @@ {% if task.started_at %}
- Started + {{ _('Started') }}
@@ -321,7 +321,7 @@ {% if task.completed_at %}
- Completed + {{ _('Completed') }}
@@ -343,35 +343,35 @@
{% if task.status == 'todo' %} - {% elif task.status == 'in_progress' %}
- -
{% elif task.status == 'review' %}
- -
{% elif task.status == 'done' %} - {% endif %} {% if task.status != 'done' and task.status != 'cancelled' %} - {% endif %} @@ -383,7 +383,7 @@
- Task Timeline + {{ _('Task Timeline') }}
@@ -392,7 +392,7 @@
{{ task.created_at.strftime('%b %d, %Y') }} -

Task created

+

{{ _('Task created') }}

@@ -401,7 +401,7 @@
{{ task.started_at.strftime('%b %d, %Y') }} -

Task started

+

{{ _('Task started') }}

{% endif %} @@ -411,7 +411,7 @@
{{ task.completed_at.strftime('%b %d, %Y') }} -

Task completed

+

{{ _('Task completed') }}

{% endif %} @@ -420,7 +420,7 @@
{{ task.updated_at.strftime('%b %d, %Y') }} -

Last updated

+

{{ _('Last updated') }}

@@ -432,7 +432,7 @@
- Activity Log + {{ _('Activity Log') }}
@@ -440,10 +440,10 @@ - - - - + + + + @@ -777,18 +777,18 @@ document.addEventListener('DOMContentLoaded', function() {
-
Confirm Action
- +
{{ _('Confirm Action') }}
+
-

Are you sure?

+

{{ _('Are you sure?') }}

@@ -801,25 +801,25 @@ document.addEventListener('DOMContentLoaded', function() {
- Delete Time Entry + {{ _('Delete Time Entry') }}
- Warning: This action cannot be undone. + {{ _('Warning:') }} {{ _('This action cannot be undone.') }}
-

Are you sure you want to delete the time entry for ?

-

Duration:

+

{{ _('Are you sure you want to delete the time entry for') }} ?

+

{{ _('Duration:') }}

diff --git a/app/utils/license_server.py b/app/utils/license_server.py index 7aceab6..38f7627 100644 --- a/app/utils/license_server.py +++ b/app/utils/license_server.py @@ -13,15 +13,15 @@ import socket logger = logging.getLogger(__name__) class LicenseServerClient: - """Client for communicating with the DryLicenseServer""" + """Client for communicating with the Metrics Server""" def __init__(self, app_identifier: str = "timetracker", app_version: str = "1.0.0"): # Server configuration (env-overridable) - # Defaults target the dev API port per docs (HTTP 8082). In prod, set HTTPS 8443 via env. + # Default targets the public metrics endpoint; override via environment if needed. default_server_url = "http://metrics.drytrix.com:58082" - configured_server_url = default_server_url + configured_server_url = os.getenv("METRICS_SERVER_URL", os.getenv("LICENSE_SERVER_BASE_URL", default_server_url)) self.server_url = self._normalize_base_url(configured_server_url) - self.api_key = "no-license-required" + self.api_key = os.getenv("METRICS_SERVER_API_KEY", os.getenv("LICENSE_SERVER_API_KEY", "no-license-required")) self.app_identifier = app_identifier self.app_version = app_version @@ -31,14 +31,14 @@ class LicenseServerClient: self.is_registered = False self.heartbeat_thread = None # Timing configuration - self.heartbeat_interval = int(os.getenv("LICENSE_HEARTBEAT_SECONDS", "3600")) # default: 1 hour - self.request_timeout = int(os.getenv("LICENSE_SERVER_TIMEOUT_SECONDS", "30")) # default: 30s per docs + self.heartbeat_interval = int(os.getenv("METRICS_HEARTBEAT_SECONDS", os.getenv("LICENSE_HEARTBEAT_SECONDS", "3600"))) # default: 1 hour + self.request_timeout = int(os.getenv("METRICS_SERVER_TIMEOUT_SECONDS", os.getenv("LICENSE_SERVER_TIMEOUT_SECONDS", "30"))) # default: 30s per docs self.running = False # System information self.system_info = self._collect_system_info() - logger.info(f"License server configured: base='{self.server_url}', app='{self.app_identifier}', version='{self.app_version}'") + logger.info(f"Metrics server configured: base='{self.server_url}', app='{self.app_identifier}', version='{self.app_version}'") if not self.api_key: logger.warning("X-API-Key is empty; server may reject requests. Set LICENSE_SERVER_API_KEY.") @@ -340,7 +340,7 @@ class LicenseServerClient: logger.info(f"License validation headers: {validation_headers}") logger.info(f"License validation body: {validation_data}") - logger.info("Validating phone home token (no license required)") + logger.info("Validating metrics token (no license required)") response = self._make_request("/api/v1/validate", "POST", validation_data) if response and response.get("valid", False): @@ -488,7 +488,7 @@ class LicenseServerClient: return response is not None def get_status(self) -> Dict[str, Any]: - """Get current status of the phone home client""" + """Get current status of the metrics client""" return { "is_registered": self.is_registered, "instance_id": self.instance_id, @@ -496,7 +496,11 @@ class LicenseServerClient: "server_healthy": self.check_server_health(), "offline_data_count": len(self.offline_data), "app_identifier": self.app_identifier, - "app_version": self.app_version + "app_version": self.app_version, + "server_url": self.server_url, + "heartbeat_interval": self.heartbeat_interval, + "analytics_enabled": not bool(self.system_info.get("analytics_disabled", False)), + "system_info": self.system_info } # Global instance @@ -544,7 +548,7 @@ def stop_license_client(): license_client.stop() def send_usage_event(event_type: str, event_data: Dict[str, Any] = None): - """Send a usage event to the license server""" + """Send a usage event to the metrics server""" if not license_client: return False diff --git a/docs/LICENSE_SERVER_INTEGRATION.md b/docs/LICENSE_SERVER_INTEGRATION.md index 39ebf40..3a810b0 100644 --- a/docs/LICENSE_SERVER_INTEGRATION.md +++ b/docs/LICENSE_SERVER_INTEGRATION.md @@ -1,32 +1,31 @@ -# License Server Integration +# Metrics Server Integration -This document describes the implementation of the DryLicenseServer communication in the TimeTracker application. +This document describes the implementation of the metrics server communication in the TimeTracker application. ## Overview -The TimeTracker application includes a license server client that communicates with a DryLicenseServer for monitoring and analytics purposes. **No license is required** to use the application - this integration is purely for usage tracking and system monitoring. +The TimeTracker application includes a metrics client that communicates with a metrics server for monitoring and analytics purposes. **No license is required** to use the application — this integration is purely for usage tracking and system monitoring. ## Implementation Details ### Core Components 1. **LicenseServerClient** (`app/utils/license_server.py`) - - Main client class for communicating with the license server + - Main client class for communicating with the metrics server - Handles instance registration, heartbeats, and usage data transmission - Implements offline data storage for failed requests - Runs background heartbeat thread -2. **Configuration** (`app/config.py`) - - License server settings in the main configuration - - Environment variable support for customization - - Default values for development +2. **Configuration** (`app/utils/license_server.py` and environment) + - Metrics server settings are environment-configurable with sane defaults + - Default values are provided for development 3. **Integration** (`app/__init__.py`) - Automatic initialization during application startup - - Graceful error handling if license server is unavailable + - Graceful error handling if metrics server is unavailable 4. **Admin Interface** (`app/routes/admin.py`) - - License server status monitoring + - Metrics server status monitoring - Testing and restart capabilities - Integration with admin dashboard @@ -36,7 +35,7 @@ The TimeTracker application includes a license server client that communicates w - ✅ **Periodic Heartbeats**: Sends status updates every hour (configurable) - ✅ **Usage Data Collection**: Tracks application usage and features - ✅ **Offline Storage**: Stores data locally when server is unavailable -- ✅ **Graceful Error Handling**: Continues operation even if license server fails +- ✅ **Graceful Error Handling**: Continues operation even if metrics server fails - ✅ **System Information Collection**: Gathers OS, hardware, and environment details - ✅ **Admin Monitoring**: Web interface for status and management @@ -44,31 +43,19 @@ The TimeTracker application includes a license server client that communicates w ### Environment Variables -**No environment variables are needed for license server configuration.** +Metrics server configuration supports environment overrides (legacy variable names are also accepted for compatibility): -All license server settings are hardcoded in the application code and cannot be changed by clients: - -- **Server URL**: `http://192.168.1.100:8081` (hardcoded in `app/utils/license_server.py`) -- **App ID**: `timetracker` (hardcoded in `app/config.py`) -- **App Version**: `1.0.0` (hardcoded in `app/config.py`) -- **Heartbeat Interval**: 3600 seconds (1 hour) (hardcoded in `app/config.py`) -- **Enabled by default**: Yes (hardcoded in `app/config.py`) - -### Hardcoded Values - -The license server configuration is intentionally hardcoded to ensure: - -- **Consistent monitoring** across all deployments -- **No client configuration** required -- **Predictable behavior** regardless of environment -- **Security** - clients cannot change monitoring endpoints +- `METRICS_SERVER_URL` (legacy: `LICENSE_SERVER_BASE_URL`) +- `METRICS_SERVER_API_KEY` (legacy: `LICENSE_SERVER_API_KEY`) +- `METRICS_HEARTBEAT_SECONDS` (legacy: `LICENSE_HEARTBEAT_SECONDS`) — default 3600 +- `METRICS_SERVER_TIMEOUT_SECONDS` (legacy: `LICENSE_SERVER_TIMEOUT_SECONDS`) — default 30 ## API Endpoints Used | Endpoint | Purpose | Status | |----------|---------|---------| | `/api/v1/register` | Instance registration | ✅ Implemented | -| `/api/v1/validate` | License validation | ✅ Implemented (always succeeds) | +| `/api/v1/validate` | Token validation | ✅ Implemented (no license required) | | `/api/v1/heartbeat` | Status updates | ✅ Implemented | | `/api/v1/data` | Usage data transmission | ✅ Implemented | | `/api/v1/status` | Server health check | ✅ Implemented | @@ -77,7 +64,7 @@ The license server configuration is intentionally hardcoded to ensure: ### Automatic Operation -The license server client starts automatically when the application starts: +The metrics client starts automatically when the application starts: 1. **Application Startup**: Client initializes and registers instance 2. **Background Heartbeats**: Sends status updates every hour @@ -89,22 +76,22 @@ The license server client starts automatically when the application starts: #### CLI Commands ```bash -# Check license server status +# Check metrics status flask license-status -# Test license server communication +# Test metrics communication flask license-test -# Restart license server client +# Restart metrics client flask license-restart ``` #### Admin Interface -- **Dashboard**: Quick access to license status -- **License Status Page**: Detailed status information +- **Dashboard**: Quick access to metrics status +- **Metrics Status Page**: Detailed status information - **Test Connection**: Verify server communication -- **Restart Client**: Restart the license server client +- **Restart Client**: Restart the metrics client ### Programmatic Usage @@ -123,7 +110,7 @@ if client: ## Data Collection -### System Information +### System Information (minimal) - Operating system and version - Hardware architecture @@ -131,7 +118,7 @@ if client: - Hostname and local IP - Processor information -### Usage Events +### Usage Events (aggregate) - Feature usage tracking - User actions @@ -172,14 +159,14 @@ if client: ### Startup Failures - Application continues to function -- License server client marked as unavailable +- Metrics client marked as unavailable - Admin interface shows error status ## Monitoring and Debugging ### Logs -License server operations are logged with appropriate levels: +Metrics client operations are logged with appropriate levels: - **INFO**: Successful operations and status changes - **WARNING**: Failed requests and connection issues @@ -221,13 +208,13 @@ python test_license_server.py ### Manual Testing 1. Start the application -2. Check admin dashboard for license status +2. Check admin dashboard for metrics status 3. Use CLI commands to test functionality 4. Monitor logs for operation details ### Integration Testing -1. Start a license server on localhost:8081 +1. Start a metrics server on localhost:8081 2. Verify registration and heartbeats 3. Test usage data transmission 4. Check offline data handling @@ -237,7 +224,7 @@ python test_license_server.py ### Common Issues 1. **Server Not Responding** - - Check if license server is running on port 8081 + - Check if metrics server is running on port 8081 - Verify network connectivity - Check firewall settings @@ -274,12 +261,12 @@ tail -f logs/timetracker.log ## Support -For issues with the license server integration: +For issues with the metrics server integration: 1. Check the admin interface for status 2. Review application logs 3. Use CLI commands for testing -4. Verify license server availability +4. Verify metrics server availability 5. Check configuration values The integration is designed to be non-intrusive and will not prevent the application from functioning normally. diff --git a/templates/admin/create_user.html b/templates/admin/create_user.html index 5a51723..353e7be 100644 --- a/templates/admin/create_user.html +++ b/templates/admin/create_user.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}New User - {{ app_name }}{% endblock %} +{% block title %}{{ _('New User') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -10,18 +10,18 @@

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

@@ -33,7 +33,7 @@
- User Information + {{ _('User Information') }}
@@ -41,18 +41,18 @@
- - -
Lowercase; must be unique.
+ + +
{{ _('Lowercase; must be unique.') }}
- +
@@ -60,10 +60,10 @@
- Cancel + {{ _('Cancel') }}
diff --git a/templates/admin/dashboard.html b/templates/admin/dashboard.html index 7fbc076..9ebcf4f 100644 --- a/templates/admin/dashboard.html +++ b/templates/admin/dashboard.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Admin Dashboard - {{ app_name }}{% endblock %} +{% block title %}{{ _('Admin Dashboard') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,21 +9,21 @@
-

Admin Dashboard

-

Manage users, system settings, and core operations at a glance.

+

{{ _('Admin Dashboard') }}

+

{{ _('Manage users, system settings, and core operations at a glance.') }}

- System Info + {{ _('System Info') }} - Create Backup + {{ _('Create Backup') }} - Restore + {{ _('Restore') }} - License Status + {{ _('Metrics Status') }}
@@ -43,7 +43,7 @@
-
Total Users
+
{{ _('Total Users') }}
{{ stats.total_users }}
@@ -60,7 +60,7 @@
-
Total Projects
+
{{ _('Total Projects') }}
{{ stats.total_projects }}
@@ -77,7 +77,7 @@
-
Time Entries
+
{{ _('Time Entries') }}
{{ stats.total_entries }}
@@ -94,7 +94,7 @@
-
Total Hours
+
{{ _('Total Hours') }}
{{ "%.1f"|format(stats.total_hours) }}h
@@ -109,16 +109,16 @@
- User Management + {{ _('User Management') }}
- Manage Users + {{ _('Manage Users') }} - Create New User + {{ _('Create New User') }}
@@ -129,16 +129,16 @@
- System Settings + {{ _('System Settings') }}
- Configure Settings + {{ _('Configure Settings') }} - Create Backup + {{ _('Create Backup') }}
@@ -152,7 +152,7 @@
- Recent Activity + {{ _('Recent Activity') }}
@@ -161,11 +161,11 @@
WhenEventUserDetails{{ _('When') }}{{ _('Event') }}{{ _('User') }}{{ _('Details') }}
- - - - - + + + + + @@ -183,9 +183,9 @@ @@ -197,8 +197,8 @@
-
No recent activity
-

No time entries have been recorded recently.

+
{{ _('No recent activity') }}
+

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

{% endif %} @@ -210,22 +210,22 @@
- Quick Actions + {{ _('Quick Actions') }}
- New Project + {{ _('New Project') }} - View Reports + {{ _('View Reports') }} - System Info + {{ _('System Info') }} - License Status + {{ _('Metrics Status') }}
diff --git a/templates/admin/license_status.html b/templates/admin/license_status.html index d93175e..b6ddae2 100644 --- a/templates/admin/license_status.html +++ b/templates/admin/license_status.html @@ -1,190 +1,207 @@ {% extends "base.html" %} -{% block title %}License Server Status - Admin{% endblock %} +{% block title %}{{ _('Metrics Server Status') }} - {{ _('Admin') }}{% endblock %} {% block content %}
-
-
-
-

License Server Status

- -
+
+
+
+

{{ _('Metrics Server Status') }}

+ +
- {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for category, message in messages %} - - {% endfor %} - {% endif %} - {% endwith %} + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} + + {% endfor %} + {% endif %} + {% endwith %} -
-
-
-
-
- Client Information -
-
-
-
UserProjectDateDurationStatus{{ _('User') }}{{ _('Project') }}{{ _('Date') }}{{ _('Duration') }}{{ _('Status') }}
{% if entry.end_time %} - Completed + {{ _('Completed') }} {% else %} - Running + {{ _('Running') }} {% endif %}
- - - - - - - - - - - - - - - - -
App Identifier:{{ status.app_identifier }}
App Version:{{ status.app_version }}
Instance ID:{{ status.instance_id or 'Not registered' }}
Registration Status: - {% if status.is_registered %} - Registered - {% else %} - Not Registered - {% endif %} -
-
-
-
+
+
+
+
+
+ {{ _('Client Information') }} +
+
+
+ + + + + + + + + + + + + + + + + +
{{ _('App Identifier:') }}{{ status.app_identifier }}
{{ _('App Version:') }}{{ status.app_version }}
{{ _('Instance ID:') }}{{ status.instance_id or _('Not registered') }}
{{ _('Registration Status:') }} + {% if status.is_registered %} + {{ _('Registered') }} + {% else %} + {{ _('Not Registered') }} + {% endif %} +
+
+
+
-
-
-
-
- Connection Status -
-
-
- - - - - - - - - - - - - -
Client Running: - {% if status.is_running %} - Running - {% else %} - Stopped - {% endif %} -
Server Health: - {% if status.server_healthy %} - Healthy - {% else %} - Not Responding - {% endif %} -
Offline Data: - {% if status.offline_data_count > 0 %} - {{ status.offline_data_count }} pending - {% else %} - None - {% endif %} -
-
-
-
-
+
+
+
+
+ {{ _('Connection Status') }} +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{{ _('Client Running:') }} + {% if status.is_running %} + {{ _('Running') }} + {% else %} + {{ _('Stopped') }} + {% endif %} +
{{ _('Server Health:') }} + {% if status.server_healthy %} + {{ _('Healthy') }} + {% else %} + {{ _('Not Responding') }} + {% endif %} +
{{ _('Offline Data:') }} + {% if status.offline_data_count > 0 %} + {{ status.offline_data_count }} {{ _('pending') }} + {% else %} + {{ _('None') }} + {% endif %} +
{{ _('Server URL:') }}{{ status.server_url }}
{{ _('Heartbeat Interval:') }}{{ status.heartbeat_interval }} {{ _('seconds') }}
{{ _('Analytics Enabled:') }} + {% if status.analytics_enabled %} + {{ _('Yes') }} + {% else %} + {{ _('No') }} + {% endif %} +
+
+
+
+
-
-
-
-
-
- Configuration -
-
-
-
-
About This Implementation
-

- This TimeTracker application communicates with a license server for monitoring and analytics purposes only. - No license is required to use the application. The license server is used to: -

-
    -
  • Track application usage and features
    • -
  • Monitor system health and performance
    • -
  • Collect analytics data for improvement
    • -
  • Provide support and troubleshooting information
    • -
-
- -
-
-
Server Configuration
-
    -
  • Server URL: http://host.docker.internal:8081
    • -
  • API Key: no-license-required
    • -
  • Heartbeat Interval: 3600 seconds (1 hour)
    • -
-
-
-
Features
-
    -
  • Automatic instance registration
    • -
  • Periodic heartbeats
    • -
  • Usage data collection
    • -
  • Offline data storage
    • -
  • Graceful error handling
    • -
-
-
- -
-
-
Privacy & Analytics Settings
-
- - Analytics Setting: - {% if settings and settings.allow_analytics %} - Enabled - System information is being shared with the license server - {% else %} - Disabled - System information sharing is disabled - {% endif %} -
- - - This setting can be changed in System Settings. - License validation continues to work regardless of this setting. - -
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ _('Configuration') }} +
+
+
+
+
{{ _('About This Implementation') }}
+

+ {{ _('This TimeTracker application communicates with a metrics server for monitoring and analytics purposes only.') }} + {{ _('No license is required') }} {{ _('to use the application. The metrics server is used to:') }} +

+
    +
  • {{ _('Track application usage and features') }}
    • +
  • {{ _('Monitor system health and performance') }}
    • +
  • {{ _('Collect analytics data for improvement') }}
    • +
  • {{ _('Provide support and troubleshooting information') }}
    • +
+
+ +
+
+
{{ _('Server Configuration') }}
+
    +
  • {{ _('Server URL:') }} {{ status.server_url }}
    • +
  • {{ _('Heartbeat Interval:') }} {{ status.heartbeat_interval }} {{ _('seconds') }}
    • +
+
+
+
{{ _('Features') }}
+
    +
  • {{ _('Automatic instance registration') }}
    • +
  • {{ _('Periodic heartbeats') }}
    • +
  • {{ _('Usage data collection') }}
    • +
  • {{ _('Offline data storage') }}
    • +
  • {{ _('Graceful error handling') }}
    • +
+
+
+ +
+
+
{{ _('Privacy & Analytics Settings') }}
+
+ + {{ _('Analytics Setting:') }} + {% if settings and settings.allow_analytics %} + {{ _('Enabled') }} + {{ _('System information is being shared with the metrics server') }} + {% else %} + {{ _('Disabled') }} + {{ _('System information sharing is disabled') }} + {% endif %} +
+ + + {{ _('This setting can be changed in') }} {{ _('System Settings') }}. + {{ _('License validation continues to work regardless of this setting.') }} + +
+
+
+
+
+
+
+
+
{% endblock %} diff --git a/templates/admin/restore.html b/templates/admin/restore.html index fb1309a..4039619 100644 --- a/templates/admin/restore.html +++ b/templates/admin/restore.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% block title %}Restore Backup{% endblock %} +{% block title %}{{ _('Restore Backup') }}{% endblock %} {% block content %}
@@ -10,12 +10,12 @@

- Restore Backup + {{ _('Restore Backup') }}

- Danger Operation + {{ _('Danger Operation') }}
- Back to Dashboard + {{ _('Back to Dashboard') }}
@@ -26,18 +26,18 @@
- Upload Backup Archive (.zip) + {{ _('Upload Backup Archive (.zip)') }}
- Restoring a backup will overwrite your current database and files. Ensure you have a recent backup before proceeding. + {{ _('Restoring a backup will overwrite your current database and files. Ensure you have a recent backup before proceeding.') }}
{% if progress %}
- Status: + {{ _('Status:') }} {{ progress.status|title }} @@ -61,19 +61,19 @@ {% endif %}
- +
- Select a .zip archive previously created via the Backup action. + {{ _('Select a .zip archive previously created via the Backup action.') }}
- Cancel + {{ _('Cancel') }}
@@ -85,15 +85,15 @@
- Safety Tips + {{ _('Safety Tips') }}
    -
  • Verify the backup archive integrity before restoring.
    • -
  • Ensure no active writes are occurring during restore.
    • -
  • Keep a copy of the current data in case you need to roll back.
    • -
  • After restore, review settings and re-run migrations if required.
    • +
  • {{ _('Verify the backup archive integrity before restoring.') }}
    • +
  • {{ _('Ensure no active writes are occurring during restore.') }}
    • +
  • {{ _('Keep a copy of the current data in case you need to roll back.') }}
    • +
  • {{ _('After restore, review settings and re-run migrations if required.') }}
diff --git a/templates/admin/settings.html b/templates/admin/settings.html index 6b08008..0c92835 100644 --- a/templates/admin/settings.html +++ b/templates/admin/settings.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Settings - {{ app_name }}{% endblock %} +{% block title %}{{ _('Settings') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -8,10 +8,10 @@

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

- Back to Dashboard + {{ _('Back to Dashboard') }}
@@ -21,13 +21,13 @@
-
Configuration
+
{{ _('Configuration') }}
- + - Select your local timezone for proper time display. Times shown include DST adjustments. + {{ _('Select your local timezone for proper time display. Times shown include DST adjustments.') }}
- +
- +
- +
- +
- +
- +
- +
- +
@@ -212,53 +212,54 @@
- +
- +
- +
- +
- +
- +
- +
{% if settings and settings.has_logo() %}
- + - This will appear on invoices for payment instructions + {{ _('This will appear on invoices for payment instructions') }}
@@ -298,29 +299,29 @@
- Invoice Defaults + {{ _('Invoice Defaults') }}
- +
- +
- +
- +
@@ -329,7 +330,7 @@
- Privacy & Analytics + {{ _('Privacy & Analytics') }}
@@ -338,13 +339,13 @@
- When enabled, basic system information (OS, version, etc.) may be shared with the license server for monitoring purposes. - License validation will continue to work regardless of this setting. -
This helps improve the application and monitor system health. + {{ _('When enabled, basic system information (OS, version, etc.) may be shared with the metrics server for monitoring purposes.') }} + {{ _('Core functionality will continue to work regardless of this setting.') }} +
{{ _('This helps improve the application and monitor system health.') }}
@@ -355,12 +356,12 @@
- Current Time: - Loading... + {{ _('Current Time:') }} + {{ _('Loading...') }}
- in {{ settings.timezone if settings else 'Europe/Rome' }} timezone + {{ _('in') }} {{ settings.timezone if settings else 'Europe/Rome' }} {{ _('timezone') }}
@@ -369,13 +370,13 @@
- This time updates every second and shows the current time in your selected timezone + {{ _('This time updates every second and shows the current time in your selected timezone') }}
- Current offset: -- + {{ _('Current offset:') }} --
@@ -391,18 +392,18 @@
-
Help
+
{{ _('Help') }}
-

Configure application-wide settings such as timezone, currency, timer behavior, data export options, and company branding for invoices.

+

{{ _('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 with the license server for monitoring purposes.
    • -
  • License validation will continue to work regardless of the analytics setting.
    • +
  • {{ _('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 with the metrics server for monitoring purposes.') }}
    • +
  • {{ _('Core functionality will continue to work regardless of the analytics setting.') }}
@@ -410,7 +411,23 @@
+ + {% endblock %} diff --git a/templates/errors/400.html b/templates/errors/400.html index c26a8b0..3f6c5c3 100644 --- a/templates/errors/400.html +++ b/templates/errors/400.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}400 Bad Request - {{ app_name }}{% endblock %} +{% block title %}{{ _('400 Bad Request') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,24 +9,24 @@

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

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

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

    -
  • Missing or invalid form data
    • -
  • Malformed request parameters
    • +
  • {{ _('Missing or invalid form data') }}
    • +
  • {{ _('Malformed request parameters') }}
- Go to Dashboard + {{ _('Go to Dashboard') }}
diff --git a/templates/errors/403.html b/templates/errors/403.html index e9f748d..77a3ef2 100644 --- a/templates/errors/403.html +++ b/templates/errors/403.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}403 Forbidden - {{ app_name }}{% endblock %} +{% block title %}{{ _('403 Forbidden') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,25 +9,25 @@

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

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

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

    -
  • Insufficient privileges
    • -
  • Not logged in
    • -
  • Resource access restrictions
    • +
  • {{ _('Insufficient privileges') }}
    • +
  • {{ _('Not logged in') }}
    • +
  • {{ _('Resource access restrictions') }}
- Go to Dashboard + {{ _('Go to Dashboard') }} - Login + {{ _('Login') }}
diff --git a/templates/errors/404.html b/templates/errors/404.html index 8e9c7f0..f0f7f68 100644 --- a/templates/errors/404.html +++ b/templates/errors/404.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Page Not Found - {{ app_name }}{% endblock %} +{% block title %}{{ _('Page Not Found') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,16 +9,16 @@

404

-

Page Not Found

+

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

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

- Go to Dashboard + {{ _('Go to Dashboard') }} - Go Back + {{ _('Go Back') }}
diff --git a/templates/errors/500.html b/templates/errors/500.html index 82b6b34..02b1f69 100644 --- a/templates/errors/500.html +++ b/templates/errors/500.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Server Error - {{ app_name }}{% endblock %} +{% block title %}{{ _('Server Error') }} - {{ app_name }}{% endblock %} {% block content %}
@@ -9,16 +9,16 @@

500

-

Server Error

+

{{ _('Server Error') }}

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

- Go to Dashboard + {{ _('Go to Dashboard') }} - Try Again + {{ _('Try Again') }}
diff --git a/templates/invoices/create.html b/templates/invoices/create.html index e0901eb..e3d3900 100644 --- a/templates/invoices/create.html +++ b/templates/invoices/create.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Create Invoice - TimeTracker{% endblock %} +{% block title %}{{ _('Create Invoice') }} - TimeTracker{% endblock %} {% block content %}
@@ -11,14 +11,14 @@

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

- Back to Invoices + {{ _('Back to Invoices') }}
@@ -30,22 +30,22 @@
1
- Basic Info + {{ _('Basic Info') }}
2
- Client Details + {{ _('Client Details') }}
3
- Settings + {{ _('Settings') }}
4
- Review + {{ _('Review') }}
@@ -60,7 +60,7 @@
- Step 1: Basic Information + {{ _('Step 1: Basic Information') }}
@@ -68,7 +68,7 @@
- +
- Select the project this invoice is for + {{ _('Select the project this invoice is for') }}
@@ -88,10 +88,10 @@
- +
- When payment is due + {{ _('When payment is due') }}
@@ -99,7 +99,7 @@
@@ -109,7 +109,7 @@ @@ -227,48 +227,48 @@
-
Select a project to see details
+
{{ _('Select a project to see details') }}
@@ -309,7 +309,7 @@
- Quick Tips + {{ _('Quick Tips') }}
@@ -318,9 +318,9 @@
- Time Integration + {{ _('Time Integration') }}

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

@@ -330,9 +330,9 @@
- Auto Calculations + {{ _('Auto Calculations') }}

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

@@ -342,9 +342,9 @@
- Export Options + {{ _('Export Options') }}

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

@@ -503,7 +503,7 @@ document.addEventListener('DOMContentLoaded', function() { noProjectInfo.classList.add('d-none'); projectClient.textContent = clientName; projectRate.textContent = '{{ settings.currency or "EUR" }}' + hourlyRate.toFixed(2); - projectBillable.textContent = hourlyRate > 0 ? 'Yes' : 'No'; + projectBillable.textContent = hourlyRate > 0 ? '{{ _('Yes') }}' : '{{ _('No') }}'; } else { projectInfo.classList.add('d-none'); noProjectInfo.classList.remove('d-none'); @@ -520,7 +520,7 @@ document.addEventListener('DOMContentLoaded', function() { invoiceForm.addEventListener('submit', function(e) { if (!validateForm()) { e.preventDefault(); - showAlert('Please fill in all required fields and complete all steps.', 'warning'); + showAlert('{{ _('Please fill in all required fields and complete all steps.') }}', 'warning'); } }); }); @@ -601,7 +601,7 @@ function validateCurrentStep() { } if (!isValid) { - showAlert('Please fill in all required fields before proceeding.', 'warning'); + showAlert('{{ _('Please fill in all required fields before proceeding.') }}', 'warning'); } return isValid; diff --git a/templates/invoices/edit.html b/templates/invoices/edit.html index 0af5113..cfdb138 100644 --- a/templates/invoices/edit.html +++ b/templates/invoices/edit.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Edit Invoice {{ invoice.invoice_number }} - TimeTracker{% endblock %} +{% block title %}{{ _('Edit Invoice') }} {{ invoice.invoice_number }} - TimeTracker{% endblock %} {% block content %}
@@ -9,14 +9,14 @@

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

- View + {{ _('View') }} - Back + {{ _('Back') }}
@@ -27,20 +27,20 @@
-
Invoice Details
+
{{ _('Invoice Details') }}
- +
- +
@@ -48,7 +48,7 @@
- +
@@ -56,14 +56,14 @@
- +
- +
@@ -71,13 +71,13 @@
- +
- +
@@ -87,9 +87,9 @@
-
Invoice Items
+
{{ _('Invoice Items') }}
@@ -97,11 +97,11 @@ - - - - - + + + + + @@ -136,7 +136,7 @@ - + - +
Description *Quantity (Hours) *Unit Price *TotalActions{{ _('Description *') }}{{ _('Quantity (Hours) *') }}{{ _('Unit Price *') }}{{ _('Total') }}{{ _('Actions') }}
Subtotal:{{ _('Subtotal:') }} @@ -145,7 +145,7 @@
- Tax ({{ "%.2f"|format(invoice.tax_rate) }}%): + {{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%):
Total Amount:{{ _('Total Amount:') }} @@ -172,29 +172,29 @@
-
Project Information
+
{{ _('Project Information') }}
- Project:
+ {{ _('Project:') }}
{{ invoice.project.name }}
- Client:
+ {{ _('Client:') }}
{{ invoice.project.client }}
- Hourly Rate:
+ {{ _('Hourly Rate:') }}
{% if invoice.project.hourly_rate %} {{ "%.2f"|format(invoice.project.hourly_rate) }} {{ currency }} {% else %} - Not set + {{ _('Not set') }} {% endif %}
- Billing Reference:
+ {{ _('Billing Reference:') }}
{{ invoice.project.billing_ref or 'None' }}
@@ -203,23 +203,23 @@
-
Quick Actions
+
{{ _('Quick Actions') }}
- Generate from Time Entries + {{ _('Generate from Time Entries') }}
@@ -228,24 +228,24 @@
-
Totals Summary
+
{{ _('Totals Summary') }}
-
Subtotal:
+
{{ _('Subtotal:') }}
{{ "%.2f"|format(invoice.subtotal) }} {{ currency }}
-
Tax:
+
{{ _('Tax:') }}
{{ "%.2f"|format(invoice.tax_amount) }} {{ currency }}
-
Total:
+
{{ _('Total:') }}
{{ "%.2f"|format(invoice.total_amount) }} {{ currency }}
@@ -262,10 +262,10 @@
- Cancel + {{ _('Cancel') }}
@@ -316,7 +316,7 @@ function removeItemRow(button) { $(button).closest('tr').remove(); calculateTotals(); } else { - alert('At least one item is required.'); + alert('{{ _('At least one item is required.') }}'); } } @@ -362,7 +362,7 @@ function useProjectRate() { calculateRowTotal(this); }); } else { - alert('No hourly rate set for this project.'); + alert('{{ _('No hourly rate set for this project.') }}'); } } diff --git a/templates/invoices/generate_from_time.html b/templates/invoices/generate_from_time.html index fc8bee3..99b7ccf 100644 --- a/templates/invoices/generate_from_time.html +++ b/templates/invoices/generate_from_time.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Generate Invoice from Time - TimeTracker{% endblock %} +{% block title %}{{ _('Generate Invoice from Time') }} - TimeTracker{% endblock %} {% block content %}
@@ -11,12 +11,12 @@

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

- Invoice #{{ invoice.invoice_number }} + {{ _('Invoice #') }}{{ invoice.invoice_number }}
- Back to Invoice + {{ _('Back to Invoice') }}
@@ -28,25 +28,25 @@
-
Client
+
{{ _('Client') }}
{{ invoice.client_name }}
-
Project
+
{{ _('Project') }}
{{ invoice.project.name }}
-
Hourly Rate
+
{{ _('Hourly Rate') }}
{{ "%.2f"|format(invoice.project.hourly_rate or 0) }} {{ currency }}
-
Available Hours
+
{{ _('Available Hours') }}
{{ "%.2f"|format(total_available_hours) }}h
@@ -62,14 +62,14 @@
- Select Time Entries + {{ _('Select Time Entries') }}
@@ -83,17 +83,17 @@
- 0 selected + 0 {{ _('selected') }} - 0.00 hours + 0.00 {{ _('hours') }}
@@ -104,12 +104,12 @@ - - - - - - + + + + + + @@ -150,11 +150,11 @@
{{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %}
{% if entry.notes|length > 50 %} - Click to view full notes + {{ _('Click to view full notes') }} {% endif %}
{% else %} - No notes + {{ _('No notes') }} {% endif %} @@ -168,12 +168,12 @@
- Summary: - 0 entries selected, - 0.00 hours total + {{ _('Summary:') }} + 0 {{ _('entries selected,') }} + 0.00 {{ _('hours total') }}
- Selected entries will be converted to invoice line items with the project's hourly rate. + {{ _("Selected entries will be converted to invoice line items with the project's hourly rate.") }}
@@ -183,10 +183,10 @@
- Cancel + {{ _('Cancel') }}
@@ -194,16 +194,16 @@
-
No time entries found
+
{{ _('No time entries found') }}

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

- Back to Invoice + {{ _('Back to Invoice') }} - Add Time Entry + {{ _('Add Time Entry') }}
@@ -218,22 +218,22 @@
- Quick Actions + {{ _('Quick Actions') }}
@@ -243,7 +243,7 @@
- Tips + {{ _('Tips') }}
@@ -252,9 +252,9 @@
- Smart Selection + {{ _('Smart Selection') }}

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

@@ -264,9 +264,9 @@
- Automatic Calculation + {{ _('Automatic Calculation') }}

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

@@ -276,9 +276,9 @@
- Review & Edit + {{ _('Review & Edit') }}

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

@@ -460,7 +460,7 @@ document.addEventListener('DOMContentLoaded', function() { const selectedCount = document.querySelectorAll('.time-entry-checkbox:checked').length; if (selectedCount === 0) { e.preventDefault(); - showAlert('Please select at least one time entry to generate invoice items.', 'warning'); + showAlert('{{ _('Please select at least one time entry to generate invoice items.') }}', 'warning'); } }); } diff --git a/templates/invoices/list.html b/templates/invoices/list.html index e413e51..c26b28f 100644 --- a/templates/invoices/list.html +++ b/templates/invoices/list.html @@ -231,7 +231,7 @@ + data-confirm="{{ _('Are you sure you want to delete this invoice? This action cannot be undone.') }}"> @@ -406,6 +406,21 @@ {% endblock %} {% block scripts %} + + {% endblock %} diff --git a/templates/invoices/view.html b/templates/invoices/view.html index 7c391f8..4a774b1 100644 --- a/templates/invoices/view.html +++ b/templates/invoices/view.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Invoice {{ invoice.invoice_number }} - TimeTracker{% endblock %} +{% block title %}{{ _('Invoice') }} {{ invoice.invoice_number }} - TimeTracker{% endblock %} {% block content %}
@@ -11,48 +11,48 @@

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

{% set status_config = { - 'draft': {'color': 'secondary', 'icon': 'edit', 'bg': 'bg-secondary'}, - 'sent': {'color': 'info', 'icon': 'paper-plane', 'bg': 'bg-info'}, - 'paid': {'color': 'success', 'icon': 'check-circle', 'bg': 'bg-success'}, - 'overdue': {'color': 'danger', 'icon': 'exclamation-triangle', 'bg': 'bg-danger'}, - 'cancelled': {'color': 'dark', 'icon': 'times-circle', 'bg': 'bg-dark'} + '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) %} - {{ invoice.status|title }} + {{ config.label }}
- Edit + {{ _('Edit') }}
- Duplicate + {{ _('Duplicate') }} - Back + {{ _('Back') }}
@@ -66,7 +66,7 @@
- Bill To + {{ _('Bill To') }}
{{ invoice.client_name }}
@@ -88,29 +88,29 @@
- Invoice Details + {{ _('Invoice Details') }}
- Invoice #: + {{ _('Invoice #:') }} {{ invoice.invoice_number }}
- Project: + {{ _('Project:') }} {{ invoice.project.name }}
- Issue Date: + {{ _('Issue Date:') }} {{ invoice.issue_date.strftime('%B %d, %Y') }}
- Due Date: + {{ _('Due Date:') }} {{ invoice.due_date.strftime('%B %d, %Y') }} {% if invoice.is_overdue %} - {{ invoice.days_overdue }} days overdue + {{ invoice.days_overdue }} {{ _('days overdue') }} {% endif %} @@ -127,7 +127,7 @@
- Status & Actions + {{ _('Status & Actions') }}
@@ -136,7 +136,7 @@
- Generate from Time + {{ _('Generate from Time') }}
{% endif %} @@ -144,21 +144,21 @@
-
Created by
+
{{ _('Created by') }}
{{ invoice.creator.display_name }}
-
Created
+
{{ _('Created') }}
{{ invoice.created_at.strftime('%B %d, %Y') }}
-
Last Modified
+
{{ _('Last Modified') }}
{{ invoice.updated_at.strftime('%B %d, %Y') }}
@@ -176,7 +176,7 @@
-
Subtotal
+
{{ _('Subtotal') }}
{{ "%.2f"|format(invoice.subtotal) }} {{ currency }}
@@ -188,7 +188,7 @@
-
Tax ({{ "%.2f"|format(invoice.tax_rate) }}%)
+
{{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%)
{{ "%.2f"|format(invoice.tax_amount) }} {{ currency }}
@@ -200,7 +200,7 @@
-
Total Amount
+
{{ _('Total Amount') }}
{{ "%.2f"|format(invoice.total_amount) }} {{ currency }}
@@ -214,12 +214,12 @@
- Invoice Items - {{ invoice.items.count() }} items + {{ _('Invoice Items') }} + {{ invoice.items.count() }} {{ _('items') }}
{% if invoice.status == 'draft' %} - Edit Items + {{ _('Edit Items') }} {% endif %}
@@ -229,10 +229,10 @@
SelectDateUserTaskDurationNotes{{ _('Select') }}{{ _('Date') }}{{ _('User') }}{{ _('Task') }}{{ _('Duration') }}{{ _('Notes') }}
- - - - + + + + @@ -244,7 +244,7 @@ {% if item.time_entry_ids %}
- Generated from {{ item.time_entry_ids.split(',')|length }} time entries + {{ _('Generated from') }} {{ item.time_entry_ids.split(',')|length }} {{ _('time entries') }}
{% endif %} @@ -264,7 +264,7 @@
DescriptionQuantity (Hours)Unit PriceTotal Amount{{ _('Description') }}{{ _('Quantity (Hours)') }}{{ _('Unit Price') }}{{ _('Total Amount') }}
- Subtotal: + {{ _('Subtotal:') }} {{ "%.2f"|format(invoice.subtotal) }} {{ currency }} @@ -273,7 +273,7 @@ {% if invoice.tax_rate > 0 %}
- Tax ({{ "%.2f"|format(invoice.tax_rate) }}%): + {{ _('Tax') }} ({{ "%.2f"|format(invoice.tax_rate) }}%): {{ "%.2f"|format(invoice.tax_amount) }} {{ currency }} @@ -282,7 +282,7 @@ {% endif %}
- Total Amount: + {{ _('Total Amount:') }} {{ "%.2f"|format(invoice.total_amount) }} {{ currency }} @@ -295,11 +295,11 @@
-
No invoice items
-

Add items to this invoice to generate totals.

+
{{ _('No invoice items') }}
+

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

{% if invoice.status == 'draft' %} - Add Items + {{ _('Add Items') }} {% endif %}
@@ -317,14 +317,14 @@
- Additional Information + {{ _('Additional Information') }}
{% if invoice.notes %}
-
Notes
+
{{ _('Notes') }}
{{ invoice.notes|nl2br }}
@@ -332,7 +332,7 @@ {% endif %} {% if invoice.terms %}
-
Terms & Conditions
+
{{ _('Terms & Conditions') }}
{{ invoice.terms|nl2br }}
@@ -353,28 +353,28 @@
-
Change Invoice Status
+
{{ _('Change Invoice Status') }}
- +
- + + placeholder="{{ _('Add any notes about this status change...') }}">
- - + +
@@ -588,12 +588,12 @@ $(document).ready(function() { if (newStatus === currentStatus) { e.preventDefault(); - alert('The selected status is the same as the current status.'); + alert('{{ _('The selected status is the same as the current status.') }}'); return false; } if (newStatus === 'cancelled') { - if (!confirm('Are you sure you want to cancel this invoice? This action cannot be undone.')) { + if (!confirm('{{ _('Are you sure you want to cancel this invoice? This action cannot be undone.') }}')) { e.preventDefault(); return false; } diff --git a/templates/main/about.html b/templates/main/about.html index 1ca8566..57d4a07 100644 --- a/templates/main/about.html +++ b/templates/main/about.html @@ -14,9 +14,9 @@
{% if settings and settings.has_logo() %} - Company Logo + {{ _('Company Logo') }} {% else %} - DryTrix Logo + {{ _('DryTrix Logo') }} {% endif %}

{{ _('About TimeTracker') }}

@@ -50,34 +50,34 @@

- Key Features + {{ _('Key Features') }}
  • - Real-time timer tracking + {{ _('Real-time timer tracking') }}
  • - Project and client management + {{ _('Project and client management') }}
  • - Comprehensive reporting + {{ _('Comprehensive reporting') }}
  • - User role management + {{ _('User role management') }}
  • - Billable time tracking + {{ _('Billable time tracking') }}
  • - Data export capabilities + {{ _('Data export capabilities') }}
@@ -88,34 +88,34 @@
- Technology + {{ _('Technology') }}
  • - Python 3.11+ + {{ _('Python 3.11+') }}
  • - Flask web framework + {{ _('Flask web framework') }}
  • - SQLAlchemy ORM + {{ _('SQLAlchemy ORM') }}
  • - Bootstrap 5 UI + {{ _('Bootstrap 5 UI') }}
  • - WebSocket support + {{ _('WebSocket support') }}
  • - Docker deployment + {{ _('Docker deployment') }}
@@ -126,7 +126,7 @@
- About DryTrix + {{ _('About DryTrix') }}
@@ -145,9 +145,9 @@
{% if settings and settings.has_logo() %} - Company Logo + {{ _('Company Logo') }} {% else %} - DryTrix Logo + {{ _('DryTrix Logo') }} {% endif %}
@@ -157,19 +157,19 @@
- Security & Privacy + {{ _('Security & Privacy') }}

- {{ app_name }} is designed for internal use and prioritizes data security and privacy: + {{ _('%(app)s is designed for internal use and prioritizes data security and privacy:', app=app_name) }}

    -
  • Username-only authentication for simplicity
    • -
  • Role-based access control
    • -
  • Secure session management
    • -
  • Data stored locally on your infrastructure
    • -
  • No external data sharing or tracking
    • +
  • {{ _('Username-only authentication for simplicity') }}
    • +
  • {{ _('Role-based access control') }}
    • +
  • {{ _('Secure session management') }}
    • +
  • {{ _('Data stored locally on your infrastructure') }}
    • +
  • {{ _('No external data sharing or tracking') }}
@@ -177,34 +177,34 @@
- Getting Help + {{ _('Getting Help') }}

- Need help using {{ app_name }}? Here are some resources: + {{ _('Need help using %(app)s? Here are some resources:', app=app_name) }}

-
Documentation
+
{{ _('Documentation') }}

- Check the help section for detailed instructions on using all features. + {{ _('Check the help section for detailed instructions on using all features.') }}

- View Help + {{ _('View Help') }}
-
System Information
+
{{ _('System Information') }}

- View system status and configuration details. + {{ _('View system status and configuration details.') }}

{% if current_user.is_admin %} - System Info + {{ _('System Info') }} {% else %} - Admin access required + {{ _('Admin access required') }} {% endif %}
diff --git a/templates/main/help.html b/templates/main/help.html index 2cbe65c..fd943de 100644 --- a/templates/main/help.html +++ b/templates/main/help.html @@ -1,13 +1,13 @@ {% extends "base.html" %} -{% block title %}Help - {{ app_name }}{% endblock %} +{% block title %}{{ _('Help') }} - {{ app_name }}{% endblock %} {% block content %} {% from "_components.html" import page_header %}
- {{ page_header('fas fa-question-circle', 'Help', 'Documentation and guidance', None) }} + {{ page_header('fas fa-question-circle', _('Help'), _('Documentation and guidance'), None) }}
@@ -16,19 +16,19 @@
- Contents + {{ _('Contents') }}
@@ -37,22 +37,25 @@
{% if settings and settings.has_logo() %} - Company Logo + {{ _('Company Logo') }} {% else %} DryTrix Logo {% endif %} -

Help & Documentation

-

TimeTracker by DryTrix

+

{{ _('Help & Documentation') }}

+

{{ _('TimeTracker by') }} DryTrix

- Log Time + {{ _('Log Time') }} - View Reports + {{ _('View Reports') }} {% if current_user.is_admin %} - System Settings + {{ _('System Settings') }} + + + {{ _('Metrics Status') }} {% endif %}
@@ -60,24 +63,24 @@
-

Getting Started

+

{{ _('Getting Started') }}

-
First Time Setup
+
{{ _('First Time Setup') }}
    -
  1. Log in with your username (no password required)
    2. -
  2. If you're an admin, create projects for your team
    3. -
  3. Start tracking time on your first project
    4. +
  4. {{ _('Log in with your username (no password required)') }}
    5. +
  5. {{ _("If you're an admin, create projects for your team") }}
    6. +
  6. {{ _('Start tracking time on your first project') }}
-
Navigation
+
{{ _('Navigation') }}
    -
  • Dashboard: Overview of your current timer and recent activity
    • -
  • Timer: Start, stop, and manage time tracking (Log Time)
    • -
  • Projects: View and manage projects{% if current_user.is_admin %} (Open Projects){% endif %}
    • -
  • Reports: Generate time reports and export data (Open Reports)
    • +
  • {{ _('Dashboard') }}: {{ _('Overview of your current timer and recent activity') }}
    • +
  • {{ _('Timer') }}: {{ _('Start, stop, and manage time tracking') }} ({{ _('Log Time') }})
    • +
  • {{ _('Projects') }}: {{ _('View and manage projects') }}{% if current_user.is_admin %} ({{ _('Open Projects') }}){% endif %}
    • +
  • {{ _('Reports') }}: {{ _('Generate time reports and export data') }} ({{ _('Open Reports') }})
    • {% if current_user.is_admin %} -
  • Admin: Manage users and system settings
    • +
  • {{ _('Admin') }}: {{ _('Manage users and system settings') }}
    • {% endif %}
@@ -86,93 +89,93 @@
-

Using the Timer

+

{{ _('Using the Timer') }}

-
Starting a Timer
+
{{ _('Starting a Timer') }}
    -
  1. Go to the Timer page or use the "Start Timer" button on the dashboard
    2. -
  2. Select a project from the dropdown
    3. -
  3. Add optional notes about what you're working on
    4. -
  4. Add optional tags (separated by commas)
    5. -
  5. Click "Start Timer"
    6. +
  6. {{ _('Go to the Timer page or use the "Start Timer" button on the dashboard') }}
    7. +
  7. {{ _('Select a project from the dropdown') }}
    8. +
  8. {{ _('Add optional notes about what you\'re working on') }}
    9. +
  9. {{ _('Add optional tags (separated by commas)') }}
    10. +
  10. {{ _('Click "Start Timer"') }}
-
Active Timer
+
{{ _('Active Timer') }}
    -
  • The timer runs continuously until you stop it
    • -
  • You can see the current duration in real-time
    • -
  • The timer persists even if you close your browser
    • -
  • Only one timer can be active at a time per user
    • +
  • {{ _('The timer runs continuously until you stop it') }}
    • +
  • {{ _('You can see the current duration in real-time') }}
    • +
  • {{ _('The timer persists even if you close your browser') }}
    • +
  • {{ _('Only one timer can be active at a time per user') }}
-
Stopping a Timer
+
{{ _('Stopping a Timer') }}
    -
  • Click the "Stop Timer" button to end the current session
    • -
  • The time entry will be saved automatically
    • -
  • You can edit the entry later if needed
    • +
  • {{ _('Click the "Stop Timer" button to end the current session') }}
    • +
  • {{ _('The time entry will be saved automatically') }}
    • +
  • {{ _('You can edit the entry later if needed') }}
-
Manual Time Entries
-

You can also create time entries manually by specifying start and end times, useful for recording time spent away from the computer.

+
{{ _('Manual Time Entries') }}
+

{{ _('You can also create time entries manually by specifying start and end times, useful for recording time spent away from the computer.') }}

-

Managing Projects

+

{{ _('Managing Projects') }}

-
Project Structure
+
{{ _('Project Structure') }}
    -
  • Name: Descriptive project name
    • -
  • Client: Optional client name for organization
    • -
  • Description: Project details and scope
    • -
  • Billable: Whether time should be tracked for billing
    • -
  • Hourly Rate: Rate for billable time calculations
    • -
  • Status: Active or archived
    • +
  • {{ _('Name') }}: {{ _('Descriptive project name') }}
    • +
  • {{ _('Client') }}: {{ _('Optional client name for organization') }}
    • +
  • {{ _('Description') }}: {{ _('Project details and scope') }}
    • +
  • {{ _('Billable') }}: {{ _('Whether time should be tracked for billing') }}
    • +
  • {{ _('Hourly Rate') }}: {{ _('Rate for billable time calculations') }}
    • +
  • {{ _('Status') }}: {{ _('Active or archived') }}
{% if current_user.is_admin %} -
Admin Project Management
+
{{ _('Admin Project Management') }}
    -
  • Create new projects with the "New Project" button
    • -
  • Edit existing projects to update details
    • -
  • Archive projects to hide them from timers (data is preserved)
    • -
  • Delete projects (use with caution - this removes all associated time entries)
    • +
  • {{ _('Create new projects with the "New Project" button') }}
    • +
  • {{ _('Edit existing projects to update details') }}
    • +
  • {{ _('Archive projects to hide them from timers (data is preserved)') }}
    • +
  • {{ _('Delete projects (use with caution - this removes all associated time entries)') }}
{% endif %} -
Viewing Project Details
-

Click on any project to view detailed statistics, time entries, and user breakdowns.

+
{{ _('Viewing Project Details') }}
+

{{ _('Click on any project to view detailed statistics, time entries, and user breakdowns.') }}

-

Reports

+

{{ _('Reports') }}

-
Available Reports
+
{{ _('Available Reports') }}
    -
  • Project Report: Time breakdown by project with filtering options
    • -
  • User Report: Time tracking statistics by user
    • -
  • Summary Report: Overview of key metrics and trends
    • -
  • CSV Export: Export time entries for external analysis
    • +
  • {{ _('Project Report') }}: {{ _('Time breakdown by project with filtering options') }}
    • +
  • {{ _('User Report') }}: {{ _('Time tracking statistics by user') }}
    • +
  • {{ _('Summary Report') }}: {{ _('Overview of key metrics and trends') }}
    • +
  • {{ _('CSV Export') }}: {{ _('Export time entries for external analysis') }}
-
Filtering Options
+
{{ _('Filtering Options') }}
    -
  • Date Range: Filter by start and end dates
    • -
  • Project: Filter by specific project
    • -
  • User: Filter by specific user
    • -
  • Status: Filter by project status
    • +
  • {{ _('Date Range') }}: {{ _('Filter by start and end dates') }}
    • +
  • {{ _('Project') }}: {{ _('Filter by specific project') }}
    • +
  • {{ _('User') }}: {{ _('Filter by specific user') }}
    • +
  • {{ _('Status') }}: {{ _('Filter by project status') }}
-
Exporting Data
-

Use the CSV export feature to download time entries for external tools. Find it on the Reports page.

+
{{ _('Exporting Data') }}
+

{{ _('Use the CSV export feature to download time entries for external tools. Find it on the Reports page.') }}

@@ -180,31 +183,32 @@ {% if current_user.is_admin %}
-

Admin Features

+

{{ _('Admin Features') }}

-
User Management
+
{{ _('User Management') }}
    -
  • Create new users with username-only authentication
    • -
  • Assign user roles (user or admin)
    • -
  • Activate/deactivate user accounts
    • -
  • View user statistics and activity
    • +
  • {{ _('Create new users with username-only authentication') }}
    • +
  • {{ _('Assign user roles (user or admin)') }}
    • +
  • {{ _('Activate/deactivate user accounts') }}
    • +
  • {{ _('View user statistics and activity') }}
-
System Settings
+
{{ _('System Settings') }}
    -
  • Configure timezone and currency
    • -
  • Set time rounding rules
    • -
  • Enable/disable self-registration
    • -
  • Configure backup settings
    • +
  • {{ _('Configure timezone and currency') }}
    • +
  • {{ _('Set time rounding rules') }}
    • +
  • {{ _('Enable/disable self-registration') }}
    • +
  • {{ _('Configure backup settings') }}
-
System Maintenance
+
{{ _('System Maintenance') }}
    -
  • Create manual database backups
    • -
  • View system information and health
    • -
  • Monitor system statistics
    • -
  • Clean up old data
    • +
  • {{ _('Create manual database backups') }}
    • +
  • {{ _('View system information and health') }}
    • +
  • {{ _('Monitor system statistics and metrics') }}
    • +
  • {{ _('Review metrics server status and connectivity') }}
    • +
  • {{ _('Clean up old data') }}
@@ -213,19 +217,19 @@
-

Frequently Asked Questions

+

{{ _('Frequently Asked Questions') }}

- The timer will continue running until you stop it. You can see your active timer on the dashboard and timer page. The timer persists even if you close your browser. + {{ _('The timer will continue running until you stop it. You can see your active timer on the dashboard and timer page. The timer persists even if you close your browser.') }}
@@ -233,12 +237,12 @@

- Yes, you can edit any time entry by clicking the edit button. You can modify the project, start/end times, notes, tags, and billable status. + {{ _('Yes, you can edit any time entry by clicking the edit button. You can modify the project, start/end times, notes, tags, and billable status.') }}
@@ -246,12 +250,12 @@

- You can only have one active timer at a time. To switch projects, stop your current timer and start a new one for the different project. You can also create manual time entries for past work. + {{ _('You can only have one active timer at a time. To switch projects, stop your current timer and start a new one for the different project. You can also create manual time entries for past work.') }}
@@ -259,12 +263,12 @@

- Go to the Reports page and use the "Export CSV" feature. You can apply filters to export specific data, or export all time entries. The CSV file can be opened in Excel or other spreadsheet applications. + {{ _('Go to the Reports page and use the "Export CSV" feature. You can apply filters to export specific data, or export all time entries. The CSV file can be opened in Excel or other spreadsheet applications.') }}
diff --git a/templates/projects/create.html b/templates/projects/create.html index 65b26dd..af35eec 100644 --- a/templates/projects/create.html +++ b/templates/projects/create.html @@ -418,7 +418,7 @@ document.addEventListener('DOMContentLoaded', function() { // Show loading state const submitBtn = form.querySelector('button[type="submit"]'); const originalText = submitBtn.innerHTML; - submitBtn.innerHTML = 'Creating...'; + submitBtn.innerHTML = '{{ _('Creating...') }}'; submitBtn.disabled = true; // Re-enable after a delay (in case of validation errors) diff --git a/templates/projects/list.html b/templates/projects/list.html index 984884e..10bf23b 100644 --- a/templates/projects/list.html +++ b/templates/projects/list.html @@ -334,12 +334,30 @@ } + +