rename class ServiceType to ServiceCategory

sharix_admin/forms/service.py

@@ -1,4 +1,4 @@
-from dbsynce.models import ServiceType, Service, Company
+from dbsynce.models import ServiceCategory, Service, Company
 from django import forms
 
 
@@ -57,12 +57,12 @@ class ServiceTariffCreateForm(forms.ModelForm):
         }
 
 
-class ServiceTypeUpdateForm(forms.ModelForm):
+class ServiceCategoryUpdateForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
-        super(ServiceTypeUpdateForm, self).__init__(*args, **kwargs)
+        super(ServiceCategoryUpdateForm, self).__init__(*args, **kwargs)
 
     class Meta:
-        model = ServiceType
+        model = ServiceCategory
         fields = [
             'status',
             'ticket_status',
@@ -88,7 +88,7 @@ PRICE_CHOICES = [
 ]
 
 
-class ServiceTypeCreateForm(forms.ModelForm):
+class ServiceCategoryCreateForm(forms.ModelForm):
     codename = forms.CharField(label="Название услуги")
     requirements = forms.CharField(label="Требования")
     price_type = forms.ChoiceField(choices=PRICE_CHOICES, label="Ценообразование")
@@ -97,10 +97,10 @@ class ServiceTypeCreateForm(forms.ModelForm):
     is_visible = forms.BooleanField(label="Доступно для планирования цепочек во всех сервисах", required=False)
 
     def __init__(self, *args, **kwargs):
-        super(ServiceTypeCreateForm, self).__init__(*args, **kwargs)
+        super(ServiceCategoryCreateForm, self).__init__(*args, **kwargs)
 
     class Meta:
-        model = ServiceType
+        model = ServiceCategory
         fields = [
             'codename',
             'requirements',

sharix_admin/tables.py

@@ -324,7 +324,7 @@ class ServiceTariffTable(tables.Table):
             return format_html('<input class="form-check-input status-toggle" disabled  type="checkbox"')
 
 
-class ServiceTypeTable(tables.Table):
+class ServiceCategoryTable(tables.Table):
     id = tables.Column(attrs={"td": {"width": "50px"}})
     codename = tables.LinkColumn(
         'service_type/edit/',
@@ -373,7 +373,7 @@ class ServiceTypeTable(tables.Table):
     )
 
     class Meta:
-        model = ServiceType
+        model = ServiceCategory
         attrs = {
             "class": "table table-layout-fixed text-start"
         }

sharix_admin/urls.py

@@ -56,10 +56,10 @@ urlpatterns = [
     path('service_tariff/edit/<int:pk>', login_required(ServiceTariffUpdateView.as_view()),
          name='service_tariff/edit/'),
 
-    path('service_type/', login_required(ServiceTypeListView.as_view()), name='service_type'),
-    path('service_type/edit/<int:pk>', login_required(ServiceTypeUpdateView.as_view()), name='service_type/edit/'),
-    path('service_type/add/', login_required(ServiceTypeCreate.as_view()), name='service_type/add/'),
-    path('service_type/delete/<int:pk>', login_required(ServiceTypeDelete.as_view()), name='service_type/delete/'),
+    path('service_type/', login_required(ServiceCategoryListView.as_view()), name='service_type'),
+    path('service_type/edit/<int:pk>', login_required(ServiceCategoryUpdateView.as_view()), name='service_type/edit/'),
+    path('service_type/add/', login_required(ServiceCategoryCreate.as_view()), name='service_type/add/'),
+    path('service_type/delete/<int:pk>', login_required(ServiceCategoryDelete.as_view()), name='service_type/delete/'),
 
     path('service_information/add/', login_required(ServiceInformationCreate.as_view()),
          name='service_information-add'),

sharix_admin/views/service_type.py

@@ -1,19 +1,19 @@
-from dbsynce.models import ServiceType
+from dbsynce.models import ServiceCategory
 from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django_tables2 import SingleTableView
 
-from sharix_admin.forms import ServiceTypeCreateForm, ServiceTypeUpdateForm
-from sharix_admin.tables import ServiceTypeTable
+from sharix_admin.forms import ServiceCategoryCreateForm, ServiceCategoryUpdateForm
+from sharix_admin.tables import ServiceCategoryTable
 from .base import BaseView
 
 
-class ServiceTypeCreate(BaseView, CreateView):
+class ServiceCategoryCreate(BaseView, CreateView):
     page_title = _('Услуги сервиса')
     page_name = 'service_type'
-    model = ServiceType
-    form_class = ServiceTypeCreateForm
+    model = ServiceCategory
+    form_class = ServiceCategoryCreateForm
     template_name = "sharix_admin/service_type_form.html"
 
     def get_context_data(self, **kwargs):
@@ -33,11 +33,11 @@ class ServiceTypeCreate(BaseView, CreateView):
         return False
 
 
-class ServiceTypeListView(BaseView, SingleTableView):
+class ServiceCategoryListView(BaseView, SingleTableView):
     page_title = _('Услуги сервиса')
     page_name = 'service_type'
-    table_class = ServiceTypeTable
-    queryset = ServiceType.objects.all()
+    table_class = ServiceCategoryTable
+    queryset = ServiceCategory.objects.all()
     template_name = 'sharix_admin/service_type.html'
 
     def get_context_data(self, **kwargs):
@@ -58,9 +58,9 @@ class ServiceTypeListView(BaseView, SingleTableView):
         return False
 
 
-class ServiceTypeUpdateView(BaseView, UpdateView):
-    model = ServiceType
-    form_class = ServiceTypeCreateForm
+class ServiceCategoryUpdateView(BaseView, UpdateView):
+    model = ServiceCategory
+    form_class = ServiceCategoryCreateForm
     template_name = "sharix_admin/service_type_form.html"
 
     def get_context_data(self, **kwargs):
@@ -82,8 +82,8 @@ class ServiceTypeUpdateView(BaseView, UpdateView):
         return reverse('service_type')
 
 
-class ServiceTypeDelete(BaseView, DeleteView):
-    model = ServiceType
+class ServiceCategoryDelete(BaseView, DeleteView):
+    model = ServiceCategory
     template_name = "sharix_admin/service_type_delete.html"
 
     def get_context_data(self, **kwargs):