diff --git a/budget.php b/budget.php index b6f1ff3..7c30ee9 100644 --- a/budget.php +++ b/budget.php @@ -4,14 +4,11 @@ require __DIR__ . '/includes/db.php'; require_login('/login.php'); // Gestion de l'onglet actif (par défaut 'recap') -$tab = $_GET['tab'] ?? 'recap'; +$tab = $_GET['tab'] ?? 'suivi'; $pageTitle = "PachaFamily - Budget"; $activePage = "budget"; -// Note: budget.css est conservé pour le style global, -// mais budget.js n'est plus requis si tu l'as supprimé comme prévu. $pageCss = "/modules/budget/budget.css"; -// $pageJs = "/modules/budget/budget.js"; // Ligne commentée ou supprimée require __DIR__ . '/header.php'; ?> @@ -21,25 +18,25 @@ require __DIR__ . '/header.php';

Gestion du Budget

diff --git a/modules/budget/includes/api/manage-item.php b/modules/budget/includes/api/manage-item.php index 0a0b244..7565a16 100644 --- a/modules/budget/includes/api/manage-item.php +++ b/modules/budget/includes/api/manage-item.php @@ -1,6 +1,6 @@ prepare("UPDATE pf_budget_items SET name=?, amount=?, category=?, type=?, payment_day=?, is_estimate=?, reg_month=?, mapping_keywords=? WHERE id=?"); - $stmt->execute([$name, $amount, $category, $type, $payment_day, $is_estimate, $reg_month, $keywords, $id]); - } else { - // INSERT - $stmt = $pdo->prepare("INSERT INTO pf_budget_items (name, amount, category, type, payment_day, is_estimate, reg_month, mapping_keywords) VALUES (?, ?, ?, ?, ?, ?, ?, ?)"); - $stmt->execute([$name, $amount, $category, $type, $payment_day, $is_estimate, $reg_month, $keywords]); + if ($id) { + // UPDATE + $stmt = $pdo->prepare("UPDATE pf_budget_items SET name=?, amount=?, category=?, type=?, payment_day=?, is_estimate=?, reg_month=?, mapping_keywords=?, holiday_id=? WHERE id=?"); + $stmt->execute([$name, $amount, $category, $type, $payment_day, $is_estimate, $reg_month, $keywords, $holiday_id, $id]); + } else { + // INSERT + $stmt = $pdo->prepare("INSERT INTO pf_budget_items (name, amount, category, type, payment_day, is_estimate, reg_month, mapping_keywords, holiday_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"); + $stmt->execute([$name, $amount, $category, $type, $payment_day, $is_estimate, $reg_month, $keywords, $holiday_id]); + } + header('Location: /budget.php?tab=recap'); + exit; } - header('Location: /budget.php?tab=recap'); // Ou ta redirection habituelle - exit; -} // --- ACTION : COCHER/DÉCOCHER RAPIDE (VIA JS FETCH) --- if ($action === 'toggle-check') { $id = $_POST['id']; - $status = $_POST['status']; // 1 ou 0 + $status = $_POST['status']; $sql = "UPDATE pf_budget_items SET is_checked = ? WHERE id = ?"; $stmt = $pdo->prepare($sql); $stmt->execute([$status, $id]); - // On renvoie du JSON car c'est un appel JS (pas de redirection) header('Content-Type: application/json'); echo json_encode(['success' => true]); exit; @@ -53,7 +54,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { $id = $_POST['id']; $pdo->prepare("DELETE FROM pf_budget_items WHERE id = ?")->execute([$id]); - // On peut répondre en JSON pour le JS ou rediriger if (isset($_POST['ajax'])) { header('Content-Type: application/json'); echo json_encode(['success' => true]); diff --git a/modules/budget/includes/api/save-budget.php b/modules/budget/includes/api/save-budget.php index 561894f..05b2a4f 100644 --- a/modules/budget/includes/api/save-budget.php +++ b/modules/budget/includes/api/save-budget.php @@ -5,8 +5,6 @@ require __DIR__ . '/../../../../includes/auth.php'; require __DIR__ . '/../../../../includes/db.php'; require_login(); -// Note : On ne force pas le header JSON partout car add/delete/update utilisent des redirections -// header('Content-Type: application/json'); $action = $_POST['action'] ?? ''; @@ -30,7 +28,7 @@ if ($action === 'update_salary_config') { // 2. MISE A JOUR TABLEAU REPARTITION (AJAX) if ($action === 'update_allocation') { - header('Content-Type: application/json'); // On précise JSON ici + header('Content-Type: application/json'); $date = $_POST['month_date']; $catId = $_POST['cat_id']; $person = $_POST['person']; // 'amount_alex' ou 'amount_laia' @@ -46,25 +44,26 @@ if ($action === 'update_allocation') { if ($action === 'add_category') { $name = trim($_POST['name']); $target = trim($_POST['target']); + $holiday_id = !empty($_POST['holiday_id']) ? (int)$_POST['holiday_id'] : null; if (!empty($name)) { - $stmt = $pdo->prepare("INSERT INTO pf_alloc_categories (name, target) VALUES (?, ?)"); - $stmt->execute([$name, $target]); + $stmt = $pdo->prepare("INSERT INTO pf_alloc_categories (name, target, holiday_id) VALUES (?, ?, ?)"); + $stmt->execute([$name, $target, $holiday_id]); } - // Redirection vers la page précédente header("Location: " . $_SERVER['HTTP_REFERER']); exit; } -// 4. MODIFICATION D'UNE CATEGORIE (Nom / Cible) - NOUVEAU BLOC +// 4. MODIFICATION D'UNE CATEGORIE if ($action === 'update_category') { $id = (int)$_POST['cat_id']; $name = trim($_POST['name']); $target = trim($_POST['target']); + $holiday_id = !empty($_POST['holiday_id']) ? (int)$_POST['holiday_id'] : null; if ($id > 0 && !empty($name)) { - $stmt = $pdo->prepare("UPDATE pf_alloc_categories SET name = ?, target = ? WHERE id = ?"); - $stmt->execute([$name, $target, $id]); + $stmt = $pdo->prepare("UPDATE pf_alloc_categories SET name = ?, target = ?, holiday_id = ? WHERE id = ?"); + $stmt->execute([$name, $target, $holiday_id, $id]); } header("Location: " . $_SERVER['HTTP_REFERER']); exit; @@ -72,11 +71,11 @@ if ($action === 'update_category') { // 5. SUPPRESSION CATEGORIE if ($action === 'delete_category') { - $id = (int)$_GET['id'] ?? (int)$_POST['id']; // Peut venir du GET (lien) ou POST + $id = (int)$_GET['id'] ?? (int)$_POST['id']; if ($id > 0) { $pdo->prepare("DELETE FROM pf_alloc_categories WHERE id = ?")->execute([$id]); - $pdo->prepare("DELETE FROM pf_alloc_values WHERE cat_id = ?")->execute([$id]); // Nettoyage valeurs + $pdo->prepare("DELETE FROM pf_alloc_values WHERE cat_id = ?")->execute([$id]); } // Redirection vers la page précédente header("Location: " . $_SERVER['HTTP_REFERER']); @@ -86,17 +85,14 @@ if ($action === 'delete_category') { // 6. VALIDATION DES VIREMENTS (Complex Business Logic) if ($action === 'validate_transfers') { header('Content-Type: application/json'); - - $person = $_POST['person']; // Alex ou Laia + $person = $_POST['person']; $monthDate = $_POST['month_date']; try { $pdo->beginTransaction(); - // 1. Récupérer tous les virements prévus pour ce mois/personne dans le BUDGET - // On joint avec les catégories pour avoir le nom et la cible $stmt = $pdo->prepare(" - SELECT v.*, c.name as cat_name, c.target + SELECT v.*, c.name as cat_name, c.target, c.holiday_id FROM pf_alloc_values v JOIN pf_alloc_categories c ON v.cat_id = c.id WHERE v.month_date = ? @@ -104,28 +100,21 @@ if ($action === 'validate_transfers') { $stmt->execute([$monthDate]); $budgetLines = $stmt->fetchAll(PDO::FETCH_ASSOC); - // On prépare les totaux à transférer par Cible - // Structure : ['Alex' => ['total'=>100, 'cats'=>['Noel'=>50, 'Eco'=>50]], 'Pol' => ...] $transfersToDo = []; foreach ($budgetLines as $line) { $amount = ($person === 'Alex') ? $line['amount_alex'] : $line['amount_laia']; - if ($amount <= 0) continue; // Rien à virer + if ($amount <= 0) continue; $target = trim($line['target']); $catName = trim($line['cat_name']); + $holidayId = $line['holiday_id']; - // MAPPING DES PROPRIÉTAIRES CIBLES $targetOwner = null; - if ($target === 'vers L.Perso') { - $targetOwner = $person; // Alex -> Alex, Laia -> Laia - } elseif ($target === 'vers L.Pol') { - $targetOwner = 'Pol'; - } elseif ($target === 'vers L.Pep') { - $targetOwner = 'Pep'; - } elseif ($target === 'vers commune') { - continue; // On ignore (Business Rule) - } + if ($target === 'vers L.Perso') { $targetOwner = $person; } + elseif ($target === 'vers L.Pol') { $targetOwner = 'Pol'; } + elseif ($target === 'vers L.Pep') { $targetOwner = 'Pep'; } + elseif ($target === 'vers commune') { continue; } if ($targetOwner) { if (!isset($transfersToDo[$targetOwner])) { @@ -134,69 +123,55 @@ if ($action === 'validate_transfers') { $transfersToDo[$targetOwner]['total_add'] += $amount; if (!isset($transfersToDo[$targetOwner]['cats'][$catName])) { - $transfersToDo[$targetOwner]['cats'][$catName] = 0; + $transfersToDo[$targetOwner]['cats'][$catName] = ['amount' => 0, 'holiday_id' => $holidayId]; } - $transfersToDo[$targetOwner]['cats'][$catName] += $amount; + $transfersToDo[$targetOwner]['cats'][$catName]['amount'] += $amount; } } - // 2. Traiter chaque Propriétaire Cible (Alex, Laia, Pol, Pep) foreach ($transfersToDo as $owner => $data) { - - // A. VÉRIFIER SI LE MOIS EXISTE EN EPARGNE + // A. VERIFIER EXISTENCE (Inchangé) $stmtCheck = $pdo->prepare("SELECT COUNT(*) FROM pf_savings WHERE owner = ? AND month_date = ? AND category = 'TOTAL_BANQUE'"); $stmtCheck->execute([$owner, $monthDate]); $exists = $stmtCheck->fetchColumn() > 0; if (!$exists) { - // SCENARIO : LE MOIS N'EXISTE PAS -> DUPLICATION DEPUIS M-1 $prevDate = date('Y-m-d', strtotime($monthDate . ' -1 month')); - - // Récup M-1 - $stmtPrev = $pdo->prepare("SELECT category, amount FROM pf_savings WHERE owner = ? AND month_date = ?"); + $stmtPrev = $pdo->prepare("SELECT category, amount, holiday_id FROM pf_savings WHERE owner = ? AND month_date = ?"); $stmtPrev->execute([$owner, $prevDate]); - $prevLines = $stmtPrev->fetchAll(PDO::FETCH_KEY_PAIR); // [Cat => Montant] + $prevLines = $stmtPrev->fetchAll(PDO::FETCH_ASSOC); - if (empty($prevLines)) { - // Si M-1 n'existe pas non plus, on initialise à 0 (ou on lève une erreur selon préférence) - $prevLines = ['TOTAL_BANQUE' => 0]; - } + if (empty($prevLines)) { $prevLines = [['category' => 'TOTAL_BANQUE', 'amount' => 0, 'holiday_id' => null]]; } - // Insertion M (Copie de M-1) - $stmtInsert = $pdo->prepare("INSERT INTO pf_savings (month_date, owner, category, amount) VALUES (?, ?, ?, ?)"); - foreach ($prevLines as $cat => $amt) { - $stmtInsert->execute([$monthDate, $owner, $cat, $amt]); + $stmtInsert = $pdo->prepare("INSERT INTO pf_savings (month_date, owner, category, amount, holiday_id) VALUES (?, ?, ?, ?, ?)"); + foreach ($prevLines as $row) { + $stmtInsert->execute([$monthDate, $owner, $row['category'], $row['amount'], $row['holiday_id']]); } } - // B. MISE À JOUR DU TOTAL_BANQUE - // On ajoute le montant du virement au montant existant (qu'il vienne d'être créé ou non) + // B. UPDATE TOTAL (Inchangé) $stmtUpdTotal = $pdo->prepare("UPDATE pf_savings SET amount = amount + ? WHERE owner = ? AND month_date = ? AND category = 'TOTAL_BANQUE'"); $stmtUpdTotal->execute([$data['total_add'], $owner, $monthDate]); - // C. MISE À JOUR / CRÉATION DES CATÉGORIES - foreach ($data['cats'] as $catName => $catAmount) { - - // --- REGLE METIER : IGNORER LA CREATION DE LIGNE POUR LES ECO --- - // Ces montants ont déjà été ajoutés au TOTAL_BANQUE (étape B juste au-dessus), - // mais on ne veut pas voir apparaître une ligne "Eco Alex" dans le détail. - if ($catName === 'Eco Alex' || $catName === 'Eco Laia') { - continue; - } + // C. UPDATE CATÉGORIES (Modifié pour gérer le holiday_id) + foreach ($data['cats'] as $catName => $catInfo) { + $catAmount = $catInfo['amount']; + $catHolidayId = $catInfo['holiday_id']; // NOUVEAU + + if ($catName === 'Eco Alex' || $catName === 'Eco Laia') { continue; } - // On vérifie si la catégorie existe déjà $stmtCheckCat = $pdo->prepare("SELECT id FROM pf_savings WHERE owner = ? AND month_date = ? AND category = ?"); $stmtCheckCat->execute([$owner, $monthDate, $catName]); $catId = $stmtCheckCat->fetchColumn(); if ($catId) { - // Update : Sommer - $stmtUpdateCat = $pdo->prepare("UPDATE pf_savings SET amount = amount + ? WHERE id = ?"); - $stmtUpdateCat->execute([$catAmount, $catId]); + // Update : On actualise aussi le holiday_id au cas où il aurait changé + $stmtUpdateCat = $pdo->prepare("UPDATE pf_savings SET amount = amount + ?, holiday_id = ? WHERE id = ?"); + $stmtUpdateCat->execute([$catAmount, $catHolidayId, $catId]); } else { - // Insert : Créer - $stmtInsertCat = $pdo->prepare("INSERT INTO pf_savings (month_date, owner, category, amount) VALUES (?, ?, ?, ?)"); - $stmtInsertCat->execute([$monthDate, $owner, $catName, $catAmount]); + // Insert + $stmtInsertCat = $pdo->prepare("INSERT INTO pf_savings (month_date, owner, category, amount, holiday_id) VALUES (?, ?, ?, ?, ?)"); + $stmtInsertCat->execute([$monthDate, $owner, $catName, $catAmount, $catHolidayId]); } } } @@ -209,9 +184,6 @@ if ($action === 'validate_transfers') { $sysCatId = $stmtSys->fetchColumn(); if ($sysCatId) { - // b. Mettre à jour la valeur (1 = Validé) - // On utilise une astuce SQL : on met à jour uniquement la colonne de la personne concernée - // Si la ligne n'existe pas, on l'insère avec 1 pour la personne et 0 pour l'autre. if ($person === 'Alex') { $sql = "INSERT INTO pf_alloc_values (month_date, cat_id, amount_alex, amount_laia) diff --git a/modules/budget/includes/api/update-payment-status.php b/modules/budget/includes/api/update-payment-status.php deleted file mode 100644 index e69de29..0000000 diff --git a/modules/budget/views/budget_prev.php b/modules/budget/views/budget_prev.php index 4a50521..2e551f5 100644 --- a/modules/budget/views/budget_prev.php +++ b/modules/budget/views/budget_prev.php @@ -68,6 +68,9 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) { $isValidatedAlex = ($row['amount_alex'] == 1); $isValidatedLaia = ($row['amount_laia'] == 1); } + +// 7. Récupération des vacances actives pour les lier au budget +$activeHolidays = $pdo->query("SELECT id, title FROM pf_holidays WHERE status IN ('draft', 'planned', 'booked') ORDER BY start_date ASC")->fetchAll(PDO::FETCH_ASSOC); ?>
@@ -191,6 +194,7 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) {
+ Info
@@ -204,6 +208,7 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) { data-id="" data-name="" data-target="" + data-holiday="" onclick="openEditModal(this)"> ✎ @@ -369,7 +374,7 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) {
-
+
+
+ + +
@@ -386,6 +400,7 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) {
+
@@ -396,11 +411,11 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) { -
+
-
+
+
+ + +
@@ -420,21 +444,16 @@ if ($sysCatId && isset($allocs[$focusDate][$sysCatId])) { diff --git a/modules/budget/views/suivi.php b/modules/budget/views/suivi.php index cdb8d94..018a3aa 100644 --- a/modules/budget/views/suivi.php +++ b/modules/budget/views/suivi.php @@ -35,11 +35,11 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_snapshot') { header("Location: ?tab=suivi"); exit; } -// D. SAUVEGARDE IMPORT CSV (AVEC BUDGET_ITEM_ID) +// D. SAUVEGARDE IMPORT CSV (AVEC BUDGET_ITEM_ID ET HOLIDAY_ID) if (isset($_POST['action']) && $_POST['action'] === 'save_import') { $count = 0; - // 1. Catégories temporaires + // 1. Catégories temporaires (Inchangé) $tempCatMapping = []; if (!empty($_POST['new_temp_cats'])) { $stmtTemp = $pdo->prepare("INSERT INTO pf_monthly_categories (month_year, name, type, budget) VALUES (?, ?, ?, 0)"); @@ -49,8 +49,8 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_import') { } } - // 2. Insertion avec budget_item_id - $stmtExp = $pdo->prepare("INSERT INTO pf_expenses (date_exp, category, label, amount, import_ref, budget_item_id) VALUES (?, ?, ?, ?, ?, ?)"); + // 2. Insertion avec budget_item_id ET holiday_id + $stmtExp = $pdo->prepare("INSERT INTO pf_expenses (date_exp, category, label, amount, import_ref, budget_item_id, holiday_id) VALUES (?, ?, ?, ?, ?, ?, ?)"); $stmtRule = $pdo->prepare("INSERT INTO pf_import_rules (keyword, category) VALUES (?, ?) ON DUPLICATE KEY UPDATE category = VALUES(category)"); if (isset($_POST['lines']) && is_array($_POST['lines'])) { @@ -59,6 +59,7 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_import') { $cat = $line['cat']; $is_credit = isset($line['is_credit']) ? (int)$line['is_credit'] : 0; $budgetItemId = !empty($line['budget_item_id']) ? (int)$line['budget_item_id'] : null; + $holidayId = !empty($line['holiday_id']) ? (int)$line['holiday_id'] : null; // NOUVEAU if ($is_credit && empty($cat)) continue; if (!$is_credit && empty($cat)) continue; @@ -70,7 +71,7 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_import') { $finalAmount = $is_credit ? -abs($line['amount']) : abs($line['amount']); try { - $stmtExp->execute([$line['date'], $cat, $line['label'], $finalAmount, $line['ref'], $budgetItemId]); + $stmtExp->execute([$line['date'], $cat, $line['label'], $finalAmount, $line['ref'], $budgetItemId, $holidayId]); $stmtRule->execute([$line['label'], $cat]); $count++; } catch (Exception $e) { continue; } @@ -89,6 +90,7 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_expense_manual') { $label = trim($_POST['label']); $budgetItemId = null; + $holidayId = !empty($_POST['holiday_id']) ? (int)$_POST['holiday_id'] : null; // NOUVEAU if ($cat === 'School' && !empty($_POST['label_select'])) { $label = trim($_POST['label_select']); @@ -98,19 +100,17 @@ if (isset($_POST['action']) && $_POST['action'] === 'save_expense_manual') { } if ($label && $amount > 0) { - // Gestion du signe (Revenu = Négatif en BDD, Dépense = Positif) - // Note: L'utilisateur saisit toujours du positif dans le formulaire - $finalAmount = ($cat === 'Income') ? -abs($amount) : abs($amount); - + $is_credit = isset($_POST['is_credit']) ? (int)$_POST['is_credit'] : 0; + $finalAmount = $is_credit ? -abs($amount) : abs($amount); if ($id) { // UPDATE - $pdo->prepare("UPDATE pf_expenses SET date_exp=?, category=?, label=?, amount=?, budget_item_id=? WHERE id=?") - ->execute([$date, $cat, $label, $finalAmount, $budgetItemId, $id]); + $pdo->prepare("UPDATE pf_expenses SET date_exp=?, category=?, label=?, amount=?, budget_item_id=?, holiday_id=? WHERE id=?") + ->execute([$date, $cat, $label, $finalAmount, $budgetItemId, $holidayId, $id]); } else { // INSERT $uniqueRef = "MANUAL_" . uniqid(); - $pdo->prepare("INSERT INTO pf_expenses (date_exp, category, label, amount, import_ref, budget_item_id) VALUES (?, ?, ?, ?, ?, ?)") - ->execute([$date, $cat, $label, $finalAmount, $uniqueRef, $budgetItemId]); + $pdo->prepare("INSERT INTO pf_expenses (date_exp, category, label, amount, import_ref, budget_item_id, holiday_id) VALUES (?, ?, ?, ?, ?, ?, ?)") + ->execute([$date, $cat, $label, $finalAmount, $uniqueRef, $budgetItemId, $holidayId]); } header("Location: ?tab=suivi"); exit; } @@ -122,6 +122,9 @@ if (isset($_GET['delete_expense'])) { header("Location: ?tab=suivi"); exit; } +// G. RECUPERATION VACANCES +$activeHolidays = $pdo->query("SELECT id, title FROM pf_holidays WHERE status IN ('draft', 'planned', 'booked') ORDER BY start_date ASC")->fetchAll(PDO::FETCH_ASSOC); + // ============================================================================ // 2. CALCUL DES BUDGETS & CHARGES FIXES // ============================================================================ @@ -318,7 +321,13 @@ function getDisplayLogic($spent, $bg, $type) { } else { $pct = ($bg > 0) ? min(100, ($spent / $bg) * 100) : ($spent > 0 ? 100 : 0); $isOver = ($spent > $bg && $bg > 0); - $text = number_format(ceil($spent), 0, ',', ' ') . ' / ' . number_format(ceil($bg), 0, ',', ' ') . ' €'; + + // MODIFICATION ICI : On cache le "/ 0 €" si le budget est à 0 + if ($bg > 0) { + $text = number_format(ceil($spent), 0, ',', ' ') . ' / ' . number_format(ceil($bg), 0, ',', ' ') . ' €'; + } else { + $text = number_format(ceil($spent), 0, ',', ' ') . ' €'; + } } return ['pct' => $pct, 'isOver' => $isOver, 'text' => $text]; } @@ -476,6 +485,12 @@ function getDisplayLogic($spent, $bg, $type) { +
@@ -565,6 +580,7 @@ function getDisplayLogic($spent, $bg, $type) {
+
+
+ + +
+
@@ -613,6 +637,16 @@ function getDisplayLogic($spent, $bg, $type) {
+
+ + +
+
@@ -741,15 +775,19 @@ function openAddModal(catKey, catLabel) { openSuiviModal('manualExpenseModal'); document.getElementById('modalTitle').innerText = "Ajouter : " + catLabel; - document.getElementById('modalExpenseId').value = ""; // Reset ID (ajout) + document.getElementById('modalExpenseId').value = ""; document.getElementById('modalDate').value = new Date().toISOString().split('T')[0]; document.getElementById('modalLabelInput').value = ""; document.getElementById('modalAmount').value = ""; + document.getElementById('modalHolidayId').value = ""; const catSelect = document.getElementById('modalCatSelect'); catSelect.value = catKey; handleModalCatChange(catSelect); + // Auto-sélection : Si on clique sur le + de "Revenus", on pré-sélectionne "Revenu" + document.getElementById('modalIsCredit').value = (catKey === 'Income') ? "1" : "0"; + setTimeout(() => document.getElementById('modalLabelInput').focus(), 100); } @@ -762,14 +800,17 @@ function openEditModal(expenseData) { document.getElementById('modalDate').value = expenseData.date_exp; document.getElementById('modalLabelInput').value = expenseData.label; - // Le montant en BDD est signé (- pour revenus), on remet en absolu pour l'input - document.getElementById('modalAmount').value = Math.abs(parseFloat(expenseData.amount)); + // NOUVEAU : On lit la vraie valeur en BDD pour définir le type (+ ou -) + const rawAmount = parseFloat(expenseData.amount); + document.getElementById('modalIsCredit').value = rawAmount < 0 ? "1" : "0"; + + document.getElementById('modalAmount').value = Math.abs(rawAmount); + document.getElementById('modalHolidayId').value = expenseData.holiday_id || ""; const catSelect = document.getElementById('modalCatSelect'); catSelect.value = expenseData.category; handleModalCatChange(catSelect); - // Pré-remplir les selects spécifiques if (expenseData.category === 'Frais') { document.getElementById('fraisSelect').value = expenseData.budget_item_id; } else if (expenseData.category === 'Income') { diff --git a/modules/holidays/index.php b/modules/holidays/index.php index 2568b5c..cc4300a 100644 --- a/modules/holidays/index.php +++ b/modules/holidays/index.php @@ -1,14 +1,18 @@ in_array($h['status'], ['passed', ' prepare("SELECT * FROM pf_holidays_items WHERE holiday_id = ?"); $stmt->execute([$h['id']]); $items = $stmt->fetchAll(PDO::FETCH_ASSOC); - // JSON pour le JS $json = htmlspecialchars(json_encode(['main' => $h, 'items' => $items]), ENT_QUOTES, 'UTF-8'); - - // Affichage des dates $dateDisplay = htmlspecialchars($h['period_hint'] ?? ''); - // MODIFICATION ICI : Format d/m/Y (jj/mm/aaaa) if (empty($dateDisplay) && $h['start_date']) { $dateDisplay = date('d/m/Y', strtotime($h['start_date'])); if ($h['end_date']) $dateDisplay .= ' → ' . date('d/m/Y', strtotime($h['end_date'])); @@ -178,6 +177,17 @@ function renderHolidayCard($h, $pdo) { default => 'bg-yellow-50 text-yellow-800' }; + // --- NOUVEAU : Calcul de la progression --- + $cost = (float)$h['total_cost']; + $funded = (float)$h['total_funded']; + $leftToPay = max(0, $cost - $funded); + + // Pourcentage pour la barre de progression (max 100%) + $percent = $cost > 0 ? min(100, round(($funded / $cost) * 100)) : 0; + + // Couleur de la barre : Rouge si < 50%, Jaune si < 100%, Vert si tout est payé + $barColor = $percent === 100 ? '#10b981' : ($percent > 50 ? '#f59e0b' : '#ef4444'); + echo "
@@ -190,9 +200,22 @@ function renderHolidayCard($h, $pdo) { 🗓️ ".($dateDisplay ?: 'Dates à définir')."
-
- Budget Total - ".number_format($h['total_cost'], 0, ',', ' ')." € +
+ +
+ Budget Total + ".number_format($cost, 0, ',', ' ')." € +
+ +
+
+
+ +
+ ✓ Financé : ".number_format($funded, 0, ',', ' ')." € + Reste : ".number_format($leftToPay, 0, ',', ' ')." € +
+
";