From 3749fbd3efe793a8a13c9105bbe6c6f4dc39663d Mon Sep 17 00:00:00 2001 From: ismail Date: Fri, 28 Nov 2025 20:25:16 +0300 Subject: [PATCH 1/5] update some urls --- recruitment/views.py | 7 +++---- templates/interviews/interview_create_type_selection.html | 2 +- templates/recruitment/applications_interview_view.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/recruitment/views.py b/recruitment/views.py index 5db6769..01b6808 100644 --- a/recruitment/views.py +++ b/recruitment/views.py @@ -5138,11 +5138,10 @@ def portal_logout(request): def interview_create_type_selection(request, candidate_slug): """Show interview type selection page for a candidate""" candidate = get_object_or_404(Application, slug=candidate_slug) - # Validate candidate is in Interview stage - if candidate.stage != 'Interview': - messages.error(request, f"Candidate {candidate.name} is not in Interview stage.") - return redirect('candidate_interview_view', slug=candidate.job.slug) + # if candidate.stage != 'Interview': + # messages.error(request, f"Candidate {candidate.name} is not in Interview stage.") + # return redirect('candidate_interview_view', slug=candidate.job.slug) context = { 'candidate': candidate, diff --git a/templates/interviews/interview_create_type_selection.html b/templates/interviews/interview_create_type_selection.html index 3b5ad56..6e57f7b 100644 --- a/templates/interviews/interview_create_type_selection.html +++ b/templates/interviews/interview_create_type_selection.html @@ -41,7 +41,7 @@
- Back to Candidate List diff --git a/templates/recruitment/applications_interview_view.html b/templates/recruitment/applications_interview_view.html index 9b0f75b..fc33d2f 100644 --- a/templates/recruitment/applications_interview_view.html +++ b/templates/recruitment/applications_interview_view.html @@ -227,7 +227,7 @@
{# Form 2: Schedule Interviews #} -
+ @@ -431,7 +431,7 @@ @@ -643,21 +643,21 @@
- + {% csrf_token %} -
- - + {{reschedule_form|crispy}} + {% comment %}
+ +
- - + +
- - -
+ + +
{% endcomment %} diff --git a/templates/interviews/partials/interview_list.html b/templates/interviews/partials/interview_list.html index 04cc425..8683408 100644 --- a/templates/interviews/partials/interview_list.html +++ b/templates/interviews/partials/interview_list.html @@ -2,12 +2,12 @@ - + - - + + - + diff --git a/templates/recruitment/applications_interview_view.html b/templates/recruitment/applications_interview_view.html index fc33d2f..4a6abd4 100644 --- a/templates/recruitment/applications_interview_view.html +++ b/templates/recruitment/applications_interview_view.html @@ -266,12 +266,13 @@ - + {% comment %} - - + {% endcomment %} + + @@ -301,7 +302,7 @@ {{ application.phone }} - - {% endcomment %} + {% comment %} - {% endcomment %} + {% comment %} + {% endcomment %} {% endfor %} From b158cb3e7b69a2e70dea27f711c9b58b8246c120 Mon Sep 17 00:00:00 2001 From: ismail Date: Sun, 30 Nov 2025 12:50:15 +0300 Subject: [PATCH 4/5] another update to interview update --- recruitment/forms.py | 15 +++++++- recruitment/urls.py | 1 + recruitment/views.py | 23 +++++++++++-- templates/interviews/interview_detail.html | 40 ++++++++++++++++++++++ templates/interviews/interview_list.html | 3 +- 5 files changed, 76 insertions(+), 6 deletions(-) diff --git a/recruitment/forms.py b/recruitment/forms.py index 4585992..7a87421 100644 --- a/recruitment/forms.py +++ b/recruitment/forms.py @@ -2821,4 +2821,17 @@ class ScheduledInterviewForm(forms.Form): start_time = self.cleaned_data.get('start_time') if start_time and start_time < timezone.now(): raise forms.ValidationError(_('Start time cannot be in the past.')) - return start_time \ No newline at end of file + return start_time + +class ScheduledInterviewUpdateStatusForm(forms.Form): + status = forms.ChoiceField( + choices=ScheduledInterview.InterviewStatus.choices, + widget=forms.Select(attrs={ + 'class': 'form-control', + 'required': True + }), + label=_('Interview Status') + ) + class Meta: + model = ScheduledInterview + fields = ['status'] \ No newline at end of file diff --git a/recruitment/urls.py b/recruitment/urls.py index 19780ba..83a877d 100644 --- a/recruitment/urls.py +++ b/recruitment/urls.py @@ -571,6 +571,7 @@ urlpatterns = [ # Interview URLs path('interviews/', views.interview_list, name='interview_list'), path('interviews//', views.interview_detail, name='interview_detail'), + path('interviews//update_interview_status', views.update_interview_status, name='update_interview_status'), # Interview Creation URLs path('interviews/create//', views.interview_create_type_selection, name='interview_create_type_selection'), diff --git a/recruitment/views.py b/recruitment/views.py index c6798f9..f53a2c6 100644 --- a/recruitment/views.py +++ b/recruitment/views.py @@ -5331,10 +5331,24 @@ def interview_create_onsite(request, candidate_slug): def get_interview_list(request, job_slug): + from .forms import ScheduledInterviewUpdateStatusForm application = Application.objects.get(slug=job_slug) interviews = ScheduledInterview.objects.filter(application=application).order_by("interview_date","interview_time").select_related('interview') - print(interviews) - return render(request, 'interviews/partials/interview_list.html', {'interviews': interviews, 'application': application}) + interview_status_form = ScheduledInterviewUpdateStatusForm() + return render(request, 'interviews/partials/interview_list.html', {'interviews': interviews, 'application': application,'interview_status_form':interview_status_form}) + +@require_POST +def update_interview_status(request,slug): + from .forms import ScheduledInterviewUpdateStatusForm + + if request.method == 'POST': + form = ScheduledInterviewUpdateStatusForm(request.POST) + if form.is_valid(): + scheduled_interview = get_object_or_404(ScheduledInterview, slug=slug) + scheduled_interview.status = form.cleaned_data['status'] + scheduled_interview.save(update_fields=['status']) + messages.success(request, "Interview status updated successfully.") + return redirect('interview_detail', slug=slug) @login_required def agency_access_link_deactivate(request, slug): @@ -5861,13 +5875,16 @@ def interview_list(request): @staff_user_required def interview_detail(request, slug): """View details of a specific interview""" + from .forms import ScheduledInterviewUpdateStatusForm + interview = get_object_or_404(ScheduledInterview, slug=slug) reschedule_form = ScheduledInterviewForm() reschedule_form.initial['topic'] = interview.interview.topic context = { 'interview': interview, - 'reschedule_form':reschedule_form + 'reschedule_form':reschedule_form, + 'interview_status_form':ScheduledInterviewUpdateStatusForm() } return render(request, 'interviews/interview_detail.html', context) diff --git a/templates/interviews/interview_detail.html b/templates/interviews/interview_detail.html index 855de95..6fb2b44 100644 --- a/templates/interviews/interview_detail.html +++ b/templates/interviews/interview_detail.html @@ -224,6 +224,11 @@ {% trans "View Job" %} + @@ -323,6 +328,13 @@ {% trans "Duration:" %} {{ interview.interview.duration }} {% trans "minutes" %} +
+ {% trans "Status:" %} + + + {{ interview.status }} + +
@@ -739,6 +751,34 @@
+ + + {% endblock %} {% block customJS %} diff --git a/templates/interviews/interview_list.html b/templates/interviews/interview_list.html index e329ffa..2d8b9cc 100644 --- a/templates/interviews/interview_list.html +++ b/templates/interviews/interview_list.html @@ -230,9 +230,8 @@ - {{meetings}} {# Using 'meetings' based on the context_object_name provided #} - {% if meetings %} + {% if interviews %}
{# View Switcher (kept the name for simplicity) #} {% include "includes/_list_view_switcher.html" with list_id="meetings-list" %} From f45e9b75c43fb746ddc80dc4b38e356cee8e88fa Mon Sep 17 00:00:00 2001 From: ismail Date: Sun, 30 Nov 2025 14:08:55 +0300 Subject: [PATCH 5/5] small update --- recruitment/urls.py | 7 +- recruitment/views.py | 114 +++++------------- .../interviews/interview_create_onsite.html | 78 +----------- .../interviews/interview_create_remote.html | 8 +- .../interview_create_type_selection.html | 8 +- templates/interviews/interview_detail.html | 7 +- .../applications_interview_view.html | 14 +-- 7 files changed, 51 insertions(+), 185 deletions(-) diff --git a/recruitment/urls.py b/recruitment/urls.py index 83a877d..4c50725 100644 --- a/recruitment/urls.py +++ b/recruitment/urls.py @@ -572,11 +572,12 @@ urlpatterns = [ path('interviews/', views.interview_list, name='interview_list'), path('interviews//', views.interview_detail, name='interview_detail'), path('interviews//update_interview_status', views.update_interview_status, name='update_interview_status'), + path('interviews//cancel_interview_for_application', views.cancel_interview_for_application, name='cancel_interview_for_application'), # Interview Creation URLs - path('interviews/create//', views.interview_create_type_selection, name='interview_create_type_selection'), - path('interviews/create//remote/', views.interview_create_remote, name='interview_create_remote'), - path('interviews/create//onsite/', views.interview_create_onsite, name='interview_create_onsite'), + path('interviews/create//', views.interview_create_type_selection, name='interview_create_type_selection'), + path('interviews/create//remote/', views.interview_create_remote, name='interview_create_remote'), + path('interviews/create//onsite/', views.interview_create_onsite, name='interview_create_onsite'), path('interviews//get_interview_list', views.get_interview_list, name='get_interview_list'), # # --- SCHEDULED INTERVIEW URLS (New Centralized Management) --- diff --git a/recruitment/views.py b/recruitment/views.py index f53a2c6..325d45b 100644 --- a/recruitment/views.py +++ b/recruitment/views.py @@ -5184,30 +5184,21 @@ def portal_logout(request): # Interview Creation Views @staff_user_required -def interview_create_type_selection(request, candidate_slug): - """Show interview type selection page for a candidate""" - candidate = get_object_or_404(Application, slug=candidate_slug) - # Validate candidate is in Interview stage - # if candidate.stage != 'Interview': - # messages.error(request, f"Candidate {candidate.name} is not in Interview stage.") - # return redirect('candidate_interview_view', slug=candidate.job.slug) +def interview_create_type_selection(request, application_slug): + """Show interview type selection page for a application""" + application = get_object_or_404(Application, slug=application_slug) context = { - 'candidate': candidate, - 'job': candidate.job, + 'application': application, + 'job': application.job, } return render(request, 'interviews/interview_create_type_selection.html', context) @staff_user_required -def interview_create_remote(request, candidate_slug): +def interview_create_remote(request, application_slug): """Create remote interview for a candidate""" - application = get_object_or_404(Application, slug=candidate_slug) - - # Validate candidate is in Interview stage - # if candidate.stage != 'Interview': - # messages.error(request, f"Candidate {candidate.name} is not in Interview stage.") - # return redirect('candidate_interview_view', slug=candidate.job.slug) + application = get_object_or_404(Application, slug=application_slug) if request.method == 'POST': form = RemoteInterviewForm(request.POST) @@ -5220,41 +5211,16 @@ def interview_create_remote(request, candidate_slug): "recruitment.tasks.create_interview_and_meeting", application.pk, application.job.pk, schedule.pk, schedule.interview_date,schedule.interview_time, form.cleaned_data['duration'] ) - # interview.interview_type = 'REMOTE' - # interview.status = 'SCHEDULED' - # interview.save() - - # Create ZoomMeetingDetails record - # from .models import ZoomMeetingDetails - # zoom_meeting = ZoomMeetingDetails.objects.create( - # topic=form.cleaned_data['topic'], - # start_time=timezone.make_aware( - # timezone.datetime.combine( - # form.cleaned_data['interview_date'], - # form.cleaned_data['interview_time'] - # ), - # timezone.get_current_timezone() - # ), - # duration=form.cleaned_data['duration'], - # meeting_id=f"KAUH-{interview.id}-{timezone.now().timestamp()}", - # join_url=f"https://zoom.us/j/{interview.id}", - # password=secrets.token_urlsafe(16), - # status='scheduled' - # ) - - # Link Zoom meeting to interview - # interview.interview_location = zoom_meeting - # interview.save() messages.success(request, f"Remote interview scheduled for {application.name}") - return redirect('interview_list') + return redirect('interview_detail', slug=schedule.slug) except Exception as e: messages.error(request, f"Error creating remote interview: {str(e)}") form = RemoteInterviewForm() form.initial['topic'] = f"Interview for {application.job.title} - {application.name}" context = { - 'candidate': application, + 'application': application, 'job': application.job, 'form': form, } @@ -5262,14 +5228,9 @@ def interview_create_remote(request, candidate_slug): @staff_user_required -def interview_create_onsite(request, candidate_slug): +def interview_create_onsite(request, application_slug): """Create onsite interview for a candidate""" - candidate = get_object_or_404(Application, slug=candidate_slug) - - # Validate candidate is in Interview stage - # if candidate.stage != 'Interview': - # messages.error(request, f"Candidate {candidate.name} is not in Interview stage.") - # return redirect('candidate_interview_view', slug=candidate.job.slug) + application = get_object_or_404(Application, slug=application_slug) if request.method == 'POST': from .models import Interview @@ -5283,48 +5244,22 @@ def interview_create_onsite(request, candidate_slug): physical_address=form.cleaned_data["physical_address"], duration=form.cleaned_data["duration"],location_type="Onsite",status="SCHEDULED") - schedule = ScheduledInterview.objects.create(application=candidate,job=candidate.job,interview=interview,interview_date=form.cleaned_data["interview_date"],interview_time=form.cleaned_data["interview_time"]) - # Create ScheduledInterview record - # interview = form.save(commit=False) - # interview.interview_type = 'ONSITE' - # interview.status = 'SCHEDULED' - # interview.save() + schedule = ScheduledInterview.objects.create(application=application,job=application.job,interview=interview,interview_date=form.cleaned_data["interview_date"],interview_time=form.cleaned_data["interview_time"]) - # Create OnsiteLocationDetails record - # from .models import OnsiteLocationDetails - # onsite_location = OnsiteLocationDetails.objects.create( - # topic=form.cleaned_data['topic'], - # start_time=timezone.make_aware( - # timezone.datetime.combine( - # form.cleaned_data['interview_date'], - # form.cleaned_data['interview_time'] - # ), - # timezone.get_current_timezone() - # ), - # duration=form.cleaned_data['duration'], - # physical_address=form.cleaned_data['physical_address'], - # room_number=form.cleaned_data.get('room_number', ''), - # location_type='ONSITE', - # status='scheduled' - # ) - - # # Link onsite location to interview - # interview.interview_location = onsite_location - # interview.save() - - messages.success(request, f"Onsite interview scheduled for {candidate.name}") + messages.success(request, f"Onsite interview scheduled for {application.name}") return redirect('interview_detail', slug=schedule.slug) except Exception as e: messages.error(request, f"Error creating onsite interview: {str(e)}") else: # Pre-populate topic - form.initial['topic'] = f"Interview for {candidate.job.title} - {candidate.name}" + form.initial['topic'] = f"Interview for {application.job.title} - {application.name}" form = OnsiteInterviewForm() + form.initial['topic'] = f"Interview for {application.job.title} - {application.name}" context = { - 'candidate': candidate, - 'job': candidate.job, + 'application': application, + 'job': application.job, 'form': form, } return render(request, 'interviews/interview_create_onsite.html', context) @@ -5350,6 +5285,21 @@ def update_interview_status(request,slug): messages.success(request, "Interview status updated successfully.") return redirect('interview_detail', slug=slug) +@require_POST +def cancel_interview_for_application(request,slug): + scheduled_interview = get_object_or_404(ScheduledInterview, slug=slug) + if request.method == 'POST': + if scheduled_interview.interview_type == 'REMOTE': + result = delete_zoom_meeting(scheduled_interview.interview.meeting_id) + if result["status"] != "success": + messages.error(request, f"Error cancelling Zoom meeting: {result.get('message', 'Unknown error')}") + return redirect('interview_detail', slug=slug) + + scheduled_interview.delete() + messages.success(request, "Interview cancelled successfully.") + return redirect('interview_list') + + @login_required def agency_access_link_deactivate(request, slug): """Deactivate an agency access link""" diff --git a/templates/interviews/interview_create_onsite.html b/templates/interviews/interview_create_onsite.html index 441ac15..61188a6 100644 --- a/templates/interviews/interview_create_onsite.html +++ b/templates/interviews/interview_create_onsite.html @@ -10,9 +10,9 @@

- Create Onsite Interview for {{ candidate.name }} + Create Onsite Interview for {{ application.name }}

- Back to Candidate List @@ -20,7 +20,7 @@

- Schedule an onsite interview for {{ candidate.name }} + Schedule an onsite interview for {{ application.name }} for the position of {{ job.title }}.

@@ -33,7 +33,7 @@ {% endfor %} {% endif %} -
+ {% csrf_token %}
@@ -99,36 +99,8 @@ {% endif %}
- - {% comment %}
-
- - {{ form.interviewer }} - {% if form.interviewer.errors %} -
- {{ form.interviewer.errors }} -
- {% endif %} -
-
{% endcomment %}
- {% comment %}
- - {{ form.topic }} - {% if form.topic.errors %} -
- {{ form.topic.errors }} -
- {% endif %} -
{% endcomment %} -
- {% comment %}
-
- - {{ form.floor_number }} - {% if form.floor_number.errors %} -
- {{ form.floor_number.errors }} -
- {% endif %} -
-
{% endcomment %} - {% comment %} {% endcomment %} - - {% comment %}
- - {{ form.parking_info }} - {% if form.parking_info.errors %} -
- {{ form.parking_info.errors }} -
- {% endif %} -
{% endcomment %} - - {% comment %}
- - {{ form.notes }} - {% if form.notes.errors %} -
- {{ form.notes.errors }} -
- {% endif %} -
{% endcomment %} -
- + {% csrf_token %}
{% trans "Are you sure you want to cancel this interview? This action cannot be undone." %}
-
- - -
- {% comment %} - - Schedule - {% endcomment %} + {% endif %}
{% trans "Topic" %} {% trans "Topic" %} {% trans "Date" %} {% trans "Duration" %} {% trans "Location" %} {% trans "Duration" %} {% trans "Location" %} {% trans "Status" %} {% trans "Actions" %} {% trans "Actions" %}
{% trans "Name" %} {% trans "Contact" %} {% trans "Topic" %} {% trans "Topic" %} {% trans "Duration" %} {% trans "Meeting Date" %} {% trans "Link" %} {% trans "Meeting Status" %} {% trans "Interview Result"%} {% trans "Meeting Status" %} {% trans "Interview Result"%} {% trans "Interview List"%} {% trans "Actions" %}
+ {% comment %} {% if application.get_latest_meeting %} {{ application.get_latest_meeting }} {% else %} @@ -323,8 +324,8 @@ -- {% endif %} {% endwith %} - + {% with latest_meeting=application.get_latest_meeting %} {% if latest_meeting and latest_meeting.details_url %} -- {% endif %} {% endwith %} - + {{ latest_meeting.status }} {% with latest_meeting=application.get_latest_meeting %} {% if latest_meeting %} @@ -351,7 +352,7 @@ -- {% endif %} {% endwith %} - {% if not application.interview_status %} + + {% if application.get_latest_meeting %} @@ -436,7 +448,7 @@ hx-swap="innerHTML" hx-target="#candidateviewModalBody"> - Schedule + Schedule Interview {% comment %} {% endcomment %} {% endif %} - - {{candidate.get_interviews}}