From 8ea360a16194972be89e19a3b4fe51ba196ae43a Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Mon, 10 Jun 2024 16:31:12 +0530
Subject: [PATCH] [UPDT] RECRUITMENT: Description field in interview section

---
 recruitment/models.py                         |  3 +++
 .../templates/candidate/individual.html       |  3 +++
 .../templates/candidate/interview_list.html   | 14 +++++++++++--
 .../question_template_organized_form.html     |  4 ++--
 recruitment/views/views.py                    | 21 +++++++------------
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/recruitment/models.py b/recruitment/models.py
index 2ed452704..d4a7f7599 100644
--- a/recruitment/models.py
+++ b/recruitment/models.py
@@ -837,6 +837,9 @@ class InterviewSchedule(HorillaModel):
     employee_id = models.ManyToManyField(Employee, verbose_name=_("interviewer"))
     interview_date = models.DateField(verbose_name=_("Interview Date"))
     interview_time = models.TimeField(verbose_name=_("Interview Time"))
+    description = models.TextField(
+        verbose_name=_("Description"), blank=True, max_length=255
+    )
     completed = models.BooleanField(
         default=False, verbose_name=_("Is Interview Completed")
     )
diff --git a/recruitment/templates/candidate/individual.html b/recruitment/templates/candidate/individual.html
index 7de61d843..8bf536de1 100644
--- a/recruitment/templates/candidate/individual.html
+++ b/recruitment/templates/candidate/individual.html
@@ -619,6 +619,9 @@
                         &nbsp<i id="fabIcon" style="font-size:12px;" class="material-icons">radio_button_checked</i> {{ interviewer }}
                       {% endfor %}
                       <br>
+                      {% if interview_schedule.description %}
+                        <span class="d-flex ms-3 mb-2 mt-2">{% trans "Description" %} : <span class=" ms-2">{{ interview_schedule.description }}</span>
+                      {% endif %}
                   </span>
                   {% if interview_schedule.completed %}
                       <div class="d-flex" style="color:green;">
diff --git a/recruitment/templates/candidate/interview_list.html b/recruitment/templates/candidate/interview_list.html
index a80054ab9..b96e275ee 100644
--- a/recruitment/templates/candidate/interview_list.html
+++ b/recruitment/templates/candidate/interview_list.html
@@ -46,7 +46,10 @@
                                 <div data-cell-index="3" data-cell-title='{% trans "Interview Time" %}'
                                     class="oh-sticky-table__th"
                                 >{% trans "Interview Time" %}</div>
-                                <div data-cell-index="4" data-cell-title='{% trans "Status" %}'
+                                <div data-cell-index="4" data-cell-title='{% trans "Description" %}'
+                                    class="oh-sticky-table__th"
+                                >{% trans "Description" %}</div>
+                                <div data-cell-index="5" data-cell-title='{% trans "Status" %}'
                                     class="oh-sticky-table__th"
                                 >{% trans "Status" %}</div>
                                 <div class="oh-sticky-table__th oh-sticky-table__right" align="center" style="width: 220px;">{% trans "Actions" %}</div>
@@ -105,7 +108,14 @@
                                     <div data-cell-index="3" class="oh-sticky-table__td timeformat_changer">
                                         {{interview.interview_time}}
                                     </div>
-                                    <div data-cell-index="4" class="oh-sticky-table__td ">
+                                    <div data-cell-index="4" class="oh-sticky-table__td">
+                                        {% if interview.description %}
+                                            {{interview.description}}
+                                        {% else %}
+                                            {% trans "None" %}
+                                        {% endif %}
+                                    </div>
+                                    <div data-cell-index="5" class="oh-sticky-table__td">
                                         {% if interview.completed %}
                                             <div class="d-flex" style="color:green;">
                                                 <i id="fabIcon" style="font-size:18px;" class="material-icons ms-3 mt-2">check_circle</i>
diff --git a/recruitment/templates/survey/question_template_organized_form.html b/recruitment/templates/survey/question_template_organized_form.html
index 56c2955d9..3be7706db 100644
--- a/recruitment/templates/survey/question_template_organized_form.html
+++ b/recruitment/templates/survey/question_template_organized_form.html
@@ -14,7 +14,7 @@
       {% for field in form.visible_fields %}
       {% if field.field.widget|is_text_area %}
       <label
-      class="oh-label"
+      class="oh-label {% if field.field.required %} required-star{% endif %}"
       for="id_{{ field.name }}"
       title="{{ field.help_text|safe }}"
       >{{ field.label }}</label
@@ -28,7 +28,7 @@
       {% else %}
       <div class="col-12 col-md-6">
         <label
-          class="oh-label"
+          class="oh-label {% if field.field.required %} required-star{% endif %}"
           for="id_{{ field.name }}"
           title="{{ field.help_text|safe }}"
           >{{ field.label }}</label
diff --git a/recruitment/views/views.py b/recruitment/views/views.py
index 03a8ba6a9..20883db42 100644
--- a/recruitment/views/views.py
+++ b/recruitment/views/views.py
@@ -1232,10 +1232,6 @@ def candidate_view(request):
     previous_data = request.GET.urlencode()
     candidates = Candidate.objects.filter(is_active=True)
     candidate_all = Candidate.objects.all()
-    print("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
-    print(candidates)
-    print(candidate_all)
-    print("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^")
 
     mails = list(Candidate.objects.values_list("email", flat=True))
     # Query the User model to check if any email is present
@@ -1534,24 +1530,23 @@ def candidate_conversion(request, cand_id, **kwargs):
         can_mail = detail.email
         can_gender = detail.gender
         can_company = detail.recruitment_id.company_id
-
-    user_exists = User.objects.filter(email=can_mail).exists()
+    user_exists = User.objects.filter(username=can_mail).exists()
     if user_exists:
         messages.error(request, _("Employee instance already exist"))
-    elif not Employee.objects.filter(email=can_mail).exists():
+    elif not Employee.objects.filter(employee_user_id__username=can_mail).exists():
         new_employee = Employee.objects.create(
             employee_first_name=can_name,
             email=can_mail,
             phone=can_mob,
             gender=can_gender,
         )
-        new_employee.save()
-        EmployeeWorkInformation.objects.create(
-            employee_id=new_employee,
-            job_position_id=can_job,
-            department_id=can_dep,
-            company_id=can_company,
+        work_info, created = EmployeeWorkInformation.objects.get_or_create(
+            employee_id=new_employee
         )
+        work_info.job_position_id = can_job
+        work_info.department_id = can_dep
+        work_info.company_id = can_company
+        work_info.save()
         messages.success(request, _("Employee instance created successfully"))
     else:
         messages.info(request, "A employee with this mail already exists")