Merge branch 'develop' of https://git.ccom.uprrp.edu/jose.reyes46/upr_espera into develop

app/forms.py

@@ -0,0 +1,8 @@
+from flask_wtf import FlaskForm
+from wtforms import StringField, PasswordField, BooleanField, SubmitField
+from wtforms.validators import DataRequired
+
+class TurnForm(FlaskForm):
+    cName = StringField('Name', validators=[DataRequired()])
+    cEmail = StringField('Email', validators=[DataRequired()])
+    submit = SubmitField('Get turn')

app/index.py

@@ -6,39 +6,38 @@ from flask import (
 from werkzeug.exceptions import abort
 
 from app.db import get_db
+from app.forms import TurnForm
 
 bp = Blueprint('index', __name__)
 
 @bp.route('/', methods=('GET', 'POST'))
 def index():
-    if request.method == 'POST':
-        cName = request.form['cName']
-        cEmail = request.form['cEmail']
-        station_name = request.form['station']
+    form = TurnForm()
+    if form.validate_on_submit():
+        station_id = request.form['station']
 
         db = get_db()
-        station_query_res = db.execute(
-            'SELECT s_id FROM station WHERE nombre_empleado=?',
-            (station_name,)
-        ).fetchone()
-        if station_query_res is not None:
-            station_id = station_query_res[0]
         db.execute(
             'UPDATE station SET last_turn = last_turn + 1 WHERE s_id=?',
             (station_id,)
         )
-        turn_query_res = db.execute(
+        turn = db.execute(
             'SELECT last_turn FROM station WHERE s_id=?',
             (station_id,)
-        ).fetchone()
-        if turn_query_res is not None:
-            turn = turn_query_res[0]
+        ).fetchone()[0]
         db.execute(
             'INSERT INTO turno (cName, cEmail, turn, timeArrival, station)'
             ' VALUES (?, ?, ?, ?, ?)',
-            (cName, cEmail, turn, '{0:%H:%M}'.format(datetime.now()), station_id)
+            (form.cName.data, form.cEmail.data, turn, '{0:%H:%M}'.format(datetime.now()), station_id)
         )
+        station_info = db.execute(
+            'SELECT nombre_empleado, oficina FROM station WHERE s_id=?',
+            (station_id,)
+        ).fetchone()
         db.commit()
+
+        flash('Your turn for {} ({}) is number {}'.format(station_info['nombre_empleado'], station_info['oficina'],  turn))
+
         return redirect(url_for('index'))
 
     db = get_db()
@@ -46,4 +45,4 @@ def index():
         'SELECT s_id, nombre_empleado, oficina FROM station'
         ' ORDER BY oficina ASC'
     ).fetchall()
-    return render_template('index.html', stations=stations)
+    return render_template('index.html', stations=stations, form=form)

app/templates/base.html

@@ -6,7 +6,7 @@
         {% block header %}{% endblock %}
     </header>
     {% for message in get_flashed_messages() %}
-        <div class="flash">{{ message }}</div>
+        <div class="flash">{{ message }}</div><br>
     {% endfor %}
     {% block content %}{% endblock %}
 </section>

app/templates/index.html

@@ -5,14 +5,15 @@
 {% endblock %}
 
 {% block content %}
-    <form method="post">
-        <label for="cName">Name</label>
-        <input name="cName" id="name" required></input><br>
-		<label for="cEmail">email</label>
-        <input name="cEmail" id="email" required></input><br>
+    <form action="" method="post">
+        {{ form.hidden_tag() }}
+        {{ form.cName.label }}<br>
+        {{ form.cName }}<br>
+        {{ form.cEmail.label }}<br>
+        {{ form.cEmail }}<br>
 
         {% for station in stations %}
-            <input type="radio" name="station" id={{ "station{}".format(station['s_id']) }} value={{ station['nombre_empleado'] }}> {{ "{} ({})".format(station['nombre_empleado'],station['oficina']) }} </input><br>
+            <input type="radio" name="station" id={{ "station{}".format(station['s_id']) }} value={{ station['s_id'] }} required> {{ "{} ({})".format(station['nombre_empleado'],station['oficina']) }} </input><br>
         {% endfor %}
 
         <input type="submit" value="Get ticket">