tire

piket_client/gui.py

@@ -117,7 +117,7 @@ class NameButtons(QWidget):
         """ Initialize UI: build GridLayout, retrieve People and build a button
         for each. """
 
-        ps = Person.get_all()
+        ps = Person.get_all(True)
         num_columns = round(len(ps) / 10) + 1
 
         if self.layout:
@@ -263,19 +263,29 @@ class PiketMainWindow(QMainWindow):
     def add_person(self) -> None:
         """ Ask for a new Person and register it, then rebuild the central
         widget. """
+        inactive_persons = Person.get_all(False)
+        inactive_persons.sort(key=lambda p: p.name)
+        inactive_names = [p.name for p in inactive_persons]
+
         self.show_keyboard()
         name, ok = QInputDialog.getItem(
             self,
             "Persoon toevoegen",
             "Voer de naam van de nieuwe persoon in, of kies uit de lijst.",
-            ["Cas", "Frenk"],
+            inactive_names,
             0,
             True,
         )
         self.hide_keyboard()
         if ok and name:
-            person = Person(name=name)
-            person = person.create()
+
+            if name in inactive_names:
+                person = inactive_persons[inactive_names.index(name)]
+                person.make_active()
+
+            else:
+                person = Person(name=name)
+                person = person.create()
 
             self.main_widget.init_ui()
 

piket_client/model.py

@@ -97,9 +97,10 @@ class Person(NamedTuple):
             return None
 
     @classmethod
-    def get_all(cls) -> ["Person"]:
+    def get_all(cls, active=None) -> ["Person"]:
         """ Get all active People. """
-        req = requests.get(urljoin(SERVER_URL, "/people"))
+        req = requests.get(urljoin(SERVER_URL, "/people"),
+                params={'active':active})
 
         try:
             data = req.json()

piket_server/__init__.py

@@ -29,6 +29,7 @@ class Person(db.Model):
 
     person_id = db.Column(db.Integer, primary_key=True)
     name = db.Column(db.String, nullable=False)
+    active = db.Column(db.Boolean, nullable=False, default=False)
 
     consumptions = db.relationship("Consumption", backref="person", lazy=True)
 
@@ -136,6 +137,10 @@ def ping() -> None:
 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'):
+        q = q.filter_by(active=bool(request.args.get('active')))
+    people = q.all()
     result = [person.as_dict for person in people]
     return jsonify(people=result)
 
@@ -189,6 +194,20 @@ def add_consumption(person_id: int):
 
     return jsonify(person=person.as_dict, consumption=consumption.as_dict), 201
 
+@app.route("/people/<int:person_id>", methods=["PATCH"])
+def update_person(person_id: int):
+    person = Person.query.get_or_404(person_id)
+
+    data = requests.json['person']
+
+    if 'active' in data:
+        person.active = data['active']
+
+        db.session.add(person)
+        db.session.commit()
+
+        return jsonify(person=person)
+
 
 @app.route("/people/<int:person_id>/add_consumption/<int:ct_id>", methods=["POST"])
 def add_consumption2(person_id: int, ct_id: int):

piket_server/alembic/versions/a09086bfe84c_create_persons_table.py

@@ -21,6 +21,7 @@ def upgrade():
         "people",
         sa.Column("person_id", sa.Integer, primary_key=True),
         sa.Column("name", sa.String, nullable=False),
+        sa.Column("active", sa.Boolean, server_default="FALSE", nullable=False),
     )
 
 

piket_server/seed.py

@@ -21,7 +21,10 @@ def main():
     parser_clear.add_argument("--removemydata", action="store_true")
 
     # Parser load_seeds
-    # TODO
+    parser_load_persons = subparsers.add_parser("load_persons",
+            help="Load Person data.")
+    parser_load_persons.set_defaults(func=cmd_load_persons)
+    parser_load_persons.add_argument('datafile')
 
     args = parser.parse_args()
     args.func(args)
@@ -59,6 +62,25 @@ def cmd_clear(args) -> None:
 
     print("Aborting.")
 
+def cmd_load_persons(args) -> None:
+    """ Entrypoint for 'load_persons" subcommand. """
+
+    print("Loading persons.")
+
+    with open(args.datafile) as csvfile:
+        reader = csv.DictReader(csvfile)
+
+        for row in reader:
+            p = Person(
+                name=row['name'],
+                active=bool(row['active'])
+            )
+            db.session.add(p)
+
+    db.session.commit()
+
+    print("Done.")
+
 
 if __name__ == "__main__":
     main()