Merge pull request #229 from ComputerScienceHouse/adhoc_attendance

Adhoc attendance

Author: devinmatte

conditional/models/models.py

@@ -56,7 +56,7 @@ class CommitteeMeeting(db.Model):
     __tablename__ = 'committee_meetings'
     id = Column(Integer, primary_key=True)
     committee = Column(Enum('Evaluations', 'History', 'Social', 'Opcomm',
-                            'R&D', 'House Improvements', 'Financial', 'Chairman', name="committees_enum"),
+                            'R&D', 'House Improvements', 'Financial', 'Chairman', 'Ad-Hoc', name="committees_enum"),
                        nullable=False)
     timestamp = Column(DateTime, nullable=False)
     approved = Column(Boolean, nullable=False)

conditional/templates/attendance_cm.html

@@ -15,6 +15,7 @@ <h3 class="page-title">Meeting Attendance</h3>
                             <label for="committee" class="control-label">Meeting Type</label>
                             <select name="committee" class="form-control">
                                 <option value="Chairman">Chairman</option>
+                                <option value="Ad-Hoc">Ad-Hoc</option>
                                 <option value="Evaluations">Evaluations</option>
                                 <option value="Financial">Financial</option>
                                 <option value="R&D">Research and Development</option>

migrations/versions/3eaae92ce6b3_ad_hoc.py

@@ -0,0 +1,31 @@
+"""ad_hoc
+
+Revision ID: 3eaae92ce6b3
+Revises: 4ac8ff82410a
+Create Date: 2019-09-06 15:32:42.472975
+
+"""
+
+# revision identifiers, used by Alembic.
+from alembic.ddl import postgresql
+
+revision = '3eaae92ce6b3'
+down_revision = '4ac8ff82410a'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+def upgrade():
+    op.alter_column('committee_meetings', 'committee',
+               existing_type=postgresql.ENUM('Evaluations', 'History', 'Social', 'Opcomm',
+                            'R&D', 'House Improvements', 'Financial', 'Chairman', 'Ad-Hoc', name="committees_enum"),
+               nullable=False)
+
+
+def downgrade():
+    op.alter_column('committee_meetings', 'committee',
+               existing_type=postgresql.Enum('Evaluations', 'History', 'Social', 'Opcomm',
+                            'R&D', 'House Improvements', 'Financial', 'Chairman', name="committees_enum"),
+               nullable=False)