This commit is contained in:
Alejandro Vazquez
2026-03-26 18:17:04 -03:00
parent 48bace5167
commit 101afa20b5
3 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -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"""
+6 -6
View File
@@ -63,13 +63,13 @@ def add_reservation():
"""Add new reservation"""
form = ReservationForm()
# Populate classroom choices
# 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
@@ -137,12 +137,12 @@ def edit_reservation(Id):
form = ReservationForm(obj=reservation)
# Populate choices
# 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)
+1 -1
View File
@@ -1,4 +1,4 @@
from setuptools import setup, find_packages
pipfrom setuptools import setup, find_packages
setup(
name="edu-space-admin",