adding individual buttons

app.py

@@ -3,21 +3,55 @@ import streamlit as st
 from functions import Functions, StreamlitFunctions
 import pandas as pd
 
+
+def calculate_salary_parameters():
+    st.session_state.type_to_calculate = "salary_parameters"
+
+
+def calculate_initial_salary_parameter():
+    st.session_state.type_to_calculate = "desired_salary"
+
+
+def calculate_tax_on_current_salary():
+    st.session_state.type_to_calculate = "tax_on_current_salary"
+
+
 StreamlitFunctions.initialize_session_values()
 StreamlitFunctions.print_tax_brackets()
 StreamlitFunctions.reset_tax_brackets()
 
 StreamlitFunctions.print_salary_parameters()
 StreamlitFunctions.reset_salary_parameters()
+st.button(
+    "Calculate Based on Salary Parameters",
+    use_container_width=True,
+    on_click=calculate_salary_parameters,
+)
 
 StreamlitFunctions.initial_salary_parameter()
 StreamlitFunctions.reset_initial_salary_parameter()
-StreamlitFunctions.check_initial_salary_parameter()
+st.button(
+    "Calculate Based on Desired Net Salary",
+    use_container_width=True,
+    on_click=calculate_initial_salary_parameter,
+)
 
-if st.button("Calculate", use_container_width=True) and st.session_state.valid_input:
-    if st.session_state.user_initial_desired_net > 0:
+StreamlitFunctions.print_tax_on_current_salary()
+StreamlitFunctions.reset_tax_on_current_salary()
+st.button(
+    "Calculate Tax on Current Salary",
+    use_container_width=True,
+    on_click=calculate_tax_on_current_salary,
+)
+
+if st.session_state.type_to_calculate is not None:
+    if st.session_state.type_to_calculate == "tax_on_current_salary":
+        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 == "desired_salary":
         initial_desired_net = st.session_state.user_initial_desired_net
-    else:
+    elif st.session_state.type_to_calculate == "salary_parameters":
         initial_desired_net = Functions.calculated_initial_desired_net(
             st.session_state.current_salary,
             st.session_state.desired_increment_percentage,
@@ -28,23 +62,31 @@ if st.button("Calculate", use_container_width=True) and st.session_state.valid_i
     result = Functions.calculate_additional_amount(
         initial_desired_net, st.session_state.tax_brackets
     )
-    st.header("Salary Calculation Results")
-    col1, col2 = st.columns(2)
-    with col1:
-        # custom_metric("Initial Desired Net Salary", result['initial_desired_net'])
-        StreamlitFunctions.custom_metric("Final Net Salary", result["final_net_salary"])
-        StreamlitFunctions.custom_metric("Tax", result["tax"])
-
-    with col2:
-        # custom_metric("Additional Amount Needed", result['additional_amount'])
-        StreamlitFunctions.custom_metric(
-            "Gross Salary Needed", result["gross_salary_needed"]
-        )
 
     # Display how initial_desired_net was determined
     st.markdown("---")
-    if st.session_state.user_initial_desired_net > 0:
-        st.success("✅ Initial Desired Net Salary was provided by the user.")
+    if st.session_state.type_to_calculate == "tax_on_current_salary":
+        st.success(
+            "✅ Calculation was done based on the selected value of 'Tax on Current Salary'"
+        )
+        summary_df = pd.DataFrame(
+            {
+                "Parameter": [
+                    "Current Salary",
+                    "Tax",
+                    "Gross 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'"
+        )
         summary_df = pd.DataFrame(
             {
                 "Parameter": [
@@ -59,9 +101,9 @@ if st.button("Calculate", use_container_width=True) and st.session_state.valid_i
                 ],
             }
         )
-    else:
-        st.info(
-            "ℹ️ Initial Desired Net Salary was calculated based on the provided parameters."
+    elif st.session_state.type_to_calculate == "salary_parameters":
+        st.success(
+            "✅ Calculation was done based on the selected values of 'Salary Parameters'"
         )
         summary_df = pd.DataFrame(
             {
@@ -85,16 +127,19 @@ if st.button("Calculate", use_container_width=True) and st.session_state.valid_i
                 ],
             }
         )
+    st.header("Salary Calculation Results")
+    col1, col2 = st.columns(2)
+    with col1:
+        # custom_metric("Initial Desired Net Salary", result['initial_desired_net'])
+        StreamlitFunctions.custom_metric("Final Net Salary", result["final_net_salary"])
+        StreamlitFunctions.custom_metric("Tax", result["tax"])
 
+    with col2:
+        # custom_metric("Additional Amount Needed", result['additional_amount'])
+        StreamlitFunctions.custom_metric(
+            "Gross Salary Needed", result["gross_salary_needed"]
+        )
     # Display a summary of the calculation
     st.subheader("Calculation Summary")
-
-    st.table(summary_df)
-
-    st.subheader("Salary Breakdown")
-    breakdown_data = {
-        "Component": ["Net Salary", "Tax"],
-        "Amount": [result["final_net_salary"], result["tax"]],
-    }
-    breakdown_df = pd.DataFrame(breakdown_data)
-    st.bar_chart(breakdown_df.set_index("Component"))
+    st.data_editor(summary_df, use_container_width=True, hide_index=True)
+    st.session_state.type_to_calculate = None

constants.py

@@ -3,7 +3,8 @@ class Constants:
     DEFAULT_INCREMENT_PERCENTAGE = 0.3
     DEFAULT_DAILY_TRAVEL_COST = 1500
     DEFAULT_PHYSICAL_DAYS = 5
-    DEFAULT_INITIAL_NET = 0.0
+    DEFAULT_INITIAL_NET = 212500.0
+    DEFAULT_CURRENT_SALARY_WITH_TAX = 200000.0
 
     DEFAULT_TAX_BRACKETS = [
         (0, 600000, 0),

functions.py

@@ -3,6 +3,12 @@ import streamlit as st
 
 
 class Functions:
+    @staticmethod
+    def calculated_current_salary_after_tax(current_salary, tax_brackets):
+        return current_salary - Functions.calculate_monthly_tax(
+            current_salary, tax_brackets
+        )
+
     @staticmethod
     def calculate_monthly_tax(monthly_income, tax_brackets):
         annual_income = monthly_income * 12
@@ -60,34 +66,20 @@ import pandas as pd
 
 
 class StreamlitFunctions:
-    @staticmethod
-    def check_initial_salary_parameter():
-        if (
-            st.session_state.user_initial_desired_net > 0
-            and st.session_state.user_initial_desired_net
-            <= st.session_state.current_salary
-        ):
-            st.warning(
-                "⚠️ The Initial Desired Net Salary should be greater than your Current Salary. Please adjust your input or leave it at 0 to calculate automatically."
-            )
-            st.session_state.valid_input = False
-        else:
-            st.session_state.valid_input = True
-
     @staticmethod
     def update_initial_salary_parameter():
-        if (
+        # if (
+        #     st.session_state.user_initial_desired_net_state
+        #     < st.session_state.current_salary
+        # ):
+        #     st.session_state.user_initial_desired_net = (
+        #         st.session_state.current_salary
+        #         + st.session_state.user_initial_desired_net_state
+        #     )
+        # else:
+        st.session_state.user_initial_desired_net = (
             st.session_state.user_initial_desired_net_state
-            < st.session_state.current_salary
-        ):
-            st.session_state.user_initial_desired_net = (
-                st.session_state.current_salary
-                + st.session_state.user_initial_desired_net_state
-            )
-        else:
-            st.session_state.user_initial_desired_net = (
-                st.session_state.user_initial_desired_net_state
-            )
+        )
 
     @staticmethod
     def reset_initial_salary_parameter():
@@ -103,13 +95,13 @@ class StreamlitFunctions:
 
     @staticmethod
     def initial_salary_parameter():
-        st.header("Calculation based on Final Desired Net Salary")
+        st.header("Final Desired Net Salary")
         if st.session_state.user_initial_desired_net >= st.session_state.current_salary:
             minimum_value = st.session_state.current_salary
         else:
             minimum_value = 0.0
         st.number_input(
-            "Final Desired Net Salary (PKR, optional)",
+            "Final Desired Net Salary (PKR)",
             min_value=minimum_value,
             value=st.session_state.user_initial_desired_net,
             step=1000.0,
@@ -144,15 +136,46 @@ class StreamlitFunctions:
             on_click=reset_values,
         )
 
+    @staticmethod
+    def reset_tax_on_current_salary():
+        def reset_values():
+            st.session_state.tax_on_current_salary = (
+                Constants.DEFAULT_CURRENT_SALARY_WITH_TAX
+            )
+
+        st.button(
+            "Reset Current Salary",
+            use_container_width=True,
+            on_click=reset_values,
+        )
+
+    @staticmethod
+    def print_tax_on_current_salary():
+        st.header("Tax on Current Salary")
+
+        def update_tax_on_current_salary_parameter():
+            st.session_state.tax_on_current_salary = (
+                st.session_state.tax_on_current_salary_state
+            )
+
+        st.number_input(
+            "Current monthly Salary (PKR)",
+            min_value=0.0,
+            step=1000.0,
+            value=st.session_state.tax_on_current_salary,
+            key="tax_on_current_salary_state",
+            on_change=update_tax_on_current_salary_parameter,
+        )
+
     @staticmethod
     def print_salary_parameters():
-        st.header("Calculation Based on Salary Parameters")
+        st.header("Salary Parameters")
 
         def update_current_salary_parameter():
             st.session_state.current_salary = st.session_state.current_salary_state
 
-        st.session_state.current_salary = st.number_input(
-            "Current monthly salary (PKR)",
+        st.number_input(
+            "Current monthly salary after Tax (PKR)",
             min_value=0.0,
             step=1000.0,
             value=st.session_state.current_salary,
@@ -165,7 +188,7 @@ class StreamlitFunctions:
                 st.session_state.desired_increment_percentage_state
             )
 
-        st.session_state.desired_increment_percentage = st.number_input(
+        st.number_input(
             "Desired salary increment (as a decimal)",
             min_value=0.0,
             step=0.05,
@@ -180,7 +203,7 @@ class StreamlitFunctions:
                 st.session_state.daily_cost_of_travel_state
             )
 
-        st.session_state.daily_cost_of_travel = st.number_input(
+        st.number_input(
             "Daily cost of travel (PKR)",
             min_value=0,
             step=100,
@@ -194,7 +217,7 @@ class StreamlitFunctions:
                 st.session_state.physical_days_per_week_state
             )
 
-        st.session_state.physical_days_per_week = st.number_input(
+        st.number_input(
             "Number of On-Site days per week",
             min_value=0,
             max_value=7,
@@ -211,7 +234,10 @@ class StreamlitFunctions:
             st.session_state.tax_brackets,
             columns=["Lower Limit", "Upper Limit", "Tax Rate"],
         )
-        edited_tax_brackets = st.data_editor(tax_brackets_df, num_rows="dynamic")
+
+        edited_tax_brackets = st.data_editor(
+            tax_brackets_df, num_rows="dynamic", use_container_width=True
+        )
         st.session_state.tax_brackets = list(
             edited_tax_brackets.itertuples(index=False, name=None)
         )
@@ -221,6 +247,10 @@ class StreamlitFunctions:
         st.title("Net Salary Calculator")
         if "tax_brackets" not in st.session_state:
             st.session_state.tax_brackets = Constants.DEFAULT_TAX_BRACKETS
+        if "tax_on_current_salary" not in st.session_state:
+            st.session_state.tax_on_current_salary = (
+                Constants.DEFAULT_CURRENT_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:
@@ -233,7 +263,10 @@ class StreamlitFunctions:
             st.session_state.physical_days_per_week = Constants.DEFAULT_PHYSICAL_DAYS
         if "user_initial_desired_net" not in st.session_state:
             st.session_state.user_initial_desired_net = Constants.DEFAULT_INITIAL_NET
-
+            
+        if "type_to_calculate" not in st.session_state:
+            st.session_state.type_to_calculate = None
+        
     @staticmethod
     def custom_metric(label, value):
         st.markdown(Styles.METRIC_STYLE, unsafe_allow_html=True)