Merge pull request #84 from ComputerScienceHouse/develop

Number Fix

Author: zedoax

packet/models.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 from functools import lru_cache
 
-from sqlalchemy import Column, Integer, String, Text, ForeignKey, DateTime, Boolean, and_, or_
+from sqlalchemy import Column, Integer, String, Text, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
 
 from . import db
@@ -68,13 +68,6 @@ def signatures_received(self, total=False):
         if misc_count > REQUIRED_MISC_SIGNATURES:
             misc_count = REQUIRED_MISC_SIGNATURES
 
-        if total:
-            return db.session.query(Packet.freshman_username) \
-                .select_from(Packet).outerjoin(UpperSignature).outerjoin(FreshSignature) \
-                .filter(or_(and_(Packet.freshman_username == self.freshman_username, UpperSignature.signed),
-                        and_(Packet.freshman_username == self.freshman_username, FreshSignature.signed))) \
-                .distinct().count() + misc_count
-
         eboard_count = db.session.query(UpperSignature.member) \
             .select_from(Packet).join(UpperSignature) \
             .filter(Packet.freshman_username == self.freshman_username,
@@ -94,6 +87,9 @@ def signatures_received(self, total=False):
                     FreshSignature.signed) \
             .distinct().count()
 
+        if total:
+            return eboard_count + upper_count + fresh_count + misc_count
+
         return {'eboard': eboard_count,
                 'upperclassmen': upper_count,
                 'freshmen': fresh_count,

packet/routes/shared.py

@@ -1,6 +1,7 @@
 from flask import render_template, redirect
 
-from packet import auth, app
+from packet import auth, app, ldap
+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_signatures, get_upperclassmen_percent
@@ -36,7 +37,7 @@ def freshman_packet(uid, info=None):
 def packets(info=None):
     if app.config["REALM"] == "csh":
         if info["member_info"]["onfloor"]:
-            if info["member_info"]["room"] is not None:
+            if info["member_info"]["room"] is not None or ldap_is_eboard(info['user_obj']):
                 open_packets = current_packets(info["uid"], False, True)
             else:
                 open_packets = current_packets(info["uid"], False, False)