Update app.py

app.py

@@ -5,11 +5,11 @@ import vega_datasets
 
 import pandas as pd
 import altair as alt
-import numpy as np
-import pprint
+# import numpy as np
+# import pprint
 import datetime as dt
 from vega_datasets import data
-import matplotlib.pyplot as plt
+# import matplotlib.pyplot as plt
 
 
 df2=pd.read_csv("https://raw.githubusercontent.com/dallascard/SI649_public/main/altair_hw3/approval_topline.csv")
@@ -17,7 +17,6 @@ df2=pd.read_csv("https://raw.githubusercontent.com/dallascard/SI649_public/main/
 df2['timestamp']=pd.to_datetime(df2['timestamp'])
 df2=pd.melt(df2, id_vars=['president', 'subgroup', 'timestamp'], value_vars=['approve','disapprove']).rename(columns={'variable':'choice', 'value':'rate'})
 
-df2_approve = df2[df2['choice'] == 'approve']
 
 # Enable Panel extensions
 # pn.extension()
@@ -33,9 +32,10 @@ template = pn.template.BootstrapTemplate(
 def create_plot(subgroup, date_range, moving_av_window):
 
     # Apply any required transformations to the data in pandas)
+    df2_approve = df2[df2['choice'] == 'approve']
     filtered_df = df2_approve[df2_approve['subgroup'] == subgroup]
     filtered_df = filtered_df[(filtered_df['timestamp'].dt.date >= date_range[0]) & (filtered_df['timestamp'].dt.date <= date_range[1])]
-    filtered_df['mov_avg'] = filtered_df['rate'].rolling(window=moving_av_window).mean().shift(moving_av_window//2)
+    filtered_df['mov_avg'] = filtered_df['rate'].rolling(window=moving_av_window).mean().shift(-moving_av_window//2)
 
     # Line chart
     line_chart = alt.Chart(filtered_df).mark_line(color='red', size=2).encode(
@@ -53,7 +53,7 @@ def create_plot(subgroup, date_range, moving_av_window):
     plot = scatter_plot + line_chart
     
     # Return the combined chart
-    return plot
+    return pn.pane.Vega(plot)
     
 
 # # Create the selection widget
@@ -63,8 +63,8 @@ select = pn.widgets.Select(name='Select', options=['All polls', 'Adults', 'Voter
 # # Create the slider for the date range
 date_range_slider = pn.widgets.DateRangeSlider(
     name='Date Range Slider',
-    start=df2_approve['timestamp'].dt.date.min(), end=df2_approve['timestamp'].dt.date.max(),
-    value=(df2_approve['timestamp'].dt.date.min(), df2_approve['timestamp'].dt.date.max()),
+    start=df2['timestamp'].dt.date.min(), end=df2['timestamp'].dt.date.max(),
+    value=(df2['timestamp'].dt.date.min(), df2['timestamp'].dt.date.max()),
     step=1
 )