Merge pull request #64 from ComputerScienceHouse/develop

Hotfix 1.0.2c

Author: mbillow

.pylintrc

@@ -80,9 +80,9 @@ bad-functions=apply,input
 [DESIGN]
 max-args = 10
 ignored-argument-names = _.*
-max-locals = 15
+max-locals = 20
 max-returns = 6
-max-branches = 12
+max-branches = 13
 max-statements = 55
 max-parents = 7
 max-attributes = 10

conditional/blueprints/intro_evals.py

@@ -58,11 +58,17 @@ def get_fid_cm_count(member_id):
                       ).filter(
                           FreshmanHouseMeetingAttendance.attendance_status == "Absent"
                       )]
+
+        if fid.signatures_missed is None:
+            signatures_missed = -1
+        else:
+            signatures_missed = fid.signatures_missed
+
         freshman = {
             'name': fid.name,
             'uid': fid.id,
             'eval_date': fid.eval_date.strftime("%Y-%m-%d"),
-            'signatures_missed': -1,
+            'signatures_missed': signatures_missed,
             'committee_meetings': get_fid_cm_count(fid.id),
             'committee_meetings_passed': get_fid_cm_count(fid.id) >= 10,
             'house_meetings_missed':

conditional/blueprints/member_management.py

@@ -266,20 +266,26 @@ def member_management_edituser(uid):
                     })
             clear_active_members_cache()
     else:
-        logger.info('backend', action="edit freshman account %s room: %s onfloor: %s eval_date: %s" %
+        logger.info('backend', action="edit freshman account %s room: %s onfloor: %s eval_date: %s sig_missed %s" %
             (uid, post_data['roomNumber'], post_data['onfloorStatus'],
-            post_data['evalDate']))
+            post_data['evalDate'], post_data['sigMissed']))
 
         name = post_data['name']
         room_number = post_data['roomNumber']
         onfloor_status = post_data['onfloorStatus']
         eval_date = post_data['evalDate']
 
+        if post_data['sigMissed'] == "":
+            sig_missed = None
+        else:
+            sig_missed = post_data['sigMissed']
+
         FreshmanAccount.query.filter(FreshmanAccount.id == uid).update({
             'name': name,
             'eval_date': datetime.strptime(eval_date, "%Y-%m-%d"),
             'onfloor_status': onfloor_status,
-            'room_number': room_number
+            'room_number': room_number,
+            'signatures_missed': sig_missed
         })
 
     db.session.flush()
@@ -333,7 +339,8 @@ def get_hm_date(hm_id):
                 'eval_date': acct.eval_date.strftime("%Y-%m-%d"),
                 'missed_hm': hms_missed,
                 'onfloor_status': acct.onfloor_status,
-                'room_number': acct.room_number
+                'room_number': acct.room_number,
+                'sig_missed': acct.signatures_missed
             }), 200
 
     if ldap_is_eval_director(user_name):

conditional/models/models.py

@@ -14,13 +14,15 @@ class FreshmanAccount(db.Model):
     eval_date = Column(Date, nullable=False)
     onfloor_status = Column(Boolean)
     room_number = Column(String)
+    signatures_missed = Column(Integer)
 
-    def __init__(self, name, onfloor, room=None):
+    def __init__(self, name, onfloor, room=None, missed=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
 
 
 class FreshmanEvalData(db.Model):

conditional/templates/member_management.html

@@ -271,10 +271,14 @@ <h4 class="modal-title" id="editFreshmanTitle">Edit Freshman Account</h4>
                                 </label>
                             </div>
                         </div>
-                        <div class="col-xs-8">
+                        <div class="col-xs-4">
                             <label class="control-label" for="evalDate">Evaluation Date</label>
                             <input class="form-control" id="evalDate" name="evalDate" type="text">
                         </div>
+                        <div class="col-xs-4">
+                            <label class="control-label" for="sigMissed">Signatures Missed</label>
+                            <input class="form-control" id="sigMissed" name="sigMissed" type="number">
+                        </div>
                     </div>
 
                     <p class="lead">Missed House Meetings</p>

frontend/javascript/modules/editUser.js

@@ -191,6 +191,10 @@ export default class EditUser {
         this.data.eval_date;
     new DatePicker(modal.querySelector('input[name=evalDate]'));
 
+    // Freshmen Signatures Missed
+    modal.querySelector('input[name=sigMissed]').value =
+        this.data.sig_missed;
+
     // Missed House Meetings
     if (this.data.missed_hm.length > 0) {
       modal.querySelector('.modal-body')
@@ -326,6 +330,7 @@ export default class EditUser {
       } else if (this.type === "freshman") {
         payload.name = modal.querySelector('input[name=name]').value;
         payload.evalDate = modal.querySelector('input[name=evalDate]').value;
+        payload.sigMissed = modal.querySelector('input[name=sigMissed]').value;
       }
 
       let roomNumber = modal.querySelector('input[name=room]').value;

migrations/versions/218de3b34a6f_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 218de3b34a6f
+Revises: 9c57eb87e918
+Create Date: 2016-09-07 23:39:18.246359
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '218de3b34a6f'
+down_revision = '9c57eb87e918'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('freshman_accounts', sa.Column('signatures_missed', sa.Integer(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('freshman_accounts', 'signatures_missed')
+    ### end Alembic commands ###