fix issue #4 and constraint non-null for workshop fields

onlyphantom · Jan 25, 2019 · ab63bb7 · ab63bb7
1 parent 368fd80
commit ab63bb7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/analytics.py b/app/analytics.py
@@ -327,7 +327,7 @@ def global_total_stats():
         # 'studenthours': sum(df['workshop_hours'] * df['class_size']),
         'companies': sum(df['workshop_category'] == 'Corporate'),
         'instructors': len(df['workshop_instructor'].unique()),
-        'topten': g.df2.loc[:,['name','workshop_hours', 'class_size']].groupby(
+        'topten': g.df2[g.df2.name != 'Capstone'].loc[:,['name','workshop_hours', 'class_size']].groupby(
             'name').sum().sort_values(
                 by='workshop_hours', 
                 ascending=False).head(10).rename_axis(None).to_html(classes=['table thead-light table-striped table-bordered table-hover table-sm'])
@@ -371,8 +371,7 @@ def person_total_stats():
         'fullstar': fullstar,
         'responsecount': len(responses),
         'qualitative': qualitative,
-        # change here:
-        'topten': g.df2.loc[:,['name','workshop_hours', 'class_size']].groupby(
+        'topten': g.df2[g.df2.name != 'Capstone'].loc[:,['name','workshop_hours', 'class_size']].groupby(
             'name').sum().sort_values(
                 by='workshop_hours', 
                 ascending=False).head(10).rename_axis(None).to_html(classes=['table thead-light table-striped table-bordered table-hover table-sm'])

diff --git a/app/models.py b/app/models.py
@@ -39,10 +39,10 @@ class Workshop(db.Model):
         name="workshop_category"), nullable=False)
     workshop_instructor = db.Column(db.Integer, db.ForeignKey(
         'employee.id'), nullable=False)
-    workshop_start = db.Column(db.DateTime, default=datetime.utcnow)
-    workshop_hours = db.Column(db.Integer)
-    workshop_venue = db.Column(db.String(64))
-    class_size = db.Column(db.Integer)
+    workshop_start = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
+    workshop_hours = db.Column(db.Integer, nullable=False)
+    workshop_venue = db.Column(db.String(64), nullable=False)
+    class_size = db.Column(db.Integer, nullable=False)
     responses = db.relationship('Response', backref='workshop', lazy='dynamic')
 
     def __repr__(self):