diff --git a/rosmorport_tsts/rosmorport_tsts/urls.py b/rosmorport_tsts/rosmorport_tsts/urls.py index f986213..673948f 100644 --- a/rosmorport_tsts/rosmorport_tsts/urls.py +++ b/rosmorport_tsts/rosmorport_tsts/urls.py @@ -28,8 +28,9 @@ urlpatterns = [ re_path(r'^logout$', views.my_logout), re_path(r'^login$', views.my_login), re_path(r'^not-auth$', views.not_auth), - re_path(r'add-clone$', views.add_clone), - re_path(r'save-clone$', views.save_clone), + re_path(r'^add-clone$', views.add_clone), + re_path(r'^save-clone$', views.save_clone), + re_path(r'^report1$', views.report1), ] diff --git a/rosmorport_tsts/rosmorport_tsts/views.py b/rosmorport_tsts/rosmorport_tsts/views.py index 56cc8e7..996e2d0 100644 --- a/rosmorport_tsts/rosmorport_tsts/views.py +++ b/rosmorport_tsts/rosmorport_tsts/views.py @@ -58,7 +58,7 @@ def not_auth(request: HttpRequest) -> HttpResponse: :return response: исходящий http-ответ """ 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: @@ -72,7 +72,7 @@ def add_clone(request: HttpRequest) -> HttpResponse: "PET_TYPES": TbPetsClones.PetType.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: @@ -86,27 +86,31 @@ def save_clone(request: HttpRequest) -> HttpResponse: } if request.method == 'POST': 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( - iPetType=int(pet_type), - szPetName=pet_name, - iPetSex=int(pet_sex), - bPetIsAlive=pet_is_alive, - szPetOwner=pet_owner, - szPetPrice=int(pay), - szPetComment=pet_note, - bPetIsReg=pet_reg + iPetType=int(request.POST.get('type')), + szPetName=request.POST.get('name'), + iPetSex=int(request.POST.get('sex')), + bPetIsAlive=True if 'is-alive' in request.POST else False, + szPetOwner=None if request.POST.get('owner') == "" else request.POST.get('owner'), + szPetPrice=int(request.POST.get('pay')), + szPetComment= request.POST.get('note'), + bPetIsReg=False if 'noreg' in request.POST else True ) pet.save() except (KeyError, ValueError, TypeError): 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) \ No newline at end of file diff --git a/rosmorport_tsts/templates-django/save_data.jinja b/rosmorport_tsts/templates-django/ page/save_data.jinja similarity index 100% rename from rosmorport_tsts/templates-django/save_data.jinja rename to rosmorport_tsts/templates-django/ page/save_data.jinja diff --git a/rosmorport_tsts/templates-django/input_data.jinja b/rosmorport_tsts/templates-django/blocks/input_data.jinja similarity index 100% rename from rosmorport_tsts/templates-django/input_data.jinja rename to rosmorport_tsts/templates-django/blocks/input_data.jinja diff --git a/rosmorport_tsts/templates-django/blocks/nav_main_menu.jinja b/rosmorport_tsts/templates-django/blocks/nav_main_menu.jinja index 84267ca..4a67866 100644 --- a/rosmorport_tsts/templates-django/blocks/nav_main_menu.jinja +++ b/rosmorport_tsts/templates-django/blocks/nav_main_menu.jinja @@ -15,8 +15,8 @@ Отчёты diff --git a/rosmorport_tsts/templates-django/not_auth.jinja b/rosmorport_tsts/templates-django/popup/not_auth.jinja similarity index 100% rename from rosmorport_tsts/templates-django/not_auth.jinja rename to rosmorport_tsts/templates-django/popup/not_auth.jinja