Mappa Parcheggio
- Hi {current_user.name},
+This is a test email triggered from the Parking Manager Test Tools.
+Selected Date: {target_date}
+SMTP Status: {'Enabled' if config.SMTP_ENABLED else 'Disabled (File Logging)'}
+If you received this, the notification system is working.
+ + + """ + + success = send_email(current_user.email, subject, body_html) + + return { + "success": success, + "mode": "SMTP" if config.SMTP_ENABLED else "FILE", + "date": target_date, + "message": "Email sent successfully" if success else "Failed to send email" + } diff --git a/app/routes/presence.py b/app/routes/presence.py index 1e073eb..e989222 100644 --- a/app/routes/presence.py +++ b/app/routes/presence.py @@ -329,3 +329,49 @@ def get_user_presences(user_id: str, start_date: date = None, end_date: date = N }) return result + + +class ClearOfficePresenceRequest(BaseModel): + start_date: date + end_date: date + office_id: str + + +@router.post("/admin/clear-office-presence") +def clear_office_presence(data: ClearOfficePresenceRequest, db: Session = Depends(get_db), current_user=Depends(require_manager_or_admin)): + """Clear all presence and parking for an office in a date range (Test Tool)""" + + # Verify office access + if current_user.role == UserRole.MANAGER and current_user.office_id != data.office_id: + raise HTTPException(status_code=403, detail="Not authorized for this office") + + # Get all users in the office + users = db.query(User).filter(User.office_id == data.office_id).all() + user_ids = [u.id for u in users] + + if not user_ids: + return {"message": "No users in office", "count_presence": 0, "count_parking": 0} + + # 1. Delete Parking Assignments + parking_delete = db.query(DailyParkingAssignment).filter( + DailyParkingAssignment.user_id.in_(user_ids), + DailyParkingAssignment.date >= data.start_date, + DailyParkingAssignment.date <= data.end_date + ) + parking_count = parking_delete.delete(synchronize_session=False) + + # 2. Delete Presence + presence_delete = db.query(UserPresence).filter( + UserPresence.user_id.in_(user_ids), + UserPresence.date >= data.start_date, + UserPresence.date <= data.end_date + ) + presence_count = presence_delete.delete(synchronize_session=False) + + db.commit() + + return { + "message": "Cleared office presence and parking", + "count_presence": presence_count, + "count_parking": parking_count + } diff --git a/app/routes/reports.py b/app/routes/reports.py new file mode 100644 index 0000000..4801d33 --- /dev/null +++ b/app/routes/reports.py @@ -0,0 +1,195 @@ +from datetime import date +from typing import Optional +from fastapi import APIRouter, Depends, HTTPException, Query, Response +from sqlalchemy.orm import Session +from openpyxl import Workbook +from openpyxl.styles import Font, PatternFill, Alignment, Border, Side +from io import BytesIO + +from database.connection import get_db +from database.models import User, UserPresence, DailyParkingAssignment, UserRole, Office +from utils.auth_middleware import require_manager_or_admin + +router = APIRouter(prefix="/api/reports", tags=["reports"]) + +@router.get("/team-export") +def export_team_data( + start_date: date, + end_date: date, + office_id: Optional[str] = None, + db: Session = Depends(get_db), + current_user: User = Depends(require_manager_or_admin) +): + """ + Export team presence and parking data to Excel. + """ + # 1. Determine Scope (Admin vs Manager) + target_office_id = office_id + if current_user.role == UserRole.MANAGER: + # Manager is restricted to their own office + if office_id and office_id != current_user.office_id: + raise HTTPException(status_code=403, detail="Cannot export data for other offices") + target_office_id = current_user.office_id + + # 2. Fetch Users + query = db.query(User) + if target_office_id: + query = query.filter(User.office_id == target_office_id) + users = query.all() + user_ids = [u.id for u in users] + + # Map users for quick lookup + user_map = {u.id: u for u in users} + + # 3. Fetch Presences + presences = db.query(UserPresence).filter( + UserPresence.user_id.in_(user_ids), + UserPresence.date >= start_date, + UserPresence.date <= end_date + ).all() + + # 4. Fetch Parking Assignments + assignments = db.query(DailyParkingAssignment).filter( + DailyParkingAssignment.user_id.in_(user_ids), + DailyParkingAssignment.date >= start_date, + DailyParkingAssignment.date <= end_date + ).all() + + # Organize data by Date -> User -> Info + # Structure: data_map[date_str][user_id] = { presence: ..., parking: ... } + data_map = {} + + for p in presences: + d_str = p.date.isoformat() + if d_str not in data_map: data_map[d_str] = {} + if p.user_id not in data_map[d_str]: data_map[d_str][p.user_id] = {} + data_map[d_str][p.user_id]['presence'] = p.status.value # 'present', 'remote', etc. + + for a in assignments: + d_str = a.date.isoformat() + if d_str not in data_map: data_map[d_str] = {} + if a.user_id not in data_map[d_str]: data_map[d_str][a.user_id] = {} + if a.spot: + data_map[d_str][a.user_id]['parking'] = a.spot.name + else: + data_map[d_str][a.user_id]['parking'] = "Unknown" + + # 5. Generate Excel + wb = Workbook() + ws = wb.active + ws.title = "Report Presenze Matrix" + + # --- Header Row (Dates) --- + # Column A: "Utente" + ws.cell(row=1, column=1, value="Utente") + + # Generate date range + from datetime import timedelta + date_cols = {} # date_str -> col_index + col_idx = 2 + + curr = start_date + while curr <= end_date: + d_str = curr.isoformat() + # Header: DD/MM + header_val = f"{curr.day}/{curr.month}" + + cell = ws.cell(row=1, column=col_idx, value=header_val) + date_cols[d_str] = col_idx + + # Style Header + cell.font = Font(bold=True) + cell.alignment = Alignment(horizontal="center") + + col_idx += 1 + curr += timedelta(days=1) + + # Style First Header (Utente) + first_header = ws.cell(row=1, column=1) + first_header.font = Font(bold=True) + first_header.alignment = Alignment(horizontal="left") + + # Define Fills + fill_present = PatternFill(start_color="dcfce7", end_color="dcfce7", fill_type="solid") # Light Green + fill_remote = PatternFill(start_color="dbeafe", end_color="dbeafe", fill_type="solid") # Light Blue + fill_absent = PatternFill(start_color="fee2e2", end_color="fee2e2", fill_type="solid") # Light Red + fill_trip = PatternFill(start_color="fef3c7", end_color="fef3c7", fill_type="solid") # Light Orange (matching frontend warning-bg) + + # --- User Rows --- + row_idx = 2 + for user in users: + # User Name in Col 1 + name_cell = ws.cell(row=row_idx, column=1, value=user.name) + name_cell.font = Font(bold=True) + + # Determine Office label (optional append?) + # name_cell.value = f"{user.name} ({user.office.name})" if user.office else user.name + + # Fill Dates + curr = start_date + while curr <= end_date: + d_str = curr.isoformat() + if d_str in date_cols: + c_idx = date_cols[d_str] + + # Get Data + u_data = data_map.get(d_str, {}).get(user.id, {}) + presence = u_data.get('presence', '') + parking = u_data.get('parking', '') + + cell_val = "" + fill = None + + if presence == 'present': + cell_val = "In Sede" + fill = fill_present + elif presence == 'remote': + cell_val = "Remoto" + fill = fill_remote + elif presence == 'absent': + cell_val = "Ferie" + fill = fill_absent + elif presence == 'business_trip': + cell_val = "Trasferta" + fill = fill_trip + + # Append Parking info if present + if parking: + if cell_val: + cell_val += f" ({parking})" + else: + cell_val = f"({parking})" # Parking without presence? Unusual but possible + + cell = ws.cell(row=row_idx, column=c_idx, value=cell_val) + if fill: + cell.fill = fill + cell.alignment = Alignment(horizontal="center", vertical="center", wrap_text=True) + + curr += timedelta(days=1) + + row_idx += 1 + + # Adjust column widths + ws.column_dimensions['A'].width = 25 # User name column + + # Auto-width for date columns (approx) + for i in range(2, col_idx): + col_letter = ws.cell(row=1, column=i).column_letter + ws.column_dimensions[col_letter].width = 12 + + # Save to buffer + output = BytesIO() + wb.save(output) + output.seek(0) + + filename = f"report_parking_matrix_{start_date}_{end_date}.xlsx" + + headers = { + 'Content-Disposition': f'attachment; filename="{filename}"' + } + + return Response( + content=output.getvalue(), + media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + headers=headers + ) diff --git a/app/routes/users.py b/app/routes/users.py index 76e2040..a258961 100644 --- a/app/routes/users.py +++ b/app/routes/users.py @@ -2,13 +2,13 @@ User Management Routes Admin user CRUD and user self-service (profile, settings, password) """ -from datetime import datetime +from datetime import datetime, date from fastapi import APIRouter, Depends, HTTPException from pydantic import BaseModel, EmailStr from sqlalchemy.orm import Session from database.connection import get_db -from database.models import User, UserRole, Office +from database.models import User, UserRole, Office, ParkingExclusion from utils.auth_middleware import get_current_user, require_admin from utils.helpers import ( generate_uuid, is_ldap_user, is_ldap_admin, @@ -54,6 +54,20 @@ class ChangePasswordRequest(BaseModel): new_password: str +class UserExclusionCreate(BaseModel): + start_date: date | None = None + end_date: date | None = None + notes: str | None = None + + +class UserExclusionResponse(BaseModel): + id: str + start_date: date | None + end_date: date | None + notes: str | None + is_excluded: bool = True + + class UserResponse(BaseModel): id: str email: str @@ -332,3 +346,105 @@ def change_password(data: ChangePasswordRequest, db: Session = Depends(get_db), db.commit() config.logger.info(f"User {current_user.email} changed password") return {"message": "Password changed"} + + +# Exclusion Management (Self-Service) +# Exclusion Management (Self-Service) +@router.get("/me/exclusion", response_model=list[UserExclusionResponse]) +def get_my_exclusions(db: Session = Depends(get_db), current_user=Depends(get_current_user)): + """Get current user's parking exclusions""" + if not current_user.office_id: + return [] + + exclusions = db.query(ParkingExclusion).filter( + ParkingExclusion.user_id == current_user.id, + ParkingExclusion.office_id == current_user.office_id + ).all() + + return [ + { + "id": e.id, + "start_date": e.start_date, + "end_date": e.end_date, + "notes": e.notes, + "is_excluded": True + } + for e in exclusions + ] + + +@router.post("/me/exclusion") +def create_my_exclusion(data: UserExclusionCreate, db: Session = Depends(get_db), current_user=Depends(get_current_user)): + """Create new parking exclusion for current user""" + if not current_user.office_id: + raise HTTPException(status_code=400, detail="User is not assigned to an office") + + if data.start_date and data.end_date and data.end_date < data.start_date: + raise HTTPException(status_code=400, detail="End date must be after start date") + + if data.end_date and not data.start_date: + raise HTTPException(status_code=400, detail="Start date is required if an end date is specified") + + exclusion = ParkingExclusion( + id=generate_uuid(), + office_id=current_user.office_id, + user_id=current_user.id, + start_date=data.start_date, + end_date=data.end_date, + notes=data.notes or "Auto-esclusione utente", + created_at=datetime.utcnow() + ) + db.add(exclusion) + db.commit() + return {"message": "Exclusion created", "id": exclusion.id} + + +@router.put("/me/exclusion/{exclusion_id}") +def update_my_exclusion(exclusion_id: str, data: UserExclusionCreate, db: Session = Depends(get_db), current_user=Depends(get_current_user)): + """Update specific parking exclusion for current user""" + if not current_user.office_id: + raise HTTPException(status_code=400, detail="User is not assigned to an office") + + exclusion = db.query(ParkingExclusion).filter( + ParkingExclusion.id == exclusion_id, + ParkingExclusion.user_id == current_user.id, + ParkingExclusion.office_id == current_user.office_id + ).first() + + if not exclusion: + raise HTTPException(status_code=404, detail="Exclusion not found") + + if data.start_date and data.end_date and data.end_date < data.start_date: + raise HTTPException(status_code=400, detail="End date must be after start date") + + if data.end_date and not data.start_date: + raise HTTPException(status_code=400, detail="Start date is required if an end date is specified") + + exclusion.start_date = data.start_date + exclusion.end_date = data.end_date + if data.notes is not None: + exclusion.notes = data.notes + + exclusion.updated_at = datetime.utcnow() + db.commit() + return {"message": "Exclusion updated", "id": exclusion.id} + + +@router.delete("/me/exclusion/{exclusion_id}") +def delete_my_exclusion(exclusion_id: str, db: Session = Depends(get_db), current_user=Depends(get_current_user)): + """Remove specific parking exclusion for current user""" + if not current_user.office_id: + raise HTTPException(status_code=400, detail="User is not assigned to an office") + + exclusion = db.query(ParkingExclusion).filter( + ParkingExclusion.id == exclusion_id, + ParkingExclusion.user_id == current_user.id, + ParkingExclusion.office_id == current_user.office_id + ).first() + + if not exclusion: + raise HTTPException(status_code=404, detail="Exclusion not found") + + db.delete(exclusion) + db.commit() + return {"message": "Exclusion removed"} diff --git a/compose.yml b/compose.yml index cd61b3e..28d6289 100644 --- a/compose.yml +++ b/compose.yml @@ -5,6 +5,12 @@ services: restart: unless-stopped volumes: - ./data:/app/data + - ./app:/app/app + - ./database:/app/database + - ./services:/app/services + - ./utils:/app/utils + - ./frontend:/app/frontend + - ./main.py:/app/main.py env_file: - .env environment: @@ -29,5 +35,4 @@ services: networks: org-network: - external: true - name: org-stack_org-network + external: true \ No newline at end of file diff --git a/database/models.py b/database/models.py index 9644375..76d0494 100644 --- a/database/models.py +++ b/database/models.py @@ -20,6 +20,8 @@ class PresenceStatus(str, enum.Enum): PRESENT = "present" REMOTE = "remote" ABSENT = "absent" + BUSINESS_TRIP = "business_trip" + class NotificationType(str, enum.Enum): @@ -67,6 +69,7 @@ class Office(Base): users = relationship("User", back_populates="office") closing_days = relationship("OfficeClosingDay", back_populates="office", cascade="all, delete-orphan") weekly_closing_days = relationship("OfficeWeeklyClosingDay", back_populates="office", cascade="all, delete-orphan") + spots = relationship("OfficeSpot", back_populates="office", cascade="all, delete-orphan") class User(Base): @@ -130,7 +133,7 @@ class DailyParkingAssignment(Base): id = Column(Text, primary_key=True) date = Column(Date, nullable=False) - spot_id = Column(Text, nullable=False) # A1, A2, B1, B2, etc. (prefix from office) + spot_id = Column(Text, ForeignKey("office_spots.id", ondelete="CASCADE"), nullable=False) user_id = Column(Text, ForeignKey("users.id", ondelete="SET NULL")) office_id = Column(Text, ForeignKey("offices.id", ondelete="CASCADE"), nullable=False) # Office that owns the spot created_at = Column(DateTime, default=datetime.utcnow) @@ -138,6 +141,7 @@ class DailyParkingAssignment(Base): # Relationships user = relationship("User", back_populates="assignments", foreign_keys=[user_id]) office = relationship("Office") + spot = relationship("OfficeSpot", back_populates="assignments") __table_args__ = ( Index('idx_assignment_office_date', 'office_id', 'date'), @@ -218,7 +222,7 @@ class ParkingExclusion(Base): user = relationship("User", foreign_keys=[user_id]) __table_args__ = ( - Index('idx_exclusion_office_user', 'office_id', 'user_id', unique=True), + Index('idx_exclusion_office_user', 'office_id', 'user_id'), ) @@ -237,12 +241,6 @@ class NotificationLog(Base): ) -class NotificationQueue(Base): - """Queue for pending notifications (for immediate parking change notifications)""" - __tablename__ = "notification_queue" - - id = Column(Text, primary_key=True) - user_id = Column(Text, ForeignKey("users.id", ondelete="CASCADE"), nullable=False) notification_type = Column(Enum(NotificationType, values_callable=lambda obj: [e.value for e in obj]), nullable=False) # parking_change subject = Column(Text, nullable=False) body = Column(Text, nullable=False) @@ -252,3 +250,23 @@ class NotificationQueue(Base): __table_args__ = ( Index('idx_queue_pending', 'sent_at'), ) + + +class OfficeSpot(Base): + """Specific parking spot definitions (e.g., A1, A2) linked to an office""" + __tablename__ = "office_spots" + + id = Column(Text, primary_key=True) + office_id = Column(Text, ForeignKey("offices.id", ondelete="CASCADE"), nullable=False) + name = Column(Text, nullable=False) # Display name: A1, A2, etc. + spot_number = Column(Integer, nullable=False) # Numeric part for sorting/filtering (1, 2, 3...) + is_unavailable = Column(Boolean, default=False) # If spot is temporarily out of service + + # Relationships + office = relationship("Office", back_populates="spots") + assignments = relationship("DailyParkingAssignment", back_populates="spot", cascade="all, delete-orphan") + + __table_args__ = ( + Index('idx_office_spot_number', 'office_id', 'spot_number', unique=True), + Index('idx_office_spot_name', 'office_id', 'name', unique=True), + ) diff --git a/fix_db_index.py b/fix_db_index.py new file mode 100644 index 0000000..7502c5a --- /dev/null +++ b/fix_db_index.py @@ -0,0 +1,61 @@ +import sqlite3 +import os +import time + +# Function to find the db file +def find_db(): + candidates = [ + 'data/parking.db', + '/home/ssalemi/org-parking/data/parking.db', + './data/parking.db' + ] + for path in candidates: + if os.path.exists(path): + return path + return None + +db_path = find_db() + +if not db_path: + print("Error: Could not find data/parking.db. Make sure you are in the project root.") + exit(1) + +print(f"Target Database: {db_path}") +print("Attempting to fix 'parking_exclusions' index...") + +try: + conn = sqlite3.connect(db_path) + cursor = conn.cursor() + + # Turn off foreign keys temporarily to avoid issues during schema modification if needed + cursor.execute("PRAGMA foreign_keys=OFF") + + # 1. Drop the existing unique index + print("Dropping index idx_exclusion_office_user...") + try: + cursor.execute("DROP INDEX IF EXISTS idx_exclusion_office_user") + print("Index dropped successfully.") + except Exception as e: + print(f"Warning during drop: {e}") + + # 2. Recreate it as non-unique + print("Creating non-unique index idx_exclusion_office_user...") + try: + cursor.execute("CREATE INDEX idx_exclusion_office_user ON parking_exclusions (office_id, user_id)") + print("Index created successfully.") + except Exception as e: + print(f"Error creating index: {e}") + exit(1) + + conn.commit() + conn.close() + print("\nSUCCESS: Database updated. You can now define multiple exclusions per user.") + +except sqlite3.OperationalError as e: + if "locked" in str(e): + print("\nERROR: Database is LOCKED.") + print("Please STOP the running application (Docker) and try again.") + else: + print(f"\nError: {e}") +except Exception as e: + print(f"\nUnexpected Error: {e}") diff --git a/frontend/css/styles.css b/frontend/css/styles.css index 3a36154..a77af61 100644 --- a/frontend/css/styles.css +++ b/frontend/css/styles.css @@ -652,6 +652,11 @@ textarea { border-color: var(--danger) !important; } +.status-business_trip { + background: var(--warning-bg) !important; + border-color: var(--warning) !important; +} + .status-nodata { background: white; } @@ -1788,6 +1793,7 @@ textarea { transform: translate(-50%, 100%); opacity: 0; } + to { transform: translate(-50%, 0); opacity: 1; @@ -1798,6 +1804,7 @@ textarea { from { opacity: 1; } + to { opacity: 0; } diff --git a/frontend/js/api.js b/frontend/js/api.js index 8fa4dad..4ffec65 100644 --- a/frontend/js/api.js +++ b/frontend/js/api.js @@ -185,9 +185,23 @@ const api = { * Logout */ async logout() { + // Fetch config to check for external logout URL + let logoutUrl = '/login'; + try { + const configRes = await this.get('/api/auth/config'); + if (configRes && configRes.ok) { + const config = await configRes.json(); + if (config.authelia_enabled && config.logout_url) { + logoutUrl = config.logout_url; + } + } + } catch (e) { + console.error('Error fetching logout config', e); + } + await this.post('/api/auth/logout', {}); this.clearToken(); - window.location.href = '/login'; + window.location.href = logoutUrl; } }; diff --git a/frontend/js/nav.js b/frontend/js/nav.js index c73c865..6f81416 100644 --- a/frontend/js/nav.js +++ b/frontend/js/nav.js @@ -87,9 +87,6 @@ async function initNav() { // Get user info (works with both JWT and Authelia) const currentUser = await api.checkAuth(); - // Render navigation - navContainer.innerHTML = renderNav(currentPath, currentUser?.role); - // Update user info in sidebar if (currentUser) { const userNameEl = document.getElementById('userName'); @@ -98,11 +95,55 @@ async function initNav() { if (userRoleEl) userRoleEl.textContent = currentUser.role || '-'; } - // Setup user menu + // Setup user menu (logout) & mobile menu setupUserMenu(); - - // Setup mobile menu setupMobileMenu(); + + // CHECK: Block access if user has no office (and is not admin) + // Admins are allowed to access "Gestione Uffici" even without an office + if (currentUser && !currentUser.office_id && currentUser.role !== 'admin') { + navContainer.innerHTML = ''; // Clear nav + + const mainContent = document.querySelector('.main-content'); + if (mainContent) { + mainContent.innerHTML = ` ++ Il tuo account ${currentUser.email} è attivo, ma non sei ancora stato assegnato a nessuno ufficio. +
++ Puoi decidere di escluderti automaticamente dalla logica di assegnazione dei posti auto. + Le richieste di esclusione sono visibili agli amministratori. +
+ + + +
-