Update app.py

app.py

@@ -221,7 +221,7 @@ def main():
         st.session_state.first_login = False
 
     # Navigation Menu
-    menu_items = ["📥 Task Entry", "🏠 Dashboard", "👀 Task Explorer", "✏️ Edit Tasks", "⚙️ Settings"]
+    menu_items = ["🏠 Dashboard", "📥 Task Entry", "👀 Task Explorer", "✏️ Edit Tasks", "⚙️ Settings"]
     if st.session_state.is_admin:
         menu_items.insert(3, "🏗️ Project Management")
     
@@ -300,8 +300,16 @@ def main():
 
     # Task Entry
     elif menu == "📥 Task Entry":
+        # Part 1: Task Type Selection
+        st.subheader("➕ Add New Task")
+        task_type_selection = st.radio(
+            "Select Task Type",
+            ["One-Time Task", "Recurring Task"],
+            horizontal=True
+        )
+    
+        # Part 2: Task Details Form
         with st.form(key="task_form", clear_on_submit=True):
-            st.subheader("➕ Add New Task")
             col1, col2 = st.columns(2)
             
             # Left Column
@@ -322,11 +330,9 @@ def main():
                 status = st.selectbox("📌 Status", ["Pending", "In Progress", "Completed"])
                 date = st.date_input("📅 Due Date", min_value=datetime.today())
                 
-                # Recurrence Settings
-                recurrence = st.selectbox("🔄 Repeat", ["None", "Daily", "Weekly", "Monthly"])
-                
-                # Show recurrence options immediately after selecting recurrence type
-                if recurrence != "None":
+                # Recurrence Settings (only for recurring tasks)
+                if task_type_selection == "Recurring Task":
+                    recurrence = st.selectbox("🔄 Repeat", ["Daily", "Weekly", "Monthly"])
                     end_condition = st.radio(
                         "End Condition",
                         ["End Date", "Number of Occurrences"],
@@ -347,6 +353,7 @@ def main():
                             help="Total number of task instances"
                         )
                 else:
+                    recurrence = "None"
                     end_condition = None
                     end_date = None
                     num_occurrences = None
@@ -368,8 +375,8 @@ def main():
                     st.stop()
                     
                 try:
-                    # Validate recurrence
-                    if recurrence != "None":
+                    # Validate recurrence (if applicable)
+                    if task_type_selection == "Recurring Task":
                         if end_condition == "End Date" and (not end_date or end_date <= date):
                             st.error("❌ End date must be after initial due date")
                             st.stop()
@@ -399,9 +406,9 @@ def main():
                                 "size": file.size
                             })
     
-                    # Generate recurring dates
+                    # Generate recurring dates (if applicable)
                     dates = [date]
-                    if recurrence != "None":
+                    if task_type_selection == "Recurring Task":
                         current_date = date
                         if end_condition == "End Date":
                             while current_date < end_date:
@@ -435,11 +442,11 @@ def main():
                             "status": status,
                             "date": str(task_date),
                             "recurrence": {
-                                "type": recurrence,
+                                "type": recurrence if task_type_selection == "Recurring Task" else "None",
                                 "original_date": str(date),
-                                "end_condition": end_condition,
-                                "end_date": str(end_date) if end_condition == "End Date" else None,
-                                "num_occurrences": num_occurrences if end_condition == "Number of Occurrences" else None,
+                                "end_condition": end_condition if task_type_selection == "Recurring Task" else None,
+                                "end_date": str(end_date) if task_type_selection == "Recurring Task" and end_condition == "End Date" else None,
+                                "num_occurrences": num_occurrences if task_type_selection == "Recurring Task" and end_condition == "Number of Occurrences" else None,
                                 "sequence": idx + 1
                             },
                             "attachments": attachments,