piket_client/gui.py

@@ -5,6 +5,7 @@ import collections
 import logging
 import os
 import sys
+from math import ceil, sqrt
 
 import qdarkstyle
 
@@ -148,7 +149,8 @@ class NameButtons(QWidget):
         LOG.debug("Initializing NameButtons.")
 
         ps = Person.get_all(True)
-        num_columns = round(len(ps) / 10) + 1
+        # num_columns = round(len(ps) / 10) + 1
+        num_columns = min(5, ceil(sqrt(len(ps))))
 
         if self.layout:
             LOG.debug("Removing %s widgets for rebuild", self.layout.count())

piket_server/__init__.py

@@ -4,6 +4,7 @@ Piket server, handles events generated by the client.
 
 import datetime
 import os
+from collections import defaultdict
 
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy import func
@@ -49,7 +50,7 @@ class Person(db.Model):
                 .filter_by(consumption_type=ct)
                 .filter_by(reversed=False)
                 .count()
-                for ct in ConsumptionType.query.all()
+                for ct in ConsumptionType.query.filter_by(active=True).all()
             },
         }
 
@@ -253,13 +254,43 @@ def status() -> None:
 @app.route("/people", methods=["GET"])
 def get_people():
     """ Return a list of currently known people. """
-    people = Person.query.order_by(Person.name).all()
     q = Person.query.order_by(Person.name)
     if request.args.get("active"):
         active_status = request.args.get("active", type=int)
         q = q.filter_by(active=active_status)
     people = q.all()
-    result = [person.as_dict for person in people]
+
+    engine = db.get_engine()
+    query = '''
+        SELECT
+            consumptions.person_id,
+            consumptions.consumption_type_id,
+            COUNT(*)
+        FROM consumptions
+        JOIN consumption_types
+            ON consumptions.consumption_type_id = consumption_types.consumption_type_id
+        WHERE
+            consumptions.settlement_id IS NULL
+            AND consumptions.reversed = 0
+        GROUP BY consumptions.person_id, consumptions.consumption_type_id;
+    '''
+    raw_counts = engine.execute(query)
+
+    counts: 'Dict[int, Dict[str, int]]' = defaultdict(dict)
+    for person_id, consumption_type_id, count in raw_counts:
+        counts[person_id][str(consumption_type_id)] = count
+
+    result = [
+        {
+            "name": person.name,
+            "active": person.active,
+            "person_id": person.person_id,
+            "consumptions": counts[person.person_id]
+        }
+        for person in people
+    ]
+
+    # result = [person.as_dict for person in people]
     return jsonify(people=result)