Removed Housing Evals Submition Model

Author: mbillow

conditional/blueprints/spring_evals.py

@@ -11,7 +11,6 @@
 from conditional.models.models import MajorProject
 from conditional.models.models import HouseMeeting
 from conditional.models.models import SpringEval
-from conditional.models.models import HousingEvalsSubmission
 
 from conditional.util.flask import render_template
 
@@ -55,20 +54,7 @@ def get_cm_count(member_id):
             print("User did not have existing spring eval data")
 
         eval_data = None
-        if internal:
-            eval_data = HousingEvalsSubmission.query.filter(
-                HousingEvalsSubmission.uid == uid).first()
 
-            if HousingEvalsSubmission.query.filter(HousingEvalsSubmission.uid == uid).count() > 0:
-                eval_data = \
-                    {
-                        'social_attended': eval_data.social_attended,
-                        'social_hosted': eval_data.social_hosted,
-                        'seminars_attended': eval_data.technical_attended,
-                        'seminars_hosted': eval_data.technical_hosted,
-                        'projects': eval_data.projects,
-                        'comments': eval_data.comments
-                    }
         h_meetings = [m.meeting_id for m in
                       MemberHouseMeetingAttendance.query.filter(
                           MemberHouseMeetingAttendance.uid == uid

conditional/models/models.py

@@ -253,32 +253,3 @@ def __init__(self, uid):
         self.active = True
         self.date_created = datetime.now()
         self.status = "Pending"
-
-
-class HousingEvalsSubmission(db.Model):
-    __tablename__ = 'housing_evals'
-    id = Column(Integer, primary_key=True)
-    uid = Column(String(32), nullable=False)
-    social_attended = Column(Text, nullable=False)
-    social_hosted = Column(Text, nullable=False)
-    technical_attended = Column(Text, nullable=False)
-    technical_hosted = Column(Text, nullable=False)
-    projects = Column(Text, nullable=False)
-    comments = Column(Text, nullable=False)
-    points = Column(Integer, nullable=False)
-    active = Column(Boolean, nullable=False)
-    date_created = Column(Date, nullable=False)
-
-    def __init__(self, uid, social_attended,
-                 social_hosted, technical_attended,
-                 technical_hosted, projects, comments):
-        self.uid = uid
-        self.social_attended = social_attended
-        self.social_hosted = social_hosted
-        self.technical_attended = technical_attended
-        self.technical_hosted = technical_hosted
-        self.projects = projects
-        self.comments = comments
-        self.points = 0
-        self.active = True
-        self.date_created = datetime.now()

migrations/versions/983d69afb7f8_.py

@@ -0,0 +1,39 @@
+"""empty message
+
+Revision ID: 983d69afb7f8
+Revises: 218de3b34a6f
+Create Date: 2016-10-18 22:36:45.102164
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '983d69afb7f8'
+down_revision = '218de3b34a6f'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('housing_evals')
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('housing_evals',
+    sa.Column('id', sa.INTEGER(), nullable=False),
+    sa.Column('uid', sa.VARCHAR(length=32), nullable=False),
+    sa.Column('social_attended', sa.TEXT(), nullable=False),
+    sa.Column('social_hosted', sa.TEXT(), nullable=False),
+    sa.Column('technical_attended', sa.TEXT(), nullable=False),
+    sa.Column('technical_hosted', sa.TEXT(), nullable=False),
+    sa.Column('projects', sa.TEXT(), nullable=False),
+    sa.Column('comments', sa.TEXT(), nullable=False),
+    sa.Column('points', sa.INTEGER(), nullable=False),
+    sa.Column('active', sa.BOOLEAN(), nullable=False),
+    sa.Column('date_created', sa.DATE(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    ### end Alembic commands ###