Merge pull request #225 from ComputerScienceHouse/rit_username

Adding rit_username

Author: devinmatte

conditional/blueprints/member_management.py

@@ -2,7 +2,7 @@
 import io
 
 from datetime import datetime
-from distutils.util import strtobool # pylint: disable=no-name-in-module,import-error
+from distutils.util import strtobool  # pylint: disable=no-name-in-module,import-error
 
 import structlog
 
@@ -71,14 +71,14 @@ def display_member_management(user_dict=None):
     onfloor_list = get_onfloor_members()
 
     co_op_list = [(ldap_get_member(member.uid).displayName, member.semester, member.uid) \
-        for member in CurrentCoops.query.filter(
+                  for member in CurrentCoops.query.filter(
             CurrentCoops.date_created > start_of_year(),
             CurrentCoops.semester != "Neither")]
 
     freshmen = FreshmanAccount.query
     freshmen_list = []
 
-    for freshman_user in freshmen: # pylint: disable=not-an-iterable
+    for freshman_user in freshmen:  # pylint: disable=not-an-iterable
         freshmen_list.append({
             "id": freshman_user.id,
             "name": freshman_user.name,
@@ -217,8 +217,13 @@ def member_management_uploaduser(user_dict=None):
             else:
                 room_number = None
 
+            if new_user[3]:
+                rit_username = new_user[3]
+            else:
+                rit_username = None
+
             log.info('Create Freshman Account for {} via CSV Upload'.format(name))
-            db.session.add(FreshmanAccount(name, onfloor_status, room_number))
+            db.session.add(FreshmanAccount(name, onfloor_status, room_number, rit_username))
 
         db.session.flush()
         db.session.commit()

conditional/models/models.py

@@ -16,14 +16,16 @@ class FreshmanAccount(db.Model):
     onfloor_status = Column(Boolean)
     room_number = Column(String)
     signatures_missed = Column(Integer)
+    rit_username = Column(String(10), nullable=True)
 
-    def __init__(self, name, onfloor, room=None, missed=None):
+    def __init__(self, name, onfloor, room=None, missed=None, rit_username=None):
         self.name = name
         today = date.fromtimestamp(time.time())
         self.eval_date = today + timedelta(weeks=10)
         self.onfloor_status = onfloor
         self.room_number = room
         self.signatures_missed = missed
+        self.rit_username = rit_username
 
 
 class FreshmanEvalData(db.Model):

migrations/versions/704962eabf9c_add_rit_username.py

@@ -0,0 +1,26 @@
+"""add_rit_username
+
+Revision ID: 704962eabf9c
+Revises: d1a06ab54211
+Create Date: 2019-08-27 09:58:45.776217
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '704962eabf9c'
+down_revision = 'd1a06ab54211'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('freshman_accounts', sa.Column('rit_username', sa.String(length=10), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('freshman_accounts', 'rit_username')
+    # ### end Alembic commands ###