Skip to content

Commit

Permalink
Merge pull request #15 from AndreWohnsland/dev
Browse files Browse the repository at this point in the history
Fix weekly hours input mapping
  • Loading branch information
AndreWohnsland authored Jul 1, 2024
2 parents 9588480 + 402c0dc commit 8e7c25f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ python = ">=3.10,<3.12"
GitPython = "^3.1.43"
matplotlib = "^3.9.0"
pandas = "^2.2.2"
pyqt5-qt5 = "5.15.2"
xlsxwriter = "^3.2.0"
pyqtdarktheme = "^2.1.0"
qtawesome = "^1.3.1"
Expand Down
2 changes: 1 addition & 1 deletion src/ui_config_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def apply_config(self):
CONFIG_HANDLER.config.subdiv = self.input_subdiv.currentText() or None
CONFIG_HANDLER.config.name = self.input_name.text()
CONFIG_HANDLER.config.daily_hours = self.input_daily_hours.value()
CONFIG_HANDLER.config.weekly_hours = self.input_daily_hours.value()
CONFIG_HANDLER.config.weekly_hours = self.input_weekly_hours.value()
CONFIG_HANDLER.config.plot_pause = self.input_plot_pause.isChecked()
selected_days: list[int] = []
for day in range(7):
Expand Down
4 changes: 1 addition & 3 deletions src/ui_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ def user_okay(self, text: str):
yes_button = message_box.addButton("Yes", QMessageBox.ButtonRole.YesRole)
message_box.addButton("No", QMessageBox.ButtonRole.NoRole)
message_box.exec()
if message_box.clickedButton() == yes_button:
return True
return False
return message_box.clickedButton() == yes_button

def display_about(self):
message = (
Expand Down
4 changes: 1 addition & 3 deletions src/ui_data_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ def __init__(self, main_window: MainWindow):

@property
def view_day(self):
if self.switch_button.isChecked():
return True
return False
return self.switch_button.isChecked()

@property
def selected_date(self):
Expand Down

0 comments on commit 8e7c25f

Please sign in to comment.