Merge pull request #58 from ComputerScienceHouse/develop

Hotfix 1.0.2b

Author: mbillow

.travis.yml

@@ -0,0 +1,13 @@
+language: python
+python:
+  - "3.3"
+
+install:
+  - "pip install -r requirements.txt"
+  - "curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.7/install.sh | bash"
+  - "nvm install"
+  - "nvm use"
+  - "npm install -g gulp"
+  - "npm install"
+script:
+  - "gulp production"

README.md

@@ -1,6 +1,8 @@
 Conditional
 ===========
 
+[![Build Status](https://travis-ci.org/ComputerScienceHouse/conditional.svg?branch=travis-ci)](https://travis-ci.org/ComputerScienceHouse/conditional)
+
 A comprehensive membership evaluations solution for Computer Science House.
 
 Development

conditional/blueprints/attendance.py

@@ -32,17 +32,7 @@
 
 
 def get_name(m):
-    if 'givenName' in m:
-        first = m['givenName'][0].decode('utf-8')
-    else:
-        first = ""
-
-    if 'sn' in m:
-        last = m['sn'][0].decode('utf-8')
-    else:
-        last = ""
-
-    return "{first} {last}".format(first=first, last=last)
+    return m['cn'][0].decode('utf-8')
 
 
 @attendance_bp.route('/attendance/ts_members')

conditional/blueprints/intro_evals.py

@@ -62,7 +62,7 @@ def get_fid_cm_count(member_id):
             'name': fid.name,
             'uid': fid.id,
             'eval_date': fid.eval_date.strftime("%Y-%m-%d"),
-            'signatures_missed': 65535,
+            'signatures_missed': -1,
             'committee_meetings': get_fid_cm_count(fid.id),
             'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10,
             'house_meetings_missed':
@@ -87,7 +87,8 @@ def get_fid_cm_count(member_id):
                  ],
             'social_events': '',
             'freshman_project': "Pending",
-            'comments': 'Does not have account yet',
+            'comments': "",
+            'ldap_account': False,
             'status': "Pending"
         }
         ie_members.append(freshman)
@@ -138,6 +139,7 @@ def get_fid_cm_count(member_id):
             'social_events': freshman_data.social_events,
             'freshman_project': freshman_data.freshman_project,
             'comments': freshman_data.other_notes,
+            'ldap_account': True,
             'status': freshman_data.freshman_eval_result
         }
         ie_members.append(member)

conditional/templates/intro_evals.html

@@ -20,18 +20,23 @@
                     </div>
                     <div class="col-sm-5 col-md-4 col-lg-5">
                         <h4 class="eval-name">{{m['name']}}</h4>
-                        <h6 class="eval-uid">{{m['uid']}}</h6>
+                            {% if not m['ldap_account'] %}
+                                <span class="label label-default">Internal Account: {{m['uid']}}</span>
+                            {% else %}
+                                <h6 class="eval-uid">{{ m['uid'] }}</h6>
+                            {% endif %}
+
                     </div>
                     <!---->
                     <div class="col-sm-5 col-md-6 col-lg-5 vcenter">
                         <div class="row">
                             <div class="text-center">
-                                {% if m['signatures_missed'] > 0 %}
-                                <div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
-                                {% elif m['signatures_missed'] == 65535 %}
-                                <div class="eval-info-label warning">Packet Not Yet Complete</div>
+                                {% if m['signatures_missed'] == 0 %}
+                                    <div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
+                                {% elif m['signatures_missed'] > 0 %}
+                                    <div class="eval-info-label danger">Signatures Missed: {{m['signatures_missed']}}</div>
                                 {% else %}
-                                <div class="eval-info-label success">Signatures Missed: {{m['signatures_missed']}}</div>
+                                    <div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Packet in Progress</div>
                                 {% endif %}
                             </div>
                             <div class="text-center">
@@ -44,7 +49,7 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                         </div>
                         <div class="text-center">
                             {% if m['freshman_project'] == "Pending" %}
-                            <div class="eval-info-label warning">Freshman Project: <span class="glyphicon glyphicon-hourglass white"></span></div>
+                            <div class="eval-info-label warning"><span class="glyphicon glyphicon-hourglass white"></span> Project Results Pending</div>
                             {% elif m['freshman_project'] == "Passed" %}
                             <div class="eval-info-label success">Freshman Project: <span class="glyphicon glyphicon-ok-sign white"></span></div>
                             {% else %}
@@ -63,11 +68,9 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                     </div>
                 </div>
             </div>
-            <div class="row">
-
+            {% if m['house_meetings_missed']|length != 0 or m['technical_seminars']|length != 0 or m['comments'] != "" %}
                 <button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse-{{m['uid']}}" aria-expanded="false" aria-controls="evalsCollapse-{{m['uid']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
-
-            </div>
+            {% endif %}
             <div class="collapse" id="evalsCollapse-{{m['uid']}}">
                 {% if m['house_meetings_missed']|length > 0 %}
                 <!-- VV only display if missing house meetings VV -->
@@ -93,7 +96,7 @@ <h4>Missed House Meetings</h4>
                 </table>
                 {% endif %}
                 <!-- ^^ HOUSE MEETINGS TABLE -->
-                {% if True or m['technical_seminars']|length > 0 %}
+                {% if m['technical_seminars']|length > 0 %}
 
                 <h4>Technical Seminars</h4>
                 <table class="table">
@@ -105,15 +108,18 @@ <h4>Technical Seminars</h4>
                         {% endfor %}
                     </tbody>
                 </table>
-                {% endif %} {% if m['social_events'] != "" %}
+                {% endif %}
+                {% if m['social_events'] != "" %}
 
                 <h4>Social Events</h4>
                 <p>{{m['social_events']}}</p>
                 {% endif %}
 
+                {% if m['comments'] != "" %}
 
-                <h4>Other Notes</h4>
+                <h4>Other Comments</h4>
                 <p>{{m['comments']}}</p>
+                {% endif %}
             </div>
         </div>
 

conditional/templates/major_project_submission.html

@@ -11,7 +11,7 @@ <h3 class="page-title">Major Project Form</h3>
             <div class="panel-body">
                 <div class="form-group label-floating is-empty">
                     <label class="control-label" for="name">Project Name</label>
-                    <input class="form-control" id="name" name="name" type="text">
+                    <input class="form-control" id="name" name="name" type="text" maxlength="64">
                 </div>
             </div>
         </div>

conditional/templates/spring_evals.html

@@ -55,13 +55,7 @@ <h6 class="eval-uid">{{m['uid']}}</h6>
                         </div>
 
                 {% if m['house_meetings_missed']|length > 0 or m['major_projects_len'] > 0 %}
-                <div class="row">
-                    <div class="col-xs-12 col-sm-12 col-md-12">
-
                         <button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse{{m['uid']}}" aria-expanded="false" aria-controls="evalsCollapse{{m['uid']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
-
-                    </div>
-                </div>
                 {% endif %}
                 <div class="collapse" id="evalsCollapse{{m['uid']}}">
                     {% if m['house_meetings_missed']|length > 0 %}

frontend/stylesheets/pages/_evals.scss

@@ -18,7 +18,7 @@
 }
 
 .eval-panel {
-  padding: 25px 20px 10px;
+  padding: 25px 20px;
 }
 
 .col-sm-2 {
@@ -49,6 +49,7 @@
     border: 0;
     background: transparent;
     width: 100%;
+    height: 0;
     text-align: center;
   }
 }