Melhorias na página de rate_palestra. ref #3

CatarinaPBressan · Nov 4, 2015 · 60a4ec1 · 60a4ec1
1 parent 5b4b98d
commit 60a4ec1
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 22 deletions.
diff --git a/hotsite/rotas.py b/hotsite/rotas.py
@@ -36,17 +36,20 @@ def login():
     return redirect(url_for('auth.login'))
 
 
-@bp.route('/avaliar/<palestra>', methods=['GET', 'POST'])
+@bp.route('/palestras/<titulo_slug>', methods=['GET', 'POST'])
 @login_required
-def rate_palestra(palestra):
-    palestra = Palestra.query.get_or_404(palestra)
-    if request.method == 'POST':
+def rate_palestra(titulo_slug):
+    palestra = Palestra.query.filter_by(titulo_slug=titulo_slug).one()
+    palestra_aluno = PalestraAluno.query \
+        .filter_by(palestra_id=palestra.id, aluno_id=current_user.id) \
+        .first()
+    if request.method == 'POST' and not palestra_aluno:
         comentario = request.form['comentario']
         rating = int(request.form['rating'])
         palestra_aluno = PalestraAluno(palestra_id=palestra.id, rating=rating,
                                        comentario=comentario,
                                        aluno_id=current_user.id)
         db.session.add(palestra_aluno)
         db.session.commit()
-        return redirect(url_for('.index'))
-    return render_template('rate_palestra.html', palestra=palestra)
+    return render_template('rate_palestra.html', palestra=palestra,
+                           palestra_aluno=palestra_aluno)
diff --git a/hotsite/templates/index.html b/hotsite/templates/index.html
@@ -43,7 +43,7 @@
                 {{ palestra.autor }}
             </td>
             <td>
-                <a href="{{ url_for('palestras.rate_palestra', palestra=palestra.id) }}" >Avaliar </a>
+                <a href="{{ url_for('palestras.rate_palestra', titulo_slug=palestra.titulo_slug) }}" >Avaliar </a>
             </td>
         </tr>
     {% endfor %}
@@ -93,7 +93,7 @@
                             <ul class="nav navbar-nav navbar-right">
                                 <li class="active"><a class="page-scroll" href="#body-container">Home</a></li>
                                 <li class="active"><a class="page-scroll" href="#sobre">Sobre</a></li>
-                                <li><a class="page-scroll" href="#cursos">Cursos</a></li>
+                                <li><a class="page-scroll" href="#palestras">Palestras</a></li>
                                 <li><a class="page-scroll" href="#contact-section">Localização</a></li>
                             </ul>
                         </div>
@@ -142,7 +142,7 @@ <h1>Sobre a <span class="text-main">Semana Acadêmica</span></h1>
                     </div>
                     <div class="more-space-l"></div>
                 </section>
-                <section id="cursos" class="page">
+                <section id="palestras" class="page">
                     <div class="page-header-wrapper">
                         <div class="container">
                             <div class="page-header text-center wow fadeInUp" data-wow-delay="0.3s">

diff --git a/hotsite/templates/rate_palestra.html b/hotsite/templates/rate_palestra.html
@@ -44,19 +44,36 @@ <h2>{{ palestra.autor }}</h2>
                                     <p style="margin-bottom: 100px;">
                                         {{ palestra.bio_autor }}
                                     </p>
-                                    <h1 style="margin-bottom: 30px;">Dê a sua avaliação!</h1>
-                                    <form action="{{ url_for('palestras.rate_palestra', palestra=palestra.id) }}" method="POST">
-                                        <textarea name="comentario" class="form-control" rows="5" style="margin-bottom: 10px"></textarea>
-                                        <button type="submit" name="rating" value="-1" class="btn btn-danger">
-                                            <i class="fa fa-thumbs-down fa-3x" name="rating" value="1" style="color: white;"></i>
-                                        </button>
-                                        <span style="margin-left: 10px; margin-right: 10px;">
-                                        </span>
-                                        <button type="submit" name="rating" value="1" class="btn btn-success">
-                                            <i class="fa fa-thumbs-up fa-3x" name="rating" value="1" style="color: white;"></i>
-                                        </button>
-                                    </form>
-                                    <div class="more-space-m"></div>
+                                    {% if palestra_aluno %}
+                                        <h1>Obrigado por sua avaliação!</h1>
+                                        <p>
+                                            Sua avaliação:
+                                            {% if palestra_aluno.rating == 1 %}
+                                                <i class="fa fa-thumbs-up fa-3x"></i>
+                                            {% else %}
+                                                <i class="fa fa-thumbs-down fa-3x"></i>
+                                            {% endif %}
+                                        </p>
+                                        {% if palestra_aluno.comentario %}
+                                            <p>
+                                                Seu comentário: {{ palestra_aluno.comentario }}
+                                            </p>
+                                        {% endif %}
+                                    {% else %}
+                                        <h1 style="margin-bottom: 30px;">Dê a sua avaliação!</h1>
+                                        <form action="{{ url_for('palestras.rate_palestra', titulo_slug=palestra.titulo_slug) }}" method="POST">
+                                            <textarea name="comentario" class="form-control" rows="5" style="margin-bottom: 10px"></textarea>
+                                            <button type="submit" name="rating" value="-1" class="btn btn-danger">
+                                                <i class="fa fa-thumbs-down fa-3x" name="rating" value="1" style="color: white;"></i>
+                                            </button>
+                                            <span style="margin-left: 10px; margin-right: 10px;">
+                                            </span>
+                                            <button type="submit" name="rating" value="1" class="btn btn-success">
+                                                <i class="fa fa-thumbs-up fa-3x" name="rating" value="1" style="color: white;"></i>
+                                            </button>
+                                        </form>
+                                        <div class="more-space-m"></div>
+                                    {% endif %}
                                     <h3><a href="{{ url_for('index') }}"><i class="fa fa-chevron-left"></i> Voltar</a></h3>
                                 </div></div>
                             </div>