Add complete project management system with role-based access control: **Core Features:** - Project creation and management for Admins/Supervisors - Time tracking with optional project selection and notes - Project-based filtering and reporting in history - Enhanced export functionality with project data - Team-specific project assignments **Database Changes:** - New Project model with full relationships - Enhanced TimeEntry model with project_id and notes - Updated migration scripts with rollback support - Sample project creation for testing **User Interface:** - Project management templates (create, edit, list) - Enhanced time tracking with project dropdown - Project filtering in history page - Updated navigation for role-based access - Modern styling with hover effects and responsive design **API Enhancements:** - Project validation and access control - Updated arrive endpoint with project support - Enhanced export functions with project data - Role-based route protection **Migration Support:** - Comprehensive migration scripts (migrate_projects.py) - Updated main migration script (migrate_db.py) - Detailed migration documentation - Rollback functionality for safe deployment **Role-Based Access:** - Admins: Full project CRUD operations - Supervisors: Project creation and management - Team Leaders: View team hours with projects - Team Members: Select projects when tracking time 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
342 lines
13 KiB
HTML
342 lines
13 KiB
HTML
{% extends "layout.html" %}
|
|
|
|
{% block content %}
|
|
<div class="timetrack-container">
|
|
<h2>Complete Time Entry History</h2>
|
|
<div class="export-button-container">
|
|
<a href="{{ url_for('export') }}" class="btn">Export Data</a>
|
|
</div>
|
|
|
|
<!-- Project Filter -->
|
|
<div class="filter-section">
|
|
<form method="GET" action="{{ url_for('history') }}" class="filter-form">
|
|
<div class="form-group">
|
|
<label for="project-filter">Filter by Project:</label>
|
|
<select id="project-filter" name="project_id" onchange="this.form.submit()">
|
|
<option value="">All Projects</option>
|
|
{% for project in available_projects %}
|
|
<option value="{{ project.id }}"
|
|
{% if request.args.get('project_id') and request.args.get('project_id')|int == project.id %}selected{% endif %}>
|
|
{{ project.code }} - {{ project.name }}
|
|
</option>
|
|
{% endfor %}
|
|
<option value="none"
|
|
{% if request.args.get('project_id') == 'none' %}selected{% endif %}>
|
|
No Project Assigned
|
|
</option>
|
|
</select>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
|
|
<div class="history-section">
|
|
{% if entries %}
|
|
<table class="time-history">
|
|
<thead>
|
|
<tr>
|
|
<th>Date</th>
|
|
<th>Project</th>
|
|
<th>Arrival</th>
|
|
<th>Departure</th>
|
|
<th>Work Duration</th>
|
|
<th>Break Duration</th>
|
|
<th>Notes</th>
|
|
<th>Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{% for entry in entries %}
|
|
<tr data-entry-id="{{ entry.id }}">
|
|
<td>{{ entry.arrival_time.strftime('%Y-%m-%d') }}</td>
|
|
<td>
|
|
{% if entry.project %}
|
|
<span class="project-tag">{{ entry.project.code }}</span>
|
|
<small>{{ entry.project.name }}</small>
|
|
{% else %}
|
|
<em>No project</em>
|
|
{% endif %}
|
|
</td>
|
|
<td>{{ entry.arrival_time.strftime('%H:%M:%S') }}</td>
|
|
<td>{{ entry.departure_time.strftime('%H:%M:%S') if entry.departure_time else 'Active' }}</td>
|
|
<td>{{ '%d:%02d:%02d'|format(entry.duration//3600, (entry.duration%3600)//60, entry.duration%60) if entry.duration is not none else 'In progress' }}</td>
|
|
<td>{{ '%d:%02d:%02d'|format(entry.total_break_duration//3600, (entry.total_break_duration%3600)//60, entry.total_break_duration%60) if entry.total_break_duration is not none else '00:00:00' }}</td>
|
|
<td>
|
|
{% if entry.notes %}
|
|
<span class="notes-preview" title="{{ entry.notes }}">{{ entry.notes[:50] }}{% if entry.notes|length > 50 %}...{% endif %}</span>
|
|
{% else %}
|
|
<em>-</em>
|
|
{% endif %}
|
|
</td>
|
|
<td>
|
|
<button class="edit-entry-btn" data-id="{{ entry.id }}">Edit</button>
|
|
<button class="delete-entry-btn" data-id="{{ entry.id }}">Delete</button>
|
|
</td>
|
|
</tr>
|
|
{% endfor %}
|
|
</tbody>
|
|
</table>
|
|
{% else %}
|
|
<p>No time entries recorded yet.</p>
|
|
{% endif %}
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Edit Entry Modal -->
|
|
<div id="edit-modal" class="modal">
|
|
<div class="modal-content">
|
|
<span class="close">×</span>
|
|
<h3>Edit Time Entry</h3>
|
|
<form id="edit-entry-form">
|
|
<input type="hidden" id="edit-entry-id">
|
|
<div class="form-group">
|
|
<label for="edit-arrival-date">Arrival Date:</label>
|
|
<input type="date" id="edit-arrival-date" required>
|
|
</div>
|
|
<div class="form-group">
|
|
<label for="edit-arrival-time">Arrival Time:</label>
|
|
<input type="time" id="edit-arrival-time" required>
|
|
</div>
|
|
<div class="form-group">
|
|
<label for="edit-departure-date">Departure Date:</label>
|
|
<input type="date" id="edit-departure-date">
|
|
</div>
|
|
<div class="form-group">
|
|
<label for="edit-departure-time">Departure Time:</label>
|
|
<input type="time" id="edit-departure-time">
|
|
</div>
|
|
<button type="submit" class="btn">Save Changes</button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Delete Confirmation Modal -->
|
|
<div id="delete-modal" class="modal">
|
|
<div class="modal-content">
|
|
<span class="close">×</span>
|
|
<h3>Confirm Deletion</h3>
|
|
<p>Are you sure you want to delete this time entry? This action cannot be undone.</p>
|
|
<input type="hidden" id="delete-entry-id">
|
|
<div class="modal-actions">
|
|
<button id="confirm-delete" class="btn btn-danger">Delete</button>
|
|
<button id="cancel-delete" class="btn">Cancel</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<script>
|
|
document.addEventListener('DOMContentLoaded', function() {
|
|
// Edit entry functionality
|
|
document.querySelectorAll('.edit-entry-btn').forEach(button => {
|
|
button.addEventListener('click', function() {
|
|
const entryId = this.getAttribute('data-id');
|
|
const row = document.querySelector(`tr[data-entry-id="${entryId}"]`);
|
|
const cells = row.querySelectorAll('td');
|
|
|
|
// Get date and time from the row
|
|
const dateStr = cells[0].textContent.trim();
|
|
const arrivalTimeStr = cells[1].textContent.trim();
|
|
const departureTimeStr = cells[2].textContent.trim();
|
|
|
|
// Set values in the form
|
|
document.getElementById('edit-entry-id').value = entryId;
|
|
document.getElementById('edit-arrival-date').value = dateStr;
|
|
|
|
// Format time for input (HH:MM format)
|
|
document.getElementById('edit-arrival-time').value = arrivalTimeStr.substring(0, 5);
|
|
|
|
if (departureTimeStr && departureTimeStr !== 'Active') {
|
|
document.getElementById('edit-departure-date').value = dateStr;
|
|
document.getElementById('edit-departure-time').value = departureTimeStr.substring(0, 5);
|
|
} else {
|
|
document.getElementById('edit-departure-date').value = '';
|
|
document.getElementById('edit-departure-time').value = '';
|
|
}
|
|
|
|
// Show the modal
|
|
document.getElementById('edit-modal').style.display = 'block';
|
|
});
|
|
});
|
|
|
|
// Delete entry functionality
|
|
document.querySelectorAll('.delete-entry-btn').forEach(button => {
|
|
button.addEventListener('click', function() {
|
|
const entryId = this.getAttribute('data-id');
|
|
document.getElementById('delete-entry-id').value = entryId;
|
|
document.getElementById('delete-modal').style.display = 'block';
|
|
});
|
|
});
|
|
|
|
// Close modals when clicking the X
|
|
document.querySelectorAll('.close').forEach(closeBtn => {
|
|
closeBtn.addEventListener('click', function() {
|
|
this.closest('.modal').style.display = 'none';
|
|
});
|
|
});
|
|
|
|
// Close modals when clicking outside
|
|
window.addEventListener('click', function(event) {
|
|
if (event.target.classList.contains('modal')) {
|
|
event.target.style.display = 'none';
|
|
}
|
|
});
|
|
|
|
// Cancel delete
|
|
document.getElementById('cancel-delete').addEventListener('click', function() {
|
|
document.getElementById('delete-modal').style.display = 'none';
|
|
});
|
|
|
|
// Confirm delete
|
|
document.getElementById('confirm-delete').addEventListener('click', function() {
|
|
const entryId = document.getElementById('delete-entry-id').value;
|
|
|
|
fetch(`/api/delete/${entryId}`, {
|
|
method: 'DELETE',
|
|
})
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
if (data.success) {
|
|
// Remove the row from the table
|
|
document.querySelector(`tr[data-entry-id="${entryId}"]`).remove();
|
|
// Close the modal
|
|
document.getElementById('delete-modal').style.display = 'none';
|
|
// Show success message
|
|
alert('Entry deleted successfully');
|
|
} else {
|
|
alert('Error: ' + data.message);
|
|
}
|
|
})
|
|
.catch(error => {
|
|
console.error('Error:', error);
|
|
alert('An error occurred while deleting the entry');
|
|
});
|
|
});
|
|
|
|
// Submit edit form
|
|
document.getElementById('edit-entry-form').addEventListener('submit', function(e) {
|
|
e.preventDefault();
|
|
|
|
const entryId = document.getElementById('edit-entry-id').value;
|
|
const arrivalDate = document.getElementById('edit-arrival-date').value;
|
|
const arrivalTime = document.getElementById('edit-arrival-time').value;
|
|
const departureDate = document.getElementById('edit-departure-date').value || '';
|
|
const departureTime = document.getElementById('edit-departure-time').value || '';
|
|
|
|
// Ensure we have seconds in the time strings
|
|
const arrivalTimeWithSeconds = arrivalTime.includes(':') ?
|
|
(arrivalTime.split(':').length === 2 ? arrivalTime + ':00' : arrivalTime) :
|
|
arrivalTime + ':00:00';
|
|
|
|
// Format datetime strings for the API (YYYY-MM-DD HH:MM:SS)
|
|
const arrivalDateTime = `${arrivalDate} ${arrivalTimeWithSeconds}`;
|
|
let departureDateTime = null;
|
|
|
|
if (departureDate && departureTime) {
|
|
const departureTimeWithSeconds = departureTime.includes(':') ?
|
|
(departureTime.split(':').length === 2 ? departureTime + ':00' : departureTime) :
|
|
departureTime + ':00:00';
|
|
departureDateTime = `${departureDate} ${departureTimeWithSeconds}`;
|
|
}
|
|
|
|
// Send update request
|
|
fetch(`/api/update/${entryId}`, {
|
|
method: 'PUT',
|
|
headers: {
|
|
'Content-Type': 'application/json',
|
|
},
|
|
body: JSON.stringify({
|
|
arrival_time: arrivalDateTime,
|
|
departure_time: departureDateTime
|
|
}),
|
|
})
|
|
.then(response => {
|
|
if (!response.ok) {
|
|
return response.json().then(data => {
|
|
throw new Error(data.message || 'Server error');
|
|
});
|
|
}
|
|
return response.json();
|
|
})
|
|
.then(data => {
|
|
if (data.success) {
|
|
// Close the modal
|
|
document.getElementById('edit-modal').style.display = 'none';
|
|
// Refresh the page to show updated data
|
|
location.reload();
|
|
} else {
|
|
alert('Error: ' + data.message);
|
|
}
|
|
})
|
|
.catch(error => {
|
|
console.error('Error:', error);
|
|
alert('An error occurred while updating the entry: ' + error.message);
|
|
});
|
|
});
|
|
});
|
|
</script>
|
|
<style>
|
|
.filter-section {
|
|
background: #f8f9fa;
|
|
padding: 1rem;
|
|
border-radius: 8px;
|
|
margin-bottom: 2rem;
|
|
}
|
|
|
|
.filter-form .form-group {
|
|
margin: 0;
|
|
}
|
|
|
|
.filter-form label {
|
|
display: block;
|
|
margin-bottom: 0.5rem;
|
|
font-weight: 500;
|
|
color: #333;
|
|
}
|
|
|
|
.filter-form select {
|
|
width: 100%;
|
|
max-width: 300px;
|
|
padding: 0.5rem;
|
|
border: 2px solid #e9ecef;
|
|
border-radius: 6px;
|
|
font-size: 1rem;
|
|
transition: border-color 0.2s ease;
|
|
}
|
|
|
|
.filter-form select:focus {
|
|
outline: none;
|
|
border-color: #4CAF50;
|
|
box-shadow: 0 0 0 3px rgba(76, 175, 80, 0.1);
|
|
}
|
|
|
|
.project-tag {
|
|
background: #4CAF50;
|
|
color: white;
|
|
padding: 0.25rem 0.5rem;
|
|
border-radius: 4px;
|
|
font-size: 0.8rem;
|
|
font-weight: 500;
|
|
margin-right: 0.5rem;
|
|
}
|
|
|
|
.project-tag + small {
|
|
color: #666;
|
|
font-size: 0.85rem;
|
|
}
|
|
|
|
.notes-preview {
|
|
color: #666;
|
|
font-size: 0.9rem;
|
|
cursor: help;
|
|
}
|
|
|
|
.time-history td {
|
|
vertical-align: middle;
|
|
}
|
|
|
|
.time-history .project-tag + small {
|
|
display: block;
|
|
margin-top: 0.25rem;
|
|
}
|
|
</style>
|
|
|
|
{% endblock %} |