SMTL

commit f65c8ada06c5d7df85ce7962addabad724deb717
parent f3c19b2deef4cb56e17905da00a6bbb93b1ad4a8
Author: Oshgnacknak <osh@oshgnacknak.de>
Date:   Thu, 27 Jun 2019 15:32:55 +0100

merge first and last name

Diffstat:
M
smtl/models/player.py
 | 
11
+++--------
M
smtl/routes.py
 | 
5
++---
M
smtl/signup_form.py
 | 
16
++++------------
M
smtl/templates/player_table.html
 | 
2
+-
M
smtl/templates/signup_form.html
 | 
2
+-

5 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/smtl/models/player.py b/smtl/models/player.py
@@ -8,13 +8,8 @@ class Player(db.Model):
         nullable=False
     )
 
-    firstname = db.Column(
-        db.String(30),
-        nullable=False
-    )
-
-    lastname = db.Column(
-        db.String(30),
+    name = db.Column(
+        db.String(60),
         nullable=False
     )
 
@@ -33,4 +28,4 @@ class Player(db.Model):
     )
 
     def __repr__(self):
-        return f'Player@{self.id}({self.firstname} {self.lastname})'
+        return f'Player@{self.id}({self.name})'
diff --git a/smtl/routes.py b/smtl/routes.py
@@ -15,8 +15,7 @@ def signup():
     form = SignupForm(request.form)
     if form.validate():
         p = Player(
-            firstname=form.data['firstname'],
-            lastname=form.data['lastname'],
+            name=form.data['name'],
             club=form.data['club'],
             email=form.data['email'],
             dwz=form.data['dwz']
@@ -28,7 +27,7 @@ def signup():
         except SQLAlchemyError as e:
             print(e, file=sys.stderr)
             return 'Database Error!', 500
-        flash(f'{p.firstname} {p.lastname} wurde hinzugefügt.')
+        flash(f'{p.name} wurde hinzugefügt.')
     else:
         for messages in form.errors.values():
             for message in messages:
diff --git a/smtl/signup_form.py b/smtl/signup_form.py
@@ -4,19 +4,11 @@ import re
 
 
 class SignupForm(Form):
-	firstname = TextField(
-		label='Vorname:',
+	name = TextField(
+		label='Name:',
 		validators=[
-			DataRequired('Der Vorname darf nicht leer sein.'),
-			Length(max=30, message='Der Vorname ist zu lang.')
-		]
-	)
-
-	lastname = TextField(
-		label='Nachname:',
-		validators=[
-			DataRequired('Der Nachname darf nicht leer sein.'),
-			Length(max=30, message='Der Nachname ist zu lang.')
+			DataRequired('Der Name darf nicht leer sein.'),
+			Length(max=60, message='Der Vorname ist zu lang.')
 		]
 	)
 
diff --git a/smtl/templates/player_table.html b/smtl/templates/player_table.html
@@ -7,7 +7,7 @@
     </tr>
     {% for player in players %}
       <tr>
-        <td>{{ player.firstname }} {{ player.lastname }}</td>
+        <td>{{ player.name }}</td>
         <td>{{ player.club }}</td>
         <td>{{ player.dwz }}</td>
       </tr>
diff --git a/smtl/templates/signup_form.html b/smtl/templates/signup_form.html
@@ -1,6 +1,6 @@
 <form action="/signup" id="signup_form" method="POST">
   <table>
-    {% for field in [form.firstname, form.lastname, form.club, form.dwz, form.email] %}
+    {% for field in [form.name, form.club, form.dwz, form.email] %}
       <tr>
         <td>{{ field.label }}</td>
         <td>{{ field }}</td>