Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

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
 
 
@@ -17,7 +17,7 @@ class ServiceTariffUpdateForm(forms.ModelForm):
         fields = [
             'status',
             'ticket_status',
-            'service_type',
+            'service_category',
             'resource',
             'requirements',
             'price_alg',
@@ -32,7 +32,7 @@ class ServiceTariffUpdateForm(forms.ModelForm):
             'status': forms.TextInput(attrs={'readonly': True}, ),
             'ticket_status': forms.TextInput(attrs={'readonly': True}),
 
-            'service_type': forms.Select(attrs={'class': 'form-select'}),
+            'service_category': forms.Select(attrs={'class': 'form-select'}),
             'resource': forms.Select(attrs={'class': 'form-select'}),
         }
 
@@ -51,18 +51,18 @@ class ServiceTariffCreateForm(forms.ModelForm):
         fields = '__all__'
 
         widgets = {
-            'service_type': forms.Select(attrs={'class': 'form-select'}),
+            'service_category': forms.Select(attrs={'class': 'form-select'}),
             'resource': forms.Select(attrs={'class': 'form-select'}),
             'ticket_status': forms.TextInput(attrs={'readonly': True}),
         }
 
 
-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',
@@ -127,14 +127,14 @@ class ServiceInformationUpdateForm(forms.ModelForm):
     class Meta:
         model = Service
         fields = [
-            'service_type'
+            'service_category'
         ]
 
         widgets = {
             # 'status': forms.TextInput(attrs={'readonly': True}),
             # 'ticket_status': forms.TextInput(attrs={'readonly': True}),
 
-            'service_type': forms.Select(attrs={'class': 'form-select'}),
+            'service_category': forms.Select(attrs={'class': 'form-select'}),
             # 'repr': forms.Select(attrs={'class': 'form-select'}),
             # 'resource': forms.Select(attrs={'class': 'form-select'}),
         }
@@ -162,9 +162,9 @@ class ServiceInformationCreateForm(forms.ModelForm):
         ]
 
         widgets = {
-            # 'service_type': forms.CharField(max_length=255)
+            # 'service_category': forms.CharField(max_length=255)
             # 'legal_name': forms.TextInput(label = 'Название')
-            # 'service_type': forms.Select(attrs={'class': 'form-select'}),
+            # 'service_category': forms.Select(attrs={'class': 'form-select'}),
             # 'repr': forms.Select(attrs={'class': 'form-select'}),
             # 'resource': forms.Select(attrs={'class': 'form-select'}),
             # 'ticket_status': forms.Select(attrs={'class': 'form-select'}),

sharix_admin/locale/ru/LC_MESSAGES/django.po

@@ -248,7 +248,7 @@ msgstr "Купить баллы"
 #: .\templates\sharix_admin\senderform.html:10
 #: .\templates\sharix_admin\service_information_form.html:23
 #: .\templates\sharix_admin\service_tariff_form.html:19
-#: .\templates\sharix_admin\service_type_form.html:19
+#: .\templates\sharix_admin\service_category_form.html:19
 msgid "Submit"
 msgstr "Отправить"
 
@@ -261,16 +261,16 @@ msgid "send_phone"
 msgstr "Отправить телефон"
 
 #: .\templates\sharix_admin\service_tariff.html:48
-#: .\templates\sharix_admin\service_type.html:48
+#: .\templates\sharix_admin\service_category.html:48
 msgid "Add"
 msgstr "Добавить"
 
-#: .\templates\sharix_admin\service_type_delete.html:9
+#: .\templates\sharix_admin\service_category_delete.html:9
 #, python-format
 msgid "Are you sure you want to delete \\\"%%(object.caption)s\\\"?"
 msgstr "Вы уверены, что хотите удалить \\\"%%(object.caption)s\\\"?"
 
-#: .\templates\sharix_admin\service_type_delete.html:12
+#: .\templates\sharix_admin\service_category_delete.html:12
 msgid "Delete"
 msgstr "Удалить"
 
@@ -386,7 +386,7 @@ msgstr "Партнеры"
 msgid "Resources"
 msgstr "Ресурсы"
 
-#: .\views\context.py:23 .\views\service_type.py:19
+#: .\views\context.py:23 .\views\service_category.py:19
 msgid "Service services"
 msgstr "Услуги сервиса"
 

sharix_admin/tables.py

@@ -272,10 +272,10 @@ class ServiceTariffTable(tables.Table):
             "td": {"width": "5%"}
         }
     )
-    service_type = tables.LinkColumn(
+    service_category = tables.LinkColumn(
         'service_tariff/edit/',
         verbose_name=_('Name of the tariff'),
-        text=lambda record: record.service_type.caption,
+        text=lambda record: record.service_category.caption,
         args=[tables.A('pk')],
         attrs={
             'th': {'scope': 'col'},
@@ -324,10 +324,10 @@ 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/',
+        'service_category/edit/',
         verbose_name='Услуга',
         orderable=False,
         text=lambda record: record.codename,
@@ -339,7 +339,7 @@ class ServiceTypeTable(tables.Table):
         }
     )
     description = tables.LinkColumn(
-        'service_type/edit/',
+        'service_category/edit/',
         orderable=False, verbose_name='Описание',
         text=lambda record: record.description,
         args=[tables.A('pk')],
@@ -350,7 +350,7 @@ class ServiceTypeTable(tables.Table):
         }
     )
     edit = tables.LinkColumn(
-        'service_type/edit/',
+        'service_category/edit/',
         verbose_name='',
         orderable=False,
         text="E",
@@ -361,7 +361,7 @@ class ServiceTypeTable(tables.Table):
         }
     )
     deletee = tables.LinkColumn(
-        'service_type/delete/',
+        'service_category/delete/',
         verbose_name='',
         orderable=False,
         text="D",
@@ -373,7 +373,7 @@ class ServiceTypeTable(tables.Table):
     )
 
     class Meta:
-        model = ServiceType
+        model = ServiceCategory
         attrs = {
             "class": "table table-layout-fixed text-start"
         }
@@ -390,7 +390,7 @@ class ServiceTypeTable(tables.Table):
         )
 
     # def render_delete(self, value, record):
-    #     return format_html('<a href="/service_type/delete" class="btn btn-outline-danger">_(Delete)</a>')
+    #     return format_html('<a href="/service_category/delete" class="btn btn-outline-danger">_(Delete)</a>')
 
     # def render_name_operation(self, value, record):
     #     return format_html("<a href='{}'>{}</a>", record.get_absolute_url(), value)
@@ -403,9 +403,9 @@ class ServiceTable(tables.Table):
             "td": {"width": "5%"}
         }
     )
-    service_type = tables.Column(
+    service_category = tables.Column(
         verbose_name=_('Description of the service'),
-        accessor='service_type.caption',
+        accessor='service_category.caption',
         attrs={
             'th': {'scope': 'col'},
             "td": {"width": "20%"}}

sharix_admin/templates/sharix_admin/base_admin.html

@@ -107,12 +107,12 @@
         </a>
       </li> {% endcomment %}
       {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_type' %}" class="nav-link {% if current_page == "service_type" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:service_category' %}" class="nav-link {% if current_page == "service_category" %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "service_type" %}
+                {% if current_page == "service_category" %}
                   {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/briefcase.svg' %}

sharix_admin/templates/sharix_admin/service_type.html → sharix_admin/templates/sharix_admin/service_category.html

@@ -23,6 +23,6 @@
       </div>
 
   <div class="container text-end mt-2">
-    <a class="btn btn-primary" id="bord" href="/service_type/add">{% trans 'Add' %}</a>
+    <a class="btn btn-primary" id="bord" href="/service_category/add">{% trans 'Add' %}</a>
   </div>
 {% endblock contenthome %}

sharix_admin/templates/sharix_admin/service_information_form.html

@@ -6,8 +6,8 @@
 <h1 class="mainHeader">{{ title }}</h1>
 <p class="description_service">Это система управления государством, источником власти в которой является сам народ. Именно народ решает, какие законы и нормы необходимы для гармоничного существования и развития государства. Таким образом, каждый человек в демократическом обществе 
     Получает определенный набор свобод и обязательств сформированных с учетом интересов всего сообщества. Исходя из вышесказанного, можно заключить, что демократия – это возможность для каждого человека свободно участвовать в непосредственном управлении своим государством, обществом и личной судьбой в конечном счете.</p>
-{{object.service_type.caption}}
-{{object.service_type.description}}
+{{object.service_category.caption}}
+{{object.service_category.description}}
 <form method="post" style="overflow: auto">
     {% csrf_token %}
     <div class="container m-2">

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_category/', login_required(ServiceCategoryListView.as_view()), name='service_category'),
+    path('service_category/edit/<int:pk>', login_required(ServiceCategoryUpdateView.as_view()), name='service_category/edit/'),
+    path('service_category/add/', login_required(ServiceCategoryCreate.as_view()), name='service_category/add/'),
+    path('service_category/delete/<int:pk>', login_required(ServiceCategoryDelete.as_view()), name='service_category/delete/'),
 
     path('service_information/add/', login_required(ServiceInformationCreate.as_view()),
          name='service_information-add'),

sharix_admin/views/__init__.py

@@ -13,7 +13,7 @@ from .schema import *
 from .service import *
 from .service_info import *
 from .service_tariff import *
-from .service_type import *
+from .service_category import *
 from .trans_id import *
 from .transactions import *
 from .user_info import *

sharix_admin/views/service_type.py → sharix_admin/views/service_category.py

@@ -1,20 +1,20 @@
-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
-    template_name = "sharix_admin/service_type_form.html"
+    page_name = 'service_category'
+    model = ServiceCategory
+    form_class = ServiceCategoryCreateForm
+    template_name = "sharix_admin/service_category_form.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -24,7 +24,7 @@ class ServiceTypeCreate(BaseView, CreateView):
         return context
 
     def get_success_url(self):
-        return reverse('service_type')
+        return reverse('service_category')
 
     def test_func(self) -> bool or None:
         group_names = ('METASERVICE-ADMIN')
@@ -33,12 +33,12 @@ 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()
-    template_name = 'sharix_admin/service_type.html'
+    page_name = 'service_category'
+    table_class = ServiceCategoryTable
+    queryset = ServiceCategory.objects.all()
+    template_name = 'sharix_admin/service_category.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -58,17 +58,17 @@ class ServiceTypeListView(BaseView, SingleTableView):
         return False
 
 
-class ServiceTypeUpdateView(BaseView, UpdateView):
-    model = ServiceType
-    form_class = ServiceTypeCreateForm
-    template_name = "sharix_admin/service_type_form.html"
+class ServiceCategoryUpdateView(BaseView, UpdateView):
+    model = ServiceCategory
+    form_class = ServiceCategoryCreateForm
+    template_name = "sharix_admin/service_category_form.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context.update({
             'title': _('Услуги сервиса'),
             'object': self.object,
-            "current_page": "service_type"
+            "current_page": "service_category"
         })
         return context
 
@@ -79,24 +79,24 @@ class ServiceTypeUpdateView(BaseView, UpdateView):
         return False
 
     def get_success_url(self):
-        return reverse('service_type')
+        return reverse('service_category')
 
 
-class ServiceTypeDelete(BaseView, DeleteView):
-    model = ServiceType
-    template_name = "sharix_admin/service_type_delete.html"
+class ServiceCategoryDelete(BaseView, DeleteView):
+    model = ServiceCategory
+    template_name = "sharix_admin/service_category_delete.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context.update({
             'title': 'Услуги сервиса',
             'object': self.object,
-            "current_page": "service_type"
+            "current_page": "service_category"
         })
         return context
 
     def get_success_url(self):
-        return reverse('service_type')
+        return reverse('service_category')
 
     def test_func(self) -> bool or None:
         group_names = ('METASERVICE-ADMIN')