Merge branch 'main' of http://10.10.1.136:3000/marwan/kaauh_ats into frontend

This reverts commit 47807ace90d52a389399f9c926da61c49505615d.

recruitment/forms.py

@@ -1634,7 +1634,7 @@ class CandidateEmailForm(forms.Form):
             message_parts = [
                 f"Than you, for your interest in the {self.job.title} role.",
                 f"We're pleased to inform you that you have cleared your exam!",
-                f"The next step is the mandatory online assessment exam.",
+                f"The next step is the mandatory interview.",
                 f"Please complete the assessment by using the following link:",
                 f"https://kaauh/hire/exam",
                 f"We look forward to reviewing your results.",
@@ -1659,6 +1659,8 @@ class CandidateEmailForm(forms.Form):
                 f"If you have any questions before your start date, please contact [Onboarding Contact].",
                 f"Best regards, The KAAUH Hiring team"
             ]
+        elif candidate:
+            message_parts=""
 
 
 

recruitment/migrations/0004_alter_interviewschedule_template_location.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.7 on 2025-11-23 09:22
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recruitment', '0003_jobposting_cv_zip_file_jobposting_zip_created'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='interviewschedule',
+            name='template_location',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='schedule_templates', to='recruitment.interviewlocation', verbose_name='Location Template (Zoom/Onsite)'),
+        ),
+    ]

recruitment/migrations/0005_alter_interviewschedule_template_location.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.7 on 2025-11-23 09:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('recruitment', '0004_alter_interviewschedule_template_location'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='interviewschedule',
+            name='template_location',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='schedule_templates', to='recruitment.interviewlocation', verbose_name='Location Template (Zoom/Onsite)'),
+        ),
+    ]

recruitment/models.py

@@ -996,6 +996,18 @@ class Application(Base):
             return True
         else:
             return False
+        
+    @property
+    def is_active(self):
+        deadline=self.job.application_deadline
+        now=timezone.now().date()
+        if deadline>now:
+            return True
+        else:
+            return False
+            
+
+
 
 
 
@@ -1162,6 +1174,9 @@ class OnsiteLocationDetails(InterviewLocation):
         verbose_name_plural = _("Onsite Location Details")
 
 
+        
+
+
 # --- 2. Scheduling Models ---
 
 class InterviewSchedule(Base):

recruitment/tasks.py

@@ -760,6 +760,7 @@ from django.utils.html import strip_tags
 
 def _task_send_individual_email(subject, body_message, recipient, attachments,sender,job):
     """Internal helper to create and send a single email."""
+    
 
     from_email = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@kaauh.edu.sa')
     is_html = '<' in body_message and '>' in body_message
@@ -780,7 +781,8 @@ def _task_send_individual_email(subject, body_message, recipient, attachments,se
     try:
         result=email_obj.send(fail_silently=False)
 
-        if result==1:
+        if result==1 and sender and job: # job is none when email sent after message creation
+            
             try:
                 user=get_object_or_404(User,email=recipient)
                 new_message = Message.objects.create(
@@ -798,7 +800,7 @@ def _task_send_individual_email(subject, body_message, recipient, attachments,se
 
 
         else:
-            logger.error("fialed to send email")
+            logger.error("failed to send email")
 
 
     except Exception as e:

recruitment/views.py

@@ -4674,55 +4674,40 @@ def message_create(request):
             message.sender = request.user
             message.save()
             # Send email if message_type is 'email' and recipient has email
-            if message.message_type == 'email' and message.recipient and message.recipient.email:
+            
+            if message.recipient and message.recipient.email:
+                
                 try:
-                    from .email_service import send_bulk_email
+                
 
-                    email_result = send_bulk_email(
+                    email_result = async_task('recruitment.tasks._task_send_individual_email',
                         subject=message.subject,
-                        message=message.content,
-                        recipient_list=[message.recipient.email],
-                        request=request,
+                        body_message=message.content,
+                        recipient=message.recipient.email,
                         attachments=None,
-                        async_task_=True,
-                        from_interview=False
+                        sender=False,
+                        job=False
                     )
-
-                    if email_result["success"]:
-                        message.is_email_sent = True
-                        message.email_address = message.recipient.email
-                        message.save(update_fields=['is_email_sent', 'email_address'])
+                    if email_result:
                         messages.success(request, "Message sent successfully via email!")
                     else:
-                        messages.warning(request, f"Message saved but email failed: {email_result.get('message', 'Unknown error')}")
+                        
+                        messages.warning(request, f"email failed: {email_result.get('message', 'Unknown error')}")
 
                 except Exception as e:
+                
                     messages.warning(request, f"Message saved but email sending failed: {str(e)}")
             else:
+                
                 messages.success(request, "Message sent successfully!")
 
-            ["recipient", "job", "subject", "content", "message_type"]
-            recipient_email = form.cleaned_data['recipient'].email # Assuming recipient is a User or Model with an 'email' field
-            subject = form.cleaned_data['subject']
-            custom_message = form.cleaned_data['content']
-            job_id = form.cleaned_data['job'].id if 'job' in form.cleaned_data and form.cleaned_data['job'] else None
-            sender_user_id = request.user.id
-
-            task_id = async_task(
-                        'recruitment.tasks.send_bulk_email_task',
-                        subject,
-                        custom_message, # Pass the custom message
-                        [recipient_email], # Pass the specific recipient as a list of one
-
-                        sender_user_id=sender_user_id,
-                        job_id=job_id,
-                        hook='recruitment.tasks.email_success_hook')
-
-            logger.info(f"{task_id} queued.")
+            
             return redirect("message_list")
         else:
+            
             messages.error(request, "Please correct the errors below.")
     else:
+        
         form = MessageForm(request.user)
 
     context = {
@@ -4759,27 +4744,21 @@ def message_reply(request, message_id):
             message.save()
 
             # Send email if message_type is 'email' and recipient has email
-            if message.message_type == 'email' and message.recipient and message.recipient.email:
+            if message.recipient and message.recipient.email:
                 try:
-                    from .email_service import send_bulk_email
-
-                    email_result = send_bulk_email(
+                    email_result = async_task('recruitment.tasks._task_send_individual_email',
                         subject=message.subject,
-                        message=message.content,
-                        recipient_list=[message.recipient.email],
-                        request=request,
+                        body_message=message.content,
+                        recipient=message.recipient.email,
                         attachments=None,
-                        async_task_=True,
-                        from_interview=False
+                        sender=False,
+                        job=False
                     )
-
-                    if email_result["success"]:
-                        message.is_email_sent = True
-                        message.email_address = message.recipient.email
-                        message.save(update_fields=['is_email_sent', 'email_address'])
-                        messages.success(request, "Reply sent successfully via email!")
+                    if email_result:
+                        messages.success(request, "Message sent successfully via email!")
                     else:
-                        messages.warning(request, f"Reply saved but email failed: {email_result.get('message', 'Unknown error')}")
+                        
+                        messages.warning(request, f"email failed: {email_result.get('message', 'Unknown error')}")
 
                 except Exception as e:
                     messages.warning(request, f"Reply saved but email sending failed: {str(e)}")
@@ -5763,15 +5742,15 @@ def send_interview_email(request, slug):
     return redirect("meeting_details", slug=meeting.slug)
 
 
-# def schedule_interview_location_form(request,slug):
-#     schedule=get_object_or_404(InterviewSchedule,slug=slug)
-#     if request.method=='POST':
-#         form=InterviewScheduleLocationForm(request.POST,instance=schedule)
-#         form.save()
-#         return redirect('list_meetings')
-#     else:
-#         form=InterviewScheduleLocationForm(instance=schedule)
-#         return render(request,'interviews/schedule_interview_location_form.html',{'form':form,'schedule':schedule})
+def schedule_interview_location_form(request,slug):
+    schedule=get_object_or_404(InterviewSchedule,slug=slug)
+    if request.method=='POST':
+        form=InterviewScheduleLocationForm(request.POST,instance=schedule)
+        form.save()
+        return redirect('list_meetings')
+    else:
+        form=InterviewScheduleLocationForm(instance=schedule)
+        return render(request,'interviews/schedule_interview_location_form.html',{'form':form,'schedule':schedule})
 
 
 class MeetingListView(ListView):
@@ -5782,6 +5761,7 @@ class MeetingListView(ListView):
     template_name = "meetings/list_meetings.html"
     context_object_name = "meetings"
     paginate_by = 100
+    
 
     def get_queryset(self):
         # Start with a base queryset, ensuring an InterviewLocation link exists.
@@ -5794,8 +5774,9 @@ class MeetingListView(ListView):
             'interview_location__zoommeetingdetails',
             'interview_location__onsitelocationdetails',
         )
-        # Note: Printing the queryset here can consume memory for large sets.
 
+        # Note: Printing the queryset here can consume memory for large sets.
+        
         # Get filters from GET request
         search_query = self.request.GET.get("q")
         status_filter = self.request.GET.get("status")
@@ -5807,12 +5788,11 @@ class MeetingListView(ListView):
         if type_filter:
             # Use .title() to handle case variations from URL (e.g., 'remote' -> 'Remote')
             normalized_type = type_filter.title()
-            print(normalized_type)
+           
             # Assuming InterviewLocation.LocationType is accessible/defined
             if normalized_type in ['Remote', 'Onsite']:
                 queryset = queryset.filter(interview_location__location_type=normalized_type)
-                print(queryset)
-
+              
         # 3. Search by Topic (stored on InterviewLocation)
         if search_query:
             queryset = queryset.filter(interview_location__topic__icontains=search_query)
@@ -5886,6 +5866,28 @@ class MeetingListView(ListView):
 
         return context
 
+
+# class MeetingListView(ListView):
+#     """
+#     A unified view to list both Remote and Onsite Scheduled Interviews.
+#     """
+#     model = InterviewLocation
+#     template_name = "meetings/list_meetings.html"
+#     context_object_name = "meetings"
+   
+    
+
+#     def get_queryset(self):
+#         # Start with a base queryset, ensuring an InterviewLocation link exists.
+#         queryset = super().get_queryset().prefetch_related(
+#             'zoommeetingdetails',
+#             'onsitelocationdetails',
+#         )
+#         print(queryset)
+
+#         return queryset
+    
+
 def reschedule_onsite_meeting(request, slug, candidate_id, meeting_id):
     """Handles the rescheduling of an Onsite Interview (updates OnsiteLocationDetails)."""
     job = get_object_or_404(JobPosting, slug=slug)

templates/base.html

@@ -295,6 +295,18 @@
                             </span>
                         </a>
                     </li>
+
+                    <li class="nav-item me-lg-4">
+                        <a class="nav-link {% if request.resolver_match.url_name == 'kaauh_career' %}active{% endif %}" href="{% url 'kaauh_career' %}">
+                            <span class="d-flex align-items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6A2.25 2.25 0 0 1 6 3.75h2.25A2.25 2.25 0 0 1 10.5 6v2.25a2.25 2.25 0 0 1-2.25 2.25H6a2.25 2.25 0 0 1-2.25-2.25V6ZM3.75 15.75A2.25 2.25 0 0 1 6 13.5h2.25a2.25 2.25 0 0 1 2.25 2.25V18a2.25 2.25 0 0 1-2.25 2.25H6A2.25 2.25 0 0 1 3.75 18v-2.25ZM13.5 6a2.25 2.25 0 0 1 2.25-2.25H18A2.25 2.25 0 0 1 20.25 6v2.25A2.25 2.25 0 0 1 18 10.5h-2.25a2.25 2.25 0 0 1-2.25-2.25V6ZM13.5 15.75a2.25 2.25 0 0 1 2.25-2.25H18a2.25 2.25 0 0 1 2.25 2.25V18A2.25 2.25 0 0 1 18 20.25h-2.25A2.25 2.25 0 0 1 13.5 18v-2.25Z" />
+                                </svg>
+
+                                {% trans "Career Page" %}
+                            </span>
+                        </a>
+                    </li>
                     {% comment %} <li class="nav-item dropdown ms-lg-2">
                         <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown"
                         data-bs-offset="0, 8" data-bs-auto-close="outside">

templates/jobs/job_detail.html

@@ -326,15 +326,15 @@
                                  <a href="{% url 'candidate_screening_view' job.slug %}" class="btn btn-main-action">
                                     <i class="fas fa-layer-group me-1"></i> {% trans "Manage Applicants" %}
                                </a>
-                               {% if not job.zip_created%}
+                               
                                 <a href="{% url 'request_cvs_download' job.slug %}" class="btn btn-main-action">
-                                    <i class="fa-solid fa-download me-1"></i> {% trans "Download All CVs" %}
+                                    <i class="fa-solid fa-download me-1"></i> {% trans "Generate All CVs" %}
                                </a>
-                               {% else %}
-                               <a href="{% url 'download_ready_cvs' job.slug %}" class="btn btn-main-action">
+                               
+                               <a href="{% url 'download_ready_cvs' job.slug %}" class="btn btn-outline-primary">
                                     <i class="fa-solid fa-eye me-1"></i> {% trans "View All CVs" %}
                                </a>
-                               {% endif %}
+                               
                         </div>
                     </div>
 

templates/recruitment/agency_assignment_detail.html

@@ -9,285 +9,265 @@
     :root {
         --kaauh-teal: #00636e;
         --kaauh-teal-dark: #004a53;
-        --kaauh-border: #e9ecef;
-        --kaauh-primary-text: #212529;
-        --kaauh-success: #198754;
-        --kaauh-info: #0dcaf0;
+        --kaauh-border: #eaeff3;
+        --kaauh-primary-text: #343a40;
+        --kaauh-success: #28a745;
+        --kaauh-info: #17a2b8;
         --kaauh-danger: #dc3545;
         --kaauh-warning: #ffc107;
-        --kaauh-bg-light: #f8f9fa;
-    }
-
-    .text-primary-teal {
-        color: var(--kaauh-teal) !important;
     }
 
     .kaauh-card {
-        border: none;
+        border: 1px solid var(--kaauh-border);
         border-radius: 0.75rem;
-        box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04);
+        box-shadow: 0 4px 12px rgba(0,0,0,0.06);
         background-color: white;
-        transition: transform 0.2s ease, box-shadow 0.2s ease;
-    }
-
-    .kaauh-card:hover {
-        box-shadow: 0 4px 15px rgba(0, 0, 0, 0.08);
     }
 
     .btn-main-action {
         background-color: var(--kaauh-teal);
         border-color: var(--kaauh-teal);
         color: white;
-        font-weight: 500;
-        padding: 0.5rem 1.2rem;
+        font-weight: 600;
         transition: all 0.2s ease;
     }
-
     .btn-main-action:hover {
         background-color: var(--kaauh-teal-dark);
         border-color: var(--kaauh-teal-dark);
-        color: white;
-        transform: translateY(-1px);
-    }
-
-    .btn-white {
-        background-color: white;
-        border-color: var(--kaauh-border);
-        color: var(--kaauh-primary-text);
-    }
-
-    .btn-white:hover {
-        background-color: var(--kaauh-bg-light);
-        border-color: #dee2e6;
+        box-shadow: 0 4px 8px rgba(0,0,0,0.15);
     }
 
     .status-badge {
         font-size: 0.75rem;
-        font-weight: 600;
-        letter-spacing: 0.5px;
-        text-transform: uppercase;
-    }
-
-    .status-ACTIVE {
-        background-color: #d1e7dd;
-        color: #0f5132;
-    }
-
-    .status-EXPIRED {
-        background-color: #f8d7da;
-        color: #842029;
-    }
-
-    .status-COMPLETED {
-        background-color: #cff4fc;
-        color: #055160;
-    }
-
-    .status-CANCELLED {
-        background-color: #fff3cd;
-        color: #664d03;
-    }
-
-    .bg-soft-primary {
-        background-color: rgba(13, 110, 253, 0.1);
-    }
-
-    .bg-soft-info {
-        background-color: rgba(13, 202, 240, 0.1);
-    }
-
-    .bg-soft-success {
-        background-color: rgba(25, 135, 84, 0.1);
-    }
-
-    .avatar-circle {
-        width: 40px;
-        height: 40px;
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        font-size: 14px;
-    }
-
-    .w-20 {
-        width: 20px;
-        text-align: center;
+        padding: 0.3em 0.7em;
+        border-radius: 0.35rem;
+        font-weight: 700;
     }
+    .status-ACTIVE { background-color: var(--kaauh-success); color: white; }
+    .status-EXPIRED { background-color: var(--kaauh-danger); color: white; }
+    .status-COMPLETED { background-color: var(--kaauh-info); color: white; }
+    .status-CANCELLED { background-color: var(--kaauh-warning); color: #856404; }
 
     .progress-ring {
+        width: 120px;
+        height: 120px;
+        position: relative;
+    }
+
+    .progress-ring-circle {
+        transition: stroke-dashoffset 0.35s;
         transform: rotate(-90deg);
         transform-origin: 50% 50%;
     }
 
-    .progress-ring-circle {
-        transition: stroke-dashoffset 0.5s ease-in-out;
+    .progress-ring-text {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        font-size: 1.5rem;
+        font-weight: 700;
+        color: var(--kaauh-teal-dark);
+    }
+
+    .message-item {
+        border-left: 4px solid var(--kaauh-teal);
+        background-color: #f8f9fa;
+        padding: 1rem;
+        margin-bottom: 1rem;
+        border-radius: 0 0.5rem 0.5rem 0;
+    }
+
+    .message-item.unread {
+        border-left-color: var(--kaauh-info);
+        background-color: #e7f3ff;
     }
 </style>
 {% endblock %}
 
 {% block content %}
-<div class="container-fluid py-5 bg-light">
+<div class="container-fluid py-4">
     <!-- Header -->
-    <div class="row mb-4">
-        <div class="col-12">
-            <div class="d-flex justify-content-between align-items-start">
-                <div>
-                    <nav aria-label="breadcrumb" class="mb-2">
-                        <ol class="breadcrumb mb-0 small">
-                            <li class="breadcrumb-item"><a href="{% url 'agency_assignment_list' %}"
-                                    class="text-decoration-none text-muted">{% trans "Assignments" %}</a></li>
-                            <li class="breadcrumb-item active" aria-current="page">{{ assignment.job.title }}</li>
-                        </ol>
-                    </nav>
-                    <h1 class="h2 fw-bold text-dark mb-2">
-                        {{ assignment.job.title }}
-                    </h1>
-                    <div class="d-flex align-items-center text-muted">
-                        <span class="me-3"><i class="fas fa-building me-1"></i> {{ assignment.agency.name }}</span>
-                        <span class="badge status-{{ assignment.status }} rounded-pill px-3">{{
-                            assignment.get_status_display }}</span>
-                    </div>
-                </div>
-                <div class="d-flex gap-2">
-                    <a href="{% url 'agency_assignment_list' %}" class="btn btn-white border shadow-sm">
-                        <i class="fas fa-arrow-left me-1"></i> {% trans "Back" %}
-                    </a>
-                    <a href="{% url 'agency_assignment_update' assignment.slug %}"
-                        class="btn btn-main-action shadow-sm">
-                        <i class="fas fa-edit me-1"></i> {% trans "Edit" %}
-                    </a>
-                </div>
-            </div>
+    <div class="d-flex justify-content-between align-items-center mb-4">
+        <div>
+            <h1 class="h3 mb-1" style="color: var(--kaauh-teal-dark); font-weight: 700;">
+                <i class="fas fa-tasks me-2"></i>
+                {{ assignment.agency.name }} - {{ assignment.job.title }}
+            </h1>
+            <p class="text-muted mb-0">
+                {% trans "Assignment Details and Management" %}
+            </p>
+        </div>
+        <div>
+            <a href="{% url 'agency_assignment_list' %}" class="btn btn-outline-secondary me-2">
+                <i class="fas fa-arrow-left me-1"></i> {% trans "Back to Assignments" %}
+            </a>
+            <a href="{% url 'agency_assignment_update' assignment.slug %}" class="btn btn-main-action">
+                <i class="fas fa-edit me-1"></i> {% trans "Edit Assignment" %}
+            </a>
         </div>
     </div>
 
-    <div class="row g-4">
-        <!-- Left Column: Details & Candidates -->
-        <div class="col-lg-8 col-md-12">
+    <div class="row">
+        <!-- Assignment Overview -->
+        <div class="col-lg-8">
             <!-- Assignment Details Card -->
-            <div class="kaauh-card mb-4">
-                <div class="card-header bg-transparent border-bottom py-3 px-4">
-                    <h5 class="mb-0 fw-bold text-dark">
-                        <i class="fas fa-info-circle me-2 text-primary-teal"></i>
-                        {% trans "Assignment Details" %}
-                    </h5>
-                </div>
-                <div class="card-body p-4">
-                    <div class="row g-4">
-                        <div class="col-md-6">
-                            <div class="detail-group">
-                                <label class="text-uppercase text-muted small fw-bold mb-1">{% trans "Agency" %}</label>
-                                <div class="fs-6 fw-medium text-dark">{{ assignment.agency.name }}</div>
-                                <div class="text-muted small">{{ assignment.agency.contact_person }}</div>
+            <div class="kaauh-card p-4 mb-4">
+                <h5 class="mb-4" style="color: var(--kaauh-teal-dark);">
+                    <i class="fas fa-info-circle me-2"></i>
+                    {% trans "Assignment Details" %}
+                </h5>
+
+                <div class="row">
+                    <div class="col-md-6">
+                        <div class="mb-3">
+                            <label class="text-muted small">{% trans "Agency" %}</label>
+                            <div class="fw-bold">{{ assignment.agency.name }}</div>
+                            <div class="text-muted small">{{ assignment.agency.contact_person }}</div>
+                        </div>
+                        <div class="mb-3">
+                            <label class="text-muted small">{% trans "Job" %}</label>
+                            <div class="fw-bold">{{ assignment.job.title }}</div>
+                            <div class="text-muted small">{{ assignment.job.department }}</div>
+                        </div>
+                    </div>
+                    <div class="col-md-6">
+                        <div class="mb-3">
+                            <label class="text-muted small">{% trans "Status" %}</label>
+                            <div>
+                                <span class="status-badge status-{{ assignment.status }}">
+                                    {{ assignment.get_status_display }}
+                                </span>
                             </div>
                         </div>
-                        <div class="col-md-6">
-                            <div class="detail-group">
-                                <label class="text-uppercase text-muted small fw-bold mb-1">{% trans "Department"
-                                    %}</label>
-                                <div class="fs-6 fw-medium text-dark">{{ assignment.job.department }}</div>
+                        <div class="mb-3">
+                            <label class="text-muted small">{% trans "Deadline" %}</label>
+                            <div class="{% if assignment.is_expired %}text-danger{% else %}text-muted{% endif %}">
+                                <i class="fas fa-calendar-alt me-1"></i>
+                                {{ assignment.deadline_date|date:"Y-m-d H:i" }}
                             </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="detail-group">
-                                <label class="text-uppercase text-muted small fw-bold mb-1">{% trans "Deadline"
-                                    %}</label>
-                                <div
-                                    class="fs-6 fw-medium {% if assignment.is_expired %}text-danger{% else %}text-dark{% endif %}">
-                                    {{ assignment.deadline_date|date:"M d, Y - H:i" }}
-                                </div>
-                                {% if assignment.is_expired %}
-                                <small class="text-danger fw-bold">
+                            {% if assignment.is_expired %}
+                                <small class="text-danger">
                                     <i class="fas fa-exclamation-triangle me-1"></i>{% trans "Expired" %}
                                 </small>
-                                {% endif %}
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="detail-group">
-                                <label class="text-uppercase text-muted small fw-bold mb-1">{% trans "Created At"
-                                    %}</label>
-                                <div class="fs-6 fw-medium text-dark">{{ assignment.created_at|date:"M d, Y" }}</div>
-                            </div>
+                            {% endif %}
                         </div>
                     </div>
-
-                    {% if assignment.admin_notes %}
-                    <div class="mt-4 pt-4 border-top">
-                        <label class="text-uppercase text-muted small fw-bold mb-2">{% trans "Admin Notes" %}</label>
-                        <div class="p-3 bg-light rounded border-start border-4 border-info text-muted">
-                            {{ assignment.admin_notes }}
-                        </div>
-                    </div>
-                    {% endif %}
                 </div>
+
+                {% if assignment.admin_notes %}
+                    <div class="mt-3 pt-3 border-top">
+                        <label class="text-muted small">{% trans "Admin Notes" %}</label>
+                        <div class="text-muted">{{ assignment.admin_notes }}</div>
+                    </div>
+                {% endif %}
+
+
             </div>
 
+            {% comment %} <div class="kaauh-card shadow-sm mb-4">
+                <div class="card-body my-2">
+                    <h5 class="card-title mb-3 mx-2">
+                        <i class="fas fa-key me-2 text-warning"></i>
+                        {% trans "Access Credentials" %}
+                    </h5>
+
+                    <div class="mb-3 mx-2">
+                        <label class="form-label text-muted small">{% trans "Login URL" %}</label>
+                        <div class="input-group">
+                            <input type="text" readonly value="{{ request.scheme }}://{{ request.get_host }}{% url 'agency_portal_login' %}"
+                                   class="form-control font-monospace" id="loginUrl">
+                            <button class="btn btn-outline-secondary" type="button" onclick="copyToClipboard('loginUrl')">
+                                <i class="fas fa-copy"></i>
+                            </button>
+                        </div>
+                    </div>
+
+                    <div class="mb-3 mx-2">
+                        <label class="form-label text-muted small">{% trans "Access Token" %}</label>
+                        <div class="input-group">
+                            <input type="text" readonly value="{{ access_link.unique_token }}"
+                                   class="form-control font-monospace" id="accessToken">
+                            <button class="btn btn-outline-secondary" type="button" onclick="copyToClipboard('accessToken')">
+                                <i class="fas fa-copy"></i>
+                            </button>
+                        </div>
+                    </div>
+
+                    <div class="mb-3 mx-2">
+                        <label class="form-label text-muted small">{% trans "Password" %}</label>
+                        <div class="input-group">
+                            <input type="text" readonly value="{{ access_link.access_password }}"
+                                   class="form-control font-monospace" id="accessPassword">
+                            <button class="btn btn-outline-secondary" type="button" onclick="copyToClipboard('accessPassword')">
+                                <i class="fas fa-copy"></i>
+                            </button>
+                        </div>
+                    </div>
+
+                    <div class="alert alert-info mx-2">
+                        <i class="fas fa-info-circle me-2"></i>
+                        {% trans "Share these credentials securely with the agency. They can use this information to log in and submit candidates." %}
+                    </div>
+
+                    {% if access_link %}
+                    <a href="{% url 'agency_access_link_detail' access_link.slug %}"
+                        class="btn btn-outline-info btn-sm mx-2">
+                        <i class="fas fa-eye me-1"></i> {% trans "View Access Links Details" %}
+                    </a>
+                {% endif %}
+                </div>
+            </div> {% endcomment %}
+
             <!-- Candidates Card -->
-            <div class="kaauh-card">
-                <div
-                    class="card-header bg-transparent border-bottom py-3 px-4 d-flex justify-content-between align-items-center">
-                    <h5 class="mb-0 fw-bold text-dark">
-                        <i class="fas fa-users me-2 text-primary-teal"></i>
-                        {% trans "Submitted Candidates" %}
-                        <span class="badge bg-light text-dark border ms-2">{{ total_candidates }}</span>
+            <div class="kaauh-card p-4">
+                <div class="d-flex justify-content-between align-items-center mb-4">
+                    <h5 class="mb-0" style="color: var(--kaauh-teal-dark);">
+                        <i class="fas fa-users me-2"></i>
+                        {% trans "Submitted Candidates" %} ({{ total_candidates }})
                     </h5>
                     {% if access_link %}
-                    <a href="{% url 'agency_portal_login' %}" target="_blank" class="btn btn-sm btn-outline-info">
-                        <i class="fas fa-external-link-alt me-1"></i> {% trans "Portal Preview" %}
-                    </a>
+                        <a href="{% url 'agency_portal_login' %}" target="_blank" class="btn btn-outline-info btn-sm">
+                            <i class="fas fa-external-link-alt me-1"></i> {% trans "Preview Portal" %}
+                        </a>
                     {% endif %}
                 </div>
-                <div class="card-body p-0">
-                    {% if candidates %}
+
+                {% if candidates %}
                     <div class="table-responsive">
-                        <table class="table table-hover align-middle mb-0">
-                            <thead class="bg-light">
+                        <table class="table table-hover">
+                            <thead>
                                 <tr>
-                                    <th class="px-4 py-3 text-uppercase small fw-bold text-muted">{% trans "Candidate"
-                                        %}</th>
-                                    <th class="px-4 py-3 text-uppercase small fw-bold text-muted">{% trans "Contact" %}
-                                    </th>
-                                    <th class="px-4 py-3 text-uppercase small fw-bold text-muted">{% trans "Stage" %}
-                                    </th>
-                                    <th class="px-4 py-3 text-uppercase small fw-bold text-muted">{% trans "Submitted"
-                                        %}</th>
-                                    <th class="px-4 py-3 text-uppercase small fw-bold text-muted text-end">{% trans
-                                        "Actions" %}</th>
+                                    <th>{% trans "Name" %}</th>
+                                    <th>{% trans "Contact" %}</th>
+                                    <th>{% trans "Stage" %}</th>
+                                    <th>{% trans "Submitted" %}</th>
+                                    <th>{% trans "Actions" %}</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 {% for candidate in candidates %}
                                 <tr>
-                                    <td class="px-4">
-                                        <div class="d-flex align-items-center">
-                                            <div class="avatar-circle me-3 bg-soft-primary text-primary fw-bold">
-                                                {{ candidate.name|slice:":2"|upper }}
-                                            </div>
-                                            <div>
-                                                <div class="fw-bold text-dark">{{ candidate.name }}</div>
-                                            </div>
+                                    <td>
+                                        <div class="fw-bold">{{ candidate.name }}</div>
+                                    </td>
+                                    <td>
+                                        <div class="small">
+                                            <div><i class="fas fa-envelope me-1"></i> {{ candidate.email }}</div>
+                                            <div><i class="fas fa-phone me-1"></i> {{ candidate.phone }}</div>
                                         </div>
                                     </td>
-                                    <td class="px-4">
+                                    <td>
+                                        <span class="badge bg-info">{{ candidate.get_stage_display }}</span>
+                                    </td>
+                                    <td>
                                         <div class="small text-muted">
-                                            <div class="mb-1"><i class="fas fa-envelope me-2 w-20"></i>{{
-                                                candidate.email }}</div>
-                                            <div><i class="fas fa-phone me-2 w-20"></i>{{ candidate.phone }}</div>
+                                            {{ candidate.created_at|date:"Y-m-d H:i" }}
                                         </div>
                                     </td>
-                                    <td class="px-4">
-                                        <span class="badge bg-soft-info text-info rounded-pill px-3">{{
-                                            candidate.get_stage_display }}</span>
-                                    </td>
-                                    <td class="px-4">
-                                        <span class="small text-muted">{{ candidate.created_at|date:"M d, Y" }}</span>
-                                    </td>
-                                    <td class="px-4 text-end">
+                                    <td>
                                         <a href="{% url 'candidate_detail' candidate.slug %}"
-                                            class="btn btn-sm btn-white border shadow-sm text-primary"
-                                            title="{% trans 'View Details' %}">
+                                           class="btn btn-sm btn-outline-primary" title="{% trans 'View Details' %}">
                                             <i class="fas fa-eye"></i>
                                         </a>
                                     </td>
@@ -296,103 +276,130 @@
                             </tbody>
                         </table>
                     </div>
-                    {% else %}
-                    <div class="text-center py-5">
-                        <div class="mb-3">
-                            <div class="avatar-circle bg-light text-muted mx-auto"
-                                style="width: 64px; height: 64px; font-size: 24px;">
-                                <i class="fas fa-user-plus"></i>
-                            </div>
-                        </div>
-                        <h6 class="fw-bold text-dark">{% trans "No candidates yet" %}</h6>
-                        <p class="text-muted small mb-0">
-                            {% trans "Candidates submitted by the agency will appear here." %}
+                {% else %}
+                    <div class="text-center py-4">
+                        <i class="fas fa-users fa-2x text-muted mb-3"></i>
+                        <h6 class="text-muted">{% trans "No candidates submitted yet" %}</h6>
+                        <p class="text-muted small">
+                            {% trans "Candidates will appear here once the agency submits them through their portal." %}
                         </p>
                     </div>
-                    {% endif %}
-                </div>
+                {% endif %}
             </div>
         </div>
 
-        <!-- Right Column: Sidebar -->
-        <div class="col-lg-4 col-md-12">
+        <!-- Sidebar -->
+        <div class="col-lg-4">
             <!-- Progress Card -->
-            <div class="kaauh-card mb-4">
-                <div class="card-body p-4 text-center">
-                    <h6 class="text-uppercase text-muted small fw-bold mb-4">{% trans "Submission Goal" %}</h6>
+            <div class="kaauh-card p-4 mb-4">
+                <h5 class="mb-4 text-center" style="color: var(--kaauh-teal-dark);">
+                    {% trans "Submission Progress" %}
+                </h5>
 
-                    <div class="position-relative d-inline-block mb-3">
-                        <svg class="progress-ring" width="140" height="140">
-                            <circle class="progress-ring-bg" stroke="#f1f3f5" stroke-width="10" fill="transparent"
-                                r="60" cx="70" cy="70" />
-                            <circle class="progress-ring-circle" stroke="var(--kaauh-teal)" stroke-width="10"
-                                fill="transparent" r="60" cx="70" cy="70"
-                                style="stroke-dasharray: 376.99; stroke-dashoffset: {{ stroke_dashoffset }};" />
+                <div class="text-center mb-3">
+                    <div class="progress-ring">
+                        <svg width="120" height="120">
+                            <circle class="progress-ring-circle"
+                                    stroke="#e9ecef"
+                                    stroke-width="8"
+                                    fill="transparent"
+                                    r="52"
+                                    cx="60"
+                                    cy="60"/>
+                            <circle class="progress-ring-circle"
+                                    stroke="var(--kaauh-teal)"
+                                    stroke-width="8"
+                                    fill="transparent"
+                                    r="52"
+                                    cx="60"
+                                    cy="60"
+                                    style="stroke-dasharray: 326.73; stroke-dashoffset: {{ stroke_dashoffset }};"/>
                         </svg>
-                        <div class="position-absolute top-50 start-50 translate-middle text-center">
-                            <div class="h3 fw-bold mb-0 text-dark">{{ total_candidates }}</div>
-                            <div class="small text-muted text-uppercase">{% trans "of" %} {{ assignment.max_candidates
-                                }}</div>
+                        <div class="progress-ring-text">
+                            {% widthratio total_candidates assignment.max_candidates 100 as progress %}
+                            {{ progress|floatformat:0 }}%
                         </div>
                     </div>
+                </div>
 
-                    <p class="text-muted small mb-0">
-                        {% trans "Candidates submitted" %}
-                    </p>
+               <div class="text-center">
+                    <div class="h4 mb-1">{{ total_candidates }}</div>
+                    <div class="text-muted">/ {{ assignment.max_candidates }} {% trans "candidates" %}</div>
+                </div>
+
+                <div class="progress mt-3" style="height: 8px;">
+                    {% widthratio total_candidates assignment.max_candidates 100 as progress %}
+                    <div class="progress-bar" style="width: {{ progress }}%"></div>
                 </div>
             </div>
 
-            <!-- Actions Card -->
-            <div class="kaauh-card mb-4">
-                <div class="card-header bg-transparent border-bottom py-3 px-4">
-                    <h6 class="mb-0 fw-bold text-dark">{% trans "Quick Actions" %}</h6>
-                </div>
-                <div class="card-body p-4">
-                    <div class="d-grid gap-3">
-                        <a href="" class="btn btn-outline-primary">
-                            <i class="fas fa-envelope me-2"></i> {% trans "Send Message" %}
-                        </a>
 
-                        {% if assignment.is_active and not assignment.is_expired %}
-                        <button type="button" class="btn btn-outline-warning" data-bs-toggle="modal"
-                            data-bs-target="#extendDeadlineModal">
-                            <i class="fas fa-clock me-2"></i> {% trans "Extend Deadline" %}
+            <!-- Actions Card -->
+            <div class="kaauh-card p-4">
+                <h5 class="mb-4" style="color: var(--kaauh-teal-dark);">
+                    <i class="fas fa-cog me-2"></i>
+                    {% trans "Actions" %}
+                </h5>
+
+                <div class="d-grid gap-2">
+                    <a href=""
+                       class="btn btn-outline-primary">
+                        <i class="fas fa-envelope me-1"></i> {% trans "Send Message" %}
+                    </a>
+
+                    {% if assignment.is_active and not assignment.is_expired %}
+                        <button type="button" class="btn btn-outline-warning"
+                                data-bs-toggle="modal" data-bs-target="#extendDeadlineModal">
+                            <i class="fas fa-clock me-1"></i> {% trans "Extend Deadline" %}
                         </button>
+                    {% endif %}
+
+                    <a href="{% url 'agency_assignment_update' assignment.slug %}"
+                       class="btn btn-outline-secondary">
+                        <i class="fas fa-edit me-1"></i> {% trans "Edit Assignment" %}
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Messages Section -->
+    {% if messages_ %}
+        <div class="kaauh-card p-4 mt-4">
+            <h5 class="mb-4" style="color: var(--kaauh-teal-dark);">
+                <i class="fas fa-comments me-2"></i>
+                {% trans "Recent Messages" %}
+            </h5>
+
+            <div class="row">
+                {% for message in messages_|slice:":6" %}
+                <div class="col-lg-6 mb-3">
+                    <div class="message-item {% if not message.is_read %}unread{% endif %}">
+                        <div class="d-flex justify-content-between align-items-start mb-2">
+                            <div class="fw-bold">{{ message.subject }}</div>
+                            <small class="text-muted">{{ message.created_at|date:"Y-m-d H:i" }}</small>
+                        </div>
+                        <div class="small text-muted mb-2">
+                            {% trans "From" %}: {{ message.sender.get_full_name }}
+                        </div>
+                        <div class="small">{{ message.message|truncatewords:30 }}</div>
+                        {% if not message.is_read %}
+                            <span class="badge bg-info mt-2">{% trans "New" %}</span>
                         {% endif %}
                     </div>
                 </div>
+                {% endfor %}
             </div>
 
-            <!-- Recent Messages -->
-            {% if messages_ %}
-            <div class="kaauh-card">
-                <div
-                    class="card-header bg-transparent border-bottom py-3 px-4 d-flex justify-content-between align-items-center">
-                    <h6 class="mb-0 fw-bold text-dark">{% trans "Recent Messages" %}</h6>
-                    {% if messages_.count > 3 %}
-                    <a href="#" class="small text-decoration-none">{% trans "View All" %}</a>
-                    {% endif %}
+            {% if messages_.count > 6 %}
+                <div class="text-center mt-3">
+                    <a href="#" class="btn btn-outline-primary btn-sm">
+                        {% trans "View All Messages" %}
+                    </a>
                 </div>
-                <div class="card-body p-0">
-                    <div class="list-group list-group-flush">
-                        {% for message in messages_|slice:":3" %}
-                        <div
-                            class="list-group-item p-3 border-bottom-0 {% if not message.is_read %}bg-soft-info{% endif %}">
-                            <div class="d-flex justify-content-between mb-1">
-                                <span class="fw-bold text-dark small">{{ message.sender.get_full_name }}</span>
-                                <small class="text-muted" style="font-size: 0.7rem;">{{ message.created_at|date:"M d"
-                                    }}</small>
-                            </div>
-                            <div class="fw-medium small text-dark mb-1">{{ message.subject }}</div>
-                            <div class="text-muted small text-truncate">{{ message.message }}</div>
-                        </div>
-                        {% endfor %}
-                    </div>
-                </div>
-            </div>
             {% endif %}
         </div>
-    </div>
+    {% endif %}
 </div>
 
 <!-- Extend Deadline Modal -->
@@ -413,8 +420,8 @@
                         <label for="new_deadline" class="form-label">
                             {% trans "New Deadline" %} <span class="text-danger">*</span>
                         </label>
-                        <input type="datetime-local" class="form-control" id="new_deadline" name="new_deadline"
-                            required>
+                        <input type="datetime-local" class="form-control" id="new_deadline"
+                               name="new_deadline" required>
                         <small class="form-text text-muted">
                             {% trans "Current deadline:" %} {{ assignment.deadline_date|date:"Y-m-d H:i" }}
                         </small>
@@ -436,13 +443,13 @@
 
 {% block customJS %}
 <script>
-    function copyToClipboard(text) {
-        navigator.clipboard.writeText(text).then(function () {
-            // Show success message
-            const toast = document.createElement('div');
-            toast.className = 'position-fixed top-0 end-0 p-3';
-            toast.style.zIndex = '1050';
-            toast.innerHTML = `
+function copyToClipboard(text) {
+    navigator.clipboard.writeText(text).then(function() {
+        // Show success message
+        const toast = document.createElement('div');
+        toast.className = 'position-fixed top-0 end-0 p-3';
+        toast.style.zIndex = '1050';
+        toast.innerHTML = `
             <div class="toast show" role="alert">
                 <div class="toast-header">
                     <strong class="me-auto">{% trans "Success" %}</strong>
@@ -453,61 +460,61 @@
                 </div>
             </div>
         `;
-            document.body.appendChild(toast);
-
-            setTimeout(() => {
-                toast.remove();
-            }, 3000);
-        });
-    }
-
-    function copyToClipboard(elementId) {
-        const element = document.getElementById(elementId);
-        element.select();
-        document.execCommand('copy');
-
-        // Show feedback
-        const button = element.nextElementSibling;
-        const originalHTML = button.innerHTML;
-        button.innerHTML = '<i class="fas fa-check"></i>';
-        button.classList.add('btn-success');
-        button.classList.remove('btn-outline-secondary');
+        document.body.appendChild(toast);
 
         setTimeout(() => {
-            button.innerHTML = originalHTML;
-            button.classList.remove('btn-success');
-            button.classList.add('btn-outline-secondary');
-        }, 2000);
-    }
-
-    function confirmDeactivate() {
-        if (confirm('{% trans "Are you sure you want to deactivate this access link? Agencies will no longer be able to use it." %}')) {
-            // Submit form to deactivate
-            window.location.href = '';
-        }
-    }
-
-    function confirmReactivate() {
-        if (confirm('{% trans "Are you sure you want to reactivate this access link?" %}')) {
-            // Submit form to reactivate
-            window.location.href = '';
-        }
-    }
-
-    document.addEventListener('DOMContentLoaded', function () {
-        // Set minimum datetime for new deadline
-        const deadlineInput = document.getElementById('new_deadline');
-        if (deadlineInput) {
-            const currentDeadline = new Date('{{ assignment.deadline_date|date:"Y-m-d\\TH:i" }}');
-            const now = new Date();
-            const minDateTime = new Date(Math.max(currentDeadline, now));
-
-            const localDateTime = new Date(minDateTime.getTime() - minDateTime.getTimezoneOffset() * 60000)
-                .toISOString()
-                .slice(0, 16);
-            deadlineInput.min = localDateTime;
-            deadlineInput.value = localDateTime;
-        }
+            toast.remove();
+        }, 3000);
     });
+}
+
+function copyToClipboard(elementId) {
+    const element = document.getElementById(elementId);
+    element.select();
+    document.execCommand('copy');
+
+    // Show feedback
+    const button = element.nextElementSibling;
+    const originalHTML = button.innerHTML;
+    button.innerHTML = '<i class="fas fa-check"></i>';
+    button.classList.add('btn-success');
+    button.classList.remove('btn-outline-secondary');
+
+    setTimeout(() => {
+        button.innerHTML = originalHTML;
+        button.classList.remove('btn-success');
+        button.classList.add('btn-outline-secondary');
+    }, 2000);
+}
+
+function confirmDeactivate() {
+    if (confirm('{% trans "Are you sure you want to deactivate this access link? Agencies will no longer be able to use it." %}')) {
+        // Submit form to deactivate
+        window.location.href = '';
+    }
+}
+
+function confirmReactivate() {
+    if (confirm('{% trans "Are you sure you want to reactivate this access link?" %}')) {
+        // Submit form to reactivate
+        window.location.href = '';
+    }
+}
+
+document.addEventListener('DOMContentLoaded', function() {
+    // Set minimum datetime for new deadline
+    const deadlineInput = document.getElementById('new_deadline');
+    if (deadlineInput) {
+        const currentDeadline = new Date('{{ assignment.deadline_date|date:"Y-m-d\\TH:i" }}');
+        const now = new Date();
+        const minDateTime = new Date(Math.max(currentDeadline, now));
+
+        const localDateTime = new Date(minDateTime.getTime() - minDateTime.getTimezoneOffset() * 60000)
+            .toISOString()
+            .slice(0, 16);
+        deadlineInput.min = localDateTime;
+        deadlineInput.value = localDateTime;
+    }
+});
 </script>
-{% endblock %}
+{% endblock %}

templates/recruitment/agency_portal_persons_list.html

@@ -165,7 +165,7 @@
                                 <tr class="person-row">
                                     <td>
                                         <div class="d-flex align-items-center">
-                                            <div class="rounded-circle bg-primary text-white d-flex align-items-center justify-content-center me-2"
+                                            <div class="rounded-circle bg-primary-theme text-white d-flex align-items-center justify-content-center me-2"
                                                  style="width: 32px; height: 32px; font-size: 14px; font-weight: 600;">
                                                 {{ person.first_name|first|upper }}{{ person.last_name|first|upper }}
                                             </div>
@@ -178,7 +178,7 @@
                                         </div>
                                     </td>
                                     <td>
-                                        <a href="mailto:{{ person.email }}" class="text-decoration-none">
+                                        <a href="mailto:{{ person.email }}" class="text-decoration-none text-dark">
                                             {{ person.email }}
                                         </a>
                                     </td>

templates/recruitment/candidate_detail.html

@@ -662,6 +662,7 @@
                         <i class="fas fa-eye me-1"></i>
                         {% trans "View Actual Resume" %}
                     </a> {% endcomment %}
+                    
                     <a href="{{ candidate.resume.url }}" download class="btn btn-outline-primary">
                         <i class="fas fa-download me-1"></i>
                         {% trans "Download Resume" %}

templates/recruitment/candidate_document_review_view.html

@@ -395,15 +395,14 @@
                                 {% endwith %}
                             </td>
                             <td class="text-center">
-                                <button type="button"
-                                        class="btn btn-sm btn-main-action"
-                                        data-bs-toggle="modal"
-                                        data-bs-target="#documentModal"
-                                        hx-get="{% url 'candidate_application_detail' candidate.slug %}"
-                                        hx-target="#documentModalBody"
-                                        title="{% trans 'View Candidate Details' %}">
-                                    <i class="fas fa-eye me-1"></i> {% trans "View Details" %}
-                                </button>
+                               <button type="button" class="btn btn-outline-secondary btn-sm"
+                                data-bs-toggle="modal"
+                                data-bs-target="#candidateviewModal"
+                                hx-get="{% url 'candidate_criteria_view_htmx' candidate.pk %}"
+                                hx-target="#candidateviewModalBody"
+                                title="View Profile">
+                                 <i class="fas fa-eye ms-1"></i>
+                            </button>
                             </td>
                         </tr>
                         {% endfor %}
@@ -419,30 +418,49 @@
         </form>
     </div>
 
-    <!-- Modal for viewing candidate details -->
-    <div class="modal fade modal-xl" id="documentModal" tabindex="-1" aria-labelledby="documentModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-            <div class="modal-content kaauh-card">
-                <div class="modal-header" style="border-bottom: 1px solid var(--kaauh-border);">
-                    <h5 class="modal-title" id="documentModalLabel" style="color: var(--kaauh-teal-dark);">
-                        {% trans "Candidate Details" %}
-                    </h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div id="documentModalBody" class="modal-body">
-                    <div class="text-center py-5 text-muted">
-                        <i class="fas fa-spinner fa-spin fa-2x"></i><br>
-                        {% trans "Loading candidate details..." %}
-                    </div>
-                </div>
-                <div class="modal-footer" style="border-top: 1px solid var(--kaauh-border);">
-                    <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">
-                        {% trans "Close" %}
-                    </button>
+    
+</div>
+
+<div class="modal fade modal-xl" id="candidateviewModal" tabindex="-1" aria-labelledby="candidateviewModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content kaauh-card"> <div class="modal-header" style="border-bottom: 1px solid var(--kaauh-border);">
+                <h5 class="modal-title" id="candidateviewModalLabel" style="color: var(--kaauh-teal-dark);">
+                    {% trans "Candidate Details / Bulk Action Form" %}
+                </h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            <div id="candidateviewModalBody" class="modal-body">
+                <div class="text-center py-5 text-muted">
+                    <i class="fas fa-spinner fa-spin fa-2x"></i><br>
+                    {% trans "Loading content..." %}
                 </div>
             </div>
+
         </div>
     </div>
+
+</div>
+
+
+<!-- Email Modal -->
+<div class="modal fade" id="emailModal" tabindex="-1" aria-labelledby="emailModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content kaauh-card">
+      <div class="modal-header" style="border-bottom: 1px solid var(--kaauh-border);">
+        <h5 class="modal-title" id="emailModalLabel" style="color: var(--kaauh-teal-dark);">
+          <i class="fas fa-envelope me-2"></i>{% trans "Compose Email" %}
+        </h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div id="emailModalBody" class="modal-body">
+        <div class="text-center py-5 text-muted">
+          <i class="fas fa-spinner fa-spin fa-2x"></i><br>
+          {% trans "Loading email form..." %}
+
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 {% endblock %}
 {% block customJS %}