diff --git a/CLAUDE.md b/CLAUDE.md index a4ba0f3..0419504 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -134,6 +134,41 @@ python manage.py check # System check | `/payroll/batch-pay/preview/` | `batch_pay_preview` | Admin: AJAX JSON batch pay preview (`?mode=schedule\|all`) | | `/payroll/batch-pay/` | `batch_pay` | Admin: POST process batch payments for multiple workers | | `/run-migrate/` | `run_migrate` | Setup: run pending DB migrations from browser | +| `/teams/` | `team_list` | Admin: list teams with filters & search | +| `/teams/new/` | `team_edit` | Admin: create a new team | +| `/teams//` | `team_detail` | Admin: team detail (Profile · Pay Schedule · Workers · History) | +| `/teams//edit/` | `team_edit` | Admin: edit team (shared view with `team_new`) | +| `/teams/report/` | `team_batch_report` | Admin: batch report across all teams (HTML) | +| `/teams/report/csv/` | `team_batch_report_csv` | Admin: batch report CSV download | +| `/projects/` | `project_list` | Admin: list projects with filters & search | +| `/projects/new/` | `project_edit` | Admin: create a new project | +| `/projects//` | `project_detail` | Admin: project detail (Profile · Supervisors · Teams · Workers · History) | +| `/projects//edit/` | `project_edit` | Admin: edit project (shared view with `project_new`) | +| `/projects/report/` | `project_batch_report` | Admin: batch report across all projects (HTML) | +| `/projects/report/csv/` | `project_batch_report_csv` | Admin: batch report CSV download | + +## Team & Project Management Pages +Added as a friendly alternative to Django admin for managing Teams and Projects +outside of `/admin/`. Pattern mirrors (or anticipates) the Workers management UI. + +- **Access**: Admins only — every view checks `is_admin(user)` and returns 403 for others +- **Entry points**: + - `Resources` dropdown in the top nav (admin-only) — links to Teams and Projects + - `Manage All Teams` / `Manage All Projects` buttons on the Dashboard's Manage Resources card tabs +- **Forms**: `TeamForm` and `ProjectForm` in `core/forms.py` — plain `ModelForm` classes, + no inline formsets. `_supervisor_user_queryset()` returns admins + Work Logger group members + so both forms pick supervisors from the same pool +- **Helpers in views.py**: + - `_build_team_report_context(request)` — shared between HTML and CSV batch-report views + - `_build_project_report_context(request)` — same pattern for projects + - Reuses existing `get_pay_period(team)` for the Team detail "Pay Schedule" tab +- **Templates**: `core/templates/core/teams/{list,detail,edit,batch_report}.html` + and `core/templates/core/projects/{list,detail,edit,batch_report}.html` +- **No model changes / no migrations** — these pages are purely additive +- **PDF export deferred** — HTML + CSV only for now; PDF can be added with a new + view + template per model if needed later +- **Django admin still works** for all of these models — the new pages are an + alternative UI, not a replacement ## Frontend Design Conventions - **CSS variables** in `static/css/custom.css` `:root` — always use `var(--name)`: diff --git a/core/forms.py b/core/forms.py index 14702d3..a5f9016 100644 --- a/core/forms.py +++ b/core/forms.py @@ -6,9 +6,21 @@ from django import forms from django.forms import inlineformset_factory +from django.contrib.auth.models import User +from django.db.models import Q from .models import WorkLog, Project, Team, Worker, PayrollAdjustment, ExpenseReceipt, ExpenseLineItem +# === HELPER: who can be a supervisor? === +# The app's business rule: a "supervisor" is either an admin (is_staff) +# or a member of the "Work Logger" group. We reuse this queryset in both +# TeamForm (single supervisor) and ProjectForm (multiple supervisors). +def _supervisor_user_queryset(): + return User.objects.filter( + Q(is_staff=True) | Q(groups__name='Work Logger') + ).distinct().order_by('username') + + class AttendanceLogForm(forms.ModelForm): """ Form for logging daily worker attendance. @@ -213,3 +225,130 @@ ExpenseLineItemFormSet = inlineformset_factory( }), } ) + + +# ============================================================================= +# === TEAM FORM === +# Used on /teams/new/ and /teams//edit/ to create or edit a Team. +# Mirrors the Django admin experience outside of /admin/ so the owner +# doesn't need to go into Django admin for routine team maintenance. +# ============================================================================= + +class TeamForm(forms.ModelForm): + """ + Form for creating/editing a Team. + + Fields: + - name: team name + - supervisor: a single User (filtered to admins + Work Logger group) + - active: whether the team is currently in use + - pay_frequency: optional — weekly / fortnightly / monthly + - pay_start_date: anchor date for the first pay period + - workers: checkbox list of ALL workers (active + inactive) — + inactive ones are flagged with a badge in the template + """ + + class Meta: + model = Team + fields = ['name', 'supervisor', 'active', 'pay_frequency', + 'pay_start_date', 'workers'] + widgets = { + 'name': forms.TextInput(attrs={ + 'class': 'form-control', + 'placeholder': 'Team name (e.g. "Footings Crew")' + }), + 'supervisor': forms.Select(attrs={'class': 'form-select'}), + 'active': forms.CheckboxInput(attrs={'class': 'form-check-input'}), + 'pay_frequency': forms.Select(attrs={'class': 'form-select'}), + 'pay_start_date': forms.DateInput(attrs={ + 'type': 'date', 'class': 'form-control' + }), + # Multi-select for workers — rendered as a checkbox grid in the template + 'workers': forms.CheckboxSelectMultiple(attrs={'class': 'form-check-input'}), + } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Supervisor dropdown = admins + Work Logger group, alphabetical + self.fields['supervisor'].queryset = _supervisor_user_queryset() + self.fields['supervisor'].required = False + # Workers picker: ALL workers — inactive marked in template + self.fields['workers'].queryset = Worker.objects.all().order_by('name') + self.fields['workers'].required = False + # Schedule fields are optional + self.fields['pay_frequency'].required = False + self.fields['pay_start_date'].required = False + + def clean(self): + """If pay_frequency is set, pay_start_date must also be set (and vice versa).""" + cleaned = super().clean() + freq = cleaned.get('pay_frequency') + start = cleaned.get('pay_start_date') + if freq and not start: + self.add_error('pay_start_date', + 'A start date is required when pay frequency is set.') + if start and not freq: + self.add_error('pay_frequency', + 'Choose a pay frequency when setting a start date.') + return cleaned + + +# ============================================================================= +# === PROJECT FORM === +# Used on /projects/new/ and /projects//edit/ to create or edit a Project. +# ============================================================================= + +class ProjectForm(forms.ModelForm): + """ + Form for creating/editing a Project. + + Fields: + - name: project name (e.g. "Solar Farm — Phase 2") + - description: free-text notes + - active: whether the project is currently running + - start_date / end_date: optional timeline + - supervisors: M2M to User — any number of supervisors may be assigned + """ + + class Meta: + model = Project + fields = ['name', 'description', 'active', 'start_date', 'end_date', + 'supervisors'] + widgets = { + 'name': forms.TextInput(attrs={ + 'class': 'form-control', + 'placeholder': 'Project name' + }), + 'description': forms.Textarea(attrs={ + 'class': 'form-control', + 'rows': 3, + 'placeholder': 'What this project covers...' + }), + 'active': forms.CheckboxInput(attrs={'class': 'form-check-input'}), + 'start_date': forms.DateInput(attrs={ + 'type': 'date', 'class': 'form-control' + }), + 'end_date': forms.DateInput(attrs={ + 'type': 'date', 'class': 'form-control' + }), + # Multi-select checkboxes for supervisors + 'supervisors': forms.CheckboxSelectMultiple(attrs={'class': 'form-check-input'}), + } + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + # Supervisor dropdown = admins + Work Logger group members + self.fields['supervisors'].queryset = _supervisor_user_queryset() + self.fields['supervisors'].required = False + self.fields['start_date'].required = False + self.fields['end_date'].required = False + self.fields['description'].required = False + + def clean(self): + """If both dates are set, end_date must not be before start_date.""" + cleaned = super().clean() + start = cleaned.get('start_date') + end = cleaned.get('end_date') + if start and end and end < start: + self.add_error('end_date', 'End date cannot be before start date.') + return cleaned diff --git a/core/templates/base.html b/core/templates/base.html index 304e71c..0009da1 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -67,7 +67,31 @@ Receipts + {# === RESOURCES DROPDOWN (admin only) === + Friendly management pages for Teams and Projects — an + alternative to Django admin. Workers will be added here + when the Workers management UI ships in a later release. #} {% if user.is_staff %} +
  • + {% with url_name=request.resolver_match.url_name %} + + + {% endwith %} +
  • Admin diff --git a/core/templates/core/index.html b/core/templates/core/index.html index 520acb2..37ae5ca 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -246,6 +246,11 @@ {# === PROJECTS TAB === #}
    +
    + + Manage All Projects + +
    {% for item in projects %}
    {{ item.name }} @@ -261,6 +266,11 @@ {# === TEAMS TAB === #}
    +
    + + Manage All Teams + +
    {% for item in teams %}
    {{ item.name }} diff --git a/core/templates/core/projects/batch_report.html b/core/templates/core/projects/batch_report.html new file mode 100644 index 0000000..1a78ec7 --- /dev/null +++ b/core/templates/core/projects/batch_report.html @@ -0,0 +1,105 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Projects Report | Fox Fitt{% endblock %} + +{% block content %} +{# === PROJECT BATCH REPORT === + Admin-only. Per-project lifetime aggregates. Filter by active/inactive/all. + CSV download preserves the same filter. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + Projects Batch Report +

    +
    + + Download CSV + + + Back to Projects + +
    +
    + + {# === FILTER BAR === #} +
    +
    +
    +
    + + +
    +
    +
    +
    + + {# === REPORT TABLE === #} +
    +
    + + + + + + + + + + + + + + {% for row in project_rows %} + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    ProjectTimelineSupervisorsTeams InvolvedWorkersWorker-DaysLabour Cost
    + + {{ row.project.name }} + + {% if not row.project.active %} + Inactive + {% endif %} + + {% if row.project.start_date %}{{ row.project.start_date|date:"d M Y" }}{% else %}—{% endif %} + → + {% if row.project.end_date %}{{ row.project.end_date|date:"d M Y" }}{% else %}ongoing{% endif %} + {{ row.supervisor_count }} + {% for team_name in row.teams_involved %} + {{ team_name }} + {% empty %} + — + {% endfor %} + {{ row.worker_count }}{{ row.total_worker_days }}R {{ row.labour_cost|floatformat:2 }}
    No projects match this filter.
    +
    +
    + +

    + + Worker-Days = sum of workers across every day of work. + Labour Cost = sum of daily rates for every worker on every day. +

    + +
    +{% endblock %} diff --git a/core/templates/core/projects/detail.html b/core/templates/core/projects/detail.html new file mode 100644 index 0000000..e64635f --- /dev/null +++ b/core/templates/core/projects/detail.html @@ -0,0 +1,319 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{{ project.name }} | Projects | Fox Fitt{% endblock %} + +{% block content %} +{# === PROJECT DETAIL PAGE === + Admin-only, read-only view with 5 tabs: + Profile · Supervisors · Teams · Workers · History. #} + +
    + + {# === PAGE HEADER === #} +
    +
    +

    + {{ project.name }} +

    + {% if project.active %} + Active + {% else %} + Inactive + {% endif %} + {% if project.start_date or project.end_date %} + + + {% if project.start_date %}{{ project.start_date|date:"d M Y" }}{% else %}—{% endif %} + → + {% if project.end_date %}{{ project.end_date|date:"d M Y" }}{% else %}ongoing{% endif %} + + {% endif %} +
    +
    + + Edit Project + + + Back to Projects + +
    +
    + + {# === TABS === #} + + +
    + + {# === PROFILE TAB === #} +
    +
    +
    +
    +
    Name
    +
    {{ project.name }}
    + +
    Description
    +
    + {% if project.description %} + {{ project.description|linebreaks }} + {% else %} + No description. + {% endif %} +
    + +
    Status
    +
    + {% if project.active %} + Active + {% else %} + Inactive + {% endif %} +
    + +
    Start Date
    +
    + {% if project.start_date %}{{ project.start_date|date:"d M Y" }}{% else %}—{% endif %} +
    + +
    End Date
    +
    + {% if project.end_date %}{{ project.end_date|date:"d M Y" }}{% else %}Ongoing{% endif %} +
    +
    +
    +
    +
    + + {# === SUPERVISORS TAB === #} +
    +
    +
    + + + + + + + + + + + {% for s in supervisors %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    UsernameFull NameEmailStaff
    {{ s.username }} + {% if s.first_name or s.last_name %} + {{ s.first_name }} {{ s.last_name }} + {% else %} + — + {% endif %} + + {% if s.email %}{{ s.email }}{% else %}—{% endif %} + + {% if s.is_staff %} + + + + {% else %} + — + {% endif %} +
    No supervisors assigned.
    +
    +
    +
    + + {# === TEAMS TAB === #} +
    +
    +
    + {% if teams_involved %} +

    Teams that have worked on this project at some point.

    +
    + {% for team in teams_involved %} +
    +
    +
    + + {{ team.name }} + + {% if team.supervisor %} +
    + {{ team.supervisor.username }} +
    + {% endif %} +
    + {% if team.active %} + Active + {% else %} + Inactive + {% endif %} +
    +
    + {% endfor %} +
    + {% else %} +

    No teams have been logged on this project yet.

    + {% endif %} +
    +
    +
    + + {# === WORKERS TAB === #} +
    +
    +
    + + + + + + + + + + + {% for w in workers_involved %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    NameID NumberDaily RateStatus
    {{ w.name }}{{ w.id_number }}R {{ w.daily_rate|floatformat:2 }} + {% if w.active %} + Active + {% else %} + Inactive + {% endif %} +
    No workers have logged attendance on this project.
    +
    +
    +
    + + {# === HISTORY TAB === #} +
    +
    +
    +
    +
    +
    Total Worker-Days
    +
    {{ total_worker_days }}
    +
    +
    +
    +
    +
    +
    +
    Lifetime Labour Cost
    +
    R {{ labour_cost|floatformat:2 }}
    +
    +
    +
    +
    +
    +
    +
    Active Date Range
    +
    + {% if date_range.0 %} + {{ date_range.0|date:"d M Y" }}
    + to {{ date_range.1|date:"d M Y" }} + {% else %} + No logs yet + {% endif %} +
    +
    +
    +
    +
    + +
    +
    +
    Recent Work Logs
    +
    +
    + + + + + + + + + + + {% for log in recent_logs %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    DateTeamWorkersSupervisor
    {{ log.date|date:"d M Y" }} + {% if log.team %} + {{ log.team.name }} + {% else %} + — + {% endif %} + {{ log.workers.count }} + {% if log.supervisor %}{{ log.supervisor.username }}{% else %}—{% endif %} +
    No work logs yet.
    +
    +
    +
    + +
    + +
    +{% endblock %} diff --git a/core/templates/core/projects/edit.html b/core/templates/core/projects/edit.html new file mode 100644 index 0000000..b090afb --- /dev/null +++ b/core/templates/core/projects/edit.html @@ -0,0 +1,150 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{% if is_new %}New Project{% else %}Edit {{ project.name }}{% endif %} | Fox Fitt{% endblock %} + +{% block content %} +{# === PROJECT EDIT/CREATE PAGE === + Serves both /projects/new/ and /projects//edit/. + Form sections: Project Basics · Timeline · Supervisors. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + + {% if is_new %}New Project{% else %}Edit: {{ project.name }}{% endif %} +

    +
    + {% if not is_new %} + + Cancel + + {% else %} + + Cancel + + {% endif %} +
    +
    + +
    + {% csrf_token %} + + {% if form.non_field_errors %} +
    + {{ form.non_field_errors }} +
    + {% endif %} + +
    + + {# === PROJECT BASICS === #} +
    +
    +
    +
    Project Basics
    +
    +
    +
    + + {{ form.name }} + {% if form.name.errors %}
    {{ form.name.errors.0 }}
    {% endif %} +
    +
    + + {{ form.description }} + {% if form.description.errors %}
    {{ form.description.errors.0 }}
    {% endif %} +
    +
    + {{ form.active }} + +
    + Inactive projects are hidden from attendance logging forms. +
    +
    +
    +
    +
    + + {# === TIMELINE === #} +
    +
    +
    +
    Timeline
    +
    +
    +

    + Optional. Used for reporting and filtering. +

    +
    + + {{ form.start_date }} + {% if form.start_date.errors %}
    {{ form.start_date.errors.0 }}
    {% endif %} +
    +
    + + {{ form.end_date }} + {% if form.end_date.errors %}
    {{ form.end_date.errors.0 }}
    {% endif %} +
    + Leave blank for ongoing projects. +
    +
    +
    +
    +
    + + {# === SUPERVISORS PICKER === #} +
    +
    +
    +
    Supervisors
    +
    +
    +

    + Any number of supervisors may be assigned. + Only admins and members of the "Work Logger" group are listed. +

    + {% if form.supervisors.errors %} +
    {{ form.supervisors.errors.0 }}
    + {% endif %} +
    + {% for choice in form.supervisors %} +
    +
    + {{ choice.tag }} + +
    +
    + {% empty %} +
    + No eligible supervisors. Add a user to the "Work Logger" group or grant them staff access first. +
    + {% endfor %} +
    +
    +
    +
    +
    + + {# === SUBMIT ROW === #} +
    + {% if not is_new %} + Cancel + {% else %} + Cancel + {% endif %} + +
    +
    + +
    +{% endblock %} diff --git a/core/templates/core/projects/list.html b/core/templates/core/projects/list.html new file mode 100644 index 0000000..1bbc700 --- /dev/null +++ b/core/templates/core/projects/list.html @@ -0,0 +1,141 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Projects | Fox Fitt{% endblock %} + +{% block content %} +{# === PROJECT LIST PAGE === + Admin-only. Shows every project with supervisor summary, worker count, + active status, and date range. Filter by active/inactive/all; search by name. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + Projects +

    +
    + + Batch Report + + + New Project + + + Back + +
    +
    + + {# === FILTER BAR === #} +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + {# === PROJECT TABLE === #} +
    +
    + + + + + + + + + + + + + {% for row in project_data %} + {% with p=row.project %} + + + + + + + + + {% endwith %} + {% empty %} + + + + {% endfor %} + +
    NameSupervisorsWorkersTimelineStatusActions
    + + {{ p.name }} + + + {% with first=p.supervisors.first total=p.supervisors.count %} + {% if first %} + {{ first.username }} + {% if total > 1 %} + and {{ total|add:"-1" }} more + {% endif %} + {% else %} + — + {% endif %} + {% endwith %} + + {{ row.worker_count }} + + {% if p.start_date %} + {{ p.start_date|date:"d M Y" }} + {% else %} + — + {% endif %} + → + {% if p.end_date %} + {{ p.end_date|date:"d M Y" }} + {% else %} + ongoing + {% endif %} + + {% if p.active %} + Active + {% else %} + Inactive + {% endif %} + + + + + + + +
    + No projects match the current filter. + {% if search or active_filter != 'all' %} + Clear filters. + {% endif %} +
    +
    +
    + +
    +{% endblock %} diff --git a/core/templates/core/teams/batch_report.html b/core/templates/core/teams/batch_report.html new file mode 100644 index 0000000..3ad1a0c --- /dev/null +++ b/core/templates/core/teams/batch_report.html @@ -0,0 +1,115 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Teams Report | Fox Fitt{% endblock %} + +{% block content %} +{# === TEAM BATCH REPORT === + Admin-only. Per-team lifetime aggregates. Filter by active/inactive/all. + CSV download preserves the same filter. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + Teams Batch Report +

    +
    + + Download CSV + + + Back to Teams + +
    +
    + + {# === FILTER BAR === #} +
    +
    +
    +
    + + +
    +
    +
    +
    + + {# === REPORT TABLE === #} +
    +
    + + + + + + + + + + + + + + + {% for row in team_rows %} + + + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    TeamSupervisorWorkersPay ScheduleWork DaysWorker-DaysLabour CostProjects
    + + {{ row.team.name }} + + {% if not row.team.active %} + Inactive + {% endif %} + + {% if row.team.supervisor %} + {{ row.team.supervisor.username }} + {% else %} + — + {% endif %} + {{ row.worker_count }} + {% if row.team.pay_frequency %} + {{ row.team.get_pay_frequency_display }} + {% else %} + Not set + {% endif %} + {{ row.total_work_days }}{{ row.total_worker_days }}R {{ row.labour_cost|floatformat:2 }} + {% for project_name in row.projects_touched %} + {{ project_name }} + {% empty %} + — + {% endfor %} +
    No teams match this filter.
    +
    +
    + +

    + + Work Days = total attendance records. Worker-Days = sum of workers across all records. + Labour Cost = sum of daily rates for every worker on every day. +

    + +
    +{% endblock %} diff --git a/core/templates/core/teams/detail.html b/core/templates/core/teams/detail.html new file mode 100644 index 0000000..d513571 --- /dev/null +++ b/core/templates/core/teams/detail.html @@ -0,0 +1,296 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{{ team.name }} | Teams | Fox Fitt{% endblock %} + +{% block content %} +{# === TEAM DETAIL PAGE === + Admin-only, read-only view with 4 tabs: + Profile · Pay Schedule · Workers · History. #} + +
    + + {# === PAGE HEADER === #} +
    +
    +

    + {{ team.name }} +

    + {% if team.active %} + Active + {% else %} + Inactive + {% endif %} + {% if team.supervisor %} + + Supervisor: {{ team.supervisor.username }} + + {% endif %} +
    +
    + + Edit Team + + + Back to Teams + +
    +
    + + {# === TABS === #} + + +
    + + {# === PROFILE TAB === #} +
    +
    +
    +
    +
    Name
    +
    {{ team.name }}
    + +
    Supervisor
    +
    + {% if team.supervisor %} + {{ team.supervisor.username }} + {% if team.supervisor.email %} + ({{ team.supervisor.email }}) + {% endif %} + {% else %} + Not assigned + {% endif %} +
    + +
    Status
    +
    + {% if team.active %} + Active + {% else %} + Inactive + {% endif %} +
    + +
    Pay Frequency
    +
    + {% if team.pay_frequency %} + {{ team.get_pay_frequency_display }} + {% else %} + Not set + {% endif %} +
    + +
    Pay Start Date
    +
    + {% if team.pay_start_date %} + {{ team.pay_start_date|date:"d M Y" }} + (anchor for pay period calculation) + {% else %} + Not set + {% endif %} +
    + +
    Worker Count
    +
    {{ workers.count }}
    +
    +
    +
    +
    + + {# === PAY SCHEDULE TAB === #} +
    +
    +
    + {% if current_period %} +
    Current Pay Period
    +

    + {{ current_period.0|date:"d M Y" }} — {{ current_period.1|date:"d M Y" }} +

    + + {% if upcoming_periods %} +
    +
    Upcoming Pay Periods
    +
      + {% for start, end in upcoming_periods %} +
    • + + {{ start|date:"d M Y" }} — {{ end|date:"d M Y" }} +
      • + {% endfor %} +
    + {% endif %} + +
    +

    + + Pay periods are calculated from the anchor date + ({{ team.pay_start_date|date:"d M Y" }}) stepping forward by + {{ team.get_pay_frequency_display|lower }} intervals. +

    + {% else %} +

    + + This team has no pay schedule configured. +

    +

    + To enable pay period calculations, edit the team and set both + Pay Frequency (weekly/fortnightly/monthly) and + Pay Start Date. +

    + + Set up pay schedule + + {% endif %} +
    +
    +
    + + {# === WORKERS TAB === #} +
    +
    +
    + + + + + + + + + + + + {% for w in workers %} + + + + + + + + {% empty %} + + + + {% endfor %} + +
    NameID NumberMonthly SalaryDaily RateStatus
    {{ w.name }}{{ w.id_number }}R {{ w.monthly_salary|floatformat:2 }}R {{ w.daily_rate|floatformat:2 }} + {% if w.active %} + Active + {% else %} + Inactive + {% endif %} +
    No workers assigned to this team yet.
    +
    +
    +
    + + {# === HISTORY TAB === #} +
    +
    +
    +
    +
    +
    Total Work Days
    +
    {{ total_days }}
    +
    +
    +
    +
    +
    +
    +
    Projects Worked
    +
    {{ projects_touched|length }}
    +
    +
    +
    +
    +
    +
    +
    Lifetime Labour Cost
    +
    R {{ labour_cost|floatformat:2 }}
    +
    +
    +
    +
    + + {% if projects_touched %} +
    +
    +
    Projects this team has worked on
    +
    +
    + {% for name in projects_touched %} + + {{ name }} + + {% endfor %} +
    +
    + {% endif %} + +
    +
    +
    Recent Work Logs
    +
    +
    + + + + + + + + + + + {% for log in recent_logs %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    DateProjectWorkersSupervisor
    {{ log.date|date:"d M Y" }}{{ log.project.name }}{{ log.workers.count }} + {% if log.supervisor %} + {{ log.supervisor.username }} + {% else %} + — + {% endif %} +
    No work logs yet.
    +
    +
    +
    + +
    + +
    +{% endblock %} diff --git a/core/templates/core/teams/edit.html b/core/templates/core/teams/edit.html new file mode 100644 index 0000000..23a33fb --- /dev/null +++ b/core/templates/core/teams/edit.html @@ -0,0 +1,152 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}{% if is_new %}New Team{% else %}Edit {{ team.name }}{% endif %} | Fox Fitt{% endblock %} + +{% block content %} +{# === TEAM EDIT/CREATE PAGE === + Serves both /teams/new/ and /teams//edit/. + Form sections: Team Basics · Pay Schedule · Workers. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + + {% if is_new %}New Team{% else %}Edit: {{ team.name }}{% endif %} +

    +
    + {% if not is_new %} + + Cancel + + {% else %} + + Cancel + + {% endif %} +
    +
    + +
    + {% csrf_token %} + + {# === FORM-LEVEL ERRORS === #} + {% if form.non_field_errors %} +
    + {{ form.non_field_errors }} +
    + {% endif %} + +
    + + {# === TEAM BASICS === #} +
    +
    +
    +
    Team Basics
    +
    +
    +
    + + {{ form.name }} + {% if form.name.errors %}
    {{ form.name.errors.0 }}
    {% endif %} +
    +
    + + {{ form.supervisor }} + {% if form.supervisor.errors %}
    {{ form.supervisor.errors.0 }}
    {% endif %} +
    + The user who manages this team — admin or member of the Work Logger group. +
    +
    +
    + {{ form.active }} + +
    + Inactive teams are hidden from attendance logging forms. +
    +
    +
    +
    +
    + + {# === PAY SCHEDULE === #} +
    +
    +
    +
    Pay Schedule
    +
    +
    +

    + Optional. If set, the app can calculate pay periods automatically. + Both fields must be filled together (or both left blank). +

    +
    + + {{ form.pay_frequency }} + {% if form.pay_frequency.errors %}
    {{ form.pay_frequency.errors.0 }}
    {% endif %} +
    +
    + + {{ form.pay_start_date }} + {% if form.pay_start_date.errors %}
    {{ form.pay_start_date.errors.0 }}
    {% endif %} +
    + Anchor date — the first day of the very first pay period. Never needs updating. +
    +
    +
    +
    +
    + + {# === WORKERS PICKER === #} +
    +
    +
    +
    Workers
    + + Inactive workers appear with a grey badge and are still selectable. + +
    +
    + {% if form.workers.errors %} +
    {{ form.workers.errors.0 }}
    + {% endif %} +
    + {% for choice in form.workers %} +
    +
    + {{ choice.tag }} + +
    +
    + {% empty %} +
    No workers exist yet.
    + {% endfor %} +
    +
    +
    +
    +
    + + {# === SUBMIT ROW === #} +
    + {% if not is_new %} + Cancel + {% else %} + Cancel + {% endif %} + +
    +
    + +
    +{% endblock %} diff --git a/core/templates/core/teams/list.html b/core/templates/core/teams/list.html new file mode 100644 index 0000000..c203f96 --- /dev/null +++ b/core/templates/core/teams/list.html @@ -0,0 +1,131 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %}Teams | Fox Fitt{% endblock %} + +{% block content %} +{# === TEAM LIST PAGE === + Admin-only. Shows every team with supervisor, worker count, pay schedule, + and active status. Filter by active/inactive/all; search by name. #} + +
    + + {# === PAGE HEADER === #} +
    +

    + Teams +

    +
    + + Batch Report + + + New Team + + + Back + +
    +
    + + {# === FILTER BAR === #} +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    +
    + + {# === TEAM TABLE === #} +
    +
    + + + + + + + + + + + + + {% for team in teams %} + + + + + + + + + {% empty %} + + + + {% endfor %} + +
    NameSupervisorWorkersPay ScheduleStatusActions
    + + {{ team.name }} + + + {% if team.supervisor %} + {{ team.supervisor.username }} + {% else %} + — + {% endif %} + + {{ team.workers.count }} + + {% if team.pay_frequency %} + {{ team.get_pay_frequency_display }} + {% if team.pay_start_date %} +
    from {{ team.pay_start_date|date:"d M Y" }} + {% endif %} + {% else %} + Not set + {% endif %} +     		+ {% if team.active %} + Active + {% else %} + Inactive + {% endif %} + + + + + + + +
    + No teams match the current filter. + {% if search or active_filter != 'all' %} + Clear filters. + {% endif %} +
    +
    +
    + +
    +{% endblock %} diff --git a/core/urls.py b/core/urls.py index 6cf935d..0c75919 100644 --- a/core/urls.py +++ b/core/urls.py @@ -24,6 +24,25 @@ urlpatterns = [ # AJAX toggle — activates/deactivates workers, projects, teams from dashboard path('toggle///', views.toggle_active, name='toggle_active'), + # === TEAMS MANAGEMENT === + # Friendly form-based management pages (alternative to Django admin). + # Admins can view, create, edit, and report on teams without leaving the app. + path('teams/', views.team_list, name='team_list'), + path('teams/new/', views.team_edit, name='team_new'), + path('teams//', views.team_detail, name='team_detail'), + path('teams//edit/', views.team_edit, name='team_edit'), + path('teams/report/', views.team_batch_report, name='team_batch_report'), + path('teams/report/csv/', views.team_batch_report_csv, name='team_batch_report_csv'), + + # === PROJECTS MANAGEMENT === + # Same pattern as Teams — friendly management pages outside Django admin. + path('projects/', views.project_list, name='project_list'), + path('projects/new/', views.project_edit, name='project_new'), + path('projects//', views.project_detail, name='project_detail'), + path('projects//edit/', views.project_edit, name='project_edit'), + path('projects/report/', views.project_batch_report, name='project_batch_report'), + path('projects/report/csv/', views.project_batch_report_csv, name='project_batch_report_csv'), + # === PAYROLL === # Main payroll dashboard — shows pending payments, history, loans, and charts path('payroll/', views.payroll_dashboard, name='payroll_dashboard'), diff --git a/core/views.py b/core/views.py index e895c75..1a0b554 100644 --- a/core/views.py +++ b/core/views.py @@ -23,7 +23,8 @@ from django.utils.html import strip_tags from django.conf import settings from .models import Worker, Project, WorkLog, Team, PayrollRecord, Loan, PayrollAdjustment -from .forms import AttendanceLogForm, PayrollAdjustmentForm, ExpenseReceiptForm, ExpenseLineItemFormSet +from .forms import (AttendanceLogForm, PayrollAdjustmentForm, ExpenseReceiptForm, + ExpenseLineItemFormSet, TeamForm, ProjectForm) # NOTE: render_to_pdf is NOT imported here at the top level. # It's imported lazily inside process_payment() and create_receipt() # to avoid crashing the entire app if xhtml2pdf is not installed on the server. @@ -2636,6 +2637,436 @@ def run_migrate(request): ) +# ============================================================================= +# === TEAM MANAGEMENT VIEWS === +# Friendly form-based pages for Teams. Mirrors the Django admin Team screens +# but inside the app UI so the owner doesn't need to use /admin/ for routine +# maintenance. +# ============================================================================= + +def _build_team_report_context(request): + """Shared helper for the team batch report (HTML + CSV). + + Builds a list of dicts — one per team — with aggregate stats used + across the HTML table, the printable batch report, and the CSV export. + Separated so all three views pull identical numbers. + """ + # Optional filter: ?active=active|inactive|all (default: active) + active_filter = request.GET.get('active', 'active') + teams_qs = Team.objects.all().order_by('name') + if active_filter == 'active': + teams_qs = teams_qs.filter(active=True) + elif active_filter == 'inactive': + teams_qs = teams_qs.filter(active=False) + + rows = [] + for team in teams_qs.prefetch_related('workers', 'work_logs__project', + 'work_logs__workers'): + # Collect distinct projects + total worker-days lifetime + projects_touched = set() + total_worker_days = 0 + for log in team.work_logs.all(): + projects_touched.add(log.project.name) + total_worker_days += log.workers.count() + + # Total lifetime labour cost for this team + labour_cost = Decimal('0.00') + for log in team.work_logs.all(): + for w in log.workers.all(): + labour_cost += w.daily_rate + + # Current pay period (if configured) + period_start, period_end = get_pay_period(team) + + rows.append({ + 'team': team, + 'worker_count': team.workers.count(), + 'total_work_days': team.work_logs.count(), + 'total_worker_days': total_worker_days, + 'labour_cost': labour_cost.quantize(Decimal('0.01')), + 'projects_touched': sorted(projects_touched), + 'period_start': period_start, + 'period_end': period_end, + }) + + return {'team_rows': rows, 'active_filter': active_filter} + + +@login_required +def team_list(request): + """Team list page at /teams/ — admin-only. + + Shows name · supervisor · worker count · pay schedule · active badge. + Filter bar: active / inactive / all; search by team name. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + active_filter = request.GET.get('active', 'active') + search = request.GET.get('q', '').strip() + + teams = Team.objects.all().order_by('name') + if active_filter == 'active': + teams = teams.filter(active=True) + elif active_filter == 'inactive': + teams = teams.filter(active=False) + if search: + teams = teams.filter(name__icontains=search) + + # Annotate worker count per team in a single query (instead of per-row lookups) + teams = teams.prefetch_related('workers', 'supervisor') + + return render(request, 'core/teams/list.html', { + 'teams': teams, + 'active_filter': active_filter, + 'search': search, + }) + + +@login_required +def team_detail(request, team_id): + """Team detail page — admin-only. Read-only with 4 tabs. + + Tabs: Profile · Pay Schedule · Workers · History. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + team = get_object_or_404(Team, pk=team_id) + + # === PAY SCHEDULE TAB: current + next 2 upcoming periods === + # Step forward from the current period end to compute the next 2 periods. + upcoming_periods = [] + period_start, period_end = get_pay_period(team) + if period_start and period_end: + # Iterate forward 2 more times to get the next 2 upcoming periods + cursor = period_end + datetime.timedelta(days=1) + for _ in range(2): + nxt_start, nxt_end = get_pay_period(team, reference_date=cursor) + if nxt_start and nxt_end: + upcoming_periods.append((nxt_start, nxt_end)) + cursor = nxt_end + datetime.timedelta(days=1) + else: + break + + # === WORKERS TAB === + # All workers in this team, with active status for the template badge + workers = team.workers.all().order_by('name') + + # === HISTORY TAB === + # Work logs for this team — total days, projects touched, labour cost, + # and the 10 most recent logs. + work_logs = team.work_logs.select_related('project').prefetch_related('workers') + total_days = work_logs.count() + projects_touched = sorted({log.project.name for log in work_logs}) + labour_cost = Decimal('0.00') + for log in work_logs: + for w in log.workers.all(): + labour_cost += w.daily_rate + labour_cost = labour_cost.quantize(Decimal('0.01')) + recent_logs = work_logs.order_by('-date')[:10] + + return render(request, 'core/teams/detail.html', { + 'team': team, + 'current_period': (period_start, period_end) if period_start else None, + 'upcoming_periods': upcoming_periods, + 'workers': workers, + 'total_days': total_days, + 'projects_touched': projects_touched, + 'labour_cost': labour_cost, + 'recent_logs': recent_logs, + }) + + +@login_required +def team_edit(request, team_id=None): + """Create a new team (when team_id is None) or edit an existing one. + + Both /teams/new/ and /teams//edit/ route here — Django passes + team_id=None for the 'new' URL. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + team = get_object_or_404(Team, pk=team_id) if team_id else None + + if request.method == 'POST': + form = TeamForm(request.POST, instance=team) + if form.is_valid(): + saved_team = form.save() + action = 'updated' if team_id else 'created' + messages.success(request, f'Team "{saved_team.name}" {action} successfully.') + return redirect('team_detail', team_id=saved_team.pk) + else: + form = TeamForm(instance=team) + + return render(request, 'core/teams/edit.html', { + 'form': form, + 'team': team, # None when creating — template uses it to pick heading + 'is_new': team_id is None, + }) + + +@login_required +def team_batch_report(request): + """Admin-only. Batch report across all teams — HTML page. + + Shows per-team aggregates: supervisor, worker count, pay schedule, + total work days, labour cost, projects worked on. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + context = _build_team_report_context(request) + return render(request, 'core/teams/batch_report.html', context) + + +@login_required +def team_batch_report_csv(request): + """Admin-only. Same data as the batch report, downloaded as CSV.""" + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + context = _build_team_report_context(request) + + response = HttpResponse(content_type='text/csv') + ts = timezone.now().strftime('%Y%m%d_%H%M%S') + response['Content-Disposition'] = f'attachment; filename="teams_report_{ts}.csv"' + + writer = csv.writer(response) + writer.writerow([ + 'Team Name', 'Supervisor', 'Active', 'Pay Frequency', 'Pay Start Date', + 'Worker Count', 'Total Work Days', 'Total Worker-Days', + 'Lifetime Labour Cost', 'Projects Worked On', + ]) + for row in context['team_rows']: + t = row['team'] + writer.writerow([ + t.name, + t.supervisor.username if t.supervisor else '', + 'Yes' if t.active else 'No', + t.pay_frequency or '', + t.pay_start_date.isoformat() if t.pay_start_date else '', + row['worker_count'], + row['total_work_days'], + row['total_worker_days'], + f"{row['labour_cost']:.2f}", + '; '.join(row['projects_touched']), + ]) + return response + + +# ============================================================================= +# === PROJECT MANAGEMENT VIEWS === +# Same pattern as Team management — friendly form-based pages outside admin. +# ============================================================================= + +def _build_project_report_context(request): + """Shared helper for the project batch report (HTML + CSV). + + Builds a row-per-project list with the aggregates the report displays: + supervisor count, teams involved, distinct workers, total worker-days, + and lifetime labour cost. + """ + active_filter = request.GET.get('active', 'active') + projects_qs = Project.objects.all().order_by('name') + if active_filter == 'active': + projects_qs = projects_qs.filter(active=True) + elif active_filter == 'inactive': + projects_qs = projects_qs.filter(active=False) + + rows = [] + for project in projects_qs.prefetch_related( + 'supervisors', 'work_logs__team', 'work_logs__workers'): + # Count distinct teams and workers that have worked on this project + teams_involved = set() + workers_involved = set() + total_worker_days = 0 + labour_cost = Decimal('0.00') + log_dates = [] + for log in project.work_logs.all(): + if log.team: + teams_involved.add(log.team.name) + log_dates.append(log.date) + for w in log.workers.all(): + workers_involved.add(w.id) + total_worker_days += 1 + labour_cost += w.daily_rate + + # Date range of all activity (earliest to latest log) + date_range = (min(log_dates), max(log_dates)) if log_dates else (None, None) + + rows.append({ + 'project': project, + 'supervisor_count': project.supervisors.count(), + 'teams_involved': sorted(teams_involved), + 'worker_count': len(workers_involved), + 'total_worker_days': total_worker_days, + 'labour_cost': labour_cost.quantize(Decimal('0.01')), + 'date_range': date_range, + }) + + return {'project_rows': rows, 'active_filter': active_filter} + + +@login_required +def project_list(request): + """Project list page at /projects/ — admin-only. + + Columns: name, supervisors (first + count), worker count, active, + start/end dates, actions. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + active_filter = request.GET.get('active', 'active') + search = request.GET.get('q', '').strip() + + projects = Project.objects.all().order_by('name') + if active_filter == 'active': + projects = projects.filter(active=True) + elif active_filter == 'inactive': + projects = projects.filter(active=False) + if search: + projects = projects.filter(name__icontains=search) + + projects = projects.prefetch_related('supervisors', 'work_logs__workers') + + # Annotate worker count (distinct workers across all work logs for this project) + project_data = [] + for p in projects: + worker_ids = set() + for log in p.work_logs.all(): + for w in log.workers.all(): + worker_ids.add(w.id) + project_data.append({ + 'project': p, + 'worker_count': len(worker_ids), + }) + + return render(request, 'core/projects/list.html', { + 'project_data': project_data, + 'active_filter': active_filter, + 'search': search, + }) + + +@login_required +def project_detail(request, project_id): + """Project detail page — admin-only. 5 tabs: Profile · Supervisors · + Teams · Workers · History. + """ + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + project = get_object_or_404(Project, pk=project_id) + + # === SUPERVISORS TAB === + supervisors = project.supervisors.all().order_by('username') + + # === TEAMS + WORKERS TABS === + # Gather which teams + distinct workers have worked on this project + work_logs = project.work_logs.select_related('team').prefetch_related('workers') + teams_involved = {} + workers_involved = {} + total_worker_days = 0 + labour_cost = Decimal('0.00') + log_dates = [] + for log in work_logs: + if log.team: + teams_involved[log.team.id] = log.team + log_dates.append(log.date) + for w in log.workers.all(): + workers_involved[w.id] = w + total_worker_days += 1 + labour_cost += w.daily_rate + + labour_cost = labour_cost.quantize(Decimal('0.01')) + date_range = (min(log_dates), max(log_dates)) if log_dates else (None, None) + + # === HISTORY TAB === + recent_logs = work_logs.order_by('-date')[:10] + + return render(request, 'core/projects/detail.html', { + 'project': project, + 'supervisors': supervisors, + 'teams_involved': list(teams_involved.values()), + 'workers_involved': sorted(workers_involved.values(), key=lambda w: w.name), + 'total_worker_days': total_worker_days, + 'labour_cost': labour_cost, + 'date_range': date_range, + 'recent_logs': recent_logs, + }) + + +@login_required +def project_edit(request, project_id=None): + """Create a new project (project_id=None) or edit an existing one.""" + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + project = get_object_or_404(Project, pk=project_id) if project_id else None + + if request.method == 'POST': + form = ProjectForm(request.POST, instance=project) + if form.is_valid(): + saved_project = form.save() + action = 'updated' if project_id else 'created' + messages.success(request, f'Project "{saved_project.name}" {action} successfully.') + return redirect('project_detail', project_id=saved_project.pk) + else: + form = ProjectForm(instance=project) + + return render(request, 'core/projects/edit.html', { + 'form': form, + 'project': project, + 'is_new': project_id is None, + }) + + +@login_required +def project_batch_report(request): + """Admin-only batch report across all projects — HTML.""" + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + context = _build_project_report_context(request) + return render(request, 'core/projects/batch_report.html', context) + + +@login_required +def project_batch_report_csv(request): + """Admin-only. Same data as batch report, downloaded as CSV.""" + if not is_admin(request.user): + return HttpResponseForbidden("Admin access required.") + + context = _build_project_report_context(request) + + response = HttpResponse(content_type='text/csv') + ts = timezone.now().strftime('%Y%m%d_%H%M%S') + response['Content-Disposition'] = f'attachment; filename="projects_report_{ts}.csv"' + + writer = csv.writer(response) + writer.writerow([ + 'Project Name', 'Active', 'Start Date', 'End Date', 'Supervisor Count', + 'Supervisors', 'Teams Involved', 'Worker Count', 'Total Worker-Days', + 'Lifetime Labour Cost', + ]) + for row in context['project_rows']: + p = row['project'] + writer.writerow([ + p.name, + 'Yes' if p.active else 'No', + p.start_date.isoformat() if p.start_date else '', + p.end_date.isoformat() if p.end_date else '', + row['supervisor_count'], + '; '.join(s.username for s in p.supervisors.all()), + '; '.join(row['teams_involved']), + row['worker_count'], + row['total_worker_days'], + f"{row['labour_cost']:.2f}", + ]) + return response + + # === BACKUP / RESTORE (browser-accessible, admin-only) === # Flatlogic has no shell/SSH — admins need to backup and restore via browser. # These views wrap the `backup_data` and `restore_data` management commands