Update app.py

app.py

@@ -95,42 +95,50 @@ st.sidebar.title(f"Welcome, {st.session_state['email']}")
 menu = st.sidebar.radio("Go to", ["Dashboard View", "Task Entry", "View Tasks by Status"])
 email = st.session_state['email']
 
-if menu == "View Tasks by Status":
-    st.subheader("📂 View Tasks by Status")
-    statuses = ["Pending", "In Progress", "Completed"]
-    for status in statuses:
-        st.subheader(f"📌 {status} Tasks")
-        tasks_ref = db.collection("tasks").where(filter=firestore.FieldFilter("user", "==", email)).where(filter=firestore.FieldFilter("status", "==", status))
-        tasks = [task.to_dict() for task in tasks_ref.stream()]
-        if tasks:
-            df = pd.DataFrame(tasks)
-            st.dataframe(df[['task', 'type', 'project', 'status', 'date']].rename(columns={
-                'task': 'Task', 'type': 'Type', 'project': 'Project', 'status': 'Status', 'date': 'Date'
-            }))
-            
-            # Add task editing feature with unique keys
-            for index, row in df.iterrows():
-                with st.expander(f"Edit Task: {row['task']}"):
-                    new_status = st.selectbox("Update Status", ["Pending", "In Progress", "Completed"], 
-                                              index=["Pending", "In Progress", "Completed"].index(row['status']),
-                                              key=f"status_{index}")
-                    new_task_desc = st.text_input("Update Task Description", row['task'], key=f"task_{index}")
-                    new_type = st.selectbox("Update Type", ["Design", "Procurement", "Construction", "Testing", "Other"], 
-                                           index=["Design", "Procurement", "Construction", "Testing", "Other"].index(row['type']),
-                                           key=f"type_{index}")
-                    new_project = st.text_input("Update Project", row['project'], key=f"project_{index}")
-                    if st.button("Save Changes", key=f"update_{index}"):
-                        db.collection("tasks").document(row['task']).update({
-                            "task": new_task_desc,
-                            "type": new_type,
-                            "project": new_project,
-                            "status": new_status
-                        })
-                        st.success("Task Updated Successfully!")
-                        st.rerun()
-            
-            # Button to download PDF
-            pdf_data = generate_pdf(df)
-            st.download_button(label="Download Report", data=pdf_data, file_name="task_report.pdf", mime="application/pdf")
-        else:
-            st.info("No tasks found.")
+if menu == "Dashboard View":
+    st.title("📊 Dashboard Overview")
+    tasks_ref = db.collection("tasks").where(filter=firestore.FieldFilter("user", "==", email))
+    tasks = [task.to_dict() for task in tasks_ref.stream()]
+    df = pd.DataFrame(tasks) if tasks else pd.DataFrame()
+
+    if not df.empty and "status" in df.columns:
+        col1, col2 = st.columns(2)
+        col1.metric("Total Tasks", len(df))
+        col1.metric("Pending Tasks", len(df[df['status'] == "Pending"]))
+        col2.metric("In Progress Tasks", len(df[df['status'] == "In Progress"]))
+        col2.metric("Completed Tasks", len(df[df['status'] == "Completed"]))
+
+        fig = px.pie(df, names='status', title='Task Status Distribution')
+        st.plotly_chart(fig)
+    else:
+        st.warning("No tasks found for the user.")
+
+elif menu == "Task Entry":
+    st.title("📝 Add New Task")
+    projects_ref = db.collection("projects")
+    projects = [proj.id for proj in projects_ref.stream()]
+    projects.append("Add New Project")
+    
+    with st.form("task_form"):
+        task = st.text_input("Task Description:")
+        task_type = st.selectbox("Task Type:", ["Design", "Procurement", "Construction", "Testing", "Other"])
+        selected_project = st.selectbox("Project Name:", projects)
+        if selected_project == "Add New Project":
+            new_project = st.text_input("Enter New Project Name:")
+            if new_project:
+                db.collection("projects").document(new_project).set({"created_by": email})
+                selected_project = new_project
+        status = st.selectbox("Status:", ["Pending", "In Progress", "Completed"])
+        date = st.date_input("Task Date:")
+        submit = st.form_submit_button("Add Task")
+        if submit and task:
+            db.collection("tasks").add({
+                "user": email,
+                "task": task,
+                "type": task_type,
+                "project": selected_project,
+                "status": status,
+                "date": str(date)
+            })
+            st.success("Task Added Successfully!")
+            st.rerun()