Adding all members and ebaord to page

Author: devinmatte

frontend/scss/components/_datatables.scss

@@ -27,4 +27,9 @@ div {
       width: 100%;
     }
   }
+
+  .eval-blocks {
+    margin-bottom: 30px;
+  }
 }
+

packet/ldap.py

@@ -85,11 +85,19 @@ def ldap_get_eboard():
         ) + _ldap_get_group_members("eboard-financial") + _ldap_get_group_members("eboard-history"
         ) + _ldap_get_group_members("eboard-imps") + _ldap_get_group_members("eboard-opcomm"
         ) + _ldap_get_group_members("eboard-research") + _ldap_get_group_members("eboard-social"
-        ) + _ldap_get_group_members("eboard-secretary")
+        ) + _ldap_get_group_members("eboard-secretary") + _ldap_get_group_members("eboard-pr")
 
     return members
 
 
+def ldap_get_live_onfloor():
+    members = []
+    onfloor = ldap_get_onfloor_members()
+    for member in onfloor:
+        if ldap_get_roomnumber(member) and not ldap_is_eboard(member):
+            members.append(member)
+    return members
+
 # Status checkers
 
 def ldap_is_active(account):
@@ -155,4 +163,4 @@ def ldap_get_roomnumber(account):
     try:
         return account.roomNumber
     except AttributeError:
-        return ""
+        return None

packet/models.py

@@ -11,9 +11,11 @@
 # The required number of off-floor and alumni signatures
 REQUIRED_MISC_SIGNATURES = 15
 
+
 def end_date():
     return datetime.now() + timedelta(days=14)
 
+
 class Freshman(db.Model):
     __tablename__ = "freshman"
     rit_username = Column(String(10), primary_key=True)
@@ -29,15 +31,16 @@ def current_packet(self):
         """
         return self.packets[0]
 
+
 class Packet(db.Model):
     __tablename__ = "packet"
     id = Column(Integer, primary_key=True, autoincrement=True)
     freshman_username = Column(ForeignKey("freshman.rit_username"))
     start = Column(DateTime, default=datetime.now, nullable=False)
     end = Column(DateTime, default=end_date, nullable=False)
-    info_eboard = Column(Text, nullable=True)       # Used to fulfil the eboard description requirement
-    info_events = Column(Text, nullable=True)       # Used to fulfil the events list requirement
-    info_achieve = Column(Text, nullable=True)      # Used to fulfil the technical achievements list requirement
+    info_eboard = Column(Text, nullable=True)  # Used to fulfil the eboard description requirement
+    info_events = Column(Text, nullable=True)  # Used to fulfil the events list requirement
+    info_achieve = Column(Text, nullable=True)  # Used to fulfil the technical achievements list requirement
 
     freshman = relationship("Freshman", back_populates="packets")
     upper_signatures = relationship("UpperSignature")
@@ -60,6 +63,7 @@ def signatures_received(self):
 
         return upper_count + fresh_count + misc_count
 
+
 class UpperSignature(db.Model):
     __tablename__ = "signature_upper"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)
@@ -70,6 +74,7 @@ class UpperSignature(db.Model):
 
     packet = relationship("Packet", back_populates="upper_signatures")
 
+
 class FreshSignature(db.Model):
     __tablename__ = "signature_fresh"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)
@@ -79,6 +84,7 @@ class FreshSignature(db.Model):
 
     packet = relationship("Packet", back_populates="fresh_signatures")
 
+
 class MiscSignature(db.Model):
     __tablename__ = "signature_misc"
     packet_id = Column(Integer, ForeignKey("packet.id"), primary_key=True)

packet/routes.py

@@ -8,7 +8,7 @@
 from packet.utils import before_request
 from . import auth, app
 from .models import Freshman
-from .ldap import ldap_get_eboard
+from .ldap import ldap_get_live_onfloor, ldap_get_eboard
 
 
 @app.route("/")
@@ -34,8 +34,9 @@ def index(info=None):
 @auth.oidc_auth
 @before_request
 def freshman_packet(uid, info=None):
+    onfloor = ldap_get_live_onfloor()
     eboard = ldap_get_eboard()
-    return render_template("packet.html", info=info, eboard=eboard, uid=uid)
+    return render_template("packet.html", info=info, eboard=eboard, onfloor=onfloor, uid=uid)
 
 
 @app.route("/csh-auth/")

packet/templates/packet.html

@@ -9,7 +9,7 @@ <h3 class="page-title">Packet Name</h3>
         </div>
         <div id="eval-blocks">
             <div id="eval-table">
-                <div class="card">
+                <div class="card mb-3">
                     <div class="card-body table-fill">
                         <div class="card-body table-fill">
                             <div class="table-responsive">
@@ -43,6 +43,40 @@ <h3 class="page-title">Packet Name</h3>
                         </div>
                     </div>
                 </div>
+                <div class="card mb-3">
+                    <div class="card-body table-fill">
+                        <div class="card-body table-fill">
+                            <div class="table-responsive">
+                                <table class="table table-striped no-bottom-margin" data-module="table"
+                                       data-searchable="true" data-sort-column="3" data-sort-order="asc"
+                                       data-length-changable="true" data-paginated="false">
+                                    <thead>
+                                    <tr>
+                                        <th>Name</th>
+                                        <th>Signature</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    {% for m in onfloor %}
+                                        <tr>
+                                            <td>
+                                                <img class="eval-user-img" alt="{{ m['uid'] }}"
+                                                     src="https://profiles.csh.rit.edu/image/{{ m['uid'] }}"
+                                                     width="30"
+                                                     height="30"/> {{ m['name'] }}
+                                            </td>
+                                            <td>
+                                                <span class="glyphicon glyphicon-ok-sign green eval-info-status"></span>
+                                                {{ m['signed'] }}
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>