pflaenz.li/pflaenz.li
3
1
Fork 0
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Handle multiple locations with same PLZ

Browse source
This commit is contained in:
Jannis Portmann 2023-10-15 17:28:16 +02:00
parent 565808fd95
commit 5040d139b5
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pflaenzli/pflaenzli/utils/distance.py
View file

@ -7,7 +7,10 @@ def calculate_distance(plz_1: Plz, plz_2: Plz):
if plz_1 == plz_2:
return 0
dist = round(distance((plz_1.lat, plz_1.lon), (plz_2.lat, plz_2.lon)).kilometers)
try:
dist = round(distance((plz_1.lat, plz_1.lon), (plz_2.lat, plz_2.lon)).kilometers)
except AttributeError:
return None
return None if dist > 400 else dist

11
pflaenzli/pflaenzli/views.py
View file

@ -59,8 +59,10 @@ def offer_detail(request, offer_id):
if offer.zipcode == request.user.zipcode:
dist = 0
else:
dist = calculate_distance(Plz.objects.filter(plz=offer.zipcode)[
0], Plz.objects.filter(plz=request.user.zipcode)[0])
user_plz = get_single_plz(request.user.zipcode)
offer_plz = get_single_plz(offer.zipcode)
dist = calculate_distance(offer_plz, user_plz)
else:
dist = None
else:
@ -194,6 +196,11 @@ def register_user(request):
return render(request, "basic_form.html", {"form": form, "button_label": _("Register"), "title": _("Registeration"), "umami_event": "User registration", "form_note": mark_safe(_('Please note the <a href="/imprint">privacy policy</a>'))})
def get_single_plz(plz):
p = Plz.objects.filter(plz=plz)
return p[0] if len(p) >= 1 else None
def save_language(request):
referer_url = request.META.get('HTTP_REFERER')
response = redirect(referer_url)