Add current student pruning

mbillow · mbillow · commit 699958c42152 · 2017-06-17T22:41:44.000-04:00
diff --git a/conditional/blueprints/housing.py b/conditional/blueprints/housing.py
@@ -11,7 +11,7 @@
 from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_get_roomnumber
 from conditional.util.ldap import ldap_get_current_students
-from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
+from conditional.util.ldap import ldap_set_active
 
 from conditional.util.flask import render_template
 
@@ -119,7 +119,7 @@ def change_room_numbers(rmnumber):
             account = ldap_get_member(occupant)
             account.roomNumber = rmnumber
             log.info('api', action='%s assigned to room %s' % (occupant, rmnumber))
-            ldap_add_member_to_group(account, "active")
+            ldap_set_active(account)
             log.info('api', action='%s marked as active because of room assignment' % occupant)
     # Delete any old occupants that are no longer in room.
         for old_occupant in [account for account in current_students
diff --git a/conditional/blueprints/member_management.py b/conditional/blueprints/member_management.py
@@ -33,8 +33,11 @@
 from conditional.util.ldap import ldap_set_active
 from conditional.util.ldap import ldap_set_inactive
 from conditional.util.ldap import ldap_set_housingpoints
+from conditional.util.ldap import ldap_set_current_student
+from conditional.util.ldap import ldap_set_non_current_student
 from conditional.util.ldap import ldap_get_active_members
 from conditional.util.ldap import ldap_get_member
+from conditional.util.ldap import ldap_get_current_students
 from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
 from conditional.util.ldap import _ldap_remove_member_from_group as ldap_remove_member_from_group
 from conditional.util.ldap import _ldap_is_member_of_group as ldap_is_member_of_group
@@ -549,7 +552,7 @@ def introductory_project_submit():
 def get_member(uid):
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
                      request_id=str(uuid.uuid4()))
-    log.info('api', action="get %s's information" & uid)
+    log.info('api', action="get {}'s information".format(uid))
 
     username = request.headers.get('x-webauth-user')
     account = ldap_get_member(username)
@@ -583,9 +586,32 @@ def clear_active_members():
     # Clear the active group.
     for account in members:
         log.info('api', action='remove %s from active status' % account.uid)
-        ldap_remove_member_from_group(account, 'active')
+        ldap_set_inactive(account)
     return jsonify({"success": True}), 200
 
+
+@member_management_bp.route('/manage/current/<uid>', methods=['POST', 'DELETE'])
+def remove_current_student(uid):
+    log = logger.new(user_name=request.headers.get("x-webauth-user"),
+                     request_id=str(uuid.uuid4()))
+
+
+    username = request.headers.get('x-webauth-user')
+    account = ldap_get_member(username)
+
+    if not ldap_is_eval_director(account):
+        return "must be eval director", 403
+
+    member = ldap_get_member(uid)
+    if request.method == 'DELETE':
+        log.info('api', action='remove {} from current_student'.format(uid))
+        ldap_set_non_current_student(member)
+    elif request.method == 'POST':
+        log.info('api', action='add {} to current_student'.format(uid))
+        ldap_set_current_student(member)
+    return jsonify({"success": True}), 200
+
+
 @member_management_bp.route('/manage/new', methods=['GET'])
 def new_year():
     log = logger.new(user_name=request.headers.get("x-webauth-user"),
@@ -598,6 +624,10 @@ def new_year():
     if not ldap_is_eval_director(account):
         return "must be eval director", 403
 
+    current_students = ldap_get_current_students()
+
+
     return render_template(request,
                            'new_year.html',
-                           username=username)
+                           username=username,
+                           current_students=current_students)
diff --git a/conditional/templates/new_year.html b/conditional/templates/new_year.html
@@ -7,27 +7,43 @@
     <div id="new-welcome">
         <h3 class="page-title">Welcome!</h3>
         <p>Is it that time of year already? Before we get started, please <strong>be careful and ready everything before continuing</strong>. Some actions taken on the next few steps can be detrimental if followed in the middle of the year. Once you are ready to proceed, click 'Begin' below.</p>
-        <a href="#" data-module="newYear" data-step="welcome" class="btn btn-primary btn-new-next center-block"><span class="glyphicon glyphicon-chevron-down"></span> Begin</a>
+        <a href="#" data-module="newYear" data-step="welcome" class="btn btn-primary btn-new-next center-block"><span class="glyphicon glyphicon-ok"></span> Begin</a>
     </div>
     <div id="new-clear" style="display: none;">
         <h3 class="page-title">Clear Active Members and Floor Roster</h3>
         <p>This is the scary part. In order to get everything ready for next year, we need to clear everyone from Active status and then clear the housing board. Once we get a fresh start, we will forward you onto the housing page to fill out the new housing board.</p>
         <a href="#" data-module="newYear" data-step="clear" class="btn btn-primary btn-new-next center-block"><span class="glyphicon glyphicon-erase"></span> Clear Active Group and Housing Board</a>
     </div>
+    <div id="new-current" style="display: none;">
+        <h3 class="page-title">Prune Current Students Group</h3>
+        <p>Take a second and scroll down the list, remove anyone who has graduated. Anyone in this list who is in good standing can become active, so it is important it is correct.</p>
+        <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="0" data-sort-order="asc" data-length-changable="true">
+            <thead>
+            <tr>
+                <th>Name</th>
+                <th>Remove</th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for student in current_students %}
+            <tr>
+                <td id="row-{{student.uid}}">{{student.displayName}}</td>
+                <td width=100px>
+                    <a href="#" data-module="newYear" data-uid="{{student.uid}}">
+                        <span id="rem-{{student.uid}}" class="glyphicon glyphicon-remove red align-center" style="width: 100%"></span>
+                        <span id="add-{{student.uid}}" class="glyphicon glyphicon-plus green align-center" style="width: 100%; display: none;"></span>
+                    </a>
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        <a href="#" data-module="newYear" data-step="current" class="btn btn-primary btn-new-next center-block"><span class="glyphicon glyphicon-ok"></span> Next Step</a>
+    </div>
     <div id="new-housing" style="display: none;">
         <h3 class="page-title">That was easy!</h3>
         <p>The next and final step is to go through and populate the housing board, the button below will even take you there. Just a note: adding people will automatically mark them as active, since they will be charged dues.</p>
         <a href="/housing" class="btn btn-primary btn-new-next center-block"><span class="glyphicon glyphicon-ok"></span> Onward and Upward!</a>
     </div>
 </div>
-
-<div class="modal fade" id="loadingModal" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="vertical-alignment-helper">
-        <div class="modal-dialog vertical-align-center">
-            <div class="modal-content">
-                SPIN...
-            </div>
-        </div>
-    </div>
-</div>
 {% endblock %}
diff --git a/conditional/util/ldap.py b/conditional/util/ldap.py
@@ -121,6 +121,18 @@ def ldap_set_inactive(account):
     ldap_get_member.cache_clear()
 
 
+def ldap_set_current_student(account):
+    _ldap_add_member_to_group(account, 'current_student')
+    ldap_get_current_students.cache_clear()
+    ldap_get_member.cache_clear()
+
+
+def ldap_set_non_current_student(account):
+    _ldap_remove_member_from_group(account, 'current_student')
+    ldap_get_current_students.cache_clear()
+    ldap_get_member.cache_clear()
+
+
 def ldap_get_roomnumber(account):
     try:
         return account.roomNumber
diff --git a/frontend/javascript/modules/newYear.js b/frontend/javascript/modules/newYear.js
@@ -1,13 +1,18 @@
 import FetchUtil from '../utils/fetchUtil';
+import Exception from "../exceptions/exception";
+import FetchException from "../exceptions/fetchException";
+import sweetAlert from "../../../node_modules/bootstrap-sweetalert/dev/sweetalert.es6.js"; // eslint-disable-line max-len
 
 export default class NewYear {
   constructor(link) {
     this.link = link;
     this.step = this.link.dataset.step;
+    this.uid = this.link.dataset.uid;
 
     this.endpoints = {
       housing: '/housing',
-      active: '/manage/active'
+      active: '/manage/active',
+      current: '/manage/current/'
     };
 
     this.render();
@@ -17,7 +22,7 @@ export default class NewYear {
       e.preventDefault();
 
       if (this.step === "welcome") {
-        $('#new-welcome').fadeOut(function() {
+        $('#new-welcome').fadeOut(() => {
           $("#new-clear").fadeIn();
         });
       } else if (this.step === "clear") {
@@ -28,11 +33,47 @@ export default class NewYear {
             fetch(this.endpoints.housing, {
               method: 'DELETE'
             })
-            .then($('#new-clear').fadeOut(function() {
-              $("#new-housing").fadeIn();
+            .then($('#new-clear').fadeOut(() => {
+              $("#new-current").fadeIn();
             })
-            );
+            ).catch(error => {
+              sweetAlert("Uh oh...", "We're having trouble submitting that " +
+                          "action right now. Please try again later.", "error");
+              throw new Exception(FetchException.REQUEST_FAILED, error);
+            });
           });
+      } else if (this.uid) {
+        if ($('#rem-' + this.uid).is(":visible")) {
+          fetch(this.endpoints.current + this.uid, {
+            method: 'DELETE'
+          }).then(() => {
+            $('#rem-' + this.uid).hide();
+            $('#add-' + this.uid).show();
+            var userRow = $('#row-' + this.uid)[0];
+            userRow.style.setProperty("text-decoration", "line-through");
+          }).catch(error => {
+            sweetAlert("Uh oh...", "We're having trouble submitting that " +
+                        "action right now. Please try again later.", "error");
+            throw new Exception(FetchException.REQUEST_FAILED, error);
+          });
+        } else {
+          fetch(this.endpoints.current + this.uid, {
+            method: 'POST'
+          }).then(() => {
+            $('#add-' + this.uid).hide();
+            $('#rem-' + this.uid).show();
+            var lineRow = $('#row-' + this.uid)[0];
+            lineRow.style.setProperty("text-decoration", "none");
+          }).catch(error => {
+            sweetAlert("Uh oh...", "We're having trouble submitting that " +
+                        "action right now. Please try again later.", "error");
+            throw new Exception(FetchException.REQUEST_FAILED, error);
+          });
+        }
+      } else if (this.step === "current") {
+        $('#new-current').fadeOut(function() {
+          $("#new-housing").fadeIn();
+        });
       }
     });
   }
