Merge branch 'master' into 138_New_map_client

2022-04-19 14:08:20 +02:00
parent bdb9f74aca 1ea4cb7297
commit 3075ca8fec
57 changed files with 1132 additions and 401 deletions
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -102,14 +102,7 @@
            {% include 'konova/includes/parcels.html' %}
        </div>
        <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-6">
-                <h4>{% trans 'Open in browser' %}</h4>
-                {{ qrcode|safe }}
-            </div>
-            <div class="col-sm-6 col-md-6 col-lg-6">
-                <h4>{% trans 'View in LANIS' %}</h4>
-                {{ qrcode_lanis|safe }}
-            </div>
+            {% include 'konova/includes/report/qrcodes.html' %}
        </div>

    </div>