+ {{ item.worker.name }}
+ {% if item.ot_hours_unpriced > 0 %}
+ OT: {{ item.ot_hours_unpriced|floatformat:2 }} Days
+ {% endif %}
+
@@ -146,6 +151,12 @@
{% if item.total_payable > 0 %}
+ {% if item.ot_hours_unpriced > 0 %}
+
+ {% endif %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Date |
+ Project |
+ OT Duration |
+ Rate % |
+
+
+
+
+
+
+
+
+
+
+
+
@@ -409,6 +462,95 @@ document.addEventListener('DOMContentLoaded', function() {
const labels = {{ chart_labels_json|safe }};
const totals = {{ chart_totals_json|safe }};
const projectData = {{ project_chart_json|safe }};
+ const allOtData = {{ overtime_data_json|default:"[]"|safe }};
+
+ // Overtime Modal Logic
+ const otModalEl = document.getElementById('priceOTModal');
+ if (otModalEl) {
+ const otModal = new bootstrap.Modal(otModalEl);
+
+ document.body.addEventListener('click', function(e) {
+ if (e.target.classList.contains('price-ot-btn')) {
+ const workerId = parseInt(e.target.dataset.workerId);
+ const workerName = e.target.dataset.workerName;
+
+ document.getElementById('otModalWorkerName').textContent = workerName;
+
+ const tbody = document.getElementById('otModalTableBody');
+ tbody.innerHTML = '';
+
+ // Filter data for this worker
+ const workerLogs = allOtData.filter(d => d.worker_id === workerId);
+
+ workerLogs.forEach(log => {
+ const tr = document.createElement('tr');
+ tr.innerHTML = `
+ ${log.date} |
+ ${log.project} |
+ ${log.ot_label} |
+
+
+ |
+ `;
+ tbody.appendChild(tr);
+ });
+
+ otModal.show();
+ }
+ });
+
+ const bulkBtn = document.getElementById('otApplyBulk');
+ if (bulkBtn) {
+ bulkBtn.addEventListener('click', function() {
+ const rate = document.getElementById('otBulkRate').value;
+ document.querySelectorAll('.ot-rate-input').forEach(input => {
+ input.value = rate;
+ });
+ });
+ }
+
+ const saveBtn = document.getElementById('otSaveBtn');
+ if (saveBtn) {
+ saveBtn.addEventListener('click', function() {
+ const form = document.createElement('form');
+ form.method = 'POST';
+ form.action = '{% url "price_overtime" %}';
+
+ const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]')?.value || '{{ csrf_token }}';
+ const csrfInput = document.createElement('input');
+ csrfInput.type = 'hidden';
+ csrfInput.name = 'csrfmiddlewaretoken';
+ csrfInput.value = csrfToken;
+ form.appendChild(csrfInput);
+
+ document.querySelectorAll('.ot-rate-input').forEach(input => {
+ const logId = document.createElement('input');
+ logId.type = 'hidden';
+ logId.name = 'log_id';
+ logId.value = input.dataset.logId;
+ form.appendChild(logId);
+
+ const workerId = document.createElement('input');
+ workerId.type = 'hidden';
+ workerId.name = 'worker_id';
+ workerId.value = input.dataset.workerId;
+ form.appendChild(workerId);
+
+ const rate = document.createElement('input');
+ rate.type = 'hidden';
+ rate.name = 'rate_pct';
+ rate.value = input.value;
+ form.appendChild(rate);
+ });
+
+ document.body.appendChild(form);
+ form.submit();
+ });
+ }
+ }
// Colour palette
const colours = ['#10b981','#3b82f6','#f59e0b','#ef4444','#8b5cf6','#ec4899','#06b6d4','#84cc16'];
diff --git a/core/urls.py b/core/urls.py
index 1fa124e..9f02739 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -13,7 +13,8 @@ from .views import (
loan_list,
add_loan,
add_adjustment,
- create_receipt
+ create_receipt,
+ price_overtime
)
urlpatterns = [
@@ -26,6 +27,7 @@ urlpatterns = [
path("payroll/", payroll_dashboard, name="payroll_dashboard"),
path("payroll/pay//", process_payment, name="process_payment"),
path("payroll/preview//", preview_payslip, name="preview_payslip"),
+ path("payroll/price-overtime/", price_overtime, name="price_overtime"),
path("payroll/payslip//", payslip_detail, name="payslip_detail"),
path("loans/", loan_list, name="loan_list"),
path("loans/add/", add_loan, name="add_loan"),
diff --git a/core/views.py b/core/views.py
index 6f9408b..ba04e9f 100644
--- a/core/views.py
+++ b/core/views.py
@@ -137,6 +137,7 @@ def log_attendance(request):
project = form.cleaned_data['project']
team = form.cleaned_data.get('team')
notes = form.cleaned_data['notes']
+ overtime = form.cleaned_data.get('overtime', 0) # Read overtime
conflict_action = request.POST.get('conflict_action')
# Generate Target Dates
@@ -226,7 +227,8 @@ def log_attendance(request):
project=project,
team=team,
notes=notes,
- supervisor=request.user if request.user.is_authenticated else None
+ supervisor=request.user if request.user.is_authenticated else None,
+ overtime=overtime # Save overtime
)
log.workers.set(workers_to_save)
created_count += len(workers_to_save)
@@ -652,12 +654,32 @@ def payroll_dashboard(request):
active_workers = Worker.objects.filter(is_active=True).order_by('name').prefetch_related('adjustments')
workers_data = [] # For pending payments
+ all_ot_data = [] # For JSON context
for worker in active_workers:
# Unpaid Work Logs
unpaid_logs = worker.work_logs.exclude(paid_in__worker=worker)
log_count = unpaid_logs.count()
log_amount = log_count * worker.day_rate
+
+ # Overtime Logic (Step 5)
+ ot_logs = worker.work_logs.filter(overtime__gt=0, overtime_priced=False).exclude(paid_in__worker=worker).select_related('project')
+ ot_data_worker = []
+ ot_hours_unpriced = Decimal('0.0')
+
+ for log in ot_logs:
+ entry = {
+ 'worker_id': worker.id,
+ 'worker_name': worker.name,
+ 'log_id': log.id,
+ 'date': log.date.strftime('%Y-%m-%d'),
+ 'project': log.project.name,
+ 'overtime': float(log.overtime),
+ 'ot_label': log.get_overtime_display(),
+ }
+ ot_data_worker.append(entry)
+ all_ot_data.append(entry)
+ ot_hours_unpriced += log.overtime
# Pending Adjustments (unlinked to any payroll record)
pending_adjustments = worker.adjustments.filter(payroll_record__isnull=True)
@@ -683,7 +705,10 @@ def payroll_dashboard(request):
'adj_amount': adj_total,
'total_payable': total_payable,
'adjustments': pending_adjustments,
- 'logs': unpaid_logs
+ 'logs': unpaid_logs,
+ 'ot_data': ot_data_worker,
+ 'ot_hours_unpriced': float(ot_hours_unpriced),
+ 'day_rate': float(worker.day_rate),
})
# Paid History
@@ -785,6 +810,7 @@ def payroll_dashboard(request):
'chart_labels_json': json.dumps(chart_labels),
'chart_totals_json': json.dumps(chart_totals),
'project_chart_json': json.dumps(project_chart_data),
+ 'overtime_data_json': json.dumps(all_ot_data),
}
return render(request, 'core/payroll_dashboard.html', context)
@@ -926,6 +952,48 @@ def preview_payslip(request, worker_id):
'net_pay': total_amount,
})
+@login_required
+def price_overtime(request):
+ """Create OVERTIME PayrollAdjustments from unpriced overtime logs."""
+ if not is_admin(request.user):
+ return redirect('payroll_dashboard')
+
+ if request.method != 'POST':
+ return redirect('payroll_dashboard')
+
+ log_ids = request.POST.getlist('log_id')
+ worker_ids = request.POST.getlist('worker_id')
+ rate_pcts = request.POST.getlist('rate_pct')
+
+ created = 0
+
+ for log_id, worker_id, rate_pct in zip(log_ids, worker_ids, rate_pcts):
+ try:
+ worklog = WorkLog.objects.get(pk=log_id)
+ worker = Worker.objects.get(pk=worker_id)
+ rate = Decimal(rate_pct)
+
+ # Formula: Day Rate * Overtime Fraction * (Rate % / 100)
+ amount = worker.day_rate * worklog.overtime * (rate / Decimal('100'))
+
+ if amount > 0:
+ PayrollAdjustment.objects.create(
+ worker=worker,
+ type='OVERTIME',
+ amount=amount,
+ date=worklog.date,
+ description=f"Overtime: {worklog.get_overtime_display()} @ {rate_pct}% - {worklog.date.strftime('%d %b %Y')}"
+ )
+ created += 1
+
+ worklog.overtime_priced = True
+ worklog.save()
+
+ except (WorkLog.DoesNotExist, Worker.DoesNotExist, Exception):
+ continue
+
+ messages.success(request, f"Created {created} overtime adjustment(s).")
+ return redirect('payroll_dashboard')
@login_required
def payslip_detail(request, pk):
|