Update app.py

app.py

@@ -300,7 +300,7 @@ def main():
 
     # Task Entry
     elif menu == "📥 Task Entry":
-        with st.form(key="task_form", clear_on_submit=True):  # Form starts here
+        with st.form(key="task_form", clear_on_submit=True):
             st.subheader("➕ Add New Task")
             col1, col2 = st.columns(2)
             
@@ -322,14 +322,31 @@ 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"])
+                end_condition = None
                 end_date = None
+                num_occurrences = None
                 if recurrence != "None":
-                    end_date = st.date_input(
-                        "🔚 Repeat Until",
-                        min_value=date + relativedelta(days=1),
-                        help="Recurrence end date (inclusive)"
+                    end_condition = st.radio(
+                        "End Condition",
+                        ["End Date", "Number of Occurrences"],
+                        horizontal=True
                     )
+                    if end_condition == "End Date":
+                        end_date = st.date_input(
+                            "Repeat Until",
+                            min_value=date + relativedelta(days=1),
+                            help="Recurrence end date (inclusive)"
+                        )
+                    else:
+                        num_occurrences = st.number_input(
+                            "Number of Occurrences",
+                            min_value=2,
+                            max_value=365,
+                            value=5,
+                            help="Total number of task instances"
+                        )
             
             # File Upload Section
             uploaded_files = st.file_uploader(
@@ -339,10 +356,9 @@ def main():
                 help="Upload relevant files (max 10MB each)"
             )
             
-            # Submit Button - MUST be inside the form context
+            # Submit Button
             submitted = st.form_submit_button("💾 Save Task", use_container_width=True)
             
-            # Form Submission Handling
             if submitted:
                 if not task.strip():
                     st.error("❌ Task description cannot be empty!")
@@ -350,9 +366,13 @@ def main():
                     
                 try:
                     # Validate recurrence
-                    if recurrence != "None" and (not end_date or end_date <= date):
-                        st.error("❌ End date must be after initial due date")
-                        st.stop()
+                    if recurrence != "None":
+                        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()
+                        elif end_condition == "Number of Occurrences" and num_occurrences < 2:
+                            st.error("❌ Number of occurrences must be at least 2")
+                            st.stop()
     
                     # Process attachments
                     attachments = []
@@ -380,14 +400,24 @@ def main():
                     dates = [date]
                     if recurrence != "None":
                         current_date = date
-                        while current_date < end_date:
-                            if recurrence == "Daily":
-                                current_date += relativedelta(days=1)
-                            elif recurrence == "Weekly":
-                                current_date += relativedelta(weeks=1)
-                            elif recurrence == "Monthly":
-                                current_date += relativedelta(months=1)
-                            if current_date <= end_date:
+                        if end_condition == "End Date":
+                            while current_date < end_date:
+                                if recurrence == "Daily":
+                                    current_date += relativedelta(days=1)
+                                elif recurrence == "Weekly":
+                                    current_date += relativedelta(weeks=1)
+                                elif recurrence == "Monthly":
+                                    current_date += relativedelta(months=1)
+                                if current_date <= end_date:
+                                    dates.append(current_date)
+                        else:
+                            for _ in range(num_occurrences - 1):
+                                if recurrence == "Daily":
+                                    current_date += relativedelta(days=1)
+                                elif recurrence == "Weekly":
+                                    current_date += relativedelta(weeks=1)
+                                elif recurrence == "Monthly":
+                                    current_date += relativedelta(months=1)
                                 dates.append(current_date)
     
                     # Batch write to Firestore
@@ -404,6 +434,9 @@ def main():
                             "recurrence": {
                                 "type": recurrence,
                                 "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,
                                 "sequence": idx + 1
                             },
                             "attachments": attachments,
@@ -425,12 +458,11 @@ def main():
         if tasks:
             df = pd.DataFrame(tasks)
             
-            # Ensure 'attachments' column exists and is a list
+            # Ensure 'attachments' and 'recurrence' columns exist
             if 'attachments' not in df.columns:
-                df['attachments'] = [[] for _ in range(len(df))]  # Initialize with empty lists
-            
-            # Convert NaN values to empty lists
-            df['attachments'] = df['attachments'].apply(lambda x: x if isinstance(x, list) else [])
+                df['attachments'] = [[] for _ in range(len(df))]
+            if 'recurrence' not in df.columns:
+                df['recurrence'] = [{} for _ in range(len(df))]
             
             # Filters
             col1, col2, col3 = st.columns(3)
@@ -484,9 +516,19 @@ def main():
                             </div>
                             """, unsafe_allow_html=True)
                             
+                            # Recurrence Details
+                            if row['recurrence'].get('type') != "None":
+                                with st.expander("🔁 Recurrence Details"):
+                                    st.write(f"**Type:** {row['recurrence']['type']}")
+                                    st.write(f"**Start Date:** {row['recurrence']['original_date']}")
+                                    if row['recurrence'].get('end_date'):
+                                        st.write(f"**End Date:** {row['recurrence']['end_date']}")
+                                    else:
+                                        st.write(f"**Occurrences:** {row['recurrence']['num_occurrences']}")
+                            
                             # Attachments
                             attachments = row['attachments']
-                            if attachments:  # Check if attachments exist
+                            if attachments:
                                 with st.expander(f"📎 Attachments ({len(attachments)})"):
                                     for att in attachments:
                                         st.markdown(f"""