blezz-tech 1 hónapja
szülő
commit
81fc66c1e2
38 módosított fájl, 93 hozzáadás és 11 törlés
  1. 1 1
      admin/__init__.py
  2. 5 4
      lib/menu.py
  3. BIN
      static/webservice_running/img/favicon.ico
  4. BIN
      static/webservice_running/img/logo.png
  5. BIN
      static/webservice_running/img/mc.png
  6. 3 0
      static/webservice_running/img/menu/arrow-right.svg
  7. 3 0
      static/webservice_running/img/menu/briefcase.svg
  8. 3 0
      static/webservice_running/img/menu/briefcase_w.svg
  9. 3 0
      static/webservice_running/img/menu/clock-history.svg
  10. 3 0
      static/webservice_running/img/menu/clock-history_w.svg
  11. 1 0
      static/webservice_running/img/menu/credit-card.svg
  12. 1 0
      static/webservice_running/img/menu/credit-card_w.svg
  13. 6 0
      static/webservice_running/img/menu/education.svg
  14. 6 0
      static/webservice_running/img/menu/education_w.svg
  15. 3 0
      static/webservice_running/img/menu/gear.svg
  16. 3 0
      static/webservice_running/img/menu/gear_w.svg
  17. 1 0
      static/webservice_running/img/menu/handshake.svg
  18. 1 0
      static/webservice_running/img/menu/handshake_w.svg
  19. 3 0
      static/webservice_running/img/menu/hdd-network.svg
  20. 3 0
      static/webservice_running/img/menu/hdd-network_w.svg
  21. 3 0
      static/webservice_running/img/menu/house.svg
  22. 3 0
      static/webservice_running/img/menu/house_w.svg
  23. 1 0
      static/webservice_running/img/menu/people.svg
  24. 1 0
      static/webservice_running/img/menu/people_w.svg
  25. 3 0
      static/webservice_running/img/menu/person.svg
  26. 3 0
      static/webservice_running/img/menu/person_w.svg
  27. 4 0
      static/webservice_running/img/menu/sotrud.svg
  28. 4 0
      static/webservice_running/img/menu/sotrud_w.svg
  29. 3 0
      static/webservice_running/img/menu/tickets.svg
  30. 3 0
      static/webservice_running/img/menu/tickets_w.svg
  31. BIN
      static/webservice_running/img/mir.png
  32. BIN
      static/webservice_running/img/paymo.png
  33. 3 0
      static/webservice_running/img/pencil.svg
  34. BIN
      static/webservice_running/img/schemav3.png
  35. BIN
      static/webservice_running/img/visa.png
  36. 4 2
      templates/webservice_running/orders_sports.html
  37. 5 3
      views/order_sports.py
  38. 4 1
      views/resource_sports.py

+ 1 - 1
admin/__init__.py

@@ -1,4 +1,4 @@
 from .favoritecontacts import FavoriteContactsAdmin
 from .frequentaddress import FrequentAddressAdmin
 from .preferredproviders import PreferredProvidersAdmin
-from .sport import *
+# from .sport import *

+ 5 - 4
lib/menu.py

@@ -15,7 +15,8 @@ MENU_GLOBAL_CUSTOMIZABLE = ['main_sports', 'service_tariffs_local']
 STAFF_METASERVICE_MENU_CUSTOMIZABLE = ['resources_local', 'providers_local', 'orders_local', 'cooperate_request' ]
 STAFF_MY_PARTNER_MENU_CUSTOMIZABLE = ['resources_local', 'providers_local', 'orders_local']
 STAFF_MY_PROVIDER_MENU_CUSTOMIZABLE = ['resources_local', 'orders_local']
-CLIENT_MY_MENU_CUSTOMIZABLE = ['orders', 'cooperate_request', 'order_local/add', 'orders_local', 'frequent_address', 'frequent_contacts', 'preferred_providers']
+CLIENT_MY_MENU_CUSTOMIZABLE = ['orders_sports', 'cooperate_request', 'order_local/add', 'resources_local', 'frequent_address', 'frequent_contacts', 'preferred_providers']
+#CLIENT_MY_MENU_CUSTOMIZABLE = ['orders', 'cooperate_request', 'order_local/add', 'orders_local', 'frequent_address', 'frequent_contacts', 'preferred_providers']
 
 #CUSTOM PAGES
 WSR_EXTENDED_MY = []
@@ -33,12 +34,12 @@ MENU_SCHEME_LIST = {
     'service_tariffs': ['sharix_admin', 'briefcase', 'Тарифы'],
     'partners': ['sharix_admin', 'handshake', 'Партнеры'],
     'resources': ['sharix_admin', 'hdd-network', 'Ресурсы'],
-    'resources_sports': ['webservice_running', 'hdd-network', 'Ресурсы'],
+#    'resources_sports': ['webservice_running', 'hdd-network', 'Ресурсы'],
 #    'resources_local': ['webservice_running', 'hdd-network', 'Ресурсы'],
     'providers': ['sharix_admin', 'person', 'Исполнители'],
     #'providers_local': ['webservice_running', 'person', 'Исполнители'],
 #    'orders': ['sharix_admin', 'clock-history', 'Заказы'],
-    'orders_local': ['webservice_running', 'clock-history', 'Заказы'],
+#    'orders_local': ['webservice_running', 'clock-history', 'Заказы'],
     'orders_sports': ['webservice_running', 'clock-history', 'Заказы'],
     'access_control': ['sharix_admin', 'hdd-network', 'Права доступа'],
     'relationship': ['sharix_admin', 'hdd-network', 'Взаимоотношения'],
@@ -48,6 +49,6 @@ MENU_SCHEME_LIST = {
     'job_request_metaservice': ['sharix_admin', 'credit-card', 'Вакансии'],
 #    'frequent_address': ['webservice_running', 'person', 'Частые адреса'],
 #    'frequent_contacts': ['webservice_running', 'person', 'Частые контакты'],
-    'preferred_providers': ['webservice_running', 'person', 'Желаемые исполнители'],
+#    'preferred_providers': ['webservice_running', 'person', 'Желаемые исполнители'],
     }
 

BIN
static/webservice_running/img/favicon.ico


BIN
static/webservice_running/img/logo.png


BIN
static/webservice_running/img/mc.png


+ 3 - 0
static/webservice_running/img/menu/arrow-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.54 11.29L9.87998 5.64001C9.78702 5.54628 9.67642 5.47188 9.55456 5.42111C9.4327 5.37035 9.30199 5.34421 9.16998 5.34421C9.03797 5.34421 8.90726 5.37035 8.78541 5.42111C8.66355 5.47188 8.55294 5.54628 8.45998 5.64001C8.27373 5.82737 8.16919 6.08082 8.16919 6.34501C8.16919 6.60919 8.27373 6.86264 8.45998 7.05001L13.41 12.05L8.45998 17C8.27373 17.1874 8.16919 17.4408 8.16919 17.705C8.16919 17.9692 8.27373 18.2226 8.45998 18.41C8.5526 18.5045 8.66304 18.5797 8.78492 18.6312C8.90679 18.6827 9.03767 18.7095 9.16998 18.71C9.30229 18.7095 9.43317 18.6827 9.55505 18.6312C9.67692 18.5797 9.78737 18.5045 9.87998 18.41L15.54 12.76C15.6415 12.6664 15.7225 12.5527 15.7779 12.4262C15.8333 12.2997 15.8619 12.1631 15.8619 12.025C15.8619 11.8869 15.8333 11.7503 15.7779 11.6238C15.7225 11.4973 15.6415 11.3836 15.54 11.29Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/briefcase.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M17 4.21053H14V3.15789C14 2.32037 13.6839 1.51715 13.1213 0.924926C12.5587 0.332706 11.7956 0 11 0H9C8.20435 0 7.44129 0.332706 6.87868 0.924926C6.31607 1.51715 6 2.32037 6 3.15789V4.21053H3C2.20435 4.21053 1.44129 4.54323 0.87868 5.13545C0.316071 5.72767 0 6.5309 0 7.36842V16.8421C0 17.6796 0.316071 18.4829 0.87868 19.0751C1.44129 19.6673 2.20435 20 3 20H17C17.7956 20 18.5587 19.6673 19.1213 19.0751C19.6839 18.4829 20 17.6796 20 16.8421V7.36842C20 6.5309 19.6839 5.72767 19.1213 5.13545C18.5587 4.54323 17.7956 4.21053 17 4.21053ZM8 3.15789C8 2.87872 8.10536 2.61098 8.29289 2.41357C8.48043 2.21617 8.73478 2.10526 9 2.10526H11C11.2652 2.10526 11.5196 2.21617 11.7071 2.41357C11.8946 2.61098 12 2.87872 12 3.15789V4.21053H8V3.15789ZM18 16.8421C18 17.1213 17.8946 17.389 17.7071 17.5864C17.5196 17.7838 17.2652 17.8947 17 17.8947H3C2.73478 17.8947 2.48043 17.7838 2.29289 17.5864C2.10536 17.389 2 17.1213 2 16.8421V11.0526C4.54626 12.1159 7.26069 12.6624 10 12.6632C12.7392 12.6614 15.4535 12.115 18 11.0526V16.8421ZM18 8.74737C15.4784 9.91345 12.7542 10.5156 10 10.5156C7.24579 10.5156 4.5216 9.91345 2 8.74737V7.36842C2 7.08925 2.10536 6.82151 2.29289 6.6241C2.48043 6.42669 2.73478 6.31579 3 6.31579H17C17.2652 6.31579 17.5196 6.42669 17.7071 6.6241C17.8946 6.82151 18 7.08925 18 7.36842V8.74737Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/briefcase_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M17 4.21053H14V3.15789C14 2.32037 13.6839 1.51715 13.1213 0.924926C12.5587 0.332706 11.7956 0 11 0H9C8.20435 0 7.44129 0.332706 6.87868 0.924926C6.31607 1.51715 6 2.32037 6 3.15789V4.21053H3C2.20435 4.21053 1.44129 4.54323 0.87868 5.13545C0.316071 5.72767 0 6.5309 0 7.36842V16.8421C0 17.6796 0.316071 18.4829 0.87868 19.0751C1.44129 19.6673 2.20435 20 3 20H17C17.7956 20 18.5587 19.6673 19.1213 19.0751C19.6839 18.4829 20 17.6796 20 16.8421V7.36842C20 6.5309 19.6839 5.72767 19.1213 5.13545C18.5587 4.54323 17.7956 4.21053 17 4.21053ZM8 3.15789C8 2.87872 8.10536 2.61098 8.29289 2.41357C8.48043 2.21617 8.73478 2.10526 9 2.10526H11C11.2652 2.10526 11.5196 2.21617 11.7071 2.41357C11.8946 2.61098 12 2.87872 12 3.15789V4.21053H8V3.15789ZM18 16.8421C18 17.1213 17.8946 17.389 17.7071 17.5864C17.5196 17.7838 17.2652 17.8947 17 17.8947H3C2.73478 17.8947 2.48043 17.7838 2.29289 17.5864C2.10536 17.389 2 17.1213 2 16.8421V11.0526C4.54626 12.1159 7.26069 12.6624 10 12.6632C12.7392 12.6614 15.4535 12.115 18 11.0526V16.8421ZM18 8.74737C15.4784 9.91345 12.7542 10.5156 10 10.5156C7.24579 10.5156 4.5216 9.91345 2 8.74737V7.36842C2 7.08925 2.10536 6.82151 2.29289 6.6241C2.48043 6.42669 2.73478 6.31579 3 6.31579H17C17.2652 6.31579 17.5196 6.42669 17.7071 6.6241C17.8946 6.82151 18 7.08925 18 7.36842V8.74737Z" fill="#FFF"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/clock-history.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/clock-history_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#FFF"/>
+</svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/credit-card.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/credit-card_w.svg


+ 6 - 0
static/webservice_running/img/menu/education.svg

@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.21144 2.04691C8.07742 1.98436 7.92258 1.98436 7.78856 2.04691L0.288558 5.54691C0.107914 5.63121 -0.00539504 5.81476 0.000197994 6.01403C0.005791 6.2133 0.129217 6.3902 0.314306 6.46424L7.81431 9.46424C7.93351 9.51192 8.06649 9.51192 8.1857 9.46424L14 7.13852V13C13.4477 13 13 13.4477 13 14V16H16V14C16 13.4477 15.5523 13 15 13V6.73852L15.6857 6.46424C15.8708 6.3902 15.9942 6.2133 15.9998 6.01403C16.0054 5.81476 15.8921 5.63121 15.7114 5.54691L8.21144 2.04691ZM8 8.46148L1.75802 5.96469L8 3.05176L14.242 5.96469L8 8.46148Z" 
+fill="#0081ff"/>
+<path d="M4.17556 9.03184C4.04549 8.98306 3.90098 8.99059 3.77669 9.05264C3.6524 9.11468 3.55952 9.22564 3.52032 9.35892L3.02032 11.0589C2.94756 11.3063 3.07488 11.5685 3.31431 11.6642L7.81431 13.4642C7.93351 13.5119 8.06649 13.5119 8.1857 13.4642L12.6857 11.6642C12.9251 11.5685 13.0524 11.3063 12.9797 11.0589L12.4797 9.35892C12.4405 9.22564 12.3476 9.11468 12.2233 9.05264C12.099 8.99059 11.9545 8.98306 11.8244 9.03184L8 10.466L4.17556 9.03184ZM4.10803 10.9047L4.32795 10.157L7.82444 11.4682C7.93763 11.5106 8.06237 11.5106 8.17556 11.4682L11.6721 10.157L11.892 10.9047L8 12.4615L4.10803 10.9047Z" 
+fill="#0081ff"/>
+</svg>

+ 6 - 0
static/webservice_running/img/menu/education_w.svg

@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.21144 2.04691C8.07742 1.98436 7.92258 1.98436 7.78856 2.04691L0.288558 5.54691C0.107914 5.63121 -0.00539504 5.81476 0.000197994 6.01403C0.005791 6.2133 0.129217 6.3902 0.314306 6.46424L7.81431 9.46424C7.93351 9.51192 8.06649 9.51192 8.1857 9.46424L14 7.13852V13C13.4477 13 13 13.4477 13 14V16H16V14C16 13.4477 15.5523 13 15 13V6.73852L15.6857 6.46424C15.8708 6.3902 15.9942 6.2133 15.9998 6.01403C16.0054 5.81476 15.8921 5.63121 15.7114 5.54691L8.21144 2.04691ZM8 8.46148L1.75802 5.96469L8 3.05176L14.242 5.96469L8 8.46148Z" 
+fill="white"/>
+<path d="M4.17556 9.03184C4.04549 8.98306 3.90098 8.99059 3.77669 9.05264C3.6524 9.11468 3.55952 9.22564 3.52032 9.35892L3.02032 11.0589C2.94756 11.3063 3.07488 11.5685 3.31431 11.6642L7.81431 13.4642C7.93351 13.5119 8.06649 13.5119 8.1857 13.4642L12.6857 11.6642C12.9251 11.5685 13.0524 11.3063 12.9797 11.0589L12.4797 9.35892C12.4405 9.22564 12.3476 9.11468 12.2233 9.05264C12.099 8.99059 11.9545 8.98306 11.8244 9.03184L8 10.466L4.17556 9.03184ZM4.10803 10.9047L4.32795 10.157L7.82444 11.4682C7.93763 11.5106 8.06237 11.5106 8.17556 11.4682L11.6721 10.157L11.892 10.9047L8 12.4615L4.10803 10.9047Z" 
+fill="white"/>
+</svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 3 - 0
static/webservice_running/img/menu/gear.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 3 - 0
static/webservice_running/img/menu/gear_w.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/handshake.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/handshake_w.svg


+ 3 - 0
static/webservice_running/img/menu/hdd-network.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M19.0909 12.7273H17.2727V10C17.2727 9.75889 17.177 9.52766 17.0065 9.35718C16.836 9.18669 16.6047 9.09091 16.3636 9.09091H10.9091V7.27273H12.7273C12.9684 7.27273 13.1996 7.17695 13.3701 7.00646C13.5406 6.83597 13.6364 6.60474 13.6364 6.36364V0.909091C13.6364 0.667985 13.5406 0.436754 13.3701 0.266267C13.1996 0.0957789 12.9684 0 12.7273 0H7.27273C7.03162 0 6.80039 0.0957789 6.6299 0.266267C6.45942 0.436754 6.36364 0.667985 6.36364 0.909091V6.36364C6.36364 6.60474 6.45942 6.83597 6.6299 7.00646C6.80039 7.17695 7.03162 7.27273 7.27273 7.27273H9.09091V9.09091H3.63636C3.39526 9.09091 3.16403 9.18669 2.99354 9.35718C2.82305 9.52766 2.72727 9.75889 2.72727 10V12.7273H0.909091C0.667985 12.7273 0.436754 12.8231 0.266267 12.9935C0.0957789 13.164 0 13.3953 0 13.6364V19.0909C0 19.332 0.0957789 19.5632 0.266267 19.7337C0.436754 19.9042 0.667985 20 0.909091 20H6.36364C6.60474 20 6.83597 19.9042 7.00646 19.7337C7.17695 19.5632 7.27273 19.332 7.27273 19.0909V13.6364C7.27273 13.3953 7.17695 13.164 7.00646 12.9935C6.83597 12.8231 6.60474 12.7273 6.36364 12.7273H4.54545V10.9091H15.4545V12.7273H13.6364C13.3953 12.7273 13.164 12.8231 12.9935 12.9935C12.8231 13.164 12.7273 13.3953 12.7273 13.6364V19.0909C12.7273 19.332 12.8231 19.5632 12.9935 19.7337C13.164 19.9042 13.3953 20 13.6364 20H19.0909C19.332 20 19.5632 19.9042 19.7337 19.7337C19.9042 19.5632 20 19.332 20 19.0909V13.6364C20 13.3953 19.9042 13.164 19.7337 12.9935C19.5632 12.8231 19.332 12.7273 19.0909 12.7273ZM5.45455 14.5455V18.1818H1.81818V14.5455H5.45455ZM8.18182 5.45455V1.81818H11.8182V5.45455H8.18182ZM18.1818 18.1818H14.5455V14.5455H18.1818V18.1818Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/hdd-network_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M19.0909 12.7273H17.2727V10C17.2727 9.75889 17.177 9.52766 17.0065 9.35718C16.836 9.18669 16.6047 9.09091 16.3636 9.09091H10.9091V7.27273H12.7273C12.9684 7.27273 13.1996 7.17695 13.3701 7.00646C13.5406 6.83597 13.6364 6.60474 13.6364 6.36364V0.909091C13.6364 0.667985 13.5406 0.436754 13.3701 0.266267C13.1996 0.0957789 12.9684 0 12.7273 0H7.27273C7.03162 0 6.80039 0.0957789 6.6299 0.266267C6.45942 0.436754 6.36364 0.667985 6.36364 0.909091V6.36364C6.36364 6.60474 6.45942 6.83597 6.6299 7.00646C6.80039 7.17695 7.03162 7.27273 7.27273 7.27273H9.09091V9.09091H3.63636C3.39526 9.09091 3.16403 9.18669 2.99354 9.35718C2.82305 9.52766 2.72727 9.75889 2.72727 10V12.7273H0.909091C0.667985 12.7273 0.436754 12.8231 0.266267 12.9935C0.0957789 13.164 0 13.3953 0 13.6364V19.0909C0 19.332 0.0957789 19.5632 0.266267 19.7337C0.436754 19.9042 0.667985 20 0.909091 20H6.36364C6.60474 20 6.83597 19.9042 7.00646 19.7337C7.17695 19.5632 7.27273 19.332 7.27273 19.0909V13.6364C7.27273 13.3953 7.17695 13.164 7.00646 12.9935C6.83597 12.8231 6.60474 12.7273 6.36364 12.7273H4.54545V10.9091H15.4545V12.7273H13.6364C13.3953 12.7273 13.164 12.8231 12.9935 12.9935C12.8231 13.164 12.7273 13.3953 12.7273 13.6364V19.0909C12.7273 19.332 12.8231 19.5632 12.9935 19.7337C13.164 19.9042 13.3953 20 13.6364 20H19.0909C19.332 20 19.5632 19.9042 19.7337 19.7337C19.9042 19.5632 20 19.332 20 19.0909V13.6364C20 13.3953 19.9042 13.164 19.7337 12.9935C19.5632 12.8231 19.332 12.7273 19.0909 12.7273ZM5.45455 14.5455V18.1818H1.81818V14.5455H5.45455ZM8.18182 5.45455V1.81818H11.8182V5.45455H8.18182ZM18.1818 18.1818H14.5455V14.5455H18.1818V18.1818Z" fill="#FFF"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/house.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M20 8.00001L14 2.74001C13.45 2.24805 12.7379 1.97607 12 1.97607C11.2621 1.97607 10.55 2.24805 10 2.74001L4 8.00001C3.68237 8.28408 3.4289 8.63256 3.25648 9.02225C3.08405 9.41194 2.99662 9.83389 3 10.26V19C3 19.7957 3.31607 20.5587 3.87868 21.1213C4.44129 21.6839 5.20435 22 6 22H18C18.7957 22 19.5587 21.6839 20.1213 21.1213C20.6839 20.5587 21 19.7957 21 19V10.25C21.002 9.82557 20.9139 9.40555 20.7415 9.01769C20.5691 8.62983 20.3164 8.28296 20 8.00001ZM14 20H10V15C10 14.7348 10.1054 14.4804 10.2929 14.2929C10.4804 14.1054 10.7348 14 11 14H13C13.2652 14 13.5196 14.1054 13.7071 14.2929C13.8946 14.4804 14 14.7348 14 15V20ZM19 19C19 19.2652 18.8946 19.5196 18.7071 19.7071C18.5196 19.8946 18.2652 20 18 20H16V15C16 14.2044 15.6839 13.4413 15.1213 12.8787C14.5587 12.3161 13.7957 12 13 12H11C10.2044 12 9.44129 12.3161 8.87868 12.8787C8.31607 13.4413 8 14.2044 8 15V20H6C5.73479 20 5.48043 19.8946 5.2929 19.7071C5.10536 19.5196 5 19.2652 5 19V10.25C5.00018 10.108 5.0306 9.9677 5.08922 9.83839C5.14784 9.70907 5.23333 9.59372 5.34 9.50001L11.34 4.25001C11.5225 4.08969 11.7571 4.00127 12 4.00127C12.2429 4.00127 12.4775 4.08969 12.66 4.25001L18.66 9.50001C18.7667 9.59372 18.8522 9.70907 18.9108 9.83839C18.9694 9.9677 18.9998 10.108 19 10.25V19Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/house_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M20 8.00001L14 2.74001C13.45 2.24805 12.7379 1.97607 12 1.97607C11.2621 1.97607 10.55 2.24805 10 2.74001L4 8.00001C3.68237 8.28408 3.4289 8.63256 3.25648 9.02225C3.08405 9.41194 2.99662 9.83389 3 10.26V19C3 19.7957 3.31607 20.5587 3.87868 21.1213C4.44129 21.6839 5.20435 22 6 22H18C18.7957 22 19.5587 21.6839 20.1213 21.1213C20.6839 20.5587 21 19.7957 21 19V10.25C21.002 9.82557 20.9139 9.40555 20.7415 9.01769C20.5691 8.62983 20.3164 8.28296 20 8.00001ZM14 20H10V15C10 14.7348 10.1054 14.4804 10.2929 14.2929C10.4804 14.1054 10.7348 14 11 14H13C13.2652 14 13.5196 14.1054 13.7071 14.2929C13.8946 14.4804 14 14.7348 14 15V20ZM19 19C19 19.2652 18.8946 19.5196 18.7071 19.7071C18.5196 19.8946 18.2652 20 18 20H16V15C16 14.2044 15.6839 13.4413 15.1213 12.8787C14.5587 12.3161 13.7957 12 13 12H11C10.2044 12 9.44129 12.3161 8.87868 12.8787C8.31607 13.4413 8 14.2044 8 15V20H6C5.73479 20 5.48043 19.8946 5.2929 19.7071C5.10536 19.5196 5 19.2652 5 19V10.25C5.00018 10.108 5.0306 9.9677 5.08922 9.83839C5.14784 9.70907 5.23333 9.59372 5.34 9.50001L11.34 4.25001C11.5225 4.08969 11.7571 4.00127 12 4.00127C12.2429 4.00127 12.4775 4.08969 12.66 4.25001L18.66 9.50001C18.7667 9.59372 18.8522 9.70907 18.9108 9.83839C18.9694 9.9677 18.9998 10.108 19 10.25V19Z" fill="#FFF"/>
+</svg>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/people.svg


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 1 - 0
static/webservice_running/img/menu/people_w.svg


+ 3 - 0
static/webservice_running/img/menu/person.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.71 12.71C16.6904 11.9387 17.406 10.8809 17.7572 9.68394C18.1085 8.48697 18.0779 7.21027 17.6698 6.03147C17.2617 4.85267 16.4963 3.83039 15.4801 3.10686C14.4639 2.38332 13.2474 1.99451 12 1.99451C10.7525 1.99451 9.53611 2.38332 8.51993 3.10686C7.50374 3.83039 6.73834 4.85267 6.33021 6.03147C5.92208 7.21027 5.89151 8.48697 6.24276 9.68394C6.59401 10.8809 7.3096 11.9387 8.29 12.71C6.61007 13.383 5.14428 14.4994 4.04889 15.9399C2.95349 17.3805 2.26956 19.0913 2.07 20.89C2.05555 21.0213 2.06711 21.1542 2.10402 21.2811C2.14093 21.4079 2.20246 21.5263 2.28511 21.6293C2.45202 21.8375 2.69478 21.9708 2.96 22C3.22521 22.0292 3.49116 21.9518 3.69932 21.7849C3.90749 21.618 4.04082 21.3752 4.07 21.11C4.28958 19.1552 5.22168 17.3498 6.68822 16.0388C8.15475 14.7278 10.0529 14.003 12.02 14.003C13.9871 14.003 15.8852 14.7278 17.3518 16.0388C18.8183 17.3498 19.7504 19.1552 19.97 21.11C19.9972 21.3557 20.1144 21.5827 20.2991 21.747C20.4838 21.9114 20.7228 22.0015 20.97 22H21.08C21.3421 21.9698 21.5817 21.8373 21.7466 21.6313C21.9114 21.4252 21.9881 21.1624 21.96 20.9C21.7595 19.0962 21.0719 17.381 19.9708 15.9382C18.8698 14.4954 17.3969 13.3795 15.71 12.71ZM12 12C11.2089 12 10.4355 11.7654 9.77772 11.3259C9.11992 10.8864 8.60723 10.2616 8.30448 9.53074C8.00173 8.79983 7.92251 7.99557 8.07686 7.21964C8.2312 6.44372 8.61216 5.73099 9.17157 5.17158C9.73098 4.61217 10.4437 4.2312 11.2196 4.07686C11.9956 3.92252 12.7998 4.00173 13.5307 4.30448C14.2616 4.60724 14.8863 5.11993 15.3259 5.77772C15.7654 6.43552 16 7.20888 16 8C16 9.06087 15.5786 10.0783 14.8284 10.8284C14.0783 11.5786 13.0609 12 12 12Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/person_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.71 12.71C16.6904 11.9387 17.406 10.8809 17.7572 9.68394C18.1085 8.48697 18.0779 7.21027 17.6698 6.03147C17.2617 4.85267 16.4963 3.83039 15.4801 3.10686C14.4639 2.38332 13.2474 1.99451 12 1.99451C10.7525 1.99451 9.53611 2.38332 8.51993 3.10686C7.50374 3.83039 6.73834 4.85267 6.33021 6.03147C5.92208 7.21027 5.89151 8.48697 6.24276 9.68394C6.59401 10.8809 7.3096 11.9387 8.29 12.71C6.61007 13.383 5.14428 14.4994 4.04889 15.9399C2.95349 17.3805 2.26956 19.0913 2.07 20.89C2.05555 21.0213 2.06711 21.1542 2.10402 21.2811C2.14093 21.4079 2.20246 21.5263 2.28511 21.6293C2.45202 21.8375 2.69478 21.9708 2.96 22C3.22521 22.0292 3.49116 21.9518 3.69932 21.7849C3.90749 21.618 4.04082 21.3752 4.07 21.11C4.28958 19.1552 5.22168 17.3498 6.68822 16.0388C8.15475 14.7278 10.0529 14.003 12.02 14.003C13.9871 14.003 15.8852 14.7278 17.3518 16.0388C18.8183 17.3498 19.7504 19.1552 19.97 21.11C19.9972 21.3557 20.1144 21.5827 20.2991 21.747C20.4838 21.9114 20.7228 22.0015 20.97 22H21.08C21.3421 21.9698 21.5817 21.8373 21.7466 21.6313C21.9114 21.4252 21.9881 21.1624 21.96 20.9C21.7595 19.0962 21.0719 17.381 19.9708 15.9382C18.8698 14.4954 17.3969 13.3795 15.71 12.71ZM12 12C11.2089 12 10.4355 11.7654 9.77772 11.3259C9.11992 10.8864 8.60723 10.2616 8.30448 9.53074C8.00173 8.79983 7.92251 7.99557 8.07686 7.21964C8.2312 6.44372 8.61216 5.73099 9.17157 5.17158C9.73098 4.61217 10.4437 4.2312 11.2196 4.07686C11.9956 3.92252 12.7998 4.00173 13.5307 4.30448C14.2616 4.60724 14.8863 5.11993 15.3259 5.77772C15.7654 6.43552 16 7.20888 16 8C16 9.06087 15.5786 10.0783 14.8284 10.8284C14.0783 11.5786 13.0609 12 12 12Z" fill="#FFF"/>
+</svg>

+ 4 - 0
static/webservice_running/img/menu/sotrud.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 1C5.67173 1 5 1.67117 5 2.49976V3H1.5C0.671573 3 0 3.67157 0 4.5V12.5C0 13.3284 0.671573 14 1.5 14H14.5C15.3284 14 16 13.3284 16 12.5V4.5C16 3.67157 15.3284 3 14.5 3H11V2.49976C11 1.67117 10.3283 1 9.5 1H6.5ZM6.5 2H9.5C9.7763 2 10 2.22463 10 2.50061V3H6V2.49976C6 2.22377 6.2237 2 6.5 2ZM8.38649 8.91441L15 7.15081V12.5C15 12.7761 14.7761 13 14.5 13H1.5C1.22386 13 1 12.7761 1 12.5V7.15081L7.61351 8.91441C7.86674 8.98194 8.13326 8.98194 8.38649 8.91441ZM1.5 4H14.5C14.7761 4 15 4.22386 15 4.5V6.11586L8.12883 7.94817C8.04442 7.97068 7.95558 7.97068 7.87117 7.94817L1 6.11586V4.5C1 4.22386 1.22386 4 1.5 4Z" 
+fill="#0081ff"/>
+</svg>

+ 4 - 0
static/webservice_running/img/menu/sotrud_w.svg

@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 1C5.67173 1 5 1.67117 5 2.49976V3H1.5C0.671573 3 0 3.67157 0 4.5V12.5C0 13.3284 0.671573 14 1.5 14H14.5C15.3284 14 16 13.3284 16 12.5V4.5C16 3.67157 15.3284 3 14.5 3H11V2.49976C11 1.67117 10.3283 1 9.5 1H6.5ZM6.5 2H9.5C9.7763 2 10 2.22463 10 2.50061V3H6V2.49976C6 2.22377 6.2237 2 6.5 2ZM8.38649 8.91441L15 7.15081V12.5C15 12.7761 14.7761 13 14.5 13H1.5C1.22386 13 1 12.7761 1 12.5V7.15081L7.61351 8.91441C7.86674 8.98194 8.13326 8.98194 8.38649 8.91441ZM1.5 4H14.5C14.7761 4 15 4.22386 15 4.5V6.11586L8.12883 7.94817C8.04442 7.97068 7.95558 7.97068 7.87117 7.94817L1 6.11586V4.5C1 4.22386 1.22386 4 1.5 4Z" 
+fill="white"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/tickets.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M21 11.9999C20.7348 11.9999 20.4804 12.1053 20.2929 12.2928C20.1054 12.4804 20 12.7347 20 12.9999V18.9999C20 19.2652 19.8946 19.5195 19.7071 19.707C19.5196 19.8946 19.2652 19.9999 19 19.9999H5C4.73478 19.9999 4.48043 19.8946 4.29289 19.707C4.10536 19.5195 4 19.2652 4 18.9999V4.99994C4 4.73472 4.10536 4.48037 4.29289 4.29283C4.48043 4.1053 4.73478 3.99994 5 3.99994H11C11.2652 3.99994 11.5196 3.89458 11.7071 3.70705C11.8946 3.51951 12 3.26516 12 2.99994C12 2.73472 11.8946 2.48037 11.7071 2.29283C11.5196 2.1053 11.2652 1.99994 11 1.99994H5C4.20435 1.99994 3.44129 2.31601 2.87868 2.87862C2.31607 3.44123 2 4.20429 2 4.99994V18.9999C2 19.7956 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 21.9999 5 21.9999H19C19.7956 21.9999 20.5587 21.6839 21.1213 21.1213C21.6839 20.5587 22 19.7956 22 18.9999V12.9999C22 12.7347 21.8946 12.4804 21.7071 12.2928C21.5196 12.1053 21.2652 11.9999 21 11.9999ZM6 12.7599V16.9999C6 17.2652 6.10536 17.5195 6.29289 17.707C6.48043 17.8946 6.73478 17.9999 7 17.9999H11.24C11.3716 18.0007 11.5021 17.9755 11.6239 17.9257C11.7457 17.8759 11.8566 17.8026 11.95 17.7099L18.87 10.7799L21.71 7.99994C21.8037 7.90698 21.8781 7.79637 21.9289 7.67452C21.9797 7.55266 22.0058 7.42195 22.0058 7.28994C22.0058 7.15793 21.9797 7.02722 21.9289 6.90536C21.8781 6.7835 21.8037 6.6729 21.71 6.57994L17.47 2.28994C17.377 2.19621 17.2664 2.12182 17.1446 2.07105C17.0227 2.02028 16.892 1.99414 16.76 1.99414C16.628 1.99414 16.4973 2.02028 16.3754 2.07105C16.2536 2.12182 16.143 2.19621 16.05 2.28994L13.23 5.11994L6.29 12.0499C6.19732 12.1434 6.12399 12.2542 6.07423 12.376C6.02446 12.4979 5.99924 12.6283 6 12.7599ZM16.76 4.40994L19.59 7.23994L18.17 8.65994L15.34 5.82994L16.76 4.40994ZM8 13.1699L13.93 7.23994L16.76 10.0699L10.83 15.9999H8V13.1699Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
static/webservice_running/img/menu/tickets_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M21 11.9999C20.7348 11.9999 20.4804 12.1053 20.2929 12.2928C20.1054 12.4804 20 12.7347 20 12.9999V18.9999C20 19.2652 19.8946 19.5195 19.7071 19.707C19.5196 19.8946 19.2652 19.9999 19 19.9999H5C4.73478 19.9999 4.48043 19.8946 4.29289 19.707C4.10536 19.5195 4 19.2652 4 18.9999V4.99994C4 4.73472 4.10536 4.48037 4.29289 4.29283C4.48043 4.1053 4.73478 3.99994 5 3.99994H11C11.2652 3.99994 11.5196 3.89458 11.7071 3.70705C11.8946 3.51951 12 3.26516 12 2.99994C12 2.73472 11.8946 2.48037 11.7071 2.29283C11.5196 2.1053 11.2652 1.99994 11 1.99994H5C4.20435 1.99994 3.44129 2.31601 2.87868 2.87862C2.31607 3.44123 2 4.20429 2 4.99994V18.9999C2 19.7956 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 21.9999 5 21.9999H19C19.7956 21.9999 20.5587 21.6839 21.1213 21.1213C21.6839 20.5587 22 19.7956 22 18.9999V12.9999C22 12.7347 21.8946 12.4804 21.7071 12.2928C21.5196 12.1053 21.2652 11.9999 21 11.9999ZM6 12.7599V16.9999C6 17.2652 6.10536 17.5195 6.29289 17.707C6.48043 17.8946 6.73478 17.9999 7 17.9999H11.24C11.3716 18.0007 11.5021 17.9755 11.6239 17.9257C11.7457 17.8759 11.8566 17.8026 11.95 17.7099L18.87 10.7799L21.71 7.99994C21.8037 7.90698 21.8781 7.79637 21.9289 7.67452C21.9797 7.55266 22.0058 7.42195 22.0058 7.28994C22.0058 7.15793 21.9797 7.02722 21.9289 6.90536C21.8781 6.7835 21.8037 6.6729 21.71 6.57994L17.47 2.28994C17.377 2.19621 17.2664 2.12182 17.1446 2.07105C17.0227 2.02028 16.892 1.99414 16.76 1.99414C16.628 1.99414 16.4973 2.02028 16.3754 2.07105C16.2536 2.12182 16.143 2.19621 16.05 2.28994L13.23 5.11994L6.29 12.0499C6.19732 12.1434 6.12399 12.2542 6.07423 12.376C6.02446 12.4979 5.99924 12.6283 6 12.7599ZM16.76 4.40994L19.59 7.23994L18.17 8.65994L15.34 5.82994L16.76 4.40994ZM8 13.1699L13.93 7.23994L16.76 10.0699L10.83 15.9999H8V13.1699Z" fill="#FFF"/>
+</svg>

BIN
static/webservice_running/img/mir.png


BIN
static/webservice_running/img/paymo.png


+ 3 - 0
static/webservice_running/img/pencil.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.1203 6.40527L17.5949 2.87987C17.0083 2.29329 16.241 2 15.4737 2C14.7064 2 13.9392 2.29329 13.3526 2.87987L2.88005 13.3376C2.30532 13.9093 1.9913 14.6885 2.00018 15.4973L2.05943 19.9855C2.07425 21.1024 2.98374 22 4.10061 22H8.50589C9.3028 22 10.0671 21.683 10.63 21.1201L21.1203 10.6476C22.2905 9.47741 22.2905 7.57843 21.1203 6.40527ZM9.56943 20.0595C9.28503 20.3439 8.90583 20.501 8.50589 20.501H4.10061C3.80732 20.501 3.56143 20.261 3.55847 19.9677L3.49922 15.4795C3.4933 15.0795 3.65327 14.6855 3.93767 14.4041L12.3779 5.97571L18.0245 11.6193L9.56943 20.0625V20.0595ZM20.0597 9.58702L19.0851 10.5587L13.4385 4.91512L14.4102 3.94342C14.6946 3.65901 15.0708 3.50496 15.4708 3.50496C15.8707 3.50496 16.247 3.66198 16.5314 3.94342L20.0568 7.46882C20.6404 8.05244 20.6404 9.00637 20.0568 9.58999L20.0597 9.58702Z" fill="white"/>
+</svg>

BIN
static/webservice_running/img/schemav3.png


BIN
static/webservice_running/img/visa.png


+ 4 - 2
templates/webservice_running/orders_sports.html

@@ -7,7 +7,7 @@
 {% block contenthome %}
 
 <p>
-Список заказов (полный).
+Список Событий сервиса "Друг-Спортсмен".
 </p>
 
 <div class="dropdown mb-3">
@@ -32,7 +32,9 @@
 {% if "METASERVICE-CLIENT" in user_groups %}
 <h1></h1>
   <div class="container text-end mt-2">
-          <a class="btn btn-primary" id="bord" href={% url "sharix_admin:order/add/" %}>{% trans 'Add' %}</a>
+          <a class="btn btn-primary" id="bord" href={% url "webservice_running:order_sports/add/" %}>{% trans 'Add' %}</a>
+	  {% comment %}<a class="btn btn-primary" id="bord" href={% url "sharix_admin:order/add/" %}>{% trans 'Add' %}</a>
+	  {% endcomment %}
   </div>
 {% endif %}
 

+ 5 - 3
views/order_sports.py

@@ -19,6 +19,7 @@ from django.views.generic.edit import FormView
 from django.views.generic import DetailView
 from tickets.models import Ticket, TicketList
 from sharix_admin.forms import OrderForm
+from webservice_running.forms import OrderSportsForm
 from sharix_admin.utils import *
 from dbsynce.lib.data import *
 from sharix_admin.views import BaseView
@@ -27,9 +28,10 @@ from django.contrib.auth import get_user_model
 
 class OrdersSportsListView(OrdersListView):
 #class OrdersListView(UserPassesTestMixin, SingleTableView):
-    table_class = EventTable
-#    table_class = OrdersTable
-    queryset = Event.objects.all()
+#    table_class = EventTable
+    table_class = OrdersTable
+    queryset = Orders.objects.all()
+    #queryset = Event.objects.all()
     template_name = 'webservice_running/orders_sports.html'
 #    page_title = 'Заказы'
     page_name = 'orders_sports'

+ 4 - 1
views/resource_sports.py

@@ -1,4 +1,5 @@
 from dbsynce.models import Resource
+from webservice_running.models import Place
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import UserPassesTestMixin
 from django.http import JsonResponse
@@ -21,9 +22,11 @@ from django.views.generic.edit import FormView
 from tickets.models import Ticket, TicketList
 
 from sharix_admin.forms import ResourceForm
+from webservice_running.forms import ResourceSportsForm
 from sharix_admin.utils import *
 from dbsynce.lib.data import *
 from sharix_admin.views.base import BaseView
+from sharix_admin.views import *
 from django.db.models import Q
 
 from dbsynce.docs.database.resource import Resource as ResourceHelpTexts
@@ -181,7 +184,7 @@ class ResourceSportsCreate(ResourceCreate):
 
         return super().form_valid(form)  # Возвращаем успешный ответ
 
-class ResourceSportsDetailView(ResourceDetailVies):
+class ResourceSportsDetailView(ResourceDetailView):
     model = Place
     template_name = 'webservice_running/resource_sports_detail.html'
     context_object_name = 'resource_sports'

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott