Aucun trajet calculé.
';
}
});
- }
- // 4. Chargement des badges Météo
- if (typeof MAP_POINTS !== "undefined") {
- MAP_POINTS.forEach((pt) => {
- if (typeof loadWeatherForStep === "function") {
- loadWeatherForStep(pt);
+ // 5. Fix Leaflet Resize
+ setTimeout(() => {
+ if (detailMap) {
+ detailMap.invalidateSize();
}
- });
- }
+ }, 300);
- // 5. Fix Leaflet Resize
- setTimeout(() => {
- if (detailMap) {
- detailMap.invalidateSize();
+ function drawFallbackLine(coords, color, weight) {
+ L.polyline(coords, {
+ color: color,
+ weight: weight || 3,
+ dashArray: "8, 8",
+ opacity: 0.7,
+ }).addTo(detailMap);
}
- }, 300);
-
- function drawFallbackLine(coords, color, weight) {
- L.polyline(coords, {
- color: color,
- weight: weight || 3,
- dashArray: "8, 8",
- opacity: 0.7,
- }).addTo(detailMap);
}
}
@@ -706,6 +723,26 @@ function openPlanningModal(step) {
let validItems = step.items.filter((it) => it.name !== "PF_TECHNICAL_POINT");
+ window.CURRENT_PLANNING_STEP = step; // Mémorise l'étape en cours
+
+ if (window.TRANSIT_DATA && window.TRANSIT_DATA[step.sort_order]) {
+ // Est-ce qu'on a déjà planifié ou ajouté ce trajet ?
+ let hasTransit = validItems.some((it) => it.expense_context === "transit");
+ if (!hasTransit) {
+ const tData = window.TRANSIT_DATA[step.sort_order];
+ const h = Math.max(1, Math.round(tData.sec / 3600)); // Arrondi en heures
+ validItems.push({
+ id: "virtual-transit",
+ name: `Essence depuis ${tData.from}`, // Garde ce nom pour lier avec le budget
+ category: "transport",
+ expense_context: "transit",
+ duration: h,
+ notes: `Trajet GPS (${Math.round(tData.sec / 60)} min). Déplacez pour planifier la route.`,
+ is_virtual: true,
+ });
+ }
+ }
+
if (!step.step_start_date || !step.step_end_date) {
container.innerHTML = `
+ style="--duration: ${dur}; ${bgStyle}"
+ ondragstart="dragStart(event)" onclick="handleItemTap(event, '${it.id}')">
-
${icon} ${it.name}
+
${visualName}
-
- ${dur}h
-
+ ${durControls}
${noteHtml}
@@ -898,19 +950,29 @@ function handleDropEvent(e, dateStr, timeStr) {
}
function handleDropLogic(itemId, dateStr, timeStr, dropZone) {
- const draggedEl = document.getElementById("drag-item-" + itemId);
- if (dropZone && draggedEl) {
- dropZone.appendChild(draggedEl);
- updateItemMemory(itemId, { item_date: dateStr, item_time: timeStr });
- const formData = new FormData();
- formData.append("action", "update_item_datetime");
- formData.append("item_id", itemId);
- formData.append("item_date", dateStr);
- formData.append("item_time", timeStr);
+ if (itemId === "virtual-transit") {
+ const step = window.CURRENT_PLANNING_STEP;
+ const tData = window.TRANSIT_DATA[step.sort_order];
+ const holidayId = document.querySelector('input[name="holiday_id"]').value;
+ const h = Math.max(1, Math.round(tData.sec / 3600));
+
+ const fd = new FormData();
+ fd.append("action", "add_single_item");
+ fd.append("holiday_id", holidayId);
+ fd.append("sort_order", step.sort_order);
+ fd.append("category", "transport");
+ fd.append("context", "transit");
+ fd.append("name", `Essence depuis ${tData.from}`);
+ fd.append("amount", tData.cost);
+ fd.append("duration", h);
+ fd.append("item_date", dateStr);
+ fd.append("item_time", timeStr);
+
fetch("/modules/holidays/includes/api/save_checkpoint.php", {
method: "POST",
- body: formData,
- });
+ body: fd,
+ }).then(() => window.location.reload());
+ return;
}
}
@@ -974,6 +1036,7 @@ function addQuickTransitExpense(
amount,
description,
btnElement,
+ durationSec = 3600,
) {
if (
!confirm(
@@ -1006,16 +1069,17 @@ function addQuickTransitExpense(
fd.append("amount", amount);
fd.append("context", "transit");
- // 3. Envoi en arrière-plan sans bloquer l'utilisateur
+ // 🔥 On sécurise la durée en base de données
+ const h = Math.max(1, Math.round(durationSec / 3600));
+ fd.append("duration", h);
+
fetch("/modules/holidays/includes/api/save_checkpoint.php", {
method: "POST",
body: fd,
})
.then((res) => res.json())
.then((data) => {
- if (!data.success) {
- alert("Erreur lors de la sauvegarde en arrière-plan : " + data.error);
- }
+ if (!data.success) alert("Erreur : " + data.error);
});
}
@@ -1037,3 +1101,25 @@ function updateFuelPrice() {
}
}
}
+
+// Formatte les secondes en "XXhYY" ou "YYmin"
+function formatDuration(seconds) {
+ if (!seconds || isNaN(seconds)) return "0min";
+ const h = Math.floor(seconds / 3600);
+ const m = Math.floor((seconds % 3600) / 60);
+ if (h > 0) {
+ return `${h}h${m.toString().padStart(2, "0")}`;
+ }
+ return `${m}min`;
+}
+
+// Ouvre et ferme la modale des détails (L'œil)
+function openTransitModal() {
+ document.getElementById("transitModal").style.display = "flex";
+ document.body.classList.add("no-scroll");
+}
+
+function closeTransitModal() {
+ document.getElementById("transitModal").style.display = "none";
+ document.body.classList.remove("no-scroll");
+}
diff --git a/modules/holidays/includes/api/save_checkpoint.php b/modules/holidays/includes/api/save_checkpoint.php
index e459caa..87954a9 100644
--- a/modules/holidays/includes/api/save_checkpoint.php
+++ b/modules/holidays/includes/api/save_checkpoint.php
@@ -21,14 +21,17 @@ if (isset($_POST['action']) && in_array($_POST['action'], ['update_item_datetime
$stepInfo = $stmt->fetch();
if ($stepInfo) {
- // Utilisation de transactions isolées pour l'AJAX
+ $dur = isset($_POST['duration']) ? (int)$_POST['duration'] : 1;
+ $date = !empty($_POST['item_date']) ? $_POST['item_date'] : null;
+ $time = !empty($_POST['item_time']) ? $_POST['item_time'] : null;
+
$pdo->beginTransaction();
- $ins = $pdo->prepare("INSERT INTO pf_holidays_items (holiday_id, category, name, amount, is_paid, location_name, lat, lng, sort_order, step_start_date, step_end_date, step_type, expense_context, duration) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)");
+ $ins = $pdo->prepare("INSERT INTO pf_holidays_items (holiday_id, category, name, amount, is_paid, location_name, lat, lng, sort_order, step_start_date, step_end_date, step_type, expense_context, duration, item_date, item_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
$ins->execute([
$holiday_id, $_POST['category'], $_POST['name'], (float)$_POST['amount'], 0,
$stepInfo['location_name'], $stepInfo['lat'], $stepInfo['lng'],
$sort_order, $stepInfo['step_start_date'], $stepInfo['step_end_date'],
- $stepInfo['step_type'], $_POST['context']
+ $stepInfo['step_type'], $_POST['context'], $dur, $date, $time
]);
$pdo->commit();
echo json_encode(['success' => true]);
diff --git a/modules/holidays/views/detail.php b/modules/holidays/views/detail.php
index fd048fa..3343214 100644
--- a/modules/holidays/views/detail.php
+++ b/modules/holidays/views/detail.php
@@ -131,7 +131,7 @@ $pctSaved = $cost > 0 ? min(100 - $pctPaid, ($saved / $cost) * 100) : 0;
0): ?>
-
+
👁️
@@ -139,10 +139,13 @@ $pctSaved = $cost > 0 ? min(100 - $pctPaid, ($saved / $cost) * 100) : 0;