MS Inactivity 1

2020-10-16 12:39:43 +02:00 · 2020-10-16 12:39:43 +02:00 · 5362733f5e
commit 5362733f5e
parent eb5690b000
9 changed files with 111 additions and 30 deletions
--- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
+++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
@ -43,10 +43,23 @@ Public Class ClassAllgemeineFunktionen
            If LoginorOut = "LOGIN" Then
                Sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Process-Manager','{2}','{3}')", USER_ID, 1, My.Application.Info.Version.ToString, Environment.MachineName)
            Else
-                Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Process-Manager')"
+                Sql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND UPPER(MACHINE_NAME) = UPPER('{Environment.MachineName}')"
            End If
-            If ClassDatabase.Execute_non_Query(Sql, True) = True Then
-                LOGGER.Debug("User logged in....")
+            If ClassDatabase.Execute_non_Query(Sql, "LOGIN/OUT") = True Then
+                Try
+                    If LoginorOut = "LOGOUT" Then
+                        If INACTIVITYRecognized = True Then
+                            Dim oSQL As String = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID = (SELECT MAX(GUID) FROM TBDD_USER_LOGIN_OUT 
+                    WHERE USER_ID = {USER_ID} AND MODULE = 'Process-Manager' AND MACHINE_NAME = '{Environment.MachineName}')"
+                            ClassDatabase.Execute_non_Query(Sql, "Inactivity insert")
+                        End If
+                    End If
+                Catch ex As Exception
+                    LOGGER.Warn($"Unexpected Error in logging Inactivity [{ex.Message}] ")
+                End Try
+
+
+                LOGGER.Debug($"User {LoginorOut} successfully!")
                Return True
            Else
                LOGGER.Info("User could not be logged in/out....")
--- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb
+++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb
@ -70,6 +70,13 @@
                ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then
                    Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "")
                    CONV_IDENTIFICATION = oIdent
+                ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
+                    Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
+                    Try
+                        INACTIVITY_DURATION = CInt(oInactivityDuration)
+                    Catch ex As Exception
+                        INACTIVITY_DURATION = 0
+                    End Try
                Else
                    LOGGER.Info($"Wrong oMode: {oMode}")
                End If
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@ -43,7 +43,7 @@
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
    <Prefer32Bit>false</Prefer32Bit>
    <CodeAnalysisRuleSet>UnusedCode.ruleset</CodeAnalysisRuleSet>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <PlatformTarget>x86</PlatformTarget>
--- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
+++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
@ -72,6 +72,8 @@ Module ModuleRuntimeVariables
    Public ADDITIONAL_TITLE As String = ""
    Public CONV_IDENTIFICATION As String = "Username"
    Public POPUP_REMINDER_ACTIVE As Boolean = True
+    Public INACTIVITY_DURATION As Integer = 0
+    Public INACTIVITYRecognized As Boolean = False

    Public LICENSE_COUNT As Integer = 0
    Public LICENSE_EXPIRED As Boolean = False
--- a/app/DD_PM_WINDREAM/frmMain.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb
@ -175,6 +175,8 @@ Partial Class frmMain
        Me.PrintPreviewBarCheckItem18 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem()
        Me.PrintPreviewBarCheckItem19 = New DevExpress.XtraPrinting.Preview.PrintPreviewBarCheckItem()
        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
+        Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
@ -1355,6 +1357,9 @@ Partial Class frmMain
        '
        Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
        '
+        'TimerInactivity
+        '
+        '
        'frmMain
        '
        Me.Appearance.Options.UseFont = True
@ -1551,4 +1556,6 @@ Partial Class frmMain
    Friend WithEvents tslblObjectCount As ToolStripLabel
    Friend WithEvents ExportierenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
+    Friend WithEvents TimerInactivity As Timer
+    Friend WithEvents Timer1 As Timer
 End Class
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAcQBBgHEAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAdQBBgHUAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -266,6 +266,12 @@
  <data name="ToolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
    <value>266, 6</value>
  </data>
+  <data name="DateiAlsLinkVersendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>200, 22</value>
+  </data>
+  <data name="DateiAlsLinkVersendenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Datei als Link versenden</value>
+  </data>
  <data name="AktionenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>269, 26</value>
  </data>
@ -604,12 +610,6 @@
  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
-  <data name="DateiAlsLinkVersendenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 22</value>
-  </data>
-  <data name="DateiAlsLinkVersendenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Datei als Link versenden</value>
-  </data>
  <metadata name="NotifyIcon1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>908, 17</value>
  </metadata>
@ -1327,6 +1327,18 @@
  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Allgemein</value>
+  </data>
+  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+    <value>Funktionen</value>
+  </data>
+  <data name="RibbonPageGroup3.Text" xml:space="preserve">
+    <value>Verwaltung</value>
+  </data>
+  <data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
+    <value>Grundeinstellungen</value>
+  </data>
  <data name="RibbonPage1.Text" xml:space="preserve">
    <value>Start</value>
  </data>
@ -1363,18 +1375,6 @@
  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Allgemein</value>
-  </data>
-  <data name="RibbonPageGroup2.Text" xml:space="preserve">
-    <value>Funktionen</value>
-  </data>
-  <data name="RibbonPageGroup3.Text" xml:space="preserve">
-    <value>Verwaltung</value>
-  </data>
-  <data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
-    <value>Grundeinstellungen</value>
-  </data>
  <data name="RibbonPage2.Text" xml:space="preserve">
    <value>RibbonPage2</value>
  </data>
@ -2498,6 +2498,18 @@
  <data name="&gt;&gt;XtraSaveFileDialog1.Type" xml:space="preserve">
    <value>DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;TimerInactivity.Name" xml:space="preserve">
+    <value>TimerInactivity</value>
+  </data>
+  <data name="&gt;&gt;TimerInactivity.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Timer1.Name" xml:space="preserve">
+    <value>Timer1</value>
+  </data>
+  <data name="&gt;&gt;Timer1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
@ -2710,9 +2722,6 @@
  <data name="miView.Caption" xml:space="preserve">
    <value>&amp;Ansicht</value>
  </data>
-  <data name="miBackground.Caption" xml:space="preserve">
-    <value>&amp;Hintergrund</value>
-  </data>
  <data name="miPageLayout.Caption" xml:space="preserve">
    <value>&amp;Seiten Layout</value>
  </data>
@ -2725,6 +2734,9 @@
  <data name="miToolbars.Caption" xml:space="preserve">
    <value>Bars</value>
  </data>
+  <data name="miBackground.Caption" xml:space="preserve">
+    <value>&amp;Hintergrund</value>
+  </data>
  <data name="PrintPreviewBarCheckItem1.Caption" xml:space="preserve">
    <value>PDF Dokument</value>
  </data>
@ -2842,4 +2854,10 @@
  <metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>919, 134</value>
  </metadata>
+  <metadata name="TimerInactivity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1078, 134</value>
+  </metadata>
+  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 173</value>
+  </metadata>
 </root>
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@ -199,9 +199,11 @@ Public Class frmMain
                bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
            End If
            Check_Timer_Notification()
+            Check_Timer_Inactivity()
            formShown = True
            Restore_Form_Position()

+
            If IDB_ACTIVE = False And ERROR_STATE = "" Then
                Try
                    If Init_windream() = True Then
@ -254,6 +256,22 @@ Public Class frmMain

        End Try

+    End Sub
+    Public Sub Check_Timer_Inactivity()
+        Try
+            If INACTIVITY_DURATION <> 0 Then
+                TimerInactivity.Stop()
+                TimerInactivity.Interval = INACTIVITY_DURATION * 60000
+                TimerInactivity.Start()
+            Else
+                TimerInactivity.Enabled = False
+                TimerInactivity.Stop()
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+
+        End Try
+
    End Sub
    Sub Restore_Form_Position()
        Try
@ -1192,8 +1210,6 @@ Public Class frmMain
                    CURRENT_DOC_GUID = 0
                    CURRENT_ProfilGUID = oHitProfilID
                    LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{oHitProfilID}]")
-
-
                    Load_Profil_from_Grid(oHitProfilID)

                ElseIf hitInfo.InDataRow Then
@ -2222,4 +2238,21 @@ Public Class frmMain
            End If

    End Sub
+
+    Private Sub TimerInactivity_Tick(sender As Object, e As EventArgs) Handles TimerInactivity.Tick
+        If Application.OpenForms().OfType(Of frmValidator).Any Then
+            Check_Timer_Inactivity()
+            Exit Sub
+        End If
+        If Application.OpenForms().OfType(Of frmAdministration).Any Then
+            Check_Timer_Inactivity()
+            Exit Sub
+        End If
+        Try
+            INACTIVITYRecognized = True
+            Application.Exit()
+        Catch ex As Exception
+            LOGGER.Error(ex.Message)
+        End Try
+    End Sub
 End Class
--- a/app/DD_PM_WINDREAM/frmMonitor.vb
+++ b/app/DD_PM_WINDREAM/frmMonitor.vb
@ -166,7 +166,6 @@ Public Class frmMonitor
    End Sub
    Sub Load_Grid_Data()
        Try
-            Application.
            FormShown = False
            Dim oSQL = "SELECT * FROM TBPM_MONITOR_KONFIG"
            DT_MONITOR_KONFIG = ClassDatabase.Return_Datatable(oSQL, "Monitor-Load_Grid_Data1")
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@ -410,8 +410,10 @@ Public Class frmValidator
            End Try
            My.Settings.frmValidatorSize = Me.Size
            My.Settings.Save()
+            If INACTIVITY_DURATION <> 0 Then frmMain.Check_Timer_Inactivity()
+
            Try
-                _frmValidatorSearch.Close()
+            _frmValidatorSearch.Close()
            Catch ex As Exception

            End Try