From 3f366413c2897b4a908821f429f2bfdc7749c29f Mon Sep 17 00:00:00 2001 From: Brendan Andresen Date: Wed, 27 Mar 2024 13:56:38 -0700 Subject: [PATCH] add points gained to user info for report --- toja/constants.py | 1 + toja/views/report.py | 41 ++++++++++++++++++++++++------------ toja/views/visualizations.py | 10 +++------ 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/toja/constants.py b/toja/constants.py index a5f3308..89cbfba 100644 --- a/toja/constants.py +++ b/toja/constants.py @@ -91,3 +91,4 @@ MAIN_FRAME = '#ebebeb' # 'grey92' SECOND_FRAME = '#d9d9d9' # 'grey85' BUTTON_TEXT = '#dbdbdb' # 'grey17' + diff --git a/toja/views/report.py b/toja/views/report.py index 853f6a9..6a9262a 100644 --- a/toja/views/report.py +++ b/toja/views/report.py @@ -15,7 +15,7 @@ def __init__(self, root, theme: Theme): self.report_window.grid_rowconfigure(1, weight=1) self.main_frame = customtkinter.CTkFrame(self.report_window, fg_color=self.theme.second_frame) - self.main_frame.grid(row=1, column=0, padx=40, pady=(0,40), sticky="nsew") + self.main_frame.grid(row=1, column=0, padx=40, pady=(0, 40), sticky="nsew") self.main_frame.grid_columnconfigure(0, weight=1) self.main_frame.grid_columnconfigure(2, weight=1) self.main_frame.grid_rowconfigure(0, weight=1) @@ -48,19 +48,28 @@ def __init__(self, root, theme: Theme): self.left_combo_frame = customtkinter.CTkFrame(self.main_frame, fg_color=self.theme.main_frame) self.left_combo_frame.grid(row=0, column=0, padx=10, pady=10, sticky="nsew") - self.left_combo_frame.grid_columnconfigure(0,weight=1) + self.left_combo_frame.grid_columnconfigure(0, weight=1) + self.left_combo_frame.grid_rowconfigure(1, weight=1) self.info_frame = customtkinter.CTkFrame(self.left_combo_frame, fg_color=self.theme.main_frame) self.info_frame.grid(row=0, column=0, padx=10, pady=10, sticky="nsew") - self.user_name_label = customtkinter.CTkLabel(self.info_frame, text='User:') - self.user_name_label.grid(row=1, column=0) - self.user_name = customtkinter.CTkLabel(self.info_frame, text='') - self.user_name.grid(row=1,column=1) - - self.user_level_label = customtkinter.CTkLabel(self.info_frame, text='Job Hunter:') - self.user_level_label.grid(row=2, column=0) - self.user_level = customtkinter.CTkLabel(self.info_frame, text='') + self.user_name_label = customtkinter.CTkLabel(self.info_frame, text='User:', + font=self.theme.header_two_font + ) + self.user_name_label.grid(row=1, column=0, sticky='e', padx=5) + self.user_name = customtkinter.CTkLabel(self.info_frame, text='', + font=self.theme.header_two_font + ) + self.user_name.grid(row=1, column=1) + + self.user_level_label = customtkinter.CTkLabel(self.info_frame, text='Job Hunter:', + font=self.theme.header_two_font + ) + self.user_level_label.grid(row=2, column=0, sticky='e', padx=5) + self.user_level = customtkinter.CTkLabel(self.info_frame, text='', + font=self.theme.header_two_font + ) self.user_level.grid(row=2, column=1) self.report_range = customtkinter.CTkLabel(self.report_window, text='', @@ -68,13 +77,17 @@ def __init__(self, root, theme: Theme): ) self.report_range.grid(row=0, column=0, padx=10, pady=10) - self.user_point_gain_label = customtkinter.CTkLabel(self.info_frame, text='Points Gained:') - self.user_point_gain_label.grid(row=5, column=0) - self.user_point_gain = customtkinter.CTkLabel(self.info_frame, text='') + self.user_point_gain_label = customtkinter.CTkLabel(self.info_frame, text='Points Gained:', + font=self.theme.header_two_font + ) + self.user_point_gain_label.grid(row=5, column=0, sticky='e', padx=5) + self.user_point_gain = customtkinter.CTkLabel(self.info_frame, text='', + font=self.theme.header_two_font + ) self.user_point_gain.grid(row=5, column=1) self.progress_bar_frame = customtkinter.CTkFrame(self.left_combo_frame, fg_color=self.theme.main_frame) - self.progress_bar_frame.grid(row=1, column=0, padx=10, pady=10, sticky="nsew") + self.progress_bar_frame.grid(row=1, column=0, sticky="nsew") self.progress_graph = ProgressEvent() self.progress_graph.bg_color = self.theme.home_frame_background diff --git a/toja/views/visualizations.py b/toja/views/visualizations.py index aae1337..e65b596 100644 --- a/toja/views/visualizations.py +++ b/toja/views/visualizations.py @@ -120,18 +120,14 @@ def show_pie_chart(self, frame: customtkinter.CTkFrame, data: dict): colors = [self.event_colors.get(label, 'gray') for label in labels] explode = [0.1 for i in range(len(labels))] - def label_format(pct, allvals): - absolute = int(pct / 100. * sum(allvals)) - return absolute - ax.pie(values, labels=labels, labeldistance=1.1, - autopct=lambda pct: label_format(pct, values), + autopct='%1.1f%%', colors=colors, explode=explode, startangle=90, - textprops={'color': self.text_color, 'fontsize': 10}, + textprops={'color': self.text_color, 'fontsize': 9}, wedgeprops={'edgecolor': self.text_color, 'linewidth': .8}) - plt.subplots_adjust(left=0.1, right=0.9) + plt.subplots_adjust(left=0.2, right=0.85) canvas = FigureCanvasTkAgg(fig, master=frame) canvas.draw()