Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix date adjustment from edit window. #16

Merged
merged 1 commit into from
Aug 16, 2020
Merged

Fix date adjustment from edit window. #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=============
Version 0.1.3
=============
* Fixed bug in date adustment from edit window.

=============
Version 0.1.2
=============
Expand Down
32 changes: 18 additions & 14 deletions src/hamster_lite/edit_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,18 +202,22 @@ def on_end_time_changed(self, widget):

def on_start_date_changed(self, widget):
if not self.master_is_cmdline:
if self.fact.start_time:
previous_date = self.fact.start_time.date()
new_date = self.start_date.date
delta = new_date - previous_date
self.fact.start_time += delta
if self.fact.end_time:
# preserve fact duration
self.fact.end_time += delta
self.end_date.date = self.fact.end_time
self.date = self.fact.date or hamster_today()
self.validate_fields()
self.update_cmdline()
new_date = self.start_date.date
self.change_start_date(new_date)

def change_start_date(self, new_date):
if self.fact.start_time:
previous_date = self.fact.start_time.date()
new_date = self.start_date.date
delta = new_date - previous_date
self.fact.start_time += delta
if self.fact.end_time:
# preserve fact duration
self.fact.end_time += delta
self.end_date.date = self.fact.end_time
self.date = self.fact.date or hamster_today()
self.validate_fields()
self.update_cmdline()

def on_start_date_expander_activated(self, widget):
# state has not changed yet, toggle also end_date calendar visibility
Expand Down Expand Up @@ -261,8 +265,8 @@ def update_fields(self):
self.start_time.time = self.fact.start_time
self.end_time.time = self.fact.end_time
self.end_time.set_start_time(self.fact.start_time)
self.start_date.date = self.fact.start_time
self.end_date.date = self.fact.end_time
self.start_date.date = self.fact.date or self.date
self.end_date.date = self.fact.date or self.date
self.activity_entry.set_text(self.fact.activity)
self.category_entry.set_text(self.fact.category)
self.description_buffer.set_text(self.fact.description)
Expand Down