diff --git a/app/Http/Controllers/Web/Auth/LoginController.php b/app/Http/Controllers/Web/Auth/LoginController.php index 69d8716..5cfd769 100644 --- a/app/Http/Controllers/Web/Auth/LoginController.php +++ b/app/Http/Controllers/Web/Auth/LoginController.php @@ -108,9 +108,9 @@ class LoginController extends Controller // Reindirizza in base al ruolo if ($user->hasRole('Admin')) { - return redirect()->to('userarea/import_dashboard.php'); + return redirect()->to('userarea/production_dashboard.php'); } elseif ($user->hasRole('User')) { - return redirect()->to('userarea/import_dashboard.php'); + return redirect()->to('userarea/production_dashboard.php'); } // Se il ruolo non è specificato, reindirizza alla home predefinita diff --git a/public/userarea/get_mescole_matrice.php b/public/userarea/get_mescole_matrice.php index b7f933b..9884342 100644 --- a/public/userarea/get_mescole_matrice.php +++ b/public/userarea/get_mescole_matrice.php @@ -1,7 +1,12 @@ false, 'message' => 'ID matrice non fornito.']); @@ -9,19 +14,24 @@ try { } $idMatrice = intval($_GET['id']); + $db = DBHandlerSelect::getInstance(); $pdo = $db->getConnection(); - // Tutte le mescole + // tutte le mescole $stmt = $pdo->query("SELECT id, nome FROM mescole ORDER BY nome ASC"); $tutte = $stmt->fetchAll(PDO::FETCH_ASSOC); - // Mescole già associate + // mescole associate $stmt = $pdo->prepare("SELECT idmescola FROM matrice_mescole WHERE idmatrice = ?"); $stmt->execute([$idMatrice]); $associate = $stmt->fetchAll(PDO::FETCH_COLUMN); - echo json_encode(['success' => true, 'tutte' => $tutte, 'associate' => $associate]); + echo json_encode([ + 'success' => true, + 'tutte' => $tutte, + 'associate' => $associate + ]); } catch (Exception $e) { - echo json_encode(['success' => false, 'message' => 'Errore: ' . $e->getMessage()]); + echo json_encode(['success' => false, 'message' => $e->getMessage()]); } diff --git a/public/userarea/include/navbar.php b/public/userarea/include/navbar.php index 2770d64..b92acc7 100644 --- a/public/userarea/include/navbar.php +++ b/public/userarea/include/navbar.php @@ -14,25 +14,17 @@ hasRole('Admin')) || (Auth::user()->hasRole('User')) || (Auth::user()->hasRole('Superuser'))) : ?>
  • - -
    + +
    -
  • - +