Skip to content

Commit 08d753e

Browse files
committed
- fixed GetNewestEntryTime()
- fixed GetOldestEntryTime()
1 parent 3ce0359 commit 08d753e

1 file changed

Lines changed: 4 additions & 18 deletions

File tree

TransactionTable/TransactionsPreset/TransactionsTable_TableCache.cs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,8 @@ public Table GetTable(DateTime date)
154154
// set the time
155155
string dateString = newestTable.GetCell(row: i, column: dateColumn);
156156
string timeString = newestTable.GetCell(row: i, column: timeColumn);
157-
string dateTime = $"{dateString} {timeString}";
158-
if (DateTime.TryParseExact(dateTime, "yyyy/MM/dd HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime outputDateTime))
159-
{
160-
if (outputDateTime > newestTime) newestTime = outputDateTime;
161-
}
162-
else
163-
{
164-
throw new InvalidDataException("DateTime could not be parsed!");
165-
}
157+
DateTime dateTime = DateTimeHelper.Merge(dateString, timeString);
158+
if (dateTime > newestTime) newestTime = dateTime;
166159
}
167160
return newestTime;
168161
}
@@ -188,15 +181,8 @@ public Table GetTable(DateTime date)
188181
// set the time
189182
string dateString = oldestTable.GetCell(row: i, column: dateColumn);
190183
string timeString = oldestTable.GetCell(row: i, column: timeColumn);
191-
string dateTime = $"{dateString} {timeString}";
192-
if (DateTime.TryParseExact(dateTime, "yyyy/MM/dd HH:mm", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime outputDateTime))
193-
{
194-
if (outputDateTime < oldestTime) oldestTime = outputDateTime;
195-
}
196-
else
197-
{
198-
throw new InvalidDataException("DateTime could not be parsed!");
199-
}
184+
DateTime dateTime = DateTimeHelper.Merge(dateString, timeString);
185+
if (dateTime < oldestTime) oldestTime = dateTime;
200186
}
201187
return oldestTime == DateTime.MaxValue ? (DateTime?)null : oldestTime;
202188
}

0 commit comments

Comments
 (0)