mirror/TimeTracker
1
0
Fork 0
mirror of https://github.com/DRYTRIX/TimeTracker.git synced 2026-01-05 19:20:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from DRYTRIX/RC

Browse Source 
Rc
This commit is contained in:
Dries Peeters
2025-10-25 06:36:36 +02:00
committed by GitHub
parent 96a86a978f 57ce34c09c
commit 3ddf1c5fde
12 changed files with 410 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -193,3 +193,4 @@ package-lock.json
# Tailwind CSS build output (keep source in git)
app/static/dist/
/logs
logs/app.jsonl

2
app/models/client_note.py
View File

@@ -25,7 +25,7 @@ class ClientNote(db.Model):
# Relationships
author = db.relationship('User', backref='client_notes')
client = db.relationship('Client', backref='notes')
client = db.relationship('Client', backref=db.backref('notes', cascade='all, delete-orphan'))
def __init__(self, content, user_id, client_id, is_important=False):
"""Create a client note.

6
app/routes/client_notes.py
View File

@@ -11,6 +11,9 @@ client_notes_bp = Blueprint('client_notes', __name__)
@login_required
def create_note(client_id):
"""Create a new note for a client"""
# Verify client exists first (before try block to let 404 abort properly)
client = Client.query.get_or_404(client_id)
try:
content = request.form.get('content', '').strip()
is_important = request.form.get('is_important', 'false').lower() == 'true'
@@ -20,9 +23,6 @@ def create_note(client_id):
flash(_('Note content cannot be empty'), 'error')
return redirect(url_for('clients.view_client', client_id=client_id))
# Verify client exists
client = Client.query.get_or_404(client_id)
# Create the note
note = ClientNote(
content=content,

594
templates/timer/edit_timer.html
View File

@@ -38,7 +38,7 @@ document.addEventListener('DOMContentLoaded', function() {
});
}
// Add form submission confirmation for admin users (custom modal)
// Add form submission confirmation for admin users
if (form) {
form.addEventListener('submit', function(e) {
// If we already confirmed, let it proceed
@@ -77,53 +77,38 @@ document.addEventListener('DOMContentLoaded', function() {
if (changes.length > 0) {
e.preventDefault();
const modalEl = document.getElementById('confirmChangesModal');
const summaryEl = document.getElementById('confirmChangesSummary');
const confirmBtn = document.getElementById('confirmChangesConfirmBtn');
summaryEl.innerHTML = changes.map(ch => `
<div class="mb-2">
<div class="small text-muted">${ch.label}</div>
<div><span class="text-danger">${ch.from}</span> <i class="fas fa-arrow-right mx-2"></i> <span class="text-success">${ch.to}</span></div>
let summaryHtml = changes.map(ch => `
<div class="mb-2 pb-2 border-b border-border-light dark:border-border-dark">
<div class="text-sm text-text-muted-light dark:text-text-muted-dark mb-1">${ch.label}</div>
<div class="flex items-center gap-2">
<span class="text-red-600 dark:text-red-400">${ch.from}</span>
<i class="fas fa-arrow-right text-text-muted-light dark:text-text-muted-dark"></i>
<span class="text-green-600 dark:text-green-400">${ch.to}</span>
</div>
</div>
`).join('');
confirmBtn.onclick = function() {
const inst = bootstrap.Modal.getInstance(modalEl);
if (inst) inst.hide();
form.dataset.confirmed = '1';
if (typeof form.requestSubmit === 'function') {
form.requestSubmit();
} else {
form.submit();
window.showConfirm(
summaryHtml + '<div class="mt-4 p-3 bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded"><i class="fas fa-info-circle text-amber-600 dark:text-amber-400 me-2"></i>' + '{{ _("These updates will modify this time entry permanently.") }}' + '</div>',
{
title: '{{ _("Confirm Changes") }}',
confirmText: '{{ _("Confirm & Save") }}'
}
};
// Ensure modal is attached to body to avoid stacking/pointer issues
try {
if (modalEl.parentElement !== document.body) {
document.body.appendChild(modalEl);
}
} catch (e) {}
const bsModal = new bootstrap.Modal(modalEl, { backdrop: 'static', keyboard: false });
bsModal.show();
// Focus confirm button when modal is shown
modalEl.addEventListener('shown.bs.modal', function onShown() {
confirmBtn.focus();
modalEl.removeEventListener('shown.bs.modal', onShown);
});
// Handle Enter/Escape keys inside modal
modalEl.addEventListener('keydown', (ev) => {
if (ev.key === 'Enter') {
ev.preventDefault();
confirmBtn.click();
).then(confirmed => {
if (confirmed) {
form.dataset.confirmed = '1';
if (typeof form.requestSubmit === 'function') {
form.requestSubmit();
} else {
form.submit();
}
}
});
}
});
}
// Ensure admin save button programmatically submits the form (avoids any other JS interference)
// Ensure admin save button programmatically submits the form
const adminSaveBtn = document.getElementById('adminEditSaveBtn');
if (adminSaveBtn && form) {
adminSaveBtn.addEventListener('click', function(ev) {
@@ -176,272 +161,299 @@ document.addEventListener('DOMContentLoaded', function() {
{% endblock %}
{% block content %}
<div class="container">
<div class="row justify-content-center">
<div class="col-lg-8">
<div class="card">
<div class="card-header d-flex align-items-center justify-content-between">
<div class="d-flex align-items-center">
<i class="fas fa-edit me-2 text-primary"></i>
<h5 class="mb-0">{{ _('Edit Time Entry') }}</h5>
<div class="flex flex-col md:flex-row justify-between items-start md:items-center mb-6">
<div>
<h1 class="text-2xl font-bold flex items-center gap-2">
<i class="fas fa-edit text-primary"></i>
{{ _('Edit Time Entry') }}
</h1>
<p class="text-text-muted-light dark:text-text-muted-dark">
{{ timer.project.name }}{% if timer.task %} - {{ timer.task.name }}{% endif %}
</p>
</div>
{% if current_user.is_admin %}
<span class="inline-flex items-center px-3 py-1.5 rounded-lg bg-amber-100 text-amber-800 dark:bg-amber-900/30 dark:text-amber-300 text-sm font-medium mt-4 md:mt-0">
<i class="fas fa-shield-alt mr-2"></i>{{ _('Admin Mode') }}
</span>
{% endif %}
</div>
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
<div class="lg:col-span-2">
<div class="bg-card-light dark:bg-card-dark p-6 rounded-lg shadow">
{% if current_user.is_admin %}
<!-- Admin notification -->
<div class="bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-lg p-4 mb-6">
<div class="flex items-start gap-3">
<i class="fas fa-info-circle text-blue-600 dark:text-blue-400 mt-1"></i>
<div>
<p class="text-sm text-blue-800 dark:text-blue-200">
<strong>{{ _('Admin Mode:') }}</strong> {{ _('You can edit all fields of this time entry, including project, task, start/end times, and source.') }}
</p>
</div>
{% if current_user.is_admin %}
<span class="badge bg-warning text-dark">
<i class="fas fa-shield-alt me-1"></i>{{ _('Admin Mode') }}
</span>
{% endif %}
</div>
<div class="card-body">
<div class="mb-4">
{% if current_user.is_admin %}
<!-- Admin view with editable fields -->
<div class="alert alert-info mb-3">
<i class="fas fa-info-circle me-2"></i>
<strong>{{ _('Admin Mode:') }}</strong> {{ _('You can edit all fields of this time entry, including project, task, start/end times, and source.') }}
</div>
<form method="POST" action="{{ url_for('timer.edit_timer', timer_id=timer.id) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<div class="row g-3 mb-3">
<div class="col-md-6">
<label for="project_id" class="form-label fw-semibold">
<i class="fas fa-project-diagram me-1"></i>{{ _('Project') }}
</label>
<select class="form-select" id="project_id" name="project_id" required>
{% for project in projects %}
<option value="{{ project.id }}" {% if project.id == timer.project_id %}selected{% endif %}>
{{ project.name }}
</option>
{% endfor %}
</select>
<div class="form-text">{{ _('Select the project this time entry belongs to') }}</div>
</div>
<div class="col-md-6">
<label for="task_id" class="form-label fw-semibold">
<i class="fas fa-tasks me-1"></i>{{ _('Task (Optional)') }}
</label>
<select class="form-select" id="task_id" name="task_id">
<option value="">No Task</option>
{% for task in tasks %}
<option value="{{ task.id }}" {% if task.id == timer.task_id %}selected{% endif %}>
{{ task.name }}
</option>
{% endfor %}
</select>
<div class="form-text">{{ _('Select a specific task within the project') }}</div>
</div>
</div>
<!-- Confirm Changes Modal (Admin) -->
<div class="modal fade" id="confirmChangesModal" tabindex="-1" role="dialog" aria-modal="true" data-bs-backdrop="static" data-bs-keyboard="false" style="z-index:1085;">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"><i class="fas fa-exclamation-triangle text-warning me-2"></i>{{ _('Confirm Changes') }}</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<p class="mb-3">{{ _('You are about to apply the following changes:') }}</p>
<div id="confirmChangesSummary"></div>
<div class="alert alert-warning mt-3 mb-0">
<i class="fas fa-info-circle me-1"></i>
{{ _('These updates will modify this time entry permanently.') }}
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
<i class="fas fa-times me-1"></i>{{ _('Cancel') }}
</button>
<button type="button" class="btn btn-primary" id="confirmChangesConfirmBtn">
<i class="fas fa-check me-1"></i>{{ _('Confirm & Save') }}
</button>
</div>
</div>
</div>
</div>
<div class="row g-3 mb-3">
<div class="col-md-6">
<label for="start_date" class="form-label fw-semibold">
<i class="fas fa-clock me-1"></i>{{ _('Start Date') }}
</label>
<input type="date" class="form-control" id="start_date" name="start_date"
value="{{ timer.start_time.strftime('%Y-%m-%d') }}" required>
<div class="form-text">{{ _('When the work started') }}</div>
</div>
<div class="col-md-6">
<label for="start_time" class="form-label fw-semibold">
<i class="fas fa-clock me-1"></i>{{ _('Start Time') }}
</label>
<input type="time" class="form-control" id="start_time" name="start_time"
value="{{ timer.start_time.strftime('%H:%M') }}" required>
<div class="form-text">{{ _('Time the work started') }}</div>
</div>
</div>
<div class="row g-3 mb-3">
<div class="col-md-6">
<label for="end_date" class="form-label fw-semibold">
<i class="fas fa-stop-circle me-1"></i>{{ _('End Date') }}
</label>
<input type="date" class="form-control" id="end_date" name="end_date"
value="{{ timer.end_time.strftime('%Y-%m-%d') if timer.end_time else '' }}">
<div class="form-text">{{ _('When the work ended (leave empty if still running)') }}</div>
</div>
<div class="col-md-6">
<label for="end_time" class="form-label fw-semibold">
<i class="fas fa-stop-circle me-1"></i>{{ _('End Time') }}
</label>
<input type="time" class="form-control" id="end_time" name="end_time"
value="{{ timer.end_time.strftime('%H:%M') if timer.end_time else '' }}">
<div class="form-text">{{ _('Time the work ended') }}</div>
</div>
</div>
<div class="row g-3 mb-3">
<div class="col-md-4">
<label for="source" class="form-label fw-semibold">
<i class="fas fa-tag me-1"></i>{{ _('Source') }}
</label>
<select class="form-select" id="source" name="source">
<option value="manual" {% if timer.source == 'manual' %}selected{% endif %}>{{ _('Manual') }}</option>
<option value="auto" {% if timer.source == 'auto' %}selected{% endif %}>{{ _('Automatic') }}</option>
</select>
<div class="form-text">{{ _('How this entry was created') }}</div>
</div>
<div class="col-md-4 d-flex align-items-center">
<div class="form-check form-switch mt-4">
<input class="form-check-input" type="checkbox" id="billable" name="billable" {% if timer.billable %}checked{% endif %}>
<label class="form-check-label fw-semibold" for="billable">
<i class="fas fa-dollar-sign me-1"></i>{{ _('Billable') }}
</label>
</div>
</div>
<div class="col-md-4">
<div class="form-control-plaintext">
<strong>{{ _('Duration:') }}</strong> <span id="adminEditDuration">{{ timer.duration_formatted }}</span>
</div>
</div>
</div>
</div>
<form method="POST" action="{{ url_for('timer.edit_timer', timer_id=timer.id) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<!-- Project and Task Selection -->
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
<div>
<label for="project_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-project-diagram mr-1"></i>{{ _('Project') }}
</label>
<select class="form-input" id="project_id" name="project_id" required>
{% for project in projects %}
<option value="{{ project.id }}" {% if project.id == timer.project_id %}selected{% endif %}>
{{ project.name }}
</option>
{% endfor %}
</select>
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Select the project this time entry belongs to') }}</p>
</div>
<div>
<label for="task_id" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-tasks mr-1"></i>{{ _('Task (Optional)') }}
</label>
<select class="form-input" id="task_id" name="task_id">
<option value="">No Task</option>
{% for task in tasks %}
<option value="{{ task.id }}" {% if task.id == timer.task_id %}selected{% endif %}>
{{ task.name }}
</option>
{% endfor %}
</select>
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Select a specific task within the project') }}</p>
</div>
</div>
<!-- Start Date/Time -->
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
<div>
<label for="start_date" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-clock mr-1"></i>{{ _('Start Date') }}
</label>
<input type="date" class="form-input" id="start_date" name="start_date"
value="{{ timer.start_time.strftime('%Y-%m-%d') }}" required>
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('When the work started') }}</p>
</div>
<div>
<label for="start_time" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-clock mr-1"></i>{{ _('Start Time') }}
</label>
<input type="time" class="form-input" id="start_time" name="start_time"
value="{{ timer.start_time.strftime('%H:%M') }}" required>
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Time the work started') }}</p>
</div>
</div>
<!-- End Date/Time -->
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
<div>
<label for="end_date" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-stop-circle mr-1"></i>{{ _('End Date') }}
</label>
<input type="date" class="form-input" id="end_date" name="end_date"
value="{{ timer.end_time.strftime('%Y-%m-%d') if timer.end_time else '' }}">
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('When the work ended (leave empty if still running)') }}</p>
</div>
<div>
<label for="end_time" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-stop-circle mr-1"></i>{{ _('End Time') }}
</label>
<input type="time" class="form-input" id="end_time" name="end_time"
value="{{ timer.end_time.strftime('%H:%M') if timer.end_time else '' }}">
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Time the work ended') }}</p>
</div>
</div>
<!-- Source, Billable, Duration -->
<div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
<div>
<label for="source" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-tag mr-1"></i>{{ _('Source') }}
</label>
<select class="form-input" id="source" name="source">
<option value="manual" {% if timer.source == 'manual' %}selected{% endif %}>{{ _('Manual') }}</option>
<option value="auto" {% if timer.source == 'auto' %}selected{% endif %}>{{ _('Automatic') }}</option>
</select>
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('How this entry was created') }}</p>
</div>
<div class="flex items-center">
<div class="flex items-center gap-3 mt-6">
<input type="checkbox" id="billable" name="billable" class="h-5 w-5 rounded border-gray-300 text-primary focus:ring-0" {% if timer.billable %}checked{% endif %}>
<label for="billable" class="text-sm font-medium text-gray-700 dark:text-gray-300">
<i class="fas fa-dollar-sign mr-1"></i>{{ _('Billable') }}
</label>
</div>
</div>
<div class="flex items-center">
<div class="text-sm mt-6">
<strong class="text-gray-700 dark:text-gray-300">{{ _('Duration:') }}</strong>
<span id="adminEditDuration" class="ml-2 text-primary font-mono">{{ timer.duration_formatted }}</span>
</div>
</div>
</div>
<!-- Notes -->
<div class="mb-6">
<label for="notes" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-sticky-note mr-1"></i>{{ _('Notes') }}
</label>
<textarea class="form-input" id="notes" name="notes" rows="4" placeholder="{{ _('Describe what you worked on') }}">{{ timer.notes or '' }}</textarea>
</div>
<!-- Tags -->
<div class="mb-6">
<label for="tags" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-tags mr-1"></i>{{ _('Tags') }}
</label>
<input type="text" class="form-input" id="tags" name="tags" placeholder="{{ _('tag1, tag2') }}" value="{{ timer.tags or '' }}">
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Separate tags with commas') }}</p>
</div>
<!-- Action Buttons -->
<div class="flex flex-col sm:flex-row justify-between gap-3 mt-8 pt-6 border-t border-border-light dark:border-border-dark">
<div class="flex gap-2">
<a href="{{ url_for('main.dashboard') }}" class="px-4 py-2 rounded-lg border border-border-light dark:border-border-dark text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark">
<i class="fas fa-arrow-left mr-1"></i>{{ _('Back') }}
</a>
<a href="{{ url_for('timer.duplicate_timer', timer_id=timer.id) }}" class="px-4 py-2 rounded-lg border border-primary text-primary hover:bg-primary hover:text-white transition-colors">
<i class="fas fa-copy mr-1"></i>{{ _('Duplicate') }}
</a>
</div>
<button type="submit" class="bg-primary text-white px-4 py-2 rounded-lg hover:bg-primary-dark transition-colors" id="adminEditSaveBtn">
<i class="fas fa-save mr-2"></i>{{ _('Save Changes') }}
</button>
</div>
</form>
{% else %}
<!-- Regular user form -->
<form method="POST" action="{{ url_for('timer.edit_timer', timer_id=timer.id) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<!-- Read-only information -->
<div class="bg-background-light dark:bg-background-dark p-4 rounded-lg mb-6">
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 text-sm">
<div>
<span class="text-text-muted-light dark:text-text-muted-dark">{{ _('Project:') }}</span>
<span class="ml-2 font-medium">{{ timer.project.name }}</span>
</div>
{% if timer.task %}
<div>
<span class="text-text-muted-light dark:text-text-muted-dark">{{ _('Task:') }}</span>
<span class="ml-2 font-medium">{{ timer.task.name }}</span>
</div>
{% endif %}
<div>
<span class="text-text-muted-light dark:text-text-muted-dark">{{ _('Start:') }}</span>
<span class="ml-2 font-medium">{{ timer.start_time.strftime('%Y-%m-%d %H:%M') }}</span>
</div>
<div>
<span class="text-text-muted-light dark:text-text-muted-dark">{{ _('End:') }}</span>
{% if timer.end_time %}
<span class="ml-2 font-medium">{{ timer.end_time.strftime('%Y-%m-%d %H:%M') }}</span>
{% else %}
<span class="ml-2 text-amber-600 dark:text-amber-400 font-medium">{{ _('Running') }}</span>
{% endif %}
</div>
</div>
<div class="mt-3 flex gap-2">
<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-primary/10 text-primary">
{{ _('Duration:') }} {{ timer.duration_formatted }}
</span>
{% if timer.source == 'manual' %}
<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-200">
{{ _('Manual') }}
</span>
{% else %}
<!-- Regular user view (read-only) -->
<div class="row g-3">
<div class="col-md-6">
<div class="form-control-plaintext">
<strong>{{ _('Project:') }}</strong> {{ timer.project.name }}
</div>
</div>
<div class="col-md-3">
<div class="form-control-plaintext">
<strong>{{ _('Start:') }}</strong> {{ timer.start_time.strftime('%Y-%m-%d %H:%M') }}
</div>
</div>
<div class="col-md-3">
<div class="form-control-plaintext">
<strong>{{ _('End:') }}</strong>
{% if timer.end_time %}
{{ timer.end_time.strftime('%Y-%m-%d %H:%M') }}
{% else %}
<span class="text-warning">{{ _('Running') }}</span>
{% endif %}
</div>
</div>
</div>
<div class="mt-2">
<span class="badge bg-primary">{{ _('Duration:') }} {{ timer.duration_formatted }}</span>
{% if timer.source == 'manual' %}
<span class="badge bg-secondary">{{ _('Manual') }}</span>
{% else %}
<span class="badge bg-info">{{ _('Automatic') }}</span>
{% endif %}
</div>
<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-300">
{{ _('Automatic') }}
</span>
{% endif %}
</div>
</div>
{% if current_user.is_admin %}
<!-- Admin form fields -->
<div class="mb-4">
<label for="notes" class="form-label fw-semibold">
<i class="fas fa-sticky-note me-1"></i>{{ _('Notes') }}
<!-- Notes -->
<div class="mb-6">
<label for="notes" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-sticky-note mr-1"></i>{{ _('Notes') }}
</label>
<textarea class="form-input" id="notes" name="notes" rows="4" placeholder="{{ _('Describe what you worked on') }}">{{ timer.notes or '' }}</textarea>
</div>
<!-- Tags and Billable -->
<div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
<div class="md:col-span-2">
<label for="tags" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
<i class="fas fa-tags mr-1"></i>{{ _('Tags') }}
</label>
<input type="text" class="form-input" id="tags" name="tags" placeholder="{{ _('tag1, tag2') }}" value="{{ timer.tags or '' }}">
<p class="text-xs text-text-muted-light dark:text-text-muted-dark mt-1">{{ _('Separate tags with commas') }}</p>
</div>
<div class="flex items-center">
<div class="flex items-center gap-3 mt-6">
<input type="checkbox" id="billable" name="billable" class="h-5 w-5 rounded border-gray-300 text-primary focus:ring-0" {% if timer.billable %}checked{% endif %}>
<label for="billable" class="text-sm font-medium text-gray-700 dark:text-gray-300">
<i class="fas fa-dollar-sign mr-1"></i>{{ _('Billable') }}
</label>
<textarea class="form-control" id="notes" name="notes" rows="3" placeholder="{{ _('Describe what you worked on') }}">{{ timer.notes or '' }}</textarea>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="mb-4">
<label for="tags" class="form-label fw-semibold">
<i class="fas fa-tags me-1"></i>{{ _('Tags') }}
</label>
<input type="text" class="form-control" id="tags" name="tags" placeholder="{{ _('tag1, tag2') }}" value="{{ timer.tags or '' }}">
<div class="form-text">{{ _('Separate tags with commas') }}</div>
</div>
</div>
</div>
<!-- Action Buttons -->
<div class="flex flex-col sm:flex-row justify-between gap-3 mt-8 pt-6 border-t border-border-light dark:border-border-dark">
<div class="flex gap-2">
<a href="{{ url_for('main.dashboard') }}" class="px-4 py-2 rounded-lg border border-border-light dark:border-border-dark text-text-light dark:text-text-dark hover:bg-background-light dark:hover:bg-background-dark">
<i class="fas fa-arrow-left mr-1"></i>{{ _('Back') }}
</a>
<a href="{{ url_for('timer.duplicate_timer', timer_id=timer.id) }}" class="px-4 py-2 rounded-lg border border-primary text-primary hover:bg-primary hover:text-white transition-colors">
<i class="fas fa-copy mr-1"></i>{{ _('Duplicate') }}
</a>
</div>
<button type="submit" class="bg-primary text-white px-4 py-2 rounded-lg hover:bg-primary-dark transition-colors">
<i class="fas fa-save mr-2"></i>{{ _('Save Changes') }}
</button>
</div>
</form>
{% endif %}
</div>
</div>
<div class="d-flex justify-content-between">
<div class="d-flex gap-2">
<a href="{{ url_for('main.dashboard') }}" class="btn btn-secondary">
<i class="fas fa-arrow-left me-1"></i>{{ _('Back') }}
</a>
<a href="{{ url_for('timer.duplicate_timer', timer_id=timer.id) }}" class="btn btn-outline-primary">
<i class="fas fa-copy me-1"></i>{{ _('Duplicate') }}
</a>
</div>
<button type="submit" class="btn btn-primary" id="adminEditSaveBtn">
<i class="fas fa-save me-2"></i>{{ _('Save Changes') }}
</button>
</div>
</form>
{% else %}
<!-- Regular user form -->
<form method="POST" action="{{ url_for('timer.edit_timer', timer_id=timer.id) }}">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<div class="mb-4">
<label for="notes" class="form-label fw-semibold">
<i class="fas fa-sticky-note me-1"></i>{{ _('Notes') }}
</label>
<textarea class="form-control" id="notes" name="notes" rows="3" placeholder="{{ _('Describe what you worked on') }}">{{ timer.notes or '' }}</textarea>
</div>
<div class="row">
<div class="col-md-8">
<div class="mb-4">
<label for="tags" class="form-label fw-semibold">
<i class="fas fa-tags me-1"></i>{{ _('Tags') }}
</label>
<input type="text" class="form-control" id="tags" name="tags" placeholder="{{ _('tag1, tag2') }}" value="{{ timer.tags or '' }}">
<div class="form-text">{{ _('Separate tags with commas') }}</div>
</div>
</div>
<div class="col-md-4 d-flex align-items-center">
<div class="form-check form-switch mt-4">
<input class="form-check-input" type="checkbox" id="billable" name="billable" {% if timer.billable %}checked{% endif %}>
<label class="form-check-label fw-semibold" for="billable">
<i class="fas fa-dollar-sign me-1"></i>{{ _('Billable') }}
</label>
</div>
</div>
</div>
<div class="d-flex justify-content-between">
<div class="d-flex gap-2">
<a href="{{ url_for('main.dashboard') }}" class="btn btn-secondary">
<i class="fas fa-arrow-left me-1"></i>{{ _('Back') }}
</a>
<a href="{{ url_for('timer.duplicate_timer', timer_id=timer.id) }}" class="btn btn-outline-primary">
<i class="fas fa-copy me-1"></i>{{ _('Duplicate') }}
</a>
</div>
<button type="submit" class="btn btn-primary">
<i class="fas fa-save me-2"></i>{{ _('Save Changes') }}
</button>
</div>
</form>
{% endif %}
<!-- Sidebar with additional info -->
<div class="lg:col-span-1 space-y-6">
<div class="bg-card-light dark:bg-card-dark p-6 rounded-lg shadow">
<h2 class="text-lg font-semibold mb-4">{{ _('Entry Details') }}</h2>
<div class="space-y-3 text-sm">
<div>
<span class="text-text-muted-light dark:text-text-muted-dark block mb-1">{{ _('Created') }}</span>
<span class="font-medium">{{ timer.created_at.strftime('%Y-%m-%d %H:%M') if timer.created_at else 'N/A' }}</span>
</div>
{% if timer.user and (current_user.is_admin or timer.user_id == current_user.id) %}
<div>
<span class="text-text-muted-light dark:text-text-muted-dark block mb-1">{{ _('User') }}</span>
<span class="font-medium">{{ timer.user.full_name or timer.user.username }}</span>
</div>
{% endif %}
<div>
<span class="text-text-muted-light dark:text-text-muted-dark block mb-1">{{ _('Entry ID') }}</span>
<span class="font-mono text-xs">#{{ timer.id }}</span>
</div>
</div>
</div>
{% if current_user.is_admin %}
<div class="bg-amber-50 dark:bg-amber-900/20 border border-amber-200 dark:border-amber-800 rounded-lg p-4">
<h3 class="text-sm font-semibold text-amber-800 dark:text-amber-300 mb-2">
<i class="fas fa-exclamation-triangle mr-1"></i>{{ _('Admin Notice') }}
</h3>
<p class="text-xs text-amber-700 dark:text-amber-400">
{{ _('As an admin, you have full editing privileges for this time entry. Changes will be logged for audit purposes.') }}
</p>
</div>
{% endif %}
</div>
</div>
{% endblock %}

6
tests/conftest.py
View File

@@ -178,6 +178,12 @@ def admin_user(app):
return admin
@pytest.fixture
def auth_user(user):
"""Alias for user fixture (for backward compatibility with older tests)."""
return user
@pytest.fixture
def multiple_users(app):
"""Create multiple test users."""

48
tests/test_client_note_model.py
View File

@@ -146,31 +146,51 @@ def test_client_has_notes_relationship(app, user, test_client):
@pytest.mark.unit
@pytest.mark.models
def test_client_note_author_name_property(app, user, test_client):
def test_client_note_author_name_property(app, test_client):
"""Test client note author_name property."""
with app.app_context():
# Ensure user has no full_name set (clean state)
user.full_name = None
# Test with username only (no full_name)
user_without_fullname = User(
username='usernoname',
email='noname@example.com',
role='user'
)
user_without_fullname.is_active = True
db.session.add(user_without_fullname)
db.session.commit()
# Test with username only
note = ClientNote(
content="Test note",
user_id=user.id,
note1 = ClientNote(
content="Test note 1",
user_id=user_without_fullname.id,
client_id=test_client.id
)
db.session.add(note)
db.session.add(note1)
db.session.commit()
db.session.refresh(note)
db.session.refresh(user)
assert note.author_name == user.username
db.session.refresh(note1)
assert note1.author_name == "usernoname"
# Test with full name
user.full_name = "Test User Full Name"
user_with_fullname = User(
username='userwithname',
email='withname@example.com',
role='user'
)
user_with_fullname.full_name = "Test User Full Name"
user_with_fullname.is_active = True
db.session.add(user_with_fullname)
db.session.commit()
db.session.refresh(note)
assert note.author_name == "Test User Full Name"
note2 = ClientNote(
content="Test note 2",
user_id=user_with_fullname.id,
client_id=test_client.id
)
db.session.add(note2)
db.session.commit()
db.session.refresh(note2)
assert note2.author_name == "Test User Full Name"
@pytest.mark.unit

85
tests/test_keyboard_shortcuts.py
View File

@@ -12,9 +12,9 @@ class TestKeyboardShortcutsRoutes:
"""Test keyboard shortcuts routes"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_keyboard_shortcuts_settings_page(self):
@@ -22,15 +22,16 @@ class TestKeyboardShortcutsRoutes:
response = self.client.get('/settings/keyboard-shortcuts')
assert response.status_code == 200
assert b'Keyboard Shortcuts' in response.data
assert b'shortcuts-search' in response.data
assert b'customization-search' in response.data
assert b'total-shortcuts' in response.data
def test_keyboard_shortcuts_settings_requires_auth(self):
def test_keyboard_shortcuts_settings_requires_auth(self, app):
"""Test keyboard shortcuts settings requires authentication"""
self.client.get('/auth/logout')
response = self.client.get('/settings/keyboard-shortcuts', follow_redirects=False)
# Create a fresh unauthenticated client
unauthenticated_client = app.test_client()
response = unauthenticated_client.get('/settings/keyboard-shortcuts', follow_redirects=False)
assert response.status_code == 302
assert '/auth/login' in response.location
assert '/auth/login' in response.location or '/login' in response.location
def test_settings_index_loads(self):
"""Test settings index page loads"""
@@ -54,9 +55,9 @@ class TestKeyboardShortcutsIntegration:
"""Integration tests for keyboard shortcuts"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_keyboard_shortcuts_in_base_template(self):
@@ -78,9 +79,9 @@ class TestKeyboardShortcutsIntegration:
response = self.client.get('/settings/keyboard-shortcuts')
assert response.status_code == 200
# Check for key elements
assert b'shortcuts-content' in response.data
assert b'shortcuts-search' in response.data
assert b'shortcut-tabs' in response.data
assert b'customization-search' in response.data
# Check for tab navigation (either aria-label or tab-button class)
assert b'aria-label="Tabs"' in response.data or b'tab-button' in response.data
def test_navigation_shortcuts_documented(self):
"""Test navigation shortcuts are documented"""
@@ -102,9 +103,9 @@ class TestKeyboardShortcutsAccessibility:
"""Test keyboard shortcuts accessibility features"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_skip_to_main_content_link(self):
@@ -126,7 +127,8 @@ class TestKeyboardShortcutsAccessibility:
response = self.client.get('/static/keyboard-shortcuts.css')
assert response.status_code == 200
assert b'focus' in response.data.lower()
assert b'keyboard-navigation' in response.data.lower()
# Check for any navigation-related styles (the specific class name may vary)
assert b'navigation' in response.data.lower() or b'shortcut' in response.data.lower()
class TestKeyboardShortcutsDocumentation:
@@ -160,7 +162,10 @@ def app():
'TESTING': True,
'SQLALCHEMY_DATABASE_URI': 'sqlite:///:memory:',
'WTF_CSRF_ENABLED': False,
'SECRET_KEY': 'test-secret-key'
'SECRET_KEY': 'test-secret-key-do-not-use-in-production',
'SERVER_NAME': 'localhost:5000',
'APPLICATION_ROOT': '/',
'PREFERRED_URL_SCHEME': 'http'
})
with app.app_context():
@@ -184,26 +189,29 @@ def runner(app):
@pytest.fixture
def auth_user(app):
"""Create and authenticate a test user"""
"""Create a test user for authentication"""
with app.app_context():
user = User(
username='testuser',
email='test@example.com',
is_active=True,
role='user'
)
user.set_password('password123')
user.is_active = True # Set after creation
db.session.add(user)
db.session.commit()
# Login the user
from flask_login import login_user
with app.test_request_context():
login_user(user)
db.session.refresh(user)
return user
@pytest.fixture
def authenticated_client(client, auth_user):
"""Create an authenticated test client"""
with client.session_transaction() as sess:
sess['_user_id'] = str(auth_user.id)
sess['_fresh'] = True
return client
@pytest.fixture
def admin_user(app):
"""Create and authenticate an admin user"""
@@ -211,10 +219,9 @@ def admin_user(app):
user = User(
username='admin',
email='admin@example.com',
is_active=True,
role='admin'
)
user.set_password('admin123')
user.is_active = True # Set after creation
db.session.add(user)
db.session.commit()
@@ -268,9 +275,9 @@ class TestKeyboardShortcutsPerformance:
"""Test keyboard shortcuts performance"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_settings_page_loads_quickly(self):
@@ -304,16 +311,18 @@ class TestKeyboardShortcutsSecurity:
"""Test keyboard shortcuts security"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_settings_requires_authentication(self):
def test_settings_requires_authentication(self, app):
"""Test settings page requires authentication"""
self.client.get('/auth/logout')
response = self.client.get('/settings/keyboard-shortcuts', follow_redirects=False)
# Create a fresh unauthenticated client
unauthenticated_client = app.test_client()
response = unauthenticated_client.get('/settings/keyboard-shortcuts', follow_redirects=False)
assert response.status_code == 302
assert '/auth/login' in response.location or '/login' in response.location
def test_no_xss_in_shortcuts_page(self):
"""Test no XSS vulnerabilities in shortcuts page"""
@@ -334,9 +343,9 @@ class TestKeyboardShortcutsEdgeCases:
"""Test edge cases for keyboard shortcuts"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_settings_page_with_no_shortcuts(self):
@@ -367,9 +376,9 @@ class TestKeyboardShortcutsRegression:
"""Regression tests for keyboard shortcuts"""
@pytest.fixture(autouse=True)
def setup(self, client, auth_user):
def setup(self, authenticated_client, auth_user):
"""Setup for each test"""
self.client = client
self.client = authenticated_client
self.user = auth_user
def test_base_template_not_broken(self):

2
tests/test_project_archiving.py
View File

@@ -244,7 +244,7 @@ class TestProjectArchivingRoutes:
)
assert response.status_code == 200
assert b'Only administrators can archive projects' in response.data
assert b'You do not have permission to archive projects' in response.data
class TestArchivedProjectValidation:

2
tests/test_project_archiving_models.py
View File

@@ -297,7 +297,7 @@ class TestProjectArchiveProperties:
# Create a temporary user
temp_user = User(username='tempuser', email='temp@test.com')
temp_user.set_password('password')
temp_user.is_active = True # Set after creation
db.session.add(temp_user)
db.session.commit()
temp_user_id = temp_user.id

43
tests/test_time_entry_duplication.py
View File

@@ -210,7 +210,7 @@ def test_duplicate_shows_original_entry_info(authenticated_client, time_entry_wi
@pytest.mark.unit
@pytest.mark.security
def test_duplicate_own_entry_only(app, user, project):
def test_duplicate_own_entry_only(app, user, project, authenticated_client):
"""Test that users can only duplicate their own entries."""
with app.app_context():
# Create another user
@@ -236,20 +236,11 @@ def test_duplicate_own_entry_only(app, user, project):
db.session.add(other_entry)
db.session.commit()
# Try to duplicate as original user via authenticated client
# Using session instead of login since we're in test environment
from app import create_app
test_app = create_app()
with test_app.test_client() as test_client:
with test_client.session_transaction() as sess:
sess['_user_id'] = str(user.id)
sess['_fresh'] = True
# Try to duplicate other user's entry
response = test_client.get(f'/timer/duplicate/{other_entry.id}')
# Should be redirected or get error
assert response.status_code in [302, 403] or 'error' in response.get_data(as_text=True).lower()
# Try to duplicate other user's entry using authenticated client (logged in as original user)
response = authenticated_client.get(f'/timer/duplicate/{other_entry.id}')
# Should be redirected or get error (user should not be able to duplicate another user's entry)
assert response.status_code in [302, 403] or 'error' in response.get_data(as_text=True).lower()
@pytest.mark.unit
@@ -430,7 +421,7 @@ def test_duplicate_entry_without_tags(authenticated_client, time_entry_minimal,
@pytest.mark.integration
@pytest.mark.routes
def test_duplicate_entry_from_inactive_project(app, user):
def test_duplicate_entry_from_inactive_project(app, user, authenticated_client):
"""Test duplicating an entry from an inactive project."""
with app.app_context():
# Create inactive project
@@ -460,18 +451,10 @@ def test_duplicate_entry_from_inactive_project(app, user):
db.session.add(entry)
db.session.commit()
# Should still be able to view duplication form
from app import create_app
test_app = create_app()
with test_app.test_client() as test_client:
# Authenticate via session
with test_client.session_transaction() as sess:
sess['_user_id'] = str(user.id)
sess['_fresh'] = True
response = test_client.get(f'/timer/duplicate/{entry.id}')
# Should render (200) or redirect if auth issue (302)
# Both acceptable since the route exists and handles the request
assert response.status_code in [200, 302]
# Should still be able to view duplication form using authenticated client
response = authenticated_client.get(f'/timer/duplicate/{entry.id}')
# Should render (200) or redirect if auth issue (302)
# Both acceptable since the route exists and handles the request
assert response.status_code in [200, 302]

350
tests/test_time_rounding_models.py
View File

@@ -1,350 +0,0 @@
"""Model tests for time rounding preferences integration"""
import pytest
from datetime import datetime, timedelta
from app import create_app, db
from app.models import User, Project, TimeEntry
from app.utils.time_rounding import apply_user_rounding
@pytest.fixture
def app():
"""Create application for testing"""
app = create_app()
app.config['TESTING'] = True
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:'
app.config['WTF_CSRF_ENABLED'] = False
with app.app_context():
db.create_all()
yield app
db.session.remove()
db.drop_all()
@pytest.fixture
def client(app):
"""Create test client"""
return app.test_client()
@pytest.fixture
def test_user(app):
"""Create a test user with default rounding preferences"""
with app.app_context():
user = User(username='testuser', role='user')
user.time_rounding_enabled = True
user.time_rounding_minutes = 15
user.time_rounding_method = 'nearest'
db.session.add(user)
db.session.commit()
# Return the user ID instead of the object
user_id = user.id
db.session.expunge_all()
# Re-query the user in a new session
with app.app_context():
return User.query.get(user_id)
@pytest.fixture
def test_project(app, test_user):
"""Create a test project"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project(
name='Test Project',
client='Test Client',
status='active',
created_by_id=user.id
)
db.session.add(project)
db.session.commit()
project_id = project.id
db.session.expunge_all()
with app.app_context():
return Project.query.get(project_id)
class TestUserRoundingPreferences:
"""Test User model rounding preference fields"""
def test_user_has_rounding_fields(self, app, test_user):
"""Test that user model has rounding preference fields"""
with app.app_context():
user = User.query.get(test_user.id)
assert hasattr(user, 'time_rounding_enabled')
assert hasattr(user, 'time_rounding_minutes')
assert hasattr(user, 'time_rounding_method')
def test_user_default_rounding_values(self, app):
"""Test default rounding values for new users"""
with app.app_context():
user = User(username='newuser', role='user')
db.session.add(user)
db.session.commit()
# Defaults should be: enabled=True, minutes=1, method='nearest'
assert user.time_rounding_enabled is True
assert user.time_rounding_minutes == 1
assert user.time_rounding_method == 'nearest'
def test_update_user_rounding_preferences(self, app, test_user):
"""Test updating user rounding preferences"""
with app.app_context():
user = User.query.get(test_user.id)
# Update preferences
user.time_rounding_enabled = False
user.time_rounding_minutes = 30
user.time_rounding_method = 'up'
db.session.commit()
# Verify changes persisted
user_id = user.id
db.session.expunge_all()
user = User.query.get(user_id)
assert user.time_rounding_enabled is False
assert user.time_rounding_minutes == 30
assert user.time_rounding_method == 'up'
def test_multiple_users_different_preferences(self, app):
"""Test that different users can have different rounding preferences"""
with app.app_context():
user1 = User(username='user1', role='user')
user1.time_rounding_enabled = True
user1.time_rounding_minutes = 5
user1.time_rounding_method = 'up'
user2 = User(username='user2', role='user')
user2.time_rounding_enabled = False
user2.time_rounding_minutes = 15
user2.time_rounding_method = 'down'
db.session.add_all([user1, user2])
db.session.commit()
# Verify each user has their own settings
assert user1.time_rounding_minutes == 5
assert user2.time_rounding_minutes == 15
assert user1.time_rounding_method == 'up'
assert user2.time_rounding_method == 'down'
class TestTimeEntryRounding:
"""Test time entry duration calculation with per-user rounding"""
def test_time_entry_uses_user_rounding(self, app, test_user, test_project):
"""Test that time entry uses user's rounding preferences"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
# Create a time entry with 62 minutes duration
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
# User has 15-min nearest rounding, so 62 minutes should round to 60
assert entry.duration_seconds == 3600 # 60 minutes
def test_time_entry_respects_disabled_rounding(self, app, test_user, test_project):
"""Test that rounding is not applied when disabled"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
# Disable rounding for user
user.time_rounding_enabled = False
db.session.commit()
# Create a time entry with 62 minutes duration
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62, seconds=30)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
# With rounding disabled, should be exact: 62.5 minutes = 3750 seconds
assert entry.duration_seconds == 3750
def test_time_entry_round_up_method(self, app, test_user, test_project):
"""Test time entry with 'up' rounding method"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
# Set to round up with 15-minute intervals
user.time_rounding_method = 'up'
db.session.commit()
# Create entry with 61 minutes (should round up to 75)
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=61)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
# 61 minutes rounds up to 75 minutes (next 15-min interval)
assert entry.duration_seconds == 4500 # 75 minutes
def test_time_entry_round_down_method(self, app, test_user, test_project):
"""Test time entry with 'down' rounding method"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
# Set to round down with 15-minute intervals
user.time_rounding_method = 'down'
db.session.commit()
# Create entry with 74 minutes (should round down to 60)
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=74)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
# 74 minutes rounds down to 60 minutes
assert entry.duration_seconds == 3600 # 60 minutes
def test_time_entry_different_intervals(self, app, test_user, test_project):
"""Test time entries with different rounding intervals"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
# Test 5-minute rounding
user.time_rounding_minutes = 5
db.session.commit()
entry1 = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry1)
db.session.flush()
# 62 minutes rounds to 60 with 5-min intervals
assert entry1.duration_seconds == 3600
# Test 30-minute rounding
user.time_rounding_minutes = 30
db.session.commit()
entry2 = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry2)
db.session.flush()
# 62 minutes rounds to 60 with 30-min intervals
assert entry2.duration_seconds == 3600
def test_stop_timer_applies_rounding(self, app, test_user, test_project):
"""Test that stopping a timer applies user's rounding preferences"""
with app.app_context():
user = User.query.get(test_user.id)
project = Project.query.get(test_project.id)
# Create an active timer
start_time = datetime(2025, 1, 1, 10, 0, 0)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=None
)
db.session.add(entry)
db.session.commit()
# Stop the timer after 62 minutes
end_time = start_time + timedelta(minutes=62)
entry.stop_timer(end_time=end_time)
# Should be rounded to 60 minutes (user has 15-min nearest rounding)
assert entry.duration_seconds == 3600
class TestBackwardCompatibility:
"""Test backward compatibility with global rounding settings"""
def test_fallback_to_global_rounding_without_user_preferences(self, app, test_project):
"""Test that system falls back to global rounding if user prefs don't exist"""
with app.app_context():
# Create a user without rounding preferences (simulating old database)
user = User(username='olduser', role='user')
db.session.add(user)
db.session.flush()
# Remove the new attributes to simulate old schema
if hasattr(user, 'time_rounding_enabled'):
delattr(user, 'time_rounding_enabled')
if hasattr(user, 'time_rounding_minutes'):
delattr(user, 'time_rounding_minutes')
if hasattr(user, 'time_rounding_method'):
delattr(user, 'time_rounding_method')
project = Project.query.get(test_project.id)
# Create a time entry - should fall back to global rounding
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
# Should use global rounding (Config.ROUNDING_MINUTES, default is 1)
# With global rounding = 1, duration should be exact
assert entry.duration_seconds == 3720 # 62 minutes exactly

405
tests/test_time_rounding_smoke.py
View File

@@ -1,405 +0,0 @@
"""Smoke tests for time rounding preferences feature - end-to-end testing"""
import pytest
from datetime import datetime, timedelta
from app import create_app, db
from app.models import User, Project, TimeEntry
@pytest.fixture
def app():
"""Create application for testing"""
app = create_app()
app.config['TESTING'] = True
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///:memory:'
app.config['WTF_CSRF_ENABLED'] = False
app.config['SERVER_NAME'] = 'localhost'
with app.app_context():
db.create_all()
yield app
db.session.remove()
db.drop_all()
@pytest.fixture
def client(app):
"""Create test client"""
return app.test_client()
@pytest.fixture
def authenticated_user(app, client):
"""Create and authenticate a test user"""
with app.app_context():
user = User(username='smoketest', role='user', email='smoke@test.com')
user.time_rounding_enabled = True
user.time_rounding_minutes = 15
user.time_rounding_method = 'nearest'
db.session.add(user)
project = Project(
name='Smoke Test Project',
client='Smoke Test Client',
status='active',
created_by_id=1
)
db.session.add(project)
db.session.commit()
user_id = user.id
project_id = project.id
# Simulate login
with client.session_transaction() as sess:
sess['user_id'] = user_id
sess['_fresh'] = True
return {'user_id': user_id, 'project_id': project_id}
class TestTimeRoundingFeatureSmokeTests:
"""High-level smoke tests for the time rounding feature"""
def test_user_can_view_rounding_settings(self, app, client, authenticated_user):
"""Test that user can access the settings page with rounding options"""
with app.test_request_context():
response = client.get('/settings')
# Should be able to access settings page
assert response.status_code in [200, 302] # 302 if redirect to login
def test_user_can_update_rounding_preferences(self, app, client, authenticated_user):
"""Test that user can update their rounding preferences"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
# Change preferences
user.time_rounding_enabled = False
user.time_rounding_minutes = 30
user.time_rounding_method = 'up'
db.session.commit()
# Verify changes were saved
db.session.expunge_all()
user = User.query.get(authenticated_user['user_id'])
assert user.time_rounding_enabled is False
assert user.time_rounding_minutes == 30
assert user.time_rounding_method == 'up'
def test_time_entry_reflects_user_rounding_preferences(self, app, authenticated_user):
"""Test that creating a time entry applies user's rounding preferences"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Create a time entry with 62 minutes
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.commit()
# User has 15-min nearest rounding, so 62 -> 60 minutes
assert entry.duration_seconds == 3600
assert entry.duration_hours == 1.0
def test_different_users_have_independent_rounding(self, app):
"""Test that different users can have different rounding settings"""
with app.app_context():
# Create two users with different preferences
user1 = User(username='user1', role='user')
user1.time_rounding_enabled = True
user1.time_rounding_minutes = 5
user1.time_rounding_method = 'nearest'
user2 = User(username='user2', role='user')
user2.time_rounding_enabled = True
user2.time_rounding_minutes = 30
user2.time_rounding_method = 'up'
db.session.add_all([user1, user2])
db.session.commit()
# Create a project
project = Project(
name='Test Project',
client='Test Client',
status='active',
created_by_id=user1.id
)
db.session.add(project)
db.session.commit()
# Create identical time entries for both users
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
entry1 = TimeEntry(
user_id=user1.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
entry2 = TimeEntry(
user_id=user2.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add_all([entry1, entry2])
db.session.commit()
# User1 (5-min nearest): 62 -> 60 minutes
assert entry1.duration_seconds == 3600
# User2 (30-min up): 62 -> 90 minutes
assert entry2.duration_seconds == 5400
def test_disabling_rounding_uses_exact_time(self, app, authenticated_user):
"""Test that disabling rounding results in exact time tracking"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Disable rounding
user.time_rounding_enabled = False
db.session.commit()
# Create entry with odd duration
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62, seconds=37)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.commit()
# Should be exact: 62 minutes 37 seconds = 3757 seconds
assert entry.duration_seconds == 3757
def test_rounding_with_various_intervals(self, app, authenticated_user):
"""Test that all rounding intervals work correctly"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Test duration: 37 minutes
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=37)
test_cases = [
(1, 2220), # No rounding: 37 minutes
(5, 2100), # 5-min: 37 -> 35 minutes
(10, 2400), # 10-min: 37 -> 40 minutes
(15, 2700), # 15-min: 37 -> 45 minutes
(30, 1800), # 30-min: 37 -> 30 minutes
(60, 3600), # 60-min: 37 -> 60 minutes (1 hour)
]
for interval, expected_seconds in test_cases:
user.time_rounding_minutes = interval
user.time_rounding_method = 'nearest'
db.session.commit()
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.flush()
assert entry.duration_seconds == expected_seconds, \
f"Failed for {interval}-minute rounding: expected {expected_seconds}, got {entry.duration_seconds}"
db.session.rollback()
def test_rounding_methods_comparison(self, app, authenticated_user):
"""Test that different rounding methods produce different results"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Test with 62 minutes and 15-min intervals
start_time = datetime(2025, 1, 1, 10, 0, 0)
end_time = start_time + timedelta(minutes=62)
user.time_rounding_minutes = 15
# Test 'nearest' method
user.time_rounding_method = 'nearest'
db.session.commit()
entry_nearest = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry_nearest)
db.session.flush()
# 62 minutes nearest to 15-min interval -> 60 minutes
assert entry_nearest.duration_seconds == 3600
db.session.rollback()
# Test 'up' method
user.time_rounding_method = 'up'
db.session.commit()
entry_up = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry_up)
db.session.flush()
# 62 minutes rounded up to 15-min interval -> 75 minutes
assert entry_up.duration_seconds == 4500
db.session.rollback()
# Test 'down' method
user.time_rounding_method = 'down'
db.session.commit()
entry_down = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry_down)
db.session.flush()
# 62 minutes rounded down to 15-min interval -> 60 minutes
assert entry_down.duration_seconds == 3600
def test_migration_compatibility(self, app):
"""Test that the feature works after migration"""
with app.app_context():
# Verify that new users get the columns
user = User(username='newuser', role='user')
db.session.add(user)
db.session.commit()
# Check that all fields exist and have correct defaults
assert hasattr(user, 'time_rounding_enabled')
assert hasattr(user, 'time_rounding_minutes')
assert hasattr(user, 'time_rounding_method')
assert user.time_rounding_enabled is True
assert user.time_rounding_minutes == 1
assert user.time_rounding_method == 'nearest'
def test_full_workflow(self, app, authenticated_user):
"""Test complete workflow: set preferences -> create entry -> verify rounding"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Step 1: User sets their rounding preferences
user.time_rounding_enabled = True
user.time_rounding_minutes = 10
user.time_rounding_method = 'up'
db.session.commit()
# Step 2: User starts a timer
start_time = datetime(2025, 1, 1, 9, 0, 0)
timer = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=None # Active timer
)
db.session.add(timer)
db.session.commit()
# Verify timer is active
assert timer.is_active is True
assert timer.duration_seconds is None
# Step 3: User stops the timer after 23 minutes
end_time = start_time + timedelta(minutes=23)
timer.stop_timer(end_time=end_time)
# Step 4: Verify the duration was rounded correctly
# With 10-min 'up' rounding, 23 minutes should round up to 30 minutes
assert timer.duration_seconds == 1800 # 30 minutes
assert timer.is_active is False
# Step 5: Verify the entry is queryable with correct rounded duration
db.session.expunge_all()
saved_entry = TimeEntry.query.get(timer.id)
assert saved_entry.duration_seconds == 1800
assert saved_entry.duration_hours == 0.5
class TestEdgeCases:
"""Test edge cases and boundary conditions"""
def test_zero_duration_time_entry(self, app, authenticated_user):
"""Test handling of zero-duration entries"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# Create entry with same start and end time
time = datetime(2025, 1, 1, 10, 0, 0)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=time,
end_time=time
)
db.session.add(entry)
db.session.commit()
# Zero duration should stay zero regardless of rounding
assert entry.duration_seconds == 0
def test_very_long_duration(self, app, authenticated_user):
"""Test rounding of very long time entries (multi-day)"""
with app.app_context():
user = User.query.get(authenticated_user['user_id'])
project = Project.query.get(authenticated_user['project_id'])
# 8 hours 7 minutes
start_time = datetime(2025, 1, 1, 9, 0, 0)
end_time = start_time + timedelta(hours=8, minutes=7)
entry = TimeEntry(
user_id=user.id,
project_id=project.id,
start_time=start_time,
end_time=end_time
)
db.session.add(entry)
db.session.commit()
# User has 15-min nearest rounding
# 487 minutes -> 485 minutes (rounded down to nearest 15)
assert entry.duration_seconds == 29100 # 485 minutes