Update app.py

app.py

@@ -187,36 +187,68 @@ def main_app():
         else:
             st.warning("No transactions recorded yet.")
 
-    # Savings Tab
+    # Set Saving Goals Tab
     elif tabs == "Savings":
         st.header("Savings Goals")
+        
+        # Fetch net savings from Home tab
+        total_income = st.session_state['income_data']['Amount'].sum()
+        total_expense = st.session_state['expense_data']['Amount'].sum()
+        net_savings = total_income - total_expense
+        max_savings = total_income - total_expense - net_savings
+    
         goal_name = st.text_input("Goal Name")
         target_amount = st.number_input("Target Amount", min_value=0, step=100)
         goal_deadline = st.date_input("Deadline", value=date.today())
+    
+        # Form to create a new saving goal
         set_goal_button = st.button("Set Saving Goal")
-        savings_to_allocate = st.number_input("Amount to Allocate from Net Savings", min_value=0, step=100)
-
+        
         if set_goal_button:
-            new_goal = {"Goal": goal_name, "Target Amount": target_amount, 
-                        "Current Savings": 0, "Deadline": goal_deadline, 
-                        "Allocated Savings": savings_to_allocate}
-            st.session_state["saving_goals"] = pd.concat(
-                [st.session_state["saving_goals"], pd.DataFrame([new_goal])], ignore_index=True
-            )
-            st.success("Goal set successfully!")
-
+            if goal_name and target_amount > 0:
+                new_goal = {"Goal": goal_name, 
+                            "Target Amount": target_amount, 
+                            "Current Savings": net_savings, 
+                            "Deadline": goal_deadline, 
+                            "Allocated Savings": 0}
+                st.session_state["saving_goals"] = pd.concat(
+                    [st.session_state["saving_goals"], pd.DataFrame([new_goal])], ignore_index=True
+                )
+                st.success("Goal set successfully!")
+            else:
+                st.error("Please provide valid goal name and target amount.")
+        
+        # Form to allocate savings
+        st.subheader("Allocate Savings to Goals")
+        if not st.session_state["saving_goals"].empty:
+            for idx, goal in st.session_state["saving_goals"].iterrows():
+                allocated_savings = st.number_input(f"Allocate Savings for {goal['Goal']}", min_value=0, 
+                                                   max_value=max_savings, step=100, key=f"allocate_{idx}")
+                if allocated_savings > 0:
+                    # Update the allocated savings for the respective goal
+                    st.session_state["saving_goals"].at[idx, "Allocated Savings"] += allocated_savings
+                    max_savings -= allocated_savings  # Adjust max savings
+                    st.session_state["saving_goals"].at[idx, "Current Savings"] += allocated_savings  # Update current savings
+                    st.success(f"Allocated {allocated_savings} to goal '{goal['Goal']}'")
+        
+        # Display current goals and their progress
         if not st.session_state["saving_goals"].empty:
+            st.subheader("Current Goals and Allocated Savings")
             for idx, goal in st.session_state["saving_goals"].iterrows():
                 progress = (goal["Current Savings"] / goal["Target Amount"]) if goal["Target Amount"] > 0 else 0
                 st.write(f"**{goal['Goal']}**")
                 st.write(f"Target Amount: {goal['Target Amount']}, Current Savings: {goal['Current Savings']}, Deadline: {goal['Deadline']}")
                 st.progress(progress)  # progress as a fraction (0.0 to 1.0)
                 st.write(f"Progress: {progress * 100:.2f}%")  # Display as a percentage
+    
+            # Option to delete a goal
+            delete_goal_idx = st.selectbox("Select Goal to Delete", options=[""] + list(st.session_state["saving_goals"]["Goal"]))
+            if delete_goal_idx:
+                st.session_state["saving_goals"] = st.session_state["saving_goals"][st.session_state["saving_goals"]["Goal"] != delete_goal_idx]
+                st.success(f"Goal '{delete_goal_idx}' deleted successfully.")
+        else:
+            st.write("No savings goals set yet.")
 
-        delete_goal_idx = st.selectbox("Select Goal to Delete", options=[""] + list(st.session_state["saving_goals"]["Goal"]))
-        if delete_goal_idx:
-            st.session_state["saving_goals"] = st.session_state["saving_goals"][st.session_state["saving_goals"]["Goal"] != delete_goal_idx]
-            st.success(f"Goal '{delete_goal_idx}' deleted successfully.")
 
     # Budget Recommendations Tab
     elif tabs == "Budget Recommendations":