setup update 3
This commit is contained in:
Alejandro Vazquez
+179
-161
@@ -1,214 +1,232 @@
|
||||
from flask import Blueprint, render_template, request, redirect, url_for, flash, jsonify
|
||||
from flask_login import login_required
|
||||
from flask import Blueprint, render_template, redirect, url_for, flash, request, jsonify
|
||||
from flask_login import login_required, current_user
|
||||
from datetime import datetime, date
|
||||
from app.models.classroom import Classroom
|
||||
from app.models.user import User
|
||||
from app.forms.classroom import ClassroomForm
|
||||
from app import db
|
||||
from app.models.classroom import Classroom, ClassroomResource
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
from app.forms.classroom import ClassroomForm, ClassroomResourceForm
|
||||
from datetime import datetime
|
||||
from sqlalchemy import text
|
||||
|
||||
classrooms_bp = Blueprint('classrooms', __name__, url_prefix='/classrooms')
|
||||
|
||||
@classrooms_bp.route('/')
|
||||
@login_required
|
||||
def list_classrooms():
|
||||
"""List all classrooms"""
|
||||
page = request.args.get('page', 1, type=int)
|
||||
search = request.args.get('search', '')
|
||||
campus = request.args.get('campus', '')
|
||||
|
||||
query = Classroom.query.filter_by(is_active=True)
|
||||
|
||||
if search:
|
||||
query = query.filter(
|
||||
Classroom.code.contains(search) |
|
||||
Classroom.name.contains(search) |
|
||||
Classroom.building.contains(search)
|
||||
)
|
||||
|
||||
if campus:
|
||||
query = query.filter(Classroom.campus_location == campus)
|
||||
|
||||
classrooms = query.paginate(
|
||||
page=page,
|
||||
per_page=20,
|
||||
error_out=False
|
||||
)
|
||||
|
||||
return render_template('classrooms/list.html',
|
||||
classrooms=classrooms,
|
||||
search=search,
|
||||
campus=campus)
|
||||
classrooms_bp = Blueprint('classrooms', __name__)
|
||||
|
||||
@classrooms_bp.route('/add', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def add_classroom():
|
||||
"""Add new classroom"""
|
||||
"""Add a new classroom"""
|
||||
form = ClassroomForm()
|
||||
|
||||
# TODO: Update when campus model is implemented
|
||||
# form.campus_id.choices = [(1, 'Main Campus')]
|
||||
|
||||
if form.validate_on_submit():
|
||||
classroom = Classroom(
|
||||
code=form.code.data,
|
||||
name=form.name.data,
|
||||
building=form.building.data,
|
||||
floor=form.floor.data,
|
||||
capacity=form.capacity.data,
|
||||
description=form.description.data,
|
||||
campus_location=form.campus_location.data
|
||||
)
|
||||
|
||||
try:
|
||||
existing_classroom = Classroom.query.filter_by(
|
||||
building=form.building.data,
|
||||
code=form.room_number.data,
|
||||
floor=form.floor.data
|
||||
).first()
|
||||
|
||||
if existing_classroom:
|
||||
flash('Classroom with this building, room number, and floor already exists.', 'error')
|
||||
return render_template('classrooms/add.html', form=form, title='Add Classroom')
|
||||
|
||||
classroom = Classroom(
|
||||
# campus_id=form.campus_id.data,
|
||||
building=form.building.data,
|
||||
code=form.room_number.data,
|
||||
name=f"{form.building.data}-{form.room_number.data}",
|
||||
floor=form.floor.data,
|
||||
capacity=form.capacity.data,
|
||||
description=form.description.data,
|
||||
is_active=form.is_active.data
|
||||
)
|
||||
|
||||
db.session.add(classroom)
|
||||
db.session.commit()
|
||||
flash(f'Classroom {classroom.code} added successfully!', 'success')
|
||||
|
||||
flash(f'Classroom {classroom.code_display} has been created successfully!', 'success')
|
||||
return redirect(url_for('classrooms.list_classrooms'))
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
flash('Error adding classroom. Classroom code might already exist.', 'error')
|
||||
flash(f'Error creating classroom: {str(e)}', 'error')
|
||||
|
||||
return render_template('classrooms/add.html', form=form)
|
||||
return render_template('classrooms/add.html', form=form, title='Add Classroom')
|
||||
|
||||
@classrooms_bp.route('/edit/<int:Id>', methods=['GET', 'POST'])
|
||||
@classrooms_bp.route('/list')
|
||||
@login_required
|
||||
def list_classrooms():
|
||||
"""List all classrooms"""
|
||||
try:
|
||||
# Get filters
|
||||
page = request.args.get('page', 1, type=int)
|
||||
active_only = request.args.get('active_only', 'true').lower() == 'true'
|
||||
search = request.args.get('search', '', type=str)
|
||||
|
||||
# Build query
|
||||
query = Classroom.query
|
||||
|
||||
if active_only:
|
||||
query = query.filter_by(is_active=True)
|
||||
|
||||
if search:
|
||||
query = query.filter(
|
||||
db.or_(
|
||||
Classroom.building.ilike(f'%{search}%'),
|
||||
Classroom.code.ilike(f'%{search}%'),
|
||||
Classroom.description.ilike(f'%{search}%')
|
||||
)
|
||||
)
|
||||
|
||||
# Paginate results
|
||||
classrooms = query.order_by(Classroom.building, Classroom.floor, Classroom.code).paginate(
|
||||
page=page, per_page=12, error_out=False
|
||||
)
|
||||
|
||||
return render_template('classrooms/list.html',
|
||||
classrooms=classrooms,
|
||||
active_only=active_only,
|
||||
search=search,
|
||||
title='Classrooms')
|
||||
|
||||
except Exception as e:
|
||||
flash(f'Error loading classrooms: {str(e)}', 'error')
|
||||
return render_template('classrooms/list.html', classrooms=None, title='Classrooms')
|
||||
|
||||
@classrooms_bp.route('/<int:id>')
|
||||
@login_required
|
||||
def edit_classroom(Id):
|
||||
"""Edit classroom"""
|
||||
classroom = Classroom.query.get_or_404(Id)
|
||||
|
||||
if not classroom.is_active:
|
||||
flash('This classroom has been deactivated.', 'warning')
|
||||
def view_classroom(id):
|
||||
"""View classroom details"""
|
||||
try:
|
||||
classroom = Classroom.query.get_or_404(id)
|
||||
|
||||
# Get upcoming reservations for this classroom
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
|
||||
upcoming_reservations = Reservation.query.filter(
|
||||
Reservation.classroom_id == id,
|
||||
Reservation.start_time > datetime.utcnow(),
|
||||
Reservation.status == ReservationStatus.CONFIRMED
|
||||
).order_by(Reservation.start_time).limit(10).all()
|
||||
|
||||
return render_template('classrooms/view.html',
|
||||
classroom=classroom,
|
||||
upcoming_reservations=upcoming_reservations,
|
||||
title=f'Classroom {classroom.code_display}')
|
||||
|
||||
except Exception as e:
|
||||
flash(f'Error loading classroom: {str(e)}', 'error')
|
||||
return redirect(url_for('classrooms.list_classrooms'))
|
||||
|
||||
|
||||
@classrooms_bp.route('/<int:id>/edit', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def edit_classroom(id):
|
||||
"""Edit classroom"""
|
||||
classroom = Classroom.query.get_or_404(id)
|
||||
form = ClassroomForm(obj=classroom)
|
||||
|
||||
# TODO: Update when campus model is implemented
|
||||
# form.campus_id.choices = [(1, 'Main Campus')]
|
||||
|
||||
if form.validate_on_submit():
|
||||
try:
|
||||
classroom.code = form.code.data
|
||||
classroom.name = form.name.data
|
||||
# Check for duplicates (excluding current classroom)
|
||||
existing_classroom = Classroom.query.filter(
|
||||
Classroom.building == form.building.data,
|
||||
Classroom.code == form.room_number.data,
|
||||
Classroom.floor == form.floor.data,
|
||||
Classroom.id != id
|
||||
).first()
|
||||
|
||||
if existing_classroom:
|
||||
flash('Classroom with this building, room number, and floor already exists.', 'error')
|
||||
return render_template('classrooms/edit.html', form=form, classroom=classroom, title='Edit Classroom')
|
||||
|
||||
# Update classroom
|
||||
# classroom.campus_id = form.campus_id.data
|
||||
classroom.building = form.building.data
|
||||
classroom.code = form.room_number.data
|
||||
classroom.name = f"{form.building.data}-{form.room_number.data}"
|
||||
classroom.floor = form.floor.data
|
||||
classroom.capacity = form.capacity.data
|
||||
classroom.description = form.description.data
|
||||
classroom.campus_location = form.campus_location.data
|
||||
classroom.is_active = form.is_active.data
|
||||
classroom.updated_at = datetime.utcnow()
|
||||
|
||||
db.session.commit()
|
||||
flash(f'Classroom {classroom.code} updated successfully!', 'success')
|
||||
return redirect(url_for('classrooms.view_classroom', Id=classroom.id))
|
||||
|
||||
flash(f'Classroom {classroom.code_display} has been updated successfully!', 'success')
|
||||
return redirect(url_for('classrooms.view_classroom', id=classroom.id))
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
flash('Error updating classroom.', 'error')
|
||||
flash(f'Error updating classroom: {str(e)}', 'error')
|
||||
|
||||
return render_template('classrooms/edit.html', form=form, classroom=classroom)
|
||||
return render_template('classrooms/edit.html', form=form, classroom=classroom, title='Edit Classroom')
|
||||
|
||||
@classrooms_bp.route('/view/<int:Id>')
|
||||
@classrooms_bp.route('/<int:id>/toggle', methods=['POST'])
|
||||
@login_required
|
||||
def view_classroom(Id):
|
||||
"""View classroom details"""
|
||||
classroom = Classroom.query.get_or_404(Id)
|
||||
|
||||
if not classroom.is_active:
|
||||
flash('This classroom has been deactivated.', 'warning')
|
||||
return redirect(url_for('classrooms.list_classrooms'))
|
||||
|
||||
# Get classroom resources
|
||||
resources = ClassroomResource.query.filter_by(classroom_id=Id).all()
|
||||
|
||||
# Get upcoming reservations
|
||||
upcoming_reservations = Reservation.query.filter(
|
||||
Reservation.classroom_id == Id,
|
||||
Reservation.start_time >= datetime.utcnow(),
|
||||
Reservation.status.in_([ReservationStatus.CONFIRMED, ReservationStatus.PENDING])
|
||||
).order_by(Reservation.start_time).limit(10).all()
|
||||
|
||||
return render_template('classrooms/view.html',
|
||||
classroom=classroom,
|
||||
resources=resources,
|
||||
upcoming_reservations=upcoming_reservations)
|
||||
|
||||
@classrooms_bp.route('/delete/<int:Id>')
|
||||
@login_required
|
||||
def delete_classroom(Id):
|
||||
"""Delete/deactivate classroom"""
|
||||
classroom = Classroom.query.get_or_404(Id)
|
||||
|
||||
# Check for active reservations
|
||||
active_reservations = Reservation.query.filter(
|
||||
Reservation.classroom_id == Id,
|
||||
Reservation.status.in_([ReservationStatus.CONFIRMED, ReservationStatus.PENDING])
|
||||
).count()
|
||||
|
||||
if active_reservations > 0:
|
||||
flash('Cannot delete classroom with active reservations.', 'error')
|
||||
return redirect(url_for('classrooms.view_classroom', Id=Id))
|
||||
def toggle_classroom(id):
|
||||
"""Toggle classroom active status"""
|
||||
classroom = Classroom.query.get_or_404(id)
|
||||
|
||||
try:
|
||||
classroom.is_active = False
|
||||
classroom.is_active = not classroom.is_active
|
||||
classroom.updated_at = datetime.utcnow()
|
||||
db.session.commit()
|
||||
flash(f'Classroom {classroom.code} has been deactivated.', 'success')
|
||||
|
||||
status = 'activated' if classroom.is_active else 'deactivated'
|
||||
flash(f'Classroom {classroom.code_display} has been {status} successfully!', 'success')
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
flash('Error deactivating classroom.', 'error')
|
||||
flash(f'Error updating classroom status: {str(e)}', 'error')
|
||||
|
||||
return redirect(url_for('classrooms.list_classrooms'))
|
||||
|
||||
@classrooms_bp.route('/<int:classroom_id>/add_resource', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def add_resource(classroom_id):
|
||||
"""Add resource to classroom"""
|
||||
classroom = Classroom.query.get_or_404(classroom_id)
|
||||
form = ClassroomResourceForm()
|
||||
|
||||
if form.validate_on_submit():
|
||||
resource = ClassroomResource(
|
||||
classroom_id=classroom_id,
|
||||
resource_type=form.resource_type.data,
|
||||
brand=form.brand.data,
|
||||
model=form.model.data,
|
||||
specifications=form.specifications.data,
|
||||
quantity=form.quantity.data
|
||||
)
|
||||
|
||||
try:
|
||||
db.session.add(resource)
|
||||
db.session.commit()
|
||||
flash(f'{resource.resource_type} added to {classroom.code} successfully!', 'success')
|
||||
return redirect(url_for('classrooms.view_classroom', Id=classroom_id))
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
flash('Error adding resource.', 'error')
|
||||
|
||||
return render_template('classrooms/add_resource.html', form=form, classroom=classroom)
|
||||
return redirect(request.referrer or url_for('classrooms.list_classrooms'))
|
||||
|
||||
# API endpoints for AJAX requests
|
||||
@classrooms_bp.route('/api/available')
|
||||
@login_required
|
||||
def api_available_classrooms():
|
||||
"""API endpoint to get available classrooms"""
|
||||
def get_available_classrooms():
|
||||
"""Get available classrooms for a specific time slot"""
|
||||
start_time = request.args.get('start_time')
|
||||
end_time = request.args.get('end_time')
|
||||
min_capacity = request.args.get('min_capacity', 0, type=int)
|
||||
|
||||
if not start_time or not end_time:
|
||||
return jsonify({'error': 'start_time and end_time are required'}), 400
|
||||
return jsonify({'error': 'Start time and end time are required'}), 400
|
||||
|
||||
try:
|
||||
from datetime import datetime
|
||||
from app.models.reservation import Reservation, ReservationStatus
|
||||
|
||||
start_dt = datetime.fromisoformat(start_time)
|
||||
end_dt = datetime.fromisoformat(end_time)
|
||||
except ValueError:
|
||||
return jsonify({'error': 'Invalid datetime format'}), 400
|
||||
|
||||
# Find available classrooms (without conflicts)
|
||||
conflicting_classroom_ids = [
|
||||
r.classroom_id for r in Reservation.query.filter(
|
||||
Reservation.start_time < end_dt,
|
||||
Reservation.end_time > start_dt,
|
||||
Reservation.status == ReservationStatus.CONFIRMED
|
||||
).all()
|
||||
]
|
||||
|
||||
available_classrooms = Classroom.query.filter(
|
||||
Classroom.is_active == True,
|
||||
Classroom.capacity >= min_capacity,
|
||||
~Classroom.id.in_(conflicting_classroom_ids)
|
||||
).all()
|
||||
|
||||
return jsonify([classroom.to_dict() for classroom in available_classrooms])
|
||||
|
||||
# Find all classrooms
|
||||
all_classrooms = Classroom.query.filter_by(is_active=True).all()
|
||||
available_classrooms = []
|
||||
|
||||
for classroom in all_classrooms:
|
||||
# Check if classroom has conflicting reservations
|
||||
conflicts = Reservation.query.filter(
|
||||
Reservation.classroom_id == classroom.id,
|
||||
Reservation.status == ReservationStatus.CONFIRMED,
|
||||
Reservation.start_time < end_dt,
|
||||
Reservation.end_time > start_dt
|
||||
).all()
|
||||
|
||||
if not conflicts:
|
||||
available_classrooms.append({
|
||||
'id': classroom.id,
|
||||
'code': classroom.code,
|
||||
'building': classroom.building,
|
||||
'room_number': classroom.code,
|
||||
'floor': classroom.floor,
|
||||
'capacity': classroom.capacity,
|
||||
'code_display': classroom.code_display
|
||||
})
|
||||
|
||||
return jsonify({'classrooms': available_classrooms})
|
||||
|
||||
except Exception as e:
|
||||
return jsonify({'error': str(e)}), 500
|
||||
Reference in New Issue
Block a user