rush

piket_client/gui.py

@@ -6,6 +6,7 @@ import logging
 import os
 import sys
 
+import qdarkstyle
 # pylint: disable=E0611
 from PySide2.QtWidgets import (
     QAction,
@@ -147,6 +148,7 @@ class PiketMainWindow(QMainWindow):
         super().__init__()
 
         self.main_widget = None
+        self.dark_theme = True
         self.toolbar = None
         self.osk = None
         self.undo_action = None
@@ -171,7 +173,7 @@ class PiketMainWindow(QMainWindow):
         self.setWindowState(Qt.WindowActive | Qt.WindowFullScreen)
 
         font_metrics = self.fontMetrics()
-        icon_size = font_metrics.height() * 2
+        icon_size = font_metrics.height() * 1.45
 
         # Initialize toolbar
         self.toolbar = QToolBar()
@@ -180,8 +182,11 @@ class PiketMainWindow(QMainWindow):
 
         # Left
         self.toolbar.addAction(
-            self.load_icon("add_person.svg"), "Nieuw persoon", self.add_person
+            self.load_icon("add_person.svg"), "+ Naam", self.add_person
         )
+        self.toolbar.addAction(
+            self.load_icon("add_consumption_type.svg"), "+ Lijst",
+            self.add_consumption_type)
         self.undo_action = self.toolbar.addAction(
             self.load_icon("undo.svg"), "Oeps", self.do_undo
         )
@@ -194,8 +199,8 @@ class PiketMainWindow(QMainWindow):
         self.toolbar.addWidget(self.create_spacer())
 
         # Right
-        ag = QActionGroup(self.toolbar)
-        ag.setExclusive(True)
+        self.ct_ag = QActionGroup(self.toolbar)
+        self.ct_ag.setExclusive(True)
 
         cts = ConsumptionType.get_all()
         if not cts:
@@ -231,18 +236,19 @@ class PiketMainWindow(QMainWindow):
                 sys.exit()
 
         for ct in cts:
-            action = QAction(self.load_icon(ct.icon or "beer_bottle.svg"), ct.name, ag)
+            action = QAction(self.load_icon(ct.icon or "beer_bottle.svg"),
+                    ct.name, self.ct_ag)
             action.setCheckable(True)
             action.setData(str(ct.consumption_type_id))
 
-        ag.actions()[0].setChecked(True)
-        [self.toolbar.addAction(a) for a in ag.actions()]
-        ag.triggered.connect(self.consumption_type_change)
+        self.ct_ag.actions()[0].setChecked(True)
+        [self.toolbar.addAction(a) for a in self.ct_ag.actions()]
+        self.ct_ag.triggered.connect(self.consumption_type_change)
 
         self.addToolBar(self.toolbar)
 
         # Initialize main widget
-        self.main_widget = NameButtons(ag.actions()[0].data(), self)
+        self.main_widget = NameButtons(self.ct_ag.actions()[0].data(), self)
         self.consumption_type_changed.connect(self.main_widget.consumption_type_changed)
         self.setCentralWidget(self.main_widget)
 
@@ -289,6 +295,30 @@ class PiketMainWindow(QMainWindow):
 
             self.main_widget.init_ui()
 
+    def add_consumption_type(self) -> None:
+        self.show_keyboard()
+        name, ok = QInputDialog.getItem(
+            self,
+            "Lijst toevoegen",
+            "Wat wil je strepen?",
+            ["Wijn", "Radler"]
+        )
+        self.hide_keyboard()
+
+        if ok and name:
+            ct = ConsumptionType(name=name)
+            ct = ct.create()
+
+            action = QAction(
+                self.load_icon(ct.icon or "beer_bottle.svg"),
+                ct.name,
+                self.ct_ag
+            )
+            action.setCheckable(True)
+            action.setData(str(ct.consumption_type_id))
+
+            self.toolbar.addAction(action)
+
     def confirm_quit(self) -> None:
         """ Ask for confirmation that the user wishes to quit, then do so. """
         ok = QMessageBox.warning(
@@ -328,6 +358,7 @@ class PiketMainWindow(QMainWindow):
         self.undo_queue.append(consumption)
         self.undo_action.setDisabled(False)
 
+
     @staticmethod
     def create_spacer() -> QWidget:
         """ Return an empty QWidget that automatically expands. """
@@ -337,17 +368,21 @@ class PiketMainWindow(QMainWindow):
 
     icons_dir = os.path.join(os.path.dirname(__file__), "icons")
 
-    @classmethod
-    def load_icon(cls, filename: str) -> QIcon:
+    def load_icon(self, filename: str) -> QIcon:
         """ Return a QtIcon loaded from the given `filename` in the icons
         directory. """
 
-        return QIcon(os.path.join(cls.icons_dir, filename))
+        if self.dark_theme:
+            filename = 'white_' + filename
+
+        icon = QIcon(os.path.join(self.icons_dir, filename))
+        return icon
 
 
 def main() -> None:
     """ Main entry point of GUI client. """
     app = QApplication(sys.argv)
+    app.setStyleSheet(qdarkstyle.load_stylesheet_pyside2())
     font = app.font()
     size = font.pointSize()
     font.setPointSize(size * 1.75)

piket_client/icons/white_add_consumption_type.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4"
+   version="1.1"
+   viewBox="0 0 384 512"
+   role="img"
+   class="svg-inline--fa fa-file-medical fa-w-12"
+   data-icon="file-medical"
+   data-prefix="fas"
+   aria-hidden="true">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:#ffffff;fill-opacity:1"
+     id="path2"
+     d="M377 105L279.1 7c-4.5-4.5-10.6-7-17-7H256v128h128v-6.1c0-6.3-2.5-12.4-7-16.9zm-153 31V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm64 160v48c0 4.4-3.6 8-8 8h-56v56c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8v-56h-56c-4.4 0-8-3.6-8-8v-48c0-4.4 3.6-8 8-8h56v-56c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v56h56c4.4 0 8 3.6 8 8z"
+     fill="white" />
+</svg>

piket_client/icons/white_add_person.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   aria-hidden="true"
+   data-prefix="fas"
+   data-icon="user"
+   class="svg-inline--fa fa-user fa-w-14"
+   role="img"
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg4">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <path
+     style="fill:#ffffff;fill-opacity:1"
+     fill="white"
+     d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"
+     id="path2" />
+</svg>

piket_client/icons/white_quit.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   aria-hidden="true"
+   data-prefix="fas"
+   data-icon="sign-out-alt"
+   class="svg-inline--fa fa-sign-out-alt fa-w-16"
+   role="img"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="quit_white.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="861"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="-190.91525"
+     inkscape:cy="256"
+     inkscape:window-x="1280"
+     inkscape:window-y="18"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4" />
+  <path
+     fill="white"
+     d="M497 273L329 441c-15 15-41 4.5-41-17v-96H152c-13.3 0-24-10.7-24-24v-96c0-13.3 10.7-24 24-24h136V88c0-21.4 25.9-32 41-17l168 168c9.3 9.4 9.3 24.6 0 34zM192 436v-40c0-6.6-5.4-12-12-12H96c-17.7 0-32-14.3-32-32V160c0-17.7 14.3-32 32-32h84c6.6 0 12-5.4 12-12V76c0-6.6-5.4-12-12-12H96c-53 0-96 43-96 96v192c0 53 43 96 96 96h84c6.6 0 12-5.4 12-12z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>

piket_client/model.py

@@ -99,6 +99,7 @@ class Person(NamedTuple):
     @classmethod
     def get_all(cls, active=None) -> ["Person"]:
         """ Get all active People. """
+        active = int(active)
         req = requests.get(urljoin(SERVER_URL, "/people"),
                 params={'active':active})
 

piket_server/__init__.py

@@ -139,7 +139,8 @@ def get_people():
     people = Person.query.order_by(Person.name).all()
     q = Person.query.order_by(Person.name)
     if request.args.get('active'):
-        q = q.filter_by(active=bool(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]
     return jsonify(people=result)

piket_server/alembic.ini

@@ -2,7 +2,7 @@
 
 [alembic]
 # path to migration scripts
-script_location = alembic
+script_location = piket_server:alembic
 
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s

piket_server/seed.py

@@ -73,7 +73,7 @@ def cmd_load_persons(args) -> None:
         for row in reader:
             p = Person(
                 name=row['name'],
-                active=bool(row['active'])
+                active=bool(int(row['active']))
             )
             db.session.add(p)
 

setup.py

@@ -46,8 +46,9 @@ setup(
             ],
             'client': [
                 'PySide2',
-                'simpleaudio',
+                'qdarkstyle@https://github.com/ColinDuquesnoy/QDarkStyleSheet/tarball/d089f12f674c78285302e509745a68cc3fa4bb3b#sha256=83902ddd331b61036568c2d179fc302e5f448b5c6b2e2bd3dec4ffb76725c113',
                 'requests',
+                'simpleaudio',
             ],
             'osk': [
                 'dbus-python',