Skip to content

1066 bug dataexchange query failed on nullable datetime #1075

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
TomKovac merged 32 commits into from
Mar 21, 2026
Merged

1066 bug dataexchange query failed on nullable datetime #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0bf8aa5
plain builder
Mar 12, 2026
7ee0a60
plain builder
Mar 12, 2026
4310730
rewrite querysymbol logic
Mar 12, 2026
27139de
wip
Mar 12, 2026
fd01421
fix naming
Mar 13, 2026
10e5edd
harmonize naming
Mar 13, 2026
1ff9db2
test createdat
Mar 13, 2026
289e559
common hiden prefix
Mar 13, 2026
08e4e5a
wip - filter and display
Mar 13, 2026
c99d49d
display symbol lock
Mar 13, 2026
7c2daf6
wip
Mar 13, 2026
50698c8
fix dynamic input
Mar 16, 2026
0589447
predicate builder - nullable
Mar 16, 2026
a91a694
clean
Mar 16, 2026
4bfdfbd
wip - entity ids intersecition
Mar 16, 2026
ff18867
Merge remote-tracking branch 'origin/dev' into 1066-bug-dataexchange-…
Mar 17, 2026
71c295a
Merge branch 'dev' into 1066-bug-dataexchange-query-failed-on-nullabl…
Mar 17, 2026
17bf320
wip
Mar 18, 2026
13273e5
wip
Mar 18, 2026
6cf4159
external predicates
Mar 19, 2026
c698215
clean razor
Mar 19, 2026
1a59f05
distributed view model clean up
Mar 19, 2026
169939b
clean view model
Mar 19, 2026
42a8acb
fix concat invoked from exchange
Mar 19, 2026
3a66914
exchange view, extension menu
Mar 19, 2026
83c17bf
fix in tests
Mar 19, 2026
7285b84
fix view
Mar 19, 2026
a330518
tailwind build
Mar 19, 2026
2476d3d
Merge remote-tracking branch 'origin/dev' into 1066-bug-dataexchange-…
Mar 19, 2026
db61a41
slngen src/data
Mar 19, 2026
eca9a7b
update axsharp
Mar 20, 2026
e06712b
Merge branch 'dev' into 1066-bug-dataexchange-query-failed-on-nullabl…
TomKovac Mar 21, 2026
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
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"AXSharp.ixc": {
"version": "0.47.0-alpha.452",
"version": "0.47.0-alpha.459",
"commands": [
"ixc"
],
Expand All @@ -17,14 +17,14 @@
"rollForward": false
},
"AXSharp.ixd": {
"version": "0.47.0-alpha.452",
"version": "0.47.0-alpha.459",
"commands": [
"ixd"
],
"rollForward": false
},
"AXSharp.ixr": {
"version": "0.47.0-alpha.452",
"version": "0.47.0-alpha.459",
"commands": [
"ixr"
],
Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<!-- Framework-Agnostic Packages -->
<ItemGroup>
<!-- AX# Libraries -->
<PackageVersion Include="AXSharp.Abstractions" Version="0.47.0-alpha.452" />
<PackageVersion Include="AXSharp.Connector" Version="0.47.0-alpha.452" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.47.0-alpha.452" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.47.0-alpha.452" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.47.0-alpha.452" />
<PackageVersion Include="Inxton.Operon" Version="0.3.0-alpha.114" />
<PackageVersion Include="AXSharp.Abstractions" Version="0.47.0-alpha.459" />
<PackageVersion Include="AXSharp.Connector" Version="0.47.0-alpha.459" />
<PackageVersion Include="AXSharp.Connector.S71500.WebAPI" Version="0.47.0-alpha.459" />
<PackageVersion Include="AXSharp.Presentation.Blazor" Version="0.47.0-alpha.459" />
<PackageVersion Include="AXSharp.Presentation.Blazor.Controls" Version="0.47.0-alpha.459" />
<PackageVersion Include="Inxton.Operon" Version="0.3.0-alpha.138" />
<!-- Data & Serialization -->
<PackageVersion Include="ClosedXML" Version="0.105.0" />
<PackageVersion Include="Microsoft.Build" Version="18.0.2" />
Expand Down
6 changes: 3 additions & 3 deletions src/Security/src/AXOpen.Security.Blazor/Pages/LoginDisplay.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using AXOpen.Security.Services
@using AXOpen.Security.Services
@using Microsoft.AspNetCore.Mvc
@using AxOpen.Security.Entities
@using Operon.Components.Dropdown
Expand All @@ -12,7 +12,7 @@
<Authorized>
<Dropdown @ref="_dropdownLogin">
<DropdownButton>
<button type="button" class="btn btn-primary" @onclick="_dropdownLogin.Toggle">
<button type="button" class="btn btn-primary" @onclick="_dropdownLogin.ToggleAsync">
@context.User.Identity?.Name
<Operon.Icons.HeroIcon Icon="chevron-down" Type="Operon.Icons.IconType.Outline" Class="@("size-5 ms-2 icon-button-rotate " + (_dropdownLogin?.Open ?? false ? "rotated" : null))" />
</button>
Expand Down Expand Up @@ -93,4 +93,4 @@
Console.WriteLine(ex);
}
}
}
}
6 changes: 3 additions & 3 deletions src/base/src/AXOpen.VisualComposer/Components/VisualComposerContainer.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using AXOpen.VisualComposer.Components.VisualComposerItem
@using AXOpen.VisualComposer.Components.VisualComposerItem
@using AXSharp.Connector;
@using Microsoft.AspNetCore.Components.Forms;
@* @using KristofferStrube.Blazor.SVGEditor *@
Expand Down Expand Up @@ -29,7 +29,7 @@
{
<Dropdown @ref="_dropdownOption">
<DropdownButton>
<button class="btn btn-primary" @onclick="_dropdownOption.Toggle">
<button class="btn btn-primary" @onclick="_dropdownOption.ToggleAsync">
Options
<Operon.Icons.HeroIcon Icon="chevron-down" Type="Operon.Icons.IconType.Outline" Class="@("size-5 ms-2 icon-button-rotate " + (_dropdownOption?.Open ?? false ? "rotated" : null))" />
</button>
Expand Down Expand Up @@ -682,4 +682,4 @@
private Modal _modalViews { get; set; }
private Modal _modalBackground { get; set; }
// private Modal _modalBackgroundSVGInput { get; set; }
}
}
35 changes: 35 additions & 0 deletions src/data/data.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.MongoDb", "src\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.RavenDb", "src\repositories\RavenDb\AXOpen.Data.RavenDb\AXOpen.Data.RavenDb.csproj", "{5970C06A-811E-4B4C-913D-09E7202378CF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_data_distributed_tests_l4", "tests\AXOpen.Data.Distributed.Tests_L4\ix\axopen_data_distributed_tests_l4.csproj", "{1298AE2A-55FF-418B-9CC1-B7EC948CFB38}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen.data.distributed.tests_l4", "tests\AXOpen.Data.Distributed.Tests_L4\Tests_L4\axopen.data.distributed.tests_l4.csproj", "{81FF2327-0656-43D5-879B-47C3A41FDA51}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Exporters.ExcelTests_L1", "tests\AXOpen.Data.Exporters.ExcelTests\AXOpen.Data.Exporters.ExcelTests_L1.csproj", "{15A8F853-6A9F-4CA0-8391-266867602515}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_data_tests_l1", "tests\AXOpen.Data.Tests_L1\ix\axopen_data_tests_l1.csproj", "{A49DA4DF-48B2-4157-BBE3-A9A6E3578E3F}"
Expand All @@ -53,6 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Secur
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{74C7FC26-1CFB-45AF-BF08-296531C7AFAD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{E5E50484-2FCA-4823-856C-941C5857E49D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{402D412C-B185-4C19-AB2C-77680E46A610}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.ToolBox", "..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj", "{AE9AB03A-3B9B-4F5B-94DF-D930A0EC6B80}"
Expand Down Expand Up @@ -111,6 +117,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "src\reposit
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3AB4CE42-4AED-4291-B285-4FBBEB69232A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "tests\AXOpen.Data.Distributed.Tests_L4\ix", "{2F9C18E5-83C3-48ED-827D-B76E4CF635E8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests_L4", "tests\AXOpen.Data.Distributed.Tests_L4\Tests_L4", "{731570AF-54EF-4BF2-AD79-73ABF682D6AB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data.Distributed.Tests_L4", "tests\AXOpen.Data.Distributed.Tests_L4", "{E38C1903-8B14-4CD8-AC4D-F4E49A22F957}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data.Exporters.ExcelTests", "tests\AXOpen.Data.Exporters.ExcelTests", "{1C9166A1-2FE9-4B4A-B4FC-94E04A34B0E1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "tests\AXOpen.Data.Tests_L1\ix", "{388DD649-0804-4957-BE24-DD613B044EBE}"
Expand Down Expand Up @@ -153,6 +165,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{D704688B-BF53-498F-8099-F60D0E697350}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{8B090DBD-24C7-44C0-892C-F928E6ADF2E5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{4A5F340A-AD3E-409B-AE8B-C095F28FBC6D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{97D2CDFF-2E87-4DCF-842E-46ACEC059BDE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\timers\src", "{F05DAD1C-ECBC-443C-99DD-D00E826F74E0}"
Expand Down Expand Up @@ -235,6 +251,14 @@ Global
{5970C06A-811E-4B4C-913D-09E7202378CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5970C06A-811E-4B4C-913D-09E7202378CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5970C06A-811E-4B4C-913D-09E7202378CF}.Release|Any CPU.Build.0 = Release|Any CPU
{1298AE2A-55FF-418B-9CC1-B7EC948CFB38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1298AE2A-55FF-418B-9CC1-B7EC948CFB38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1298AE2A-55FF-418B-9CC1-B7EC948CFB38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1298AE2A-55FF-418B-9CC1-B7EC948CFB38}.Release|Any CPU.Build.0 = Release|Any CPU
{81FF2327-0656-43D5-879B-47C3A41FDA51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{81FF2327-0656-43D5-879B-47C3A41FDA51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81FF2327-0656-43D5-879B-47C3A41FDA51}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81FF2327-0656-43D5-879B-47C3A41FDA51}.Release|Any CPU.Build.0 = Release|Any CPU
{15A8F853-6A9F-4CA0-8391-266867602515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{15A8F853-6A9F-4CA0-8391-266867602515}.Debug|Any CPU.Build.0 = Debug|Any CPU
{15A8F853-6A9F-4CA0-8391-266867602515}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -279,6 +303,10 @@ Global
{74C7FC26-1CFB-45AF-BF08-296531C7AFAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74C7FC26-1CFB-45AF-BF08-296531C7AFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74C7FC26-1CFB-45AF-BF08-296531C7AFAD}.Release|Any CPU.Build.0 = Release|Any CPU
{E5E50484-2FCA-4823-856C-941C5857E49D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5E50484-2FCA-4823-856C-941C5857E49D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5E50484-2FCA-4823-856C-941C5857E49D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5E50484-2FCA-4823-856C-941C5857E49D}.Release|Any CPU.Build.0 = Release|Any CPU
{402D412C-B185-4C19-AB2C-77680E46A610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{402D412C-B185-4C19-AB2C-77680E46A610}.Debug|Any CPU.Build.0 = Debug|Any CPU
{402D412C-B185-4C19-AB2C-77680E46A610}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -331,6 +359,11 @@ Global
{A6A3266B-515E-488B-BA61-CCFA071915CB} = {6491B3CC-75F5-4C26-B660-9511E4D659F8}
{6491B3CC-75F5-4C26-B660-9511E4D659F8} = {3AB4CE42-4AED-4291-B285-4FBBEB69232A}
{3AB4CE42-4AED-4291-B285-4FBBEB69232A} = {0626003B-07C9-4CBC-9B7F-8141816DE858}
{1298AE2A-55FF-418B-9CC1-B7EC948CFB38} = {2F9C18E5-83C3-48ED-827D-B76E4CF635E8}
{2F9C18E5-83C3-48ED-827D-B76E4CF635E8} = {E38C1903-8B14-4CD8-AC4D-F4E49A22F957}
{81FF2327-0656-43D5-879B-47C3A41FDA51} = {731570AF-54EF-4BF2-AD79-73ABF682D6AB}
{731570AF-54EF-4BF2-AD79-73ABF682D6AB} = {E38C1903-8B14-4CD8-AC4D-F4E49A22F957}
{E38C1903-8B14-4CD8-AC4D-F4E49A22F957} = {2626F720-4E6A-4F45-8C91-613314AF6B14}
{15A8F853-6A9F-4CA0-8391-266867602515} = {1C9166A1-2FE9-4B4A-B4FC-94E04A34B0E1}
{1C9166A1-2FE9-4B4A-B4FC-94E04A34B0E1} = {2626F720-4E6A-4F45-8C91-613314AF6B14}
{A49DA4DF-48B2-4157-BBE3-A9A6E3578E3F} = {388DD649-0804-4957-BE24-DD613B044EBE}
Expand Down Expand Up @@ -359,6 +392,8 @@ Global
{74C7FC26-1CFB-45AF-BF08-296531C7AFAD} = {0ACADA3A-C5C5-498B-A38D-93DF40384A3D}
{0ACADA3A-C5C5-498B-A38D-93DF40384A3D} = {EE717758-91F9-48E6-B057-8F8F08BC313F}
{EE717758-91F9-48E6-B057-8F8F08BC313F} = {D704688B-BF53-498F-8099-F60D0E697350}
{E5E50484-2FCA-4823-856C-941C5857E49D} = {8B090DBD-24C7-44C0-892C-F928E6ADF2E5}
{8B090DBD-24C7-44C0-892C-F928E6ADF2E5} = {4A5F340A-AD3E-409B-AE8B-C095F28FBC6D}
{402D412C-B185-4C19-AB2C-77680E46A610} = {97D2CDFF-2E87-4DCF-842E-46ACEC059BDE}
{97D2CDFF-2E87-4DCF-842E-46ACEC059BDE} = {F05DAD1C-ECBC-443C-99DD-D00E826F74E0}
{F05DAD1C-ECBC-443C-99DD-D00E826F74E0} = {D71F6050-A98B-4B20-890A-5E153DDE5A3E}
Expand Down
Loading
Loading