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

Jump to bottom

Support for TIME and TIMEVALUE #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for TIME and TIMEVALUE #17

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
8 changes: 4 additions & 4 deletions SUPPORTED_FORMULAS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Supported Formulas - 152
# Supported Formulas - 154

* ABS
* ACOS
Expand Down Expand Up @@ -141,6 +141,8 @@
* TANH
* TEXT
* TEXTJOIN
* TIME
* TIMEVALUE
* TODAY
* TRUE
* UPPER
Expand All @@ -154,7 +156,7 @@
* YEAR


# Not Yet Supported Formulas - 336
# Not Yet Supported Formulas - 334

* ACCRINT
* ACCRINTM
Expand Down Expand Up @@ -458,8 +460,6 @@
* TBILLPRICE
* TBILLYIELD
* TDIST
* TIME
* TIMEVALUE
* TINV
* TRANSPOSE
* TREND
Expand Down
16 changes: 16 additions & 0 deletions hotxlfp/formulas/dateandtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,27 @@ def DATE(year, month, day):
return datetime.datetime(year, month, day)


@dispatcher.register_for('TIME')
def TIME(hour, minute, second):
year = utils.parse_number(hour)
minute = utils.parse_number(minute)
second = utils.parse_number(second)
if utils.any_is_error((year, minute, second)):
return error.VALUE
return datetime.datetime(1900, 1, 1, hour, minute, second)


@dispatcher.register_for('DATEVALUE')
def DATEVALUE(date):
return utils.serialize_date(date)


@dispatcher.register_for('TIMEVALUE')
def TIMEVALUE(time):
# -1 is because excel has epoch starting on day 0 of 1900 and datetime starts at 1
return utils.serialize_date(datetime.datetime.combine(utils.date_1900, utils.parse_date(time).time())) - 1


@dispatcher.register_for('YEAR')
def YEAR(serial_number):
serial_number = utils.parse_date(serial_number)
Expand Down
29 changes: 29 additions & 0 deletions tests/test_operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,35 @@ def test_div(self):
self.assertEqual(ret['result'], None)
self.assertEqual(ret['error'], '#DIV/0!')

def test_time_logic(self):
p = Parser(debug=True)
# Numbers
ret = p.parse('TIME(22,0,0) = TIME(23,0,0)')
self.assertEqual(ret['result'], False) # 0
self.assertEqual(ret['error'], None)
ret = p.parse('TIME(22,0,0) <> TIME(23,0,0)')
self.assertEqual(ret['result'], True)
self.assertEqual(ret['error'], None)
ret = p.parse('TIME(22,0,0) > TIME(23,0,0)')
self.assertEqual(ret['result'], False)
self.assertEqual(ret['error'], None)
ret = p.parse('TIME(22,0,0) < TIME(23,0,0)')
self.assertEqual(ret['result'], True)
self.assertEqual(ret['error'], None)
ret = p.parse('HOUR(TIME(22,15,30))')
self.assertEqual(ret['result'], 22)
self.assertEqual(ret['error'], None)
ret = p.parse('MINUTE(TIME(22,15,30))')
self.assertEqual(ret['result'], 15)
self.assertEqual(ret['error'], None)
ret = p.parse('SECOND(TIME(22,15,30))')
self.assertEqual(ret['result'], 30)
self.assertEqual(ret['error'], None)
ret = p.parse('TIMEVALUE("12:00")')
self.assertEqual(ret['result'], 0.5)
self.assertEqual(ret['error'], None)


def test_logic(self):
p = Parser(debug=True)
# Numbers
Expand Down