Update app.py

app.py

@@ -1,69 +1,94 @@
+# app.py
 import streamlit as st
-import plotly.express as px
 from salesforce_integration import fetch_poles
+from modules.visuals import display_dashboard, display_charts
+import plotly.express as px
+import pandas as pd
 
-st.set_page_config(layout="wide")
+# Title
 st.title("📡 VIEP Smart Poles Dashboard")
 
-# ✅ Fetch raw data
-try:
-    df = fetch_poles()
-except Exception as e:
-    st.error(f"⚠️ Error connecting to Salesforce:\n\n{e}")
-    st.stop()
+# Get data
+df = fetch_poles()
+
 
-# ✅ Sidebar Filters
+
+#  Fetch the raw data from Salesforce
+df = fetch_poles()
+
+#  Sidebar Filters (your code should go here!)
 st.sidebar.header("📁 Filter Data")
 
-selected_alerts = st.sidebar.multiselect("Alert Level", ["Red", "Yellow", "Green"], default=["Red", "Yellow", "Green"])
-selected_sites = st.sidebar.multiselect("Site", df["Site__c"].unique().tolist(), default=df["Site__c"].unique().tolist())
-selected_camera_status = st.sidebar.selectbox("Camera Status", ["All", "Online", "Offline"])
+selected_alert_levels = st.sidebar.multiselect(
+    "Alert Level", ["Red", "Yellow", "Green"], default=["Red", "Yellow", "Green"]
+)
+
+selected_sites = st.sidebar.multiselect(
+    "Site", ["Hyderabad", "Gadwal", "Kurnool", "Ballari"],
+    default=["Hyderabad", "Gadwal", "Kurnool", "Ballari"]
+)
+
+selected_camera_status = st.sidebar.selectbox(
+    "Camera Status", ["All", "Online", "Offline"]
+)
 
-# ✅ Apply filters
+# Apply filters to create filtered_df
 filtered_df = df[
-    (df["Alert_Level__c"].isin(selected_alerts)) &
+    (df["Alert_Level__c"].isin(selected_alert_levels)) &
     (df["Site__c"].isin(selected_sites))
 ]
+
 if selected_camera_status != "All":
     filtered_df = filtered_df[filtered_df["Camera_Status__c"] == selected_camera_status]
 
-# ✅ Dashboard Summary
-st.subheader("📊 System Summary")
-col1, col2, col3, col4 = st.columns(4)
-col1.metric("Total Poles", filtered_df.shape[0])
-col2.metric("Red Alerts", filtered_df[filtered_df["Alert_Level__c"] == "Red"].shape[0])
-col3.metric("Power Issues", filtered_df[filtered_df["Power_Sufficient__c"] == "No"].shape[0])
-col4.metric("Offline Cameras", filtered_df[filtered_df["Camera_Status__c"] == "Offline"].shape[0])
+# Now use filtered_df everywhere
+
+# Show system summary
+display_dashboard(filtered_df)
 
-# ✅ Pole Table
+# Show pole table
 st.subheader("📋 Pole Table")
 st.dataframe(filtered_df)
 
-# ✅ Energy Chart
-st.subheader("⚙ Energy Generation")
-fig1 = px.bar(
+# Show charts
+display_charts(filtered_df)
+
+# Tilt vs Vibration Scatter Plot
+st.subheader("📈 Tilt vs Vibration")
+fig_tv = px.scatter(
+    filtered_df,
+    x="Tilt_Angle__c",
+    y="Vibration_Level__c",
+    color="Alert_Level__c",
+    hover_name="Name",
+    title="Tilt Angle vs Vibration Level"
+)
+st.plotly_chart(fig_tv)
+
+# 1. System Summary (Show first)
+display_dashboard(df)
+
+# 2. Pole Table
+st.subheader("📋 Pole Table")
+st.dataframe(df, use_container_width=True)
+
+# 3. Charts
+st.subheader("⚙ Energy Generation (Solar vs Wind)")
+st.plotly_chart(px.bar(df, x="Name", y=["Solar_Generation__c", "Wind_Generation__c"], barmode="group"))
+
+# 4. Charts (Energy + Alert Breakdown)
+display_charts(df)
+
+import plotly.express as df
+
+st.subheader("📈 Tilt vs Vibration")
+
+fig_tv = px.scatter(
     filtered_df,
-    x="Name",
-    y=["Solar_Generation__c", "Wind_Generation__c"],
-    barmode="group"
+    x="Tilt_Angle__c",         # make sure this is your column name
+    y="Vibration_Level__c",    # make sure this is your column name
+    color="Alert_Level__c",
+    hover_name="Name",
+    title="Tilt Angle vs Vibration Level"
 )
-st.plotly_chart(fig1)
-
-# ✅ Camera Status
-st.subheader("🎥 Camera Status Distribution")
-fig2 = px.pie(filtered_df, names="Camera_Status__c", hole=0.4)
-st.plotly_chart(fig2)
-
-# ✅ Tilt vs Vibration
-if "Tilt__c" in filtered_df.columns and "Vibration__c" in filtered_df.columns:
-    st.subheader("📈 Tilt vs Vibration")
-    fig3 = px.scatter(
-        filtered_df,
-        x="Tilt__c",
-        y="Vibration__c",
-        color="Alert_Level__c",
-        hover_name="Name"
-    )
-    st.plotly_chart(fig3)
-else:
-    st.warning("Tilt or Vibration data not available in records.")
+st.plotly_chart(fig_tv)