Skip to content

Commit 8b2d7fe

Browse files
Fixed spelling, added check of empty export data
1 parent 8d993ba commit 8b2d7fe

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

src/button_controler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ def export_data(self):
166166
overtime_report = self.ui_controler.report_choice()
167167
if overtime_report == None:
168168
return
169-
succesful, file_path = self.data_exporter.export_data(self.report_df, report_date, overtime_report)
169+
succesful, message = self.data_exporter.export_data(self.report_df, report_date, overtime_report)
170170
if succesful:
171171
self.ui_controler.show_message(f"File saved under: {file_path}")
172172
else:
173-
self.ui_controler.show_message(f"Could not open Workbook: {file_path}, is it still opened?")
173+
self.ui_controler.show_message(message)
174174

175175
def switch_dataview(self):
176176
self.ui_controler.handle_delete_button(self.delete_selected_event)

src/data_exporter.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ def __init__(self):
1414
self.worktime = 8
1515

1616
def export_data(self, df, report_date, overtime_report=True):
17+
if not df:
18+
message = f"No data to export, will no generate file..."
19+
print(message)
20+
return False, message
1721
config = self.config_handler.get_config_file_data()
1822
file_suffix = "time"
1923
if overtime_report:
@@ -35,16 +39,17 @@ def export_data(self, df, report_date, overtime_report=True):
3539
workbook.close()
3640
return True, file_path
3741
except:
38-
print(f"Could not open Workbook: {file_name}, is it still opened?")
39-
return False, file_path
42+
message = f"Could not open Workbook: {file_name}, is it still opened?"
43+
print(message)
44+
return False, message
4045

4146
def round_quarterly(self, number):
4247
return round(number * 4) / 4
4348

4449
def write_person_information(self, worksheet, df, config, bold, color, overtime_report):
4550
worksheet.write("A1", "Name:", bold)
4651
worksheet.write("B1", config["Name"], color)
47-
worksheet.write("A2", "Pers.Nr::", bold)
52+
worksheet.write("A2", "Pers.Nr:", bold)
4853
worksheet.write("B2", config["Personal Number"], color)
4954
worksheet.write("A3", "Monat:", bold)
5055
worksheet.write("B3", df.index[0].strftime("%B"), color)

src/ui_mainwindow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def connect_buttons(self):
2626

2727
def set_icon(self, window):
2828
dirpath = os.path.dirname(__file__)
29-
self.clock_picture = os.path.join(dirpath, "..", "ui", "clock.png")
29+
self.clock_picture = os.path.join(os.path.dirname(dirpath), "ui", "clock.png")
3030
window.setWindowIcon(QIcon(self.clock_picture))
3131

3232
def set_objects(self):

0 commit comments

Comments
 (0)