[NEW-FEATURE] Posibility to close any dialog at init (#698)

* Create draft PR for #697 * + reopen dialogs after restart application (TcoDialog,TcoInspector) + posibilty to close all dialog by restore methods (TcoDialog,TcoInspector) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Peter Barancek <[email protected]>
TcOpenGroup · Mar 20, 2024 · bfaf92a · bfaf92a
1 parent e3684de
commit bfaf92a
Show file tree

Hide file tree

Showing 24 changed files with 225 additions and 99 deletions.
diff --git a/src/TcOpen.Inxton/src/Abstractions/Dialogs/IsDialog.cs b/src/TcOpen.Inxton/src/Abstractions/Dialogs/IsDialog.cs
@@ -10,6 +10,8 @@ namespace TcOpen.Inxton.Dialogs
     public interface IsDialog : IVortexObject
     {
         string DialogId { get; set; }
+
+        void ShowAgainIfInvoked();
         void Initialize(Action dialogAction);
 
     }

diff --git a/src/TcOpen.Inxton/src/Application/Dialogs/DialogProxyService.cs b/src/TcOpen.Inxton/src/Application/Dialogs/DialogProxyService.cs
@@ -15,6 +15,7 @@ public abstract class DialogProxyServiceBase
         protected DialogProxyServiceBase(IEnumerable<IVortexObject> observedObjects)
         {           
             UpdateDialogs(observedObjects);
+            ShowDialogsIfAlreadyInvoked(observedObjects);
         }
         void UpdateDialogs(IEnumerable<IVortexObject> observedObjects)
         {
@@ -27,6 +28,19 @@ void UpdateDialogs(IEnumerable<IVortexObject> observedObjects)
                 }
             }
 
+        }
+
+        void ShowDialogsIfAlreadyInvoked(IEnumerable<IVortexObject> observedObjects)
+        {
+            if (observedObjects == null || observedObjects.Count() == 0) return;
+            foreach (var observedObject in observedObjects)
+            {
+                foreach (var dialog in observedObject.GetDescendants<IsDialog>())
+                {
+                    dialog.ShowAgainIfInvoked();
+                }
+            }
+
         }
         protected abstract void Queue(IsDialog dialog);        
     }

diff --git a/src/TcoCore/README.md b/src/TcoCore/README.md
@@ -7,6 +7,17 @@
 
 ## Dialogs 
 
+### Plc Hide dialog
+
+```csharp		
+	0:
+		_dialog1.Restore();
+		_dialog2.Restore();
+		_dialog3.Restore();
+		_dialog4.Restore();
+		_dialogCustomized.Restore();
+```
+
 ### Plc Example usage of Dialog
 
 ```csharp

diff --git a/src/TcoCore/src/TcoCore.Wpf/TcoDialog/TcoDialog/TcoCustomizedDialogDialogViewModel.cs b/src/TcoCore/src/TcoCore.Wpf/TcoDialog/TcoDialog/TcoCustomizedDialogDialogViewModel.cs
@@ -48,7 +48,7 @@ public TcoCustomizedDialogDialogViewModel() : base()
         private void dispatcherTimer_Tick(object sender, EventArgs e)
         {
             Dialog.Read();
-            if ( Dialog._answer.LastValue != (short)eCustomizedDialogAnswer.NoAnswer)
+            if (Dialog._answer.LastValue != (short)eCustomizedDialogAnswer.Invoked)
             {
                 this.Close(this, new EventArgs());
 

diff --git a/src/TcoCore/src/TcoCore.Wpf/TcoDialog/TcoDialog/TcoDialogDialogViewModel.cs b/src/TcoCore/src/TcoCore.Wpf/TcoDialog/TcoDialog/TcoDialogDialogViewModel.cs
@@ -48,7 +48,7 @@ public TcoDialogDialogViewModel() : base()
         private void dispatcherTimer_Tick(object sender, EventArgs e)
         {
             Dialog.Read();
-            if ( Dialog._answer.LastValue != (short)eDialogAnswer.NoAnswer)
+            if (  Dialog._answer.LastValue != (short)eDialogAnswer.Invoked)
             {
                 this.Close(this, new EventArgs());
 

diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoCustomizedDialog.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoCustomizedDialog.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TcOpen.Inxton.Dialogs;
+using Vortex.Connector;
+
+namespace TcoCore
+{
+   public partial class TcoCustomizedDialog : IsDialog
+    {
+        public new void ShowAgainIfInvoked()
+        {
+            this.Read();
+            if ((eDialogAnswer)this._answer.LastValue == eDialogAnswer.Invoked)
+            {
+                this._restoreRequest.Synchron = true;
+            }
+        }
+    }
+}
diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoDialog.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoDialog.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TcOpen.Inxton.Dialogs;
+using Vortex.Connector;
+
+namespace TcoCore
+{
+   public partial class TcoDialog : IsDialog
+    {
+        public new void ShowAgainIfInvoked()
+        {
+            this.Read();
+            if ((eDialogAnswer)this._answer.LastValue == eDialogAnswer.Invoked)
+            {
+                this._restoreRequest.Synchron = true;
+            }
+        }
+    }
+}
diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoDialogBase.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoDialog/TcoDialogBase.cs
@@ -10,5 +10,10 @@ namespace TcoCore
     public partial class TcoDialogBase : IsDialog
     {
         public string DialogId { get; set; }
+
+        public void ShowAgainIfInvoked()
+        {
+
+        }
     }
 }
diff --git a/...ore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/Customized/TcoCustomizedDialog.TcPOU b/...ore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/Customized/TcoCustomizedDialog.TcPOU
@@ -56,11 +56,24 @@ END_VAR
         </Implementation>
       </Get>
     </Property>
+    <Method Name="ClearInfos" Id="{9e722987-911a-0195-3661-cb02771b3598}">
+      <Declaration><![CDATA[METHOD INTERNAL ClearInfos
+VAR_INPUT
+END_VAR
+]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[_imageSource:='';
+_caption:='';
+_text:='';
+_dialogType  := eDialogType.Undefined;
+]]></ST>
+      </Implementation>
+    </Method>
     <Method Name="OnStart" Id="{bf8ba463-a3c1-01f6-35a4-f02acf9128ba}">
       <Declaration><![CDATA[METHOD PROTECTED OnStart ]]></Declaration>
       <Implementation>
         <ST><![CDATA[SUPER^.OnStart();
-_answer := eCustomizedDialogAnswer.NoAnswer;]]></ST>
+_answer := eCustomizedDialogAnswer.Invoked;]]></ST>
       </Implementation>
     </Method>
     <Method Name="Restore" Id="{5fc5f523-ea5c-0427-1adc-baeb66ae158a}">
@@ -70,10 +83,8 @@ END_VAR
 ]]></Declaration>
       <Implementation>
         <ST><![CDATA[SUPER^.Restore();
-_imageSource:='';
-_caption:='';
-_text:='';
-_dialogType  := eDialogType.Undefined;]]></ST>
+ClearInfos();
+_answer:=eCustomizedDialogAnswer.NoAnswer;]]></ST>
       </Implementation>
     </Method>
     <Method Name="Show" Id="{450b74d4-edd3-0a58-040d-81caa87a3c2a}">
@@ -107,15 +118,13 @@ _contentOption4 := '';
 
 
 
-_imageSource := '';
-_text := '';
-_caption := '';
-_dialogType := eDialogType.Undefined;
+ClearInfos();
 
 Show := THIS^;
 
-IF THIS^._taskState = eTaskState.Done AND _answer <> eDialogAnswer.NoAnswer THEN
-    THIS^.Restore();
+IF THIS^._taskState = eTaskState.Done AND _answer <> eCustomizedDialogAnswer.Invoked  AND  _answer<>eCustomizedDialogAnswer.NoAnswer  THEN
+   SUPER^.Restore();
+	THIS^.ClearInfos();
 END_IF;
 ]]></ST>
       </Implementation>
@@ -184,10 +193,8 @@ _contentOption2 := '';
 _contentOption3 := '';
 _contentOption4 := '';
 
-_imageSource := '';
-_text        := '';
-_caption     := '';
-_dialogType  := eDialogType.Undefined;
+ClearInfos();
+
 
 ShowWithExternalClose := THIS^;
 
@@ -203,8 +210,9 @@ IF _rTrig.q THEN
 END_IF
 
 
-IF THIS^._taskState=eTaskState.Done AND _answer<>eDialogAnswer.NoAnswer THEN	
-	THIS^.Restore();
+IF THIS^._taskState=eTaskState.Done AND _answer<>eDialogAnswer.Invoked THEN	
+	SUPER^.Restore();
+	THIS^.ClearInfos();
 END_IF; ]]></ST>
       </Implementation>
     </Method>

diff --git a/...src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/Customized/eCustomizedDialogAnswer.TcDUT b/...src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/Customized/eCustomizedDialogAnswer.TcDUT
@@ -10,7 +10,8 @@ TYPE
         Option1 := 10,
         Option2 := 20,
         Option3 := 30,
-        Option4 := 40
+        Option4 := 40,
+		Invoked := 50
     );
 END_TYPE
 ]]></Declaration>

diff --git a/src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/TcoDialog.TcPOU b/src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/TcoDialog.TcPOU
@@ -52,11 +52,24 @@ END_VAR
         </Implementation>
       </Get>
     </Property>
+    <Method Name="ClearInfos" Id="{c6d266a9-164a-0722-16e5-669ea7a37376}">
+      <Declaration><![CDATA[METHOD INTERNAL ClearInfos
+VAR_INPUT
+END_VAR
+]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[_imageSource:='';
+_caption:='';
+_text:='';
+_dialogType  := eDialogType.Undefined;
+]]></ST>
+      </Implementation>
+    </Method>
     <Method Name="OnStart" Id="{889d908b-4444-0ca3-12c3-2ee5a16d4c25}">
       <Declaration><![CDATA[METHOD PROTECTED OnStart ]]></Declaration>
       <Implementation>
         <ST><![CDATA[SUPER^.OnStart();
-_answer := eDialogAnswer.NoAnswer;]]></ST>
+_answer := eDialogAnswer.Invoked;]]></ST>
       </Implementation>
     </Method>
     <Method Name="Restore" Id="{b1b04a3a-6e24-00f0-1f54-b5cc0b7efc8c}">
@@ -66,10 +79,8 @@ END_VAR
 ]]></Declaration>
       <Implementation>
         <ST><![CDATA[SUPER^.Restore();
-_imageSource:='';
-_caption:='';
-_text:='';
-_dialogType  := eDialogType.Undefined;]]></ST>
+THIS^.ClearInfos();
+_answer:=eDialogAnswer.NoAnswer;]]></ST>
       </Implementation>
     </Method>
     <Method Name="Show" Id="{052bdc3b-8ff1-0bbd-0fbb-d25a0348416f}">
@@ -99,16 +110,13 @@ _hasYes      := FALSE;
 _hasNo       := FALSE;
 _hasCancel   := FALSE;
 
-_imageSource  :='';
-_text        := '';
-_caption     := '';
-_dialogType  := eDialogType.Undefined;
-
+ClearInfos();
 
 Show := THIS^;
 
-IF THIS^._taskState=eTaskState.Done AND _answer<>eDialogAnswer.NoAnswer THEN
-	THIS^.Restore();
+IF THIS^._taskState=eTaskState.Done AND  _answer<>eDialogAnswer.Invoked AND  _answer<>eDialogAnswer.NoAnswer THEN
+	SUPER^.Restore();
+	THIS^.ClearInfos();
 END_IF; 
  ]]></ST>
       </Implementation>
@@ -173,10 +181,8 @@ _hasYes      := FALSE;
 _hasNo       := FALSE;
 _hasCancel   := FALSE;
 
-_imageSource  :='';
-_text        := '';
-_caption     := '';
-_dialogType  := eDialogType.Undefined;
+ClearInfos();
+
 
 ShowWithExternalClose := THIS^;
 
@@ -192,8 +198,9 @@ IF _rTrig.q THEN
 END_IF
 
 
-IF THIS^._taskState=eTaskState.Done AND _answer<>eDialogAnswer.NoAnswer THEN	
-	THIS^.Restore();
+IF THIS^._taskState=eTaskState.Done AND _answer<>eDialogAnswer.Invoked  AND  _answer<>eDialogAnswer.NoAnswer  THEN	
+	SUPER^.Restore();
+	THIS^.ClearInfos();
 END_IF; ]]></ST>
       </Implementation>
     </Method>

diff --git a/src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/eDialogAnswer.TcDUT b/src/TcoCore/src/XaeTcoCore/TcoCore/POUs/Prototypes/TcoDialog/eDialogAnswer.TcDUT
@@ -10,7 +10,8 @@ TYPE
         OK       := 10,
         Yes      := 20,
         No       := 30,
-        Cancel   := 40	
+        Cancel   := 40,
+		Invoked	  :=50
     );
 END_TYPE
 ]]></Declaration>

diff --git a/src/TcoCore/src/XaeTcoCore/TcoCoreExamples/Examples/Dialogs/DiaglogsContext.TcPOU b/src/TcoCore/src/XaeTcoCore/TcoCoreExamples/Examples/Dialogs/DiaglogsContext.TcPOU
@@ -44,7 +44,14 @@ END_VAR]]></Declaration>
       <Implementation>
         <ST><![CDATA[
 CASE _state OF
-    0:
+			
+	0:
+		_dialog1.Restore();
+		_dialog2.Restore();
+		_dialog3.Restore();
+		_dialog4.Restore();
+		_dialogCustomized.Restore();
+
         IF (_invokeDiaglog1) THEN
             _state := 10;
 		ELSIF (_invokeCustomizedDiaglog) THEN
@@ -234,7 +241,7 @@ CASE _state OF
 				_invokeDiaglog1 := FALSE;
 			END_IF;
 		
-	
+
     1000:
         IF (_dialog3.Show()
             .WithType(eDialogType.Warning)

diff --git a/src/TcoCore/tests/TcoCore.Sandbox.Wpf/App.xaml.cs b/src/TcoCore/tests/TcoCore.Sandbox.Wpf/App.xaml.cs
@@ -54,6 +54,7 @@ public App() : base()
             PlcTcoCoreExamples.EXAMPLES_PRG._loggerContext._loggerUsage._logger.StartLoggingMessages(eMessageCategory.All);
             PlcTcoCoreExamples.MAIN._station001._components._wrappedComponent2.SearchComponentsDepth = 1;
             PlcTcoCoreExamples.MAIN._station001._components._di.IsExpanded = false;
+
         }
 
 
@@ -92,7 +93,7 @@ private static TcoCoreExamplesTwinController CreateTwin()
         {
             if (!IsInDesign)
             {
-                return new TcoCoreExamplesTwinController(Tc3ConnectorAdapter.Create(AMS_ID, 853, true));
+                return new TcoCoreExamplesTwinController(Tc3ConnectorAdapter.Create( 853, true));
             }
             else
             {

diff --git a/src/TcoInspectors/README.md b/src/TcoInspectors/README.md
@@ -13,6 +13,11 @@ IF (seq.Step(inStepID := 0,
     inStepDescription := 'ASKING SOME QUESTION')) THEN
     //--------------------------------------------------------
 //<StandardDialog>	
+	
+	//restore method also close each inactive dialog
+	Data.BoltPresenceInspector.Restore();
+	GroupInspection.Restore();
+
 	answer := _dialog			
 			.Show()	
 			.WithType(eDialogType.Question)				

diff --git a/src/TcoInspectors/src/TcoInspectorsConnector/pex/TcoInspectorDialog.cs b/src/TcoInspectors/src/TcoInspectorsConnector/pex/TcoInspectorDialog.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TcoCore;
+using TcOpen.Inxton.Dialogs;
+using Vortex.Connector;
+
+namespace TcoInspectors
+{
+    public partial class TcoInspectorDialog : IsDialog
+        {
+            public new void ShowAgainIfInvoked()
+            {
+                this.Read();
+                if (this._isInvoked.LastValue)
+                {
+                    this._restoreRequest.Synchron = true;
+                }
+            }
+        }
+
+}