diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index 642ba11..0000000 Binary files a/db.sqlite3 and /dev/null differ diff --git a/recruitment/__pycache__/urls.cpython-312.pyc b/recruitment/__pycache__/urls.cpython-312.pyc index cc455ac..f02d3e3 100644 Binary files a/recruitment/__pycache__/urls.cpython-312.pyc and b/recruitment/__pycache__/urls.cpython-312.pyc differ diff --git a/recruitment/__pycache__/urls.cpython-313.pyc b/recruitment/__pycache__/urls.cpython-313.pyc index 8ea1b3f..fef6675 100644 Binary files a/recruitment/__pycache__/urls.cpython-313.pyc and b/recruitment/__pycache__/urls.cpython-313.pyc differ diff --git a/recruitment/__pycache__/views.cpython-312.pyc b/recruitment/__pycache__/views.cpython-312.pyc index ecdf9e1..38268c6 100644 Binary files a/recruitment/__pycache__/views.cpython-312.pyc and b/recruitment/__pycache__/views.cpython-312.pyc differ diff --git a/recruitment/__pycache__/views.cpython-313.pyc b/recruitment/__pycache__/views.cpython-313.pyc index 0837bdf..e73d9b1 100644 Binary files a/recruitment/__pycache__/views.cpython-313.pyc and b/recruitment/__pycache__/views.cpython-313.pyc differ diff --git a/recruitment/migrations/0010_merge_20251013_1819.py b/recruitment/migrations/0010_merge_20251013_1819.py new file mode 100644 index 0000000..6acb9b0 --- /dev/null +++ b/recruitment/migrations/0010_merge_20251013_1819.py @@ -0,0 +1,14 @@ +# Generated by Django 5.2.7 on 2025-10-13 15:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('recruitment', '0009_merge_20251013_1714'), + ('recruitment', '0009_merge_20251013_1718'), + ] + + operations = [ + ] diff --git a/recruitment/urls.py b/recruitment/urls.py index bd02d46..aa42625 100644 --- a/recruitment/urls.py +++ b/recruitment/urls.py @@ -77,8 +77,8 @@ urlpatterns = [ path('htmx//candidate_set_exam_date/', views.candidate_set_exam_date, name='candidate_set_exam_date'), path('htmx/bulk_candidate_move_to_exam/', views.bulk_candidate_move_to_exam, name='bulk_candidate_move_to_exam'), - # path('forms/form//submit/', views.submit_form, name='submit_form'), - # path('forms/form//', views.form_wizard_view, name='form_wizard'), + path('forms/form//submit/', views.submit_form, name='submit_form'), + path('forms/form//', views.form_wizard_view, name='form_wizard'), path('forms//submissions//', views.form_submission_details, name='form_submission_details'), path('forms/template//submissions/', views.form_template_submissions_list, name='form_template_submissions_list'), path('forms/template//all-submissions/', views.form_template_all_submissions, name='form_template_all_submissions'), @@ -91,6 +91,7 @@ urlpatterns = [ # path('api/forms/save/', views.save_form_builder, name='save_form_builder'), # path('api/forms//load/', views.load_form, name='load_form'), # path('api/forms//update/', views.update_form_builder, name='update_form_builder'), + path('jobs//calendar/', views.interview_calendar_view, name='interview_calendar'), path('jobs//calendar/interview//', views.interview_detail_view, name='interview_detail'), ] diff --git a/recruitment/views.py b/recruitment/views.py index a974b2c..3b5efa9 100644 --- a/recruitment/views.py +++ b/recruitment/views.py @@ -320,20 +320,27 @@ def job_detail(request, slug): """View details of a specific job""" job = get_object_or_404(JobPosting, slug=slug) - + print(job) # Get all candidates for this job, ordered by most recent applicants = job.candidates.all().order_by("-created_at") + print(applicants) # Count candidates by stage for summary statistics total_applicant = applicants.count() + applied_count = applicants.filter(stage="Applied").count() + + exam_count=applicants.filter(stage="Exam").count + interview_count = applicants.filter(stage="Interview").count() + offer_count = applicants.filter(stage="Offer").count() + status_form = JobPostingStatusForm(instance=job) image_upload_form=JobPostingImageForm(instance=job) - + # 2. Check for POST request (Status Update Submission) if request.method == 'POST': @@ -359,6 +366,7 @@ def job_detail(request, slug): "applicants": applicants, "total_applicants": total_applicant, "applied_count": applied_count, + 'exam_count':exam_count, "interview_count": interview_count, "offer_count": offer_count, 'status_form':status_form, @@ -387,13 +395,13 @@ def job_image_upload(request, slug): def kaauh_career(request): - active_jobs = JobPosting.objects.select_related( - 'form_template' + active_jobs = JobPosting.objects.select_related( + 'form_template' ).filter( status='ACTIVE', form_template__is_active=True ) - + return render(request,'jobs/career.html',{'active_jobs':active_jobs}) @@ -924,7 +932,7 @@ def delete_form_template(request, template_id): def form_wizard_view(request, template_id): """Display the form as a step-by-step wizard""" - template = get_object_or_404(FormTemplate, id=template_id, is_active=True) + template = get_object_or_404(FormTemplate, pk=template_id, is_active=True) job_id = template.job.internal_job_id return render( request, @@ -1011,7 +1019,7 @@ def submit_form(request, template_id): job=submission.template.job, ) return redirect('application_success') - + except Exception as e: logger.error(f"Candidate creation failed,{e}") pass diff --git a/templates/base.html b/templates/base.html index 8e39bac..dc0738e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -307,7 +307,7 @@ {% endcomment %} -
  • +
  • {% include "icons/jobs.html" %} @@ -316,7 +316,7 @@
    • -
  • + {% comment %}
  • @@ -327,18 +327,18 @@ -
    • + {% endcomment %} -
  • +
  • {% include "icons/users.html" %} - {% trans "Candidates" %} + {% trans "Applicants" %}
    • -
  • +
  • @@ -351,7 +351,7 @@
    • -
  • +
  • diff --git a/templates/jobs/job_detail.html b/templates/jobs/job_detail.html index daa9ce7..78d6579 100644 --- a/templates/jobs/job_detail.html +++ b/templates/jobs/job_detail.html @@ -160,126 +160,6 @@ border: 1px solid; } - /* ==================================== */ - /* MULTI-COLORED CANDIDATE STAGE TRACKER */ - /* ==================================== */ - - .progress-stages { - position: relative; - padding: 1.5rem 0; - } - - .progress-stages a { - text-decoration: none; - color: inherit; - } - - .stage-item { - display: flex; - flex-direction: column; - align-items: center; - text-align: center; - min-width: 60px; - transition: all 0.3s ease; - color: var(--stage-inactive); - } - - .stage-icon { - width: 36px; - height: 36px; - border-radius: 50%; - background-color: #e9ecef; - color: var(--stage-inactive); - display: flex; - align-items: center; - justify-content: center; - font-size: 0.9rem; - z-index: 10; - border: 2px solid white; - box-shadow: 0 0 0 2px #e9ecef; - transition: all 0.3s ease; - } - - /* ---------------- STAGE SPECIFIC COLORS ---------------- */ - - /* APPLIED STAGE (Teal) */ - .stage-item[data-stage="Applied"].completed .stage-icon, - .stage-item[data-stage="Applied"].active .stage-icon { - background-color: var(--stage-applied); - color: white; - } - .stage-item[data-stage="Applied"].active { color: var(--stage-applied); } - - /* EXAM STAGE (Cyan/Info) */ - .stage-item[data-stage="Exam"].completed .stage-icon, - .stage-item[data-stage="Exam"].active .stage-icon { - background-color: var(--stage-exam); - color: white; - } - .stage-item[data-stage="Exam"].active { color: var(--stage-exam); } - - /* INTERVIEW STAGE (Yellow/Warning) */ - .stage-item[data-stage="Interview"].completed .stage-icon, - .stage-item[data-stage="Interview"].active .stage-icon { - background-color: var(--stage-interview); - color: var(--kaauh-primary-text); /* Dark text for light background */ - } - .stage-item[data-stage="Interview"].active { color: var(--stage-interview); } - - /* OFFER STAGE (Green/Success) */ - .stage-item[data-stage="Offer"].completed .stage-icon, - .stage-item[data-stage="Offer"].active .stage-icon { - background-color: var(--stage-offer); - color: white; - } - .stage-item[data-stage="Offer"].active { color: var(--stage-offer); } - - /* ---------------- GENERIC ACTIVE/COMPLETED STYLING ---------------- */ - - /* Active State (Applies glow/scale to current stage) */ - .stage-item.active .stage-icon { - box-shadow: 0 0 0 4px rgba(0, 99, 110, 0.4); - transform: scale(1.1); - } - .stage-item.active .stage-count { - font-weight: 700; - } - - /* Completed State (Applies dark text color to completed stages) */ - .stage-item.completed { - color: var(--kaauh-primary-text); - } - - /* Connector Line */ - .stage-connector { - flex-grow: 1; - height: 3px; - background-color: #e9ecef; - margin: 0 0.5rem; - position: relative; - top: -18px; - z-index: 1; - transition: background-color 0.3s ease; - } - - /* Line in completed state (Kept the line teal/primary for consistency) */ - .stage-connector.completed { - background-color: var(--kaauh-teal); - } - - /* Labels and counts */ - .stage-label { - font-size: 0.75rem; - margin-top: 0.4rem; - font-weight: 500; - white-space: nowrap; - } - .stage-count { - font-size: 0.9rem; - font-weight: 600; - margin-top: 0.1rem; - color: #6c757d; - } {% endblock %} @@ -487,68 +367,12 @@ {# RIGHT COLUMN: TABBED CARDS #}
    -
    -
    -
    {% trans "Applicant Tracking" %}
    -
    -
    - - {% comment %} STAGE 1: Applied {% endcomment %} - -
    - +
    +
    +
    {% trans "Applicant Tracking" %}
    + {% include 'jobs/partials/applicant_tracking.html' %}
    -
    {% trans "Applied" %}
    -
    {{ applied_count|default:"0" }}
    -     - - {% comment %} CONNECTOR 1 -> 2 {% endcomment %} -
    - - {% comment %} STAGE 2: Exam {% endcomment %} - -
    - -
    -
    {% trans "Exam" %}
    -
    {{ exam_count|default:"0" }}
    -     - - {% comment %} CONNECTOR 2 -> 3 {% endcomment %} -
    - - {% comment %} STAGE 3: Interview {% endcomment %} - -
    - -
    -
    {% trans "Interview" %}
    -
    {{ interview_count|default:"0" }}
    -     - - {% comment %} CONNECTOR 3 -> 4 {% endcomment %} -
    - - {% comment %} STAGE 4: Offer {% endcomment %} - -
    - -
    -
    {% trans "Offer" %}
    -
    {{ offer_count|default:"0" }}
    -
    -
    -
    -
    {# RIGHT TABS NAVIGATION #} @@ -575,7 +399,7 @@ {# TAB 1: APPLICANTS CONTENT #}
    {% trans "Total Applicants" %} ({{ total_applicants }})
    - {% if total_applicants > 0 %} + {% comment %} {% if total_applicants > 0 %}
    @@ -602,7 +426,7 @@
    - {% endif %} + {% endif %} {% endcomment %}
    @@ -699,12 +523,12 @@ {% trans "View All Existing Forms" %} {% endcomment %} - + {% comment %} {% trans "Create Candidate" %} {% trans "Manage Tiers" %} - + {% endcomment %}
    diff --git a/templates/jobs/job_list.html b/templates/jobs/job_list.html index a47f532..aac62e9 100644 --- a/templates/jobs/job_list.html +++ b/templates/jobs/job_list.html @@ -89,10 +89,10 @@ .table-hover tbody tr:hover { background-color: #f3f7f9; } - + /* Optimized Main Table Column Widths (Total must be 100%) */ .table th:nth-child(1) { width: 22%; } /* Job ID (Tight) */ - + .table th:nth-child(2) { width: 12%; } /* Source (Tight) */ .table th:nth-child(3) { width: 8%; } /* Actions (Tight, icon buttons) */ .table th:nth-child(4) { width: 8%; } /* Form (Tight, icon buttons) */ @@ -114,17 +114,17 @@ text-align: center; color: #6c757d; font-size: 0.75rem; /* Even smaller font for nested headers */ - width: calc(100% / 7); + width: calc(100% / 7); } /* Explicit widths are technically defined by the 1/7 rule, but keeping them for clarity/safety */ .nested-header-table thead th:nth-child(1), .nested-header-table thead th:nth-child(2), - .nested-header-table thead th:nth-child(5) { - width: calc(100% / 7); + .nested-header-table thead th:nth-child(5) { + width: calc(100% / 7); } .nested-header-table thead th:nth-child(3), - .nested-header-table thead th:nth-child(4) { - width: calc(100% / 7 * 2); + .nested-header-table thead th:nth-child(4) { + width: calc(100% / 7 * 2); } /* Inner Nested Table (P/F) */ @@ -157,9 +157,9 @@ font-size: 0.9rem; /* Keep data readable */ border-left: 1px solid var(--kaauh-border); } - .candidate-data-cell a { - display: block; - text-decoration: none; + .candidate-data-cell a { + display: block; + text-decoration: none; padding: 0.4rem 0; /* Minimized vertical padding */ } @@ -232,7 +232,7 @@ {% trans "Source" %} {% trans "Actions" %} {% trans "Manage Forms" %} - + {% trans "Applicants Metrics" %} @@ -240,7 +240,7 @@ - + - + +
    {% trans "Applied" %} {% trans "Screened" %}{% trans "Exam" %} @@ -249,7 +249,7 @@
    		{% trans "Interview" %} @@ -285,21 +285,23 @@ - + {# CANDIDATE MANAGEMENT DATA - 7 SEPARATE COLUMNS CORRESPONDING TO THE HEADER #} - - + + @@ -313,7 +315,7 @@ - + {% comment %} Fallback/Empty State {% endcomment %} {% if not jobs and not job_list_data and not page_obj %}
    diff --git a/templates/jobs/partials/applicant_tracking.html b/templates/jobs/partials/applicant_tracking.html new file mode 100644 index 0000000..382652c --- /dev/null +++ b/templates/jobs/partials/applicant_tracking.html @@ -0,0 +1,183 @@ +{% load static i18n %} + + + +
    +
    + + {% comment %} STAGE 1: Applied {% endcomment %} + +
    + +
    +
    {% trans "Screened" %}
    +
    {{ applied_count|default:"0" }}
    +     + + {% comment %} CONNECTOR 1 -> 2 {% endcomment %} +
    + + {% comment %} STAGE 2: Exam {% endcomment %} + +
    + +
    +
    {% trans "Exam" %}
    +
    {{ exam_count|default:"0" }}
    +     + + {% comment %} CONNECTOR 2 -> 3 {% endcomment %} +
    + + {% comment %} STAGE 3: Interview {% endcomment %} + +
    + +
    +
    {% trans "Interview" %}
    +
    {{ interview_count|default:"0" }}
    +     + + {% comment %} CONNECTOR 3 -> 4 {% endcomment %} +
    + + {% comment %} STAGE 4: Offer {% endcomment %} + +
    + +
    +
    {% trans "Offer" %}
    +
    {{ offer_count|default:"0" }}
    +     +
    +
    \ No newline at end of file diff --git a/templates/recruitment/candidate_exam_view.html b/templates/recruitment/candidate_exam_view.html index 048b73b..353eb92 100644 --- a/templates/recruitment/candidate_exam_view.html +++ b/templates/recruitment/candidate_exam_view.html @@ -5,143 +5,143 @@ {% block customCSS %} {% endblock %} {% block content %} -
    +
    -

    - - {% trans "Exam" %} - {{ job.title }} +

    + + {% trans "Exam Management" %} - {{ job.title }}

    -

    - Total Candidates: {{ total_candidates }} -

    +

    + {% trans "Candidates in Exam Stage:" %} {{ total_candidates }} +

    {% trans "Back to Job" %}
    - -
    + {# APPLICANT TRACKING TIMELINE INCLUSION #} +
    + {% include 'jobs/partials/applicant_tracking.html' %} +
    + {# END APPLICANT TRACKING TIMELINE INCLUSION #} + + {% comment %}
    +

    + {% trans "Define Top Candidates (Tiers)" %} +

    {% csrf_token %} -
    -
    - - +
    +
    + +
    -
    -
    +
    - + {% endcomment %}
    - -

    {% trans "Candidate Tiers" %}

    +

    + {% trans "Candidate List" %} + {{ candidates|length }} / {{ total_candidates }} Total + (Sorted by AI Score) +

    + +
    {% url "bulk_update_candidate_exam_status" job.slug as bulk_update_candidate_exam_status_url %} - {% if candidates %} - - - {% endif %} -
    -
    - - - - - - - - - + {% if job.form_template %} + + + + + + + + + + {% endif %}
    		{% if job.metrics.applied %}{{ job.metrics.applied }}{% else %}-{% endif %}{% if job.metrics.screening %}{{ job.metrics.screening }}{% else %}-{% endif %}{% if job.metrics.applied %}{{ job.metrics.applied }}{% else %}-{% endif %}{% if job.metrics.screening %}{{ job.metrics.screening }}{% else %}-{% endif %} {% if job.metrics.exam_p %}{{ job.metrics.exam_p }}{% else %}-{% endif %} {% if job.metrics.exam_f %}{{ job.metrics.exam_f }}{% else %}-{% endif %} {% if job.metrics.interview_p %}{{ job.metrics.interview_p }}{% else %}-{% endif %}
    - - - - - - - - - - - - - {% for candidate in candidates %} + +
    + {% if candidates %} + + + {% endif %} +
    + + + {% csrf_token %} +
    - {% if candidates %} -
    - -
    - {% endif %} -     		{% trans "Name" %}{% trans "Contact" %}{% trans "AI Score" %}{% trans "Exam Status" %}{% trans "Exam Date" %}{% trans "Actions" %}
    + + + + + + + + + + + + + {% for candidate in candidates %} - - + - - {% endfor %} - -
    + {% if candidates %} +
    + +
    + {% endif %} +     		{% trans "Name" %}{% trans "Contact" %}{% trans "AI Score" %}{% trans "Exam Status" %}{% trans "Exam Date" %}{% trans "Actions" %}
    		 -
    {{ candidate.name }}
    -     		-
    - Email: {{ candidate.email }}
    - Phone: {{ candidate.phone }}
    +
    + {{ candidate.name }} + {# Tier logic updated to be cleaner #} + {% if forloop.counter <= tier1_count %} + Tier 1 + {% elif forloop.counter <= tier1_count|default:0|add:tier1_count %} + Tier 2 + {% else %} + Tier 3+ + {% endif %}
    		- {{ candidate.match_score|default:"0" }} +
    + {{ candidate.email }}
    + {{ candidate.phone }} +
    		+ + {{ candidate.match_score|default:"0" }}% + {% if candidate.exam_status == "Passed" %} - {{ candidate.exam_status }} + {{ candidate.exam_status }} {% elif candidate.exam_status == "Failed" %} - {{ candidate.exam_status }} + {{ candidate.exam_status }} + {% else %} + Pending {% endif %} {{candidate.exam_date|date:"M d, Y h:i A"}} - + - + - {% if candidate.stage != "Exam" %} - - {% endif %} + title="Set Exam Status/Date"> + Set Exam +
    - - - + {% endfor %} +
    + {% if not candidates %} + + {% endif %} + +
    +
    + +