initial commit

sharix_admin/locale/ru/LC_MESSAGES/django.po

@@ -400,8 +400,8 @@ msgid "Partner Information"
 msgstr "Информация о партнере"
 
 #: .\views\context.py:29 .\views\service.py:18
-msgid "Rates"
-msgstr "Тарифы"
+msgid "Services"
+msgstr "Услуги сервиса"
 
 #: .\views\context.py:31 .\views\user_info.py:17
 msgid "User Management"

sharix_admin/tables.py

@@ -4,6 +4,9 @@ from dbsynce.models import *
 from django.contrib.auth import get_user_model
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
+from django_tables2.utils import A 
+from sharix_admin.views import *
+from sharix_admin.urls import *
 
 
 class TransactionsWalletTable(tables.Table):
@@ -398,18 +401,25 @@ class ServiceTypeTable(tables.Table):
 
 class ServiceTable(tables.Table):
     id = tables.Column(
-        verbose_name=_('ID'),
+        verbose_name=_('id'),
         attrs={
             "td": {"width": "5%"}
         }
     )
     servicetype = tables.Column(
-        verbose_name=_('Description of the service'),
+        verbose_name=_('Услуга'),
         accessor='servicetype.caption',
         attrs={
             'th': {'scope': 'col'},
             "td": {"width": "20%"}}
     )
+    servicedescription = tables.Column(
+        verbose_name=_('Описание'),
+        accessor='servicetype.description',
+        attrs={
+            'th': {'scope': 'col'},
+            "td": {"width": "40%"}}
+    )
 
     # description = tables.Column(verbose_name='Название тарифа', attrs={'th':{'scope':'col'}, "td":{"width":"20%"}})
     # description = tables.Column(verbose_name='Описание строки тарифов', attrs={'th':{'scope':'col'}, "td":{"width":"20%"}})
@@ -435,13 +445,17 @@ class ServiceTable(tables.Table):
             "td": {"width": "20%"}
         }
     )
-
+    edit = tables.LinkColumn('sharix_admin:service_edit', text=lambda record:record.id, args=[A('id')])
     class Meta:
         model = Service
         attrs = {
             "class": "table table-layout-fixed"
         }
         exclude = (
+            'company_comission',
+            'price_amount',
+            'price_min',
+            'price_km',
             'resource',
             'requirements',
             'id_metaservice',

sharix_admin/templates/sharix_admin/base_admin.html

@@ -15,12 +15,12 @@
 
     <ul class="d-flex flex-column nav nav-pills rounded box-shadow border p-2 bg-white">
       <li class="nav-item">
-        <a href="{% url "sharix_admin:main" %}" class="nav-link {% if current_page == "main" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:main' %}" class="nav-link {% if current_page == 'main' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "main" %}
+                {% if current_page == 'main' %}
                   {% static 'sharix_admin/img/menu/house_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/house.svg' %}
@@ -30,12 +30,12 @@
         </a>
       </li>
       <li class="nav-item">
-        <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link {% if current_page == "tickets" %}active rounded{% endif %}">
+        <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link {% if current_page == 'tickets' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "tickets" %}
+                {% if current_page == 'tickets' %}
                   {% static 'sharix_admin/img/menu/tickets_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/tickets.svg' %}
@@ -45,12 +45,27 @@
         </a>
       </li>
       <li class="nav-item">
-        <a href="http://study.reversea.net/" class="nav-link {% if current_page == "education" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:service' %}" class="nav-link {% if current_page == 'service' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "education" %}
+                {% if current_page == 'service' %}
+                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
+                {% else %}
+                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
+                {% endif %}"> 
+            <span class="menu-bar-label">Услуги сервиса</span>
+          </div>
+        </a>
+      </li>
+      <li class="nav-item">
+        <a href="http://study.reversea.net/" class="nav-link {% if current_page == 'education' %}active rounded{% endif %}">
+          <div class="link d-flex align-items-center">
+            <img
+              class="nav-img"
+              src="
+                {% if current_page == 'education' %}
                   {% static 'sharix_admin/img/menu/education_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/education.svg' %}
@@ -60,12 +75,12 @@
         </a>
       </li>
       {% comment %} <li class="nav-item">
-        <a href="{% url "sharix_admin:partners" %}" class="nav-link {% if current_page == "partners" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:partners' %}" class="nav-link {% if current_page == 'partners' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "partners" %}
+                {% if current_page == 'partners' %}
                   {% static 'sharix_admin/img/menu/people_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/people.svg' %}
@@ -76,12 +91,12 @@
       </li> {% endcomment %}
       {% if not "PARTNER-ADMIN" in user_groups %}
         <li class="nav-item">
-          <a href="{% url "sharix_admin:cooperate" %}" class="nav-link {% if current_page == "cooperate" %}active rounded{% endif %}">
+          <a href="{% url 'sharix_admin:cooperate' %}" class="nav-link {% if current_page == 'cooperate' %}active rounded{% endif %}">
             <div class="link d-flex align-items-center">
               <img
                 class="nav-img"
                 src="
-                  {% if current_page == "cooperate" %}
+                  {% if current_page == 'cooperate' %}
                     {% static 'sharix_admin/img/menu/handshake_w.svg' %}
                   {% else %}
                     {% static 'sharix_admin/img/menu/handshake.svg' %}
@@ -92,12 +107,12 @@
         </li>
       {% endif %}
       {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:user_information' %}" class="nav-link {% if current_page == "none" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:user_information' %}" class="nav-link {% if current_page == 'none' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "none" %}
+                {% if current_page == 'none' %}
                   {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/hdd-network.svg' %}
@@ -107,12 +122,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_type' %}" class="nav-link {% if current_page == 'service_type' %}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_type' %}
                   {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/briefcase.svg' %}
@@ -122,12 +137,12 @@
         </a>
       </li> {% endcomment %}
       {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:transactions' %}" class="nav-link {% if current_page == "transactions" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:transactions' %}" class="nav-link {% if current_page == 'transactions' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "transactions" %}
+                {% if current_page == 'transactions' %}
                   {% static 'sharix_admin/img/menu/clock-history_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/clock-history.svg' %}
@@ -154,12 +169,12 @@
         </li>
       {% endif %}
       {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_information-add' %}" class="nav-link {% if current_page == "service_info" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:service_information-add' %}" class="nav-link {% if current_page == 'service_info' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "service_info" %}
+                {% if current_page == 'service_info' %}
                   {% static 'sharix_admin/img/menu/person_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/person.svg' %}
@@ -169,12 +184,12 @@
         </a>
       </li> {% endcomment %}
       {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:payment' %}" class="nav-link {% if current_page == "payment" %}active rounded{% endif %}">
+        <a href="{% url 'sharix_admin:payment' %}" class="nav-link {% if current_page == 'payment' %}active rounded{% endif %}">
           <div class="link d-flex align-items-center">
             <img
               class="nav-img"
               src="
-                {% if current_page == "payment" %}
+                {% if current_page == 'payment' %}
                   {% static 'sharix_admin/img/menu/credit-card_w.svg' %}
                 {% else %}
                   {% static 'sharix_admin/img/menu/credit-card.svg' %}
@@ -212,7 +227,7 @@
         <a href="https://wiki.sharix-app.org/doku.php">Помощь</a>
     </div>
 
-    <form method="post" action="{% url "sharix_admin:auth_logout" %}">
+    <form method="post" action="{% url 'sharix_admin:auth_logout' %}">
       {% csrf_token %}
       <button class="btn btn-sm btn-outline-secondary text-nowrap" type="submit">
         Выйти

sharix_admin/templates/sharix_admin/service.html

@@ -1,22 +1,27 @@
-{% extends 'sharix_admin/index.html' %}
+{% extends 'sharix_admin/base_admin.html' %}
 {% load render_table from django_tables2 %}
+{% load static %}
 
-
-{% block contenthome %}
-    <p class="h1">{{ title }}</p>
-    <p class="description_service">Это система управления государством, источником власти в которой является сам народ. Именно народ решает, какие законы и нормы необходимы для гармоничного существования и развития государства. Таким образом, каждый человек в демократическом обществе 
-      Получает определенный набор свобод и обязательств сформированных с учетом интересов всего сообщества. Исходя из вышесказанного, можно заключить, что демократия – это возможность для каждого человека свободно участвовать в непосредственном управлении своим государством, обществом и личной судьбой в конечном счете.</p>
-    <div class="container text-center mt-2">
-      {% render_table table %}
+{% block view %}
+    <p class="description_service">Это то, что ShariX предлагает своим клиентам и партнерам. Добавляйте новые услуги и редактируйте существующие. 
Новая услуга добавляется неактивной – активируйте ее в Заявках.</p>
+      <p class="description_service">Партнеры выбирают услуги из предложенных и уточняют их в заданных рамках.</p>
+  
+    <div>
+      <details>
+      <summary>
+        Как пользоваться?
+      </summary>
+      <p>А тут ответ как пользоваться</p>
+    </details>
     </div>
-    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
-    <script>
+    <!-- <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> -->
+    <!-- <script>
       // Запрос на изменения статуса исполнителя
       $('.status-toggle').change(function() {
         var service_id = $(this).data('service-id');
         var new_status = $(this).prop('checked') ? 'active' : 'deactivated';
         $.ajax({
-          url: '{% url "service/change_status" %}',
+          url: '#',
           type: 'POST',
           data: {
             'service_id': service_id,
@@ -33,8 +38,19 @@
           }
         });
       });
-    </script>
+    </script> -->
     
-
+<div class="row">
+  <div class="col">
+    <input>
+  </div>
+  <div class="col"></div>
+  <div class="col">
+    <button class="btn btn-primary">+ Услугу</button>
+  </div>
+</div>
+<div>
+  {% render_table table %}
+</div>
     
-{% endblock contenthome %}
+{% endblock %}

sharix_admin/templates/sharix_admin/service_edit.html

@@ -0,0 +1,9 @@
+{% extends 'sharix_admin/base_admin.html' %}
+
+{% block view %}
+<form method="post" class="d-flex flex-column align-items-end">
+    {% csrf_token %}
+    {% include 'sharix_admin/include/form.html' %}
+    <button class="btn btn-primary" type="submit">Отправить</button>
+</form>
+{% endblock %}

sharix_admin/urls.py

@@ -31,7 +31,6 @@ urlpatterns = [
 
     # Страница "Сотрудничество" (запрос на подключение к сервису)
     path('cooperate/', login_required(CooperateView.as_view()), name='cooperate'),
-
     # Страница "О партнере"
     path('partner/', login_required(PartnerDetailView.as_view()), name='partner_detail'),
     path('partner/edit/', login_required(PartnerEditView.as_view()), name='partner_edit'),
@@ -68,8 +67,9 @@ urlpatterns = [
 
     path('service/', ServiceListView.as_view(), name='service'),
     path('service/change_status/', change_service_status, name='service/change_status'),
+    path('service/edit', service_edit, name='service_edit'),
 
-    # path('partner_information/', login_required(PartnerInfoView.as_view()), name='partner_information/'),
+    #path('partner_information/', login_required(PartnerBaseView.as_view()), name='partner_information/'),
     # path('partner_information/add/', login_required(PartnerInformationCreate.as_view()), name='partner_information/add/'),
     # path('partner_information/edit/<int:pk>', login_required(PartnerInformationUpdateView.as_view()), name='partner_information/edit/'),
 

sharix_admin/views/service.py

@@ -1,4 +1,4 @@
-from dbsynce.models import Service
+from dbsynce.models import Service, ServiceType
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.utils.translation import gettext as _
@@ -6,6 +6,7 @@ from django_tables2 import SingleTableView
 
 from sharix_admin.tables import ServiceTable
 from sharix_admin.utils import group_required
+from django.http import HttpResponse
 
 
 class ServiceListView(UserPassesTestMixin, SingleTableView):
@@ -16,12 +17,12 @@ class ServiceListView(UserPassesTestMixin, SingleTableView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context.update({
-            'title': _('Rates'),
+            'title': _('Услуги сервиса'),
             'object_list': context['object_list']
         })
         return context
 
-    def test_func(self) -> bool or None:
+    def test_func(self) -> bool or None: # type: ignore
         group_names = ('PROVIDER')
         if bool(self.request.user.groups.filter(name=group_names)) or self.request.user.is_superuser:
             return True
@@ -38,3 +39,9 @@ def change_service_status(request):
         service = Service.objects.get(pk=service_id)
         service.status = new_status
         service.save()
+
+def change_status():
+    return None
+
+def service_edit(id):
+    return id