MS

2020-12-02 13:53:28 +01:00 · 2020-12-02 13:53:28 +01:00 · 8a4e59c1b2
commit 8a4e59c1b2
parent 8ec1b7b2f1
9 changed files with 5078 additions and 6125 deletions
--- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
+++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb
@ -44,12 +44,13 @@ Public Class ClassAllgemeineFunktionen
                oSql = 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
                If INACTIVITYRecognized = True Then
-                    oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID IN (SELECT GUID FROM TBDD_USER_LOGIN_OUT 
-                    WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND LOGOUT IS NULL)"
-                    ClassDatabase.Execute_non_Query(oSql, "Inactivity insert")
+                    oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected',LOGOUT = GETDATE() WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager') AND LOGOUT IS NULL"
+                    If ClassDatabase.Execute_non_Query(oSql, "Inactivity insert") = True Then
+
+                    End If
                End If

-                oSql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
+                    oSql = $"DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')"
            End If
            If ClassDatabase.Execute_non_Query(oSql, "LOGIN/OUT") = True Then
                LOGGER.Debug($"{LoginorOut} of User successfully!")
--- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb
+++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb
@ -84,7 +84,7 @@
                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
                    Try
                        LAST_EDITED_COLUMN = oLEDITEDCOL
-                        LOGGER.Info($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
+                        LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
                    Catch ex As Exception
                        LAST_EDITED_COLUMN = ""

@ -93,7 +93,7 @@
                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
                    Try
                        LAST_ADDED_COLUMN = oLEDITEDCOL
-                        LOGGER.Info($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
+                        LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
                    Catch ex As Exception
                        LAST_ADDED_COLUMN = ""

--- a/app/DD_PM_WINDREAM/ClassSnapPanelNew.vb
+++ b/app/DD_PM_WINDREAM/ClassSnapPanelNew.vb
@ -0,0 +1,56 @@
+Public Class ClassSnapPanelNew
+    Inherits System.Windows.Forms.Panel
+
+    Private _ShowGrid As Boolean = True
+    Private _GridSize As Integer = 16
+
+    Private Property AutoScaleMode As AutoScaleMode
+
+    Public Property GridSize As Integer
+        Get
+            Return _GridSize
+        End Get
+        Set(value As Integer)
+            _GridSize = value
+            Refresh()
+        End Set
+    End Property
+
+    Public Property ShowGrid As Boolean
+        Get
+            Return _ShowGrid
+        End Get
+        Set(value As Boolean)
+            _ShowGrid = value
+            Refresh()
+        End Set
+    End Property
+
+    Protected Overrides Sub OnControlAdded(e As System.Windows.Forms.ControlEventArgs)
+        AddHandler e.Control.LocationChanged, AddressOf AlignToGrid
+        AddHandler e.Control.DragDrop, AddressOf AlignToGrid
+        MyBase.OnControlAdded(e)
+    End Sub
+
+    Protected Overrides Sub OnControlRemoved(e As System.Windows.Forms.ControlEventArgs)
+        RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid
+        RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid
+        MyBase.OnControlRemoved(e)
+    End Sub
+
+    Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs)
+        If _ShowGrid Then
+            ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor)
+        End If
+        MyBase.OnPaint(e)
+    End Sub
+
+    Private Sub AlignToGrid(sender As Object, e As EventArgs)
+        If _ShowGrid Then
+            Dim item As Control = CType(sender, Control)
+            Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize
+            Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize
+            item.Location = New Point(x, y)
+        End If
+    End Sub
+End Class
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@ -256,6 +256,9 @@
    <Compile Include="ClassSnapPanel.vb">
      <SubType>Component</SubType>
    </Compile>
+    <Compile Include="ClassSnapPanelNew.vb">
+      <SubType>Component</SubType>
+    </Compile>
    <Compile Include="ClassSQLEditor.vb" />
    <Compile Include="ClassSQLTypeConverter.vb" />
    <Compile Include="ClassSQLValue.vb" />
--- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb
--- a/app/DD_PM_WINDREAM/frmAdministration.resx
+++ b/app/DD_PM_WINDREAM/frmAdministration.resx
--- a/app/DD_PM_WINDREAM/frmMain.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb
@ -88,11 +88,14 @@ Partial Class frmMain
        Me.bbtnitmGhostMode = New DevExpress.XtraBars.BarButtonItem()
        Me.bsi_GhostMode = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.SearchItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.SearchItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupBasicConf = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
        Me.DocumentViewerBarManager1 = New DevExpress.XtraPrinting.Preview.DocumentViewerBarManager(Me.components)
@ -168,10 +171,6 @@ Partial Class frmMain
        Me.bwBasicData = New System.ComponentModel.BackgroundWorker()
        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)
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.SearchItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.SearchItem2 = New DevExpress.XtraBars.BarButtonItem()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit()
@ -656,6 +655,22 @@ Partial Class frmMain
        Me.BarButtonItem2.Name = "BarButtonItem2"
        Me.BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
        '
+        'SearchItem1
+        '
+        resources.ApplyResources(Me.SearchItem1, "SearchItem1")
+        Me.SearchItem1.Id = 22
+        Me.SearchItem1.ImageOptions.SvgImage = CType(resources.GetObject("SearchItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.SearchItem1.Name = "SearchItem1"
+        Me.SearchItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        '
+        'SearchItem2
+        '
+        resources.ApplyResources(Me.SearchItem2, "SearchItem2")
+        Me.SearchItem2.Id = 23
+        Me.SearchItem2.ImageOptions.SvgImage = CType(resources.GetObject("SearchItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.SearchItem2.Name = "SearchItem2"
+        Me.SearchItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup4})
@ -694,6 +709,14 @@ Partial Class frmMain
        Me.RibbonPageGroupBasicConf.Name = "RibbonPageGroupBasicConf"
        resources.ApplyResources(Me.RibbonPageGroupBasicConf, "RibbonPageGroupBasicConf")
        '
+        'RibbonPageGroup4
+        '
+        Me.RibbonPageGroup4.AllowTextClipping = False
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.SearchItem1)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.SearchItem2)
+        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
+        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
+        '
        'RibbonStatusBar1
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiUser)
@ -1315,30 +1338,6 @@ Partial Class frmMain
        'TimerInactivity
        '
        '
-        'RibbonPageGroup4
-        '
-        Me.RibbonPageGroup4.AllowTextClipping = False
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.SearchItem1)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.SearchItem2)
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
-        '
-        'SearchItem1
-        '
-        resources.ApplyResources(Me.SearchItem1, "SearchItem1")
-        Me.SearchItem1.Id = 22
-        Me.SearchItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.SearchItem1.Name = "SearchItem1"
-        Me.SearchItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-        '
-        'SearchItem2
-        '
-        resources.ApplyResources(Me.SearchItem2, "SearchItem2")
-        Me.SearchItem2.Id = 23
-        Me.SearchItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage1"), DevExpress.Utils.Svg.SvgImage)
-        Me.SearchItem2.Name = "SearchItem2"
-        Me.SearchItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
-        '
        'frmMain
        '
        Me.Appearance.Options.UseFont = True
@ -1524,7 +1523,6 @@ Partial Class frmMain
    Friend WithEvents ExportierenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
    Friend WithEvents TimerInactivity As Timer
-    Friend WithEvents Timer1 As Timer
    Friend WithEvents SearchItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents SearchItem2 As DevExpress.XtraBars.BarButtonItem
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAARABBwEQAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAASgBBwEoAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -1303,7 +1303,7 @@
  <data name="SearchItem1.Caption" xml:space="preserve">
    <value>Suche</value>
  </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="SearchItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -1326,7 +1326,7 @@
  <data name="SearchItem2.Caption" xml:space="preserve">
    <value>Suche2</value>
  </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage1" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="SearchItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@ -1998,6 +1998,18 @@
  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;SearchItem1.Name" xml:space="preserve">
+    <value>SearchItem1</value>
+  </data>
+  <data name="&gt;&gt;SearchItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;SearchItem2.Name" xml:space="preserve">
+    <value>SearchItem2</value>
+  </data>
+  <data name="&gt;&gt;SearchItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
    <value>RibbonPage1</value>
  </data>
@ -2028,6 +2040,12 @@
  <data name="&gt;&gt;RibbonPageGroupBasicConf.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
+    <value>RibbonPageGroup4</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;DocumentViewerBarManager1.Name" xml:space="preserve">
    <value>DocumentViewerBarManager1</value>
  </data>
@ -2448,30 +2466,6 @@
  <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;RibbonPageGroup4.Name" xml:space="preserve">
-    <value>RibbonPageGroup4</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;SearchItem1.Name" xml:space="preserve">
-    <value>SearchItem1</value>
-  </data>
-  <data name="&gt;&gt;SearchItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;SearchItem2.Name" xml:space="preserve">
-    <value>SearchItem2</value>
-  </data>
-  <data name="&gt;&gt;SearchItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
@ -2852,7 +2846,4 @@
  <metadata name="TimerInactivity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>744, 95</value>
  </metadata>
-  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>875, 95</value>
-  </metadata>
 </root>
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@ -2362,8 +2362,12 @@ Public Class frmMain
            Dim omsg As String = "Sie wurden aufgrund von Inaktivität automatisch abgemeldet!"

            If USER_LANGUAGE <> "de-DE" Then
-                omsg = "Due to inactivity we closed all actions and You were logged out automatically."
+                omsg = "Due to inactivity we closed all actions and You have been logged out automatically."
            End If
+            Timer5Mins.Stop()
+            TimerRefresh.Stop()
+            TimerReminder.Stop()
+            LOGGER.Info("Inactivity recognized. Automatic Logout in process!")
            Hide()
            ClassAllgemeineFunktionen.LoginOut("LOGOUT")
            TimerInactivity.Stop()
@ -2376,7 +2380,6 @@ Public Class frmMain

    Private Sub BarButtonItem3_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SearchItem1.ItemClick
        Try
-
            Dim oTag = SearchItem1.Tag
            Dim _SPLIT As String()
            _SPLIT = oTag.Split("%")
@ -2390,5 +2393,9 @@ Public Class frmMain
        End Try


+    End Sub
+
+    Private Sub GridView_Docs_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridView_Docs.SelectionChanged
+
    End Sub
 End Class