Update app.py

app.py

@@ -93,40 +93,19 @@ if viz_type == "Complaints Over Time":
     start_date = st.sidebar.date_input("Start Date", pd.to_datetime("2020-01-01"), key="start_date")
     end_date = st.sidebar.date_input("End Date", pd.to_datetime("2024-12-31"), key="end_date")
 
-# # Dropdown for Housing Block (only show when Complaints by Housing Block and Type or the updated version is selected)
-# if viz_type in ["Complaints by Housing Block and Type", "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)"]:
-#     block_options = ['All Blocks'] + sorted(data['Housing Block'].unique().tolist())
-#     selected_block = st.sidebar.selectbox(
-#         "Select Housing Block", 
-#         options=block_options, 
-#         key=f"block_select_{viz_type}"  # Unique key for each visualization
-#     )
-    
-# # Ensuring selected_block is only used if defined
-# if viz_type in ["Complaints by Housing Block and Type", "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)"] and 'selected_block' not in locals():
-#     selected_block = 'All Blocks'  # Default to 'All Blocks' if no selection made
-
 # Dropdown for Housing Block (only show when Complaints by Housing Block and Type or the updated version is selected)
-housing_block_viz_types = ["Complaints by Housing Block and Type", "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)"]
-
-if viz_type in housing_block_viz_types:
-    # Define blocks to be excluded for the specific version
-    excluded_blocks = [
-        '3400 block', '3500 block', '3600 block', '3700 block', '3800 block', '3900 block', 
-        '4000 block', '4100 block', '4200 block', '4300 block', '4400 block', '4500 block', 
-        '4600 block', '4700 block', '4800 block', '4900 block', '5000 block'
-    ]
+if viz_type in ["Complaints by Housing Block and Type", "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)"]:
+    block_options = ['All Blocks'] + sorted(data['Housing Block'].unique().tolist())
+    selected_block = st.sidebar.selectbox(
+        "Select Housing Block", 
+        options=block_options, 
+        key=f"block_select_{viz_type}"  # Unique key for each visualization
+    )
     
-    # Creating the desired order, excluding unwanted blocks
-    desired_order = [
-        '1 block', '100 block', '200 block', '300 block', '400 block', '500 block',
-        '600 block', '700 block', '800 block', '900 block', '1000 block', '1100 block',
-        '1200 block', '1300 block', '1400 block', '1500 block', '1600 block', 
-        '1700 block', '1800 block', '1900 block', '2000 block', '2100 block', 
-        '2200 block', '2300 block', '2400 block', '2500 block', '2600 block', 
-        '2700 block', '2800 block', '2900 block', '3000 block', '3100 block', 
-        '3200 block', '3300 block'
-    ]
+# Ensuring selected_block is only used if defined
+if viz_type in ["Complaints by Housing Block and Type", "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)"] and 'selected_block' not in locals():
+    selected_block = 'All Blocks'  # Default to 'All Blocks' if no selection made
+
 
     # Filtering the data based on selected year
     filtered_data_time = data  # Use filtered_data if date range is not needed
@@ -539,6 +518,93 @@ elif viz_type == "Complaints by Housing Block and Type":
 #     """)
 # In the above code , We incorporated all of the professor's suggestions and refined the chart to make it more useful for analysis while ensuring good aesthetics. Given that the data from block 3400 onwards is very sparse, we decided to exclude these records. This adjustment helped focus the visualization on the more relevant data, providing clearer insights and improving its overall effectiveness for analysis.
 
+# elif viz_type == "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)":
+#     st.subheader("Complaints by Housing Block and Type - Incorporating Suggestions Based on Professor's Feedback")
+    
+#     # Define blocks to be excluded
+#     excluded_blocks = [
+#         '3400 block', '3500 block', '3600 block', '3700 block', '3800 block', '3900 block', 
+#         '4000 block', '4100 block', '4200 block', '4300 block', '4400 block', '4500 block', 
+#         '4600 block', '4700 block', '4800 block', '4900 block', '5000 block'
+#     ]
+    
+#     # Creating the desired order, excluding unwanted blocks
+#     desired_order = [
+#         '1 block', '100 block', '200 block', '300 block', '400 block', '500 block',
+#         '600 block', '700 block', '800 block', '900 block', '1000 block', '1100 block',
+#         '1200 block', '1300 block', '1400 block', '1500 block', '1600 block', 
+#         '1700 block', '1800 block', '1900 block', '2000 block', '2100 block', 
+#         '2200 block', '2300 block', '2400 block', '2500 block', '2600 block', 
+#         '2700 block', '2800 block', '2900 block', '3000 block', '3100 block', 
+#         '3200 block', '3300 block'
+#     ]
+
+#     # Filtering the data based on selected year
+#     filtered_data_time = data  # Use filtered_data if date range is not needed
+#     if selected_year != 'All Time':
+#         filtered_data_time = filtered_data_time[filtered_data_time['Year Reported'] == selected_year]
+    
+#     # Exclude blocks from the data
+#     filtered_data_time = filtered_data_time[~filtered_data_time['Housing Block'].isin(excluded_blocks)]
+    
+#     # Get the list of blocks excluding the unwanted ones
+#     available_blocks = sorted(filtered_data_time['Housing Block'].unique().tolist())
+    
+#     # Dropdown for Housing Block (excluding unwanted blocks)
+#     block_options = ['All Blocks'] + available_blocks
+#     selected_block = st.sidebar.selectbox("Select Housing Block", options=block_options, key="block_select")
+
+#     # Further filtering by selected Housing Block (if applicable)
+#     if selected_block != 'All Blocks':
+#         filtered_data_time = filtered_data_time[filtered_data_time['Housing Block'] == selected_block]
+    
+#     # Pivoting the data
+#     complaint_pivot = filtered_data_time.pivot_table(
+#         index='Housing Block',
+#         columns='Type of Complaint',
+#         values='Disposition',
+#         aggfunc='count',
+#         fill_value=0
+#     )
+    
+#     # Ensure the pivot data is numeric for plotting
+#     complaint_pivot = complaint_pivot.astype(float)
+
+#     # Reordering the pivot table by the desired order (excluding unwanted blocks)
+#     complaint_pivot = complaint_pivot.reindex(desired_order)
+
+#     # If a specific block is selected, only show that block on the x-axis
+#     if selected_block != 'All Blocks':
+#         complaint_pivot = complaint_pivot.loc[[selected_block]]
+
+#     # Calculating percentages for each complaint type per housing block
+#     percentages = complaint_pivot.div(complaint_pivot.sum(axis=1), axis=0) * 100
+
+#     # Plotting the data
+#     fig = complaint_pivot.plot(kind='bar', stacked=True, colormap='inferno', figsize=(10, 6)).get_figure()
+
+#     # Adding percentage labels to the plot
+#     ax = fig.gca()
+#     for idx, block in enumerate(complaint_pivot.index):
+#         cumulative_height = 0
+#         for i, complaint_type in enumerate(complaint_pivot.columns):
+#             count = complaint_pivot.iloc[idx, i]
+#             percent = percentages.iloc[idx, i]
+#             if count > 0:
+#                 # Compute the position for the percentage label
+#                 x_pos = idx - 0.4 + 0.8 / 2  # Adjusting the position of the label
+#                 y_pos = cumulative_height + count / 2
+#                 ax.text(
+#                     x_pos, y_pos, f"{percent:.1f}%", 
+#                     ha='center', va='center', 
+#                     fontsize=10, color='black', 
+#                     bbox=dict(facecolor='white', alpha=0.7, edgecolor='none')
+#                 )
+#             cumulative_height += count
+
+#     # Display the plot in Streamlit
+#     st.pyplot(fig)
+
 elif viz_type == "Complaints by Housing Block and Type (Incorporating Suggestions Based on Professor's Feedback)":
     st.subheader("Complaints by Housing Block and Type - Incorporating Suggestions Based on Professor's Feedback")
     
@@ -573,7 +639,11 @@ elif viz_type == "Complaints by Housing Block and Type (Incorporating Suggestion
     
     # Dropdown for Housing Block (excluding unwanted blocks)
     block_options = ['All Blocks'] + available_blocks
-    selected_block = st.sidebar.selectbox("Select Housing Block", options=block_options, key="block_select")
+    selected_block = st.sidebar.selectbox(
+        "Select Housing Block", 
+        options=block_options, 
+        key=f"block_select_{viz_type}"  # Unique key for each visualization type
+    )
 
     # Further filtering by selected Housing Block (if applicable)
     if selected_block != 'All Blocks':
@@ -626,6 +696,7 @@ elif viz_type == "Complaints by Housing Block and Type (Incorporating Suggestion
     # Display the plot in Streamlit
     st.pyplot(fig)
 
+
     # Description of the visualization
     st.write("""
     **What this visualization shows:**