pages for service and service category details filled

sharix_admin/tables.py

@@ -256,11 +256,24 @@ class ResourcesTable(tables.Table):
         }
     )
 
+    edit = tables.LinkColumn(
+        'sharix_admin:resource/edit/',
+        verbose_name='',
+        orderable=False,
+        text="E",
+        args=[tables.A('pk')],
+        attrs={
+            'th': {'scope': 'col'},
+            "td": {"class": "edit_col"},
+            "td": {"width": "10%"}
+        }
+    )
+
     check = tables.BooleanColumn(
         verbose_name='',
         attrs={
             'th': {'scope': 'col'},
-            "td": {"width": "40%"}
+            "td": {"width": "10%"}
         }
     )
 
@@ -336,6 +349,18 @@ class ProvidersTable(tables.Table):
         }   
     )
 
+    #edit = tables.LinkColumn(
+    #    'sharix_admin:provider/edit/',
+    #    verbose_name='',
+    #    orderable=False,
+    #    text="E",
+    #    args=[tables.A('pk')],
+    #    attrs={
+    #        'th': {'scope': 'col'},
+    #        "td": {"class": "edit_col"}
+    #    }
+    #)
+
     check = tables.BooleanColumn(
         verbose_name='',
         attrs={
@@ -384,7 +409,7 @@ class ServiceTariffsTable(tables.Table):
         }
     )
     codename = tables.LinkColumn(
-        'sharix_admin:service_tariff/edit/',
+        'sharix_admin:service_tariff_detail',
         verbose_name=_('Кодовое название'),
         text=lambda record: record.caption,
         args=[tables.A('pk')],
@@ -395,8 +420,8 @@ class ServiceTariffsTable(tables.Table):
     )
     #service_category = tables.Column(
     service_category = tables.LinkColumn(
-        'sharix_admin:service_category/edit/',
-        verbose_name=_('Название схемы услуги'),
+        'sharix_admin:service_category_detail',
+        verbose_name=_('Название Типа услуги'),
         text=lambda record: record.service_category.caption,
         args=[tables.A('pk')],
         attrs={
@@ -405,7 +430,7 @@ class ServiceTariffsTable(tables.Table):
         }
     )
     resource_type = tables.Column(
-        verbose_name=_('Тип ресурса'),
+        #verbose_name=_('Тип ресурса'),
         attrs={
             'th': {'scope': 'col'},
             "td": {"width": "20%"}
@@ -413,13 +438,25 @@ class ServiceTariffsTable(tables.Table):
     )
 
     company_comission = tables.Column(
-        verbose_name=_('Комиссия партнера'),
+        #verbose_name=_('Комиссия партнера'),
         attrs={
             'th': {'scope': 'col'},
             "td": {"width": "20%"}
         }
     )
 
+    edit = tables.LinkColumn(
+        'sharix_admin:service_tariff/edit/',
+        verbose_name='',
+        orderable=False,
+        text="E",
+        args=[tables.A('pk')],
+        attrs={
+            'th': {'scope': 'col'},
+            "td": {"class": "edit_col"}
+        }
+    )
+
     check = tables.BooleanColumn(
         verbose_name=_('Activity'),
         orderable=False,

sharix_admin/templates/sharix_admin/service_detail.html

@@ -11,15 +11,15 @@
         <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 %}
+		<li><b>{{ captions.status }}</b> {{ service.status }}</li>
+		<li><b>{{ captions.service_category }}</b> {{ service.service_category }}</li>
+		<li><b>{{ captions.description }}</b> {{ service.description }}</li>
+		<li><b>{{ captions.resource_type }}</b> {{ service.resource_type }}</li>
+		<li><b>{{ captions.price_km }}</b> {{ service.price_km }}</li>
+		<li><b>{{ captions.price_min }}</b> {{ service.price_min }}</li>
+		<li><b>{{ captions.price_amount }}</b> {{ service.price_amount }}</li>
+		<li><b>{{ captions.company }}</b> {{ service.company }}</li>
+		<li><b>{{ captions.company_comission }}</b> {{ service.company_comission }}</li>
         </ul>
     </div>
     {% comment %}    <a class="btn btn-primary btn-edit" href="{% url "sharix_admin:partner/edit" %}">

sharix_admin/urls.py

@@ -54,7 +54,7 @@ urlpatterns = [
     path('resources/', login_required(ResourcesListView.as_view()), name='resources'),
     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/edit/<int:pk>', login_required(ResourceEditView.as_view()), name='resource/edit/'),
     # path('resource/doc/<str:doc_code>/upload', login_required(ResourceDocUploadView.as_view()),
     #      name='partner_doc_upload'),
     # path('resource/doc/<str:doc_code>', login_required(ResourceDocView.as_view()), name='resource_doc'),
@@ -62,7 +62,7 @@ urlpatterns = [
 
     path('providers/', login_required(ProvidersListView.as_view()), name='providers'),
     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/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()),
     #      name='partner_doc_upload'),

sharix_admin/views/service.py

@@ -28,6 +28,9 @@ from tickets.models import Ticket, TicketList
 from sharix_admin.utils import *
 from dbsynce.lib.data import *
 
+from dbsynce.docs.database.service import Service as ServiceHelpTexts
+from dbsynce.docs.verbose_names.service import Service as ServiceVerboseNames
+
 class ServiceTariffCreate(BaseView, FormView):
     form_class = ServiceTariffCreateForm
     template_name = "sharix_admin/service_tariff_form.html"
@@ -243,5 +246,13 @@ class ServiceTariffDetailView(BaseView, DetailView):
         except Service.DoesNotExist:
             raise Http404('Service does not exist')
 
-        return render(request, template_name, context={'service': service})
+        return render(request, template_name, context={
+            'help_texts': ServiceHelpTexts,
+            'captions': ServiceVerboseNames,
+            })
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['help_texts'] = ServiceHelpTexts
+        context['captions'] = ServiceVerboseNames
+        return context