From b386364cd65987c5c36e43166cc5a90b59a2bd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?= <gru@macbook.net.r.local>
Date: Wed, 17 Sep 2025 21:53:28 +0200
Subject: [PATCH] podzial dzienny

---
 static/js/expense_chart.js | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/static/js/expense_chart.js b/static/js/expense_chart.js
index 42e00d8..0a5df7c 100644
--- a/static/js/expense_chart.js
+++ b/static/js/expense_chart.js
@@ -20,8 +20,18 @@ document.addEventListener("DOMContentLoaded", function () {
             url += '&show_all=true';
         }
 
-        if (startDate && endDate) {
-            url += `&start_date=${startDate}&end_date=${endDate}`;
+        // Jeśli zakres to custom, to wymuszamy przekazanie dat jako kompletny URL
+        if (range === 'custom' && startDate && endDate) {
+            url = `/expenses_data?range=custom&start_date=${startDate}&end_date=${endDate}`;
+            if (showAllCheckbox) {
+                url += showAllCheckbox.checked ? '&show_all=true' : '&show_all=false';
+            } else {
+                url += '&show_all=true';
+            }
+        } else {
+            if (startDate && endDate) {
+                url += `&start_date=${startDate}&end_date=${endDate}`;
+            }
         }
 
         if (window.selectedCategoryId) {
@@ -115,11 +125,16 @@ document.addEventListener("DOMContentLoaded", function () {
     toggleBtn.addEventListener("click", function () {
         categorySplit = !categorySplit;
 
-        // Znajdź aktualnie aktywny przycisk podziału czasu
-        let activeRange = 'currentmonth'; // domyślna wartość
+        const startDateInput = document.getElementById("startDate");
+        const endDateInput = document.getElementById("endDate");
+        const startDate = startDateInput ? startDateInput.value : null;
+        const endDate = endDateInput ? endDateInput.value : null;
+
+        // Wybierz zakres - przy daily ustawiamy range = 'custom', by respektować daty
+        let activeRange = 'currentmonth'; // default
 
         if (document.getElementById('toggleDailySplit').classList.contains('btn-primary')) {
-            activeRange = 'daily';
+            activeRange = (startDate && endDate) ? 'custom' : 'daily';
         } else if (document.getElementById('toggleMonthlySplit').classList.contains('btn-primary')) {
             activeRange = 'monthly';
         }
@@ -134,13 +149,6 @@ document.addEventListener("DOMContentLoaded", function () {
             this.classList.add("btn-outline-warning");
         }
 
-        // Pobierz wybrane daty
-        const startDateInput = document.getElementById("startDate");
-        const endDateInput = document.getElementById("endDate");
-        const startDate = startDateInput ? startDateInput.value : null;
-        const endDate = endDateInput ? endDateInput.value : null;
-
-        // Wywołaj loadExpenses z przekazaniem zakresu dat, jeśli jest ustawiony
         if (startDate && endDate) {
             loadExpenses(activeRange, startDate, endDate);
         } else {
@@ -148,6 +156,7 @@ document.addEventListener("DOMContentLoaded", function () {
         }
     });
 
+
     toggleBtn.textContent = "🔵 Pokaż całościowo";
     toggleBtn.classList.remove("btn-outline-warning");
     toggleBtn.classList.add("btn-outline-info");