setup
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ class User(UserMixin, db.Model):
|
|||||||
|
|
||||||
def set_password(self, password):
|
def set_password(self, password):
|
||||||
"""Set password hash"""
|
"""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):
|
def check_password(self, password):
|
||||||
"""Check password"""
|
"""Check password"""
|
||||||
|
|||||||
@@ -63,13 +63,13 @@ def add_reservation():
|
|||||||
"""Add new reservation"""
|
"""Add new reservation"""
|
||||||
form = ReservationForm()
|
form = ReservationForm()
|
||||||
|
|
||||||
# Populate classroom choices
|
# Populate classroom choices
|
||||||
classrooms = Classroom.query.filter_by(is_active=True).all()
|
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
|
# Populate commission choices
|
||||||
commissions = Commission.query.filter_by(is_active=True).all()
|
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():
|
if form.validate_on_submit():
|
||||||
# Check for conflicts
|
# Check for conflicts
|
||||||
@@ -137,12 +137,12 @@ def edit_reservation(Id):
|
|||||||
|
|
||||||
form = ReservationForm(obj=reservation)
|
form = ReservationForm(obj=reservation)
|
||||||
|
|
||||||
# Populate choices
|
# Populate choices
|
||||||
classrooms = Classroom.query.filter_by(is_active=True).all()
|
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()
|
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():
|
if form.validate_on_submit():
|
||||||
# Check for conflicts (excluding this reservation)
|
# Check for conflicts (excluding this reservation)
|
||||||
|
|||||||
Reference in New Issue
Block a user