adding unread count when listing feeds, using count_by_feed for user management

2 files changed, 11 insertions, 3 deletions

diff --git a/pyaggr3g470r/views/feed.py b/pyaggr3g470r/views/feed.py
index f940e22d..d50d0883 100644
--- a/pyaggr3g470r/views/feed.py
+++ b/pyaggr3g470r/views/feed.py
@@ -23,9 +23,12 @@ feed_bp = Blueprint('feed', __name__, url_prefix='/feed')
 @login_required
 def feeds():
     "Lists the subscribed  feeds in a table."
+    art_contr = ArticleController(g.user.id)
     return render_template('feeds.html',
             feeds=FeedController(g.user.id).read(),
-            article_count=ArticleController(g.user.id).count_by_feed())
+            unread_article_count=art_contr.count_by_feed(readed=False),
+            article_count=art_contr.count_by_feed(),
+            )
 
 
 @feed_bp.route('/<int:feed_id>', methods=['GET'])
diff --git a/pyaggr3g470r/views/views.py b/pyaggr3g470r/views/views.py
index e0bd1dcb..a4e799cc 100644
--- a/pyaggr3g470r/views/views.py
+++ b/pyaggr3g470r/views/views.py
@@ -736,9 +736,14 @@ def user(user_id=None):
     """
     See information about a user (stations, etc.).
     """
-    user = User.query.filter(User.id == user_id).first()
+    user = UserController().get(id=user_id)
     if user is not None:
-        return render_template('/admin/user.html', user=user)
+        article_contr = ArticleController(user_id)
+        return render_template('/admin/user.html', user=user,
+                article_count=article_contr.count_by_feed(),
+                unread_article_count=article_contr.count_by_feed(readed=False),
+                )
+
     else:
         flash(gettext('This user does not exist.'), 'danger')
         return redirect(redirect_url())