Merge pull request #96 from ComputerScienceHouse/develop

Conditional 1.2.1

Author: stevenmirabito

conditional/blueprints/cache_management.py

@@ -1,6 +1,9 @@
+import os
+import signal
 import structlog
 
 from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.ldap import ldap_is_rtp
 from conditional.util.ldap import ldap_get_housing_points
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_intro_members
@@ -14,12 +17,23 @@
 logger = structlog.get_logger()
 cache_bp = Blueprint('cache_bp', __name__)
 
+@cache_bp.route('/restart')
+def restart_app():
+    user_name = request.headers.get('x-webauth-user')
+
+    if not ldap_is_rtp(user_name):
+        return redirect("/dashboard")
+
+    logger.info('api', action='restart conditional')
+    os.kill(os.getpid(), signal.SIGINT)
+    return "application restarted", 200
+
 
 @cache_bp.route('/clearcache')
 def clear_cache():
     user_name = request.headers.get('x-webauth-user')
 
-    if not ldap_is_eval_director(user_name):
+    if not ldap_is_eval_director(user_name) or ldap_is_rtp(user_name):
         return redirect("/dashboard")
 
     logger.info('api', action='purge system cache')

conditional/blueprints/intro_evals.py

@@ -107,7 +107,7 @@ def get_fid_cm_count(member_id):
 
         if freshman_data is None:
             continue
-        elif freshman_data.freshman_eval_result != "Pending":
+        elif freshman_data.freshman_eval_result != "Pending" and internal is True:
             continue
 
         h_meetings = [m.meeting_id for m in

conditional/templates/intro_eval_slideshow.html

@@ -13,32 +13,40 @@
     <section id="slide-{{m['uid']}}">
       <section>
         <h1>{{m['name']}}</h1>
-        <div class="row">
-          <div class="col-xs-12 col-md-4">
-            {% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
-            <div class="item{% if committee_meetings_passed %} passed{% endif %}" >
-              <span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
-              <h3>{{m['committee_meetings']}}</h3>
-              <p>Meetings</p>
+          <div class="row">
+            <div class="col-xs-12 col-md-3">
+              {% set packet_passed = m['signatures_missed'] == 0 %}
+              <div class="item{% if packet_passed %} passed{% endif %}" >
+                <span class="icon glyphicon glyphicon-{% if packet_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
+                <h3>{{m['signatures_missed']}}</h3>
+                <p>Signatures Missed</p>
+              </div>
             </div>
-          </div>
-          <div class="col-xs-12 col-md-4">
-            {% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
-            <div class="item{% if house_meetings_passed %} passed{% endif %}">
-              <span class="icon glyphicon glyphicon-{% if house_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
-              <h3>{{m['house_meetings_missed']|length}}</h3>
-              <p>Absences</p>
+            <div class="col-xs-12 col-md-3">
+              {% set committee_meetings_passed = m['committee_meetings'] >= 10 %}
+              <div class="item{% if committee_meetings_passed %} passed{% endif %}" >
+                <span class="icon glyphicon glyphicon-{% if committee_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
+                <h3>{{m['committee_meetings']}}</h3>
+                <p>Meetings</p>
+              </div>
             </div>
-          </div>
-          <div class="col-xs-12 col-md-4">
-            {% set technical_seminars_passed = m['technical_seminars']|length >= 2 %}
-            <div class="item{% if technical_seminars_passed %} passed{% endif %}">
-              <span class="icon glyphicon glyphicon-{% if technical_seminars_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
-              <h3>{{m['technical_seminars']|length}}</h3>
-              <p>Seminars</p>
+            <div class="col-xs-12 col-md-3">
+              {% set house_meetings_passed = m['house_meetings_missed']|length == 0 %}
+              <div class="item{% if house_meetings_passed %} passed{% endif %}">
+                <span class="icon glyphicon glyphicon-{% if house_meetings_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
+                <h3>{{m['house_meetings_missed']|length}}</h3>
+                <p>Absences</p>
+              </div>
+            </div>
+            <div class="col-xs-12 col-md-3">
+              {% set technical_seminars_passed = m['technical_seminars']|length >= 2 %}
+              <div class="item{% if technical_seminars_passed %} passed{% endif %}">
+                <span class="icon glyphicon glyphicon-{% if technical_seminars_passed %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span>
+                <h3>{{m['technical_seminars']|length}}</h3>
+                <p>Seminars</p>
+              </div>
             </div>
           </div>
-        </div>
         <h4><span class="icon glyphicon glyphicon-{% if m['freshman_project'] == 'Passed' %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span> Freshman Project</h4>
 
         <div class="actions" data-uid="{{m['uid']}}" data-cn="{{m['name']}}">

conditional/templates/nav.html

@@ -44,17 +44,27 @@
                     </ul>
                 </li>
                 {% endif %}
-                {% if is_eval_director or is_financial_director %}
+                {% if is_eval_director or is_financial_director or is_rtp%}
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-wrench"></span> Admin<span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
+
+                        {% if is_financial_director or is_eval_director %}
+                            <li><a href="/manage"><span class="glyphicon glyphicon-user"></span> Member Management</a></li>
+                        {% endif %}
+
                         {% if is_eval_director %}
+                            <li><a href="/manage/intro_project"><span class="glyphicon glyphicon-tower"></span> Introductory Project Results</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 %}
 
-                        <li><a href="/manage/intro_project"><span class="glyphicon glyphicon-tower"></span> Introductory Project Results</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>
+                        {% if is_eval_director or is_rtp %}
+                            <li><a href="/clearcache"><span class="glyphicon glyphicon-floppy-remove"></span> Clear Cache</a></li>
+                        {% endif %}
 
+                        {% if is_rtp %}
+                            <li><a href="/restart"><span class="glyphicon glyphicon-refresh"></span> Restart Conditional</a></li>
                         {% endif %}
                     </ul>
                 </li>

conditional/util/flask.py

@@ -7,6 +7,7 @@
 from conditional.util.ldap import ldap_is_financial_director
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_intromember
+from conditional.util.ldap import ldap_is_rtp
 from conditional import db
 
 
@@ -27,6 +28,7 @@ def render_template(request, template_name, **kwargs):
     is_financial = ldap_is_financial_director(user_name)
     is_eval = ldap_is_eval_director(user_name)
     is_intromember = ldap_is_intromember(user_name)
+    is_rtp = ldap_is_rtp(user_name)
 
     if is_eval:
         lockdown = False
@@ -40,4 +42,5 @@ def render_template(request, template_name, **kwargs):
         is_eval_director=is_eval,
         is_financial_director=is_financial,
         is_intromember=is_intromember,
+        is_rtp=is_rtp,
         **kwargs)

conditional/util/ldap.py

@@ -201,6 +201,10 @@ def ldap_is_eboard(username):
     return _ldap_is_member_of_group(username, 'eboard')
 
 
+def ldap_is_rtp(username):
+    return _ldap_is_member_of_group(username, 'rtp')
+
+
 def ldap_is_intromember(username):
     return _ldap_is_member_of_group(username, 'intromembers')
 

frontend/javascript/modules/conditionalForm.js

@@ -15,8 +15,9 @@ export default class ConditionalForm {
 
   _submitForm(e) {
     e.preventDefault();
+    let uid = this.form.uid.value;
     let payload = {
-      uid: this.form.uid.value,
+      uid: uid,
       description: this.form.querySelector('input[name=description]').value,
       dueDate: this.form.querySelector('input[name=due_date]').value
     };
@@ -26,6 +27,12 @@ export default class ConditionalForm {
     }, () => {
       $(this.form.closest('.modal')).modal('hide');
       if (location.pathname.split('/')[1] === "slideshow") {
+        $('#createConditional').on('hidden.bs.modal', function() {
+          var condBtn = $('div[data-uid="' + uid + '"] button')
+          .first();
+          $(condBtn).text("Conditionaled").off("click").addClass("disabled");
+          $(condBtn).next().hide();
+        });
         reveal.right();
       } else {
         location.reload();

frontend/javascript/modules/presentation.js

@@ -42,10 +42,6 @@ export default class Presentation {
           $('#createConditional').modal();
           $('#createConditional input[type="text"]').val('');
           $('#createConditional input[name="uid"]').val(uid);
-          $('#createConditional').on('hidden.bs.modal', function() {
-            $(e.target).text("Conditionaled").off("click").addClass("disabled");
-            $(e.target).next().hide();
-          });
         });
       $(e.target).click(e => {
         e.preventDefault();

frontend/stylesheets/components/_reveal.scss

@@ -105,10 +105,11 @@ $yellow: #f1c40f;
   }
   & .item {
     position: relative;
+    margin: 0 auto;
     border: 6px solid $red;
     border-radius: 20px;
     padding: 60px 0 0;
-    width: 95%;
+    width: 92%;
     height: 100%;
     color: #555;
     &.passed {

frontend/stylesheets/components/reveal/_white.scss

@@ -72,6 +72,7 @@ body {
 }
 
 .reveal .item p {
+  font-size: .6em;
   font-weight: normal;
 }