Update app.py

app.py

@@ -300,122 +300,124 @@ def main():
 
     # Task Entry
     elif menu == "📥 Task Entry":
-        with st.form(key="task_form", clear_on_submit=True):
+        with st.form(key="task_form", clear_on_submit=True):  # Form starts here
             st.subheader("➕ Add New Task")
             col1, col2 = st.columns(2)
-        
-        # Left Column
-        with col1:
-            task = st.text_area("📝 Task Description", height=100)
-            task_type = st.selectbox(
-                "📦 Task Type",
-                ["Design", "Procurement", "Construction", "Testing", "Other"]
-            )
-        
-        # Right Column
-        with col2:
-            projects = [p.id for p in db.collection("projects").stream()] + ["Add New Project"]
-            project = st.selectbox("🏗️ Project", projects)
-            if project == "Add New Project":
-                project = st.text_input("✨ New Project Name")
             
-            status = st.selectbox("📌 Status", ["Pending", "In Progress", "Completed"])
-            date = st.date_input("📅 Due Date", min_value=datetime.today())
-            
-            recurrence = st.selectbox("🔄 Repeat", ["None", "Daily", "Weekly", "Monthly"])
-            end_date = None
-            if recurrence != "None":
-                end_date = st.date_input(
-                    "🔚 Repeat Until",
-                    min_value=date + relativedelta(days=1),
-                    help="Recurrence end date (inclusive)"
+            # Left Column
+            with col1:
+                task = st.text_area("📝 Task Description", height=100)
+                task_type = st.selectbox(
+                    "📦 Task Type",
+                    ["Design", "Procurement", "Construction", "Testing", "Other"]
                 )
-        
-        # File Upload Section
-        uploaded_files = st.file_uploader(
-            "📎 Attachments",
-            type=["pdf", "docx", "xlsx", "png", "jpg", "jpeg"],
-            accept_multiple_files=True,
-            help="Upload relevant files (max 10MB each)"
-        )
-        
-        submitted = st.form_submit_button("💾 Save Task", use_container_width=True)
-        
-        if submitted:
-            if not task.strip():
-                st.error("❌ Task description cannot be empty!")
-                st.stop()
+            
+            # Right Column
+            with col2:
+                projects = [p.id for p in db.collection("projects").stream()] + ["Add New Project"]
+                project = st.selectbox("🏗️ Project", projects)
+                if project == "Add New Project":
+                    project = st.text_input("✨ New Project Name")
+                
+                status = st.selectbox("📌 Status", ["Pending", "In Progress", "Completed"])
+                date = st.date_input("📅 Due Date", min_value=datetime.today())
                 
-            try:
-                # Validate recurrence
-                if recurrence != "None" and (not end_date or end_date <= date):
-                    st.error("❌ End date must be after initial due date")
+                recurrence = st.selectbox("🔄 Repeat", ["None", "Daily", "Weekly", "Monthly"])
+                end_date = None
+                if recurrence != "None":
+                    end_date = st.date_input(
+                        "🔚 Repeat Until",
+                        min_value=date + relativedelta(days=1),
+                        help="Recurrence end date (inclusive)"
+                    )
+            
+            # File Upload Section
+            uploaded_files = st.file_uploader(
+                "📎 Attachments",
+                type=["pdf", "docx", "xlsx", "png", "jpg", "jpeg"],
+                accept_multiple_files=True,
+                help="Upload relevant files (max 10MB each)"
+            )
+            
+            # Submit Button - MUST be inside the form context
+            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!")
                     st.stop()
-
-                # Process attachments
-                attachments = []
-                if uploaded_files:
-                    for file in uploaded_files:
-                        if file.size > 10 * 1024 * 1024:  # 10MB limit
-                            st.error(f"❌ File {file.name} exceeds 10MB limit")
-                            st.stop()
+                    
+                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()
+    
+                    # Process attachments
+                    attachments = []
+                    if uploaded_files:
+                        for file in uploaded_files:
+                            if file.size > 10 * 1024 * 1024:  # 10MB limit
+                                st.error(f"❌ File {file.name} exceeds 10MB limit")
+                                st.stop()
+                                
+                            # Upload to Cloudinary
+                            result = cloudinary.uploader.upload(
+                                file,
+                                folder=f"attachments/{st.session_state.user_uid}/",
+                                resource_type="auto"
+                            )
                             
-                        # Upload to Cloudinary
-                        result = cloudinary.uploader.upload(
-                            file,
-                            folder=f"attachments/{st.session_state.user_uid}/",
-                            resource_type="auto"
-                        )
-                        
-                        attachments.append({
-                            "name": file.name,
-                            "url": result['secure_url'],
-                            "type": file.type,
-                            "size": file.size
+                            attachments.append({
+                                "name": file.name,
+                                "url": result['secure_url'],
+                                "type": file.type,
+                                "size": file.size
+                            })
+    
+                    # Generate recurring dates
+                    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:
+                                dates.append(current_date)
+    
+                    # Batch write to Firestore
+                    batch = db.batch()
+                    for idx, task_date in enumerate(dates):
+                        task_ref = db.collection("tasks").document()
+                        batch.set(task_ref, {
+                            "user": st.session_state.email,
+                            "task": task.strip(),
+                            "type": task_type,
+                            "project": project,
+                            "status": status,
+                            "date": str(task_date),
+                            "recurrence": {
+                                "type": recurrence,
+                                "original_date": str(date),
+                                "sequence": idx + 1
+                            },
+                            "attachments": attachments,
+                            "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                         })
-
-                # Generate recurring dates
-                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:
-                            dates.append(current_date)
-
-                # Batch write to Firestore
-                batch = db.batch()
-                for idx, task_date in enumerate(dates):
-                    task_ref = db.collection("tasks").document()
-                    batch.set(task_ref, {
-                        "user": st.session_state.email,
-                        "task": task.strip(),
-                        "type": task_type,
-                        "project": project,
-                        "status": status,
-                        "date": str(task_date),
-                        "recurrence": {
-                            "type": recurrence,
-                            "original_date": str(date),
-                            "sequence": idx + 1
-                        },
-                        "attachments": attachments,
-                        "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                    })
-                batch.commit()
-
-                st.success(f"✅ Created {len(dates)} {'task' if len(dates) == 1 else 'tasks'} with {len(attachments)} attachments!")
-                st.rerun()
-
-            except cloudinary.exceptions.Error as e:
-                st.error(f"❌ Cloudinary upload failed: {str(e)}")
-            except Exception as e:
-                st.error(f"❌ Error: {str(e)}")
+                    batch.commit()
+    
+                    st.success(f"✅ Created {len(dates)} {'task' if len(dates) == 1 else 'tasks'} with {len(attachments)} attachments!")
+                    st.rerun()
+    
+                except cloudinary.exceptions.Error as e:
+                    st.error(f"❌ Cloudinary upload failed: {str(e)}")
+                except Exception as e:
+                    st.error(f"❌ Error: {str(e)}")
 
     # Task Explorer (Updated Date Filter)
     elif menu == "👀 Task Explorer":