Progress...

member_map.py

@@ -16,6 +16,11 @@ def payment_slip_delivered(member: models.Members, year: int):
              .filter(models.Deliveries.member_id == member.id, extract('year', models.Deliveries.delivery_date) == year)\
              .count()
 
+def payment_made(member: models.Members, year: int):
+    return db.query(models.Payments.payment_date)\
+             .filter(models.Payments.member_id == member.id, extract('year', models.Deliveries.delivery_date) == year)\
+             .count()
+
 def update_missing_locs():
     members = db.query(models.Members).filter(models.Members.member_geo_latitude == None).all()
 
@@ -90,23 +95,26 @@ marker_cluster = MarkerCluster().add_to(map)
 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)
         
         iconColor = "blue"
         hasMail = checkEmail(member.member_email)
-        if hasMail:
-            iconColor = "orange"
+        if not paid:
+            iconColor = "red"
         elif delivered:
             iconColor = "green"
+        elif hasMail:
+            iconColor = "orange"
 
-        if hasMail and delivered:
-            iconColor = "darkgreen"
+        # if hasMail and delivered:
+        #     iconColor = "darkgreen"
 
         #delivered = member.member_deliveries
         location = (member.member_geo_latitude, member.member_geo_longitude)
         folium.Marker(location=location,
-                        popup=f'{member.member_firstname} {member.member_surname}',
-                        tooltip=f'\nZugestellt' if delivered else 'Nicht zugestellt',
-                        icon=folium.Icon(color=iconColor))\
+                      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',
+                      icon=folium.Icon(color=iconColor))\
         .add_to(marker_cluster)
 
 #Display the map