Pmuscat41 commited on
Commit
320e15e
·
verified ·
1 Parent(s): dabc084

Update app.py

Browse files

corrected function call errors

Files changed (1) hide show
  1. app.py +6 -41
app.py CHANGED
@@ -2,7 +2,6 @@ import streamlit as st
2
  import pandas as pd
3
  from hijri_converter import Gregorian, Hijri
4
  from datetime import date
5
- from dateutil.relativedelta import relativedelta
6
 
7
  # Add a sidebar with radio buttons
8
  st.sidebar.title("Navigation")
@@ -19,34 +18,6 @@ option = st.sidebar.radio(
19
  ),
20
  )
21
 
22
- # Function to add months to a Hijri date
23
- def add_hijri_months(hijri_date, months):
24
- year = hijri_date.year
25
- month = hijri_date.month
26
- day = hijri_date.day
27
-
28
- month += months
29
- while month > 12:
30
- month -= 12
31
- year += 1
32
-
33
- # Adjust the day if necessary
34
- try:
35
- new_hijri_date = Hijri(year, month, day)
36
- except ValueError:
37
- # If day is invalid (e.g., 30 in a month that only has 29 days), adjust day to 29
38
- day = 29
39
- new_hijri_date = Hijri(year, month, day)
40
-
41
- return new_hijri_date
42
-
43
- # Function to add days to a Hijri date
44
- def add_hijri_days(hijri_date, days):
45
- jd = hijri_date.to_jd()
46
- new_jd = jd + days
47
- new_hijri_date = Hijri.from_jd(new_jd)
48
- return new_hijri_date
49
-
50
  # Function to calculate three month deadlines
51
  def three_month_deadlines():
52
  st.title("Three Month Deadline Converter")
@@ -66,8 +37,8 @@ def three_month_deadlines():
66
  }
67
  )
68
 
69
- # Add 3 months to Hijri date
70
- deadline_hijri = add_hijri_months(hijri_start_date, 3)
71
 
72
  # Convert deadline back to Gregorian
73
  deadline_gregorian = deadline_hijri.to_gregorian()
@@ -83,7 +54,7 @@ def three_month_deadlines():
83
  # Function to add months and store results
84
  def add_months_and_store_from_deadline(deadline_hijri, months):
85
  for i in range(1, months + 1):
86
- future_hijri = add_hijri_months(deadline_hijri, i)
87
  future_gregorian = future_hijri.to_gregorian()
88
 
89
  description = f"{i} Hijri month extension from deadline"
@@ -119,7 +90,7 @@ def sixty_days_deadlines():
119
  )
120
 
121
  # Add 60 days to Hijri date
122
- deadline_hijri_date = add_hijri_days(hijri_date, 60)
123
 
124
  # Convert deadline Hijri date to Gregorian date
125
  deadline_gregorian_date = deadline_hijri_date.to_gregorian()
@@ -155,7 +126,7 @@ def ninety_days_deadlines():
155
  )
156
 
157
  # Add 90 days to Hijri date
158
- deadline_hijri_date = add_hijri_days(hijri_date, 90)
159
 
160
  # Convert deadline Hijri date to Gregorian date
161
  deadline_gregorian_date = deadline_hijri_date.to_gregorian()
@@ -209,13 +180,7 @@ def add_years_to_filing_date(years):
209
  )
210
 
211
  # Add years to Hijri date
212
- future_hijri_date = Hijri(hijri_date.year + years, hijri_date.month, hijri_date.day)
213
-
214
- # Adjust the day if necessary
215
- try:
216
- future_hijri_date = Hijri(future_hijri_date.year, future_hijri_date.month, future_hijri_date.day)
217
- except ValueError:
218
- future_hijri_date = Hijri(future_hijri_date.year, future_hijri_date.month, 29)
219
 
220
  # Convert future Hijri date to Gregorian date
221
  future_gregorian_date = future_hijri_date.to_gregorian()
 
2
  import pandas as pd
3
  from hijri_converter import Gregorian, Hijri
4
  from datetime import date
 
5
 
6
  # Add a sidebar with radio buttons
7
  st.sidebar.title("Navigation")
 
18
  ),
19
  )
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  # Function to calculate three month deadlines
22
  def three_month_deadlines():
23
  st.title("Three Month Deadline Converter")
 
37
  }
38
  )
39
 
40
+ # Add 3 Hijri months to Hijri date
41
+ deadline_hijri = hijri_start_date.add_months(3)
42
 
43
  # Convert deadline back to Gregorian
44
  deadline_gregorian = deadline_hijri.to_gregorian()
 
54
  # Function to add months and store results
55
  def add_months_and_store_from_deadline(deadline_hijri, months):
56
  for i in range(1, months + 1):
57
+ future_hijri = deadline_hijri.add_months(i)
58
  future_gregorian = future_hijri.to_gregorian()
59
 
60
  description = f"{i} Hijri month extension from deadline"
 
90
  )
91
 
92
  # Add 60 days to Hijri date
93
+ deadline_hijri_date = hijri_date.add_days(60)
94
 
95
  # Convert deadline Hijri date to Gregorian date
96
  deadline_gregorian_date = deadline_hijri_date.to_gregorian()
 
126
  )
127
 
128
  # Add 90 days to Hijri date
129
+ deadline_hijri_date = hijri_date.add_days(90)
130
 
131
  # Convert deadline Hijri date to Gregorian date
132
  deadline_gregorian_date = deadline_hijri_date.to_gregorian()
 
180
  )
181
 
182
  # Add years to Hijri date
183
+ future_hijri_date = hijri_date.add_years(years)
 
 
 
 
 
 
184
 
185
  # Convert future Hijri date to Gregorian date
186
  future_gregorian_date = future_hijri_date.to_gregorian()