@*
@@ -24,15 +25,15 @@
*@
@*
*@
-
-
@Component?.HumanReadable
+@Component?.Unit.HumanReadable
@@ -44,8 +45,8 @@
@@ -61,15 +62,15 @@
@if (EnableModalTechnologySettings)
{
-
-
@Component?.HumanReadable
+@Component?.Unit.HumanReadable
@@ -81,8 +82,8 @@
{
}
@@ -109,7 +110,7 @@
{
}
@@ -128,12 +129,12 @@
Process Data
-
-
-
-
- ().ToArray();
- return new AxoMessenger[] {};
- }
- }
-
-
-
-
protected override void OnInitialized()
{
//base.OnInitialized();
@@ -162,12 +141,6 @@
this.UpdateValuesOnChange(Unit.Ground.Status);
this.UpdateValuesOnChange(Unit.Automat.Status);
this.UpdateValuesOnChange(Unit.Service.Status);
-
-
- foreach (var axoMessenger in this.Messengers.SelectMany(p => new ITwinElement[] { p.MessengerState }))
- {
- this.UpdateValuesOnChange(axoMessenger);
- }
}
private StandardUnit _unit;
diff --git a/src/templates.simple/axpansion/server/Components/UnitSpotView.razor b/src/templates.simple/axpansion/server/Components/UnitSpotView.razor
index 1ddbe5c15..685176c46 100644
--- a/src/templates.simple/axpansion/server/Components/UnitSpotView.razor
+++ b/src/templates.simple/axpansion/server/Components/UnitSpotView.razor
@@ -4,7 +4,7 @@
@using AXOpen.Core.Blazor.Culture
@using AXOpen.Messaging.Static
@using AXOpen.ToolBox.Extensions
-@inherits RenderableComplexComponentBase
+@inherits RenderableComplexComponentBase
-@Component.GetAttributeName(CultureInfo.CurrentUICulture)
+@Component.Unit.GetAttributeName(CultureInfo.CurrentUICulture)
@ModeDescription
@@ -28,6 +29,9 @@ @code { + [Parameter] + public IUnitServices Component { get; set; } + [Parameter] public string Link { get; set; } @@ -106,17 +110,10 @@ PolledElements.Add(Unit.Automat.Status); PolledElements.Add(Unit.Service.Status); } - - foreach (var axoMessenger in this.Messengers.SelectMany(p => new ITwinElement[] { p.MessengerState })) - { - axoMessenger.StartPolling(2500, this); - PolledElements.Add(axoMessenger); - } } protected override async Task OnAfterRenderAsync(bool firstRender) { - await UpdateMessages(); await base.OnAfterRenderAsync(firstRender); this.StateHasChanged(); } @@ -133,28 +130,10 @@ return this._unit; } } - - private async Task UpdateMessages() - { - if (Messengers != null) MessagesCount = Messengers.Count(p => p.State > eAxoMessengerState.Idle); - } - + public int MessagesCount { get; set; } - private AxoMessenger[] Messengers - { - get - { - var twinObject = this.Component; - if (twinObject != null) return twinObject.GetChildren().Flatten(p => p.GetChildren()).OfType
@@ -112,9 +112,9 @@
{
if (this._unit == null && this.Component != null)
{
- this._unit = new StandardUnit(this.Component);
+ this._unit = new StandardUnit(this.Component.UnitServices);
}
-
+
return this._unit;
}
}
diff --git a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
index 708bd129f..68c107c2c 100644
--- a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
+++ b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
@@ -5,6 +5,7 @@
@using AXOpen.Core.Blazor.AxoAlertDialog;
@using AXOpen.Base.Dialogs
@using axosimple.BaseUnit
+@using axosimple.server.Units
@inject IAlertService _alerts
/// Provide access to unit objets, that are used into sequnces.
diff --git a/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor b/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
index 1e2983fa5..90d09c963 100644
--- a/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
+++ b/src/templates.simple/ax/src/templates/unit/server/UnitTemplate.razor
@@ -1,11 +1,12 @@
@page "/Context/Units/UnitTemplate"
@using AXOpen.Base.Dialogs;
@using AXOpen.ToolBox.Extensions
-@using axosimple.server.Components;
@using AXOpen.VisualComposer;
@using AXSharp.Connector;
@using AXOpen.Core;
@using axosimple.server.Units
+@using axosimple.UnitTemplate
+@using Unit = axosimple.server.Components.Unit
@inject IAlertService _alerts
@inherits RenderableComplexComponentBase
@@ -37,13 +38,11 @@
@@ -35,7 +36,7 @@
_alerts.AddAlertDialog(eAlertType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting automatic mode of selected units"]}.", 1);
var notGroundedStations = ControlledUnits.Where(p => p.unit.GroundStatus != eAxoTaskState.Done);
- var ungroundedStationsList = string.Join(",", notGroundedStations.Select(p => p.unit.Component.AttributeName));
+ var ungroundedStationsList = string.Join(",", notGroundedStations.Select(p => p.unit.Component.Unit.AttributeName));
if (notGroundedStations.Count() > 0)
{
@@ -77,7 +78,7 @@
{
var pp = string.Join(",\n", ControlledUnits
.Where(p => p.unit.GroundStatus != eAxoTaskState.Done)
- .Select(p => p.unit.Component.AttributeName));
+ .Select(p => p.unit.Component.Unit.AttributeName));
_alerts.AddAlertDialog(eAlertType.Danger,
Localizer["Mode change"],
@@ -109,8 +110,8 @@
// (new StandardUnit(Entry.Plc.Context.Cu1),"Context/Units/Cu1", "logo-header.svg"),
// (new StandardUnit(Entry.Plc.Context.Cu2),"Context/Units/Cu2", "logo-header.svg"),
- (new StandardUnit(Entry.Plc.Context.UnitTemplate),"Context/Units/UnitTemplate", "logo-header.svg"),
- (new StandardUnit(Entry.Plc.Context.StarterUnitTemplate),"Context/Units/StarterUnitTemplate", "logo-axopen-no-background.svg"),
+ (new StandardUnit(ContextService.Instance.UnitTemplateServices),"Context/Units/UnitTemplate", "logo-header.svg"),
+ (new StandardUnit(ContextService.Instance.StarterUnitTemplateServices),"Context/Units/StarterUnitTemplate", "logo-axopen-no-background.svg"),
};
}
}
diff --git a/src/templates.simple/axpansion/server/Program.cs b/src/templates.simple/axpansion/server/Program.cs
index bda2f557b..a40035276 100644
--- a/src/templates.simple/axpansion/server/Program.cs
+++ b/src/templates.simple/axpansion/server/Program.cs
@@ -96,21 +96,18 @@
var persistentRepository = Repository.Factory("Persistent_Data");
Entry.Plc.Context.PersistentData.InitializeRemoteDataExchange(Entry.Plc.Context, persistentRepository);
-var axoappContext = ContextService.Create();
-axoappContext.SetContextData(
+ContextService.Instance.SetContextData(
technologyCommonRepository: TechnologyCommonRepository,
entitySettingsRepository: EntitySettingsRepository,
entityDataRepository: EntityDataRepository
);
-var axoappContext_starterUnitTemplate = StarterUnitTemplateServices.Create(axoappContext);
-axoappContext_starterUnitTemplate.SetUnitsData(
+ContextService.Instance.StarterUnitTemplateServices.SetUnitsData(
technologySettingsRepository: StarterUnitTemplate_TechSettings,
processSettingsRepository: StarterUnitTemplate_ProcessSettings,
processDataRepository: StarterUnitTemplate_ProcessData);
-var axoappContext_unitTemplate = UnitTemplateServices.Create(axoappContext);
-axoappContext_unitTemplate.SetUnitsData(
+ContextService.Instance.UnitTemplateServices.SetUnitsData(
technologySettingsRepository: UnitTemplate_TechSettings,
processSettingsRepository: UnitTemplate_ProcessSettings,
processDataRepository: UnitTemplate_ProcessData);
diff --git a/src/templates.simple/axpansion/server/StandardUnit.cs b/src/templates.simple/axpansion/server/StandardUnit.cs
index 5837c261e..7fffdb6c0 100644
--- a/src/templates.simple/axpansion/server/StandardUnit.cs
+++ b/src/templates.simple/axpansion/server/StandardUnit.cs
@@ -1,4 +1,5 @@
using AXOpen.Core;
+using axosimple.server.Units;
using AXSharp.Connector;
namespace axosimple.server
@@ -6,26 +7,26 @@ namespace axosimple.server
public class StandardUnit
{
- public StandardUnit(ITwinObject component)
+ public StandardUnit(IUnitServices component)
{
Component = component;
}
- public ITwinObject Component { get; }
+ public IUnitServices Component { get; }
public AxoTask Automat
{
- get { return this.Component?.GetType().GetProperty("AutomatSequence").GetValue(this?.Component) as AxoTask; }
+ get { return this.Component.Unit?.GetType().GetProperty("AutomatSequence").GetValue(this?.Component.Unit) as AxoTask; }
}
public AxoTask Ground
{
- get { return this.Component?.GetType().GetProperty("GroundSequence").GetValue(this?.Component) as AxoTask; }
+ get { return this.Component.Unit?.GetType().GetProperty("GroundSequence").GetValue(this?.Component.Unit) as AxoTask; }
}
public AxoTask Service
{
- get { return this.Component?.GetType().GetProperty("ServiceMode").GetValue(this?.Component) as AxoTask; }
+ get { return this.Component.Unit?.GetType().GetProperty("ServiceMode").GetValue(this?.Component.Unit) as AxoTask; }
}
public eAxoTaskState GroundStatus
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
index de0fda384..2f35b7cf3 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
@@ -6,9 +6,9 @@
"BackgroundColor": "#ebeaea",
"Items": [
{
- "Id": "d4adaeecea3b6ffad114d37e94fbf37c2b27290f21f1c59554227a6ef3ea8ecd",
- "Left": 10,
- "Top": 10,
+ "Id": "52d1d1f6cd1735d95593ce57bc469a286d48d55502c62cb52f65dc80875778cf",
+ "Left": 47.89556962025316,
+ "Top": 9.290337761874703,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
@@ -21,9 +21,9 @@
"BackgroundColor": "#FFFFFF"
},
{
- "Id": "3d80a6735bf45a502b9c1a397f2ad7e9938eb10031806b2a7e18c4884275fabe",
- "Left": 78.43354430379746,
- "Top": 1.6334661354581672,
+ "Id": "9d4aff63c9d5f9a25058b55243f3cd77c516e9c44d88ea88ae4cf16752abd1a5",
+ "Left": 25.348101265822784,
+ "Top": 0.6623389720355721,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
@@ -36,9 +36,39 @@
"BackgroundColor": "#FFFFFF"
},
{
- "Id": "27c78cca5a92bc574d8fe5c2994d282d6533737d2821bc1f71f4ccef1e8542a5",
- "Left": 43.54430379746835,
- "Top": 0.6374501992031876,
+ "Id": "11ac3d4bb916a6e46bb90bc0b9518f8de0b696b035ae0593880fdf8b41861938",
+ "Left": 74.24050632911391,
+ "Top": 0.4382351073644264,
+ "Transform": "TopCenter",
+ "Presentation": "Status-Display",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "9d4e0930db186250edf78d314b940f513029605aa3ea0234a1528bf77c26644e",
+ "Left": 57.78481012658228,
+ "Top": 17.32072624592411,
+ "Transform": "TopCenter",
+ "Presentation": "Status-Display",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "66bad7bd0d35cdce69082b42dcc83b3cf74f42e78143a8ec744b2098f7282f9d",
+ "Left": 51.77215189873418,
+ "Top": 28.003010461915416,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/A.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/A.json
index 997885067..bcefd80e0 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/A.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/A.json
@@ -3,14 +3,14 @@
"BackgroundWidth": 100,
"BackgroundHeight": 500,
"EmptyBackground": true,
- "BackgroundColor": "#ffffff",
+ "BackgroundColor": "#9c8686",
"Items": [
{
"Id": "f4604aad0a074ceddfcfb36ce1368c5b5f42abe96debd1b1111becd21a569fac",
- "Left": 59.128580808999786,
- "Top": 5.984482644235638,
+ "Left": 62.92604916343017,
+ "Top": 1.1489426170353478,
"Transform": "TopCenter",
- "Presentation": "Status-Display",
+ "Presentation": "Spot",
"Width": -1,
"Height": -1,
"ZIndex": 0,
@@ -25,7 +25,52 @@
"Left": 30.885580247304258,
"Top": 0.8516039373020607,
"Transform": "TopCenter",
- "Presentation": "Status-Display",
+ "Presentation": "Spot",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "f8df9664d6ae010b883eca2b54b0fb0b7b6d28579bc6a379c774b94d20218c28",
+ "Left": 51.85126582278481,
+ "Top": 6.57314629258517,
+ "Transform": "TopCenter",
+ "Presentation": "Command-Control",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "1780c09eccb80303d602233147728d6ad90e4e050a0802a38b348ff65e7b8901",
+ "Left": 25.74367088607595,
+ "Top": 4.949899799599198,
+ "Transform": "TopCenter",
+ "Presentation": "Command-Control",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "49c07b8779b6643fee112ee100f5f3a0a0c633b07002798721e0ef4dd67dbdf9",
+ "Left": 67.91139240506328,
+ "Top": 3.9278557114228456,
+ "Transform": "TopCenter",
+ "Presentation": "Command-Control",
"Width": -1,
"Height": -1,
"ZIndex": 0,
@@ -40,5 +85,5 @@
"Scale": 1,
"TranslateX": 0,
"TranslateY": 0,
- "AllowZoomingAndPanning": true
+ "AllowZoomingAndPanning": false
}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/B.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/B.json
index a6be6c0f0..6344976bd 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/B.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate.ServiceMode/B.json
@@ -25,5 +25,5 @@
"Scale": 1,
"TranslateX": 0,
"TranslateY": 0,
- "AllowZoomingAndPanning": true
+ "AllowZoomingAndPanning": false
}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate/B.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate/B.json
index 50fd20d28..6981b7a38 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate/B.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.UnitTemplate/B.json
@@ -10,7 +10,7 @@
"Left": 10,
"Top": 10,
"Transform": "TopCenter",
- "Presentation": "Status-Display",
+ "Presentation": "Command-Control",
"Width": -1,
"Height": -1,
"ZIndex": 0,
@@ -34,6 +34,66 @@
"PresentationTemplate": null,
"Background": true,
"BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "af0e476a0f2622d5dd40a5624b65ffc90570d69a2f164098a86cfdae85124596",
+ "Left": 40.0925925925926,
+ "Top": 9.039780521262003,
+ "Transform": "TopCenter",
+ "Presentation": "Status-Display",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": true,
+ "BackgroundColor": "#ffffff"
+ },
+ {
+ "Id": "4743d317c595337a5c4193c0c85dce87823a9df450fee2efc00f2c55ddd057aa",
+ "Left": 29.290123456790123,
+ "Top": 45.5281207133059,
+ "Transform": "TopCenter",
+ "Presentation": "Control",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": true,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "fb37e50dfddf1765e0366ab32e0544be2eef322bc4cebc0b31fbb815d1d1cf9f",
+ "Left": 33.61111111111112,
+ "Top": 27.695473251028808,
+ "Transform": "TopCenter",
+ "Presentation": "Control",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": true,
+ "BackgroundColor": "#FFFFFF"
+ },
+ {
+ "Id": "97692f95d651c40480ddcff6dd8bb12f3d503992cc7f8c00f585809048df96ff",
+ "Left": 11.774691358024691,
+ "Top": 29.204389574759944,
+ "Transform": "TopCenter",
+ "Presentation": "Command-Control",
+ "Width": -1,
+ "Height": -1,
+ "ZIndex": 0,
+ "Scale": 1,
+ "Roles": "",
+ "PresentationTemplate": null,
+ "Background": false,
+ "BackgroundColor": "#FFFFFF"
}
],
"Theme": "text-dark",
diff --git a/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs b/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs
new file mode 100644
index 000000000..f490f497b
--- /dev/null
+++ b/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs
@@ -0,0 +1,16 @@
+// axosimple
+// Copyright (c)2024 Peter Kurhajec and Contributors All Rights Reserved.
+// Contributors: https://github.com/PTKu/ix/graphs/contributors
+// See the LICENSE file in the repository root for more information.
+// https://github.com/PTKu/ix/blob/master/LICENSE
+// Third party licenses: https://github.com/PTKu/ix/blob/master/notices.md
+
+using axosimple.server.Units;
+
+namespace axosimple.BaseUnit
+{
+ public partial class Unit : AXOpen.Core.AxoObject, axosimple.IUnit
+ {
+ public IUnitServices UnitServices { get; internal set; }
+ }
+}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/twin/Context/Context.cs b/src/templates.simple/axpansion/twin/Context/Context.cs
index d506b096d..8227f61fc 100644
--- a/src/templates.simple/axpansion/twin/Context/Context.cs
+++ b/src/templates.simple/axpansion/twin/Context/Context.cs
@@ -1,15 +1,27 @@
using AXOpen.Base.Data;
+using axosimple.server.Units;
namespace axosimple
{
public class ContextService
{
+
+ private static readonly Lazy lazy = new(() => new ContextService());
+
+ public static ContextService Instance => lazy.Value;
+
private ContextService()
{
+ StarterUnitTemplateServices = StarterUnitTemplateServices.Create(this);
+ UnitTemplateServices = UnitTemplateServices.Create(this);
}
private axosimple.Context Context { get; } = Entry.Plc.Context;
+ public StarterUnitTemplateServices StarterUnitTemplateServices { get; }
+
+ public UnitTemplateServices UnitTemplateServices { get; }
+
public axosimple.ProcessData ProcessData { get; } = Entry.Plc.Context.ProcessData.CreateBuilder();
public axosimple.ProcessData ProcessSettings { get; } = Entry.Plc.Context.ProcessSettings.CreateBuilder();
public axosimple.TechnologyData TechnologySettings { get; } = Entry.Plc.Context.TechnologySettings.CreateBuilder();
@@ -29,14 +41,8 @@ private ContextService()
/// repository - data connected with specific part or piece in production/technology
///
public IRepository EntityDataRepository { get; private set; }
-
- public static ContextService Create()
- {
- var retVal = new ContextService();
- return retVal;
- }
-
- public void SetContextData(
+
+ public ContextService SetContextData(
IRepository technologyCommonRepository,
IRepository entitySettingsRepository,
IRepository entityDataRepository
@@ -53,6 +59,8 @@ public void SetContextData(
this.TechnologyCommonRepository = technologyCommonRepository;
TechnologySettings.Common.InitializeRemoteDataExchange(this.TechnologyCommonRepository);
TechnologySettings.InitializeRemoteDataExchange();
+
+ return this;
}
}
}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs b/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs
new file mode 100644
index 000000000..075b8bb13
--- /dev/null
+++ b/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs
@@ -0,0 +1,32 @@
+// axosimple
+// Copyright (c)2024 Peter Kurhajec and Contributors All Rights Reserved.
+// Contributors: https://github.com/PTKu/ix/graphs/contributors
+// See the LICENSE file in the repository root for more information.
+// https://github.com/PTKu/ix/blob/master/LICENSE
+// Third party licenses: https://github.com/PTKu/ix/blob/master/notices.md
+
+using AXOpen.Messaging.Static;
+using AXSharp.Connector;
+
+namespace axosimple.server.Units;
+
+public interface IUnitServices
+{
+ AXOpen.Data.AxoDataEntity? Data { get; }
+
+ AXOpen.Data.AxoDataEntity? DataHeader { get; }
+
+ AXOpen.Data.AxoDataExchangeBase? DataManger { get; }
+
+ AXOpen.Data.AxoDataEntity? TechnologySettings { get; }
+
+ AXOpen.Data.AxoDataEntity? SharedTechnologySettings { get; }
+
+ public AxoObject? UnitComponents { get; }
+
+ public AxoMessageProvider MessageProvider { get; }
+
+ public axosimple.BaseUnit.Unit Unit { get; }
+
+ ITwinObject[] Associates { get; }
+}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/twin/Resources/PlcStringResources.resx b/src/templates.simple/axpansion/twin/Resources/PlcStringResources.resx
index bbd8bdada..ea778c894 100644
--- a/src/templates.simple/axpansion/twin/Resources/PlcStringResources.resx
+++ b/src/templates.simple/axpansion/twin/Resources/PlcStringResources.resx
@@ -162,6 +162,10 @@
DIALOG
src\templates\starterunit\GroundSequence.st,67
+
+ DO YOU WANT TO RUN THE GROUND MODE SEQUENCE?
+ src\templates\starterunit\GroundSequence.st,70
+
RESTORE
src\templates\starterunit\GroundSequence.st,85
diff --git a/src/templates.simple/axpansion/twin/axosimple.csproj b/src/templates.simple/axpansion/twin/axosimple.csproj
index fbab6caeb..2ac071e97 100644
--- a/src/templates.simple/axpansion/twin/axosimple.csproj
+++ b/src/templates.simple/axpansion/twin/axosimple.csproj
@@ -48,7 +48,6 @@
From 680fc54c7b55312261e058e8b6d615fb316009c8 Mon Sep 17 00:00:00 2001
From: PTKu <61538034+PTKu@users.noreply.github.com>
Date: Thu, 29 Feb 2024 07:02:30 +0100
Subject: [PATCH 04/10] wip
---
src/templates.simple/ax/src/BaseUnit/Unit.st | 2 +-
.../ax/src/templates/starterunit/Unit.st | 2 +-
.../server/StarterUnitTemplate.razor | 11 +-
.../starterunit/twin/StarterUnitTemplate.cs | 15 +-
.../ax/src/templates/unit/Unit.st | 2 +-
.../templates/unit/server/UnitTemplate.razor | 11 +-
.../unit/twin/UnitTemplateServices.cs | 15 +-
.../axpansion/server/Components/Unit.razor | 36 ++--
.../axpansion/server/Components/Unit.razor.cs | 70 +-------
.../server/Components/UnitBaseSpotView.razor | 141 ++++++++++++++++
.../server/Components/UnitLinkView.razor | 68 +++-----
.../server/Components/UnitSpotView.razor | 155 ------------------
.../server/Components/UnitsSequences.razor | 1 -
.../server/Pages/Context/Units/Units.razor | 15 +-
.../axpansion/server/Program.cs | 10 +-
.../axpansion/server/StandardUnit.cs | 154 ++++++++---------
.../default.json | 12 +-
.../ContextView/a.json | 10 +-
.../axpansion/twin/BaseUnit/Unit.cs | 62 ++++++-
.../axpansion/twin/Context/Context.cs | 10 +-
.../twin/Context/Units/IUnitServices.cs | 6 +-
21 files changed, 395 insertions(+), 413 deletions(-)
create mode 100644 src/templates.simple/axpansion/server/Components/UnitBaseSpotView.razor
delete mode 100644 src/templates.simple/axpansion/server/Components/UnitSpotView.razor
diff --git a/src/templates.simple/ax/src/BaseUnit/Unit.st b/src/templates.simple/ax/src/BaseUnit/Unit.st
index 28ce26190..5783d027e 100644
--- a/src/templates.simple/ax/src/BaseUnit/Unit.st
+++ b/src/templates.simple/ax/src/BaseUnit/Unit.st
@@ -8,7 +8,7 @@ NAMESPACE axosimple.BaseUnit
/// Represents controlled units and high level task coordination.
///
{S7.extern=ReadWrite}
- CLASS PUBLIC Unit
+ CLASS PUBLIC UnitBase
EXTENDS AXOpen.Core.AxoObject IMPLEMENTS axosimple.IUnit
VAR PUBLIC
diff --git a/src/templates.simple/ax/src/templates/starterunit/Unit.st b/src/templates.simple/ax/src/templates/starterunit/Unit.st
index 26337fe6c..df2d9f030 100644
--- a/src/templates.simple/ax/src/templates/starterunit/Unit.st
+++ b/src/templates.simple/ax/src/templates/starterunit/Unit.st
@@ -9,7 +9,7 @@ NAMESPACE axosimple.StarterUnitTemplate
///
{S7.extern=ReadWrite}
CLASS Unit
- EXTENDS axosimple.BaseUnit.Unit
+ EXTENDS axosimple.BaseUnit.UnitBase
VAR PUBLIC
///
/// Provide access to unit objets, that are used into sequnces.
diff --git a/src/templates.simple/ax/src/templates/starterunit/server/StarterUnitTemplate.razor b/src/templates.simple/ax/src/templates/starterunit/server/StarterUnitTemplate.razor
index bf7ac1ae6..cf627c000 100644
--- a/src/templates.simple/ax/src/templates/starterunit/server/StarterUnitTemplate.razor
+++ b/src/templates.simple/ax/src/templates/starterunit/server/StarterUnitTemplate.razor
@@ -1,12 +1,13 @@
@page "/Context/Units/StarterUnitTemplate"
@using AXOpen.Base.Dialogs;
@using AXOpen.ToolBox.Extensions
-@using axosimple.server.Components;
@using AXOpen.VisualComposer;
@using AXSharp.Connector;
@using AXOpen.Core;
@using axosimple.server.Units
+@using axosimple.StarterUnitTemplate
@using Context = axosimple.Context
+@using Unit = axosimple.server.Components.Unit
@inject IAlertService _alerts
@inherits RenderableComplexComponentBase
@@ -40,13 +41,11 @@
-
@*
@@ -25,15 +25,15 @@
*@
@*
*@
-
-
@Component?.Unit.HumanReadable
+@Component.HumanReadable
@@ -45,8 +45,8 @@
@@ -62,15 +62,15 @@
@if (EnableModalTechnologySettings)
{
-
-
@Component?.Unit.HumanReadable
+@Component.HumanReadable
@@ -82,8 +82,8 @@
{
}
@@ -110,7 +110,7 @@
{
}
@@ -129,12 +129,12 @@
Process Data
-
-
-
-
+ 
+
+
+@code {
+
+ public string Mode
+ {
+ get
+ {
+ if (Component.GroundStatus == eAxoTaskState.Done
+ && Component.AutomatStatus != eAxoTaskState.Busy
+ && Component.ServiceStatus != eAxoTaskState.Busy)
+ {
+ return "text-bg-secondary";
+ }
+
+ if (Component.GroundStatus == eAxoTaskState.Busy)
+ {
+ return "text-bg-warning";
+ }
+
+ if (Component.AutomatStatus == eAxoTaskState.Busy)
+ {
+ return "text-bg-primary";
+ }
+
+ if (Component.ServiceStatus == eAxoTaskState.Busy)
+ {
+ return "text-bg-warning";
+ }
+
+ return "text-bg-dark";
+ }
+ }
+
+ public string ModeDescription
+ {
+ get
+ {
+ if (Component.GroundStatus == eAxoTaskState.Done
+ && Component.AutomatStatus != eAxoTaskState.Busy
+ && Component.ServiceStatus != eAxoTaskState.Busy)
+ {
+ return Localizer["READY TO START"];
+ }
+
+ if (Component.GroundStatus == eAxoTaskState.Busy)
+ {
+ return Localizer["GROUNDING"];
+ }
+
+ if (Component.AutomatStatus == eAxoTaskState.Busy)
+ {
+ return Localizer["RUNNING"];
+ }
+
+ if (Component.ServiceStatus == eAxoTaskState.Busy)
+ {
+ return Localizer["IN SERVICE"];
+ }
+
+ return Localizer["IDLE"];
+ }
+ }
+
+ public override void AddToPolling(ITwinElement element, int pollingInterval = 250)
+ {
+ if (Component != null)
+ {
+ Component.Ground.Status.StartPolling(2500, this);
+ Component.Automat.Status.StartPolling(2500, this);
+ Component.Service.Status.StartPolling(2500, this);
+
+ PolledElements.Add(Component.Ground.Status);
+ PolledElements.Add(Component.Automat.Status);
+ PolledElements.Add(Component.Service.Status);
+ }
+ }
+
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ await base.OnAfterRenderAsync(firstRender);
+ }
+
+ private AxoMessageObserver observer;
+ private AxoMessageObserver? Observer
+ {
+ get
+ {
+ if (observer == null && Component.UnitServices.MessageProvider != null)
+ observer = AxoMessageObserver.Create(Component.UnitServices.MessageProvider, this);
+
+ return observer;
+ }
+ }
+
+ protected override async Task@Component.AttributeName
+
+
+@Component.GetAttributeName(CultureInfo.CurrentUICulture)
++ @ModeDescription +
+ + @Localizer["OPEN"] + @if (@Observer.Provider.ActiveMessagesCount > 0) + { + + New alerts + + } + +
+
-
-
-().ToArray();
- return new AxoMessenger[] {};
- }
- }
-
- protected override void OnInitialized()
- {
- //base.OnInitialized();
-
- this.UpdateValuesOnChange(Unit.Ground.Status);
- this.UpdateValuesOnChange(Unit.Automat.Status);
- this.UpdateValuesOnChange(Unit.Service.Status);
-
-
- foreach (var axoMessenger in this.Messengers.SelectMany(p => new ITwinElement[] { p.MessengerState }))
- {
- this.UpdateValuesOnChange(axoMessenger);
- }
- }
-
- private StandardUnit _unit;
-}
diff --git a/src/templates.simple/axpansion/server/Components/UnitsSequences.razor b/src/templates.simple/axpansion/server/Components/UnitsSequences.razor
index a2dcbf298..65576358f 100644
--- a/src/templates.simple/axpansion/server/Components/UnitsSequences.razor
+++ b/src/templates.simple/axpansion/server/Components/UnitsSequences.razor
@@ -9,7 +9,6 @@
@* *@
@@ -106,36 +106,13 @@
protected override async Task OnAfterRenderAsync(bool firstRender)
{
await base.OnAfterRenderAsync(firstRender);
+ this.StateHasChanged();
}
-
- private AxoMessageObserver observer;
- private AxoMessageObserver? Observer
- {
- get
- {
- if (observer == null && Component.UnitServices.MessageProvider != null)
- observer = AxoMessageObserver.Create(Component.UnitServices.MessageProvider, this);
-
- return observer;
- }
- }
-
- protected override async Task
-
@code {
-
- [Parameter]
- public IUnitServices Component { get; set; }
[Parameter]
public string Link { get; set; }
@@ -42,24 +39,24 @@
{
get
{
- if (Unit.GroundStatus == eAxoTaskState.Done
- && Unit.AutomatStatus != eAxoTaskState.Busy
- && Unit.ServiceStatus != eAxoTaskState.Busy)
+ if (Component.GroundStatus == eAxoTaskState.Done
+ && Component.AutomatStatus != eAxoTaskState.Busy
+ && Component.ServiceStatus != eAxoTaskState.Busy)
{
return "text-bg-secondary";
}
- if (Unit.GroundStatus == eAxoTaskState.Busy)
+ if (Component.GroundStatus == eAxoTaskState.Busy)
{
return "text-bg-warning";
}
- if (Unit.AutomatStatus == eAxoTaskState.Busy)
+ if (Component.AutomatStatus == eAxoTaskState.Busy)
{
return "text-bg-primary";
}
- if (Unit.ServiceStatus == eAxoTaskState.Busy)
+ if (Component.ServiceStatus == eAxoTaskState.Busy)
{
return "text-bg-warning";
}
@@ -72,24 +69,24 @@
{
get
{
- if (Unit.GroundStatus == eAxoTaskState.Done
- && Unit.AutomatStatus != eAxoTaskState.Busy
- && Unit.ServiceStatus != eAxoTaskState.Busy)
+ if (Component.GroundStatus == eAxoTaskState.Done
+ && Component.AutomatStatus != eAxoTaskState.Busy
+ && Component.ServiceStatus != eAxoTaskState.Busy)
{
return Localizer["READY TO START"];
}
- if (Unit.GroundStatus == eAxoTaskState.Busy)
+ if (Component.GroundStatus == eAxoTaskState.Busy)
{
return Localizer["GROUNDING"];
}
- if (Unit.AutomatStatus == eAxoTaskState.Busy)
+ if (Component.AutomatStatus == eAxoTaskState.Busy)
{
return Localizer["RUNNING"];
}
- if (Unit.ServiceStatus == eAxoTaskState.Busy)
+ if (Component.ServiceStatus == eAxoTaskState.Busy)
{
return Localizer["IN SERVICE"];
}
@@ -100,15 +97,15 @@
public override void AddToPolling(ITwinElement element, int pollingInterval = 250)
{
- if (Unit != null)
+ if (Component != null)
{
- Unit.Ground.Status.StartPolling(2500, this);
- Unit.Automat.Status.StartPolling(2500, this);
- Unit.Service.Status.StartPolling(2500, this);
+ Component.Ground.Status.StartPolling(2500, this);
+ Component.Automat.Status.StartPolling(2500, this);
+ Component.Service.Status.StartPolling(2500, this);
- PolledElements.Add(Unit.Ground.Status);
- PolledElements.Add(Unit.Automat.Status);
- PolledElements.Add(Unit.Service.Status);
+ PolledElements.Add(Component.Ground.Status);
+ PolledElements.Add(Component.Automat.Status);
+ PolledElements.Add(Component.Service.Status);
}
}
@@ -117,19 +114,6 @@
await base.OnAfterRenderAsync(firstRender);
this.StateHasChanged();
}
-
- private StandardUnit Unit
- {
- get
- {
- if (this._unit == null && this.Component != null)
- {
- this._unit = new StandardUnit(this.Component);
- }
-
- return this._unit;
- }
- }
public int MessagesCount { get; set; }
@@ -138,10 +122,8 @@
{
//base.OnInitialized();
- this.UpdateValuesOnChange(Unit.Ground.Status);
- this.UpdateValuesOnChange(Unit.Automat.Status);
- this.UpdateValuesOnChange(Unit.Service.Status);
+ this.UpdateValuesOnChange(Component.Ground.Status);
+ this.UpdateValuesOnChange(Component.Automat.Status);
+ this.UpdateValuesOnChange(Component.Service.Status);
}
-
- private StandardUnit _unit;
}
diff --git a/src/templates.simple/axpansion/server/Components/UnitSpotView.razor b/src/templates.simple/axpansion/server/Components/UnitSpotView.razor
deleted file mode 100644
index 685176c46..000000000
--- a/src/templates.simple/axpansion/server/Components/UnitSpotView.razor
+++ /dev/null
@@ -1,155 +0,0 @@
-@namespace axosimple.BaseUnit
-@using AXSharp.Connector
-@using AXOpen.Core
-@using AXOpen.Core.Blazor.Culture
-@using AXOpen.Messaging.Static
-@using AXOpen.ToolBox.Extensions
-@inherits RenderableComplexComponentBase@Component.Unit.GetAttributeName(CultureInfo.CurrentUICulture)
+@Component.GetAttributeName(CultureInfo.CurrentUICulture)
@ModeDescription
@@ -28,9 +28,6 @@
-
-
-@code {
-
- public string Mode
- {
- get
- {
- if (Unit.GroundStatus == eAxoTaskState.Done
- && Unit.AutomatStatus != eAxoTaskState.Busy
- && Unit.ServiceStatus != eAxoTaskState.Busy)
- {
- return "text-bg-secondary";
- }
-
- if (Unit.GroundStatus == eAxoTaskState.Busy)
- {
- return "text-bg-warning";
- }
-
- if (Unit.AutomatStatus == eAxoTaskState.Busy)
- {
- return "text-bg-primary";
- }
-
- if (Unit.ServiceStatus == eAxoTaskState.Busy)
- {
- return "text-bg-warning";
- }
-
- return "text-bg-dark";
- }
- }
-
- public string ModeDescription
- {
- get
- {
- if (Unit.GroundStatus == eAxoTaskState.Done
- && Unit.AutomatStatus != eAxoTaskState.Busy
- && Unit.ServiceStatus != eAxoTaskState.Busy)
- {
- return Localizer["READY TO START"];
- }
-
- if (Unit.GroundStatus == eAxoTaskState.Busy)
- {
- return Localizer["GROUNDING"];
- }
-
- if (Unit.AutomatStatus == eAxoTaskState.Busy)
- {
- return Localizer["RUNNING"];
- }
-
- if (Unit.ServiceStatus == eAxoTaskState.Busy)
- {
- return Localizer["IN SERVICE"];
- }
-
- return Localizer["IDLE"];
- }
- }
-
- public override void AddToPolling(ITwinElement element, int pollingInterval = 250)
- {
- if (Unit != null)
- {
- Unit.Ground.Status.StartPolling(2500, this);
- Unit.Automat.Status.StartPolling(2500, this);
- Unit.Service.Status.StartPolling(2500, this);
-
- PolledElements.Add(Unit.Ground.Status);
- PolledElements.Add(Unit.Automat.Status);
- PolledElements.Add(Unit.Service.Status);
- }
-
- foreach (var axoMessenger in this.Messengers.SelectMany(p => new ITwinElement[] { p.MessengerState }))
- {
- axoMessenger.StartPolling(2500, this);
- PolledElements.Add(axoMessenger);
- }
- }
-
- protected override async Task OnAfterRenderAsync(bool firstRender)
- {
- await UpdateMessages();
- await base.OnAfterRenderAsync(firstRender);
- this.StateHasChanged();
- }
-
- private StandardUnit Unit
- {
- get
- {
- if (this._unit == null && this.Component != null)
- {
- this._unit = new StandardUnit(this.Component.UnitServices);
- }
-
- return this._unit;
- }
- }
-
- private async Task UpdateMessages()
- {
- if (Messengers != null) MessagesCount = Messengers.Count(p => p.State > eAxoMessengerState.Idle);
- }
-
- public int MessagesCount { get; set; }
-
- private AxoMessenger[] Messengers
- {
- get
- {
- var twinObject = this.Component;
- if (twinObject != null) return twinObject.GetChildren().Flatten(p => p.GetChildren()).OfType@Component.AttributeName
-
-
-@Component.GetAttributeName(CultureInfo.CurrentUICulture)
-- @ModeDescription -
-
-
@* @foreach (var task in this.Component.GetChildren().OfType().Where(p => p is AxoTask).Select(p => p as AxoTask)) *@
@* { *@
@* $1$
#1# *@
diff --git a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
index 68c107c2c..6e7ce9f5b 100644
--- a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
+++ b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
@@ -5,7 +5,6 @@
@using AXOpen.Core.Blazor.AxoAlertDialog;
@using AXOpen.Base.Dialogs
@using axosimple.BaseUnit
-@using axosimple.server.Units
@inject IAlertService _alerts
("Persistent_Data");
Entry.Plc.Context.PersistentData.InitializeRemoteDataExchange(Entry.Plc.Context, persistentRepository);
+Entry.Plc.Context.StarterUnitTemplate.Services = StarterUnitTemplateServices.Create(ContextService.Instance);
+Entry.Plc.Context.UnitTemplate.Services = UnitTemplateServices.Create(ContextService.Instance);
+
+
ContextService.Instance.SetContextData(
technologyCommonRepository: TechnologyCommonRepository,
entitySettingsRepository: EntitySettingsRepository,
entityDataRepository: EntityDataRepository
);
-ContextService.Instance.StarterUnitTemplateServices.SetUnitsData(
+Entry.Plc.Context.StarterUnitTemplate.Services.SetUnitsData(
technologySettingsRepository: StarterUnitTemplate_TechSettings,
processSettingsRepository: StarterUnitTemplate_ProcessSettings,
processDataRepository: StarterUnitTemplate_ProcessData);
-ContextService.Instance.UnitTemplateServices.SetUnitsData(
+Entry.Plc.Context.UnitTemplate.Services.SetUnitsData(
technologySettingsRepository: UnitTemplate_TechSettings,
processSettingsRepository: UnitTemplate_ProcessSettings,
processDataRepository: UnitTemplate_ProcessData);
diff --git a/src/templates.simple/axpansion/server/StandardUnit.cs b/src/templates.simple/axpansion/server/StandardUnit.cs
index 7fffdb6c0..d89edbaaa 100644
--- a/src/templates.simple/axpansion/server/StandardUnit.cs
+++ b/src/templates.simple/axpansion/server/StandardUnit.cs
@@ -1,77 +1,77 @@
-using AXOpen.Core;
-using axosimple.server.Units;
-using AXSharp.Connector;
-
-namespace axosimple.server
-{
- public class StandardUnit
- {
-
- public StandardUnit(IUnitServices component)
- {
- Component = component;
- }
-
- public IUnitServices Component { get; }
-
- public AxoTask Automat
- {
- get { return this.Component.Unit?.GetType().GetProperty("AutomatSequence").GetValue(this?.Component.Unit) as AxoTask; }
- }
-
- public AxoTask Ground
- {
- get { return this.Component.Unit?.GetType().GetProperty("GroundSequence").GetValue(this?.Component.Unit) as AxoTask; }
- }
-
- public AxoTask Service
- {
- get { return this.Component.Unit?.GetType().GetProperty("ServiceMode").GetValue(this?.Component.Unit) as AxoTask; }
- }
-
- public eAxoTaskState GroundStatus
- {
- get
- {
- try
- {
- return (AXOpen.Core.eAxoTaskState)Ground?.Status.LastValue;
- }
- catch
- {
- return eAxoTaskState.Disabled;
- }
- }
- }
-
- public eAxoTaskState AutomatStatus
- {
- get
- {
- try
- {
- return (AXOpen.Core.eAxoTaskState)Automat?.Status.LastValue;
- }
- catch
- {
- return eAxoTaskState.Disabled;
- }
- }
- }
-
- public eAxoTaskState ServiceStatus
- {
- get
- {
- try
- {
- return (AXOpen.Core.eAxoTaskState)Service?.Status.LastValue;
- }
- catch
- {
- return eAxoTaskState.Disabled;
- }
- }
- }
- }
-}
+// using AXOpen.Core;
+// using axosimple.server.Units;
+// using AXSharp.Connector;
+//
+// namespace axosimple.server
+// {
+// public class StandardUnit
+// {
+//
+// public StandardUnit(IUnit component)
+// {
+// Component = component;
+// }
+//
+// public IUnit Component { get; }
+//
+// public AxoTask Automat
+// {
+// get { return this.Component.GetType().GetProperty("AutomatSequence").GetValue(this?.Component) as AxoTask; }
+// }
+//
+// public AxoTask Ground
+// {
+// get { return this.Component.GetType().GetProperty("GroundSequence").GetValue(this?.Component) as AxoTask; }
+// }
+//
+// public AxoTask Service
+// {
+// get { return this.Component.GetType().GetProperty("ServiceMode").GetValue(this?.Component) as AxoTask; }
+// }
+//
+// public eAxoTaskState GroundStatus
+// {
+// get
+// {
+// try
+// {
+// return (AXOpen.Core.eAxoTaskState)Ground?.Status.LastValue;
+// }
+// catch
+// {
+// return eAxoTaskState.Disabled;
+// }
+// }
+// }
+//
+// public eAxoTaskState AutomatStatus
+// {
+// get
+// {
+// try
+// {
+// return (AXOpen.Core.eAxoTaskState)Automat?.Status.LastValue;
+// }
+// catch
+// {
+// return eAxoTaskState.Disabled;
+// }
+// }
+// }
+//
+// public eAxoTaskState ServiceStatus
+// {
+// get
+// {
+// try
+// {
+// return (AXOpen.Core.eAxoTaskState)Service?.Status.LastValue;
+// }
+// catch
+// {
+// return eAxoTaskState.Disabled;
+// }
+// }
+// }
+// }
+// }
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
index 2f35b7cf3..4d2a469ca 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/Context.StarterUnitTemplate.ServiceMode/default.json
@@ -7,8 +7,8 @@
"Items": [
{
"Id": "52d1d1f6cd1735d95593ce57bc469a286d48d55502c62cb52f65dc80875778cf",
- "Left": 47.89556962025316,
- "Top": 9.290337761874703,
+ "Left": 24.320179795644567,
+ "Top": 10.462820654283409,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
@@ -52,8 +52,8 @@
},
{
"Id": "9d4e0930db186250edf78d314b940f513029605aa3ea0234a1528bf77c26644e",
- "Left": 57.78481012658228,
- "Top": 17.32072624592411,
+ "Left": 61.740412446147474,
+ "Top": 31.92346772410527,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
@@ -67,8 +67,8 @@
},
{
"Id": "66bad7bd0d35cdce69082b42dcc83b3cf74f42e78143a8ec744b2098f7282f9d",
- "Left": 51.77215189873418,
- "Top": 28.003010461915416,
+ "Left": 52.1677121306907,
+ "Top": 32.639647354622575,
"Transform": "TopCenter",
"Presentation": "Status-Display",
"Width": -1,
diff --git a/src/templates.simple/axpansion/server/VisualComposerSerialize/ContextView/a.json b/src/templates.simple/axpansion/server/VisualComposerSerialize/ContextView/a.json
index c76b5ad61..762303784 100644
--- a/src/templates.simple/axpansion/server/VisualComposerSerialize/ContextView/a.json
+++ b/src/templates.simple/axpansion/server/VisualComposerSerialize/ContextView/a.json
@@ -7,14 +7,14 @@
"Items": [
{
"Id": "8e729099b499008e6604e84d6b67169f01935c21fc69da20fcc0a0ec0dd770a0",
- "Left": 14.35040638467051,
- "Top": 1.6723366508552517,
+ "Left": 19.828801446398906,
+ "Top": 1.9924581140847293,
"Transform": "TopCenter",
"Presentation": "Spot",
"Width": -1,
"Height": -1,
"ZIndex": 0,
- "Scale": 1,
+ "Scale": 0.5,
"Roles": "",
"PresentationTemplate": null,
"Background": false,
@@ -22,8 +22,8 @@
},
{
"Id": "f122746ffacbbf3a0633a9695c646677467d58ed708ea07d46a16dea4f178979",
- "Left": 63.86877472119027,
- "Top": 1.6872428885274957,
+ "Left": 86.32247842489397,
+ "Top": 2.4189490901948716,
"Transform": "TopCenter",
"Presentation": "Spot",
"Width": -1,
diff --git a/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs b/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs
index f490f497b..6dbe4fdec 100644
--- a/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs
+++ b/src/templates.simple/axpansion/twin/BaseUnit/Unit.cs
@@ -9,8 +9,68 @@
namespace axosimple.BaseUnit
{
- public partial class Unit : AXOpen.Core.AxoObject, axosimple.IUnit
+ public partial class UnitBase : AXOpen.Core.AxoObject, axosimple.IUnit
{
public IUnitServices UnitServices { get; internal set; }
+
+ public AxoTask Automat
+ {
+ get { return this.GetType().GetProperty("AutomatSequence").GetValue(this) as AxoTask; }
+ }
+
+ public AxoTask Ground
+ {
+ get { return this.GetType().GetProperty("GroundSequence").GetValue(this) as AxoTask; }
+ }
+
+ public AxoTask Service
+ {
+ get { return this.GetType().GetProperty("ServiceMode").GetValue(this) as AxoTask; }
+ }
+
+ public eAxoTaskState GroundStatus
+ {
+ get
+ {
+ try
+ {
+ return (AXOpen.Core.eAxoTaskState)Ground?.Status.LastValue;
+ }
+ catch
+ {
+ return eAxoTaskState.Disabled;
+ }
+ }
+ }
+
+ public eAxoTaskState AutomatStatus
+ {
+ get
+ {
+ try
+ {
+ return (AXOpen.Core.eAxoTaskState)Automat?.Status.LastValue;
+ }
+ catch
+ {
+ return eAxoTaskState.Disabled;
+ }
+ }
+ }
+
+ public eAxoTaskState ServiceStatus
+ {
+ get
+ {
+ try
+ {
+ return (AXOpen.Core.eAxoTaskState)Service?.Status.LastValue;
+ }
+ catch
+ {
+ return eAxoTaskState.Disabled;
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/src/templates.simple/axpansion/twin/Context/Context.cs b/src/templates.simple/axpansion/twin/Context/Context.cs
index 8227f61fc..02ce7eb4b 100644
--- a/src/templates.simple/axpansion/twin/Context/Context.cs
+++ b/src/templates.simple/axpansion/twin/Context/Context.cs
@@ -1,5 +1,6 @@
using AXOpen.Base.Data;
using axosimple.server.Units;
+using axosimple.StarterUnitTemplate;
namespace axosimple
{
@@ -12,16 +13,11 @@ public class ContextService
private ContextService()
{
- StarterUnitTemplateServices = StarterUnitTemplateServices.Create(this);
- UnitTemplateServices = UnitTemplateServices.Create(this);
+
}
private axosimple.Context Context { get; } = Entry.Plc.Context;
-
- public StarterUnitTemplateServices StarterUnitTemplateServices { get; }
-
- public UnitTemplateServices UnitTemplateServices { get; }
-
+
public axosimple.ProcessData ProcessData { get; } = Entry.Plc.Context.ProcessData.CreateBuilder();
public axosimple.ProcessData ProcessSettings { get; } = Entry.Plc.Context.ProcessSettings.CreateBuilder();
public axosimple.TechnologyData TechnologySettings { get; } = Entry.Plc.Context.TechnologySettings.CreateBuilder();
diff --git a/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs b/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs
index 075b8bb13..ea339b650 100644
--- a/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs
+++ b/src/templates.simple/axpansion/twin/Context/Units/IUnitServices.cs
@@ -26,7 +26,11 @@ public interface IUnitServices
public AxoMessageProvider MessageProvider { get; }
- public axosimple.BaseUnit.Unit Unit { get; }
+ public axosimple.BaseUnit.UnitBase Unit { get; }
ITwinObject[] Associates { get; }
+
+ string Link { get; }
+
+ string ImageLink { get; }
}
\ No newline at end of file
From 5d4604771484bf634113a239520d8a88e3f4cebb Mon Sep 17 00:00:00 2001
From: PTKu <61538034+PTKu@users.noreply.github.com>
Date: Fri, 1 Mar 2024 07:46:00 +0100
Subject: [PATCH 05/10] wip
---
.../axpansion/server/Components/Unit.razor | 4 +-
.../server/Components/UnitBaseSpotView.razor | 43 ++----
.../server/Components/UnitLinkView.razor | 129 ------------------
.../server/Pages/Context/Units/Units.razor | 29 ++--
.../ContextView/a.json | 8 +-
5 files changed, 29 insertions(+), 184 deletions(-)
delete mode 100644 src/templates.simple/axpansion/server/Components/UnitLinkView.razor
diff --git a/src/templates.simple/axpansion/server/Components/Unit.razor b/src/templates.simple/axpansion/server/Components/Unit.razor
index 9621b2415..ad3aa4d5f 100644
--- a/src/templates.simple/axpansion/server/Components/Unit.razor
+++ b/src/templates.simple/axpansion/server/Components/Unit.razor
@@ -135,6 +135,6 @@
-
@@ -13,7 +12,7 @@
@foreach (var unit in ControlledUnits)
{
@@ -36,7 +35,7 @@
_alerts.AddAlertDialog(eAlertType.Info, Localizer["Mode change"], $"{Localizer[$"Requesting automatic mode of selected units"]}.", 1);
var notGroundedStations = ControlledUnits.Where(p => p.unit.GroundStatus != eAxoTaskState.Done);
- var ungroundedStationsList = string.Join(",", notGroundedStations.Select(p => p.unit.Component.Unit.AttributeName));
+ var ungroundedStationsList = string.Join(",", notGroundedStations.Select(p => p.unit.AttributeName));
if (notGroundedStations.Count() > 0)
{
@@ -78,7 +77,7 @@
{
var pp = string.Join(",\n", ControlledUnits
.Where(p => p.unit.GroundStatus != eAxoTaskState.Done)
- .Select(p => p.unit.Component.Unit.AttributeName));
+ .Select(p => p.unit.AttributeName));
_alerts.AddAlertDialog(eAlertType.Danger,
Localizer["Mode change"],
@@ -101,17 +100,17 @@
this.StateHasChanged();
}
- private IEnumerable<(StandardUnit unit, string link, string imageLink)> ControlledUnits
+ private IEnumerable<(UnitBase unit, string link, string imageLink)> ControlledUnits
{
get
{
- return new (StandardUnit, string, string)[]
+ return new (UnitBase, string, string)[]
{
// (new StandardUnit(Entry.Plc.Context.Cu1),"Context/Units/Cu1", "logo-header.svg"),
// (new StandardUnit(Entry.Plc.Context.Cu2),"Context/Units/Cu2", "logo-header.svg"),
- (new StandardUnit(ContextService.Instance.UnitTemplateServices),"Context/Units/UnitTemplate", "logo-header.svg"),
- (new StandardUnit(ContextService.Instance.StarterUnitTemplateServices),"Context/Units/StarterUnitTemplate", "logo-axopen-no-background.svg"),
+ (Entry.Plc.Context.UnitTemplate,"Context/Units/UnitTemplate", "logo-header.svg"),
+ (Entry.Plc.Context.StarterUnitTemplate,"Context/Units/StarterUnitTemplate", "logo-axopen-no-background.svg"),
};
}
}
diff --git a/src/templates.simple/axpansion/server/Program.cs b/src/templates.simple/axpansion/server/Program.cs
index a40035276..9eb77c768 100644
--- a/src/templates.simple/axpansion/server/Program.cs
+++ b/src/templates.simple/axpansion/server/Program.cs
@@ -14,6 +14,8 @@
using AXSharp.Presentation.Blazor.Services;
using Serilog;
using System.Reflection;
+using axosimple.StarterUnitTemplate;
+using axosimple.UnitTemplate;
using Microsoft.Extensions.Options;
using MongoDB.Bson.Serialization;
@@ -96,18 +98,22 @@
var persistentRepository = Repository.Factory
-
}
-
-
-
-@code {
-
- [Parameter]
- public string Link { get; set; }
-
- [Parameter]
- public string ImageLink { get; set; }
-
- public string Mode
- {
- get
- {
- if (Component.GroundStatus == eAxoTaskState.Done
- && Component.AutomatStatus != eAxoTaskState.Busy
- && Component.ServiceStatus != eAxoTaskState.Busy)
- {
- return "text-bg-secondary";
- }
-
- if (Component.GroundStatus == eAxoTaskState.Busy)
- {
- return "text-bg-warning";
- }
-
- if (Component.AutomatStatus == eAxoTaskState.Busy)
- {
- return "text-bg-primary";
- }
-
- if (Component.ServiceStatus == eAxoTaskState.Busy)
- {
- return "text-bg-warning";
- }
-
- return "text-bg-dark";
- }
- }
-
- public string ModeDescription
- {
- get
- {
- if (Component.GroundStatus == eAxoTaskState.Done
- && Component.AutomatStatus != eAxoTaskState.Busy
- && Component.ServiceStatus != eAxoTaskState.Busy)
- {
- return Localizer["READY TO START"];
- }
-
- if (Component.GroundStatus == eAxoTaskState.Busy)
- {
- return Localizer["GROUNDING"];
- }
-
- if (Component.AutomatStatus == eAxoTaskState.Busy)
- {
- return Localizer["RUNNING"];
- }
-
- if (Component.ServiceStatus == eAxoTaskState.Busy)
- {
- return Localizer["IN SERVICE"];
- }
-
- return Localizer["IDLE"];
- }
- }
-
- public override void AddToPolling(ITwinElement element, int pollingInterval = 250)
- {
- if (Component != null)
- {
- Component.Ground.Status.StartPolling(2500, this);
- Component.Automat.Status.StartPolling(2500, this);
- Component.Service.Status.StartPolling(2500, this);
-
- PolledElements.Add(Component.Ground.Status);
- PolledElements.Add(Component.Automat.Status);
- PolledElements.Add(Component.Service.Status);
- }
- }
-
- protected override async Task OnAfterRenderAsync(bool firstRender)
- {
- await base.OnAfterRenderAsync(firstRender);
- this.StateHasChanged();
- }
-
- public int MessagesCount { get; set; }
-
-
- protected override void OnInitialized()
- {
- //base.OnInitialized();
-
- this.UpdateValuesOnChange(Component.Ground.Status);
- this.UpdateValuesOnChange(Component.Automat.Status);
- this.UpdateValuesOnChange(Component.Service.Status);
- }
-}
diff --git a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
index 6e7ce9f5b..a64a7790e 100644
--- a/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
+++ b/src/templates.simple/axpansion/server/Pages/Context/Units/Units.razor
@@ -12,7 +12,7 @@
@foreach (var unit in ControlledUnits)
{
-
-@Component.GetAttributeName(CultureInfo.CurrentUICulture)
-- @ModeDescription -
- - @Localizer["OPEN"] - @if (MessagesCount > 0) - { - - New alerts - - } - -
-
}