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

DataExchangeView_use_the_same_shadow_for_multiple_clients #584

Merged
merged 14 commits into from
Feb 7, 2025
Merged

DataExchangeView_use_the_same_shadow_for_multiple_clients #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f96d978
Create draft PR for #583
Feb 5, 2025
98c992d
wip
Feb 5, 2025
8984db8
wip
PTKu Feb 5, 2025
749e3bb
wip
Feb 5, 2025
c636c5f
wip
PTKu Feb 5, 2025
a282e0d
wip
PTKu Feb 6, 2025
6fba3e5
data views are now using individual instance of the view object to av…
PTKu Feb 6, 2025
a6d3ec6
mend
PTKu Feb 6, 2025
4dd9e44
Refactor temp path usage and add new test method
PTKu Feb 6, 2025
56e2692
Skip complex tests in non-debug environments
PTKu Feb 6, 2025
133172a
Conditionally compile tests to avoid CI failures
PTKu Feb 6, 2025
c4e2986
disable update button when other user edit
Feb 7, 2025
0138956
some bool
Feb 7, 2025
33d261c
viewRefreshMutex on Displayed record
Feb 7, 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
43 changes: 43 additions & 0 deletions src/AXOpen-L1-tests.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "core\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_tests_L1", "core\tests\AXOpen.Core.Tests\axopen_core_tests_L1.csproj", "{BAF8BDFE-68FB-45BC-B41A-3BBF2F06AF43}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_data", "data\src\AXOpen.Data\inxton_axopen_data.csproj", "{8325ED8B-1E6A-4619-9C74-147048A12205}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Exporters.Excel", "data\src\exporters\AXOpen.Data.Exporters.Excel\AXOpen.Data.Exporters.Excel.csproj", "{025F3EF4-CFC5-448E-803C-AA9A28B4A61B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.InMemory", "data\src\repositories\InMemory\AXOpen.Data.InMemory.csproj", "{D44609C8-7392-4150-B0A5-98DFA912A687}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "data\src\repositories\Json\AXOpen.Data.Json.csproj", "{B9A57467-1A22-425E-A547-1CA4DB9C4790}"
Expand All @@ -27,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.MongoDb", "data
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.RavenDb", "data\src\repositories\RavenDb\AXOpen.Data.RavenDb\AXOpen.Data.RavenDb.csproj", "{5C954310-8F62-485F-85DC-CE2B68D18F4A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Exporters.ExcelTests_L1", "data\tests\AXOpen.Data.Exporters.ExcelTests\AXOpen.Data.Exporters.ExcelTests_L1.csproj", "{7872B448-74FE-4936-9F86-A73426ADEE77}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_data_tests_L1", "data\tests\AXOpen.Data.Tests\axopen_data_tests_L1.csproj", "{1938E718-2363-4586-B481-13DEBABC7864}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_repository_integration_tests_L1", "data\tests\AXOpen.Repository.Integration.Tests_L1\axopen_repository_integration_tests_L1.csproj", "{CE6EDD11-2686-4D26-82D6-611022775C95}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_inspectors", "inspectors\src\AXOpen.Inspectors\inxton_axopen_inspectors.csproj", "{F4E62A68-4350-47AD-B00E-0F59B11EDF10}"
Expand Down Expand Up @@ -93,6 +101,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "core\tests", "{540
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{A6BAC111-2787-41CE-B5BE-5BC17E68E471}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data", "data\src\AXOpen.Data", "{F5BC5646-83A3-402C-BA39-CA23DD567F8C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data.Exporters.Excel", "data\src\exporters\AXOpen.Data.Exporters.Excel", "{B06EE8F3-730C-4313-9781-F4CB40D21A7D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "exporters", "data\src\exporters", "{18D03688-4AD9-4EB6-A25B-8CAD075B07AD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InMemory", "data\src\repositories\InMemory", "{8FF9B1C9-EC96-4F35-9DB0-1FE9922FB228}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "data\src\repositories\Json", "{72894A84-F6EE-478E-B14F-E8F6502E73D8}"
Expand All @@ -107,6 +121,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "data\src\re
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "data\src", "{B03BB3B6-96CD-4869-BC25-DDE50E5B1598}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data.Exporters.ExcelTests", "data\tests\AXOpen.Data.Exporters.ExcelTests", "{89ABC6FD-4D02-44B9-87A9-2BAB0DC4922C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Data.Tests", "data\tests\AXOpen.Data.Tests", "{49E1C4FD-9C88-4D96-BE14-335377EB4DDA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Repository.Integration.Tests_L1", "data\tests\AXOpen.Repository.Integration.Tests_L1", "{BA1A4EFF-A93A-43CF-A7CA-8BC0CB78ACD2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "data\tests", "{ABC8EBD0-ABE0-47B9-99EC-7A43506E5AB8}"
Expand Down Expand Up @@ -203,6 +221,14 @@ Global
{BAF8BDFE-68FB-45BC-B41A-3BBF2F06AF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BAF8BDFE-68FB-45BC-B41A-3BBF2F06AF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BAF8BDFE-68FB-45BC-B41A-3BBF2F06AF43}.Release|Any CPU.Build.0 = Release|Any CPU
{8325ED8B-1E6A-4619-9C74-147048A12205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8325ED8B-1E6A-4619-9C74-147048A12205}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8325ED8B-1E6A-4619-9C74-147048A12205}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8325ED8B-1E6A-4619-9C74-147048A12205}.Release|Any CPU.Build.0 = Release|Any CPU
{025F3EF4-CFC5-448E-803C-AA9A28B4A61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{025F3EF4-CFC5-448E-803C-AA9A28B4A61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{025F3EF4-CFC5-448E-803C-AA9A28B4A61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{025F3EF4-CFC5-448E-803C-AA9A28B4A61B}.Release|Any CPU.Build.0 = Release|Any CPU
{D44609C8-7392-4150-B0A5-98DFA912A687}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D44609C8-7392-4150-B0A5-98DFA912A687}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D44609C8-7392-4150-B0A5-98DFA912A687}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -219,6 +245,14 @@ Global
{5C954310-8F62-485F-85DC-CE2B68D18F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C954310-8F62-485F-85DC-CE2B68D18F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C954310-8F62-485F-85DC-CE2B68D18F4A}.Release|Any CPU.Build.0 = Release|Any CPU
{7872B448-74FE-4936-9F86-A73426ADEE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7872B448-74FE-4936-9F86-A73426ADEE77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7872B448-74FE-4936-9F86-A73426ADEE77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7872B448-74FE-4936-9F86-A73426ADEE77}.Release|Any CPU.Build.0 = Release|Any CPU
{1938E718-2363-4586-B481-13DEBABC7864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1938E718-2363-4586-B481-13DEBABC7864}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1938E718-2363-4586-B481-13DEBABC7864}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1938E718-2363-4586-B481-13DEBABC7864}.Release|Any CPU.Build.0 = Release|Any CPU
{CE6EDD11-2686-4D26-82D6-611022775C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE6EDD11-2686-4D26-82D6-611022775C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE6EDD11-2686-4D26-82D6-611022775C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -287,6 +321,11 @@ Global
{BAF8BDFE-68FB-45BC-B41A-3BBF2F06AF43} = {D59E1386-5C35-47DC-B83A-0D9714EB6324}
{D59E1386-5C35-47DC-B83A-0D9714EB6324} = {540F532D-3212-4D67-99B1-BBC182EEDB28}
{540F532D-3212-4D67-99B1-BBC182EEDB28} = {A6BAC111-2787-41CE-B5BE-5BC17E68E471}
{8325ED8B-1E6A-4619-9C74-147048A12205} = {F5BC5646-83A3-402C-BA39-CA23DD567F8C}
{F5BC5646-83A3-402C-BA39-CA23DD567F8C} = {B03BB3B6-96CD-4869-BC25-DDE50E5B1598}
{025F3EF4-CFC5-448E-803C-AA9A28B4A61B} = {B06EE8F3-730C-4313-9781-F4CB40D21A7D}
{B06EE8F3-730C-4313-9781-F4CB40D21A7D} = {18D03688-4AD9-4EB6-A25B-8CAD075B07AD}
{18D03688-4AD9-4EB6-A25B-8CAD075B07AD} = {B03BB3B6-96CD-4869-BC25-DDE50E5B1598}
{D44609C8-7392-4150-B0A5-98DFA912A687} = {8FF9B1C9-EC96-4F35-9DB0-1FE9922FB228}
{8FF9B1C9-EC96-4F35-9DB0-1FE9922FB228} = {E4995E2F-E9C8-4E08-ADA3-B51C0655D5CE}
{B9A57467-1A22-425E-A547-1CA4DB9C4790} = {72894A84-F6EE-478E-B14F-E8F6502E73D8}
Expand All @@ -298,6 +337,10 @@ Global
{E13DA9FC-3B33-4EAE-9BE8-A8F4FFD93579} = {E4995E2F-E9C8-4E08-ADA3-B51C0655D5CE}
{E4995E2F-E9C8-4E08-ADA3-B51C0655D5CE} = {B03BB3B6-96CD-4869-BC25-DDE50E5B1598}
{B03BB3B6-96CD-4869-BC25-DDE50E5B1598} = {38A6D9E5-0551-41C7-B67C-3E7BAB3C109F}
{7872B448-74FE-4936-9F86-A73426ADEE77} = {89ABC6FD-4D02-44B9-87A9-2BAB0DC4922C}
{89ABC6FD-4D02-44B9-87A9-2BAB0DC4922C} = {ABC8EBD0-ABE0-47B9-99EC-7A43506E5AB8}
{1938E718-2363-4586-B481-13DEBABC7864} = {49E1C4FD-9C88-4D96-BE14-335377EB4DDA}
{49E1C4FD-9C88-4D96-BE14-335377EB4DDA} = {ABC8EBD0-ABE0-47B9-99EC-7A43506E5AB8}
{CE6EDD11-2686-4D26-82D6-611022775C95} = {BA1A4EFF-A93A-43CF-A7CA-8BC0CB78ACD2}
{BA1A4EFF-A93A-43CF-A7CA-8BC0CB78ACD2} = {ABC8EBD0-ABE0-47B9-99EC-7A43506E5AB8}
{ABC8EBD0-ABE0-47B9-99EC-7A43506E5AB8} = {38A6D9E5-0551-41C7-B67C-3E7BAB3C109F}
Expand Down
24 changes: 12 additions & 12 deletions src/AXOpen.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.MongoDb", "data
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.RavenDb", "data\src\repositories\RavenDb\AXOpen.Data.RavenDb\AXOpen.Data.RavenDb.csproj", "{563799B9-CEC3-43C1-8F59-3236BFE1E72B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Exporters.ExcelTests", "data\tests\AXOpen.Data.Exporters.ExcelTests\AXOpen.Data.Exporters.ExcelTests.csproj", "{95254E4F-E1ED-499C-9B61-BCE307F351BE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Exporters.ExcelTests_L1", "data\tests\AXOpen.Data.Exporters.ExcelTests\AXOpen.Data.Exporters.ExcelTests_L1.csproj", "{053BB6DA-08CF-4201-BAEB-C96B296AC487}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_data_tests", "data\tests\AXOpen.Data.Tests\axopen_data_tests.csproj", "{CF00F877-1F2F-4605-ACAC-B3D6444A11B9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_data_tests_L1", "data\tests\AXOpen.Data.Tests\axopen_data_tests_L1.csproj", "{F7FFD373-925F-459E-81F3-F8F26743D304}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_repository_integration_tests_L1", "data\tests\AXOpen.Repository.Integration.Tests_L1\axopen_repository_integration_tests_L1.csproj", "{DAEE3A6C-29C3-4DF8-8DE8-C125E4FD6592}"
EndProject
Expand Down Expand Up @@ -1247,14 +1247,14 @@ Global
{563799B9-CEC3-43C1-8F59-3236BFE1E72B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{563799B9-CEC3-43C1-8F59-3236BFE1E72B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{563799B9-CEC3-43C1-8F59-3236BFE1E72B}.Release|Any CPU.Build.0 = Release|Any CPU
{95254E4F-E1ED-499C-9B61-BCE307F351BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95254E4F-E1ED-499C-9B61-BCE307F351BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95254E4F-E1ED-499C-9B61-BCE307F351BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95254E4F-E1ED-499C-9B61-BCE307F351BE}.Release|Any CPU.Build.0 = Release|Any CPU
{CF00F877-1F2F-4605-ACAC-B3D6444A11B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF00F877-1F2F-4605-ACAC-B3D6444A11B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF00F877-1F2F-4605-ACAC-B3D6444A11B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF00F877-1F2F-4605-ACAC-B3D6444A11B9}.Release|Any CPU.Build.0 = Release|Any CPU
{053BB6DA-08CF-4201-BAEB-C96B296AC487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{053BB6DA-08CF-4201-BAEB-C96B296AC487}.Debug|Any CPU.Build.0 = Debug|Any CPU
{053BB6DA-08CF-4201-BAEB-C96B296AC487}.Release|Any CPU.ActiveCfg = Release|Any CPU
{053BB6DA-08CF-4201-BAEB-C96B296AC487}.Release|Any CPU.Build.0 = Release|Any CPU
{F7FFD373-925F-459E-81F3-F8F26743D304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7FFD373-925F-459E-81F3-F8F26743D304}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7FFD373-925F-459E-81F3-F8F26743D304}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7FFD373-925F-459E-81F3-F8F26743D304}.Release|Any CPU.Build.0 = Release|Any CPU
{DAEE3A6C-29C3-4DF8-8DE8-C125E4FD6592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DAEE3A6C-29C3-4DF8-8DE8-C125E4FD6592}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DAEE3A6C-29C3-4DF8-8DE8-C125E4FD6592}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -1691,9 +1691,9 @@ Global
{3BEEEFDB-2214-4FD8-8B52-6A31B3A6B003} = {96D76075-1BD0-41C7-A6F4-4F6537504CA2}
{96D76075-1BD0-41C7-A6F4-4F6537504CA2} = {9981845F-42F8-4F6C-A57A-76BE4545D596}
{9981845F-42F8-4F6C-A57A-76BE4545D596} = {77F14555-3A3C-4008-9A89-C93451A67519}
{95254E4F-E1ED-499C-9B61-BCE307F351BE} = {7DA95460-56B4-47BB-A34A-61F96D7E7AB7}
{053BB6DA-08CF-4201-BAEB-C96B296AC487} = {7DA95460-56B4-47BB-A34A-61F96D7E7AB7}
{7DA95460-56B4-47BB-A34A-61F96D7E7AB7} = {A240EAD2-C015-4528-B19D-5C762036D493}
{CF00F877-1F2F-4605-ACAC-B3D6444A11B9} = {64C5B60B-3ADF-4454-8BC2-5F7606897BEB}
{F7FFD373-925F-459E-81F3-F8F26743D304} = {64C5B60B-3ADF-4454-8BC2-5F7606897BEB}
{64C5B60B-3ADF-4454-8BC2-5F7606897BEB} = {A240EAD2-C015-4528-B19D-5C762036D493}
{DAEE3A6C-29C3-4DF8-8DE8-C125E4FD6592} = {665FB47E-A9AB-44D8-83AF-AEC915B5047E}
{665FB47E-A9AB-44D8-83AF-AEC915B5047E} = {A240EAD2-C015-4528-B19D-5C762036D493}
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
<PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="nunit" Version="4.3.2" />
<PackageVersion Include="JunitXml.TestLogger" Version="4.1.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="SSH.NET" Version="2024.2.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
Expand Down
4 changes: 2 additions & 2 deletions src/data/app/apax.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ variables:
- "--debug" # Generate debug information for target "1500"
PLC_NAME: "plc_line"
DEFAULT_NAMESPACE: "AXOpen.Data"
AXTARGET: 10.10.10.120
AXTARGET: 10.222.6.2
AXTARGETPLATFORMINPUT: .\bin\1500\
AX_USERNAME: "adm"
AX_TARGET_PWD: "123ABCDabcd$#!"
USE_PLC_SIM_ADVANCED: "true"
USE_PLC_SIM_ADVANCED: "false"
devDependencies:
"@inxton/ax-sdk": '0.0.0-dev.0'
dependencies:
Expand Down
20 changes: 17 additions & 3 deletions src/data/app/ix-blazor/JSONREPOS/Groups/AdminGroup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,23 @@
"DataEntityId": "AdminGroup",
"Name": "AdminGroup",
"Roles": [
"Administrator"
"Administrator",
"process_settings_access",
"process_traceability_access",
"can_run_ground_mode",
"can_run_automat_mode",
"can_run_service_mode",
"can_skip_steps_in_sequence",
"can_data_item_create",
"can_data_item_edit",
"can_data_item_copy",
"can_data_item_delete",
"can_data_send_to_plc",
"can_data_load_from_plc",
"can_data_export",
"can_data_import"
],
"RolesHash": "AQAAAAIAAYagAAAAEOnVgoEc0N/grlrKHOmSswEnXUk0/PHHYrCCns0sBFfQdP27cLrZ3LZPIFyLd6X/oA==",
"RolesHash": "AQAAAAIAAYagAAAAEH46VaHanDxoFVjjUWHPBE07jE9N7AJA2se4ivPeRv4J0XSKkfAoPis3F4r9pRfcVw==",
"Created": "2023-08-09T12:33:03.2736142+02:00",
"Modified": "2023-08-09T12:33:03.4914502+02:00"
"Modified": "2025-02-05T16:34:06.8872271+01:00"
}
9 changes: 9 additions & 0 deletions src/data/app/ix-blazor/librarytemplate.blazor/Pages/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@
Welcome to your new app.

<SurveyPrompt Title="How is Blazor working for you?" />

<div class="card">
<div class="card-header">
<h2>DataExchange PresentationType="Command"</h2>
</div>
<div class="card-body">
<RenderableContentControl Context="@Entry.Plc.AxoDataExchangeContext.DataManager" Presentation="Command" />
</div>
</div>
14 changes: 7 additions & 7 deletions src/data/app/ix-blazor/librarytemplate.blazor/Pages/Rendering.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@using librarytemplate
@inject AuthenticationStateProvider _authenticationProvider
@inject IAlertService _alertDialogService

<div class="card">
<div class="card-header">
<h2>DataExchange PresentationType="Command"</h2>
Expand Down Expand Up @@ -42,9 +43,9 @@
<div class="card-body">
//<CustomColumns>
<DataExchangeView Vm="@_vm_columndata" Presentation="Command">
<ColumnData HeaderName="Some data" BindingValue="SomeData" Clickable="false" />
<ColumnData HeaderName="A number" BindingValue="SomeNumber" Clickable="false" />
<ColumnData HeaderName="Yes/No" BindingValue="SomeBool" Clickable="false" />
<ColumnData HeaderName="Some data" BindingValue="SomeString" Clickable="false" />
<ColumnData HeaderName="A number" BindingValue="SomeInt" Clickable="false" />
<ColumnData HeaderName="Yes/No" BindingValue="SomeBool" Clickable="false" />
</DataExchangeView>
//</CustomColumns>
</div>
Expand Down Expand Up @@ -78,17 +79,16 @@
</div>
<div class="card-body">
//<Sorting>
<DataExchangeView Vm="@_vm_columndata" Presentation="Command" EnableSorting="true" SortElements='new() {"SomeData"}'>
<ColumnData HeaderName="Some data" BindingValue="SomeData" Clickable="false" />
<ColumnData HeaderName="A number" BindingValue="SomeNumber" Clickable="false" />
<DataExchangeView Vm="@_vm_columndata" Presentation="Command" EnableSorting="true" SortElements='new() {"SomeData"}'>
<ColumnData HeaderName="Some data" BindingValue="SomeString" Clickable="false" />
<ColumnData HeaderName="A number" BindingValue="SomeInt" Clickable="false" />
<ColumnData HeaderName="Yes/No" BindingValue="SomeBool" Clickable="false" />
</DataExchangeView>
//</Sorting>
</div>
</div>



//<CustomColumnsCode>
@code {
private DataExchangeViewModel _vm_columndata;
Expand Down
2 changes: 1 addition & 1 deletion src/data/app/ix/Entry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ConnectionConfig

public class TwinConnectorSelector
{
public static string TargetIp { get; } = "10.10.10.120";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
public static string TargetIp { get; } = "10.222.6.2";//Environment.GetEnvironmentVariable("AXTARGET"); // <- replace by your IP
private static string Pass => @"123ABCDabcd$#!"; //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); //Environment.GetEnvironmentVariable("AX_TARGET_PWD"); // <- Pass in the password that you have set up for the user. NOT AS PLAIN TEXT! Use user secrets instead.
private static string UserName = "adm"; //Environment.GetEnvironmentVariable("AX_USERNAME"); //<- replace by user name you have set up in your WebAPI settings
private const bool IgnoreSslErrors = true; // <- When you have your certificates in order set this to false.
Expand Down
8 changes: 6 additions & 2 deletions src/data/app/src/Examples/AxoDataFragmentExchangeExample.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ NAMESPACE AxoDataFramentsExchangeExample
SomeString : STRING;
{#ix-set:AttributeName = "Some int"}
SomeInt : INT;
{#ix-set:AttributeName = "Some bool"}
SomeBool : BOOL;
END_VAR
END_CLASS

Expand All @@ -80,10 +82,12 @@ NAMESPACE AxoDataFramentsExchangeExample
{S7.extern=ReadWrite}
CLASS PUBLIC Station_1_Data EXTENDS AXOpen.Data.AxoDataEntity
VAR PUBLIC
{#ix-set:AttributeName = "Some string"}
{#ix-set:AttributeName = "Some string st"}
SomeString : STRING;
{#ix-set:AttributeName = "Some int"}
{#ix-set:AttributeName = "Some int st"}
SomeInt : INT;
{#ix-set:AttributeName = "Some bool st"}
SomeBool : BOOL;
END_VAR
END_CLASS

Expand Down
Loading
Loading