From 193eb7c8afa1d5b0f9ea0dda06653be8af685b28 Mon Sep 17 00:00:00 2001 From: Eligiusz Kurzawa Date: Fri, 15 Jan 2021 15:19:10 +0100 Subject: [PATCH] 23# added messages --- templates/base.html | 18 +++++++++--------- templates/jobs/single.html | 4 ++-- templates/users/employee-profile.html | 1 + users/models.py | 3 +++ users/urls.py | 2 +- users/views.py | 15 +++++++++++++-- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/templates/base.html b/templates/base.html index 0893da7..b12d90d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -56,11 +56,11 @@ {{ user.first_name }}
- My Jobs - You Have {{ user.count_unread_messages }} message(s) - My Wish List - Update Profile - Change Password + My jobs + You have {{ user.count_unread_messages }} message(s) + My wish list + Update profile + Change password Logout
@@ -71,12 +71,12 @@ {{ user.first_name }}
- Add Job - My Jobs + Add job + My jobs {% if user.get_profile_id %} - Update Profile + Update profile {% endif %} - Change Password + Change password Logout
diff --git a/templates/jobs/single.html b/templates/jobs/single.html index 399b85c..f2a416b 100644 --- a/templates/jobs/single.html +++ b/templates/jobs/single.html @@ -6,7 +6,7 @@
-

Home Blog Single

+

Home Detail

Job detail

@@ -43,7 +43,7 @@ Applied candidates {% for employee in applied_employees %} - {{ employee.first_name }} {{ employee.last_name }} + {{ employee.first_name }} {{ employee.last_name }} {% endfor %}
{% else %} diff --git a/templates/users/employee-profile.html b/templates/users/employee-profile.html index c8fe1d5..124ec3e 100644 --- a/templates/users/employee-profile.html +++ b/templates/users/employee-profile.html @@ -26,6 +26,7 @@

Send an invitation to employee

+ {% csrf_token %}
diff --git a/users/models.py b/users/models.py index 4a60214..b38e525 100644 --- a/users/models.py +++ b/users/models.py @@ -55,6 +55,9 @@ class Account(AbstractBaseUser, PermissionsMixin): def get_profile_id(self): return self.profile.id + def count_unread_messages(self): + return self.invites.filter(unread=True).count() + class Profile(models.Model): user = models.OneToOneField(Account, on_delete=models.CASCADE, related_name="profile") diff --git a/users/urls.py b/users/urls.py index 9a9b89c..6a616c1 100644 --- a/users/urls.py +++ b/users/urls.py @@ -7,6 +7,6 @@ urlpatterns = [ path('login/', UserLoginView.as_view(), name='login'), path('logout/', UserLogoutView.as_view(), name='logout'), path('update-profile//', UserUpdateView.as_view(), name='update_profile'), - path('employee-profile//', EmployeeProfileView.as_view(), name='employee_profile'), + path('employee-profile///', EmployeeProfileView.as_view(), name='employee_profile'), path('employer-jobs/', EmployerPostedJobsView.as_view(), name='employer_jobs'), ] diff --git a/users/views.py b/users/views.py index 3136232..949d163 100644 --- a/users/views.py +++ b/users/views.py @@ -67,11 +67,22 @@ class EmployeeProfileView(CreateView): def get_context_data(self, **kwargs): context = super(EmployeeProfileView, self).get_context_data(**kwargs) - context['account'] = Account.objects.get(pk=self.kwargs['pk']) - context['profile'] = Profile.objects.get(user_id=self.kwargs['pk']) + context['account'] = Account.objects.get(pk=self.kwargs['employee_id']) + context['profile'] = Profile.objects.get(user_id=self.kwargs['employee_id']) + context['job'] = Job.objects.get(id=self.kwargs['job_id']) context['categories'] = Category.objects.all() return context + def form_valid(self, form): + instance = form.save(commit=False) + instance.user = Account.objects.get(pk=self.kwargs['employee_id']) + instance.job = Job.objects.get(pk=self.kwargs['job_id']) + instance.save() + return super(EmployeeProfileView, self).form_valid(form) + + def get_success_url(self): + return reverse('users:employer_jobs') + @method_decorator(login_required(login_url='/users/login'), name='dispatch') class EmployerPostedJobsView(ListView):