#6: General enhancements

sustApp/member_map.py

@@ -9,7 +9,7 @@ from sqlalchemy import *
 import logging
 import webbrowser
 import re
-
+from config_loader import load_config
 
 def payment_slip_delivered(member: models.Members, year: int):
     return db.query(models.Deliveries.delivery_date)\
@@ -52,6 +52,9 @@ def checkEmail(email):
     else:
         return False
 
+cfg = load_config()
+year = cfg['year']
+
 logger = logging.getLogger(__name__)
 
 #geolocator = Nominatim(user_agent="sust", timeout=10)
@@ -92,8 +95,8 @@ marker_cluster = MarkerCluster().add_to(map)
 #folium.Marker([lat, lon], popup=str(name)+': '+color+'-'+str(clname), icon=folium.Icon(color='black',icon_color='#FFFF00')).add_to(feature_group)
 for member in members:
     if member.member_geo_latitude != None and member.member_geo_latitude != None:
-        delivered = payment_slip_delivered(member, 2024)
-        paid = payment_made(member, 2024)
+        delivered = payment_slip_delivered(member, year)
+        paid = payment_made(member, year)
         
         iconColor = "blue"
         hasMail = checkEmail(member.member_email)
@@ -111,7 +114,10 @@ for member in members:
         location = (member.member_geo_latitude, member.member_geo_longitude)
         folium.Marker(location=location,
                       popup=f'{member.member_firstname} {member.member_surname}',
-                      tooltip=f'\nZugestellt & bezahlt' if (delivered and paid) else 'Nicht bezahlt' if not paid else 'Nicht zugestellt',
+                      tooltip=f'\nZugestellt & bezahlt' if (delivered and paid) else
+                               'Nicht zugestellt' if not delivered else
+                               'Zugestellt, aber nicht bezahlt' if delivered and not paid else 
+                               'Weder zugestellt, noch bezahlt',
                       icon=folium.Icon(color=iconColor))\
         .add_to(marker_cluster)