Skip to content

Commit 5f3b85e

Browse files
committed
Merge branch 'main' into dev
2 parents 1f6133f + 2684017 commit 5f3b85e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tuttle/model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ class Contact(SQLModel, table=True):
155155
"""An entry in the address book."""
156156

157157
id: Optional[int] = Field(default=None, primary_key=True)
158-
first_name: str
159-
last_name: str
158+
first_name: Optional[str]
159+
last_name: Optional[str]
160160
company: Optional[str]
161161
email: Optional[str]
162162
address_id: Optional[int] = Field(default=None, foreign_key="address.id")

tuttle/timetracking.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,9 @@ def import_from_calendar(cal: Calendar) -> DataFrame:
119119
if issubclass(type(cal), ICloudCalendar):
120120
timetracking_data = cal.to_data()
121121
return timetracking_data
122-
elif issubclass(cal, FileCalendar):
123-
raise NotImplementedError()
122+
elif issubclass(type(cal), FileCalendar):
123+
timetracking_data = cal.to_data()
124+
return timetracking_data
124125
else:
125126
raise NotImplementedError()
126127

0 commit comments

Comments
 (0)