setup
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ class User(UserMixin, db.Model):
|
||||
|
||||
def set_password(self, password):
|
||||
"""Set password hash"""
|
||||
self.password_hash = generate_password_hash(password)
|
||||
self.password_hash = generate_password_hash(password, method='pbkdf2:sha256')
|
||||
|
||||
def check_password(self, password):
|
||||
"""Check password"""
|
||||
|
||||
@@ -65,11 +65,11 @@ def add_reservation():
|
||||
|
||||
# Populate classroom choices
|
||||
classrooms = Classroom.query.filter_by(is_active=True).all()
|
||||
form.classroom_id.choices = [(c.id, c'{c.code} - {c.name} ({c.capacity} seats)') for c in classrooms]
|
||||
form.classroom_id.choices = [(c.id, f'{c.code} - {c.name} ({c.capacity} seats)') for c in classrooms]
|
||||
|
||||
# Populate commission choices
|
||||
commissions = Commission.query.filter_by(is_active=True).all()
|
||||
form.commission_id.choices = [(c.id, c'{c.get_full_code()} - {c.teacher_name}') for c in commissions]
|
||||
form.commission_id.choices = [(c.id, f'{c.get_full_code()} - {c.teacher_name}') for c in commissions]
|
||||
|
||||
if form.validate_on_submit():
|
||||
# Check for conflicts
|
||||
@@ -139,10 +139,10 @@ def edit_reservation(Id):
|
||||
|
||||
# Populate choices
|
||||
classrooms = Classroom.query.filter_by(is_active=True).all()
|
||||
form.classroom_id.choices = [(c.id, c'{c.code} - {c.name} ({c.capacity} seats)') for c in classrooms]
|
||||
form.classroom_id.choices = [(c.id, f'{c.code} - {c.name} ({c.capacity} seats)') for c in classrooms]
|
||||
|
||||
commissions = Commission.query.filter_by(is_active=True).all()
|
||||
form.commission_id.choices = [(c.id, c'{c.get_full_code()} - {c.teacher_name}') for c in commissions]
|
||||
form.commission_id.choices = [(c.id, f'{c.get_full_code()} - {c.teacher_name}') for c in commissions]
|
||||
|
||||
if form.validate_on_submit():
|
||||
# Check for conflicts (excluding this reservation)
|
||||
|
||||
Reference in New Issue
Block a user