diff --git a/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache b/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache index 671ed4a..715c91b 100644 Binary files a/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache and b/app/.vs/DD_PM_WINDREAM/DesignTimeBuild/.dtbcache differ diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 6c89a09..4112adb 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -183,19 +183,7 @@ Public Class ClassInit USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") - Try - WORKING_MODE = DT_CHECKUSER_MODULE.Rows(0).Item("WORKING_MODE") - Catch ex As Exception - WORKING_MODE = "" - End Try - If WORKING_MODE.Contains("PM#FORCE_LAYOUT_OVERVIEW") Then - FORCE_LAYOUT_OVERVIEW = True - End If - If WORKING_MODE.Contains("PM#NO_CHARTS") Then - SHOW_CHARTS = False - Else - SHOW_CHARTS = True - End If + ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) Try diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb new file mode 100644 index 0000000..ac56356 --- /dev/null +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -0,0 +1,33 @@ +Public Class ClassParamRefresh + Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable) + FORCE_LAYOUT_OVERVIEW = False + SHOW_CHARTS = True + USER_DEBUG_LOG = False + + + If DT_CHECKUSER.Rows.Count = 1 Then + USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN") + Try + WORKING_MODE = DT_CHECKUSER.Rows(0).Item("WORKING_MODE") + Catch ex As Exception + WORKING_MODE = "" + End Try + + If WORKING_MODE.Contains("PM#FORCE_LAYOUT_OVERVIEW") Then + FORCE_LAYOUT_OVERVIEW = True + End If + + If WORKING_MODE.Contains("PM#NO_CHARTS") Then + SHOW_CHARTS = False + End If + + If WORKING_MODE.Contains("PM#DEBUG_LOG") Then + USER_DEBUG_LOG = True + LOGCONFIG.Debug = True + + End If + + End If + + End Sub +End Class diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 59d6ca9..a6c0d71 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -214,6 +214,7 @@ + diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 06ecd05..c8c7479 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -39,6 +39,7 @@ Module ModuleRuntimeVariables Public USER_RIGHT2 As Boolean = False Public USER_RIGHT3 As Boolean = False Public USER_RIGHT4 As Boolean = False + Public USER_DEBUG_LOG As Boolean = False Public FORCE_LAYOUT_OVERVIEW As Boolean = False diff --git a/app/DD_PM_WINDREAM/frmKonfig.vb b/app/DD_PM_WINDREAM/frmKonfig.vb index 1ed0a78..fb141d6 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.vb @@ -273,7 +273,7 @@ Public Class frmKonfig End Sub Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles btnLogMail.Click - email.Send_Log_Mail(" Log-/SupportMail von Process-Manager DD.

", _ + email.Send_Log_Mail(" Log-/SupportMail von Process-Manager DD.

", "Support-Mail Process-Manager", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support@didalog.de", False, True) End Sub @@ -284,7 +284,7 @@ Public Class frmKonfig End Sub Private Sub Button1_Click_3(sender As Object, e As EventArgs) Handles Button1.Click - MsgBox("Culture-Name: " & CultureInfo.CurrentCulture.Name & vbNewLine & "Culture-ThreeLetterISOLanguageName: " & CultureInfo.CurrentCulture.ThreeLetterISOLanguageName & vbNewLine & _ + MsgBox("Culture-Name: " & CultureInfo.CurrentCulture.Name & vbNewLine & "Culture-ThreeLetterISOLanguageName: " & CultureInfo.CurrentCulture.ThreeLetterISOLanguageName & vbNewLine & "CurrentUICulture-Name: " & CultureInfo.CurrentUICulture.Name & vbNewLine & "CurrentUICulture-ThreeLetterISOLanguageName: " & CultureInfo.CurrentUICulture.ThreeLetterISOLanguageName) End Sub diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index e08c190..3da0b43 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -53,6 +53,7 @@ Partial Class frmMain Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblLastSysnc = New System.Windows.Forms.ToolStripStatusLabel() Me.tslblmessage = New System.Windows.Forms.ToolStripStatusLabel() + Me.tsslblDEBUG_LOG = New System.Windows.Forms.ToolStripStatusLabel() Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControl_Docs = New DevExpress.XtraGrid.GridControl() Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -93,6 +94,7 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) Me.Timer5Mins = New System.Windows.Forms.Timer(Me.components) + Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -308,7 +310,7 @@ Partial Class frmMain ' resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsstlblUser, Me.tslblLicenses, Me.tslblUserLoggedin, Me.tslblVersion, Me.tsslblLastSysnc, Me.tslblmessage}) + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsstlblUser, Me.tslblLicenses, Me.tslblUserLoggedin, Me.tslblVersion, Me.tsslblLastSysnc, Me.tslblmessage, Me.tsslblDEBUG_LOG}) Me.StatusStrip1.Name = "StatusStrip1" ' 'tsstlblUser @@ -360,6 +362,13 @@ Partial Class frmMain Me.tslblmessage.Name = "tslblmessage" resources.ApplyResources(Me.tslblmessage, "tslblmessage") ' + 'tsslblDEBUG_LOG + ' + resources.ApplyResources(Me.tsslblDEBUG_LOG, "tsslblDEBUG_LOG") + Me.tsslblDEBUG_LOG.ForeColor = System.Drawing.Color.DarkRed + Me.tsslblDEBUG_LOG.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.A_1 + Me.tsslblDEBUG_LOG.Name = "tsslblDEBUG_LOG" + ' 'Panel1 ' Me.Panel1.Controls.Add(Me.GridControl_Docs) @@ -730,4 +739,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents LayoutSpeichernToolStripMenuItem As ToolStripMenuItem Friend WithEvents Timer5Mins As Timer + Friend WithEvents tsslblDEBUG_LOG As ToolStripStatusLabel + Friend WithEvents ToolTip1 As ToolTip End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 76e15bc..6b5ecd6 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAUwBBAFMAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVQBBAFUAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -667,6 +667,15 @@ 0, 24 + + Tahoma, 9pt, style=Bold + + + 20, 24 + + + False + 0, 498 @@ -1407,6 +1416,9 @@ 1335, 95 + + 73, 134 + True @@ -1690,6 +1702,12 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsslblDEBUG_LOG + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + CMGroupStart @@ -1894,6 +1912,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolTip1 + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 52ec7ab..a28a7c8 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -9,6 +9,7 @@ Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraCharts Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraEditors.Controls +Imports System.Threading Public Class frmMain 'Private _windreamPM As ClassPMWindream @@ -870,7 +871,7 @@ Public Class frmMain If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() - + Handling_DEBUG_USER() End Sub @@ -1590,19 +1591,65 @@ Public Class frmMain Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown Decide_Load() - + Handling_DEBUG_USER() + End Sub + Sub Handling_DEBUG_USER() + If USER_DEBUG_LOG = True Then + If USER_LANGUAGE = "de-DE" Then + tsslblDEBUG_LOG.Text = "ACHTUNG: UserDebugMode ist eingeschaltet!" + Else + tsslblDEBUG_LOG.Text = "ATTENTION: UserDebugMode activated!" + End If + tsslblDEBUG_LOG.Visible = True + Else + tsslblDEBUG_LOG.Visible = False + End If End Sub - Private Sub Timer5Mins_Tick(sender As Object, e As EventArgs) Handles Timer5Mins.Tick Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) - If DT_CHECKUSER_MODULE.Rows.Count = 1 Then - USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + 1 - If USER_LANGUAGE = "de-DE" Then - tslblUserLoggedin.Text = "License Count: " & USERCOUNT_LOGGED_IN - Else - tslblUserLoggedin.Text = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN - End If + ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) + + If USER_LANGUAGE = "de-DE" Then + tslblUserLoggedin.Text = "License Count: " & USERCOUNT_LOGGED_IN + Else + tslblUserLoggedin.Text = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN End If + + + + 'If USER_DEBUG_LOG = True Then + ' 'Jetzt de rinsert der Inhalte + ' If Not IsNothing(LOGCONFIG.Logs) Then + ' If LOGCONFIG.Logs.Count > 0 Then + ' Dim odel = $"delete from TBPM_LOG_DEBUG where userid = {USER_ID}" + ' ClassDatabase.Execute_non_Query(odel) + + ' Dim thread As New Thread(AddressOf DebuglogBackgroundthread) + ' thread.Start() + + ' End If + + ' End If + 'End If + + End Sub + 'Sub DebuglogBackgroundthread() + ' For Each oSLogstring As String In LOGCONFIG.Logs + ' Dim oLogSplit As String() + ' oLogSplit = oSLogstring.Split("|") + ' 'Console.WriteLine(oLogSplit(2)) + ' Dim omsg = oLogSplit(2).Replace("'", "''") + ' omsg = omsg.Replace("\\n", "") + ' omsg = omsg.Replace(Chr(10), "") + ' omsg = omsg.Replace(Chr(13), "") + ' Dim odatetime As Date = CDate(oLogSplit(0)) + ' Dim oSQL As String = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID] , [LOGMSG], [ADDED_WHEN]) VALUES({USER_ID},'{omsg}','{odatetime}')" + ' ClassDatabase.Execute_non_Query(oSQL) + ' Next + 'End Sub + Private Sub tsslblDEBUG_LOG_MouseHover(sender As Object, e As EventArgs) Handles tsslblDEBUG_LOG.MouseHover + MsgBox("UserDebugMode is activated remotely. Debugdata will be transferred to database and will be deleted after 10 days!!", MsgBoxStyle.Information) + End Sub End Class \ No newline at end of file