Skip to content

Merge descriptions #3

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

Open
codingforfun wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Merge descriptions #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
844b068
Merge description of same activity
codingforfun Sep 1, 2015
6078e19
Fix delimiter string
codingforfun Sep 1, 2015
1c139d6
Do not duplicate exact same description item when merging.
codingforfun Sep 18, 2015
fc1bf3c
Reverse sort entries by duration
codingforfun Aug 27, 2015
edb0edb
Group by date on sorting by duration
codingforfun Sep 18, 2015
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
9 changes: 7 additions & 2 deletions hamster-export
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,19 @@ class Timesheet(object):
if len(items) > 1:
item.duration = sum(map(operator.attrgetter('duration'),
items))

item.description = ', '.join(set(
filter(lambda i: i and i.strip() or '',
map(operator.attrgetter('description'), items))))
return item

key = operator.attrgetter('date', 'name', 'description')
key = operator.attrgetter('date', 'name')
merged = []
for key, items in itertools.groupby(sorted(self.entries, key=key),
key=key):
merged.append(merge(list(items)))
self._entries = merged
# sort by date and duration
self._entries = sorted(merged, key=lambda i: (i.date, -i.duration))

def check_activities(self, activities):
patterns = set(map(operator.attrgetter('name'), activities))
Expand Down