Merge pull request #198 from ComputerScienceHouse/develop

Version 1.8.0

Author: stevenmirabito

Dockerfile

@@ -23,4 +23,6 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
     apt-get -yq remove nodejs npm && \
     apt-get -yq clean all
 
+RUN ln -sf /usr/share/zoneinfo/America/New_York /etc/localtime
+
 CMD ["gunicorn", "conditional:app", "--bind=0.0.0.0:8080", "--access-logfile=-"]

conditional/_version.py

@@ -1 +1 @@
-__version__ = "1.7.0"
+__version__ = "1.8.0"

conditional/blueprints/member_management.py

@@ -34,6 +34,7 @@
 from conditional.util.ldap import ldap_set_roomnumber
 from conditional.util.ldap import ldap_set_active
 from conditional.util.ldap import ldap_set_inactive
+from conditional.util.ldap import ldap_set_onfloor
 from conditional.util.ldap import ldap_set_housingpoints
 from conditional.util.ldap import ldap_set_current_student
 from conditional.util.ldap import ldap_set_non_current_student
@@ -494,11 +495,12 @@ def member_management_upgrade_user(user_dict=None):
                 fhm.meeting_id))
         db.session.delete(fhm)
 
+    new_account = ldap_get_member(uid)
     if acct.onfloor_status:
         db.session.add(OnFloorStatusAssigned(uid, datetime.now()))
+        ldap_set_onfloor(new_account)
 
     if acct.room_number:
-        new_account = ldap_get_member(uid)
         ldap_set_roomnumber(new_account, acct.room_number)
 
     db.session.delete(acct)

conditional/templates/intro_eval_slideshow.html

@@ -12,6 +12,7 @@
     {% for m in members %}
     <section id="slide-{{m['uid']}}">
       <section>
+        <img class="eval-user-img" alt="{{m['uid']}}" src="https://profiles.csh.rit.edu/image/{{m['uid']}}" />
         <h1>{{m['name']}}</h1>
           <div class="row">
             <div class="col-xs-12 col-md-3">

conditional/templates/spring_eval_slideshow.html

@@ -12,6 +12,7 @@
     {% for m in members %}
     <section id="slide-{{m['uid']}}">
       <section>
+        <img class="eval-user-img" alt="{{m['uid']}}" src="https://profiles.csh.rit.edu/image/{{m['uid']}}" />
         <h1>{{m['name']}}</h1>
         <div class="row">
           <div class="col-xs-12 col-md-4">

conditional/util/ldap.py

@@ -133,6 +133,10 @@ def ldap_set_non_current_student(account):
     ldap_get_current_students.cache_clear()
     ldap_get_member.cache_clear()
 
+def ldap_set_onfloor(account):
+    _ldap_add_member_to_group(account, 'onfloor')
+    ldap_get_onfloor_members.cache_clear()
+    ldap_get_member.cache_clear()
 
 def ldap_get_roomnumber(account):
     try:

frontend/stylesheets/components/reveal/_white.scss

@@ -300,7 +300,9 @@ body {
 
 .reveal section img {
   margin: 15px 0;
-  border: 4px solid #222;
+  border: none;
+  width: 100px;
+  height: 100px;
   box-shadow: 0 0 10px rgba(0, 0, 0, .15);
   background: rgba(255, 255, 255, .12);
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conditional",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "CSH Re-evaluation (MEGA_EVALS RE:RE:LOADED)",
   "license": "MIT",
   "homepage": "http://csh.rit.edu/",

requirements.txt

@@ -3,9 +3,9 @@ astroid==1.6.1
 blinker==1.4
 click==6.7
 csh-ldap==2.0.2
-Flask==0.12.2
+Flask==1.0.2
 Flask-Migrate==2.1.1
-Flask-pyoidc==1.2.0
+Flask-pyoidc==1.3.0
 Flask-SQLAlchemy==2.3.2
 gunicorn==19.7.1
 isort==4.3.4