setup update 2

app/routes/auth.py

@@ -29,7 +29,7 @@ def login():
             if not next_page or not next_page.startswith('/'):
                 next_page = url_for('main.dashboard')
             
-            flash(f'Welcome back, {user.name}!', 'success')
+            flash(f'Welcome back, {user.first_name} {user.last_name}!', 'success')
             return redirect(next_page)
         else:
             flash('Invalid email or password.', 'error')

app/routes/main.py

@@ -3,6 +3,7 @@ from flask_login import login_required, current_user
 from app.models.reservation import Reservation
 from app.models.classroom import Classroom
 from app.models.subject import Subject
+from app.models.subject import Commission
 from datetime import datetime, timedelta
 from sqlalchemy import func
 
@@ -12,30 +13,45 @@ main_bp = Blueprint('main', __name__)
 @login_required
 def dashboard():
     """Main dashboard page"""
-    # Get statistics
-    total_classrooms = Classroom.query.filter_by(is_active=True).count()
-    total_subjects = Subject.query.filter_by(is_active=True).count()
+# Get statistics
+    try:
+        total_classrooms = Classroom.query.filter_by(is_active=True).count()
+    except:
+        total_classrooms = 0
+        
+    try:
+        total_subjects = Subject.query.filter_by(is_active=True).count()
+    except:
+        total_subjects = 0
     
     # Get today's reservations
     today = datetime.utcnow().date()
-    today_reservations = Reservation.query.filter(
-        func.date(Reservation.start_time) == today
-    ).count()
+    try:
+        today_reservations = Reservation.query.filter(
+            func.date(Reservation.start_time) == today
+        ).count()
+    except:
+        today_reservations = 0
     
     # Get this week's reservations
     week_start = today - timedelta(days=today.weekday())
     week_end = week_start + timedelta(days=6)
-    week_reservations = Reservation.query.filter(
-        func.date(Reservation.start_time) >= week_start,
-        func.date(Reservation.start_time) <= week_end
-    ).count()
+    try:
+        week_reservations = Reservation.query.filter(
+            func.date(Reservation.start_time) >= week_start,
+            func.date(Reservation.start_time) <= week_end
+        ).count()
+    except:
+        week_reservations = 0
     
     # Get upcoming reservations (next 7 days)
-    upcoming_reservations = Reservation.query.filter(
-        Reservation.start_time >= datetime.utcnow(),
-        Reservation.start_time <= datetime.utcnow() + timedelta(days=7),
-        Reservation.status.in_(['CONFIRMED', 'PENDING'])
-    ).join(Classroom).join(Subject).limit(10).all()
+    try:
+        upcoming_reservations = Reservation.query.filter(
+            Reservation.start_time >= datetime.utcnow(),
+            Reservation.start_time <= datetime.utcnow() + timedelta(days=7)
+        ).limit(10).all()
+    except:
+        upcoming_reservations = []
     
     stats = {
         'total_classrooms': total_classrooms,