diff --git a/.env b/.env index b9e2bf0..8d7fbd5 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -DB_NAME=norahuniversity -DB_USER=norahuniversity -DB_PASSWORD=norahuniversity \ No newline at end of file +DB_NAME=haikal_db +DB_USER=faheed +DB_PASSWORD=Faheed@215 \ No newline at end of file diff --git a/recruitment/forms.py b/recruitment/forms.py index e31ca66..b58f18c 100644 --- a/recruitment/forms.py +++ b/recruitment/forms.py @@ -359,6 +359,10 @@ class ApplicationForm(forms.ModelForm): self.fields['job'].initial = current_job self.fields['job'].widget.attrs['readonly'] = True + else: + self.fields['job'].queryset = self.fields['job'].queryset.filter( + status="ACTIVE" + ) # Make job field read-only if it's being pre-populated job_value = self.initial.get("job") @@ -706,7 +710,7 @@ class BulkInterviewTemplateForm(forms.ModelForm): def clean_start_date(self): start_date = self.cleaned_data.get("start_date") - if start_date and start_date <= timezone.now().date(): + if start_date and start_date < timezone.now().date(): raise forms.ValidationError(_("Start date must be in the future")) return start_date @@ -2198,7 +2202,7 @@ Job: {job.title} """ if interview.location_type == 'Remote': - initial_message += f"Pease join using meeting link {interview.details_url} .\n\n" + initial_message += f"Pease join using meeting link {interview.join_url} \n\n" else: initial_message += "This is an onsite schedule. Please arrive 10 minutes early.\n\n" diff --git a/recruitment/migrations/0001_initial.py b/recruitment/migrations/0001_initial.py index 2aaf4db..e4dfd2a 100644 --- a/recruitment/migrations/0001_initial.py +++ b/recruitment/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 6.0 on 2025-12-12 11:17 +# Generated by Django 5.2.7 on 2025-12-16 14:20 import django.contrib.auth.models import django.contrib.auth.validators @@ -92,11 +92,14 @@ class Migration(migrations.Migration): ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated at')), ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), ('location_type', models.CharField(choices=[('Remote', 'Remote (e.g., Zoom, Google Meet)'), ('Onsite', 'In-Person (Physical Location)')], db_index=True, max_length=10, verbose_name='Location Type')), + ('interview_result', models.CharField(blank=True, choices=[('passed', 'Passed'), ('failed', 'Failed'), ('on_hold', 'ON Hold')], default='on_hold', max_length=10, null=True, verbose_name='Interview Result')), + ('result_comments', models.TextField(blank=True, null=True)), ('topic', models.CharField(blank=True, help_text="e.g., 'Zoom Topic: Software Interview' or 'Main Conference Room'", max_length=255, verbose_name='Meeting/Location Topic')), + ('join_url', models.URLField(blank=True, max_length=2048, null=True, verbose_name='Meeting/Location URL')), ('timezone', models.CharField(default='UTC', max_length=50, verbose_name='Timezone')), ('start_time', models.DateTimeField(db_index=True, verbose_name='Start Time')), ('duration', models.PositiveIntegerField(verbose_name='Duration (minutes)')), - ('status', models.CharField(choices=[('waiting', 'Waiting'), ('started', 'Started'), ('ended', 'Ended'), ('cancelled', 'Cancelled')], db_index=True, default='waiting', max_length=20)), + ('status', models.CharField(choices=[('waiting', 'Waiting'), ('started', 'Started'), ('updated', 'Updated'), ('deleted', 'Deleted'), ('ended', 'Ended')], db_index=True, default='waiting', max_length=20)), ('cancelled_at', models.DateTimeField(blank=True, null=True, verbose_name='Cancelled At')), ('cancelled_reason', models.TextField(blank=True, null=True, verbose_name='Cancellation Reason')), ('meeting_id', models.CharField(blank=True, max_length=50, null=True, unique=True, verbose_name='External Meeting ID')), @@ -125,7 +128,7 @@ class Migration(migrations.Migration): ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), ('name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Participant Name')), ('email', models.EmailField(max_length=254, verbose_name='Email')), - ('phone', secured_fields.fields.EncryptedCharField(blank=True, max_length=12, null=True, verbose_name='Phone Number')), + ('phone', secured_fields.fields.EncryptedCharField(blank=True, max_length=12, null=True, searchable=True, verbose_name='Phone Number')), ('designation', models.CharField(blank=True, max_length=100, null=True, verbose_name='Designation')), ], options={ @@ -139,8 +142,9 @@ class Migration(migrations.Migration): ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created at')), ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated at')), ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), + ('name', models.CharField(blank=True, help_text="A human-readable name (e.g., 'Zoom')", max_length=100, null=True, verbose_name='Friendly Name')), ('key', models.CharField(help_text='Unique key for the setting', max_length=100, unique=True, verbose_name='Setting Key')), - ('value', models.TextField(help_text='Value for the setting', verbose_name='Setting Value')), + ('value', secured_fields.fields.EncryptedTextField(help_text='Value for the setting', verbose_name='Setting Value')), ], options={ 'verbose_name': 'Setting', @@ -154,8 +158,8 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated at')), ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), - ('name', models.CharField(help_text='e.g., ATS, ERP ', max_length=100, unique=True, verbose_name='Source Name')), - ('source_type', models.CharField(help_text='e.g., ATS, ERP ', max_length=100, verbose_name='Source Type')), + ('name', models.CharField(help_text='Name of the source', max_length=100, unique=True, verbose_name='Source Name')), + ('source_type', models.CharField(help_text='Type of the source', max_length=100, verbose_name='Source Type')), ('description', models.TextField(blank=True, help_text='A description of the source', verbose_name='Description')), ('ip_address', models.GenericIPAddressField(blank=True, help_text='The IP address of the source', null=True, verbose_name='IP Address')), ('created_at', models.DateTimeField(auto_now_add=True)), @@ -190,9 +194,9 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), - ('first_name', secured_fields.fields.EncryptedCharField(blank=True, max_length=150, verbose_name='first name')), + ('first_name', secured_fields.fields.EncryptedCharField(blank=True, max_length=150, searchable=True, verbose_name='first name')), ('user_type', models.CharField(choices=[('staff', 'Staff'), ('agency', 'Agency'), ('candidate', 'Candidate')], db_index=True, default='staff', max_length=20, verbose_name='User Type')), - ('phone', secured_fields.fields.EncryptedCharField(blank=True, null=True, verbose_name='Phone')), + ('phone', secured_fields.fields.EncryptedCharField(blank=True, null=True, searchable=True, verbose_name='Phone')), ('profile_image', models.ImageField(blank=True, null=True, upload_to='profile_pic/', validators=[recruitment.validators.validate_image_size], verbose_name='Profile Image')), ('designation', models.CharField(blank=True, max_length=100, null=True, verbose_name='Designation')), ('email', models.EmailField(db_index=True, error_messages={'unique': 'A user with this email already exists.'}, max_length=254, unique=True)), @@ -358,7 +362,7 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=200, unique=True, verbose_name='Agency Name')), ('contact_person', models.CharField(blank=True, max_length=150, verbose_name='Contact Person')), ('email', models.EmailField(max_length=254, unique=True)), - ('phone', secured_fields.fields.EncryptedCharField(blank=True, max_length=20, null=True)), + ('phone', secured_fields.fields.EncryptedCharField(blank=True, max_length=20, null=True, searchable=True)), ('website', models.URLField(blank=True)), ('notes', models.TextField(blank=True, help_text='Internal notes about the agency')), ('country', django_countries.fields.CountryField(blank=True, max_length=2, null=True)), @@ -581,11 +585,11 @@ class Migration(migrations.Migration): ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created at')), ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated at')), ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), - ('first_name', secured_fields.fields.EncryptedCharField(max_length=255, verbose_name='First Name')), + ('first_name', secured_fields.fields.EncryptedCharField(max_length=255, searchable=True, verbose_name='First Name')), ('last_name', models.CharField(max_length=255, verbose_name='Last Name')), ('middle_name', models.CharField(blank=True, max_length=255, null=True, verbose_name='Middle Name')), ('email', models.EmailField(db_index=True, max_length=254, unique=True, verbose_name='Email')), - ('phone', secured_fields.fields.EncryptedCharField(blank=True, null=True, verbose_name='Phone')), + ('phone', secured_fields.fields.EncryptedCharField(blank=True, null=True, searchable=True, verbose_name='Phone')), ('date_of_birth', models.DateField(blank=True, null=True, verbose_name='Date of Birth')), ('gender', models.CharField(blank=True, choices=[('M', 'Male'), ('F', 'Female')], max_length=1, null=True, verbose_name='Gender')), ('gpa', models.DecimalField(decimal_places=2, help_text='GPA must be between 0 and 4.', max_digits=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(4)], verbose_name='GPA')), @@ -620,6 +624,7 @@ class Migration(migrations.Migration): ('interview_time', models.TimeField(verbose_name='Interview Time')), ('interview_type', models.CharField(choices=[('Remote', 'Remote (e.g., Zoom, Google Meet)'), ('Onsite', 'In-Person (Physical Location)')], default='Remote', max_length=20)), ('status', models.CharField(choices=[('scheduled', 'Scheduled'), ('confirmed', 'Confirmed'), ('cancelled', 'Cancelled'), ('completed', 'Completed')], db_index=True, default='scheduled', max_length=20)), + ('interview_questions', models.JSONField(blank=True, null=True, verbose_name='Question Data')), ('application', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='scheduled_interviews', to='recruitment.application')), ('interview', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='scheduled_interview', to='recruitment.interview', verbose_name='Interview/Meeting')), ('job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='scheduled_interviews', to='recruitment.jobposting')), diff --git a/recruitment/migrations/0002_alter_source_name_alter_source_source_type.py b/recruitment/migrations/0002_alter_source_name_alter_source_source_type.py deleted file mode 100644 index 3b4ce6a..0000000 --- a/recruitment/migrations/0002_alter_source_name_alter_source_source_type.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 6.0 on 2025-12-12 11:32 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='source', - name='name', - field=models.CharField(help_text='Name of the source', max_length=100, unique=True, verbose_name='Source Name'), - ), - migrations.AlterField( - model_name='source', - name='source_type', - field=models.CharField(help_text='Type of the source', max_length=100, verbose_name='Source Type'), - ), - ] diff --git a/recruitment/migrations/0003_interview_interview_result_interview_result_comments.py b/recruitment/migrations/0003_interview_interview_result_interview_result_comments.py deleted file mode 100644 index 738e042..0000000 --- a/recruitment/migrations/0003_interview_interview_result_interview_result_comments.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.2.7 on 2025-12-15 12:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0002_alter_source_name_alter_source_source_type'), - ] - - operations = [ - migrations.AddField( - model_name='interview', - name='interview_result', - field=models.CharField(blank=True, choices=[('passed', 'Passed'), ('failed', 'Failed'), ('on_hold', 'ON Hold')], default='on_hold', max_length=10, null=True, verbose_name='Interview Result'), - ), - migrations.AddField( - model_name='interview', - name='result_comments', - field=models.TextField(blank=True, null=True), - ), - ] diff --git a/recruitment/migrations/0004_interviewquestion.py b/recruitment/migrations/0004_interviewquestion.py deleted file mode 100644 index 17b0c18..0000000 --- a/recruitment/migrations/0004_interviewquestion.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 6.0 on 2025-12-15 13:59 - -import django.db.models.deletion -import django_extensions.db.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0003_interview_interview_result_interview_result_comments'), - ] - - operations = [ - migrations.CreateModel( - name='InterviewQuestion', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created at')), - ('updated_at', models.DateTimeField(auto_now=True, verbose_name='Updated at')), - ('slug', django_extensions.db.fields.RandomCharField(blank=True, editable=False, length=8, unique=True, verbose_name='Slug')), - ('question_text', models.TextField(verbose_name='Question Text')), - ('question_type', models.CharField(choices=[('technical', 'Technical'), ('behavioral', 'Behavioral'), ('situational', 'Situational')], default='technical', max_length=20, verbose_name='Question Type')), - ('difficulty_level', models.CharField(choices=[('easy', 'Easy'), ('medium', 'Medium'), ('hard', 'Hard')], default='medium', max_length=20, verbose_name='Difficulty Level')), - ('category', models.CharField(blank=True, max_length=100, verbose_name='Category')), - ('schedule', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ai_questions', to='recruitment.scheduledinterview', verbose_name='Interview Schedule')), - ], - options={ - 'verbose_name': 'Interview Question', - 'verbose_name_plural': 'Interview Questions', - 'ordering': ['created_at'], - 'indexes': [models.Index(fields=['schedule', 'question_type'], name='recruitment_schedul_b09a70_idx')], - }, - ), - ] diff --git a/recruitment/migrations/0004_settings_name.py b/recruitment/migrations/0004_settings_name.py deleted file mode 100644 index c5c7f1f..0000000 --- a/recruitment/migrations/0004_settings_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.2.7 on 2025-12-15 14:48 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0003_interview_interview_result_interview_result_comments'), - ] - - operations = [ - migrations.AddField( - model_name='settings', - name='name', - field=models.CharField(blank=True, help_text="A human-readable name (e.g., 'Zoom')", max_length=100, null=True, verbose_name='Friendly Name'), - ), - ] diff --git a/recruitment/migrations/0005_alter_settings_value.py b/recruitment/migrations/0005_alter_settings_value.py deleted file mode 100644 index 9f4aea7..0000000 --- a/recruitment/migrations/0005_alter_settings_value.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 5.2.7 on 2025-12-16 09:13 - -import secured_fields.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0004_settings_name'), - ] - - operations = [ - migrations.AlterField( - model_name='settings', - name='value', - field=secured_fields.fields.EncryptedTextField(help_text='Value for the setting', verbose_name='Setting Value'), - ), - ] diff --git a/recruitment/migrations/0005_merge_0004_interviewquestion_0004_settings_name.py b/recruitment/migrations/0005_merge_0004_interviewquestion_0004_settings_name.py deleted file mode 100644 index 1ba0c59..0000000 --- a/recruitment/migrations/0005_merge_0004_interviewquestion_0004_settings_name.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 6.0 on 2025-12-16 08:41 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0004_interviewquestion'), - ('recruitment', '0004_settings_name'), - ] - - operations = [ - ] diff --git a/recruitment/migrations/0006_interview_join_url.py b/recruitment/migrations/0006_interview_join_url.py deleted file mode 100644 index b7641f2..0000000 --- a/recruitment/migrations/0006_interview_join_url.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 6.0 on 2025-12-16 09:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0005_merge_0004_interviewquestion_0004_settings_name'), - ] - - operations = [ - migrations.AddField( - model_name='interview', - name='join_url', - field=models.URLField(blank=True, max_length=2048, null=True, verbose_name='Meeting/Location URL'), - ), - ] diff --git a/recruitment/migrations/0007_alter_interview_status.py b/recruitment/migrations/0007_alter_interview_status.py deleted file mode 100644 index 3951a2f..0000000 --- a/recruitment/migrations/0007_alter_interview_status.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 6.0 on 2025-12-16 10:11 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0006_interview_join_url'), - ] - - operations = [ - migrations.AlterField( - model_name='interview', - name='status', - field=models.CharField(choices=[('waiting', 'Waiting'), ('started', 'Started'), ('updated', 'Updated'), ('ended', 'Ended'), ('deleted', 'Deleted')], db_index=True, default='waiting', max_length=20), - ), - ] diff --git a/recruitment/migrations/0008_remove_interviewquestion_recruitment_schedul_b09a70_idx_and_more.py b/recruitment/migrations/0008_remove_interviewquestion_recruitment_schedul_b09a70_idx_and_more.py deleted file mode 100644 index 906a5c0..0000000 --- a/recruitment/migrations/0008_remove_interviewquestion_recruitment_schedul_b09a70_idx_and_more.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 6.0 on 2025-12-16 10:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0007_alter_interview_status'), - ] - - operations = [ - migrations.RemoveIndex( - model_name='interviewquestion', - name='recruitment_schedul_b09a70_idx', - ), - migrations.AddField( - model_name='interviewquestion', - name='data', - field=models.JSONField(blank=True, default=1, verbose_name='Question Data'), - preserve_default=False, - ), - migrations.AlterField( - model_name='interview', - name='status', - field=models.CharField(choices=[('waiting', 'Waiting'), ('started', 'Started'), ('updated', 'Updated'), ('deleted', 'Deleted'), ('ended', 'Ended')], db_index=True, default='waiting', max_length=20), - ), - migrations.AddIndex( - model_name='interviewquestion', - index=models.Index(fields=['schedule'], name='recruitment_schedul_dbb350_idx'), - ), - migrations.RemoveField( - model_name='interviewquestion', - name='category', - ), - migrations.RemoveField( - model_name='interviewquestion', - name='difficulty_level', - ), - migrations.RemoveField( - model_name='interviewquestion', - name='question_text', - ), - migrations.RemoveField( - model_name='interviewquestion', - name='question_type', - ), - ] diff --git a/recruitment/migrations/0009_remove_interviewquestion_recruitment_schedul_dbb350_idx_and_more.py b/recruitment/migrations/0009_remove_interviewquestion_recruitment_schedul_dbb350_idx_and_more.py deleted file mode 100644 index 291e5be..0000000 --- a/recruitment/migrations/0009_remove_interviewquestion_recruitment_schedul_dbb350_idx_and_more.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 6.0 on 2025-12-16 10:48 - -import django.utils.timezone -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('recruitment', '0008_remove_interviewquestion_recruitment_schedul_b09a70_idx_and_more'), - ] - - operations = [ - migrations.RemoveIndex( - model_name='interviewquestion', - name='recruitment_schedul_dbb350_idx', - ), - migrations.AddField( - model_name='scheduledinterview', - name='interview_questions', - field=models.JSONField(blank=True, default={}, verbose_name='Question Data'), - preserve_default=False, - ), - migrations.DeleteModel( - name='InterviewQuestion', - ), - ] diff --git a/recruitment/models.py b/recruitment/models.py index 3c63626..f12c1b7 100644 --- a/recruitment/models.py +++ b/recruitment/models.py @@ -45,7 +45,7 @@ class CustomUser(AbstractUser): ("candidate", _("Candidate")), ] - first_name=EncryptedCharField(_("first name"), max_length=150, blank=True) + first_name=EncryptedCharField(_("first name"), max_length=150, blank=True,searchable=True) user_type = models.CharField( max_length=20, @@ -55,7 +55,7 @@ class CustomUser(AbstractUser): db_index=True, # Added index for user_type filtering ) phone = EncryptedCharField( - blank=True, null=True, verbose_name=_("Phone") + blank=True, null=True, verbose_name=_("Phone"),searchable=True ) profile_image = models.ImageField( null=True, @@ -535,7 +535,7 @@ class Person(Base): ] # Personal Information - first_name = EncryptedCharField(max_length=255, verbose_name=_("First Name")) + first_name = EncryptedCharField(max_length=255, verbose_name=_("First Name"),searchable=True) last_name = models.CharField(max_length=255, verbose_name=_("Last Name")) middle_name = models.CharField( max_length=255, blank=True, null=True, verbose_name=_("Middle Name") @@ -546,7 +546,7 @@ class Person(Base): verbose_name=_("Email"), ) phone = EncryptedCharField( - blank=True, null=True, verbose_name=_("Phone") + blank=True, null=True, verbose_name=_("Phone"),searchable=True ) date_of_birth = models.DateField( null=True, blank=True, verbose_name=_("Date of Birth") @@ -1354,7 +1354,7 @@ class ScheduledInterview(Base): ) interview_questions = models.JSONField( verbose_name=_("Question Data"), - blank=True + blank=True,null=True ) def __str__(self): @@ -1968,7 +1968,7 @@ class HiringAgency(Base): max_length=150, blank=True, verbose_name=_("Contact Person") ) email = models.EmailField(unique=True) - phone = EncryptedCharField(max_length=20, blank=True,null=True) + phone = EncryptedCharField(max_length=20, blank=True,null=True,searchable=True) website = models.URLField(blank=True) notes = models.TextField(blank=True, help_text=_("Internal notes about the agency")) country = CountryField(blank=True, null=True, blank_label=_("Select country")) @@ -2362,7 +2362,7 @@ class Participants(Base): ) email =models.EmailField(verbose_name=_("Email")) phone = EncryptedCharField( - max_length=12, verbose_name=_("Phone Number"), null=True, blank=True + max_length=12, verbose_name=_("Phone Number"), null=True, blank=True,searchable=True ) designation = models.CharField( max_length=100, blank=True, verbose_name=_("Designation"), null=True diff --git a/recruitment/views.py b/recruitment/views.py index 0efc7f0..5fce1f0 100644 --- a/recruitment/views.py +++ b/recruitment/views.py @@ -2530,6 +2530,7 @@ def agency_list(request): | Q(contact_person__icontains=search_query) | Q(email__icontains=search_query) | Q(country__icontains=search_query) + | Q(phone=search_query) ) # Order by most recently created @@ -4475,7 +4476,7 @@ def source_list(request): """List all sources with search and pagination""" search_query = request.GET.get("q", "") sources = Source.objects.all() - + if search_query: sources = sources.filter( Q(name__icontains=search_query) diff --git a/recruitment/views_source.py b/recruitment/views_source.py index c1e2a3e..96b0be3 100644 --- a/recruitment/views_source.py +++ b/recruitment/views_source.py @@ -23,7 +23,7 @@ class SourceListView(LoginRequiredMixin, UserPassesTestMixin, ListView): queryset = super().get_queryset().order_by('name') # Search functionality - search_query = self.request.GET.get('search', '') + search_query = self.request.GET.get('q', '') if search_query: queryset = queryset.filter( models.Q(name__icontains=search_query) | diff --git a/templates/interviews/interview_list.html b/templates/interviews/interview_list.html index e431910..7837ef9 100644 --- a/templates/interviews/interview_list.html +++ b/templates/interviews/interview_list.html @@ -258,10 +258,12 @@ {{ interview.interview_date|date:"d-m-Y" }}
{{ interview.interview_time|date:"h:i A" }} + + {# Assuming interview.interview.location_type is meant to be interview.location_type #} - {% if interview.location_type == 'Remote' %} + {% if interview.interview.location_type == 'Remote' %} {% trans "Remote" %} @@ -319,7 +321,7 @@ {# --- Type/Location --- #} {% trans "Type" %}: {{ interview.location_type }} - {% if interview.location_type == 'Remote' %}
+ {% if interview.location_type == 'Remote' %}
{# Using interview.join_url directly if available, assuming interview is the full object #} {% trans "Link" %}: {% if interview.join_url %}Join Meeting{% else %}N/A{% endif %} {% else %}
diff --git a/templates/messages/message_list.html b/templates/messages/message_list.html index 7692dea..4f52188 100644 --- a/templates/messages/message_list.html +++ b/templates/messages/message_list.html @@ -50,12 +50,12 @@
-
-
+