-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #467 from ix-ax/466-_NEW-FEATURE_log_button_action…
…_in_DataExchange_Edit_window * Create draft PR for #466 * dataexchange user action loging * Double akc on button send data to PLC * data exchange roles Added authentification over buttons: create, load, send, copy, delete in DataExchangeView * reload data record after canceled edit in modal window * fix refactored method in dataexchange * update upax file for app, entry, certs * certs * cert * some change * fixed an issue with dependency --------- Co-authored-by: blazej.kuhajda <blazej.kuhajda@mts.sk> Co-authored-by: Peter Kurhajec <61538034+PTKu@users.noreply.github.com>
- Loading branch information
Showing
24 changed files
with
472 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
CONFIGURATION HardwareIDs | ||
VAR_GLOBAL CONSTANT | ||
plc_line_HwID : UINT := UINT#32; | ||
plc_line_Rail_0_HwID : UINT := UINT#257; | ||
plc_line_plc_line_HwID : UINT := UINT#48; | ||
plc_line_plc_line_CPU_display_1_HwID : UINT := UINT#54; | ||
plc_line_plc_line_Card_reader_writer_1_HwID : UINT := UINT#51; | ||
plc_line_plc_line_DP_interface_1_HwID : UINT := UINT#60; | ||
plc_line_plc_line_OPC_UA_1_HwID : UINT := UINT#117; | ||
plc_line_plc_line_profinet_x1_HwID : UINT := UINT#64; | ||
plc_line_plc_line_profinet_x1_Port_1_HwID : UINT := UINT#65; | ||
plc_line_plc_line_profinet_x1_Port_2_HwID : UINT := UINT#66; | ||
plc_line_plc_line_profinet_x2_HwID : UINT := UINT#72; | ||
plc_line_plc_line_profinet_x2_Port_3_HwID : UINT := UINT#73; | ||
plc_line_plc_line_virtual_communication_interface_HwID : UINT := UINT#135; | ||
profinet_plc_line_HwID : UINT := UINT#256; | ||
|
||
END_VAR | ||
END_CONFIGURATION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
CONFIGURATION IoAddresses | ||
VAR_GLOBAL | ||
|
||
END_VAR | ||
END_CONFIGURATION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
-----BEGIN CERTIFICATE----- | ||
MIIDqTCCApGgAwIBAgIUWIyy2tceYfRUs4uPo6KZXlgGQY8wDQYJKoZIhvcNAQELBQAwgYYxCzAJ | ||
BgNVBAYTAlhYMRIwEAYDVQQIDAlTdGF0ZU5hbWUxETAPBgNVBAcMCENpdHlOYW1lMRQwEgYDVQQK | ||
DAtDb21wYW55TmFtZTEbMBkGA1UECwwSQ29tcGFueVNlY3Rpb25OYW1lMR0wGwYDVQQDDBRDb21t | ||
b25OYW1lT3JIb3N0bmFtZTAeFw0yNDEyMTAxMDI3MTFaFw0yNTEyMTAxMDI3MTFaMIGGMQswCQYD | ||
VQQGEwJYWDESMBAGA1UECAwJU3RhdGVOYW1lMREwDwYDVQQHDAhDaXR5TmFtZTEUMBIGA1UECgwL | ||
Q29tcGFueU5hbWUxGzAZBgNVBAsMEkNvbXBhbnlTZWN0aW9uTmFtZTEdMBsGA1UEAwwUQ29tbW9u | ||
TmFtZU9ySG9zdG5hbWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmr6liRyZbj0WO | ||
0rxgaGmbR+RB/petCLZXE7zWjVbctSnVHSZOHpRR0MGcdl1Py9LmD4OCBLr227dZBn94E4xZLxFc | ||
LiuIxfxoTLgRdt3mmdaZTdQ1cyhB/vMoYbPlwt1UXXKhZWpJl0k7kyrBE1eilGoBj5QzE/740cVJ | ||
MWZ2TwGOSpzdTDGzCTKwUHiEUdgldslHzf+On5kwPVuYPxyvLF2AtJ3sJOg3Me3W6l39nDXkT2SQ | ||
CcnGiELF0k06UNOS2q+r8mg8uOltNVBkdjnEoTWzMCRx+XHNfiliJPqK3hO6QHuZEP2UZA+6HRrk | ||
jkhopEaaLOE528aVCXqgg+itAgMBAAGjDTALMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQELBQADggEB | ||
AHzLOYXsUK0aTHtY2VZEg03MgvHrxI3lfCWQNo0/lhkedhxBkHF8/I9IHlZxaSTCElfKVnEsb9JW | ||
JI6zK8UNLei2Sy6qwpHnePQZPkl9usaRn/AmgybEDUZk8vZ/RhAPgTvi8zGZTLU+oIvZ9gL46PUa | ||
/b+YYgGtu2ax+OSz7ZUVqyGeL9mF7mNjGRP+i01qF6DeemhO1YCXw4zdK12z5t3qc/wKJkAdGTun | ||
BF06KgzJIY6Q2jrrC6mtIQou7UdmPSkpWegLLYfk3gPMVbw5Na8puIM1EDE28fFNJb9VABs3prtp | ||
gRfWVdYDCg9/agYD1kR4ZbJZeu6/+I5GUod5DUE= | ||
-----END CERTIFICATE----- |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Devices: | ||
- Name: plc_line | ||
Modules: | ||
- Apply: | ||
TemplateName: 6ES7516-3AP03-0AB0_v3_1 | ||
Arguments: | ||
PLCName: plc_line | ||
IpAddress_X1: 10.10.10.120/24 | ||
ProfinetDeviceName_X1: plc_line_x1 | ||
IoSystems: | ||
- Name: profinet_plc_line | ||
ControllerInterfaces: | ||
- Ref: plc_line/plc_line/profinet_x1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,19 @@ | ||
@using librarytemplate.blazor.hmi.Shared; | ||
<Router AppAssembly="@typeof(App).Assembly"> | ||
<Found Context="routeData"> | ||
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" /> | ||
<FocusOnNavigate RouteData="@routeData" Selector="h1" /> | ||
</Found> | ||
<NotFound> | ||
<PageTitle>Not found</PageTitle> | ||
<LayoutView Layout="@typeof(MainLayout)"> | ||
<p role="alert">Sorry, there's nothing at this address.</p> | ||
</LayoutView> | ||
</NotFound> | ||
</Router> | ||
@using AxOpen.Security.Service | ||
@using librarytemplate.blazor.hmi.Shared; | ||
|
||
|
||
<CascadingAuthenticationState> | ||
<Router AppAssembly="@typeof(App).Assembly" | ||
AdditionalAssemblies="new[] { typeof(BlazorSecurity).Assembly}"> | ||
<Found Context="routeData"> | ||
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" /> | ||
<FocusOnNavigate RouteData="@routeData" Selector="h1" /> | ||
</Found> | ||
<NotFound> | ||
<PageTitle>Not found</PageTitle> | ||
<LayoutView Layout="@typeof(MainLayout)"> | ||
<p role="alert">Sorry, there's nothing at this address.</p> | ||
</LayoutView> | ||
</NotFound> | ||
</Router> | ||
</CascadingAuthenticationState> |
4 changes: 4 additions & 0 deletions
4
src/data/app/ix-blazor/librarytemplate.blazor/Pages/UserAdministration.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
@page "/Security/UserAdministration" | ||
<div class="ms-5"> | ||
<AxOpen.Security.Views.SecurityManagementView /> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/data/app/ix-blazor/librarytemplate.blazor/Shared/MainLayout.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/data/app/ix-blazor/librarytemplate.blazor/Shared/TopRow.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
@using System.Globalization | ||
@inject NavigationManager NavigationManager | ||
|
||
<div class="top-row px-2"> | ||
<a href=""> | ||
<img src="logo-no-background.svg" width="50" /> | ||
</a> | ||
|
||
|
||
<div class="ms-auto"> | ||
<select class="form-control" @bind="Culture" @bind:event="oninput"> | ||
@foreach (var culture in supportedCultures) | ||
{ | ||
<option data value="@culture">@culture.NativeName</option> | ||
} | ||
</select> | ||
</div> | ||
<div class="ms-5"> | ||
<AxOpen.Security.Views.LoginDisplay /> | ||
</div> | ||
</div> | ||
|
||
@code { | ||
private CultureInfo[] supportedCultures = new[] | ||
{ | ||
new CultureInfo("en-US"), | ||
new CultureInfo("sk-SK"), | ||
new CultureInfo("es-ES") | ||
}; | ||
|
||
private CultureInfo Culture | ||
{ | ||
get => CultureInfo.CurrentCulture; | ||
set | ||
{ | ||
// Prevent unnecessary navigation | ||
if (!Equals(CultureInfo.CurrentCulture, value) && !Equals(CultureInfo.CurrentUICulture, value)) | ||
{ | ||
var cultureEscaped = Uri.EscapeDataString(value.Name); | ||
NavigationManager.NavigateTo($"/culture?culture={cultureEscaped}", true); | ||
} | ||
} | ||
} | ||
|
||
protected override void OnInitialized() | ||
{ | ||
Culture = CultureInfo.CurrentCulture; | ||
} | ||
} |
13 changes: 13 additions & 0 deletions
13
src/data/app/ix-blazor/librarytemplate.blazor/Shared/TopRow.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
.top-row { | ||
background-color: #f7f7f7; | ||
border-bottom: 1px solid #d6d5d5; | ||
height: 3.5rem; | ||
display: flex; | ||
align-items: center; | ||
} | ||
|
||
@media (max-width: 769px) { | ||
.IAmHereIndicator { | ||
display: none; | ||
} | ||
} |
Oops, something went wrong.