Merge pull request #110 from mxmeinhold/remove-essays

Removes the essays

Author: JoelEager

migrations/versions/fe83600ef3fa_remove_essays.py

@@ -0,0 +1,32 @@
+"""Remove essays
+
+Revision ID: fe83600ef3fa
+Revises: 0eeabc7d8f74
+Create Date: 2018-10-22 21:55:15.257440
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'fe83600ef3fa'
+down_revision = '0eeabc7d8f74'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('packet', 'info_events')
+    op.drop_column('packet', 'info_eboard')
+    op.drop_column('packet', 'info_achieve')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('packet', sa.Column('info_achieve', sa.TEXT(), autoincrement=False, nullable=True))
+    op.add_column('packet', sa.Column('info_eboard', sa.TEXT(), autoincrement=False, nullable=True))
+    op.add_column('packet', sa.Column('info_events', sa.TEXT(), autoincrement=False, nullable=True))
+    # ### end Alembic commands ###

packet/models.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 from itertools import chain
 
-from sqlalchemy import Column, Integer, String, Text, ForeignKey, DateTime, Boolean
+from sqlalchemy import Column, Integer, String, ForeignKey, DateTime, Boolean
 from sqlalchemy.orm import relationship
 
 from . import db
@@ -50,9 +50,6 @@ class Packet(db.Model):
     freshman_username = Column(ForeignKey("freshman.rit_username"))
     start = Column(DateTime, nullable=False)
     end = Column(DateTime, 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
 
     freshman = relationship("Freshman", back_populates="packets")
     upper_signatures = relationship("UpperSignature", lazy="subquery",

packet/routes/freshmen.py

@@ -19,33 +19,3 @@ def index(info=None):
         return redirect(url_for("freshman_packet", packet_id=most_recent_packet.id), 302)
     else:
         return redirect(url_for("packets"), 302)
-
-
-@app.route("/essays/<packet_id>/")
-@packet_auth
-@before_request
-def essays(packet_id, info=None):
-    packet = Packet.by_id(packet_id)
-
-    if packet is not None and packet.freshman_username == info["uid"]:
-        return render_template("essays.html", info=info, packet=packet)
-    else:
-        return redirect(url_for("index"), 302)
-
-
-@app.route("/essays/<packet_id>/", methods=["POST"])
-@packet_auth
-@before_request
-def submit_essays(packet_id, info=None):
-    packet = Packet.by_id(packet_id)
-
-    if packet is not None and packet.is_open() and packet.freshman_username == info["uid"]:
-        packet.info_eboard = request.form.get("info_eboard", None)
-        packet.info_events = request.form.get("info_events", None)
-        packet.info_achieve = request.form.get("info_achieve", None)
-
-        db.session.commit()
-        app.logger.info("Updated essays for {}".format(info["uid"]))
-        return redirect(url_for("essays", packet_id=packet_id), 302)
-    else:
-        return redirect(url_for("index"), 302)

packet/templates/essays.html

@@ -18,10 +18,6 @@
                     <li class="nav-item">
                         <a class="nav-link" href="{{ url_for("upperclassmen_total") }}">Signatures</a>
                     </li>
-                {% elif packet is defined and packet.freshman_username == info.uid %}
-                     <li class="nav-item">
-                        <a class="nav-link" href="{{ url_for("essays", packet_id=packet.id) }}">Essays</a>
-                    </li>
                 {% endif %}
 
             </ul>