Add HTML and Python Delete Functionality

Author: mbillow

conditional/blueprints/major_project_submission.py

@@ -34,7 +34,8 @@ def display_major_project():
             'proj_name': p.name,
             'status': p.status,
             'description': p.description,
-            'id': p.id
+            'id': p.id,
+            'is_owner': bool(user_name == p.uid)
         } for p in
         MajorProject.query]
 
@@ -95,3 +96,27 @@ def major_project_review():
     db.session.flush()
     db.session.commit()
     return jsonify({"success": True}), 200
+
+
+@major_project_bp.route('/major_project/delete/<pid>', methods=['DELETE'])
+def major_project_delete(pid):
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+    log.info('api', action='review major project')
+
+    # get user data
+    user_name = request.headers.get('x-webauth-user')
+    major_project = MajorProject.query.filter(
+        MajorProject.id == pid
+    ).first()
+    creator = major_project.uid
+
+    if creator == user_name or ldap_is_eval_director(user_name):
+        MajorProject.query.filter(
+            MajorProject.id == pid
+        ).delete()
+        db.session.flush()
+        db.session.commit()
+        return jsonify({"success": True}), 200
+    else:
+        return "Must be project owner to delete!", 401

conditional/templates/dashboard.html

@@ -209,6 +209,7 @@ <h3 class="panel-title">Major Projects</h3>
                     </span>
                         {% elif p['status'] == "Pending" %}
                         <span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-hourglass yellow"></span> {{p['name']}}
+                        <button class="btn-xs btn-danger btn-mp"><span class="glyphicon glyphicon-trash"></span> Delete</button>
                     </span>
                         {% else %}
                         <span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-minus-sign red"></span> {{p['name']}}

conditional/templates/major_project_submission.html

@@ -41,8 +41,10 @@ <h4>{{p['proj_name']}}</h4>
                 <img class="table-img" src="https://profiles.csh.rit.edu/image/{{p['username']}}">
                 {{p['name']}} ({{p['username']}})
             </div>
-            {% if is_eval_director %}
             <div class="col-xs-4 col-sm-2">
+
+            {% if is_eval_director %}
+
                 <div class="btn-group" data-module="majorProjectStatus" data-id="{{p['id']}}">
                     <a href="#" class="btn {% if p['status'] == 'Passed' %}btn-success{% elif p['status'] == 'Failed' %}btn-danger{% else %}btn-warning{% endif %} dropdown-toggle btn-mp" data-toggle="dropdown" aria-expanded="false">
                         {{p['status']}}
@@ -58,20 +60,24 @@ <h4>{{p['proj_name']}}</h4>
                         <li>
                             <a href="#" data-option="Failed"><span class="glyphicon glyphicon-remove-sign red"></span> Failed</a>
                         </li>
+                        <li>
+                            <a href="#" data-option="Delete"><span class="glyphicon glyphicon-trash red"></span> Delete</a>
+                        </li>
                     </ul>
                 </div>
-            </div>
             {% else %}
-            <div class="col-xs-4 col-sm-2">
                 {% if p['status'] == 'Passed' %}
                 <h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-ok green"></span></h5>
                 {% elif p['status'] == 'Failed' %}
                 <h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-remove red"></span></h5>
                 {% else %}
                 <h5 style="padding:15px 20px;float:right"><span class="glyphicon glyphicon-hourglass yellow"></span></h5>
                 {% endif %}
-            </div>
+                {% if p.is_owner and p['status'] == 'Pending' %}
+                <button class="btn btn-danger btn-mp"><span class="glyphicon glyphicon-trash"></span> Delete</button>
+                {% endif %}
             {% endif %}
+            </div>
             <button class="btn-expand-panel" role="button" data-toggle="collapse" href="#evalsCollapse-{{p['id']}}" aria-expanded="false" aria-controls="evalsCollapse-{{p['id']}}"><span class="glyphicon glyphicon glyphicon-menu-down"></span></button>
             <div class="collapse" id="evalsCollapse-{{p['id']}}">
                 {{p['description']}}

frontend/stylesheets/pages/_management.scss

@@ -125,6 +125,8 @@
 
 .btn-mp {
   margin-top: 20px;
+  margin-right:15px;
+  float: right;
 }
 
 .stat-number {