-
{{meeting["name"]}}
+
+ {{meeting["name"]}}
+ {% if meeting["name"] == "Ad-Hoc" %}
+ - {{meeting["adhoc"]}}
+ {% endif %}
+
{{meeting["date"]}}
diff --git a/conditional/templates/dashboard.html b/conditional/templates/dashboard.html
index 572055e4..91d7f684 100644
--- a/conditional/templates/dashboard.html
+++ b/conditional/templates/dashboard.html
@@ -505,7 +505,12 @@
Directorship Meeting Attendance
{% for meeting in cm_attendance %}
- | {{meeting['committee']}} |
+
+ {{meeting['committee']}}
+ {% if meeting['committee'] == "Ad-Hoc" %}
+ - {{meeting['adhoc']}}
+ {% endif %}
+ |
{{meeting['timestamp'].strftime('%Y-%m-%d')}} |
{% endfor %}
diff --git a/conditional/util/member.py b/conditional/util/member.py
index d3154267..6e3d5f67 100644
--- a/conditional/util/member.py
+++ b/conditional/util/member.py
@@ -74,7 +74,8 @@ def get_cm(member):
).with_entities(
MemberCommitteeAttendance.uid,
CommitteeMeeting.timestamp,
- CommitteeMeeting.committee
+ CommitteeMeeting.committee,
+ CommitteeMeeting.adhoc
).filter(
CommitteeMeeting.timestamp > start_of_year(),
MemberCommitteeAttendance.uid == member.uid,
@@ -84,7 +85,8 @@ def get_cm(member):
c_meetings = [{
"uid": cm.uid,
"timestamp": cm.timestamp,
- "committee": cm.committee
+ "committee": cm.committee,
+ "adhoc": cm.adhoc
} for cm in query_result]
return c_meetings
diff --git a/frontend/javascript/exceptions/adhocException.js b/frontend/javascript/exceptions/adhocException.js
new file mode 100644
index 00000000..2aa52b06
--- /dev/null
+++ b/frontend/javascript/exceptions/adhocException.js
@@ -0,0 +1,12 @@
+import { Enumify } from 'enumify';
+
+export default class AdHocException extends Enumify {
+ NO_FOLLOW_ATTRIBUTE = AdHocException("Unable to find follow query selector for adhoc module");
+ NO_PARENT_ATTRIBUTE = AdHocException("Unable to find parent element id for adhoc module");
+ _ = AdHocException.closeEnum();
+
+ constructor(message) {
+ super();
+ this.message = message;
+ }
+}
diff --git a/frontend/javascript/modules/adhoc.js b/frontend/javascript/modules/adhoc.js
new file mode 100644
index 00000000..f0e53a1d
--- /dev/null
+++ b/frontend/javascript/modules/adhoc.js
@@ -0,0 +1,68 @@
+/* global fetch */
+import "whatwg-fetch";
+import "@selectize/selectize";
+import FetchUtil from "../utils/fetchUtil";
+import Exception from "../exceptions/exception";
+import AttendanceException from "../exceptions/attendanceException";
+import AdHocException from "../exceptions/adhocException";
+import FetchException from "../exceptions/fetchException";
+
+export default class AdHoc {
+ constructor(element) {
+ this.element = element;
+ this.dataSrc = element.dataset.src;
+ this.followSelector = element.dataset.follow;
+ this.parentId = element.dataset.parent;
+ this.list = element.list;
+
+ if (!this.followSelector) {
+ throw new Exception(AdHocException.NO_FOLLOW_ATTRIBUTE);
+ } else if (!this.parentId) {
+ throw new Exception(AdHocException.NO_PARENT_ATTRIBUTE);
+ }
+
+ if (this.dataSrc) {
+ fetch('/attendance/' + this.dataSrc, {
+ method: 'GET',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ credentials: 'same-origin'
+ })
+ .then(FetchUtil.checkResponse)
+ .then(FetchUtil.parseJSON)
+ .then(response => {
+ response.adhocs.forEach(item => {
+ const option = document.createElement('option');
+ option.value = item
+ element.list.appendChild(option);
+ });
+ this.render();
+ })
+ .catch(error => {
+ throw new Exception(FetchException.REQUEST_FAILED, error);
+ });
+ } else {
+ throw new Exception(AttendanceException.NO_SRC_ATTRIBUTE);
+ }
+ }
+
+ render() {
+ const parentElem = document.getElementById(this.parentId);
+
+ document.querySelectorAll(this.followSelector).forEach(input => {
+ if (input.value === "Ad-Hoc") {
+ parentElem.style.display = "block";
+ }
+
+ input.addEventListener("change", event => {
+ if (event.target.value === "Ad-Hoc") {
+ parentElem.style.display = "block";
+ } else {
+ parentElem.style.display = "none";
+ }
+ });
+ });
+ }
+}
diff --git a/frontend/javascript/modules/attendanceForm.js b/frontend/javascript/modules/attendanceForm.js
index 0af8e0d7..b8ebb3d2 100644
--- a/frontend/javascript/modules/attendanceForm.js
+++ b/frontend/javascript/modules/attendanceForm.js
@@ -41,6 +41,11 @@ export default class AttendanceForm {
e.preventDefault();
let payload = {};
+
+ if (this.fields.committee.value === "Ad-Hoc") {
+ this.fields.adhoc = this.form.elements.adhoc;
+ }
+
Object.keys(this.fields).forEach(field => {
if (field === "attendees") {
let membersSplit = MemberUtil.splitFreshmenUpperclassmen(
diff --git a/migrations/versions/3f094d78df95_add_adhoc_column_to_committee_meetings.py b/migrations/versions/3f094d78df95_add_adhoc_column_to_committee_meetings.py
new file mode 100644
index 00000000..fdb5c626
--- /dev/null
+++ b/migrations/versions/3f094d78df95_add_adhoc_column_to_committee_meetings.py
@@ -0,0 +1,30 @@
+"""add adhoc column to committee_meetings
+
+Revision ID: 3f094d78df95
+Revises: 5e8db174ce30
+Create Date: 2026-09-30 02:03:08.999839
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '3f094d78df95'
+down_revision = '5e8db174ce30'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ with op.batch_alter_table('committee_meetings', schema=None) as batch_op:
+ batch_op.add_column(sa.Column('adhoc', sa.String(), nullable=True))
+
+ # ### end Alembic commands ###
+
+
+def downgrade():
+ # ### commands auto generated by Alembic - please adjust! ###
+ with op.batch_alter_table('committee_meetings', schema=None) as batch_op:
+ batch_op.drop_column('adhoc')
+
+ # ### end Alembic commands ###