Merge pull request #46 from ComputerScienceHouse/develop

stevenmirabito · web-flow · commit db0b9b611e73 · 2016-08-29T13:39:38.000-05:00
Conditional v1.0.2
diff --git a/conditional/blueprints/dashboard.py b/conditional/blueprints/dashboard.py
@@ -108,10 +108,9 @@ def display_dashboard():
         housing['points'] = ldap_get_housing_points(user_name)
         housing['room'] = ldap_get_room_number(user_name)
         if housing['room'] == "N/A":
-            housing['queue_pos'] = get_queue_position(user_name)
+            housing['queue_pos'] = "%s / %s" % (get_queue_position(user_name), get_queue_length())
         else:
-            housing['queue_pos'] = "On Floor"
-        housing['queue_len'] = get_queue_length()
+            housing['queue_pos'] = "N/A"
     else:
         housing = None
 
diff --git a/conditional/blueprints/intro_evals.py b/conditional/blueprints/intro_evals.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 import uuid
 import structlog
 
@@ -6,8 +7,12 @@
 from conditional.util.ldap import ldap_get_intro_members
 from conditional.util.ldap import ldap_get_name
 
+from conditional.models.models import FreshmanCommitteeAttendance
 from conditional.models.models import MemberCommitteeAttendance
+from conditional.models.models import FreshmanAccount
 from conditional.models.models import FreshmanEvalData
+from conditional.models.models import FreshmanHouseMeetingAttendance
+from conditional.models.models import FreshmanSeminarAttendance
 from conditional.models.models import MemberHouseMeetingAttendance
 from conditional.models.models import MemberSeminarAttendance
 from conditional.models.models import HouseMeeting
@@ -26,17 +31,68 @@ def display_intro_evals(internal=False):
     log.info('frontend', action='display intro evals listing')
 
     # get user data
-    def get_cm_count(member_id):
+    def get_uid_cm_count(member_id):
         return len([a for a in MemberCommitteeAttendance.query.filter(
             MemberCommitteeAttendance.uid == member_id)])
 
+    def get_fid_cm_count(member_id):
+        return len([a for a in FreshmanCommitteeAttendance.query.filter(
+            FreshmanCommitteeAttendance.fid == member_id)])
+
     user_name = None
     if not internal:
         user_name = request.headers.get('x-webauth-user')
 
     members = [m['uid'] for m in ldap_get_intro_members()]
 
     ie_members = []
+
+    # freshmen who don't have accounts
+    fids = [f for f in FreshmanAccount.query.filter(
+        FreshmanAccount.eval_date > datetime.now())]
+
+    for fid in fids:
+        h_meetings = [m.meeting_id for m in
+                      FreshmanHouseMeetingAttendance.query.filter(
+                          FreshmanHouseMeetingAttendance.fid == fid.id
+                      ).filter(
+                          FreshmanHouseMeetingAttendance.attendance_status == "Absent"
+                      )]
+        freshman = {
+            'name': fid.name,
+            'uid': fid.id,
+            'eval_date': fid.eval_date.strftime("%Y-%m-%d"),
+            'signatures_missed': 65535,
+            'committee_meetings': get_fid_cm_count(fid.id),
+            'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10,
+            'house_meetings_missed':
+                [
+                    {
+                        "date": m.date.strftime("%Y-%m-%d"),
+                        "reason":
+                            FreshmanHouseMeetingAttendance.query.filter(
+                                FreshmanHouseMeetingAttendance.fid == fid.id).filter(
+                                FreshmanHouseMeetingAttendance.meeting_id == m.id).first().excuse
+                    }
+                    for m in HouseMeeting.query.filter(
+                        HouseMeeting.id.in_(h_meetings)
+                    )
+                ],
+            'technical_seminars':
+                [s.name for s in TechnicalSeminar.query.filter(
+                    TechnicalSeminar.id.in_(
+                        [a.seminar_id for a in FreshmanSeminarAttendance.query.filter(
+                            FreshmanSeminarAttendance.fid == fid.id)]
+                    ))
+                 ],
+            'social_events': '',
+            'freshman_project': "Pending",
+            'comments': 'Does not have account yet',
+            'status': "Pending"
+        }
+        ie_members.append(freshman)
+
+    # freshmen who have accounts
     for member_uid in members:
         uid = member_uid[0].decode('utf-8')
         freshman_data = FreshmanEvalData.query.filter(
@@ -57,8 +113,8 @@ def get_cm_count(member_id):
             'uid': uid,
             'eval_date': freshman_data.eval_date.strftime("%Y-%m-%d"),
             'signatures_missed': freshman_data.signatures_missed,
-            'committee_meetings': get_cm_count(uid),
-            'committee_meetings_passed': get_cm_count(uid) >= 10,
+            'committee_meetings': get_uid_cm_count(uid),
+            'committee_meetings_passed': get_uid_cm_count(uid) >= 10,
             'house_meetings_missed':
                 [
                     {
diff --git a/conditional/blueprints/member_management.py b/conditional/blueprints/member_management.py
@@ -169,6 +169,10 @@ def member_management_adduser():
     onfloor_status = post_data['onfloor']
     room_number = post_data['roomNumber']
 
+    # empty room numbers should be NULL
+    if room_number == "":
+        room_number = None
+
     logger.info('backend', action="add f_%s as onfloor: %s with room_number: %s" % (name, onfloor_status, room_number))
     db.session.add(FreshmanAccount(name, onfloor_status, room_number))
     db.session.flush()
diff --git a/conditional/templates/attendance_cm.html b/conditional/templates/attendance_cm.html
@@ -1,7 +1,10 @@
 {% extends "nav.html" %}
+{% block title %}
+Directorship Meeting Attendance
+{% endblock %}
 {% block body %}
 <div class="container main">
-    <h3 class="page-title">Committee Attendance</h3>
+    <h3 class="page-title">Meeting Attendance</h3>
     <form data-module="attendanceForm" data-type="committee">
         <!-- Meeting Type -->
         <div class="row">
diff --git a/conditional/templates/attendance_hm.html b/conditional/templates/attendance_hm.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+House Meeting Attendance
+{% endblock %}
 {% block body %}
 <div class="container main">
     <h3>House Meeting Attendance</h3>
diff --git a/conditional/templates/attendance_ts.html b/conditional/templates/attendance_ts.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+Seminar Attendance
+{% endblock %}
 {% block body %}
 <div class="container main">
     <h3 class="page-title">Seminar Attendance</h3>
diff --git a/conditional/templates/conditional.html b/conditional/templates/conditional.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+Conditionals
+{% endblock %}
 {% block extraFooter %}
 <script src="../static/js/conditional.js"></script>
 {% endblock %}
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
@@ -1,15 +1,17 @@
 {% extends "nav.html" %}
-
+{% block title %}
+Dashboard
+{% endblock %}
 {% block body %}
 <div class="container main">
     <div class="panel panel-default">
         <div class="panel-body dashboard-user">
             <div class="row">
-                <div class="col-md-2 col-sm-3 col-xs-12 vcenter">
+                <div class="col-md-2 col-sm-3 col-xs-12 vcenter profile-container">
                     <img class="profile-image" src="https://profiles.csh.rit.edu/image/{{username}}">
                 </div>
-                <div class="col-xs-12 col-sm-9 col-md-9 vcenter" style="padding-bottom:10px">
-                    <h2 class="username">{{name}}</h2>
+                <div class="col-xs-12 col-sm-9 col-md-9 vcenter profile-container">
+                    <h3 class="username">{{name}}</h3>
                     <h5 class="email">{{username}}@csh.rit.edu</h5>
                     <div class="profile-badges">
                         {% if active %}
@@ -57,7 +59,7 @@ <h3 class="panel-title">Freshman Evaluations
                             </td>
                         </tr>
                         <tr>
-                            <td class="title">Committee Meetings</td>
+                            <td class="title">Directorship Meetings</td>
                             <td><span class="pull-right">
                                 {% if freshman['committee_meetings'] >= 10 %}
                                 <span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
@@ -109,7 +111,7 @@ <h3 class="panel-title">Freshman Evaluations
 
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">Spring Evaluations
+                    <h3 class="panel-title">Membership Evaluations
                         {% if spring['status'] == "Passed" %}
                         <span class="pull-right"><span class="glyphicon glyphicon-ok-sign green"></span> Passed</span>
                         {% elif spring['status'] == "Failed" %}
@@ -123,7 +125,7 @@ <h3 class="panel-title">Spring Evaluations
                     <table class="table table-striped table-responsive no-bottom-margin">
                         <tbody>
                         <tr>
-                            <td class="title">Committee Meetings</td>
+                            <td class="title">Directorship Meetings</td>
                             <td><span class="pull-right">
                                 {% if spring['committee_meetings'] >= 25 %}
                                 <span class="glyphicon glyphicon-ok-sign green"></span> {% else %}
@@ -240,7 +242,7 @@ <h3 class="panel-title">Housing Status</h3>
                         </tr>
                         <tr>
                             <td class="title">Housing Queue Position</td>
-                            <td><span class="pull-right">{{housing['queue_pos']}} / {{housing['queue_len']}}</span></td>
+                            <td><span class="pull-right">{{housing['queue_pos']}}</span></td>
                         </tr>
                         </tbody>
                     </table>
@@ -277,11 +279,11 @@ <h3 class="panel-title">Missed House Meetings</h3>
             {% endif %}
 
             {% if cm_attendance_len == 0 %}
-            <div class="alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"></span> You have not attended any committee meetings.</div>
+            <div class="alert alert-warning"><span class="glyphicon glyphicon-exclamation-sign white" style="padding-right:5px"></span> You have not attended any directorship meetings.</div>
             {% else %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">Committee Meeting Attendance</h3>
+                    <h3 class="panel-title">Directorship Meeting Attendance</h3>
                 </div>
 
                 <div class="panel-body table-fill">
diff --git a/conditional/templates/financial.html b/conditional/templates/financial.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+Financial
+{% endblock %}
 {% block body %}
 <div class="container main">
     <div class="panel panel-default">
diff --git a/conditional/templates/housing.html b/conditional/templates/housing.html
@@ -1,4 +1,8 @@
-{% extends "nav.html" %} {% block body %}
+{% extends "nav.html" %}
+{% block title %}
+Housing
+{% endblock %}
+{% block body %}
 <div class="container main">
     <div class="row">
         <div class="col-xs-12 col-sm-6 col-md-6">
diff --git a/conditional/templates/intro_eval_slideshow.html b/conditional/templates/intro_eval_slideshow.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% block title %}
+Introductory Evaluations Slideshow
+{% endblock %}
 {% block extraHeader %}
         <script src="../static/js/libraries/jquery.min.js"></script>
         <link rel="stylesheet" href="/css/reveal.css">
@@ -28,7 +31,7 @@
                         <h2>{{m['name']}}</h2>
                         <h4>Eval Date:</h4>
                         <p>{{m['eval_date']}}</p>
-                        <h4>Committee Meetings Passed:</h4>
+                        <h4>Directorship Meetings Passed:</h4>
                         <p>{{m['committee_meetings_passed']}}</p>
                         <h4>House Meetings Missed:</h4>
                         <p>{{m['house_meetings_missed']|length}}</p>
diff --git a/conditional/templates/intro_evals.html b/conditional/templates/intro_evals.html
@@ -1,4 +1,8 @@
-{% extends "nav.html" %} {% block body %}
+{% extends "nav.html" %}
+{% block title %}
+Introductory Evaluations
+{% endblock %}
+{% block body %}
 <div class="container main">
     {% if members|length > 0 %}
     {% for m in members %}
@@ -30,9 +34,9 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                             </div>
                             <div class="text-center">
                                 {% if m['committee_meetings']
-                                < 10 %} <div class="eval-info-label danger">Committee Meetings: {{m['committee_meetings']}}</div>
+                                < 10 %} <div class="eval-info-label danger">Directorship Meetings: {{m['committee_meetings']}}</div>
                             {% else %}
-                            <div class="eval-info-label success">Committee Meetings: {{m['committee_meetings']}}</div>
+                            <div class="eval-info-label success">Directorship Meetings: {{m['committee_meetings']}}</div>
                             {% endif %}
 
                         </div>
diff --git a/conditional/templates/intro_evals_form.html b/conditional/templates/intro_evals_form.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+Introductory Evaluations Form
+{% endblock %}
 {% block body %}
 <div class="container main">
     <h3>Introductory Evaluations Form</h3>
diff --git a/conditional/templates/major_project_submission.html b/conditional/templates/major_project_submission.html
@@ -1,4 +1,7 @@
 {% extends "nav.html" %}
+{% block title %}
+Major Project Form
+{% endblock %}
 {% block body %}
 
 <div class="container main">
diff --git a/conditional/templates/member_management.html b/conditional/templates/member_management.html
@@ -1,4 +1,8 @@
-{% extends "nav.html" %} {% block body %}
+{% extends "nav.html" %}
+{% block title %}
+Administration
+{% endblock %}
+{% block body %}
 <div class="container main">
     <div class="panel panel-default">
         <div class="panel-heading">
diff --git a/conditional/templates/nav.html b/conditional/templates/nav.html
@@ -17,7 +17,7 @@
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-stats"></span> Evals <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><a href="/intro_evals"><span class="glyphicon glyphicon-star"></span> Introductory Evaluations</a></li>
-                        <li><a href="/spring_evals"><span class="glyphicon glyphicon-tree-deciduous"></span> Spring Evaluations</a></li>
+                        <li><a href="/spring_evals"><span class="glyphicon glyphicon-tree-deciduous"></span> Membership Evaluations</a></li>
                         <li><a href="/conditionals"><span class="glyphicon glyphicon-exclamation-sign"></span> Current Conditionals</a></li>
                     </ul>
                 </li>
@@ -36,7 +36,7 @@
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-ok"></span> Attendance <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/attendance_cm"><span class="glyphicon glyphicon-briefcase"></span> Committee Meeting </a></li>
+                        <li><a href="/attendance_cm"><span class="glyphicon glyphicon-briefcase"></span> Directorship Meeting </a></li>
                         <li><a href="/attendance_ts"><span class="glyphicon glyphicon-blackboard"></span> Technical Seminar</a></li>
                         {% if is_eval_director %}
                         <li><a href="/attendance_hm"><span class="glyphicon glyphicon-home"></span> House Meeting</a></li>
@@ -51,8 +51,8 @@
                         <li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
                         {% if is_eval_director %}
 
-                        <li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Fall Presentation</a></li>
-                        <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Spring Presentation</a></li>
+                        <li><a href="/slideshow/intro"><span class="glyphicon glyphicon-eye-open"></span> Introductory Evaluations Presentation</a></li>
+                        <li><a href="/slideshow/spring"><span class="glyphicon glyphicon-eye-open"></span> Membership Evaluations Presentation</a></li>
 
                         {% endif %}
                     </ul>
@@ -74,6 +74,7 @@
                         <li><a href="https://profiles.csh.rit.edu/user/{{username}}"><span class="glyphicon glyphicon-user"></span> Profiles</a></li>
                         <li role="separator" class="divider"></li>
                         <li><a href="https://members.csh.rit.edu/"><span class="glyphicon glyphicon-globe"></span> Members Portal</a></li>
+                        <li><a href="https://github.com/ComputerScienceHouse/conditional/issues"><span class="glyphicon glyphicon-exclamation-sign"></span> Report an Issue</a></li>
                         <li><a href="https://webauth.csh.rit.edu/logout"><span class="glyphicon glyphicon-log-out"></span> Webauth Logout</a></li>
                     </ul>
                 </li>
diff --git a/conditional/templates/spring_eval_slideshow.html b/conditional/templates/spring_eval_slideshow.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% block title %}
+Membership Evaluations Slideshow
+{% endblock %}
 {% block extraHeader %}
         <script src="../static/js/libraries/jquery.min.js"></script>
         <link rel="stylesheet" href="/css/reveal.css">
@@ -26,7 +29,7 @@
                 <section id="slide-{{m['uid']}}">
                     <section>
                         <h2>{{m['name']}}</h2>
-                        <h4>Committee Meetings Attended:</h4>
+                        <h4>Directorship Meetings Attended:</h4>
                         <p>{{m['committee_meetings']}}</p>
                         <h4>House Meetings Missed:</h4>
                         <p>{{m['house_meetings_missed']|length}}</p>
diff --git a/conditional/templates/spring_evals.html b/conditional/templates/spring_evals.html
@@ -1,4 +1,8 @@
-{% extends "nav.html" %} {% block body %}
+{% extends "nav.html" %}
+{% block title %}
+Membership Evaluations
+{% endblock %}
+{% block body %}
 <div class="container main">
     {% for m in members %}
     <div class="panel panel-default">
@@ -22,9 +26,9 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                         <div class="spring-info row">
                             <div class="text-center">
                                         {% if m['committee_meetings'] < 25 %}
-                                        <div class="eval-info-label danger">Committee Meetings: {{m['committee_meetings']}}</div>
+                                        <div class="eval-info-label danger">Directorship Meetings: {{m['committee_meetings']}}</div>
                                         {% else %}
-                                        <div class="eval-info-label success">Committee Meetings: {{m['committee_meetings']}}</div>
+                                        <div class="eval-info-label success">Directorship Meetings: {{m['committee_meetings']}}</div>
                                         {% endif %}
 
                                     </div>
diff --git a/frontend/stylesheets/pages/_dashboard.scss b/frontend/stylesheets/pages/_dashboard.scss
diff --git a/frontend/stylesheets/pages/_evals.scss b/frontend/stylesheets/pages/_evals.scss
diff --git a/frontend/stylesheets/partials/_responsive.scss b/frontend/stylesheets/partials/_responsive.scss
