# QR code
* refactors qr code generating into class * refactors usage of former qr code method calls
This commit is contained in:
@@ -14,7 +14,7 @@ from compensation.models import Compensation
|
||||
from konova.contexts import BaseContext
|
||||
from konova.forms import SimpleGeomForm
|
||||
from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
|
||||
from konova.utils.generators import generate_qr_code
|
||||
from konova.utils.qrcode import QrCode
|
||||
from konova.views.report import AbstractPublicReportView
|
||||
|
||||
|
||||
@@ -48,10 +48,14 @@ class CompensationPublicReportView(AbstractPublicReportView):
|
||||
)
|
||||
parcels = comp.get_underlying_parcels()
|
||||
|
||||
qrcode_url = request.build_absolute_uri(reverse("compensation:report", args=(id,)))
|
||||
qrcode_img = generate_qr_code(qrcode_url, 10)
|
||||
qrcode_lanis_url = comp.get_LANIS_link()
|
||||
qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
|
||||
qrcode = QrCode(
|
||||
content=request.build_absolute_uri(reverse("compensation:report", args=(id,))),
|
||||
size=10
|
||||
)
|
||||
qrcode_lanis = QrCode(
|
||||
content=comp.get_LANIS_link(),
|
||||
size=7
|
||||
)
|
||||
|
||||
# Order states by surface
|
||||
before_states = comp.before_states.all().order_by("-surface").prefetch_related("biotope_type")
|
||||
@@ -61,12 +65,12 @@ class CompensationPublicReportView(AbstractPublicReportView):
|
||||
context = {
|
||||
"obj": comp,
|
||||
"qrcode": {
|
||||
"img": qrcode_img,
|
||||
"url": qrcode_url,
|
||||
"img": qrcode.get_img(),
|
||||
"url": qrcode.get_content(),
|
||||
},
|
||||
"qrcode_lanis": {
|
||||
"img": qrcode_img_lanis,
|
||||
"url": qrcode_lanis_url,
|
||||
"img": qrcode_lanis.get_img(),
|
||||
"url": qrcode_lanis.get_content(),
|
||||
},
|
||||
"is_entry_shared": False, # disables action buttons during rendering
|
||||
"before_states": before_states,
|
||||
|
||||
@@ -14,7 +14,7 @@ from compensation.models import EcoAccount
|
||||
from konova.contexts import BaseContext
|
||||
from konova.forms import SimpleGeomForm
|
||||
from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
|
||||
from konova.utils.generators import generate_qr_code
|
||||
from konova.utils.qrcode import QrCode
|
||||
from konova.views.report import AbstractPublicReportView
|
||||
|
||||
|
||||
@@ -48,10 +48,14 @@ class EcoAccountPublicReportView(AbstractPublicReportView):
|
||||
)
|
||||
parcels = acc.get_underlying_parcels()
|
||||
|
||||
qrcode_url = request.build_absolute_uri(reverse("compensation:acc:report", args=(id,)))
|
||||
qrcode_img = generate_qr_code(qrcode_url, 10)
|
||||
qrcode_lanis_url = acc.get_LANIS_link()
|
||||
qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
|
||||
qrcode = QrCode(
|
||||
content=request.build_absolute_uri(reverse("compensation:acc:report", args=(id,))),
|
||||
size=10
|
||||
)
|
||||
qrcode_lanis = QrCode(
|
||||
content=acc.get_LANIS_link(),
|
||||
size=7
|
||||
)
|
||||
|
||||
# Order states by surface
|
||||
before_states = acc.before_states.all().order_by("-surface").select_related("biotope_type__parent")
|
||||
@@ -67,12 +71,12 @@ class EcoAccountPublicReportView(AbstractPublicReportView):
|
||||
context = {
|
||||
"obj": acc,
|
||||
"qrcode": {
|
||||
"img": qrcode_img,
|
||||
"url": qrcode_url,
|
||||
"img": qrcode.get_img(),
|
||||
"url": qrcode.get_content(),
|
||||
},
|
||||
"qrcode_lanis": {
|
||||
"img": qrcode_img_lanis,
|
||||
"url": qrcode_lanis_url,
|
||||
"img": qrcode_lanis.get_img(),
|
||||
"url": qrcode_lanis.get_content(),
|
||||
},
|
||||
"is_entry_shared": False, # disables action buttons during rendering
|
||||
"before_states": before_states,
|
||||
|
||||
Reference in New Issue
Block a user