fix date filter

employee dashboard fully working

common/templatetags/filters.py

@@ -8,7 +8,7 @@ register = template.Library()
 @register.filter
 def bg_date(value):
     if value:
-        return date(value, "y.m.d h:m")
+        return date(value, "d.m.Y H:i")
     return ""
 
 

common/views/barrier_views.py

@@ -9,7 +9,7 @@ class BarrierDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateView
     template_name = 'barrier/barrier-dashboard.html'
 
     def test_func(self):
-        return self.request.user.user_type == 'BA'
+        return self.request.user.user_type == 'BS'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

common/views/employee_views.py

@@ -7,6 +7,7 @@ from common.forms.company import CompanyCreateForm, CompanyUpdateForm
 from common.forms.line import LineCreateForm, LineUpdateForm
 from common.models import CompanyModel, LinesModel
 from containers.models import Container
+from payments.models import Payment
 from preinfo.models import Preinfo
 
 
@@ -18,7 +19,7 @@ class EmployeeDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateVie
     }
 
     def test_func(self):
-        return self.request.user.user_type == 'EMP' or self.request.user.is_superuser
+        return self.request.user.user_type == 'EM' or self.request.user.is_superuser
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -28,6 +29,8 @@ class EmployeeDashboardView(LoginRequiredMixin, UserPassesTestMixin, TemplateVie
         context['containers'] = containers
         context['preinfos'] = preinfos
         context['bookings'] = bookings
+        context['recent_containers'] = Container.objects.order_by('-expedited_on', '-received_on')[:10]
+        context['recent_payments'] = Payment.objects.order_by('-created_on')[:10]
         return context