Merge pull request #15 from devinmatte/master

Prompting for Signature, and making call

Author: devinmatte

packet/packet.py

@@ -2,25 +2,25 @@
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db
 
 
-def sign(member_username, freshman_username):
+def sign(signer_username, freshman_username):
     freshman = Freshman.query.filter_by(rit_username=freshman_username).first()
     if freshman is None:
         return False
-
     packet = freshman.current_packet()
     if packet is None:
         return False
     if not packet.is_open():
         return False
 
-    upper_signature = UpperSignature.query.filter_by(member=member_username).first()
-    fresh_signature = FreshSignature.query.filter_by(freshman_username=member_username).first()
+    upper_signature = UpperSignature.query.filter(UpperSignature.member == signer_username).first()
+    fresh_signature = FreshSignature.query.filter(FreshSignature.freshman_username == signer_username).first()
+
     if upper_signature:
         upper_signature.signed = True
     elif fresh_signature:
         fresh_signature.signed = True
     else:
-        db.session.add(MiscSignature(packet.id, member_username, datetime.now(), packet))
+        db.session.add(MiscSignature(packet.id, signer_username, datetime.now(), packet))
     db.session.commit()
 
     return True
@@ -37,8 +37,8 @@ def get_signatures(freshman_username):
 
 
 def get_number_signed(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_received()
+    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_received()
 
 
 def get_number_required(freshman_username):
-    return Freshman.query.filter_by(rit_username=freshman_username)[0].current_packet().signatures_required()
+    return Freshman.query.filter_by(rit_username=freshman_username).first().current_packet().signatures_required()

packet/routes/api.py

@@ -1,18 +1,18 @@
 from packet import auth, app
 from packet.utils import before_request
-from packet.packet import sign
+from packet.packet import sign as sign_packet
 
 
-@app.route("/api/v1/<member_username>/sign/<packet_username>")
+@app.route("/api/v1/<member_username>/sign/<packet_username>", methods=["POST"])
 @auth.oidc_auth
 @before_request
 def sign(member_username, packet_username, info):
-    if info.uid != member_username:
-        if info.member_info:
-            if "eboard-evaluations" not in info.member_info.group_list:
+    if info['uid'] != member_username:
+        if info['member_info']:
+            if "eboard-evaluations" not in info['member_info']['group_list']:
                 return "Error: You are not evals"
         else:
             return "Error: UID Submission Mismatch"
-    if not sign(member_username, packet_username):
+    if not sign_packet(member_username, packet_username):
         return "Error: Signature not valid.  Reason: Unknown"
     return "Success: Signed Packet: " + packet_username

packet/routes/shared.py

@@ -12,8 +12,8 @@
 def freshman_packet(uid, info=None):
     freshman = Freshman.query.filter_by(rit_username=uid)[0]
     signatures = get_signatures(uid)
-    required = get_number_required(uid)
-    signed = get_number_signed(uid)
+    required = sum(get_number_required(uid).values())
+    signed = sum(get_number_signed(uid).values())
     return render_template("packet.html", info=info, signatures=signatures, uid=uid, required=required, signed=signed,
                            freshman=freshman)
 

packet/static/js/signing.js

@@ -0,0 +1,29 @@
+$(document).ready(function () {
+
+    $('.sign-button').click(function () {
+        var packetData = $(this).get(0).dataset;
+        var userData = $("#userInfo").val();
+        console.log(userData);
+        swal({
+            title: "Are you sure?",
+            text: "Once a packet is signed it can only be unsigned from request to the Evals Director",
+            icon: "warning",
+            buttons: true,
+            dangerMode: true,
+        })
+            .then((willSign) => {
+                if (willSign) {
+                    $.ajax({
+                        url: "/api/v1/" + userData + "/sign/" + packetData.freshman_uid,
+                        method: "POST",
+                        success: function (data) {
+                            swal("Congratulations or I'm Sorry\nYou've signed " + packetData.freshman_name + "'s packet", {
+                                icon: "success",
+                            });
+                        }
+                    });
+                }
+            });
+    });
+
+});

packet/templates/active_packets.html

@@ -31,12 +31,14 @@ <h3 class="page-title">Active Packets</h3>
                                                         {{ packet.freshman.name }}
                                                     </td>
                                                     <td>
-                                                        <span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>
                                                         {{ packet.signatures_received() }}
                                                     </td>
                                                     <td class="sign-packet" align="right">
                                                         {# if not signed #}
-                                                        <button class="btn btn-primary">Sign</button>
+                                                        <button class="btn btn-primary sign-button"
+                                                                data-freshman_uid="{{ packet.freshman.rit_username }}"
+                                                                data-freshman_name="{{ packet.freshman.name }}">Sign
+                                                        </button>
                                                         {# else if signed #}
                                                         <button class="btn btn-primary" disabled="disabled"><i
                                                                 class="fa fa-check"></i>&nbsp;Signed
@@ -55,7 +57,6 @@ <h3 class="page-title">Active Packets</h3>
                 </div>
             {% else %}
                 <div class="alert alert-info" role="alert">
-                    <span class="glyphicon glyphicon-info-sign white" style="padding-right:5px"></span>
                     There are currently no active packets.
                 </div>
             {% endif %}

packet/templates/include/head.html

@@ -22,6 +22,8 @@
 
     <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/>
 
+    <script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
+
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
 
     <link rel="stylesheet" href="/static/css/packet.css">

packet/templates/include/nav.html

@@ -25,6 +25,7 @@
                     </a>
 
                     <div class="dropdown-menu" aria-labelledby="user01">
+                        <input id="userInfo" hidden value="{{ info.uid }}">
                         {% if info.realm == "csh" %}
                             <a class="dropdown-item" href="/">Profile</a>
                             <a class="dropdown-item" href="https://themeswitcher.csh.rit.edu/">Theme</a>

packet/templates/include/scripts.html

@@ -9,6 +9,8 @@
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
 
+<script src="/static/js/signing.js"></script>
+
 <script type="text/javascript">
   $(document).ready(function(){
   	$('[data-toggle="tooltip"]').tooltip()

packet/templates/packet.html

@@ -9,6 +9,16 @@ <h3 class="page-title">{{ freshman.name }}</h3>
         </div>
         <div>
             Signatures: {{ signed }}/{{ required }}
+            {# if not signed #}
+            <button class="btn btn-primary sign-button"
+                    data-freshman_uid="{{ freshman.rit_username }}"
+                    data-freshman_name="{{ freshman.name }}">Sign
+            </button>
+            {# else if signed #}
+            <button class="btn btn-primary" disabled="disabled"><i
+                    class="fa fa-check"></i>&nbsp;Signed
+            </button>
+            {# endif #}
         </div>
         <div id="eval-blocks">
             <div id="eval-table">
@@ -103,11 +113,11 @@ <h3 class="page-title">{{ freshman.name }}</h3>
                                     {% for m in signatures.freshmen %}
                                         <tr>
                                             <td>
-                                                <a href="/packet/{{ m.freshman }}">
-                                                    <img class="eval-user-img" alt="{{ m.freshman }}"
-                                                         src="https://profiles.csh.rit.edu/image/{{ m.freshman }}"
+                                                <a href="/packet/{{ m.freshman.rit_username }}">
+                                                    <img class="eval-user-img" alt="{{ m.freshman.rit_username }}"
+                                                         src="https://profiles.csh.rit.edu/image/{{ m.freshman.rit_username }}"
                                                          width="30"
-                                                         height="30"/> {{ get_freshman_name(m.freshman) }}
+                                                         height="30"/> {{ get_freshman_name(m.freshman.rit_username) }}
                                                 </a>
                                             </td>
                                             <td>
@@ -165,4 +175,4 @@ <h3 class="page-title">{{ freshman.name }}</h3>
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock %}