Merge pull request #93 from ComputerScienceHouse/develop

Version 3.0.6

Author: zedoax

packet/_version.py

@@ -1 +1 @@
-__version__ = "3.0.5"
+__version__ = "3.0.6"

packet/member.py

@@ -4,7 +4,7 @@
 from sqlalchemy import exc, text
 
 from .models import db, REQUIRED_MISC_SIGNATURES
-from .packet import get_number_required, get_misc_signatures
+from .packet import get_misc_signatures, get_number_required_off_floor
 
 LOGGER = getLogger(__name__)
 
@@ -22,7 +22,7 @@ def current_packets(member, intro=False, onfloor=False):
     SPacket = namedtuple('spacket', ['rit_username', 'name', 'did_sign', 'total_signatures', 'required_signatures'])
 
     packets = []
-    base_required = get_number_required()
+    base_required = get_number_required_off_floor()
 
     signed_packets = get_signed_packets(member, intro, onfloor)
     misc_signatures = get_misc_signatures()

packet/packet.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from functools import lru_cache
 
-from sqlalchemy import exc
+from sqlalchemy import exc, false, true
 
 from packet.ldap import ldap_get_member, ldap_is_intromember
 from .models import Freshman, UpperSignature, FreshSignature, MiscSignature, db, Packet
@@ -88,6 +88,7 @@ def get_signatures(freshman_username):
     misc_signatures = db.session.query(MiscSignature.member, Freshman.rit_username) \
         .select_from(MiscSignature).join(Packet).join(Freshman) \
         .filter(MiscSignature.packet_id == packet.id) \
+        .order_by(MiscSignature.updated.asc()) \
         .distinct().all()
 
     return {'eboard': eboard,
@@ -150,23 +151,41 @@ def get_number_signed(freshman_username, separated=False):
         .first().signatures_received(not separated)
 
 
-@lru_cache(maxsize=512)
-def get_number_required(separated=False):
+@lru_cache(maxsize=256)
+def get_number_required_on_floor(separated=False):
     """
     Get the number of required signatures for Packet (not counting on/off-floor status)
     :param separated: whether or not to separate those by category
     :return: a map or an integer of total signatures required
     """
-    return db.session.query(Packet) \
-        .filter(Packet.start < datetime.now(), Packet.end > datetime.now()).first().signatures_required(not separated)
+    return db.session.query(Packet).join(Freshman).filter(
+        Packet.start < datetime.now(),
+        Packet.end > datetime.now(),
+        Freshman.onfloor == true()
+    ).first().signatures_required(not separated)
+
+
+@lru_cache(maxsize=256)
+def get_number_required_off_floor(separated=False):
+    """
+    Get the number of required signatures for Packet (not counting on/off-floor status)
+    :param separated: whether or not to separate those by category
+    :return: a map or an integer of total signatures required
+    """
+    return db.session.query(Packet).join(Freshman).filter(
+        Packet.start < datetime.now(),
+        Packet.end > datetime.now(),
+        Freshman.onfloor == false()
+    ).first().signatures_required(not separated)
 
 
 @lru_cache(maxsize=512)
 def get_upperclassmen_percent(username, onfloor=False):
-    required = get_number_required(True)
-    upperclassmen_required = required['upperclassmen'] + required['eboard'] + required['miscellaneous']
     if onfloor:
-        upperclassmen_required -= 1
+        required = get_number_required_on_floor(True)
+    else:
+        required = get_number_required_off_floor(True)
+    upperclassmen_required = required['upperclassmen'] + required['eboard'] + required['miscellaneous']
 
     signatures = get_number_signed(username, True)
     upperclassmen_signature = signatures['upperclassmen'] + signatures['eboard'] + signatures['miscellaneous']
@@ -207,7 +226,8 @@ def clear_cache():
     """
     get_upperclassmen_percent.cache_clear()
     get_number_signed.cache_clear()
-    get_number_required.cache_clear()
+    get_number_required_on_floor.cache_clear()
+    get_number_required_off_floor.cache_clear()
     signed_packets.cache_clear()
     get_signatures.cache_clear()
     get_misc_signatures.cache_clear()

packet/routes/shared.py

@@ -1,9 +1,10 @@
 from flask import render_template, redirect
 
-from packet import auth, app, ldap
+from packet import auth, app
 from packet.ldap import ldap_is_eboard
 from packet.member import current_packets
-from packet.packet import get_number_required, get_number_signed, signed_packet, get_freshman
+from packet.packet import get_number_signed, signed_packet, get_freshman, \
+    get_number_required_off_floor, get_number_required_on_floor
 from packet.packet import get_signatures, get_upperclassmen_percent
 from packet.utils import before_request
 
@@ -22,7 +23,10 @@ def freshman_packet(uid, info=None):
     upperclassmen_percent = get_upperclassmen_percent(uid)
     signatures = get_signatures(uid)
     signed_dict = get_number_signed(uid, True)
-    required = get_number_required()
+    if freshman.onfloor:
+        required = get_number_required_on_floor()
+    else:
+        required = get_number_required_off_floor()
     signed = get_number_signed(uid)
 
     packet_signed = signed_packet(info['uid'], uid)

packet/templates/packet.html

@@ -179,7 +179,7 @@ <h5>Upperclassmen Score - {{ '%0.2f' % upperclassmen_percent }}%</h5>
                                    data-length-changable="true" data-paginated="false">
                                 <tbody>
                                 {% for m in signatures.misc %}
-                                    <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
+                                    <tr style="background-color: #4caf505e">
                                         <td width="3%">
                                             {{ loop.index }}.
                                         </td>