From 6f2c4b0672c1a384e9aed4f5d940ad66991ab0da Mon Sep 17 00:00:00 2001 From: AlexSserb Date: Fri, 27 Sep 2024 16:03:44 +0400 Subject: [PATCH] feat: page numbers, deal id on each page, avoid breaks after product header in deal document --- static/css/deal.css | 5 ++++- templates/documents/deal.html | 32 ++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/static/css/deal.css b/static/css/deal.css index 04e0f7d..9ea93a2 100644 --- a/static/css/deal.css +++ b/static/css/deal.css @@ -6,6 +6,10 @@ } } +html { + font-family: sans-serif; +} + hr { background-color: black; height: 2px; @@ -18,7 +22,6 @@ hr { margin: -30px 0; padding: 0 15px; font-size: 13px; - font-family: sans-serif; } .deal-name-id-container { diff --git a/templates/documents/deal.html b/templates/documents/deal.html index 651dabd..4263689 100644 --- a/templates/documents/deal.html +++ b/templates/documents/deal.html @@ -15,12 +15,30 @@ src: url(data:font/woff2;base64,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); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } + + @page :first { + @top-right { + margin-bottom: 0; + } + } + + @page { + @bottom-right { + content: counter(page); + margin-right: 20px; + } + @top-right { + content: "ID:{{ deal.id }}"; + border: solid black 2px; + padding: 12px 2px; + margin-top: 50px; + margin-right: 28px; + margin-bottom: 10px; + } + } -
@@ -29,9 +47,6 @@
Название сделки: {{ deal.name }}
-
- ID:{{ deal.id }} -

@@ -91,7 +106,7 @@ {% for product in deal.products %} -
+

@@ -168,7 +183,8 @@
- Итого: {{ product_services_totals[loop.index0].total }} Р, за единицу: {{ product_services_totals[loop.index0].total_one_product }} Р + Итого: {{ product_services_totals[loop.index0].total }} Р, за + единицу: {{ product_services_totals[loop.index0].total_one_product }} Р
{% else %}