Merge branch 'master' of https://github.com/DennisTurco/CalendarioLezioniPrivate

Author: DennisTurco

GUI.py

@@ -1051,7 +1051,7 @@ def __init__(self, parent, main_class):
         self.button_open_events_table_preview.configure(command=self.events_table_preview)
 
         # Graph types
-        (self.button_select_all, self.button_deselect_all, self.total_hours_per_year, self.total_hours_per_month, self.total_hours_by_summary, self.total_hours_by_summary2, self.total_hours_per_year_by_summary, self.total_hours_per_month_by_summary) = GUIWidgets.create_graph_types_scroll_frame(self, square_check_image, square_image)
+        (self.button_select_all, self.button_deselect_all, self.total_hours_per_year, self.total_hours_per_month, self.total_hours_by_summary, self.total_hours_by_summary2, self.total_hours_per_year_by_summary, self.total_hours_per_month_by_summary, self.total_hours_per_month_grouped_by_year) = GUIWidgets.create_graph_types_scroll_frame(self, square_check_image, square_image)
         self.button_select_all.configure(command=self.select_all)
         self.button_deselect_all.configure(command=self.deselect_all)
 
@@ -1100,6 +1100,7 @@ def select_all(self):
         self.total_hours_by_summary2.select()
         self.total_hours_per_year_by_summary.select()
         self.total_hours_per_month_by_summary.select()
+        self.total_hours_per_month_grouped_by_year.select()
         Logger.write_log(f"all chart types selected", Logger.LogType.INFO)
         self._common.write_log(self.log_box, f"all chart types selected")
 
@@ -1110,6 +1111,7 @@ def deselect_all(self):
         self.total_hours_by_summary2.deselect()
         self.total_hours_per_year_by_summary.deselect()
         self.total_hours_per_month_by_summary.deselect()
+        self.total_hours_per_month_grouped_by_year.deselect()
         Logger.write_log(f"all chart types deselected", Logger.LogType.INFO)
         self._common.write_log(self.log_box, f"all chart types deselected")
 
@@ -1166,6 +1168,8 @@ def generate_graph(self):
                 self.generate_chart_with_timeout(Plotter.Plotter.chart_TotalHoursPerYearBySummary, data)
             if self.total_hours_per_month_by_summary.get() == "on":
                 self.generate_chart_with_timeout(Plotter.Plotter.chart_TotalHoursPerMonthBySummary, data)
+            if self.total_hours_per_month_grouped_by_year.get() == "on":
+                self.generate_chart_with_timeout(Plotter.Plotter.chart_TotalHoursPerMonthGroupedByYear, data)
 
         except FileNotFoundError as error:
             Logger.write_log(f"Error, the file '{self.file_path.get()}' doesn't exist", Logger.LogType.ERROR, error)

GUIWidgets.py

@@ -144,7 +144,9 @@ def create_graph_types_scroll_frame(master, square_check_image: PhotoImage, squa
     total_hours_per_year_by_summary.grid(row=3, column=0, padx=10, pady=10, sticky="ew")
     total_hours_per_month_by_summary = ctk.CTkCheckBox(graph_types_frame, text="Hours per Month By Summary", onvalue="on", offvalue="off")
     total_hours_per_month_by_summary.grid(row=3, column=1, padx=10, pady=10, sticky="ew")
-    return(button_select_all, button_deselect_all, total_hours_per_year, total_hours_per_month, total_hours_by_summary, total_hours_by_summary2, total_hours_per_year_by_summary, total_hours_per_month_by_summary)
+    total_hours_per_month_grouped_by_year = ctk.CTkCheckBox(graph_types_frame, text="Hours per Month Grouped By Year", onvalue="on", offvalue="off")
+    total_hours_per_month_grouped_by_year.grid(row=4, column=0, padx=10, pady=10, sticky="ew")
+    return(button_select_all, button_deselect_all, total_hours_per_year, total_hours_per_month, total_hours_by_summary, total_hours_by_summary2, total_hours_per_year_by_summary, total_hours_per_month_by_summary, total_hours_per_month_grouped_by_year)
 
 def create_date_selection_for_events_list_scroll_frame(master, timezone: list[str], calendar_image: PhotoImage):
     date_frame = ctk.CTkScrollableFrame(master, label_text="Date Interval")

Plotter.py

@@ -220,6 +220,56 @@ def chart_TotalHoursPerMonth(data):
         # Show the plot
         fig.show()
         ####################
+        
+    @staticmethod
+    def chart_TotalHoursPerMonthGroupedByYear(data):
+        #################### Total Hours per Month Grouped by Year
+        # Extract time data
+        data = Plotter.__extractTimeData(data)
+
+        # Group by month, year, and calculate the sum of hours
+        monthly_hours_by_year = data.groupby(['Month', 'Year'])['Duration'].sum().reset_index()
+
+        # Create a bar chart with Plotly, color by 'Year'
+        fig = px.bar(
+            monthly_hours_by_year,
+            x='Month',
+            y='Duration',
+            color='Year',
+            labels={'Month': 'Month', 'Duration': 'Total Hours'},
+            title='Total Hours per Month Grouped by Year',
+            text_auto=True  # Automatically align values
+        )
+
+        # Ensure text annotations are centered inside each bar segment
+        fig.for_each_trace(lambda trace: trace.update(
+            textposition='inside',  # Position text inside the bar
+            textfont=dict(size=12),  # Adjust font size for better readability
+        ))
+
+        # Customize layout
+        fig.update_layout(
+            xaxis=dict(
+                tickmode='array',
+                tickvals=monthly_hours_by_year['Month'].unique(),
+                ticktext=[f"Month {i}" for i in monthly_hours_by_year['Month'].unique()]
+            ),
+            yaxis=dict(
+                title="Total Hours"
+            ),
+            coloraxis_colorbar=dict(
+                tickvals=sorted(monthly_hours_by_year['Year'].unique()),  # Unique year ticks
+                title="Year"
+            ),
+            title=dict(
+                text='Total Hours per Month Grouped by Year',
+                x=0.5  # Center the title
+            )
+        )
+
+        # Show the plot
+        fig.show()
+        ####################
 
     @staticmethod
     def chart_TotalHoursBySummary(data):