Update dashboard.py

dashboard.py

@@ -167,6 +167,23 @@ def loadTaskMethodTimeSeries(topic,task):
     return task_method_ts
 
 
+def loadTaskTimeSeries(topic):
+#cluster_{cluster_id}_TASK_time_series.csv
+    task_ts = pd.read_csv(os.path.join(data_folder+'/time_series', f"""cluster_{topic}_TASK_time_series.csv"""),
+                                                  header=0, sep=',', lineterminator='\n', low_memory=False)
+
+    task_ts.set_index(task_ts.columns[0], inplace=True)
+    return task_ts
+
+def loadMethodTimeSeries(topic):
+
+    method_ts = pd.read_csv(os.path.join(data_folder+'/time_series', f"""cluster_{topic}_METHOD_time_series.csv"""),
+                                                  header=0, sep=',', lineterminator='\n', low_memory=False)
+
+    method_ts.set_index(method_ts.columns[0], inplace=True)
+    return method_ts
+
+
 ################################# CREATE CHARTS ############################
 ################################# CREATE CHARTS ############################
 
@@ -585,11 +602,49 @@ def CreatePage7():
         align="center",
     )
 
+def load_Task_Method_trends(topic, **kwargs):
 
+    task_data = dict()
 
+    # Check if macro_topics_mapping exists
+    if topic not in macro_topics_mapping:
+        raise ValueError(f"Topic '{topic}' not found in macro_topics_mapping")
+    macro_topic_str = str(macro_topics_mapping[topic])
 
 
-def load_Task_Method_trends(topic, **kwargs):
+    #load the tasks and methods timeseries dataframe for the selected topic
+    task_ts_df = loadTaskTimeSeries(macro_topic_str)
+    method_ts_df = loadMethodTimeSeries(macro_topic_str)
+
+    task_overlay = create_overlay_plot(task_ts_df)
+    method_overlay = create_overlay_plot(method_ts_df)
+
+    # Recolor and relabel elements in overlays
+
+    task_overlay_colored = hv.Overlay([
+        curve.opts(color='red', legend_label=curve.label if curve.label else f"Series {i + 1}")
+        for i, curve in enumerate(task_overlay)
+    ])
+    method_overlay_colored = hv.Overlay([
+        curve.opts(color='blue', legend_label=curve.label if curve.label else f"Series {i + 1}")
+        for i, curve in enumerate(method_overlay)
+    ])
+
+    # Merge overlays into one plot
+    merged_overlay = task_overlay_colored * method_overlay_colored
+    merged_overlay.opts(
+        show_legend=True,
+        legend_position='right',
+        width=1400,
+        height=900
+    )
+    return pn.Column(
+        merged_overlay
+    )
+
+
+
+def load_Task_Method_triple_trends(topic, **kwargs):
 
     task_data = dict()