Skip to content

Fixes an issue with interpratation of Date type when reading from the… #376

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

Merged
PTKu merged 2 commits into from
Jan 27, 2025
Merged

Fixes an issue with interpratation of Date type when reading from the… #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a410f2
Fixes an issue with interpratation of Date type when reading from the…
Jan 27, 2025
e15d34f
Merge branch 'dev' into 369-check-behavior-of-date-related-types-in-l…
PTKu Jan 27, 2025
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
4 changes: 2 additions & 2 deletions src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/BuiltInWrappers/WebApiDate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ private DateOnly GetFromBinary(long value)
switch (_webApiConnector.TargetPlatform)
{
case eTargetProjectPlatform.TIAPORTAL:
int val = ((int)value) - 1;
return DateOnly.FromDayNumber(val).AddYears(1989);
//int val = ((int)value) - 1;
return ((int)value).GetDateOnly();//DateOnly.FromDayNumber((int)value).AddYears(1989);

case eTargetProjectPlatform.SIMATICAX:
var valAx = value / 100;
Expand Down
11 changes: 11 additions & 0 deletions src/AXSharp.connectors/src/AXSharp.Connector.S71500.WebAPI/WebApiConnectorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ public static ConnectorAdapter CreateWebApi(this ConnectorAdapterBuilder adapter
{ Parameters = new object[] { ipAddress, userName, password, customServerCertHandler, ignoreSslErrors, platform, dbName } };
}

public static DateOnly GetDateOnly(this int value)
{
// 1 tick = 100 ns
// Use DateTimeKind.Utc for correct interpretation
var dateTime = new DateTime(1990, 1, 1, 0, 0, 0, DateTimeKind.Utc)
.AddDays(value);

// Return the date portion in UTC
return DateOnly.FromDateTime(dateTime.ToUniversalTime());
}

public static DateOnly GetDateOnly(this long value)
{
// 1 tick = 100 ns
Expand Down