Merge pull request #226 from ComputerScienceHouse/remove_freshmen_project

Remove freshmen project

Author: devinmatte

conditional/blueprints/intro_evals.py

@@ -88,7 +88,6 @@ def get_fid_cm_count(member_id):
                     ))
                  ],
             'social_events': '',
-            'freshman_project': "Pending",
             'comments': "",
             'ldap_account': False,
             'status': "Pending"
@@ -141,14 +140,12 @@ def get_fid_cm_count(member_id):
                             TechnicalSeminar.approved == True # pylint: disable=singleton-comparison
                             ).all()],
             '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_info)
 
-    ie_members.sort(key=lambda x: x['freshman_project'] == "Passed")
     ie_members.sort(key=lambda x: len(x['house_meetings_missed']))
     ie_members.sort(key=lambda x: x['committee_meetings'], reverse=True)
     ie_members.sort(key=lambda x: x['signatures_missed'])

conditional/blueprints/member_management.py

@@ -6,7 +6,7 @@
 
 import structlog
 
-from flask import Blueprint, request, jsonify, abort, make_response
+from flask import Blueprint, request, jsonify, make_response
 
 from conditional import app, get_user, auth
 
@@ -25,7 +25,6 @@
 from conditional.models.models import CurrentCoops
 
 from conditional.blueprints.cache_management import clear_members_cache
-from conditional.blueprints.intro_evals import display_intro_evals
 
 from conditional.util.ldap import ldap_is_eval_director, ldap_is_bad_standing
 from conditional.util.ldap import ldap_is_financial_director
@@ -537,57 +536,6 @@ def member_management_make_user_active(user_dict=None):
     return jsonify({"success": True}), 200
 
 
-@member_management_bp.route('/manage/intro_project', methods=['GET'])
-@auth.oidc_auth
-@get_user
-def introductory_project(user_dict=None):
-    log = logger.new(request=request, auth_dict=user_dict)
-    log.info('Display Freshmen Project Management')
-
-    if not ldap_is_eval_director(user_dict['account']):
-        return "must be eval director", 403
-
-    return render_template('introductory_project.html',
-                           username=user_dict['username'],
-                           intro_members=display_intro_evals(internal=True))
-
-
-@member_management_bp.route('/manage/intro_project', methods=['POST'])
-@auth.oidc_auth
-@get_user
-def introductory_project_submit(user_dict=None):
-    log = logger.new(request=request, auth_dict=user_dict)
-
-    if not ldap_is_eval_director(user_dict['account']):
-        return "must be eval director", 403
-
-    post_data = request.get_json()
-
-    if not isinstance(post_data, list):
-        abort(400)
-
-    for intro_member in post_data:
-        if not isinstance(intro_member, dict):
-            abort(400)
-
-        if 'uid' not in intro_member or 'status' not in intro_member:
-            abort(400)
-
-        if intro_member['status'] not in ['Passed', 'Pending', 'Failed']:
-            abort(400)
-
-        log.info('Freshmen Project {} for {}'.format(intro_member['status'], intro_member['uid']))
-
-        FreshmanEvalData.query.filter(FreshmanEvalData.uid == intro_member['uid']).update({
-            'freshman_project': intro_member['status']
-        })
-
-    db.session.flush()
-    db.session.commit()
-
-    return jsonify({"success": True}), 200
-
-
 @member_management_bp.route('/member/<uid>', methods=['GET'])
 @auth.oidc_auth
 @get_user

conditional/models/models.py

@@ -33,7 +33,7 @@ class FreshmanEvalData(db.Model):
     id = Column(Integer, primary_key=True)
     uid = Column(String(32), nullable=False)
     freshman_project = Column(Enum('Pending', 'Passed', 'Failed',
-                                   name="freshman_project_enum"), nullable=False)
+                                   name="freshman_project_enum"), nullable=True)
     eval_date = Column(DateTime, nullable=False)
     signatures_missed = Column(Integer, nullable=False)
     social_events = Column(Text)
@@ -44,7 +44,7 @@ class FreshmanEvalData(db.Model):
 
     def __init__(self, uid, signatures_missed):
         self.uid = uid
-        self.freshman_project = 'Pending'
+        self.freshman_project = None
         self.freshman_eval_result = 'Pending'
         self.signatures_missed = signatures_missed
         self.social_events = ""

conditional/templates/intro_eval_slideshow.html

@@ -49,12 +49,6 @@ <h3>{{m['technical_seminars']|length}}</h3>
             </div>
           </div>
 
-        <h4>
-            {% if m['freshman_project'] != 'Pending' %}
-                <span class="icon glyphicon glyphicon-{% if m['freshman_project'] == 'Passed' %}ok passed{%else%}remove{% endif %}" aria-hidden="true"></span> Freshman Project
-            {% endif %}
-        </h4>
-
         <div class="actions" data-uid="{{m['uid']}}" data-cn="{{m['name']}}">
           <button class="pass" type="button">Pass</button>
           <button class="fail" type="button">Fail</button>

conditional/templates/intro_evals.html

@@ -86,25 +86,6 @@ <h6 class="eval-uid">{{ m['uid'] }}</h6>
                                     </div>
                                 {% endif %}
 
-                        </div>
-                        <div class="text-center">
-                            {% if m['freshman_project'] == "Passed" %}
-                            <div class="eval-info-label">
-                                <span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>Freshmen Project
-                                <span class="eval-info-number">Passed</span>
-                            </div>
-                            {% elif m['freshman_project'] == "Failed" %}
-                            <div class="eval-info-label">
-                                <span class="glyphicon glyphicon-remove-sign red eval-info-status"></span>Freshmen Project
-                                <span class="eval-info-number">Failed</span>
-                            </div>
-                            {% else %}
-                            <div class="eval-info-label">
-                                <span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span>Freshmen Project
-                                <span class="eval-info-number">Pending</span>
-                            </div>
-                            {% endif %}
-
                         </div>
                         <div class="text-center">
                             {% if m['house_meetings_missed']|length > 0 %}
@@ -203,7 +184,6 @@ <h4>Other Comments</h4>
                         <th>Result</th>
                         <th>Meetings</th>
                         <th>Signatures Missed</th>
-                        <th>Freshman Project</th>
                         <th>Technical Seminars</th>
 						<th>House Meetings Missed</th>
                     </tr>
@@ -239,15 +219,6 @@ <h4>Other Comments</h4>
                                <span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span> Pending
                                 {% endif %}
                         </td>
-                        <td>
-                             {% if m['freshman_project'] == "Passed" %}
-                                <span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> Passed
-                            {% elif m['freshman_project'] == "Failed" %}
-                                <span class="glyphicon glyphicon-remove-sign red eval-info-status"></span> Failed
-                            {% else %}
-                                <span class="glyphicon glyphicon-hourglass yellow eval-info-status"></span> Pending
-                            {% endif %}
-                        </td>
                         <td data-sort="{{ m['technical_seminars']|length }}">
                             {% if m['technical_seminars']|length >= 2 %}
                                 <span class="glyphicon glyphicon-ok-sign green eval-info-status"></span> {{m['technical_seminars']|length}}

conditional/templates/introductory_project.html

@@ -64,7 +64,6 @@
                         {% 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 %}

conditional/templates/nav.html

@@ -0,0 +1,30 @@
+"""remove_freshmen_project
+
+Revision ID: 4ac8ff82410a
+Revises: d1a06ab54211
+Create Date: 2019-09-06 11:21:28.515040
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '4ac8ff82410a'
+down_revision = 'd1a06ab54211'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('freshman_eval_data', 'freshman_project',
+               existing_type=postgresql.ENUM('Pending', 'Passed', 'Failed', name='freshman_project_enum'),
+               nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('freshman_eval_data', 'freshman_project',
+               existing_type=postgresql.ENUM('Pending', 'Passed', 'Failed', name='freshman_project_enum'),
+               nullable=False)
+    # ### end Alembic commands ###