Merge pull request #66 from ComputerScienceHouse/mp-delete

Allow Deletion of Major Projects

Author: mbillow

conditional/blueprints/dashboard.py

@@ -96,7 +96,6 @@ def display_dashboard():
     user_name = request.headers.get('x-webauth-user')
 
     can_vote = get_voting_members()
-    logger.info('backend', action=can_vote)
     data = dict()
     data['username'] = user_name
     data['name'] = ldap_get_name(user_name)
@@ -142,6 +141,7 @@ def display_dashboard():
 
     data['major_projects'] = [
         {
+            'id': p.id,
             'name': p.name,
             'status': p.status,
             'description': p.description

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

@@ -201,23 +201,24 @@ <h3 class="panel-title">Conditionals</h3>
                 <div class="panel-heading">
                     <h3 class="panel-title">Major Projects</h3>
                 </div>
-                <table>
-                    {% for p in major_projects %}
-                    <tr>
+                <div class="panel-body">
+                {% for p in major_projects %}
+                    <div class="mp-container">
                         {% if p['status'] == "Passed" %}
-                        <span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-ok-sign green"></span> {{p['name']}}
-                    </span>
+                        <div class="title"><span class="glyphicon glyphicon-ok-sign green"></span> {{p['name']}}</div>
                         {% elif p['status'] == "Pending" %}
-                        <span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-hourglass yellow"></span> {{p['name']}}
-                    </span>
+                        <div class="title">
+                            <span class="glyphicon glyphicon-hourglass yellow"></span> {{p['name']}}
+                            <button class="btn-xs btn-danger pull-right" data-module="majorProjectStatus" data-id="{{p['id']}}"><span class="glyphicon glyphicon-trash"></span> Delete</button>
+                        </div>
                         {% else %}
-                        <span class="title"><span style="padding-left:15px; padding-top:15px;" class="glyphicon glyphicon-minus-sign red"></span> {{p['name']}}
-                    </span>
+                        <div class="title"><span class="glyphicon glyphicon-minus-sign red"></span> {{p['name']}}</div>
                         {% endif %}
-                        <div class="panel-body" style="word-wrap:break-word">{{p['description']}}</div>
-                    </tr>
-                    {% endfor %}
-                </table>
+                        <div class="mp-description">{{p['description']}}</div>
+                    </div>
+                </tr>
+                {% endfor %}
+                </div>
             </div>
             {% endif %}
 

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" data-module="majorProjectStatus" data-id="{{p['id']}}"><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/javascript/modules/attendanceForm.js

@@ -53,7 +53,7 @@ export default class AttendanceForm {
         });
 
         FetchUtil.postWithWarning(this.endpoint, payload, {
-          warningText: "You will not be able to edit this event once" +
+          warningText: "You will not be able to edit this event once " +
                         "attendance has been recorded.",
           successText: "Attendance has been submitted."
         });

frontend/javascript/modules/editUser.js

@@ -352,8 +352,8 @@ export default class EditUser {
 
     FetchUtil.fetchWithWarning(this.endpoints.userDetails + this.uid, {
       method: 'DELETE',
-      warningText: 'This account\'s data will be permanently deleted.',
-      successText: 'Freshman account has been deleted.'
+      warningText: "This account's data will be permanently deleted.",
+      successText: "Freshman account has been deleted."
     }, () => {
       $(modal).modal('hide');
       window.location.reload();
@@ -371,9 +371,9 @@ export default class EditUser {
     };
 
     FetchUtil.postWithWarning(this.endpoints.userUpgrade, payload, {
-      warningText: 'This will irreversibly migrate all of this ' +
-      'freshman\'s data to the specified member account.',
-      successText: 'Account has been upgraded.'
+      warningText: "This will irreversibly migrate all of this " +
+      "freshman's data to the specified member account.",
+      successText: "Account has been upgraded."
     }, () => {
       $(modal).modal('hide');
       window.location.reload();

frontend/javascript/modules/hmForm.js

@@ -58,7 +58,7 @@ export default class HouseMeetingForm {
         payload.members = upperclassmen;
 
         FetchUtil.postWithWarning(this.endpoint, payload, {
-          warningText: "You will not be able to unmark a member as present" +
+          warningText: "You will not be able to unmark a member as present " +
                         "once attendance has been recorded.",
           successText: "Attendance has been submitted."
         });

frontend/javascript/modules/majorProjectStatus.js

@@ -6,68 +6,95 @@ import FetchUtil from "../utils/fetchUtil";
 import sweetAlert from "../../../node_modules/bootstrap-sweetalert/dev/sweetalert.es6.js"; // eslint-disable-line max-len
 
 export default class MajorProjectStatus {
-  constructor(dropdown) {
-    this.dropdown = dropdown;
-    this.id = this.dropdown.dataset.id;
+  constructor(control) {
+    this.control = control;
+    this.id = this.control.dataset.id;
     this.endpoint = '/major_project/review';
+    this.deleteEndpoint = '/major_project/delete/';
     this.render();
   }
 
   render() {
-    const options = this.dropdown.querySelectorAll('[data-option]');
-    options.forEach(option => {
-      option.addEventListener('click', e => this._changeStatus(e));
-    });
+    if (this.control.tagName.toLowerCase() === "div") {
+      // Evals director dropdown
+      const options = this.control.querySelectorAll('[data-option]');
+      options.forEach(option => {
+        option.addEventListener('click', e => {
+          e.preventDefault();
+          this._changeStatus(e.target.dataset.option);
+        });
+      });
+    } else {
+      // Member self-delete button
+      this.control.addEventListener('click',
+          () => this._changeStatus('Delete'));
+    }
   }
 
-  _changeStatus(e) {
-    e.preventDefault();
-
-    let option = e.target.dataset.option;
-    let payload = {
-      id: this.id,
-      status: option
-    };
-
-    fetch(this.endpoint, {
-      method: 'POST',
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-      },
-      credentials: "same-origin",
-      body: JSON.stringify(payload)
-    })
-      .then(FetchUtil.checkStatus)
-      .then(FetchUtil.parseJSON)
-      .then(response => {
-        if (response.hasOwnProperty('success') && response.success === true) {
-          let toggle = this.dropdown.querySelector('.dropdown-toggle');
-          ["btn-success", "btn-danger", "btn-warning"].forEach(classToRemove =>
-            toggle.classList.remove(classToRemove));
-
-          const caret = document.createElement('span');
-          caret.classList.add('caret');
-          toggle.text = option + " ";
-          toggle.appendChild(caret);
-
-          if (option === "Passed") {
-            toggle.classList.add("btn-success");
-          } else if (option === "Failed") {
-            toggle.classList.add("btn-danger");
-          } else {
-            toggle.classList.add("btn-warning");
-          }
+  _changeStatus(option) {
+    if (option === "Delete") {
+      FetchUtil.fetchWithWarning(this.deleteEndpoint + this.id, {
+        method: 'DELETE',
+        warningText: 'This action cannot be undone.',
+        successText: 'Major project deleted.'
+      }, () => {
+        let dashboardContainer = this.control.closest(".mp-container");
+        if (dashboardContainer) {
+          // Dashboard button
+          $(dashboardContainer).hide();
         } else {
-          sweetAlert("Uh oh...", "We're having trouble updating this project " +
-            "right now. Please try again later.", "error");
-          throw new Exception(FetchException.REQUEST_FAILED, response);
+          // Major projects page button
+          $(this.control.closest(".panel")).fadeOut();
         }
-      })
-      .catch(error => {
-        sweetAlert("Uh oh...", "We're having trouble updating this project " +
-          "right now. Please try again later.", "error");
-        throw new Exception(FetchException.REQUEST_FAILED, error);
       });
+    } else {
+      let payload = {
+        id: this.id,
+        status: option
+      };
+
+      fetch(this.endpoint, {
+        method: 'POST',
+        headers: {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json'
+        },
+        credentials: "same-origin",
+        body: JSON.stringify(payload)
+      })
+          .then(FetchUtil.checkStatus)
+          .then(FetchUtil.parseJSON)
+          .then(response => {
+            if (response.hasOwnProperty('success') &&
+                response.success === true) {
+              let toggle = this.control.querySelector('.dropdown-toggle');
+              ["btn-success", "btn-danger", "btn-warning"]
+                  .forEach(classToRemove =>
+                  toggle.classList.remove(classToRemove));
+
+              const caret = document.createElement('span');
+              caret.classList.add('caret');
+              toggle.text = option + " ";
+              toggle.appendChild(caret);
+
+              if (option === "Passed") {
+                toggle.classList.add("btn-success");
+              } else if (option === "Failed") {
+                toggle.classList.add("btn-danger");
+              } else {
+                toggle.classList.add("btn-warning");
+              }
+            } else {
+              sweetAlert("Uh oh...", "We're having trouble updating " +
+                  "this project right now. Please try again later.", "error");
+              throw new Exception(FetchException.REQUEST_FAILED, response);
+            }
+          })
+          .catch(error => {
+            sweetAlert("Uh oh...", "We're having trouble updating " +
+                "this project right now. Please try again later.", "error");
+            throw new Exception(FetchException.REQUEST_FAILED, error);
+          });
+    }
   }
 }

frontend/stylesheets/pages/_dashboard.scss

@@ -31,3 +31,13 @@
 .profile-container {
   padding: 0 0 0 15px;
 }
+
+.mp-description {
+  margin: 5px 0 15px;
+
+  word-wrap: break-word;
+
+  &:last-of-type {
+    margin: 5px 0;
+  }
+}

frontend/stylesheets/pages/_management.scss

@@ -124,7 +124,9 @@
 }
 
 .btn-mp {
+  float: right;
   margin-top: 20px;
+  margin-right: 15px;
 }
 
 .stat-number {