Изменено расположение шаблонов

This commit is contained in:
e-serg 2024-04-14 23:35:23 +03:00
parent c0864ba183
commit b0c9722d10
6 changed files with 28 additions and 23 deletions

View File

@ -28,8 +28,9 @@ urlpatterns = [
re_path(r'^logout$', views.my_logout), re_path(r'^logout$', views.my_logout),
re_path(r'^login$', views.my_login), re_path(r'^login$', views.my_login),
re_path(r'^not-auth$', views.not_auth), re_path(r'^not-auth$', views.not_auth),
re_path(r'add-clone$', views.add_clone), re_path(r'^add-clone$', views.add_clone),
re_path(r'save-clone$', views.save_clone), re_path(r'^save-clone$', views.save_clone),
re_path(r'^report1$', views.report1),
] ]

View File

@ -58,7 +58,7 @@ def not_auth(request: HttpRequest) -> HttpResponse:
:return response: исходящий http-ответ :return response: исходящий http-ответ
""" """
to_template = {"META_REFRESH": "15; url=/"} to_template = {"META_REFRESH": "15; url=/"}
return render(request, template_name="not_auth.jinja", context=to_template, status=401) return render(request, template_name="popup/not_auth.jinja", context=to_template, status=401)
def add_clone(request: HttpRequest) -> HttpResponse: def add_clone(request: HttpRequest) -> HttpResponse:
@ -72,7 +72,7 @@ def add_clone(request: HttpRequest) -> HttpResponse:
"PET_TYPES": TbPetsClones.PetType.choices, "PET_TYPES": TbPetsClones.PetType.choices,
"PET_SEXES": TbPetsClones.PetSex.choices "PET_SEXES": TbPetsClones.PetSex.choices
} }
return render(request, template_name="input_data.jinja", context=to_template) return render(request, template_name="blocks/input_data.jinja", context=to_template)
def save_clone(request: HttpRequest) -> HttpResponse: def save_clone(request: HttpRequest) -> HttpResponse:
@ -86,27 +86,31 @@ def save_clone(request: HttpRequest) -> HttpResponse:
} }
if request.method == 'POST': if request.method == 'POST':
try: try:
pay = request.POST.get('pay')
pet_type = request.POST.get('type')
pet_sex = request.POST.get('sex')
pet_is_alive = True if 'is-alive' in request.POST else False
pet_reg = False if 'noreg' in request.POST else True
pet_name = request.POST.get('name')
pet_note = request.POST.get('note')
pet_owner = None if request.POST.get('owner') == "" else request.POST.get('owner')
pet = TbPetsClones( pet = TbPetsClones(
iPetType=int(pet_type), iPetType=int(request.POST.get('type')),
szPetName=pet_name, szPetName=request.POST.get('name'),
iPetSex=int(pet_sex), iPetSex=int(request.POST.get('sex')),
bPetIsAlive=pet_is_alive, bPetIsAlive=True if 'is-alive' in request.POST else False,
szPetOwner=pet_owner, szPetOwner=None if request.POST.get('owner') == "" else request.POST.get('owner'),
szPetPrice=int(pay), szPetPrice=int(request.POST.get('pay')),
szPetComment=pet_note, szPetComment= request.POST.get('note'),
bPetIsReg=pet_reg bPetIsReg=False if 'noreg' in request.POST else True
) )
pet.save() pet.save()
except (KeyError, ValueError, TypeError): except (KeyError, ValueError, TypeError):
return HttpResponseRedirect('/add-clone') return HttpResponseRedirect('/add-clone')
return render(request, template_name="save_data.jinja", context=to_template) return render(request, template_name=" page/save_data.jinja", context=to_template)
def report1(request: HttpRequest) -> HttpResponse:
""" Отчет по клонированным питомцам
:param
:return response: исходящий http-ответ
"""
to_template = {
"META_REFRESH": "3600; url=/logout", # автоматический logout через 10 минут бездействия
"PETS": TbPetsClones.objects.all()
}
return render(request, template_name="report1.jinja", context=to_template)

View File

@ -15,8 +15,8 @@
<i class="fa-solid fa-table"></i> Отчёты <i class="fa-solid fa-table"></i> Отчёты
</a> </a>
<ul class="dropdown-menu">{% if request.user.is_authenticated %} <ul class="dropdown-menu">{% if request.user.is_authenticated %}
<li><a class="dropdown-item" href="#">Отчёт 1</a></li> <li><a class="dropdown-item" href="/report1">Отчёт 1</a></li>
<li><a class="dropdown-item" href="#">Отчёт 2</a></li>{% else %} <li><a class="dropdown-item" href="/report2">Отчёт 2</a></li>{% else %}
<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#login_modal"> <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#login_modal">
<i class="fa-solid fa-right-to-bracket"></i> Необходима авторизация</a></li>{% endif %} <i class="fa-solid fa-right-to-bracket"></i> Необходима авторизация</a></li>{% endif %}
</ul> </ul>