Skip to content

Commit 1bfa4c4

Browse files
More date/datetime fixes
1 parent b0abeff commit 1bfa4c4

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

pandas/io/excel/_odswriter.py

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,30 +68,39 @@ def write_cells(
6868
for _ in range(cell.col - col_count[cell.row]):
6969
rows[cell.row].addElement(TableCell())
7070
col_count[cell.row] += 1
71-
class_to_cell_type = {
72-
str: "string",
73-
int: "float",
74-
float: "float",
75-
bool: "boolean",
76-
}
7771
val, fmt = self._value_with_fmt(cell.val)
78-
# print("type", type(val), "value", val)
79-
value = val
72+
print("type", type(val), "value", val)
73+
pvalue = value = val
8074
if isinstance(val, bool):
8175
value = str(val).lower()
82-
# if isinstance(val, datetime.date):
83-
# tc = TableCell(valuetype="date",
84-
if isinstance(val, datetime.date):
76+
pvalue = str(val).upper()
77+
if isinstance(val, datetime.datetime):
78+
print('datetime', val.strftime("%Y-%m-%d"), val.strftime("%x"))
79+
if val.time():
80+
value = val.isoformat()
81+
pvalue = val.strftime("%c")
82+
else:
83+
value = val.strftime("%Y-%m-%d")
84+
pvalue = val.strftime("%x")
85+
tc = TableCell(valuetype="date", datevalue=value)
86+
elif isinstance(val, datetime.date):
8587
print('date', val.strftime("%Y-%m-%d"), val.strftime("%x"))
8688
value = val.strftime("%Y-%m-%d")
89+
pvalue = val.strftime("%x")
90+
# value = val.isoformat()
91+
# pvalue = val.strftime("%c")
8792
tc = TableCell(valuetype="date", datevalue=value)
8893
else:
94+
class_to_cell_type = {
95+
str: "string",
96+
int: "float",
97+
float: "float",
98+
bool: "boolean",
99+
}
89100
tc = TableCell(valuetype=class_to_cell_type[type(val)], value=value)
90101
rows[cell.row].addElement(tc)
91102
col_count[cell.row] += 1
92-
if isinstance(val, bool):
93-
value = str(val).upper()
94-
p = P(text=value)
103+
p = P(text=pvalue)
95104
tc.addElement(p)
96105
"""
97106
stylekey = json.dumps(cell.style)

0 commit comments

Comments
 (0)