General tweaks to model for applications

blender-bfct/application/controllers/main.py

@@ -18,6 +18,7 @@ class ApplicationForm(Form):
     website = URLField(validators=[url()])
     city_country = TextField('City and Country', validators=[DataRequired()])
     teaching = BooleanField('Teaching')
+    institution_name = TextField('School or institution name')
     skills = SelectMultipleField('Areas of expertise', coerce=int)
     video_example = URLField(validators=[url()])
     written_example = URLField(validators=[url()])

blender-bfct/application/models/applications.py

@@ -15,7 +15,7 @@ class Application(db.Model):
     network_profile = db.Column(db.String(255))
     website = db.Column(db.String(255))
     city_country = db.Column(db.String(255))
-    teaching = db.Column(db.Boolean())
+    institution_name = db.Column(db.String(255))
     skills = db.relationship('Skill', secondary='skills_applications',
                             backref=db.backref('applications', lazy='dynamic'))
     video_example = db.Column(db.String(255))
@@ -41,10 +41,15 @@ class Application(db.Model):
             return '--'
 
 
+
 class Skill(db.Model):
     id = db.Column(db.Integer(), primary_key=True)
     name = db.Column(db.String(80), unique=True)
     description = db.Column(db.String(255))
+    
+    def __str__(self):
+        return self.name
+
 
 
 skills_applications = db.Table('skills_applications',

blender-bfct/application/models/users.py

@@ -18,6 +18,10 @@ class User(db.Model, UserMixin):
     roles = db.relationship('Role', secondary='roles_users',
                             backref=db.backref('users', lazy='dynamic'))
 
+    def __str__(self):
+        return self.email
+
+
 class Role(db.Model, RoleMixin):
     __bind_key__ = 'users'
     id = db.Column(db.Integer(), primary_key=True)

blender-bfct/application/templates/apply.html

@@ -33,6 +33,13 @@
                  </div>
                 </label>
 
+                <label class="control-label">
+                 <div class="input-group input-group-lg">
+                   <span class="input-group-addon">Institution Name</span>
+                    {{ form.institution_name(class='form-control', placeholder='School or institution name') }} 
+                 </div>
+                </label>
+
                 <label class="control-label">
                  <div class="input-group input-group-lg">
                    <span class="input-group-addon">Areas of expertise</span>