Update app.py

app.py

@@ -3,7 +3,7 @@ import firebase_admin
 from firebase_admin import credentials, firestore, auth
 import pandas as pd
 import plotly.express as px
-from datetime import datetime
+from datetime import datetime, timedelta
 
 # Initialize Firebase
 if not firebase_admin._apps:
@@ -66,10 +66,27 @@ st.sidebar.title(f"Welcome, {st.session_state['email']}")
 menu = st.sidebar.radio("Go to", ["Dashboard View", "Task Entry", "View Tasks", "Add New Project", "Edit Task"])
 email = st.session_state['email']
 
+def get_tasks():
+    tasks_ref = db.collection("tasks").where("user", "==", email)
+    return [{"id": task.id, **task.to_dict()} for task in tasks_ref.stream()]
+
+def calculate_deadline_status(task_date):
+    today = datetime.today().date()
+    task_date = datetime.strptime(task_date, "%Y-%m-%d").date()
+    delta = (task_date - today).days
+    
+    if delta < 0:
+        return "Overdue", abs(delta)
+    elif delta == 0:
+        return "Due Today", 0
+    elif delta <= 3:
+        return f"Due in {delta} days", delta
+    else:
+        return "On Track", delta
+
 if menu == "Dashboard View":
     st.title("📊 Dashboard Overview")
-    tasks_ref = db.collection("tasks").where("user", "==", email)
-    tasks = [task.to_dict() for task in tasks_ref.stream()]
+    tasks = get_tasks()
     
     if not tasks:
         st.info("No tasks found.")
@@ -78,14 +95,30 @@ if menu == "Dashboard View":
         total_tasks = len(df)
         completed_tasks = len(df[df['status'] == "Completed"])
         
-        col1, col2 = st.columns(2)
+        # Add deadline calculations
+        df['deadline_status'] = df['date'].apply(lambda x: calculate_deadline_status(x)[0])
+        overdue_tasks = df[(df['status'].isin(["Pending", "In Progress"])) & 
+                         (df['deadline_status'].isin(["Overdue", "Due Today", "Due in 1-3 days"]))]
+        
+        col1, col2, col3 = st.columns(3)
         col1.metric("Total Tasks", total_tasks)
         col2.metric("Completed Tasks", completed_tasks)
+        col3.metric("Urgent Tasks", len(overdue_tasks))
         
         st.subheader("Tasks by Status")
         status_counts = df['status'].value_counts().reset_index()
         fig = px.pie(status_counts, values='count', names='status', hole=0.3)
         st.plotly_chart(fig)
+        
+        # Deadline Alerts
+        st.subheader("⚠️ Upcoming Deadlines")
+        if not overdue_tasks.empty:
+            for _, task in overdue_tasks.iterrows():
+                status, days = calculate_deadline_status(task['date'])
+                emoji = "❗" if "Overdue" in status else "⏳"
+                st.write(f"{emoji} {task['task']} ({task['project']}) - {status}")
+        else:
+            st.info("No upcoming deadlines!")
 
 elif menu == "Task Entry":
     st.title("📝 Add New Task")
@@ -103,7 +136,7 @@ elif menu == "Task Entry":
                 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:")
+        date = st.date_input("Target Date:")
         if st.form_submit_button("Add Task"):
             db.collection("tasks").add({
                 "user": email,
@@ -127,19 +160,42 @@ elif menu == "Add New Project":
 
 elif menu == "View Tasks":
     st.subheader("📋 All Tasks")
-    tasks_ref = db.collection("tasks").where("user", "==", email)
-    tasks = [task.to_dict() for task in tasks_ref.stream()]
+    tasks = get_tasks()
     
     if tasks:
         df = pd.DataFrame(tasks)
-        st.dataframe(df[['task', 'type', 'project', 'status', 'date']])
+        
+        # Add filtering options
+        col1, col2 = st.columns(2)
+        with col1:
+            selected_status = st.selectbox("Filter by Status:", ["All"] + ["Pending", "In Progress", "Completed"])
+        with col2:
+            projects = ["All"] + list(df['project'].unique())
+            selected_project = st.selectbox("Filter by Project:", projects)
+        
+        # Apply filters
+        if selected_status != "All":
+            df = df[df['status'] == selected_status]
+        if selected_project != "All":
+            df = df[df['project'] == selected_project]
+        
+        # Add deadline status column
+        df['deadline_status'] = df['date'].apply(lambda x: calculate_deadline_status(x)[0])
+        
+        # Display table with styling
+        st.dataframe(
+            df[['task', 'type', 'project', 'status', 'date', 'deadline_status']]
+            .style.apply(lambda x: ['background: #ffcccc' if v == "Overdue" else 
+                                  'background: #fff3cd' if "Due" in v else '' 
+                                  for v in x], subset=['deadline_status']),
+            height=400
+        )
     else:
         st.info("No tasks found.")
 
 elif menu == "Edit Task":
     st.title("✏️ Edit Task")
-    tasks_ref = db.collection("tasks").where("user", "==", email)
-    tasks = [{"id": task.id, **task.to_dict()} for task in tasks_ref.stream()]
+    tasks = get_tasks()
     
     if not tasks:
         st.info("No tasks to edit")
@@ -148,7 +204,6 @@ elif menu == "Edit Task":
         selected_task = st.selectbox("Select Task to Edit", task_options)
         task_id = selected_task.split("(")[-1].strip(")")
         
-        # Find the selected task
         task_to_edit = next((t for t in tasks if t['id'] == task_id), None)
         
         if task_to_edit:
@@ -158,7 +213,7 @@ elif menu == "Edit Task":
                                       index=["Design", "Procurement", "Construction", "Testing", "Other"].index(task_to_edit['type']))
                 new_status = st.selectbox("Status", ["Pending", "In Progress", "Completed"], 
                                        index=["Pending", "In Progress", "Completed"].index(task_to_edit['status']))
-                new_date = st.date_input("Date", value=datetime.strptime(task_to_edit['date'], "%Y-%m-%d"))
+                new_date = st.date_input("Target Date", value=datetime.strptime(task_to_edit['date'], "%Y-%m-%d"))
                 
                 if st.form_submit_button("Update Task"):
                     db.collection("tasks").document(task_id).update({