add more plots

app.py

@@ -38,8 +38,7 @@ def full_report():
 
     request = RunReportRequest(
         property=f"properties/{PROPERTY_ID}",
-        dimensions=[Dimension(name="hour"),
-                    Dimension(name="nthDay"),
+        dimensions=[Dimension(name="nthDay"),
                     Dimension(name='eventName'),
                     Dimension(name="continent"),
                     Dimension(name="country"),
@@ -56,13 +55,12 @@ def full_report():
     res = {'day': [], 'jumps': [], 'continent': [], 'country': [], 'iso': []}
 
     for row in response.rows:
-        date = row.dimension_values[0].value  # YYYMMDD (e.g 20230715)
-        day = int(row.dimension_values[1].value)
-        event_name = row.dimension_values[2].value
-        continent = row.dimension_values[3].value
-        country = row.dimension_values[4].value
-        country_iso = row.dimension_values[5].value
+        event_name = row.dimension_values[1].value
         if event_name == FINISHED_EXERCISE:
+            day = int(row.dimension_values[0].value)
+            continent = row.dimension_values[2].value
+            country = row.dimension_values[3].value
+            country_iso = row.dimension_values[4].value
             event_value = float(row.metric_values[0].value)
             total_jumps += int(event_value)
             res['day'].append(day)
@@ -93,10 +91,22 @@ def full_report():
     total_map = px.choropleth(country_df, locations="iso",
                                 color="jumps", 
                                 hover_name="country", # column to add to hover information
-                                color_discrete_map="Reds",
+                                color_continuous_scale ="plasma",
+                                projection='natural earth',
                                 template="plotly_dark")
+    # remove the legend
+    total_map.update_layout(showlegend=False)
+    total_map.update(layout_coloraxis_showscale=False)
 
-    return f"## Total Jumps: {total_jumps:,}", total, avg, total_map
+    df = df.groupby(['day', 'continent']).sum().reset_index()
+    df = df.sort_values(by=['day'])
+    df['total_jumps'] = df.groupby('continent')['jumps'].cumsum()
+    jumps_over_time = px.line(df, x='day', 
+                              y='total_jumps', 
+                              color='continent', 
+                              template="plotly_dark")
+
+    return f"## Total Jumps: {total_jumps:,}", total, avg, total_map, jumps_over_time
 
 
 with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
@@ -104,11 +114,14 @@ with gr.Blocks(theme='WeixuanYuan/Soft_dark') as demo:
         total_jumps_label = gr.Markdown("Total Jumps: 0")
     with gr.Row():
         map_fig = gr.Plot(label="Map")
+    with gr.Row():
+        jumps_over_time = gr.Plot(label="Jumps Over Time")
     with gr.Row():
         total_plot = gr.Plot(label="Total Jumps")
+    with gr.Row():
         avg_plot = gr.Plot(label="Average Jumps per Day")
 
-    outputs = [total_jumps_label, total_plot, avg_plot, map_fig]
+    outputs = [total_jumps_label, total_plot, avg_plot, map_fig, jumps_over_time]
     dep = demo.load(full_report, None, outputs)
 
 if __name__ == "__main__":

requirements.txt

@@ -1,5 +1,3 @@
 google-analytics-data
 pandas<2.0.0
-seaborn
-matplotlib
 plotly