calendar update

Author: khumnath

.gitignore

@@ -0,0 +1,49 @@
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build*
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+# QtCreator 4.8< compilation database 
+compile_commands.json
+
+# QtCreator local machine specific files for imported projects
+*creator.user*

docs/bikram.js

@@ -97,7 +97,7 @@
         let nepalimonth = saura_masa_num % 12;
         this.Year = YearSaka + 135 + Math.floor((saura_masa_num - nepalimonth) / 12);
         this.Month = (saura_masa_num + 1) % 12;
-        this.Day = saura_masa_day;
+        this.Day = saura_masa_day +1;
       }
 
       // Public method to convert Bikram Sambat to Gregorian
@@ -106,7 +106,7 @@
         let YearKali = YearSaka + 3179;
         let ahar = Math.floor((YearKali * this.YugaCivilDays) / this.YugaRotation_sun);
         let [saura_masa_num, saura_masa_day] = this.getSauraMasaDay(ahar);
-        bsMonth = (bsMonth + 11) % 12; // Adjust the month to the correct range
+        bsMonth = (bsMonth + 12) % 12; // Adjust the month to the correct range
         while (saura_masa_num !== bsMonth || saura_masa_day !== bsDay) {
           if (saura_masa_num < bsMonth || (saura_masa_num === bsMonth && saura_masa_day < bsDay)) {
             ahar++;
@@ -141,7 +141,7 @@
 
 
       getDay() {
-        return this.Day;
+        return this.Day -1;
       }
 getNepaliWeekdayName() {
     const weekdayNepali = ["आइतबार", "सोमबार", "मङ्गलबार", "बुधबार", "बिहिबार", "शुक्रबार", "शनिबार"];
@@ -176,7 +176,7 @@ getGregorianMonthName() {
 
   // Method to get Nepali day name for Gregorian date
   getGregorianDayName(year, month, day) {
-    let date = new Date(year, month - 1, day);
+    let date = new Date(year, month, day);
     const weekdayNepali = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"];
     return weekdayNepali[date.getDay()];
   }

docs/index.html

@@ -44,7 +44,7 @@
     }
 
     .calendar {
-      display: none;  /* hidden untill correct calendar update logic fixed */
+   
       width: 100%;
       max-width: 600px;
       border: 1px solid #ccc;
@@ -232,19 +232,17 @@ <h1 class="text-center">Nepali Date Converter</h1>
         <center>
           <p>Converted Date: <span id="gYearResult" class="result"></span> <span id="gMonthResult"
                                                                                   class="result"></span> <span
-              id="gDayResult" class="result"></span> <!--<span id="gregorianWeekday"
-                                                          class="result"></span> removed --></p></center>
+              id="gDayResult" class="result"></span></p></center>
       </div>
     </div>
   </div>
 </div>
 
 <div class="container">
   <div class="calendar" id="bikramCalendar">
-    <h3>Bikram Sambat Calendar Current Month </h3>
-    <div>
-      <span id="currentDate"></span>
-    </div>
+    <h3>Bikram Sambat Calendar</h3>
+    
+<br>
     <table>
       <thead>
       <tr>
@@ -264,67 +262,105 @@ <h3>Bikram Sambat Calendar Current Month </h3>
   </div>
 </div>
 <script>
-  document.addEventListener('DOMContentLoaded', function () {
-    const bikram = new Bikram();
-
-    function generateBikramCalendar(bsYear, bsMonth) {
-      const daysInMonth = bikram.daysInMonth(bsYear, bsMonth);
-      const firstDay = bikram.getDayOfWeek(bsYear, bsMonth, 1);
-      const currentDay = new Date().getDay();
-      const bikramBody = document.getElementById('bikramBody');
-      bikramBody.innerHTML = '';
-
-      for (let i = 0; i < 6; i++) {
-        let row = document.createElement('tr');
-        for (let j = 0; j < 7; j++) {
-          let cell = document.createElement('td');
-          let dayNumber = i * 7 + j - firstDay;
-
-          if (dayNumber > 0 && dayNumber <= daysInMonth) {
-            cell.innerHTML = convertToNepaliDigits(dayNumber);
-
-            // Convert Bikram Sambat date to Gregorian date
-            let gDate = bikram.toGregorian(bsYear, bsMonth, dayNumber);
-
-            // Calculate Tithi
-            try {
-              let tithiInfo = calculateTithi(gDate.year, gDate.month, gDate.day);
-              if (tithiInfo && tithiInfo.tithi) {
-               cell.setAttribute('title', `${tithiInfo.tithi} - ${tithiInfo.paksha}`);;
-                cell.innerHTML += `<br><span class="tithi-label">${tithiInfo.tithi}</span>`;
-              } else {
-                console.error(`Tithi info is undefined for: Year: ${gDate.year}, Month: ${gDate.month}, Day: ${gDate.day}`);
-              }
-            } catch (error) {
-              console.error(`Error calculating tithi for: Year: ${gDate.year}, Month: ${gDate.month}, Day: ${gDate.day}`, error);
-            }
-
-            if (j === currentDay && i === 0) {
-              cell.style.color = 'red';
-            }
-          } else {
-            cell.textContent = '';
+ document.addEventListener('DOMContentLoaded', function () {
+  const bikram = new Bikram();
+
+  // Function to generate the Bikram Sambat calendar
+ function generateBikramCalendar(bsYear, bsMonth) {
+  const daysInMonth = bikram.daysInMonth(bsYear, bsMonth); // Total number of days in the selected month
+  const firstDay = bikram.getDayOfWeek(bsYear, bsMonth, 1); // First day of the month (Bikram Sambat day of the week)
+  
+  // Get today's Bikram Sambat date
+  const today = new Date();
+  const todayBikramDate = bikram.fromGregorian(today.getFullYear(), today.getMonth() + 1, today.getDate());
+
+
+  const bikramBody = document.getElementById('bikramBody');
+  bikramBody.innerHTML = ''; // Clear the existing calendar body
+
+  let dayCounter = 1; // Start with the 1st day of the month
+  let row = document.createElement('tr'); // Create the first row for weekdays
+
+  // Loop through the weeks (6 rows to handle all days in the month)
+  for (let i = 0; i < 6; i++) {
+    // Loop through the days of the week (7 columns)
+    for (let j = 0; j < 7; j++) {
+      let cell = document.createElement('td');
+      
+      // Check if it's the correct day in the calendar
+      if (i === 0 && j < firstDay) {
+        // Fill empty cells before the first day of the month
+        cell.textContent = '';
+      } else if (dayCounter <= daysInMonth) {
+        // Fill cells with actual days
+        cell.innerHTML = convertToNepaliDigits(dayCounter);
+
+        // Convert Bikram Sambat date to Gregorian date
+        let gDate = bikram.toGregorian(bsYear, bsMonth, dayCounter);
+
+        // Calculate Tithi (if available)
+        try {
+          let tithiInfo = calculateTithi(gDate.year, gDate.month, gDate.day);
+          if (tithiInfo && tithiInfo.tithi) {
+            cell.setAttribute('title', `${tithiInfo.tithi} - ${tithiInfo.paksha}`);
+            cell.innerHTML += `<br><span class="tithi-label">${tithiInfo.tithi}</span>`;
           }
+        } catch (error) {
+          console.error(`Error calculating tithi for: Year: ${gDate.year}, Month: ${gDate.month}, Day: ${gDate.day}`, error);
+        }
 
-          row.appendChild(cell);
+        // Highlight today's Bikram Sambat date
+        if (dayCounter === todayBikramDate) {
+          cell.style.backgroundColor = 'yellow'; // Highlight today
         }
-        bikramBody.appendChild(row);
+
+        dayCounter++; // Increment the day counter for the next day
+      } else {
+        // Fill remaining cells after the last day of the month
+        cell.textContent = '';
       }
 
-      document.getElementById('currentDate').textContent = `${bikram.getBikramMonthName(bsMonth)} ${convertToNepaliDigits(bsYear)}`;
+      row.appendChild(cell); // Append the cell to the row
     }
 
-    const today = new Date();
-    bikram.fromGregorian(today.getFullYear(), today.getMonth() + 1, 1);
-    generateBikramCalendar(bikram.getYear(), bikram.getMonth() + 1);
+    bikramBody.appendChild(row); // Append the row to the calendar body
+
+    // If dayCounter exceeds the number of days in the month, stop adding new rows
+    if (dayCounter > daysInMonth) {
+      break;
+    }
+
+    // Create a new row for the next week
+    row = document.createElement('tr');
+  }
+
+}
+  
+
+  // Function to update the calendar from selected Gregorian date
+  function updateCalendarFromGregorian() {
+    const gYear = parseInt(document.getElementById('gYear').value);
+    const gMonth = parseInt(document.getElementById('gMonth').value);
+    const gDay = parseInt(document.getElementById('gDay').value);
+
+    // Convert the Gregorian date to Bikram Sambat date
+    bikram.fromGregorian(gYear, gMonth, gDay);
+
+    // Generate the calendar for the corresponding Bikram Sambat year and month
+    generateBikramCalendar(bikram.getYear(), bikram.getMonth() + 1); // Bikram months are 1-indexed
+  }
+
+  // Listen for changes in the Gregorian date dropdowns
+  document.getElementById('gYear').addEventListener('change', updateCalendarFromGregorian);
+  document.getElementById('gMonth').addEventListener('change', updateCalendarFromGregorian);
+  //document.getElementById('gDay').addEventListener('change', updateCalendarFromGregorian);
+
+  // Generate the initial Bikram Sambat calendar
+  const today = new Date();
+  bikram.fromGregorian(today.getFullYear(), today.getMonth() + 1, 1); // Initialize Bikram from current Gregorian date
+  generateBikramCalendar(bikram.getYear(), bikram.getMonth() + 1); // Generate the calendar for the current month
+});
 
-    document.getElementById('bikramCalendar').addEventListener('change', function () {
-      const bsYear = parseInt(document.getElementById('bikramYear').value);
-      const bsMonth = parseInt(document.getElementById('bikramMonth').value);
-      generateBikramCalendar(bsYear, bsMonth);
-      bikram.fromNepali(bsYear, bsMonth, 1);
-    });
-  });
 </script>