Update index.html

Author: 613avi

index.html

@@ -115,33 +115,32 @@
     <div id="countdown" class="fixed-width-digits">00:00:00</div>
     <div class="countdown-info">
       <div>שעה נוכחית: <span id="nowSmall" class="fixed-width-digits">--:--:--</span></div>
-      <div>שעת נץ: <span id="sunriseSmall" class="fixed-width-digits">--:--</span></div>
+      <div>שעת נץ: <span id="sunriseSmall" class="fixed-width-digits">--:--:--</span></div> <!-- Changed default value to include seconds -->
     </div>
   </div>
 
 <script>
 const CSV_PATH = './sunrise_times.csv';
-const VERSION_FILE_PATH = './version.json'; // Path to the version indicator file
+const VERSION_FILE_PATH = './version.json';
 const DEFAULT_SUNRISE = '06:00:00';
-const VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1000; // Check for new version every 5 minutes
+const VERSION_CHECK_INTERVAL_MS = 5 * 60 * 1000;
 
-let sunriseMap = new Map(); // 'YYYY-MM-DD' -> { sunrise:'HH:MM:SS', hebrew:'...' }
-let currentDataVersion = 0; // Stores the timestamp of the currently loaded data
+let sunriseMap = new Map();
+let currentDataVersion = 0;
 
 function z(n,len=2){return String(n).padStart(len,'0');}
 
 async function loadCsv(){
   try{
-    // Adding a cache-busting parameter to ensure the latest CSV is fetched
     const res = await fetch(CSV_PATH + '?cache=' + new Date().getTime());
     if(!res.ok) throw new Error('CSV fetch error: ' + res.statusText);
     const txt = await res.text();
     parseCsv(txt);
     console.log("CSV data loaded successfully.");
-    return true; // Indicate success
+    return true;
   }catch(e){
     console.warn("בעיה בטעינת CSV",e);
-    return false; // Indicate failure
+    return false;
   }
 }
 
@@ -151,7 +150,6 @@
   let start = 0;
   if (/date/i.test(lines[0])) start = 1;
 
-  // Clear existing map before parsing new data
   sunriseMap.clear();
 
   for(let i=start;i<lines.length;i++){
@@ -171,7 +169,11 @@
 }
 
 function getDataForDate(dateObj){
-  const key = dateObj.toISOString().slice(0,10);
+  const year = dateObj.getFullYear();
+  const month = z(dateObj.getMonth() + 1); // getMonth() is 0-indexed
+  const day = z(dateObj.getDate());
+  const key = `${year}-${month}-${day}`;
+
   return sunriseMap.get(key) || {sunrise:DEFAULT_SUNRISE, hebrew:'—'};
 }
 
@@ -184,6 +186,9 @@
   const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
 
   const data = getDataForDate(today);
+  console.log("Current date being checked (local):", today.getFullYear()+"-"+z(today.getMonth()+1)+"-"+z(today.getDate())); // For debugging
+  console.log("Data retrieved for today (local):", data); // For debugging
+
   const hebrewDate = data.hebrew;
   const [sh,sm,ss] = data.sunrise.split(':').map(n=>parseInt(n,10));
 
@@ -208,7 +213,7 @@
 
     document.getElementById('countdown').textContent = z(hh)+":"+z(mm)+":"+z(ss2);
     document.getElementById('nowSmall').textContent = formatTime(now);
-    document.getElementById('sunriseSmall').textContent = z(sh)+":"+z(sm);
+    document.getElementById('sunriseSmall').textContent = z(sh)+":"+z(sm)+":"+z(ss); // FIX: Added seconds here
 
   } else {
     defaultDisplay.style.display = 'flex';
@@ -219,35 +224,29 @@
   }
 }
 
-// Function to check for new data version
 async function checkForNewVersion(){
   try {
-    // Cache-bust the version file fetch as well
     const res = await fetch(VERSION_FILE_PATH + '?cache=' + new Date().getTime());
     if (!res.ok) throw new Error('Version file fetch error: ' + res.statusText);
     const versionData = await res.json();
     const latestVersion = versionData.last_updated || 0;
 
     if (latestVersion > currentDataVersion) {
       console.log(`New data version detected: ${latestVersion}. Current: ${currentDataVersion}. Reloading CSV.`);
-      const loaded = await loadCsv(); // Attempt to load new CSV
+      const loaded = await loadCsv();
       if (loaded) {
-        currentDataVersion = latestVersion; // Update version only if CSV loaded successfully
+        currentDataVersion = latestVersion;
         console.log("CSV data updated from new version.");
-        // No need to call updateTick explicitly here, as setInterval(updateTick, 1000) will pick up new data.
       }
     }
   } catch (e) {
     console.warn("בעיה בבדיקת גרסה או טעינת נתונים חדשים", e);
   }
 }
 
-
 (async function init(){
-  // Initial load of CSV
   const loaded = await loadCsv();
   if (loaded) {
-    // If initial CSV load is successful, get initial version from version.json
     try {
       const res = await fetch(VERSION_FILE_PATH + '?cache=' + new Date().getTime());
       if (res.ok) {
@@ -260,10 +259,9 @@
     }
   }
 
-  updateTick(); // Initial display update
-  setInterval(updateTick,1000); // Update time every second
+  updateTick();
+  setInterval(updateTick,1000);
 
-  // Start periodic version checking
   setInterval(checkForNewVersion, VERSION_CHECK_INTERVAL_MS);
 })();
 </script>