Update app.py

app.py

@@ -39,21 +39,23 @@ def has_system_availability(schedule_data, class_selected, day_selected, start_t
 
 # Convert string day and time to datetime
 def get_class_datetime(day_selected, start_time_selected):
-    days_of_week = ["یکشنبه", "دوشنبه", "سه‌شنبه", "چهارشنبه", "پنج‌شنبه", "جمعه", "شنبه"]
-    today = JalaliDate.today()
-    current_day_index = today.day_of_week
+    days_of_week = ["شنبه", "یکشنبه", "دوشنبه", "سه‌شنبه", "چهارشنبه", "پنج‌شنبه", "جمعه"]
+    today = JalaliDate.today().to_gregorian()
+    current_day_index = today.weekday()  # This returns the current day of the week as an integer (0=Monday, 6=Sunday)
 
-    # Find the date of the next occurrence of the given day
+    # Adjusting days of the week to start from Saturday to match the Persian calendar
     target_day_index = days_of_week.index(day_selected)
-    delta_days = (target_day_index - current_day_index) % 7
+    adjusted_day_index = (target_day_index + 1) % 7  # Mapping Saturday to 0, ..., Friday to 6
+
+    delta_days = (adjusted_day_index - current_day_index) % 7
 
     # If the class day is today but time has passed, move to the next week
-    if delta_days == 0 and datetime.strptime(start_time_selected, "%H:%M").time() < today.to_gregorian().time():
+    class_time = datetime.strptime(start_time_selected, "%H:%M").time()
+    if delta_days == 0 and class_time < datetime.now().time():
         delta_days = 7
 
     class_date = today + timedelta(days=delta_days)
-    class_time = datetime.strptime(start_time_selected, "%H:%M").time()
-    class_datetime = datetime.combine(class_date.to_gregorian(), class_time)
+    class_datetime = datetime.combine(class_date, class_time)
 
     return class_datetime