Fix datatables (#531)

BigSpaceships · web-flow · commit ac9850caefb6 · 2026-03-26T18:23:31.000-04:00
* Fix datatables

* oops it builds now

* fix lint

* specified docker repo
diff --git a/Dockerfile b/Dockerfile
@@ -6,14 +6,14 @@ WORKDIR /opt/conditional
 
 COPY package.json package-lock.json /opt/conditional/
 
-RUN npm ci 
+RUN npm ci --ignore-scripts
 
 COPY webpack.config.js /opt/conditional
 COPY frontend /opt/conditional/frontend
 
 RUN npm run webpack 
 
-FROM astral/uv:python3.13-trixie-slim
+FROM docker.io/astral/uv:python3.13-trixie-slim
 LABEL maintainer="Computer Science House <webmaster@csh.rit.edu>"
 
 WORKDIR /opt/conditional
diff --git a/conditional/blueprints/housing.py b/conditional/blueprints/housing.py
@@ -13,6 +13,7 @@
 from conditional.util.ldap import ldap_get_roomnumber
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_set_active
+from conditional.util.user_dict import user_dict_is_eval_director
 
 logger = structlog.get_logger()
 
@@ -56,7 +57,7 @@ def display_housing(user_dict=None):
     # return names in 'first last (username)' format
     return render_template('housing.html',
                            username=user_dict['username'],
-                           queue=get_housing_queue(ldap_is_eval_director(user_dict['account'])),
+                           queue=get_housing_queue(user_dict_is_eval_director(user_dict)),
                            housing=housing,
                            room_list=sorted(list(room_list)))
 
@@ -67,7 +68,7 @@ def display_housing(user_dict=None):
 def change_queue_state(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
 
-    if not ldap_is_eval_director(user_dict['account']):
+    if not user_dict_is_eval_director(user_dict):
         return "must be eval director", 403
 
     post_data = request.get_json()
@@ -95,7 +96,7 @@ def change_room_numbers(rmnumber, user_dict=None):
 
     update = request.get_json()
 
-    if not ldap_is_eval_director(user_dict['account']):
+    if not user_dict_is_eval_director(user_dict):
         return "must be eval director", 403
 
     # Get the current list of people living on-floor.
diff --git a/conditional/templates/attendance_hm.html b/conditional/templates/attendance_hm.html
@@ -26,7 +26,7 @@ <h3 class="panel-title">Attendees</h3>
                     <input class="form-control" type="text" placeholder="Quick Select" data-module="hmSearch" data-target="table.hm-attendance">
                 </div>
                 <div class="table-responsive">
-                    <table class="table table-striped no-bottom-margin hm-attendance" data-module="table" data-sort-column="0" data-sort-order="asc" data-paginated="false">
+                    <table class="table table-striped no-bottom-margin hm-attendance" data-module="table" data-order="[[ 0, &quot;asc&quot; ]]"  data-paging="false">
                         <thead>
                             <tr>
                                 <th>Name</th>
diff --git a/conditional/templates/co_op_management.html b/conditional/templates/co_op_management.html
@@ -11,7 +11,7 @@ <h3 class="panel-title">Co-Op Management</h3>
         </div>
         <div class="panel-body table-fill">
             <div class="table-responsive">
-                <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="false" data-sort-column="1" data-sort-order="asc" data-length-changable="true" data-paginated="false">
+                <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="false" data-order="[[ 1, &quot;asc&quot; ]]" data-length-change="true" data-paging="false" data-info="true">
                     <thead>
                     <tr>
                         <th>Name</th>
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
@@ -462,7 +462,7 @@ <h3 class="panel-title">Directorship Meeting Attendance</h3>
     </div>
     
     <div class="panel-body table-fill">
-        <table class="table table-striped table-responsive" data-module="table">
+        <table class="table table-striped table-responsive" data-module="table" data-length-change="false" data-searching="false">
             <thead>
                 <tr>
                     <th>Event</th>
diff --git a/conditional/templates/gatekeep.html b/conditional/templates/gatekeep.html
@@ -126,10 +126,9 @@ <h4>Missed House Meetings</h4>
     </div>
     <div id="eval-table" style="display:none;">
     <div class="panel panel-default">
-        <div class="panel-body table-fill">
 	<div class="panel-body table-fill">
             <div class="table-responsive">
-                <table class="table table-striped" data-module="table" data-searchable="true" data-sort-column="4" data-sort-order="asc" data-length-changable="true" data-paginated="false">
+                <table class="table table-striped" data-module="table" data-order="[[ 4, &quot;asc&quot; ]]" data-length-change="true" data-paging="false" data-info="false">
                     <thead>
                     <tr>
                         <th>Name</th>
@@ -181,7 +180,6 @@ <h4>Missed House Meetings</h4>
                 </table>
             </div>
         </div>
-        </div>
     </div>
     </div>
 </div>
diff --git a/conditional/templates/housing.html b/conditional/templates/housing.html
@@ -18,7 +18,7 @@ <h3 class="panel-title">Housing Queue
                 </div>
                 <div class="panel-body table-fill">
                     <div class="table-responsive">
-                        <table class="table table-striped no-bottom-margin" data-module="table" data-paginated="false" data-ordering="false"{% if is_eval_director %} data-searchable="true" data-show="all"{% endif %}>
+                        <table class="table table-striped no-bottom-margin" data-module="table" data-paging="false" data-ordering="false"{% if is_eval_director %} data-search="true" data-show="all"{% endif %}>
                             <thead>
                                 <tr>
                                     <th>Member</th>
diff --git a/conditional/templates/intro_evals.html b/conditional/templates/intro_evals.html
@@ -174,18 +174,17 @@ <h4>Other Comments</h4>
 
 <div id="eval-table" style="display:none;">
     <div class="panel panel-default">
-        <div class="panel-body table-fill">
 	<div class="panel-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">
+                <table class="table table-striped" data-module="table" data-order="[[ 4, &quot;asc&quot; ]]" data-sort-order="asc" data-length-change="true" data-paging="false" data-info="false">
                     <thead>
                     <tr>
                         <th>Name</th>
                         <th>Result</th>
                         <th>Meetings</th>
                         <th>Signatures Missed</th>
                         <th>Technical Seminars</th>
-						<th>House Meetings Missed</th>
+                        <th>House Meetings Missed</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -239,7 +238,6 @@ <h4>Other Comments</h4>
                 </table>
             </div>
         </div>
-        </div>
     </div>
     </div>
 </div>
diff --git a/conditional/templates/logs.html b/conditional/templates/logs.html
@@ -8,26 +8,26 @@
     <h3 class="page-title">User Logs</h3>
     <div class="panel panel-default">
     <div class="panel-body table-fill">
-    <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="0" data-sort-order="desc" data-length-changable="true" data-page-length="100">
+    <table class="table table-striped" data-module="table" data-searchable="true" data-order="[[ 0, &quot;desc&quot; ]]" data-length-change="true" data-page-length="100">
     	<thead>
-    		<th>ID</th>
-    		<th>Method</th>
-    		<th>User</th>
-    		<th>Blueprint</th>
-    		<th>URL</th>
-    		<th>Description</th>
+	    <th>ID</th>
+	    <th>Method</th>
+	    <th>User</th>
+	    <th>Blueprint</th>
+	    <th>URL</th>
+	    <th>Description</th>
     	</thead>
     	<tbody>
-    		{% for log in logs %}
-    		<tr>
-    			<td>{{log.timestamp}}</td>
-    			<td>{{log.method}}</td>
-    			<td>{{log.uid}}</td>
-    			<td>{{log.blueprint}}</td>
-    			<td>{{log.path}}</td>
-    			<td>{{log.description}}</td>
-    		</tr>
-			{% endfor %}
+	    {% for log in logs %}
+	    <tr>
+		<td data-sort="{{log.timestamp}}">{{log.timestamp}}</td>
+		<td>{{log.method}}</td>
+		<td>{{log.uid}}</td>
+		<td>{{log.blueprint}}</td>
+		<td>{{log.path}}</td>
+		<td>{{log.description}}</td>
+	    </tr>
+	    {% endfor %}
     	</tbody>
     </table>
     </div>
diff --git a/conditional/templates/member_management.html b/conditional/templates/member_management.html
@@ -102,7 +102,7 @@ <h3 class="panel-title">Freshman Management</h3>
         </div>
         <div class="panel-body table-fill">
             <div class="table-responsive">
-                <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"{% if freshmen|length < 11 %} data-paginated="false" {% endif %}>
+                <table class="table table-striped no-bottom-margin" data-module="table" data-order="[[ 0, &quot;asc&quot' ]]" data-length-change="true">
                     <thead>
                     <tr>
                         <th>Name</th>
@@ -145,7 +145,7 @@ <h3 class="panel-title">
         </div>
         <div class="panel-body table-fill">
             <div class="table-responsive">
-                <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">
+                <table class="table table-striped" data-module="table" data-order="[[ 0, &quot;asc&quot;]]" data-length-change="true">
                     <thead>
                         <tr>
                             <th>Name</th>
diff --git a/conditional/templates/new_year.html b/conditional/templates/new_year.html
@@ -17,7 +17,7 @@ <h3 class="page-title">Clear Active Members and Floor Roster</h3>
     <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">
+        <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-order="[[ 0, &quot;asc&quot; ]]" data-paging="false">
             <thead>
             <tr>
                 <th>Name</th>
diff --git a/conditional/templates/spring_evals.html b/conditional/templates/spring_evals.html
@@ -183,17 +183,16 @@ <h4>Major Projects</h4>
     </div>
     <div id="eval-table" style="display:none;">
     <div class="panel panel-default">
-        <div class="panel-body table-fill">
 	<div class="panel-body table-fill">
             <div class="table-responsive">
-                <table class="table table-striped no-bottom-margin" data-module="table" data-searchable="true" data-sort-column="4" data-sort-order="asc" data-length-changable="true" data-paginated="false">
+                <table class="table table-striped" data-module="table" data-order="[[ 4, &quot;asc&quot; ]]" data-sort-order="asc" data-length-change="true" data-paging="false" data-info="false">
                     <thead>
                     <tr>
                         <th>Name</th>
                         <th>Result</th>
                         <th>Meetings</th>
                         <th>Major Project</th>
-						<th>House Meetings Missed</th>
+                        <th>House Meetings Missed</th>
                     </tr>
                     </thead>
                     <tbody>
@@ -238,7 +237,6 @@ <h4>Major Projects</h4>
                 </table>
             </div>
         </div>
-        </div>
     </div>
     </div>
 </div>
diff --git a/conditional/util/housing.py b/conditional/util/housing.py
@@ -2,7 +2,7 @@
 
 from conditional.models.models import InHousingQueue
 from conditional.models.models import OnFloorStatusAssigned
-from conditional.util.ldap import ldap_get_member, ldap_is_current_student
+from conditional.util.ldap import ldap_get_current_students, ldap_get_member, ldap_is_current_student
 
 
 def get_housing_queue(is_eval_director=False):
@@ -24,7 +24,14 @@ def get_housing_queue(is_eval_director=False):
     }
 
     # CSHMember accounts that are in queue
-    potential_accounts = [ldap_get_member(username) for username in in_queue]
+    potential_accounts = []
+
+    if is_eval_director:
+        potential_accounts = ldap_get_current_students()
+    else:
+        potential_accounts = [ldap_get_member(username) for username in in_queue]
+
+        potential_accounts = [user for user in potential_accounts if ldap_is_current_student(user)]
 
     # Populate a list of dictionaries containing the name, username,
     # and on-floor datetime for each current studetn who has on-floor status
@@ -37,7 +44,7 @@ def get_housing_queue(is_eval_director=False):
             "time": in_queue.get(account.uid, {}).get('time', datetime.now()) or datetime.now(),
             "in_queue": account.uid in in_queue
         } for account in potential_accounts
-        if ldap_is_current_student(account) and (is_eval_director or account.roomNumber is None)
+        if is_eval_director or account.roomNumber is None
     ]
 
     # Sort based on time (ascending) and then points (decending).
diff --git a/frontend/javascript/modules/table.js b/frontend/javascript/modules/table.js
@@ -1,37 +1,8 @@
 /* global $ */
-import _ from "lodash";
-import "datatables.net-bs";
+import DataTable from "datatables.net-bs";
 
 export default class Table {
   constructor(table) {
-    this.table = table;
-
-    // Set options based on data attributes
-    this.sortColumn = (_.isNil(this.table.dataset.sortColumn) ||
-                        _.isNaN(this.table.dataset.sortColumn)) ?
-                        1 : this.table.dataset.sortColumn;
-    this.sortOrder = this.table.dataset.sortOrder === "asc" ? "asc" : "desc";
-
-    this.options = {
-      lengthChange: this.table.dataset.lengthChangable === 'true',
-      info: false,
-      paging: !(this.table.dataset.paginated === 'false'),
-      pagingType: "numbers",
-      order: [],
-      pageLength: this.table.dataset.pageLength || 10
-    };
-
-    // Just remove the search input from the DOM instead of disabling it
-    if (this.table.dataset.searchable !== 'true') {
-      this.options.dom = "lrtip";
-    }
-
-    this.render();
-  }
-
-  render() {
-    this.table = $(this.table).DataTable(this.options) // eslint-disable-line new-cap
-      .order([this.sortColumn, this.sortOrder])
-      .draw();
+    this.table = new DataTable(table)
   }
 }
diff --git a/frontend/stylesheets/app.scss b/frontend/stylesheets/app.scss
@@ -15,7 +15,6 @@ $bootstrap-icons-font-dir: "../fonts/";
 // Components
 @import 'components/switches';
 @import 'components/flat-buttons';
-@import 'components/datatables';
 @import 'components/date-picker';
 @import 'components/select';
 @import 'components/dropzone';
diff --git a/frontend/stylesheets/components/_datatables.scss b/frontend/stylesheets/components/_datatables.scss
diff --git a/webpack.config.js b/webpack.config.js
@@ -15,6 +15,7 @@ var babelQuery = {
 var webpackConfig = {
   context: jsSrc,
   entry: ["./javascript/app.js"],
+  devtool: "source-map",
   output: {
     path: path.normalize(jsDest),
     filename: 'js/app.js',
