From 65f6a535ef4b62d706de51cac588744b12b611c6 Mon Sep 17 00:00:00 2001
From: Steven Mirabito <steven@stevenmirabito.com>
Date: Sun, 21 Jan 2018 14:35:29 -0500
Subject: [PATCH] Non-active members are not required to complete a major
 project

---
 .../blueprints/major_project_submission.py    | 23 +++++++++++--------
 .../templates/major_project_submission.html   |  6 +++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py
index 300b80de..f03ba5cb 100644
--- a/conditional/blueprints/major_project_submission.py
+++ b/conditional/blueprints/major_project_submission.py
@@ -8,6 +8,7 @@
 
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_get_member
+from conditional.util.ldap import ldap_is_active
 from conditional.util.flask import render_template
 
 from conditional import db, start_of_year
@@ -57,17 +58,21 @@ def submit_major_project():
 
     user_name = request.headers.get('x-webauth-user')
 
-    post_data = request.get_json()
-    name = post_data['projectName']
-    description = post_data['projectDescription']
+    if ldap_is_active(user_name):
+        post_data = request.get_json()
+        name = post_data['projectName']
+        description = post_data['projectDescription']
 
-    if name == "" or description == "":
-        return jsonify({"success": False}), 400
-    project = MajorProject(user_name, name, description)
+        if name == "" or description == "":
+            return jsonify({"success": False}), 400
+        project = MajorProject(user_name, name, description)
 
-    db.session.add(project)
-    db.session.commit()
-    return jsonify({"success": True}), 200
+        db.session.add(project)
+        db.session.commit()
+        return jsonify({"success": True}), 200
+    else:
+        # User is not an active member and does not need to complete a major project
+        return jsonify({"success": False}, 403)
 
 
 @major_project_bp.route('/major_project/review', methods=['POST'])
diff --git a/conditional/templates/major_project_submission.html b/conditional/templates/major_project_submission.html
index 8705d2ad..ff7e4a32 100644
--- a/conditional/templates/major_project_submission.html
+++ b/conditional/templates/major_project_submission.html
@@ -6,6 +6,7 @@
 
 <div class="container main">
     <h3 class="page-title">Major Project Form</h3>
+    {% if is_active %}
     <form data-module="majorProjectForm">
         <div class="panel panel-default">
             <div class="panel-body">
@@ -27,6 +28,11 @@ <h3 class="page-title">Major Project Form</h3>
         </div>
         <input class="btn btn-raised btn-primary" style="width:100%;margin-bottom:20px;" type="submit" value="Submit Major Project">
     </form>
+    {% else %}
+    <div class="alert alert-success" role="alert">
+        <span class="glyphicon glyphicon-ok-sign"></span> You are not required to complete a major project.
+    </div>
+    {% endif %}
     <h3 class="page-title">All Major Projects</h3> {% if major_projects_len
     <=0 %} <div class="panel panel-default">
         <div class="panel-body">