Merge branches 'master' and 'master' of git.closed.social:closed-social/pastExam

app.py

@@ -9,6 +9,7 @@
 
 from flask import Flask, request, render_template, send_from_directory, abort, redirect, session, url_for, send_file
 from flask_sqlalchemy import SQLAlchemy
+from sqlalchemy import func
 from flask_limiter import Limiter
 from flask_limiter.util import get_remote_address
 
@@ -178,9 +179,9 @@ def list(username):
     ps = ps.order_by(db.desc('like_num'))
     pagination = ps.paginate(max_per_page=100)
     curr_year = date.today().year
-    all_courses = [i for i, in db.session.query(Paper.course.distinct()).all()]
-    all_teachers = [i for i, in db.session.query(Paper.teacher.distinct()).all()]
-    all_years = [i for i, in db.session.query(Paper.year.distinct()).all()]
+    all_courses  = db.session.query(Paper.course,  func.count()).group_by(Paper.course).all()
+    all_teachers = db.session.query(Paper.teacher, func.count()).group_by(Paper.teacher).all()
+    all_years    = db.session.query(Paper.year,    func.count()).group_by(Paper.year).all()
     ipfs_version = hashlib.sha256(C.ipfs_base_url.encode('utf-8')).hexdigest()
     disable_upload = not C.allow_guest_upload and username.startswith('guest<')
     return render_template('list.html', **locals())

templates/list.html

@@ -139,21 +139,28 @@
     }
 
     .cate {
+      margin: 4px;
+      display: inline-block;
+    }
+
+    .cate a {
       display: inline-block;
       background-color: #444;
       color: white;
-      margin: 4px;
       padding: 2px 4px;
+      text-decoration: none;
     }
 
-    .cate.selected {
+    .cate.selected a {
       background-color: white;
       color: #444;
       border: 1px black solid;
     }
 
-    .cate a {
-      text-decoration: none;
+    .cate .count {
+      font-size: 12px;
+      vertical-align: bottom;
+      margin-left: -3px;
     }
 
     .footer {
@@ -341,8 +348,11 @@
 
           <div id="collapseOne" class="collapse {{'show' if has_course or ept else ''}}" data-parent="#accordion">
             <div class="card-body">
-              {% for c in all_courses %}
-              <span class="cate {{'selected' if c==course else ''}}"><a href="?course={{'' if c==course else c}}#part2">{{c}}</a></span>
+              {% for c, count in all_courses %}
+              <span class="cate {{'selected' if c==course else ''}}">
+                <a href="?course={{'' if c==course else c}}#part2">{{c}}</a>
+                <span class="count">({{count}})</span>
+              </span>
               {% endfor %}
             </div>
           </div>
@@ -357,8 +367,12 @@
           </div>
           <div id="collapseTwo" class="collapse {{'show' if has_teacher else ''}}" data-parent="#accordion">
             <div class="card-body">
-              {% for t in all_teachers %}
-              <span class="cate {{'selected' if t==teacher else ''}}"><a href="?teacher={{'' if t==teacher else t}}#part2">{{t}}</a></span>
+              {% for t, count in all_teachers %}
+              <span class="cate {{'selected' if t==teacher else ''}}">
+                <a href="?teacher={{'' if t==teacher else t}}#part2">{{t}}</a>
+                <span class="count">({{count}})</span>
+              </span>
+              </span>
               {% endfor %}
             </div>
           </div>
@@ -373,8 +387,12 @@
           </div>
           <div id="collapseThree" class="collapse {{'show' if has_year else ''}}" data-parent="#accordion">
             <div class="card-body">
-              {% for y in all_years %}
-              <span class="cate {{'selected' if y==year else ''}}"><a href="?year={{'' if y==year else y}}#part2">{{y or '/'}}</a></span>
+              {% for y, count in all_years %}
+              <span class="cate {{'selected' if y==year else ''}}">
+                <a href="?year={{'' if y==year else y}}#part2">{{y or '/'}}</a>
+                <span class="count">({{count}})</span>
+              </span>
+              </span>
               {% endfor %}
             </div>
           </div>