Add vote count to dashboard for eboard memebrs #67

Author: mbillow

conditional/blueprints/dashboard.py

@@ -22,6 +22,8 @@
 from conditional.models.models import HouseMeeting
 from conditional.models.models import CommitteeMeeting
 
+from conditional.blueprints.member_management import get_members_info
+
 from conditional.util.housing import get_queue_length, get_queue_position
 from conditional.util.flask import render_template
 
@@ -106,6 +108,9 @@ def display_dashboard():
     # Voting Status
     data['voting'] = bool(user_name in can_vote)
 
+    active_list = get_members_info()[0]
+    data['voting_count'] = {"Voting Members": len(can_vote),
+                            "Active Members": len(active_list)}
     # freshman shit
     if ldap_is_intromember(user_name):
         data['freshman'] = get_freshman_data(user_name)

conditional/blueprints/member_management.py

@@ -3,6 +3,7 @@
 import uuid
 
 from datetime import datetime
+from functools import lru_cache
 
 import structlog
 
@@ -50,7 +51,9 @@
 member_management_bp = Blueprint('member_management_bp', __name__)
 
 
-def get_members_info(members):
+@lru_cache(maxsize=1024)
+def get_members_info():
+    members = [m['uid'] for m in ldap_get_current_students()]
     member_list = []
     number_onfloor = 0
 
@@ -88,8 +91,7 @@ def display_member_management():
     if not ldap_is_eval_director(user_name) and not ldap_is_financial_director(user_name):
         return "must be eval director", 403
 
-    members = [m['uid'] for m in ldap_get_current_students()]
-    member_list, onfloor_number = get_members_info(members)
+    member_list, onfloor_number = get_members_info()
 
     freshmen = FreshmanAccount.query
     freshmen_list = []

conditional/templates/dashboard.html

@@ -194,6 +194,35 @@ <h3 class="panel-title">Conditionals</h3>
             </div>
             {% endif %}
 
+
+            {% if is_eboard %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Member Statistics</h3>
+                </div>
+                <div class="panel-body table-fill">
+                    <div class="table-responsive">
+                        <table class="table table-striped no-bottom-margin">
+                            <tbody>
+                            <tr>
+                                <th>Category</th>
+                                <th><span class="pull-right">Members</span></th>
+                            </tr>
+                            {% for title in voting_count %}
+                            <tr>
+                                <td>{{ title }}</td>
+                                <td><span class="pull-right">{{ voting_count[title] }}</span></td>
+                            </tr>
+                            {% endfor %}
+                            </tbody>
+                        </table>
+
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+
+
             {% if major_projects_count == 0 and not active%}
             <div class="alert alert-warning" role="alert"> <span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"> </span> You have no major projects.</div>
             {% elif major_projects_count > 0 %}