diff --git a/cao_sunyata/models/entries.py b/cao_sunyata/models/entries.py index 805c571..a1ec9bd 100644 --- a/cao_sunyata/models/entries.py +++ b/cao_sunyata/models/entries.py @@ -39,12 +39,21 @@ def get_entries_by_id(request, _id): results = request.dbsession.execute(text(query), {'id':_id}).first() return results -def get_entries_count_by_topic(request): - query = """SELECT topics.topic_name, tags.tag_name, count(entries.id) as count, strftime('%d/%m/%Y', created) AS create_date - FROM entries - INNER JOIN topics ON entries.topic_id = topics.topic - INNER JOIN tags ON entries.tag = tags.tag - GROUP BY entries.tag ORDER BY entries.topic_id, entries.tag;""" +def get_entries_last_viewed(request): + query = """SELECT strftime('%d/%m/%Y', view_date) AS last_viewed, title, view_count + FROM entries WHERE topic_id <> '_admin' ORDER BY view_date DESC LIMIT 20;""" + results = request.dbsession.execute(text(query),).fetchall() + return results + +def get_entries_most_viewed(request): + query = """SELECT strftime('%d/%m/%Y', view_date) AS date_viewed, title, view_count + FROM entries WHERE topic_id <> '_admin' ORDER BY view_count DESC LIMIT 20;""" + results = request.dbsession.execute(text(query),).fetchall() + return results + +def get_entries_last_created(request): + query = """SELECT strftime('%d/%m/%Y', created) AS last_created, title, view_count + FROM entries WHERE topic_id <> '_admin' ORDER BY created DESC LIMIT 20;""" results = request.dbsession.execute(text(query),).fetchall() return results diff --git a/cao_sunyata/templates/layout.jinja2 b/cao_sunyata/templates/layout.jinja2 index 7cc5358..fe05645 100644 --- a/cao_sunyata/templates/layout.jinja2 +++ b/cao_sunyata/templates/layout.jinja2 @@ -188,6 +188,8 @@ {% endif %}
| Topic | -Tag | -Nombre | -Dern. ajout | -
|---|---|---|---|
| {{ entry.topic_name }} | -{{ entry.tag_name }} | -{{ entry.count }} | -{{ entry.create_date }} | -
+ {% for entry in last_viewed %}
+ {{ entry.last_viewed }} - {{ entry.title }} - ({{ entry.view_count }})
+ {% endfor %}
+
+ {% for entry in last_created %}
+ {{ entry.last_created }} - {{ entry.title }} - ({{ entry.view_count }})
+ {% endfor %}
+
+ {% for entry in most_viewed %}
+ {{ entry.view_count }} - {{ entry.title }} - {{ entry.date_viewed }}
+ {% endfor %}
+