Fixed page jump bug and added functionality after the top 20 quotes (#46)

* Fixed page jump bug and added functionality after the top 20 quotes

* Fixed page jump bug and added functionality after the top 20 quotes

Author: Vivian Nowka-Keane

quotefault/__init__.py

@@ -217,6 +217,7 @@ def get():
     elif metadata['speaker'] is not None:
         quotes = Quote.query.order_by(Quote.quote_time.desc()).filter(Quote.speaker == metadata['speaker']).all()
     else:
+        # collect all quote rows in the Quote db
         # quotes = Quote.query.order_by(Quote.quote_time.desc()).limit(20).all()
 
         # returns tuples with a quote and its net vote value
@@ -245,17 +246,26 @@ def get():
 @app.route('/additional', methods=['GET'])
 @auth.oidc_auth
 def additional_quotes():
-    quotes = Quote.query.order_by(Quote.quote_time.desc()).all()  # collect all quote rows in the Quote db
+
     metadata = get_metadata()
+
+    # returns tuples with a quote and its net vote value
+    quotes = db.session.query(Quote, func.sum(Vote.direction).label('votes')).outerjoin(Vote).group_by(Quote).order_by(
+        Quote.quote_time.desc()).all()
+
+    user_votes = db.session.query(Vote).filter(Vote.voter == metadata['uid']).all()
+
     if request.cookies.get('flag'):
         return render_template(
             'flag/additional_quotes.html',
             quotes=quotes[20:],
-            metadata=metadata
+            metadata=metadata,
+            user_votes=user_votes
         )
     else:
         return render_template(
             'bootstrap/additional_quotes.html',
             quotes=quotes[20:],
-            metadata=metadata
+            metadata=metadata,
+            user_votes=user_votes
         )

quotefault/templates/bootstrap/additional_quotes.html

@@ -1,7 +1,21 @@
-{% for quote in quotes %}
+{% for quote, votes in quotes %}
     <div class="card m-3">
         <div class="card-body">
             "{{ quote.quote }}" <b>- {{ get_display_name(quote.speaker) }}</b>
+            <div id="votes-{{ quote.id }}" class="upvote upvote-meta-stackoverflow">
+                <a class="upvote" id="upVote-{{ quote.id }}" onClick="makeVote({{ quote.id }}, 1)">
+                </a>
+                <span class="count">
+                    {% if votes %}
+                        {{ votes }}
+                    {% else %}
+                        0
+                    {% endif %}
+                </span>
+                <a class="downvote" id="downVote-{{ quote.id }}"
+                   onClick="makeVote({{ quote.id }}, -1)">
+                </a>
+            </div>
         </div>
         <div class="card-footer">
             Submitted by <a

quotefault/templates/bootstrap/storage.html

@@ -25,7 +25,7 @@
                 <div class="card-body">
                     "{{ quote.quote }}" <b>- {{ get_display_name(quote.speaker) }}</b>
                     <div id="votes-{{ quote.id }}" class="upvote upvote-meta-stackoverflow">
-                        <a href="#" class="upvote" id="upVote-{{ quote.id }}" onClick="makeVote({{ quote.id }}, 1)">
+                        <a class="upvote" id="upVote-{{ quote.id }}" onClick="makeVote({{ quote.id }}, 1)">
                         </a>
                         <span class="count">
                             {% if votes %}
@@ -34,7 +34,7 @@
                                 0
                             {% endif %}
                         </span>
-                        <a href="#" class="downvote" id="downVote-{{ quote.id }}"
+                        <a class="downvote" id="downVote-{{ quote.id }}"
                            onClick="makeVote({{ quote.id }}, -1)">
                         </a>
                     </div>