From 88825efaeb28ef9ebff572a8ac4b9056d77b5913 Mon Sep 17 00:00:00 2001
From: bogo <bszczuka@amsetedam-standard.com>
Date: Sat, 28 Sep 2024 09:12:18 +0200
Subject: [PATCH] Add popper for custom distance

---
 app.py                                  |   8 +++++---
 templates/base.html                     |   2 +-
 templates/custom.html                   |  22 +++++++++++++++-------
 templates/pdf_template_custom.html      |   8 +++++---
 templates/popper_svg.html               |   3 +++
 templates/setup.html                    |   4 ++--
 translations/pl/LC_MESSAGES/messages.mo | Bin 2972 -> 3086 bytes
 translations/pl/LC_MESSAGES/messages.po |   8 +++++++-
 8 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 templates/popper_svg.html

diff --git a/app.py b/app.py
index dd54947..48003f1 100644
--- a/app.py
+++ b/app.py
@@ -27,6 +27,8 @@ IPSC_TARGET_HEIGHT = 58
 IPSC_STAGE_WIDTH = 322
 
 IDPA_TARGET_HEIGHT = 78
+POPPER_HEIGHT = 85
+POPPER_WIDTH = 30
 
 VALUES = {
     "five_to_go": {
@@ -276,15 +278,15 @@ def generate_pdf_custom():
     size = request.form.get('size')
     target_type = request.form.get('target_type')
     scale = distance / simulated_distance
-    print(distance,simulated_distance_meters, simulated_distance, scale)
-    original_target_height= IPSC_TARGET_HEIGHT if target_type == 'ipsc' else  IDPA_TARGET_HEIGHT
+    original_target_height= (IPSC_TARGET_HEIGHT if target_type == 'ipsc' else IDPA_TARGET_HEIGHT if target_type == 'idpa' else POPPER_HEIGHT)
+    original_target_width= (IPSC_TARGET_WIDTH if target_type == 'ipsc' else IPSC_TARGET_WIDTH if target_type == 'idpa' else POPPER_WIDTH)
 
     rendered_html = render_template(
         'pdf_template_custom.html',
         distance=distance,
         size=size,
         target_height=scale * original_target_height,
-        target_width=scale * IPSC_TARGET_WIDTH,
+        target_width=scale * original_target_width,
         gap=scale * IPSC_GAP + scale * IPSC_TARGET_WIDTH,
         target_type=target_type,
         simulated_distance=simulated_distance_meters
diff --git a/templates/base.html b/templates/base.html
index 6be841d..722f5ae 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -44,7 +44,7 @@
             </a>
             <a href="{{ url_for('custom') }}"
                     class="{{ 'shadow-inner shadow-blue-900' if current_url == url_for('custom') else '' }} bg-blue-500 text-white py-2 px-4 rounded-md hover:bg-blue-600 transition-colors">
-                Custom
+                {% trans %}Custom distance{% endtrans %}
             </a>
             
         </div>
diff --git a/templates/custom.html b/templates/custom.html
index 11f2b27..019d817 100644
--- a/templates/custom.html
+++ b/templates/custom.html
@@ -1,19 +1,27 @@
 {% extends "base.html" %}
-{% block title %}El Presidente{% endblock %}
+{% block title %}{%trans%}Custom distance{%endtrans%}{% endblock %}
 {% block content %}
 
 
 <form class="" action="/generate-pdf-custom" method="post">
     {% include 'setup.html' %}
+    <div class="mb-6 max-w-2xl mx-auto mt-4">
+        <h2>{%trans%}Simulated distance{%endtrans%} [m]</h2>
+        <input type="number" id="simulated_distance" name="simulated_distance" min="1" max="300" class="w-full p-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-400" required>
+    </div>
     <div class="mb-6 max-w-2xl mx-auto">
-        <h2>{%trans%}Select the stage{%endtrans%}</h2>
-
-        <div class="mb-6 max-w-2xl mx-auto mt-4">
-            <h2>{%trans%}Simulated distance{%endtrans%} [m]</h2>
-            <input type="number" id="simulated_distance" name="simulated_distance" min="1" max="300" class="w-full p-2 border rounded-md focus:outline-none focus:ring-2 focus:ring-blue-400" required>
-        </div>
+        <h2>{%trans%}Select the target type{%endtrans%}</h2>
 
         <div id="stage" class="grid grid-cols-1 gap-4">
+            <div>
+                <label for="popper">
+                    <p>Popper</p>
+                    {% with target_width=3, target_height=8.5 %}
+                        {%include 'popper_svg.html'%}
+                    {% endwith %}
+                    <input type="radio" id="popper" name="target_type" value="popper" required>
+                </label>
+            </div>              
             <div>
                 <label for="ipsc">
                     <p>IPSC</p>
diff --git a/templates/pdf_template_custom.html b/templates/pdf_template_custom.html
index 0c56137..d3aa3f8 100644
--- a/templates/pdf_template_custom.html
+++ b/templates/pdf_template_custom.html
@@ -63,11 +63,13 @@
     <div class="page-break">
         <div class="content">
              {% with target_width=target_width, target_height=target_height %}
-                {%if target_type == 'ipsc' %}
+                {% if target_type == 'ipsc' %}
                     {%include 'ipsc_svg.html'%}
-                {%else%}
+                {% elif target_type == 'idpa' %}
                     {%include 'idpa_svg.html'%}
-                {%endif%}
+                {% else %}
+                    {% include 'popper_svg.html'%}
+                {% endif%}
             {% endwith %}
             <br>
             <div class="mounting-info">
diff --git a/templates/popper_svg.html b/templates/popper_svg.html
new file mode 100644
index 0000000..750217b
--- /dev/null
+++ b/templates/popper_svg.html
@@ -0,0 +1,3 @@
+<svg style="display: block; margin: auto;" width="{{target_width}}cm" height="{{target_height}}cm" viewBox="0 0 300 850" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 150a1 1 0 11300 0 1 1 0 11-300 0zm53 114 194 0-22 586-150 0-22-586" fill="dodgerblue"/>
+</svg>
\ No newline at end of file
diff --git a/templates/setup.html b/templates/setup.html
index a1846ea..b8aaad8 100644
--- a/templates/setup.html
+++ b/templates/setup.html
@@ -5,7 +5,7 @@
                class="cursor-pointer border-2 border-transparent rounded-lg overflow-hidden transition-all hover:border-blue-400">
             <img src="{{ url_for('static', filename='images/floor.webp') }}" alt="{%trans%}Distance from wall{%endtrans%}"
                  class="w-40 h-auto">
-        <input type="radio" id="floor" name="distance_type" value="floor" required>
+        <input type="radio" id="floor" name="distance_type" value="floor" required checked>
         </label>
         {% if current_url != url_for('custom') %}
             <label for="wall"
@@ -29,7 +29,7 @@
                class="cursor-pointer border-2 border-transparent rounded-lg overflow-hidden transition-all hover:border-blue-400">
             <img src="{{ url_for('static', filename='images/a4.webp') }}" alt="A4 (210mm x 297mm)"
                  class="w-40 h-auto">
-        <input type="radio" id="a4" name="size" value="a4" required>
+        <input type="radio" id="a4" name="size" value="a4" required checked>
         </label>
         <label for="a3"
                class="cursor-pointer border-2 border-transparent rounded-lg overflow-hidden transition-all hover:border-blue-400">
diff --git a/translations/pl/LC_MESSAGES/messages.mo b/translations/pl/LC_MESSAGES/messages.mo
index 9420a6bfd21d57920f097a5c9a7a5609dcfac2f7..05724a0e7527a1bee984cb98f8af0dacdda94c07 100644
GIT binary patch
delta 503
zcmYk&ze~eF6u|M<CR$r9)%c@|9g2hhf)0X%i<2l$P8ym}3YtorA{C`ew^q?XT<RvB
zDhQG4QWOV4q#|esmric#|KRs%29I1mdGB%eE?0{mPnNodekP15W`g;pf`6kC5Q!0A
z;Q+SKz$a|tCl29Bu$R9;llU6dIztoLz!_Y{1AN6cQZGqO7a1nezzJ+&5kLI=N?&i|
zO&lSg!+tE|AXab;&oP1xoW)y=Vi%t|<PWO-n;{V%Y4eKHUpjo;k@!Wmpw4e9Z&025
z5vMT`7Fox6T*fNCVF%R>)akAc<l!jZ;~~D|IIdAtH<$L^M{SYBk)Jq4)#wsgBM&%-
zFMh14E=z^Ho83uTnY?Q{Dch?CqFUI@rENFq7I(dh{vC`Zos6x@mYK7%dqvL)1vNco
LZx_6+$U@)`cH2eJ

delta 424
zcmYk&F-t;G6u|NGo-dzT4^0XMgSM8!p~b1K;SCXj7`P?qX5=P8VIM#f2XoQU!TEtS
zgu9D4I0;(#5rP&c|A*(`h5LT@oOihQp8JvPCF-lV)e%O5dB&V;us0fpNQk(Jas0#)
z4)F*dO+WvHMdEji;u;J1hgrM}h)l7M`oCg{#6;@y%HoAY(@%(f;BT13WAc|6#2Y-s
zTRg!mMzD+*SVafBIN@>ww27bjXmd6E!WL?sOIHr(%L5C&X$ey}#vCrt#dKI?hBefV
zT~5`D<naxQc#1!$FZ91NL=nwO3N?R@y8ks&BKMflrzq?aZS=kkC*b{BOVgX%8`E1y
Gu8b|^J1hDC

diff --git a/translations/pl/LC_MESSAGES/messages.po b/translations/pl/LC_MESSAGES/messages.po
index 111a130..3c82e1f 100644
--- a/translations/pl/LC_MESSAGES/messages.po
+++ b/translations/pl/LC_MESSAGES/messages.po
@@ -83,4 +83,10 @@ msgid "Place target on"
 msgstr "Umieść cel w odległości"
 
 msgid "Target"
-msgstr "Cel"
\ No newline at end of file
+msgstr "Cel"
+
+msgid "Custom distance"
+msgstr "Dystans niestandardowy"
+
+msgid "Select the target type"
+msgstr "Wybierz rodzaj celu"
\ No newline at end of file