adding yearly salary tax calculator

app.py

@@ -1,31 +1,45 @@
+import pandas as pd
 import streamlit as st
 
 from functions import Functions, StreamlitFunctions
-import pandas as pd
-
+from logs import logger
 
 def calculate_salary_parameters():
+    logger.info("Calculating based on Salary parameters")
     st.session_state.type_to_calculate = "salary_parameters"
 
 
 def calculate_initial_salary_parameter():
+    logger.info("Calculating based on Desired Salary")
     st.session_state.type_to_calculate = "desired_salary"
 
 
 def calculate_tax_on_current_salary():
+    logger.info("Calculating Tax on Current Salary")
     st.session_state.type_to_calculate = "tax_on_current_salary"
 
-
+def calculate_tax_on_yearly_salary():
+    logger.info("Calculating Tax on Yearly Salary")
+    st.session_state.type_to_calculate = "tax_on_yearly_salary"
+    
 StreamlitFunctions.initialize_session_values()
 StreamlitFunctions.print_tax_brackets()
 StreamlitFunctions.reset_tax_brackets()
 
-StreamlitFunctions.print_salary_parameters()
-StreamlitFunctions.reset_salary_parameters()
+StreamlitFunctions.print_tax_on_current_salary()
+StreamlitFunctions.reset_tax_on_current_salary()
 st.button(
-    "Calculate Based on Salary Parameters",
+    "Calculate Tax on Current Salary",
     use_container_width=True,
-    on_click=calculate_salary_parameters,
+    on_click=calculate_tax_on_current_salary,
+)
+
+StreamlitFunctions.print_tax_on_yearly_salary()
+StreamlitFunctions.reset_tax_on_yearly_salary()
+st.button(
+    "Calculate Tax on Yearly Salary",
+    use_container_width=True,
+    on_click=calculate_tax_on_yearly_salary,
 )
 
 StreamlitFunctions.initial_salary_parameter()
@@ -36,12 +50,12 @@ st.button(
     on_click=calculate_initial_salary_parameter,
 )
 
-StreamlitFunctions.print_tax_on_current_salary()
-StreamlitFunctions.reset_tax_on_current_salary()
+StreamlitFunctions.print_salary_parameters()
+StreamlitFunctions.reset_salary_parameters()
 st.button(
-    "Calculate Tax on Current Salary",
+    "Calculate Based on Salary Parameters",
     use_container_width=True,
-    on_click=calculate_tax_on_current_salary,
+    on_click=calculate_salary_parameters,
 )
 
 if st.session_state.type_to_calculate is not None:
@@ -49,6 +63,10 @@ if st.session_state.type_to_calculate is not None:
         initial_desired_net = Functions.calculated_current_salary_after_tax(
             st.session_state.tax_on_current_salary, st.session_state.tax_brackets
         )
+    elif st.session_state.type_to_calculate == "tax_on_yearly_salary":
+        initial_desired_net = Functions.calculated_yearly_salary_after_tax(
+            st.session_state.tax_on_yearly_salary, st.session_state.tax_brackets
+        )
     elif st.session_state.type_to_calculate == "desired_salary":
         initial_desired_net = st.session_state.user_initial_desired_net
     elif st.session_state.type_to_calculate == "salary_parameters":
@@ -83,6 +101,25 @@ if st.session_state.type_to_calculate is not None:
                 ],
             }
         )
+    elif st.session_state.type_to_calculate == "tax_on_yearly_salary":
+        st.success(
+            "✅ Calculation was done based on the selected value of 'Tax on Yearly Salary'"
+        )
+        result = {key:value*12 for key, value in result.items()}
+        summary_df = pd.DataFrame(
+            {
+                "Parameter": [
+                    "Yearly Salary",
+                    "Yearly Tax",
+                    "Gross Yearly Salary",
+                ],
+                "Value": [
+                    f"PKR {result['final_net_salary']:,.2f}",
+                    f"PKR {result['tax']:,.2f}",
+                    f"PKR {result['gross_salary_needed']:,.2f}",
+                ],
+            }
+        )
     elif st.session_state.type_to_calculate == "desired_salary":
         st.success(
             "✅ Calculation was done based on the selected value of 'Final Desired Net Salary'"

constants.py

@@ -5,6 +5,7 @@ class Constants:
     DEFAULT_PHYSICAL_DAYS = 5
     DEFAULT_INITIAL_NET = 212500.0
     DEFAULT_CURRENT_SALARY_WITH_TAX = 200000.0
+    DEFAULT_YEARLY_SALARY_WITH_TAX = 1500000.0
 
     DEFAULT_TAX_BRACKETS = [
         (0, 600000, 0),

functions.py

@@ -8,6 +8,12 @@ class Functions:
         return current_salary - Functions.calculate_monthly_tax(
             current_salary, tax_brackets
         )
+    
+    @staticmethod
+    def calculated_yearly_salary_after_tax(current_salary, tax_brackets):
+        return current_salary/12 - Functions.calculate_monthly_tax(
+            current_salary/12, tax_brackets
+        )
 
     @staticmethod
     def calculate_monthly_tax(monthly_income, tax_brackets):
@@ -150,6 +156,19 @@ class StreamlitFunctions:
             on_click=reset_values,
         )
 
+    @staticmethod
+    def reset_tax_on_yearly_salary():
+        def reset_values():
+            st.session_state.tax_on_yearly_salary = (
+                Constants.DEFAULT_YEARLY_SALARY_WITH_TAX
+            )
+
+        st.button(
+            "Reset Yearly Salary",
+            use_container_width=True,
+            on_click=reset_values,
+        )
+        
     @staticmethod
     def print_tax_on_current_salary():
         st.header("Tax on Current Salary")
@@ -168,6 +187,25 @@ class StreamlitFunctions:
             key="tax_on_current_salary_state",
             on_change=update_tax_on_current_salary_parameter,
         )
+        
+    @staticmethod
+    def print_tax_on_yearly_salary():
+        st.header("Tax on Yearly Salary")
+
+        def update_tax_on_yearly_salary_parameter():
+            st.session_state.tax_on_yearly_salary = (
+                st.session_state.tax_on_yearly_salary_state
+            )
+            st.session_state.type_to_calculate = "tax_on_current_salary"
+
+        st.number_input(
+            "Current Yearly Salary (PKR)",
+            min_value=0.0,
+            step=50000.0,
+            value=st.session_state.tax_on_yearly_salary,
+            key="tax_on_yearly_salary_state",
+            on_change=update_tax_on_yearly_salary_parameter,
+        )
 
     @staticmethod
     def print_salary_parameters():
@@ -257,6 +295,10 @@ class StreamlitFunctions:
             st.session_state.tax_on_current_salary = (
                 Constants.DEFAULT_CURRENT_SALARY_WITH_TAX
             )
+        if "tax_on_yearly_salary" not in st.session_state:
+            st.session_state.tax_on_yearly_salary = (
+                Constants.DEFAULT_YEARLY_SALARY_WITH_TAX
+            )
         if "current_salary" not in st.session_state:
             st.session_state.current_salary = Constants.DEFAULT_CURRENT_SALARY
         if "desired_increment_percentage" not in st.session_state: