Skip to content

Update "ActivyList" to "ActivityList" #19

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
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update "ActivyList" to "ActivityList" #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad279d0
Rename "ActivityList" function and references
cjmuldoon Sep 5, 2019
8b5911d
Update autotimer.py
cjmuldoon Sep 5, 2019
e98be40
Merge pull request #2 from cjmuldoon/cjmuldoon-patch-2
cjmuldoon Sep 5, 2019
7911728
Merge pull request #1 from cjmuldoon/cjmuldoon-patch-1
cjmuldoon Sep 5, 2019
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
8 changes: 4 additions & 4 deletions activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
from dateutil import parser


class AcitivyList:
class ActivityList:
def __init__(self, activities):
self.activities = activities

def initialize_me(self):
activity_list = AcitivyList([])
activity_list = ActivityList([])
with open('activities.json', 'r') as f:
data = json.load(f)
activity_list = AcitivyList(
activity_list = ActivityList(
activities = self.get_activities_from_json(data)
)
return activity_list
Expand Down Expand Up @@ -100,4 +100,4 @@ def serialize(self):
'hours' : self.hours,
'minutes' : self.minutes,
'seconds' : self.seconds
}
}
2 changes: 1 addition & 1 deletion autotimer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
active_window_name = ""
activity_name = ""
start_time = datetime.datetime.now()
activeList = AcitivyList([])
activeList = ActivityList([])
first_time = True


Expand Down