Update app.py

updated by o1 Open Ai

app.py

@@ -1,7 +1,6 @@
 import streamlit as st
 import pandas as pd
-from hijri_converter import Gregorian, Hijri
-from datetime import date
+from hijridate import Hijri, Gregorian
 
 # Add a sidebar with radio buttons
 st.sidebar.title("Navigation")
@@ -18,55 +17,62 @@ option = st.sidebar.radio(
     ),
 )
 
-# Function to add days to a Hijri date
+# Function to add days to a Hijri date without using Julian or Gregorian dates
 def add_hijri_days(hijri_date, days):
-    jd = hijri_date.to_jd()
-    new_jd = jd + days
-    new_hijri_date = Hijri.from_jd(new_jd)
+    day = hijri_date.day
+    month = hijri_date.month
+    year = hijri_date.year
+
+    while days > 0:
+        days_in_current_month = Hijri(year, month, 1).month_length()
+        remaining_days_in_month = days_in_current_month - day + 1
+
+        if days >= remaining_days_in_month:
+            days -= remaining_days_in_month
+            day = 1
+            if month == 12:
+                month = 1
+                year += 1
+            else:
+                month += 1
+        else:
+            day += days
+            days = 0
+
+    new_hijri_date = Hijri(year, month, day)
     return new_hijri_date
 
-# Function to add months to a Hijri date
+# Function to add months to a Hijri date without using Gregorian dates
 def add_hijri_months(hijri_date, months):
-    year = hijri_date.year
     month = hijri_date.month
+    year = hijri_date.year
     day = hijri_date.day
 
-    # Calculate new month and year
-    total_months = (year * 12 + (month - 1)) + months
-    new_year = total_months // 12
+    total_months = (year - 1) * 12 + (month - 1) + months
+    new_year = total_months // 12 + 1
     new_month = total_months % 12 + 1
 
-    try:
-        new_hijri_date = Hijri(new_year, new_month, day)
-    except ValueError:
-        # Day is invalid in the new month, so advance to first day of next month
-        total_months += 1  # Advance one more month
-        new_year = total_months // 12
-        new_month = total_months % 12 + 1
-        new_hijri_date = Hijri(new_year, new_month, 1)
+    max_day = Hijri(new_year, new_month, 1).month_length()
+    if day > max_day:
+        day = max_day
 
+    new_hijri_date = Hijri(new_year, new_month, day)
     return new_hijri_date
 
-# Function to add years to a Hijri date
+# Function to add years to a Hijri date without using Gregorian dates
 def add_hijri_years(hijri_date, years):
     year = hijri_date.year + years
     month = hijri_date.month
     day = hijri_date.day
 
-    try:
-        new_hijri_date = Hijri(year, month, day)
-    except ValueError:
-        # Day is invalid in the new month, advance to first day of next month
-        if month == 12:
-            month = 1
-            year += 1
-        else:
-            month += 1
-        new_hijri_date = Hijri(year, month, 1)
+    max_day = Hijri(year, month, 1).month_length()
+    if day > max_day:
+        day = max_day
 
+    new_hijri_date = Hijri(year, month, day)
     return new_hijri_date
 
-# Function to calculate three month deadlines
+# Function to calculate three-month deadlines
 def three_month_deadlines():
     st.title("Three Month Deadline Converter")
     start_date = st.date_input("Select a Gregorian start date")
@@ -258,4 +264,4 @@ elif option == "Add 20 Years to Filing Date":
 elif option == "Add 15 Years to Filing Date":
     add_years_to_filing_date(15)
 elif option == "Add 10 Years to Filing Date":
-    add_years_to_filing_date(10)
+    add_years_to_filing_date(10)