GUI update

Rebuild mostly

piket_client/gui.py

@@ -1,6 +1,7 @@
 """
 Provides the graphical front-end for Piket.
 """
+import logging
 import os
 import sys
 
@@ -18,7 +19,7 @@ from PySide2.QtWidgets import (
     QWidget,
 )
 from PySide2.QtGui import QIcon
-from PySide2.QtCore import QSize, Qt, QObject, Signal, Slot
+from PySide2.QtCore import QObject, QSize, Qt, Signal, Slot
 
 # pylint: enable=E0611
 
@@ -29,6 +30,9 @@ except ImportError:
 
 from piket_client.sound import PLOP_WAVE
 from piket_client.model import Person, ConsumptionType
+import piket_client.logger
+
+LOG = logging.getLogger(__name__)
 
 
 def plop() -> None:
@@ -49,16 +53,21 @@ class NameButton(QPushButton):
         self.clicked.connect(self.process_click)
 
     @Slot(str)
-    def new_active_id(self, new_id: str):
+    def new_active_id(self, new_id: str) -> None:
+        """ Change the active ConsumptionType id, update the label. """
         self.active_id = new_id
         self.setText(self.current_label)
 
-    @property
-    def active_consumption_type_id(self) -> str:
-        return self.parent().active_consumption_type_id
+    @Slot()
+    def rebuild(self) -> None:
+        """ Refresh the Person object and the label. """
+        self.person = self.person.reload()
+        self.setText(self.current_label)
 
     @property
     def current_count(self) -> int:
+        """ Return the count of the currently active ConsumptionType for this
+        Person. """
         return self.person.consumptions.get(self.active_id, 0)
 
     @property
@@ -81,29 +90,44 @@ class NameButtons(QWidget):
 
     new_id_set = Signal(str)
 
-    def __init__(self, consumption_type_id) -> None:
+    def __init__(self, consumption_type_id: str) -> None:
         super().__init__()
 
         self.layout = None
+        self.layout = QGridLayout()
+        self.setLayout(self.layout)
         self.active_consumption_type_id = consumption_type_id
         self.init_ui()
 
     @Slot(str)
     def consumption_type_changed(self, new_id: str):
+        """ Process a change of the consumption type and propagate to the
+        contained buttons. """
         self.active_consumption_type_id = new_id
         self.new_id_set.emit(new_id)
 
     def init_ui(self) -> None:
         """ Initialize UI: build GridLayout, retrieve People and build a button
         for each. """
-        self.layout = QGridLayout()
 
-        for index, person in enumerate(Person.get_all()):
+        ps = Person.get_all()
+        num_columns = round(len(ps) / 10) + 1
+
+        if self.layout:
+            LOG.debug("Removing %s widgets for rebuild", self.layout.count())
+            for index in range(self.layout.count()):
+                item = self.layout.itemAt(0)
+                LOG.debug("Removing item %s: %s", index, item)
+                if item:
+                    w = item.widget()
+                    LOG.debug("Person %s", w.person)
+                    self.layout.removeItem(item)
+                    w.deleteLater()
+
+        for index, person in enumerate(ps):
             button = NameButton(person, self.active_consumption_type_id, self)
             self.new_id_set.connect(button.new_active_id)
-            self.layout.addWidget(button, index // 2, index % 2)
-
-        self.setLayout(self.layout)
+            self.layout.addWidget(button, index // num_columns, index % num_columns)
 
 
 class PiketMainWindow(QMainWindow):
@@ -157,7 +181,40 @@ class PiketMainWindow(QMainWindow):
         ag = QActionGroup(self.toolbar)
         ag.setExclusive(True)
 
-        for ct in ConsumptionType.get_all():
+        cts = ConsumptionType.get_all()
+        if not cts:
+            self.show_keyboard()
+            name, ok = QInputDialog.getItem(
+                self,
+                "Consumptietype toevoegen",
+                (
+                    "Dit lijkt de eerste keer te zijn dat Piket start. Wat wil je "
+                    "tellen? Je kunt later meer typen toevoegen."
+                ),
+                ["Bier", "Wijn", "Cola"],
+                current=0,
+                editable=True,
+            )
+            self.hide_keyboard()
+
+            if ok and name:
+                c_type = ConsumptionType(name=name)
+                c_type = c_type.create()
+
+                cts.append(c_type)
+
+            else:
+                QMessageBox.critical(
+                    self,
+                    "Kan niet doorgaan",
+                    (
+                        "Je drukte op 'Annuleren' of voerde geen naam in, dus ik"
+                        "sluit af."
+                    ),
+                )
+                sys.exit()
+
+        for ct in cts:
             action = QAction(self.load_icon(ct.icon or "beer_bottle.svg"), ct.name, ag)
             action.setCheckable(True)
             action.setData(str(ct.consumption_type_id))
@@ -202,10 +259,9 @@ class PiketMainWindow(QMainWindow):
         self.hide_keyboard()
         if ok and name:
             person = Person(name=name)
-            person = person.save()
+            person = person.create()
 
-            self.main_widget = NameButtons()
-            self.setCentralWidget(self.main_widget)
+            self.main_widget.init_ui()
 
     @staticmethod
     def create_spacer() -> QWidget: