payments
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
from django.forms import ModelForm
|
||||
|
||||
from common.models import CompanyModel
|
||||
|
||||
|
||||
class CompanyBaseForm(ModelForm):
|
||||
class Meta:
|
||||
model = CompanyModel
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class CompanyCreateForm(CompanyBaseForm):
|
||||
...
|
||||
|
||||
|
||||
class CompanyUpdateForm(CompanyBaseForm):
|
||||
...
|
||||
@@ -0,0 +1,17 @@
|
||||
from django.forms import ModelForm
|
||||
|
||||
from common.models import LinesModel
|
||||
|
||||
|
||||
class LineBaseForm(ModelForm):
|
||||
class Meta:
|
||||
model = LinesModel
|
||||
fields = '__all__'
|
||||
|
||||
|
||||
class LineCreateForm(LineBaseForm):
|
||||
...
|
||||
|
||||
|
||||
class LineUpdateForm(LineBaseForm):
|
||||
...
|
||||
+29
-7
@@ -1,14 +1,36 @@
|
||||
from django.urls import path, include
|
||||
from common.views.barrier_views import BarrierDashboardView
|
||||
from common.views.employee_views import EmployeeDashboardView
|
||||
from common.views.client_views import ClientDashboardView
|
||||
from common.views.employee_views import EmployeeDashboardView, EmployeeCompanyListView, EmployeeCompanyCreateView, \
|
||||
EmployeeCompanyUpdateView, EmployeeLineListView, EmployeeLineCreateView, EmployeeLineUpdateView
|
||||
from common.views.client_views import ClientDashboardView, ClientCompanyListView, ClientCompanyCreateView, \
|
||||
ClientCompanyUpdateView, ClientLineListView, ClientLineCreateView, ClientLineUpdateView
|
||||
from common.views.shared_views import IndexView, DashboardRedirectView
|
||||
urlpatterns = [
|
||||
path('', IndexView.as_view(), name='index'),
|
||||
path('dashboard/', include([
|
||||
path('', DashboardRedirectView.as_view(), name='dashboard'),
|
||||
path('client/', ClientDashboardView.as_view(), name='client_dashboard'),
|
||||
path('barrier/', BarrierDashboardView.as_view(), name='barrier_dashboard'),
|
||||
path('employee/', EmployeeDashboardView.as_view(), name='employee_dashboard'),
|
||||
]))
|
||||
path('', DashboardRedirectView.as_view(), name='dashboard'),
|
||||
path('client/', ClientDashboardView.as_view(), name='client_dashboard'),
|
||||
path('barrier/', BarrierDashboardView.as_view(), name='barrier_dashboard'),
|
||||
path('employee/', EmployeeDashboardView.as_view(), name='employee_dashboard'),
|
||||
])),
|
||||
path('client/company/', include([
|
||||
path('', ClientCompanyListView.as_view(), name='client_company'),
|
||||
path('create/', ClientCompanyCreateView.as_view(), name='client_company_create'),
|
||||
path('<int:pk>/edit/', ClientCompanyUpdateView.as_view(), name='client_company_edit'),
|
||||
])),
|
||||
path('client/line/', include([
|
||||
path('', ClientLineListView.as_view(), name='client_line'),
|
||||
path('create/', ClientLineCreateView.as_view(), name='client_line_create'),
|
||||
path('<int:pk>/edit/', ClientLineUpdateView.as_view(), name='client_line_update'),
|
||||
])),
|
||||
path('employee/company/', include([
|
||||
path('', EmployeeCompanyListView.as_view(), name='employee_company'),
|
||||
path('create/', EmployeeCompanyCreateView.as_view(), name='employee_company_create'),
|
||||
path('<int:pk>/edit/', EmployeeCompanyUpdateView.as_view(), name='employee_company_update'),
|
||||
])),
|
||||
path('employee/line/', include([
|
||||
path('', EmployeeLineListView.as_view(), name='employee_line'),
|
||||
path('create/', EmployeeLineCreateView.as_view(), name='employee_line_create'),
|
||||
path('<int:pk>/edit/', EmployeeLineUpdateView.as_view(), name='employee_line_update'),
|
||||
])),
|
||||
]
|
||||
|
||||
@@ -8,7 +8,7 @@ def filter_queryset_by_user(queryset, user):
|
||||
If the user has a line, it filters by that line.
|
||||
If the user has a company, it filters by all lines associated with that company.
|
||||
"""
|
||||
print(f'user: {user}, user company: {user.company}, user line: {user.line}')
|
||||
print(f'user: {user}, user company: {user.company}, user line: {user.line}, user type: {user.user_type}')
|
||||
if user.line:
|
||||
filtered = queryset.filter(line=user.line)
|
||||
print(f"Filtering by line: {user.line.id}, count: {filtered.count()}")
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
|
||||
from django.shortcuts import render
|
||||
from django.views.generic import TemplateView
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import TemplateView, ListView, CreateView, UpdateView
|
||||
|
||||
from DepoT.mixins.LineFiltweFormMixin import LineFilterFormMixin
|
||||
from common.forms.company import CompanyCreateForm, CompanyUpdateForm
|
||||
from common.forms.line import LineCreateForm, LineUpdateForm
|
||||
from common.models import CompanyModel, LinesModel
|
||||
from common.utils.utils import filter_queryset_by_user
|
||||
|
||||
|
||||
class ClientDashboardView(TemplateView):
|
||||
@@ -10,4 +18,123 @@ class ClientDashboardView(TemplateView):
|
||||
}
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
return render(request, self.template_name, self.extra_context)
|
||||
return render(request, self.template_name, self.extra_context)
|
||||
|
||||
|
||||
|
||||
class ClientCompanyListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-list.html'
|
||||
context_object_name = 'objects'
|
||||
paginate_by = 3
|
||||
base_template = 'client-base.html'
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_employee_perm('can_view_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['base_template'] = self.base_template
|
||||
return context
|
||||
|
||||
def get_queryset(self):
|
||||
queryset = super().get_queryset()
|
||||
user = self.request.user
|
||||
result = filter_queryset_by_user(queryset, user)
|
||||
return result
|
||||
|
||||
|
||||
|
||||
class ClientCompanyCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-create.html'
|
||||
form_class = CompanyCreateForm
|
||||
success_url = reverse_lazy('client-company')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_company_perm('can_create_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.created_by = self.request.user
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
|
||||
|
||||
class ClientCompanyUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-update.html'
|
||||
form_class = CompanyUpdateForm
|
||||
success_url = reverse_lazy('client-company')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.ha.s_company_perm('can_edit_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
|
||||
|
||||
class ClientLineListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
|
||||
model = LinesModel
|
||||
template_name = 'client/line-list.html'
|
||||
context_object_name = 'objects'
|
||||
paginate_by = 3
|
||||
base_template = 'client-base.html'
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_employee_perm('can_view_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['base_template'] = self.base_template
|
||||
return context
|
||||
|
||||
def get_queryset(self):
|
||||
queryset = super().get_queryset()
|
||||
user = self.request.user
|
||||
result = queryset.filter(company=user.company)
|
||||
return result
|
||||
|
||||
|
||||
class ClientLineCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
|
||||
model = LinesModel
|
||||
template_name = 'client/line-create.html'
|
||||
form_class = LineCreateForm
|
||||
|
||||
success_url = reverse_lazy('client-line')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_company_perm('can_create_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_form(self, form_class=None):
|
||||
form = super().get_form(form_class)
|
||||
form.fields['company'].queryset = CompanyModel.objects.filter(id=self.request.user.company.id)
|
||||
form.fields['company'].initial = self.request.user.company.id
|
||||
return form
|
||||
|
||||
def form_valid(self, form):
|
||||
# todo more validation
|
||||
form.instance.company = self.request.user.company
|
||||
return super().form_valid(form)
|
||||
|
||||
class ClientLineUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
|
||||
model = LinesModel
|
||||
template_name = 'client/line-update.html'
|
||||
form_class = LineUpdateForm
|
||||
success_url = reverse_lazy('client-company')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.ha.s_company_perm('can_edit_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_form(self, form_class=None):
|
||||
form = super().get_form(form_class)
|
||||
form.fields['company'].queryset = CompanyModel.objects.filter(id=self.request.user.company.id)
|
||||
form.fields['company'].initial = self.request.user.company.id
|
||||
return form
|
||||
|
||||
def form_valid(self, form):
|
||||
# todo more validation
|
||||
form.instance.company = self.request.user.company
|
||||
return super().form_valid(form)
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
from django.views.generic import TemplateView
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import TemplateView, ListView, CreateView, UpdateView
|
||||
|
||||
from booking.models import Booking
|
||||
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 preinfo.models import Preinfo
|
||||
|
||||
@@ -20,4 +25,98 @@ class EmployeeDashboardView(TemplateView):
|
||||
context['containers'] = containers
|
||||
context['preinfos'] = preinfos
|
||||
context['bookings'] = bookings
|
||||
return context
|
||||
return context
|
||||
|
||||
|
||||
class EmployeeCompanyListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-list.html'
|
||||
context_object_name = 'objects'
|
||||
paginate_by = 3
|
||||
base_template = 'employee-base.html'
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_employee_perm('can_view_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['base_template'] = self.base_template
|
||||
return context
|
||||
|
||||
|
||||
|
||||
class EmployeeCompanyCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-create.html'
|
||||
form_class = CompanyCreateForm
|
||||
success_url = reverse_lazy('employee_company')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_company_perm('can_create_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.created_by = self.request.user
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
|
||||
|
||||
class EmployeeCompanyUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
|
||||
model = CompanyModel
|
||||
template_name = 'common/../../templates/employee/company-update.html'
|
||||
form_class = CompanyUpdateForm
|
||||
success_url = reverse_lazy('employee_company')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.ha.s_company_perm('can_edit_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
|
||||
class EmployeeLineListView(LoginRequiredMixin, UserPassesTestMixin, ListView):
|
||||
model = LinesModel
|
||||
template_name = 'employee/line-list.html'
|
||||
context_object_name = 'objects'
|
||||
paginate_by = 3
|
||||
base_template = 'employee-base.html'
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_employee_perm('can_view_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['base_template'] = self.base_template
|
||||
return context
|
||||
|
||||
|
||||
|
||||
class EmployeeLineCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
|
||||
model = LinesModel
|
||||
template_name = 'employee/company-create.html'
|
||||
form_class = LineCreateForm
|
||||
success_url = reverse_lazy('employee_line')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.has_company_perm('can_create_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.created_by = self.request.user
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
|
||||
|
||||
class EmployeeLineUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
|
||||
model = LinesModel
|
||||
template_name = 'employee/company-update.html'
|
||||
form_class = LineUpdateForm
|
||||
success_url = reverse_lazy('employee_line')
|
||||
|
||||
def test_func(self):
|
||||
return True # self.request.user.ha.s_company_perm('can_edit_preinfo') or self.request.user.user_type == 'CA'
|
||||
|
||||
# def form_valid(self, form):
|
||||
# form.instance.updated_by = self.request.user
|
||||
# return super().form_valid(form)
|
||||
|
||||
Reference in New Issue
Block a user