Update app.py

rewrite to add Hijry days/ months, not gregorian

app.py

@@ -8,11 +8,45 @@ from dateutil.relativedelta import relativedelta
 st.sidebar.title("Navigation")
 option = st.sidebar.radio(
     "Choose an option",
-    ("Three Month Deadline Converter", "60 Days Deadline Converter", "90 Days Deadline Converter", 
-     "Convert Hijri Date to Gregorian Date", "Add 20 Years to Filing Date", "Add 15 Years to Filing Date", 
-     "Add 10 Years to Filing Date")
+    (
+        "Three Month Deadline Converter",
+        "60 Days Deadline Converter",
+        "90 Days Deadline Converter",
+        "Convert Hijri Date to Gregorian Date",
+        "Add 20 Years to Filing Date",
+        "Add 15 Years to Filing Date",
+        "Add 10 Years to Filing Date",
+    ),
 )
 
+# Function to add months to a Hijri date
+def add_hijri_months(hijri_date, months):
+    year = hijri_date.year
+    month = hijri_date.month
+    day = hijri_date.day
+
+    month += months
+    while month > 12:
+        month -= 12
+        year += 1
+
+    # Adjust the day if necessary
+    try:
+        new_hijri_date = Hijri(year, month, day)
+    except ValueError:
+        # If day is invalid (e.g., 30 in a month that only has 29 days), adjust day to 29
+        day = 29
+        new_hijri_date = Hijri(year, month, day)
+
+    return new_hijri_date
+
+# Function to add days to a Hijri date
+def add_hijri_days(hijri_date, days):
+    jd = hijri_date.to_jd()
+    new_jd = jd + days
+    new_hijri_date = Hijri.from_jd(new_jd)
+    return new_hijri_date
+
 # Function to calculate three month deadlines
 def three_month_deadlines():
     st.title("Three Month Deadline Converter")
@@ -20,44 +54,48 @@ def three_month_deadlines():
     date_data = []
 
     if start_date:
-        # Original Gregorian date
+        # Convert start_date to Hijri
         gregorian_date = Gregorian(start_date.year, start_date.month, start_date.day)
-        
-        # Convert to Hijri for display
         hijri_start_date = gregorian_date.to_hijri()
-        
-        # Calculate deadline by adding 3 months to Gregorian date
-        deadline_gregorian = start_date + relativedelta(months=3)
-        
-        # Convert deadline to Hijri
-        deadline_hijri = Gregorian(deadline_gregorian.year, deadline_gregorian.month, deadline_gregorian.day).to_hijri()
-
-        # Add to date_data list
-        date_data.append({
-            "Description": "Chosen Start Date",
-            "Hijri Date": hijri_start_date.isoformat(),
-            "Gregorian Date": gregorian_date.isoformat()
-        })
-        date_data.append({
-            "Description": "Deadline - three months from start date",
-            "Hijri Date": deadline_hijri.isoformat(),
-            "Gregorian Date": deadline_gregorian.isoformat()
-        })
+
+        date_data.append(
+            {
+                "Description": "Chosen Start Date",
+                "Hijri Date": hijri_start_date.isoformat(),
+                "Gregorian Date": gregorian_date.isoformat(),
+            }
+        )
+
+        # Add 3 months to Hijri date
+        deadline_hijri = add_hijri_months(hijri_start_date, 3)
+
+        # Convert deadline back to Gregorian
+        deadline_gregorian = deadline_hijri.to_gregorian()
+
+        date_data.append(
+            {
+                "Description": "Deadline - three Hijri months from start date",
+                "Hijri Date": deadline_hijri.isoformat(),
+                "Gregorian Date": deadline_gregorian.isoformat(),
+            }
+        )
 
         # Function to add months and store results
-        def add_months_and_store_from_deadline(deadline_gregorian, months):
+        def add_months_and_store_from_deadline(deadline_hijri, months):
             for i in range(1, months + 1):
-                future_gregorian = deadline_gregorian + relativedelta(months=i)
-                future_hijri = Gregorian(future_gregorian.year, future_gregorian.month, future_gregorian.day).to_hijri()
-                
-                description = f"{i} month extension from deadline"
-                date_data.append({
-                    "Description": description,
-                    "Hijri Date": future_hijri.isoformat(),
-                    "Gregorian Date": future_gregorian.isoformat()
-                })
-
-        add_months_and_store_from_deadline(deadline_gregorian, 3)
+                future_hijri = add_hijri_months(deadline_hijri, i)
+                future_gregorian = future_hijri.to_gregorian()
+
+                description = f"{i} Hijri month extension from deadline"
+                date_data.append(
+                    {
+                        "Description": description,
+                        "Hijri Date": future_hijri.isoformat(),
+                        "Gregorian Date": future_gregorian.isoformat(),
+                    }
+                )
+
+        add_months_and_store_from_deadline(deadline_hijri, 3)
         df = pd.DataFrame(date_data)
         st.write("### Date Conversion Table")
         st.dataframe(df)
@@ -69,21 +107,30 @@ def sixty_days_deadlines():
     date_data = []
 
     if start_date:
-        gregorian_date = start_date
-        hijri_date = Gregorian(gregorian_date.year, gregorian_date.month, gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": "Chosen Start Date",
-            "Hijri Date": hijri_date.isoformat(),
-            "Gregorian Date": gregorian_date.isoformat()
-        })
-
-        deadline_gregorian_date = gregorian_date + relativedelta(days=60)
-        deadline_hijri_date = Gregorian(deadline_gregorian_date.year, deadline_gregorian_date.month, deadline_gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": "Deadline - 60 days from start date",
-            "Hijri Date": deadline_hijri_date.isoformat(),
-            "Gregorian Date": deadline_gregorian_date.isoformat()
-        })
+        # Convert start date to Hijri date
+        gregorian_date = Gregorian(start_date.year, start_date.month, start_date.day)
+        hijri_date = gregorian_date.to_hijri()
+        date_data.append(
+            {
+                "Description": "Chosen Start Date",
+                "Hijri Date": hijri_date.isoformat(),
+                "Gregorian Date": gregorian_date.isoformat(),
+            }
+        )
+
+        # Add 60 days to Hijri date
+        deadline_hijri_date = add_hijri_days(hijri_date, 60)
+
+        # Convert deadline Hijri date to Gregorian date
+        deadline_gregorian_date = deadline_hijri_date.to_gregorian()
+
+        date_data.append(
+            {
+                "Description": "Deadline - 60 Hijri days from start date",
+                "Hijri Date": deadline_hijri_date.isoformat(),
+                "Gregorian Date": deadline_gregorian_date.isoformat(),
+            }
+        )
 
         df = pd.DataFrame(date_data)
         st.write("### Date Conversion Table")
@@ -96,21 +143,30 @@ def ninety_days_deadlines():
     date_data = []
 
     if start_date:
-        gregorian_date = start_date
-        hijri_date = Gregorian(gregorian_date.year, gregorian_date.month, gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": "Chosen Start Date",
-            "Hijri Date": hijri_date.isoformat(),
-            "Gregorian Date": gregorian_date.isoformat()
-        })
-
-        deadline_gregorian_date = gregorian_date + relativedelta(days=90)
-        deadline_hijri_date = Gregorian(deadline_gregorian_date.year, deadline_gregorian_date.month, deadline_gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": "Deadline - 90 days from start date",
-            "Hijri Date": deadline_hijri_date.isoformat(),
-            "Gregorian Date": deadline_gregorian_date.isoformat()
-        })
+        # Convert start date to Hijri date
+        gregorian_date = Gregorian(start_date.year, start_date.month, start_date.day)
+        hijri_date = gregorian_date.to_hijri()
+        date_data.append(
+            {
+                "Description": "Chosen Start Date",
+                "Hijri Date": hijri_date.isoformat(),
+                "Gregorian Date": gregorian_date.isoformat(),
+            }
+        )
+
+        # Add 90 days to Hijri date
+        deadline_hijri_date = add_hijri_days(hijri_date, 90)
+
+        # Convert deadline Hijri date to Gregorian date
+        deadline_gregorian_date = deadline_hijri_date.to_gregorian()
+
+        date_data.append(
+            {
+                "Description": "Deadline - 90 Hijri days from start date",
+                "Hijri Date": deadline_hijri_date.isoformat(),
+                "Gregorian Date": deadline_gregorian_date.isoformat(),
+            }
+        )
 
         df = pd.DataFrame(date_data)
         st.write("### Date Conversion Table")
@@ -119,7 +175,7 @@ def ninety_days_deadlines():
 # Function to convert Hijri date to Gregorian date
 def hijri_to_gregorian():
     st.title("Convert Hijri Date to Gregorian Date")
-    
+
     # Inputs for Hijri year, month, and day
     hijri_year = st.number_input("Enter Hijri Year:", min_value=1, step=1)
     hijri_month = st.number_input("Enter Hijri Month:", min_value=1, max_value=12, step=1)
@@ -134,31 +190,45 @@ def hijri_to_gregorian():
         except ValueError as e:
             st.error(f"Invalid Hijri date: {e}")
 
-# New function to add years to filing date
+# Function to add years to filing date according to Hijri calendar
 def add_years_to_filing_date(years):
     st.title(f"Add {years} Years to Filing Date")
     filing_date = st.date_input("Select a Gregorian filing date")
     date_data = []
 
     if filing_date:
-        gregorian_date = filing_date
-        hijri_date = Gregorian(gregorian_date.year, gregorian_date.month, gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": "Filing Date",
-            "Hijri Date": hijri_date.isoformat(),
-            "Gregorian Date": gregorian_date.isoformat()
-        })
-
-        future_gregorian_date = gregorian_date + relativedelta(years=years)
-        future_hijri_date = Gregorian(future_gregorian_date.year, future_gregorian_date.month, future_gregorian_date.day).to_hijri()
-        date_data.append({
-            "Description": f"Date after adding {years} years",
-            "Hijri Date": future_hijri_date.isoformat(),
-            "Gregorian Date": future_gregorian_date.isoformat()
-        })
+        # Convert filing date to Hijri date
+        gregorian_date = Gregorian(filing_date.year, filing_date.month, filing_date.day)
+        hijri_date = gregorian_date.to_hijri()
+        date_data.append(
+            {
+                "Description": "Filing Date",
+                "Hijri Date": hijri_date.isoformat(),
+                "Gregorian Date": gregorian_date.isoformat(),
+            }
+        )
+
+        # Add years to Hijri date
+        future_hijri_date = Hijri(hijri_date.year + years, hijri_date.month, hijri_date.day)
+
+        # Adjust the day if necessary
+        try:
+            future_hijri_date = Hijri(future_hijri_date.year, future_hijri_date.month, future_hijri_date.day)
+        except ValueError:
+            future_hijri_date = Hijri(future_hijri_date.year, future_hijri_date.month, 29)
+
+        # Convert future Hijri date to Gregorian date
+        future_gregorian_date = future_hijri_date.to_gregorian()
+        date_data.append(
+            {
+                "Description": f"Date after adding {years} Hijri years",
+                "Hijri Date": future_hijri_date.isoformat(),
+                "Gregorian Date": future_gregorian_date.isoformat(),
+            }
+        )
 
         df = pd.DataFrame(date_data)
-        st.write(f"### Date Conversion Table ({years} Years Added)")
+        st.write(f"### Date Conversion Table ({years} Hijri Years Added)")
         st.dataframe(df)
 
 # Sidebar navigation using radio buttons
@@ -175,4 +245,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)