- Fixed 3 JavaScript syntax errors in fg_scan.html (lines 951, 840-950, 1175-1215) - Restored form field validation with proper null safety checks - Re-enabled auto-advance between form fields - Re-enabled CP code auto-complete with hyphen detection - Updated validation error messages with clear format specifications and examples - Added autocomplete='off' to all input fields - Removed auto-prefix correction feature - Updated warehouse routes and modules for box assignment workflow - Added/improved database initialization scripts - Updated requirements.txt dependencies Format specifications implemented: - Operator Code: OP + 2 digits (example: OP01, OP99) - CP Code: CP + 8 digits + hyphen + 4 digits (example: CP00000000-0001) - OC1/OC2 Codes: OC + 2 digits (example: OC01, OC99) - Defect Code: 3 digits only
125 lines
3.8 KiB
Python
125 lines
3.8 KiB
Python
"""
|
|
Main application routes (Login, Logout, Dashboard)
|
|
"""
|
|
from flask import (
|
|
Blueprint, render_template, request, session, redirect, url_for,
|
|
flash, current_app
|
|
)
|
|
from app.auth import authenticate_user, get_user_by_id
|
|
import logging
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
main_bp = Blueprint('main', __name__)
|
|
|
|
|
|
@main_bp.route('/', methods=['GET'])
|
|
def index():
|
|
"""Redirect to dashboard if logged in, otherwise to login"""
|
|
if 'user_id' in session:
|
|
return redirect(url_for('main.dashboard'))
|
|
return redirect(url_for('main.login'))
|
|
|
|
|
|
@main_bp.route('/login', methods=['GET', 'POST'])
|
|
def login():
|
|
"""Login page and authentication"""
|
|
if request.method == 'POST':
|
|
username = request.form.get('username', '').strip()
|
|
password = request.form.get('password', '')
|
|
|
|
if not username or not password:
|
|
flash('Username and password are required', 'error')
|
|
return render_template('login.html')
|
|
|
|
# Authenticate user
|
|
user = authenticate_user(username, password)
|
|
|
|
if user:
|
|
# Store user information in session
|
|
session.permanent = True
|
|
session['user_id'] = user['id']
|
|
session['username'] = user['username']
|
|
session['email'] = user['email']
|
|
session['role'] = user['role']
|
|
session['full_name'] = user['full_name']
|
|
session.modified = True # Force session to be saved
|
|
|
|
logger.info(f"User {username} logged in successfully")
|
|
logger.debug(f"Session data set: user_id={user['id']}, username={username}")
|
|
flash(f'Welcome, {user["full_name"]}!', 'success')
|
|
|
|
return redirect(url_for('main.dashboard'))
|
|
else:
|
|
flash('Invalid username or password', 'error')
|
|
logger.warning(f"Failed login attempt for user: {username}")
|
|
|
|
return render_template('login.html')
|
|
|
|
|
|
@main_bp.route('/dashboard', methods=['GET'])
|
|
def dashboard():
|
|
"""Main dashboard page"""
|
|
if 'user_id' not in session:
|
|
return redirect(url_for('main.login'))
|
|
|
|
user_id = session.get('user_id')
|
|
user = get_user_by_id(user_id)
|
|
|
|
if not user:
|
|
session.clear()
|
|
flash('User session invalid', 'error')
|
|
return redirect(url_for('main.login'))
|
|
|
|
modules = [
|
|
{
|
|
'name': 'Quality Module',
|
|
'description': 'Manage quality checks and inspections',
|
|
'icon': 'fa-check-circle',
|
|
'color': 'primary',
|
|
'url': url_for('quality.quality_index')
|
|
},
|
|
{
|
|
'name': 'Warehouse Module',
|
|
'description': 'Manage warehouse operations and inventory',
|
|
'icon': 'fa-warehouse',
|
|
'color': 'info',
|
|
'url': url_for('warehouse.warehouse_index')
|
|
},
|
|
{
|
|
'name': 'Settings',
|
|
'description': 'Configure application settings',
|
|
'icon': 'fa-cog',
|
|
'color': 'secondary',
|
|
'url': url_for('settings.settings_index')
|
|
}
|
|
]
|
|
|
|
return render_template('dashboard.html', user=user, modules=modules)
|
|
|
|
|
|
@main_bp.route('/logout', methods=['GET', 'POST'])
|
|
def logout():
|
|
"""Logout user"""
|
|
username = session.get('username', 'Unknown')
|
|
session.clear()
|
|
logger.info(f"User {username} logged out")
|
|
flash('You have been logged out successfully', 'success')
|
|
return redirect(url_for('main.login'))
|
|
|
|
|
|
@main_bp.route('/profile', methods=['GET'])
|
|
def profile():
|
|
"""User profile page"""
|
|
if 'user_id' not in session:
|
|
return redirect(url_for('main.login'))
|
|
|
|
user_id = session.get('user_id')
|
|
user = get_user_by_id(user_id)
|
|
|
|
if not user:
|
|
session.clear()
|
|
return redirect(url_for('main.login'))
|
|
|
|
return render_template('profile.html', user=user)
|