new pages with details avaliable

sharix_admin/tables.py

@@ -80,13 +80,26 @@ class PartnersTable(tables.Table):
             "td": {"width": "5%"}
         }
     )
-    legal_name = tables.Column(
+    #legal_name = tables.Column(
+    #    verbose_name=_('Legal entity'),
+    #    attrs={
+    #        'th': {'scope': 'col'},
+    #        "td": {"width": "20%"}
+    #    }
+    #)
+
+    legal_name = tables.LinkColumn(
+        'sharix_admin:partner_detail',
+        args=[tables.A('pk')],
         verbose_name=_('Legal entity'),
+        #args=[tables.A('pk')],
         attrs={
             'th': {'scope': 'col'},
             "td": {"width": "20%"}
         }
     )
+
+
     repr = tables.Column(
         accessor='repr.full_name',
         order_by=('repr.first_name', 'repr.last_name'),
@@ -129,7 +142,7 @@ class PartnersTable(tables.Table):
             'id_metaservice',
             'is_global',
             'is_visible',
-            'ticket_status'
+            'ticket_status',
         )
 
     def render_check(self, value, record):
@@ -152,6 +165,8 @@ class OrdersTable(tables.Table):
         }
     )
     title = tables.Column(
+        #'sharix_admin:order_detail',
+        #args=[tables.A('pk')],
         verbose_name=_('Title'), 
         attrs={
             "td": {"width": "20%"}
@@ -166,6 +181,8 @@ class OrdersTable(tables.Table):
     receiver = tables.Column(
         accessor='receiver.get_full_name',
         verbose_name=_('Receiver'),
+        #'sharix_admin:user_detail',
+        #args=[tables.A('pk')],
         attrs={
             "td": {"width": "20%"}
         }

sharix_admin/templates/sharix_admin/order_detail.html

@@ -0,0 +1,66 @@
+{% extends 'sharix_admin/base_admin.html' %}
+{% load static %}
+
+{% block view %}
+<p class="description_service">
+Тут представлена информация о Заказе {{ order.title }}. Действия с заказом осуществляются через мобильное приложение.
+</p>
+
+<div class="card w-100 mb-4">
+    <div class="card-body position-relative">
+        <h5 class="card-title fw-bold mb-4">{{ order.title }}</h5>
+
+        <ul class="list-style-none">
+		<li><b>{{ orders_help_texts.note }}</b> {{ order.note }}</li>
+		{% comment%}
+
+		<li><b>Юр. адрес</b> {{ company.address }}</li>
+            
+	    {% comment %}
+            <!-- FIXME: Не настроено -->
+            <li><b>НДС</b> Не платит</li>
+	    {% endcomment %}
+            
+            <li><b>ИНН</b> {{ company.inn }}</li>
+            <li><b>ОГРН</b> {{ company.ogrn }}</li>
+            <li><b>Р/c</b> {{ company.rs }}</li>
+            <li><b>К/c</b> {{ company.ks }}</li>
+            <li><b>БИК</b> {{ company.bik }}</li>
+            <li><b>Банк</b> {{ company.bank_name }}</li>
+	    {% endcomment %}
+
+        </ul>
+    </div>
+    {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">
+	    <img src="{% static 'sharix_admin/img/pencil.svg' %}">
+    </a>
+    {% endcomment %}
+</div>
+
+{% comment %}
+<h6 class="mb-4">Документы</h6>
+    <ul class="list-style-none">
+        {% for doc in docs %}
+            <li class="d-flex justify-content-between">
+                <div class="d-flex align-items-center">
+                    {% if doc.ticket_status and doc.status == "deactivated" %}
+                        <i class="fa-solid fa-clock-rotate-left me-2 no-user-select fs-4 text-warning"></i>
+                    {% elif doc.status == "activated" %}
+                        <i class="fa-solid fa-check me-2 no-user-select fs-4 text-success"></i>
+                    {% else %}
+                        <i class="fa-regular fa-file me-2 no-user-select fs-4 text-primary"></i>
+                    {% endif %}
+
+                    {{ doc.get_doc_type_display }}
+                </div>
+                
+                {% if doc.ticket_status %}
+                    <a class="btn btn-sm btn-outline-primary" href="{% url "sharix_admin:partner_doc" doc.doc_type %}">Посмотреть</a>
+                {% else %}
+                    <a class="btn btn-sm btn-primary" href="{% url "sharix_admin:partner_doc_upload" doc.doc_type %}">Загрузить</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endcomment %}
+{% endblock %}

sharix_admin/templates/sharix_admin/provider_detail.html

@@ -0,0 +1,58 @@
+{% extends 'sharix_admin/base_admin.html' %}
+{% load static %}
+
+{% block view %}
+<p class="description_service">
+Тут представлена информация о поставщике {{ provider.user }} {{ provider. service }}.
+</p>
+
+<div class="card w-100 mb-4">
+    <div class="card-body position-relative">
+        <h5 class="card-title fw-bold mb-4">{{ provider.user }}</h5>
+	{% comment %}
+        <ul class="list-style-none">
+            <li><b>Представитель</b> {{ company.repr.get_full_name }}</li>
+            <li><b>Юр. адрес</b> {{ company.address }}</li>
+            
+            <li><b>ИНН</b> {{ company.inn }}</li>
+            <li><b>ОГРН</b> {{ company.ogrn }}</li>
+            <li><b>Р/c</b> {{ company.rs }}</li>
+            <li><b>К/c</b> {{ company.ks }}</li>
+            <li><b>БИК</b> {{ company.bik }}</li>
+            <li><b>Банк</b> {{ company.bank_name }}</li>
+        </ul>
+	{% endcomment %}
+    </div>
+    {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">
+	    <img src="{% static 'sharix_admin/img/pencil.svg' %}">
+    </a>
+    {% endcomment %}
+</div>
+
+{% comment %}
+<h6 class="mb-4">Документы</h6>
+    <ul class="list-style-none">
+        {% for doc in docs %}
+            <li class="d-flex justify-content-between">
+                <div class="d-flex align-items-center">
+                    {% if doc.ticket_status and doc.status == "deactivated" %}
+                        <i class="fa-solid fa-clock-rotate-left me-2 no-user-select fs-4 text-warning"></i>
+                    {% elif doc.status == "activated" %}
+                        <i class="fa-solid fa-check me-2 no-user-select fs-4 text-success"></i>
+                    {% else %}
+                        <i class="fa-regular fa-file me-2 no-user-select fs-4 text-primary"></i>
+                    {% endif %}
+
+                    {{ doc.get_doc_type_display }}
+                </div>
+                
+                {% if doc.ticket_status %}
+                    <a class="btn btn-sm btn-outline-primary" href="{% url "sharix_admin:partner_doc" doc.doc_type %}">Посмотреть</a>
+                {% else %}
+                    <a class="btn btn-sm btn-primary" href="{% url "sharix_admin:partner_doc_upload" doc.doc_type %}">Загрузить</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endcomment %}
+{% endblock %}

sharix_admin/templates/sharix_admin/service_category_detail.html

@@ -0,0 +1,59 @@
+{% extends 'sharix_admin/base_admin.html' %}
+{% load static %}
+
+{% block view %}
+<p class="description_service">
+Тут представлена информация о Категории Услуг Сервиса {{ service_category.codename }}.
+</p>
+
+<div class="card w-100 mb-4">
+    <div class="card-body position-relative">
+        <h5 class="card-title fw-bold mb-4">{{ service_category.caprion }}</h5>
+
+        <ul class="list-style-none">
+            <li><b>Кодовое название</b> {{ service_category.codename }}</li>
+	    {% comment %}
+	    <li><b>Юр. адрес</b> {{ company.address }}</li>
+            
+            <li><b>ИНН</b> {{ company.inn }}</li>
+            <li><b>ОГРН</b> {{ company.ogrn }}</li>
+            <li><b>Р/c</b> {{ company.rs }}</li>
+            <li><b>К/c</b> {{ company.ks }}</li>
+            <li><b>БИК</b> {{ company.bik }}</li>
+            <li><b>Банк</b> {{ company.bank_name }}</li>
+	    {% endcomment %}
+        </ul>
+    </div>
+    {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">
+	    <img src="{% static 'sharix_admin/img/pencil.svg' %}">
+    </a>
+    {% endcomment %}
+</div>
+
+{% comment %}
+<h6 class="mb-4">Документы</h6>
+    <ul class="list-style-none">
+        {% for doc in docs %}
+            <li class="d-flex justify-content-between">
+                <div class="d-flex align-items-center">
+                    {% if doc.ticket_status and doc.status == "deactivated" %}
+                        <i class="fa-solid fa-clock-rotate-left me-2 no-user-select fs-4 text-warning"></i>
+                    {% elif doc.status == "activated" %}
+                        <i class="fa-solid fa-check me-2 no-user-select fs-4 text-success"></i>
+                    {% else %}
+                        <i class="fa-regular fa-file me-2 no-user-select fs-4 text-primary"></i>
+                    {% endif %}
+
+                    {{ doc.get_doc_type_display }}
+                </div>
+                
+                {% if doc.ticket_status %}
+                    <a class="btn btn-sm btn-outline-primary" href="{% url "sharix_admin:partner_doc" doc.doc_type %}">Посмотреть</a>
+                {% else %}
+                    <a class="btn btn-sm btn-primary" href="{% url "sharix_admin:partner_doc_upload" doc.doc_type %}">Загрузить</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endcomment %}
+{% endblock %}

sharix_admin/templates/sharix_admin/service_detail.html

@@ -0,0 +1,57 @@
+{% extends 'sharix_admin/base_admin.html' %}
+{% load static %}
+
+{% block view %}
+<p class="description_service">
+Тут представлена информация о Тарифе {{ service.codename }}.
+</p>
+
+<div class="card w-100 mb-4">
+    <div class="card-body position-relative">
+        <h5 class="card-title fw-bold mb-4">{{ service.caption }}</h5>
+
+        <ul class="list-style-none">
+            <li><b>Кодовое название</b> {{ service.codename }}</li>
+	    {% comment %} 
+            <li><b>ИНН</b> {{ company.inn }}</li>
+            <li><b>ОГРН</b> {{ company.ogrn }}</li>
+            <li><b>Р/c</b> {{ company.rs }}</li>
+            <li><b>К/c</b> {{ company.ks }}</li>
+            <li><b>БИК</b> {{ company.bik }}</li>
+            <li><b>Банк</b> {{ company.bank_name }}</li>
+	    {% endcomment %}
+        </ul>
+    </div>
+    {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">
+	    <img src="{% static 'sharix_admin/img/pencil.svg' %}">
+    </a>
+    {% endcomment %}
+</div>
+
+{% comment %}
+<h6 class="mb-4">Документы</h6>
+    <ul class="list-style-none">
+        {% for doc in docs %}
+            <li class="d-flex justify-content-between">
+                <div class="d-flex align-items-center">
+                    {% if doc.ticket_status and doc.status == "deactivated" %}
+                        <i class="fa-solid fa-clock-rotate-left me-2 no-user-select fs-4 text-warning"></i>
+                    {% elif doc.status == "activated" %}
+                        <i class="fa-solid fa-check me-2 no-user-select fs-4 text-success"></i>
+                    {% else %}
+                        <i class="fa-regular fa-file me-2 no-user-select fs-4 text-primary"></i>
+                    {% endif %}
+
+                    {{ doc.get_doc_type_display }}
+                </div>
+                
+                {% if doc.ticket_status %}
+                    <a class="btn btn-sm btn-outline-primary" href="{% url "sharix_admin:partner_doc" doc.doc_type %}">Посмотреть</a>
+                {% else %}
+                    <a class="btn btn-sm btn-primary" href="{% url "sharix_admin:partner_doc_upload" doc.doc_type %}">Загрузить</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endcomment %}
+{% endblock %}

sharix_admin/templates/sharix_admin/user_detail.html

@@ -0,0 +1,58 @@
+{% extends 'sharix_admin/base_admin.html' %}
+{% load static %}
+
+{% block view %}
+<p class="description_service">
+Тут представлена информация о пользователе Сервиса {{ user.first_name }} {{user.last_name}}. Редактировать информацию может только представитель Партнера Сервиса с ролью PARTNER ADMIN.
+</p>
+
+<div class="card w-100 mb-4">
+    <div class="card-body position-relative">
+	    <h5 class="card-title fw-bold mb-4">{{ user.first_name }} {{ user.last_name }}</h5>
+
+        <ul class="list-style-none">
+            <li><b>Телефон</b> {{ user.phone_number }}</li>
+	    {% comment %}
+            
+            <li><b>ИНН</b> {{ company.inn }}</li>
+            <li><b>ОГРН</b> {{ company.ogrn }}</li>
+            <li><b>Р/c</b> {{ company.rs }}</li>
+            <li><b>К/c</b> {{ company.ks }}</li>
+            <li><b>БИК</b> {{ company.bik }}</li>
+            <li><b>Банк</b> {{ company.bank_name }}</li>
+	    {% endcomment %}
+        </ul>
+    </div>
+    {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">
+	    <img src="{% static 'sharix_admin/img/pencil.svg' %}">
+    </a>
+    {% endcomment %}
+</div>
+
+{% comment %}
+<h6 class="mb-4">Документы</h6>
+    <ul class="list-style-none">
+        {% for doc in docs %}
+            <li class="d-flex justify-content-between">
+                <div class="d-flex align-items-center">
+                    {% if doc.ticket_status and doc.status == "deactivated" %}
+                        <i class="fa-solid fa-clock-rotate-left me-2 no-user-select fs-4 text-warning"></i>
+                    {% elif doc.status == "activated" %}
+                        <i class="fa-solid fa-check me-2 no-user-select fs-4 text-success"></i>
+                    {% else %}
+                        <i class="fa-regular fa-file me-2 no-user-select fs-4 text-primary"></i>
+                    {% endif %}
+
+                    {{ doc.get_doc_type_display }}
+                </div>
+                
+                {% if doc.ticket_status %}
+                    <a class="btn btn-sm btn-outline-primary" href="{% url "sharix_admin:partner_doc" doc.doc_type %}">Посмотреть</a>
+                {% else %}
+                    <a class="btn btn-sm btn-primary" href="{% url "sharix_admin:partner_doc_upload" doc.doc_type %}">Загрузить</a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+{% endcomment %}
+{% endblock %}

sharix_admin/urls.py

@@ -42,7 +42,7 @@ urlpatterns = [
 
     # Набор страниц по модели Партнер
     path('partners/', login_required(PartnersListView.as_view()), name='partners'),
-    path('partner/', login_required(PartnerDetailView.as_view()), name='partner_detail_my'),
+    path('my_partner/', login_required(MyPartnerDetailView.as_view()), name='partner_detail_my'),
     path('partner/<int:pk>', login_required(PartnerDetailView.as_view()), name='partner_detail'),
     path('partner/edit/<int:pk>', login_required(PartnerEditView.as_view()), name='partner/edit'),
     path('partner/doc/<str:doc_code>/upload', login_required(PartnerDocUploadView.as_view()),
@@ -52,7 +52,7 @@ urlpatterns = [
     
     #Набор страниц по модели Ресурс
     path('resources/', login_required(ResourcesListView.as_view()), name='resources'),
-    #path('resource/<str:pk>', login_required(ResourceDetailView.as_view()), name='resource_detail'),
+    path('resource/<int:pk>', login_required(ResourceDetailView.as_view()), name='resource_detail'),
     path('resource/add/', login_required(ResourceCreate.as_view()), name='resource/add/'),
     path('resource/edit/<int:pk>', login_required(ResourceEditView.as_view()), name='resource/edit'),
     # path('resource/doc/<str:doc_code>/upload', login_required(ResourceDocUploadView.as_view()),
@@ -61,7 +61,7 @@ urlpatterns = [
     path('resource/change_status/', change_resource_status, name='resource/change_status'),
 
     path('providers/', login_required(ProvidersListView.as_view()), name='providers'),
-    # path('provider/<str:pk>', login_required(ProviderDetailView.as_view()), name='provider_detail'),
+    path('provider/<int:pk>', login_required(ProviderDetailView.as_view()), name='provider_detail'),
     # path('provider/edit/<int:pk>', login_required(ProviderEditView.as_view()), name='provider/edit'),
     path('provider/add', login_required(ProviderCreate.as_view()), name='provider/add'),
     # path('provider/doc/<str:doc_code>/upload', login_required(ProviderDocUploadView.as_view()),
@@ -71,7 +71,7 @@ urlpatterns = [
 
     path('service_tariffs/', login_required(ServiceTariffsListView.as_view()), name='service_tariffs'),
     path('service_tariffs/my/', login_required(ServiceTariffsMyListView.as_view()), name='service_tariffs/my'),
-    # path('service_tariff/<int:pk>', login_required(ServiceTariffDetailView.as_view()), name='service_tariff_detail'),
+    path('service_tariff/<int:pk>', login_required(ServiceTariffDetailView.as_view()), name='service_tariff_detail'),
 
     path('service_tariff/add/', login_required(ServiceTariffCreate.as_view()), name='service_tariff/add/'),
     path('service_tariff/edit/<int:pk>', login_required(ServiceTariffUpdateView.as_view()),
@@ -79,7 +79,7 @@ urlpatterns = [
     path('service_tariff/change_status/', change_service_status, name='service_tariff/change_status'),
 
     path('service_categories/', login_required(ServiceCategoriesListView.as_view()), name='service_categories'),
-    #path('service_category/<int:pk>', login_required(ServiceCategoryDetailView.as_view()), name='service_category'),
+    path('service_category/<int:pk>', login_required(ServiceCategoryDetailView.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/change_status/', change_service_category_status, name='service_category/change_status'),
@@ -98,7 +98,7 @@ urlpatterns = [
     path('relationship', login_required(RelationshipListView.as_view()), name='relationship'),    
     path('relationship/change_status/', change_relationship_status, name='relationship/change_status'),
 #    path('active_users', login_required(ActiveUsersListView.as_view()), name='active_users'),
-#    path('user/detail/<int:pk>', login_required(UserDetailView.as_view()), name='user_detail'),
+    path('user/detail/<int:pk>', login_required(UserDetailView.as_view()), name='user_detail'),
 #    path('active_users/change_status/', change_access_status, name='active_users/change_status'),
 #    path('changelog', login_required(ChangelogListView.as_view()), name='changelog'),
 #    path('closing-documents', login_required(ClosingDocumentsListView.as_view()), name='closing_documents'),

sharix_admin/views/order.py

@@ -22,6 +22,8 @@ from .base import BaseView
 from django.db.models import Q
 from django.contrib.auth import get_user_model
 
+from dbsynce.docs.database.orders import Orders as OrdersHelpTexts
+
 class OrdersListView(BaseView, SingleTableView):
 #class OrdersListView(UserPassesTestMixin, SingleTableView):
     table_class = OrdersTable
@@ -133,10 +135,25 @@ class OrderCreateView(BaseView, FormView):
 
 class OrderDetailView(BaseView, DetailView):
     model = Orders
-    template_name = 'sharix_admin/order.html'
+    template_name = 'sharix_admin/order_detail.html'
     context_object_name = 'order'
+    page_title = 'Детали заказа'
+    page_name = 'order_detail'
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['title'] = _('Order Details')
-        return context
+    def detail_view(request, primary_key):
+        try:
+            order = Order.objects.get(pk=primary_key)
+        except Order.DoesNotExist:
+            raise Http404('Company does not exist')
+
+        return render(request, template_name, context={'order': order, 'orders_help_texts': OrdersHelpTexts})
+
+#class OrderDetailView(BaseView, DetailView):
+#    model = Orders
+#    template_name = 'sharix_admin/order.html'
+#    context_object_name = 'order'
+#
+#    def get_context_data(self, **kwargs):
+#        context = super().get_context_data(**kwargs)
+#        context['title'] = _('Order Details')
+#        return context

sharix_admin/views/provider.py

@@ -4,6 +4,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from django.http import JsonResponse
 from django.utils.translation import gettext as _
 from django_tables2 import SingleTableView
+from django.views.generic import DetailView
 
 from sharix_admin.tables import ProvidersTable
 from sharix_admin.utils import group_required
@@ -135,3 +136,19 @@ def change_provider_status(request):
         return JsonResponse({'status': 'success'})
     else:
         return JsonResponse({'status': 'error'})
+
+
+class ProviderDetailView(BaseView, DetailView):
+    model = Provider
+    template_name = 'sharix_admin/provider_detail.html'
+    context_object_name = 'provider'
+    page_title = 'О возможности для заказа'
+    page_name = 'provider_detail'
+
+    def detail_view(request, primary_key):
+        try:
+            provider = Provider.objects.get(pk=primary_key)
+        except Provider.DoesNotExist:
+            raise Http404('Provider does not exist')
+
+        return render(request, template_name, context={'provider': provider})

sharix_admin/views/resource.py

@@ -4,6 +4,7 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from django.http import JsonResponse
 from django.utils.translation import gettext as _
 from django_tables2 import SingleTableView
+from django.views.generic import DetailView
 
 from sharix_admin.tables import ResourcesTable
 from sharix_admin.utils import group_required
@@ -175,3 +176,19 @@ class ResourceCreate(BaseView, FormView):
         )
 
         return super().form_valid(form)  # Возвращаем успешный ответ
+
+class ResourceDetailView(BaseView, DetailView):
+    model = Resource
+    template_name = 'sharix_admin/resource_detail.html'
+    context_object_name = 'resource'
+    page_title = 'О ресурсе'
+    page_name = 'resource_detail'
+
+    def detail_view(request, primary_key):
+        try:
+            resource = Resource.objects.get(pk=primary_key)
+        except Resource.DoesNotExist:
+            raise Http404('Provider does not exist')
+
+        return render(request, template_name, context={'resource': resource})
+

sharix_admin/views/service.py

@@ -3,6 +3,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.utils.translation import gettext as _
 from django_tables2 import SingleTableView
+from django.views.generic import DetailView
 
 from sharix_admin.tables import ServiceTable
 from sharix_admin.utils import group_required
@@ -228,3 +229,19 @@ def change_service_status(request):
         service = Service.objects.get(pk=service_id)
         service.status = new_status
         service.save()
+
+class ServiceTariffDetailView(BaseView, DetailView):
+    model = Service
+    template_name = 'sharix_admin/service_detail.html'
+    context_object_name = 'service'
+    page_title = 'О тарифе'
+    page_name = 'service_detail'
+
+    def detail_view(request, primary_key):
+        try:
+            service = Service.objects.get(pk=primary_key)
+        except Service.DoesNotExist:
+            raise Http404('Service does not exist')
+
+        return render(request, template_name, context={'service': service})
+

sharix_admin/views/service_category.py

@@ -7,6 +7,7 @@ from django_tables2 import SingleTableView
 from sharix_admin.forms import ServiceCategoryCreateForm, ServiceCategoryUpdateForm
 from sharix_admin.tables import ServiceCategoriesTable
 from .base import BaseView
+from django.views.generic import DetailView
 
 from sharix_admin.utils import group_required
 from django.contrib.auth.decorators import login_required
@@ -245,3 +246,20 @@ def change_service_category_status(request):
         return JsonResponse({'status': 'success'})
     else:
         return JsonResponse({'status': 'error'})
+
+class ServiceCategoryDetailView(BaseView, DetailView):
+    model = ServiceCategory
+    template_name = 'sharix_admin/service_category_detail.html'
+    context_object_name = 'service_category'
+    page_title = 'О категории услуг'
+    page_name = 'service_category_detail'
+
+    def detail_view(request, primary_key):
+        try:
+            service_category = ServiceCategory.objects.get(pk=primary_key)
+        except ServiceCategory.DoesNotExist:
+            raise Http404('ServiceCategory does not exist')
+
+        return render(request, template_name, context={'service_category': service_category})
+
+

sharix_admin/views/user_info.py

@@ -3,12 +3,15 @@ from django.contrib.auth.mixins import UserPassesTestMixin
 from django.contrib.auth.models import Group
 from django.utils.translation import gettext as _
 from django_tables2 import SingleTableView
+from django.views.generic import DetailView
 
 from sharix_admin.tables import UserInfoTable
 from django.views.generic import DetailView
 
 from dbsynce.models import Company, Documents, DocumentFile
 
+#from user import ShariXUser
+
 from .base import BaseView
 
 class UserListView(UserPassesTestMixin, SingleTableView):
@@ -70,3 +73,21 @@ class UserDetailView(BaseView, DetailView):
             context.update({"docs": docs})
 
         return context
+
+class UserInfoDetailView(BaseView, DetailView):
+#    model = ShariXUser
+    model = Company
+    template_name = 'sharix_admin/user_detail.html'
+    context_object_name = 'user'
+    page_title = 'О пользователе'
+    page_name = 'user_detail'
+
+    def detail_view(request, primary_key):
+        try:
+            user = ShariXUser.objects.get(pk=primary_key)
+        except ShariXUser.DoesNotExist:
+            raise Http404('User does not exist')
+
+        return render(request, template_name, context={'user': user})
+
+