diff --git a/app/routes/timer.py b/app/routes/timer.py index 9fd5255..478d6e6 100644 --- a/app/routes/timer.py +++ b/app/routes/timer.py @@ -447,3 +447,188 @@ def manual_entry_for_project(project_id): return render_template('timer/manual_entry.html', projects=active_projects, selected_project_id=project_id, selected_task_id=task_id) + +@timer_bp.route('/timer/bulk', methods=['GET', 'POST']) +@login_required +def bulk_entry(): + """Create bulk time entries for multiple days""" + # Get active projects for dropdown + active_projects = Project.query.filter_by(status='active').order_by(Project.name).all() + + # Get project_id and task_id from query parameters for pre-filling + project_id = request.args.get('project_id', type=int) + task_id = request.args.get('task_id', type=int) + + if request.method == 'POST': + project_id = request.form.get('project_id', type=int) + task_id = request.form.get('task_id', type=int) + start_date = request.form.get('start_date') + end_date = request.form.get('end_date') + start_time = request.form.get('start_time') + end_time = request.form.get('end_time') + notes = request.form.get('notes', '').strip() + tags = request.form.get('tags', '').strip() + billable = request.form.get('billable') == 'on' + skip_weekends = request.form.get('skip_weekends') == 'on' + + # Validate required fields + if not all([project_id, start_date, end_date, start_time, end_time]): + flash('All fields are required', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Check if project exists and is active + project = Project.query.filter_by(id=project_id, status='active').first() + if not project: + flash('Invalid project selected', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Validate task if provided + if task_id: + task = Task.query.filter_by(id=task_id, project_id=project_id).first() + if not task: + flash('Invalid task selected', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Parse and validate dates + try: + from datetime import datetime, timedelta + start_date_obj = datetime.strptime(start_date, '%Y-%m-%d').date() + end_date_obj = datetime.strptime(end_date, '%Y-%m-%d').date() + + if end_date_obj < start_date_obj: + flash('End date must be after or equal to start date', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Check for reasonable date range (max 31 days) + if (end_date_obj - start_date_obj).days > 31: + flash('Date range cannot exceed 31 days', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + except ValueError: + flash('Invalid date format', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Parse and validate times + try: + start_time_obj = datetime.strptime(start_time, '%H:%M').time() + end_time_obj = datetime.strptime(end_time, '%H:%M').time() + + if end_time_obj <= start_time_obj: + flash('End time must be after start time', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + except ValueError: + flash('Invalid time format', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Generate date range + current_date = start_date_obj + dates_to_create = [] + + while current_date <= end_date_obj: + # Skip weekends if requested + if skip_weekends and current_date.weekday() >= 5: # Saturday = 5, Sunday = 6 + current_date += timedelta(days=1) + continue + + dates_to_create.append(current_date) + current_date += timedelta(days=1) + + if not dates_to_create: + flash('No valid dates found in the selected range', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Check for existing entries on the same dates/times + from app.models.time_entry import local_now + existing_entries = [] + + for date_obj in dates_to_create: + start_datetime = datetime.combine(date_obj, start_time_obj) + end_datetime = datetime.combine(date_obj, end_time_obj) + + # Check for overlapping entries + overlapping = TimeEntry.query.filter( + TimeEntry.user_id == current_user.id, + TimeEntry.start_time <= end_datetime, + TimeEntry.end_time >= start_datetime, + TimeEntry.end_time.isnot(None) + ).first() + + if overlapping: + existing_entries.append(date_obj.strftime('%Y-%m-%d')) + + if existing_entries: + flash(f'Time entries already exist for these dates: {", ".join(existing_entries[:5])}{"..." if len(existing_entries) > 5 else ""}', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + # Create bulk entries + created_entries = [] + + try: + for date_obj in dates_to_create: + start_datetime = datetime.combine(date_obj, start_time_obj) + end_datetime = datetime.combine(date_obj, end_time_obj) + + entry = TimeEntry( + user_id=current_user.id, + project_id=project_id, + task_id=task_id, + start_time=start_datetime, + end_time=end_datetime, + notes=notes, + tags=tags, + source='manual', + billable=billable + ) + + db.session.add(entry) + created_entries.append(entry) + + if not safe_commit('bulk_entry', {'user_id': current_user.id, 'project_id': project_id, 'count': len(created_entries)}): + flash('Could not create bulk entries due to a database error. Please check server logs.', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + task_name = "" + if task_id: + task = Task.query.get(task_id) + task_name = f" - {task.name}" if task else "" + + flash(f'Successfully created {len(created_entries)} time entries for {project.name}{task_name}', 'success') + return redirect(url_for('main.dashboard')) + + except Exception as e: + db.session.rollback() + current_app.logger.exception("Error creating bulk entries: %s", e) + flash('An error occurred while creating bulk entries. Please try again.', 'error') + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) + +@timer_bp.route('/timer/bulk/') +@login_required +def bulk_entry_for_project(project_id): + """Create bulk time entries for a specific project""" + task_id = request.args.get('task_id', type=int) + + # Check if project exists and is active + project = Project.query.filter_by(id=project_id, status='active').first() + if not project: + flash('Invalid project selected', 'error') + return redirect(url_for('main.dashboard')) + + # Get active projects for dropdown + active_projects = Project.query.filter_by(status='active').order_by(Project.name).all() + + return render_template('timer/bulk_entry.html', projects=active_projects, + selected_project_id=project_id, selected_task_id=task_id) diff --git a/app/templates/base.html b/app/templates/base.html index 98e3923..5895861 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -95,7 +95,9 @@
  • {{ _('Projects') }}
  • {{ _('Clients') }}
  • {{ _('Tasks') }}
    • +
  • {{ _('Log Time') }}
    • +
  • {{ _('Bulk Time Entry') }}
    • diff --git a/app/templates/main/dashboard.html b/app/templates/main/dashboard.html index 3d5573a..2a29ce4 100644 --- a/app/templates/main/dashboard.html +++ b/app/templates/main/dashboard.html @@ -162,6 +162,17 @@ +
    + +
    +
    + +
    +
    {{ _('Bulk Entry') }}
    + {{ _('Multi-day time entry') }} +
    +     +
    diff --git a/docs/BULK_TIME_ENTRY_README.md b/docs/BULK_TIME_ENTRY_README.md new file mode 100644 index 0000000..bed00d3 --- /dev/null +++ b/docs/BULK_TIME_ENTRY_README.md @@ -0,0 +1,213 @@ +# Bulk Time Entry Feature + +## Overview + +The Bulk Time Entry feature allows users to quickly create multiple time entries for consecutive days with the same project, task, duration, and other settings. This is particularly useful for users who work regular hours on the same project across multiple days. + +## Features + +### Core Functionality +- **Multi-day Entry Creation**: Create time entries for a date range (up to 31 days) +- **Weekend Skipping**: Option to automatically skip weekends (Saturday & Sunday) +- **Consistent Time Patterns**: Same start/end time applied to all days +- **Project & Task Selection**: Full integration with existing project and task system +- **Conflict Detection**: Prevents creation of overlapping time entries +- **Real-time Preview**: Shows exactly which dates will have entries created + +### User Interface +- **Intuitive Form**: Clean, modern interface matching the existing design system +- **Date Range Picker**: Easy selection of start and end dates +- **Time Preview**: Visual preview showing total days, hours, and affected dates +- **Responsive Design**: Works seamlessly on desktop and mobile devices +- **Accessibility**: Full keyboard navigation and screen reader support + +### Validation & Safety +- **Overlap Prevention**: Checks for existing time entries that would conflict +- **Date Range Limits**: Maximum 31-day range to prevent accidental bulk operations +- **Time Validation**: Ensures end time is after start time +- **Project/Task Validation**: Verifies selected project and task are valid and active +- **Database Integrity**: Uses transactions to ensure all-or-nothing creation + +## Usage + +### Accessing Bulk Entry +Users can access the bulk time entry feature through: + +1. **Main Navigation**: Work → Bulk Time Entry +2. **Dashboard**: Quick Actions → Bulk Entry card +3. **Direct URL**: `/timer/bulk` +4. **Project-specific**: `/timer/bulk/` (pre-selects project) + +### Creating Bulk Entries + +1. **Select Project**: Choose the project to log time for +2. **Select Task** (Optional): Choose a specific task within the project +3. **Set Date Range**: + - Choose start and end dates + - Optionally enable "Skip weekends" to exclude Saturdays and Sundays +4. **Set Time Pattern**: + - Enter start time (same for all days) + - Enter end time (same for all days) +5. **Add Details**: + - Notes (applied to all entries) + - Tags (applied to all entries) + - Billable status (applied to all entries) +6. **Preview & Submit**: Review the preview showing affected dates and total hours +7. **Create Entries**: Click "Create X Entries" button + +### Example Scenarios + +**Scenario 1: Regular Work Week** +- Project: Client Website Development +- Date Range: Monday 2024-01-08 to Friday 2024-01-12 +- Skip Weekends: Enabled +- Time: 09:00 - 17:00 +- Result: 5 entries created (40 hours total) + +**Scenario 2: Multi-week Project** +- Project: Database Migration +- Date Range: Monday 2024-01-15 to Friday 2024-01-26 +- Skip Weekends: Enabled +- Time: 10:00 - 16:00 +- Result: 10 entries created (60 hours total) + +## Technical Implementation + +### Backend Routes + +#### Main Routes +- `GET/POST /timer/bulk`: Main bulk entry form +- `GET /timer/bulk/`: Pre-filled form for specific project + +#### Validation Logic +```python +# Date range validation +if (end_date_obj - start_date_obj).days > 31: + flash('Date range cannot exceed 31 days', 'error') + +# Overlap detection +overlapping = TimeEntry.query.filter( + TimeEntry.user_id == current_user.id, + TimeEntry.start_time <= end_datetime, + TimeEntry.end_time >= start_datetime, + TimeEntry.end_time.isnot(None) +).first() +``` + +#### Bulk Creation Process +1. Generate list of dates (excluding weekends if requested) +2. Check for conflicts with existing entries +3. Create TimeEntry objects for each date +4. Use database transaction for atomic operation +5. Provide detailed success/error feedback + +### Frontend Features + +#### Real-time Preview +- Calculates total days and hours as user types +- Shows list of affected dates +- Updates submit button text with entry count +- Responsive visual feedback + +#### Form Validation +- Client-side validation for required fields +- Date range validation (end >= start) +- Time validation (end > start) +- Real-time feedback on form errors + +#### Mobile Optimization +- Touch-friendly interface +- Optimized form layout for small screens +- Improved button sizes and spacing +- Responsive date/time pickers + +### Database Considerations + +#### Performance +- Uses efficient database queries for overlap detection +- Batch insert operations for multiple entries +- Proper indexing on user_id and time fields + +#### Data Integrity +- Foreign key constraints ensure valid project/task references +- Transaction rollback on any creation failure +- Consistent timestamp handling using local timezone + +## User Benefits + +### Time Savings +- Reduces manual entry time from minutes per day to seconds for the entire range +- Eliminates repetitive form filling for routine work patterns +- Batch operations are much faster than individual entries + +### Accuracy Improvements +- Consistent time patterns reduce human error +- Automatic conflict detection prevents double-booking +- Preview functionality allows verification before creation + +### Workflow Integration +- Seamless integration with existing project and task management +- Maintains all existing features (notes, tags, billable status) +- Compatible with reporting and invoicing systems + +## Future Enhancements + +### Potential Improvements +1. **Templates**: Save common bulk entry patterns as reusable templates +2. **Recurring Entries**: Automatic creation of bulk entries on a schedule +3. **Advanced Patterns**: Different time patterns for different days of the week +4. **Bulk Editing**: Modify multiple existing entries simultaneously +5. **Import/Export**: CSV import for bulk entry creation +6. **Team Templates**: Share bulk entry patterns across team members + +### Integration Opportunities +1. **Calendar Integration**: Import from external calendars +2. **Project Templates**: Auto-suggest bulk patterns based on project type +3. **Analytics**: Track bulk entry usage patterns +4. **Notifications**: Alerts for incomplete time tracking periods + +## Testing Scenarios + +### Functional Tests +1. Create bulk entries for a work week +2. Test weekend skipping functionality +3. Verify conflict detection works correctly +4. Test maximum date range limits +5. Verify all form validations +6. Test mobile responsiveness +7. Test with different timezones + +### Edge Cases +1. Leap year date handling +2. Daylight saving time transitions +3. Very large date ranges +4. Overlapping with existing active timers +5. Project/task deletion during bulk creation +6. Network interruption during submission + +### Performance Tests +1. Maximum 31-day bulk creation +2. Multiple users creating bulk entries simultaneously +3. Database performance with large numbers of entries + +## Security Considerations + +### Access Control +- Users can only create entries for themselves +- Project/task access validated against user permissions +- Admin users have same restrictions for bulk entries + +### Input Validation +- All user inputs sanitized and validated +- SQL injection prevention through parameterized queries +- XSS prevention in form handling + +### Rate Limiting +- Reasonable limits on bulk operation frequency +- Protection against accidental or malicious bulk operations + +## Conclusion + +The Bulk Time Entry feature significantly enhances the TimeTracker application by providing an efficient way to handle routine time tracking scenarios. The implementation maintains the high standards of the existing application while providing substantial time savings for users with regular work patterns. + +The feature is designed to be intuitive, safe, and performant, with comprehensive validation and error handling to ensure data integrity. The responsive design ensures it works well across all device types, maintaining the application's excellent user experience. diff --git a/templates/timer/bulk_entry.html b/templates/timer/bulk_entry.html new file mode 100644 index 0000000..ac19fd0 --- /dev/null +++ b/templates/timer/bulk_entry.html @@ -0,0 +1,558 @@ +{% extends "base.html" %} + +{% block title %}{{ _('Bulk Time Entry') }} - {{ app_name }}{% endblock %} + +{% block content %} +{% block extra_css %} + +{% endblock %} +
    + {% from "_components.html" import page_header %} +
    +
    + {% set actions %} + + {{ _('Back') }} + + + {{ _('Single Entry') }} + + {% endset %} + {{ page_header('fas fa-calendar-plus', _('Bulk Time Entry'), _('Create multiple time entries for consecutive days'), actions) }} +
    +
    + +
    +
    +
    +
    +
    + {{ _('Bulk Entry Form') }} +
    +
    + + {{ _('Reset') }} + +
    +
    +
    +
    +
    +
    +
    + + +
    {{ _('Select the project to log time for') }}
    +
    +
    +
    + {% set preselected_task_id = request.form.get('task_id') or selected_task_id %} +
    + + +
    {{ _('Tasks load after selecting a project') }}
    +
    +
    +
    + + +
    +
    +
    +
    +
    + {{ _('Date Range') }} * +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    {{ _('Start Time') }} *
    + +
    {{ _('Same start time for all days') }}
    +
    +
    +
    +
    +
    +
    +
    {{ _('End Time') }} *
    + +
    {{ _('Same end time for all days') }}
    +
    +
    +
    +
    + +
    + + +
    + +
    +
    +
    + + +
    {{ _('Separate tags with commas (same for all entries)') }}
    +
    +
    +
    +
    + +
    + + {{ _('Include in invoices') }} +
    +
    +
    +
    + +
    + + {{ _('Back') }} + +
    + + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + {{ _('Bulk Entry Tips') }} +
    +
    +
    +
    +
    +
    + {{ _('Date Range') }} +

    {{ _('Select start and end dates. Entries will be created for each day in the range.') }}

    +
    +
    +
    +
    +
    + {{ _('Skip Weekends') }} +

    {{ _('Enable to automatically skip Saturdays and Sundays from the date range.') }}

    +
    +
    +
    +
    +
    + {{ _('Same Time Daily') }} +

    {{ _('All entries will use the same start and end time each day.') }}

    +
    +
    +
    +
    +
    + {{ _('Conflict Check') }} +

    {{ _('System will check for existing time entries and prevent overlaps.') }}

    +
    +
    +
    +
    +
    +
    +
    + + + + + +{% endblock %} + +