From 56d7af5c9df8a2778d11a1e7b1f30f33415f5ef1 Mon Sep 17 00:00:00 2001 From: erjemin Date: Sat, 31 Dec 2022 05:13:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report_price_list.html => price/price_list.html} | 2 +- .../price_list_frame.html} | 0 .../price_offers_for_one_window.html} | 2 +- .../price_offers_for_one_window_frame.html} | 0 oknardia/web/prices.py | 8 ++++---- 5 files changed, 6 insertions(+), 6 deletions(-) rename oknardia/templates/{report/report_price_list.html => price/price_list.html} (99%) rename oknardia/templates/{report/report_price_list_frame.html => price/price_list_frame.html} (100%) rename oknardia/templates/{report/report_price_offers_for_one_window.html => price/price_offers_for_one_window.html} (99%) rename oknardia/templates/{report/report_price_offers_for_one_window_frame.html => price/price_offers_for_one_window_frame.html} (100%) diff --git a/oknardia/templates/report/report_price_list.html b/oknardia/templates/price/price_list.html similarity index 99% rename from oknardia/templates/report/report_price_list.html rename to oknardia/templates/price/price_list.html index b9e10b5..2f76d80 100755 --- a/oknardia/templates/report/report_price_list.html +++ b/oknardia/templates/price/price_list.html @@ -165,7 +165,7 @@ $(function () { // инициализация и обработка попове - {% include "report/report_price_list_frame.html" %} + {% include "price/price_list_frame.html" %} diff --git a/oknardia/templates/report/report_price_list_frame.html b/oknardia/templates/price/price_list_frame.html similarity index 100% rename from oknardia/templates/report/report_price_list_frame.html rename to oknardia/templates/price/price_list_frame.html diff --git a/oknardia/templates/report/report_price_offers_for_one_window.html b/oknardia/templates/price/price_offers_for_one_window.html similarity index 99% rename from oknardia/templates/report/report_price_offers_for_one_window.html rename to oknardia/templates/price/price_offers_for_one_window.html index 9ad21a5..4cdabcb 100755 --- a/oknardia/templates/report/report_price_offers_for_one_window.html +++ b/oknardia/templates/price/price_offers_for_one_window.html @@ -205,7 +205,7 @@ $(function () { // инициализация и обработка попове - {% include "report/report_price_list_one_flap_frame.html" %} + {% include "price/price_offers_for_one_window_frame.html" %}

diff --git a/oknardia/templates/report/report_price_offers_for_one_window_frame.html b/oknardia/templates/price/price_offers_for_one_window_frame.html similarity index 100% rename from oknardia/templates/report/report_price_offers_for_one_window_frame.html rename to oknardia/templates/price/price_offers_for_one_window_frame.html diff --git a/oknardia/web/prices.py b/oknardia/web/prices.py index c519268..7769d69 100644 --- a/oknardia/web/prices.py +++ b/oknardia/web/prices.py @@ -441,7 +441,7 @@ def report_one_win_price(request: HttpRequest, win_width_mm: str = '670', win_he 'LOG_VISIT': get_last_all_user_visit_list(), 'ticks': float(time.time() - time_start) }) - return render(request, "report/report_price_offers_for_one_window.html", to_template) + return render(request, "price/price_offers_for_one_window.html", to_template) def next_one_win_price(request: HttpRequest, win_id='16', frame_begin_n="0"): @@ -457,7 +457,7 @@ def next_one_win_price(request: HttpRequest, win_id='16', frame_begin_n="0"): to_template.update({'MOUNT_DIM_PER_OFFER': 1, 'WIN_ID': int(win_id), 'ticks': float(time.time() - time_start)}) - return render(request, "report/report_price_offers_for_one_window_frame.html", to_template) + return render(request, "price/price_offers_for_one_window_frame.html", to_template) def report_price(request: HttpRequest, build_id: str = "22427", apart_id: str = "61", @@ -677,7 +677,7 @@ def report_price(request: HttpRequest, build_id: str = "22427", apart_id: str = last_visit = json.dumps(last_visit[:3]) # упаковываем json без пробелов (три записи) # print u"сейчас запишем вот эту куку:", LastVisit to_template.update({'ticks': float(time.time() - time_start)}) - response = render(request, "report/report_price_list.html", to_template) + response = render(request, "price/price_list.html", to_template) response.set_cookie("LastVisit", last_visit, max_age=7862400) # ставим или перезаписываем куки (91 день) return response @@ -708,4 +708,4 @@ def next_price_frame(request: HttpRequest, apart_id: str = "1", mount_dim_per_o 'ADDRESS_LAT': address_latitude, 'ADDRESS_LON': address_longitude, 'ticks': float(time.time() - time_start)}) - return render(request, "report/report_price_list_frame.html", to_template) + return render(request, "price/price_list_frame.html", to_template)