MS18.10.2017

This commit is contained in:
Digital Data - Marlon Schreiber 2017-10-18 11:40:17 +02:00
parent 76796df71f
commit ccdac594d1
12 changed files with 1077 additions and 974 deletions

View File

@ -4,7 +4,7 @@
Return ClassDatabase.Execute_non_Query(SQL) = True
End Function
Public Shared Function GetLastRecord()
Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = " & CURRENT_ENTITY_ID & " AND UPPER(ADDED_WHO) = '" & USER_USERNAME & "'"
Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
Return ClassDatabase.Execute_Scalar(SQL)
End Function

View File

@ -56,10 +56,11 @@
ElseIf dt.Rows.Count = 0 Then
Return Nothing
Else
Throw New Exception("Record" & RecordId & " is not unique")
MsgBox("Unexpected behaviour in IsRecordLocked: ", MsgBoxStyle.Information)
Return Nothing
End If
Catch ex As Exception
MsgBox("Error in IsRecordInWork: " + vbNewLine + ex.Message, MsgBoxStyle.Critical)
MsgBox("Error in IsRecordLocked: " + vbNewLine + ex.Message, MsgBoxStyle.Critical)
Return Nothing
End Try
End Function

View File

@ -27,6 +27,7 @@ Module ModuleMySettings
Public vWLaufwerk As String = "W"
Public vVERSION_DELIMITER As String = "~"
Public vFILE_DELIMITER As String = "_"
Public AUTO_LOGOUT_USER As Integer
Public USER_IS_ADMIN = False
Public USERS_LOGGED_IN = 0
@ -394,6 +395,7 @@ Module ModuleMySettings
vWLaufwerk = DT.Rows(0).Item("STRING1")
vVERSION_DELIMITER = DT.Rows(0).Item("VERSION_DELIMITER")
vFILE_DELIMITER = DT.Rows(0).Item("FILE_DELIMITER")
AUTO_LOGOUT_USER = DT.Rows(0).Item("AUTO_LOGOUT_USER")
Else
Return False
End If

View File

@ -1,2 +1,3 @@
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -1743,8 +1743,8 @@ Public Class frmConstructor_Main
End If
End If
Me.Cursor = Cursors.WaitCursor
Try
If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then
' Try
If TCDetails.SelectedTabPage.Text.StartsWith("Pos") = False Then
SELECTED_RECORD_ID = 0
Lock_RecordControls(False)
tsButtonCancel.Visible = True
@ -1752,9 +1752,9 @@ Public Class frmConstructor_Main
CURRENT_PARENT_ENTITY_ID = PARENT_ENTITYID
' Den Record anlegen, damit wir eine RECORD_ID bekommen
If ClassRecordCommands.CreateRecord(ENTITY_ID) = True Then
' Die RECORD_ID auslesen und setzen
NEW_RECORD_ID = ClassRecordCommands.GetLastRecord(ENTITY_ID)
CURRENT_RECORD_ID = NEW_RECORD_ID
' Die RECORD_ID auslesen und setzen
NEW_RECORD_ID = ClassRecordCommands.GetLastRecord()
CURRENT_RECORD_ID = NEW_RECORD_ID
RECORD_ID = NEW_RECORD_ID
SELECTED_RECORD_ID = NEW_RECORD_ID
ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID)
@ -1787,11 +1787,11 @@ Public Class frmConstructor_Main
End If
End If
Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace)
Finally
Me.Cursor = Cursors.Default
End Try
' Catch ex As Exception
'ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error tsButtonAdd", ex.Message, ex.StackTrace)
' Finally
'Me.Cursor = Cursors.Default
' End Try
End Sub
Private Sub tsButtonSave_Click(sender As Object, e As EventArgs) Handles tsButtonSave.Click
@ -2837,8 +2837,6 @@ Public Class frmConstructor_Main
If CtrlCommandUI.IsInsert = True Then
EDIT_STATE = EditState.None
Lock_RecordControls(True)
'Me.pnlDetails.Enabled = False
'CtrlCommandUI.IsInsert = False
End If
Try
Dim ResultMessage = Update_Record_OnChange()
@ -6400,7 +6398,7 @@ Public Class frmConstructor_Main
If RECORD_CREATE = True Then
ClassRecordCommands.CreateRecord(ENTITY_ID)
Try
NEWRECORD = ClassRecordCommands.GetLastRecord(ENTITY_ID)
NEWRECORD = ClassRecordCommands.GetLastRecord()
Catch ex As Exception
Dim SQL = "SELECT (MAX(GUID)) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND ADDED_WHO = '" & USER_USERNAME & "'"
NEWRECORD = ClassDatabase.Execute_Scalar(SQL)

View File

@ -14,7 +14,7 @@ Public Class frmMain
Dim strIPAddress As String
Public Shared TIMER_SCAN As New System.Windows.Forms.Timer
Public Shared TIMER_INACTIVITY As New System.Windows.Forms.Timer
Private Shared Sub Scan_TickHandler(sender As Object, e As EventArgs)
Try
If ClassFolderWatcher.NEW_FILES = False Then Exit Sub
@ -600,6 +600,16 @@ Public Class frmMain
MsgBox(String.Format("Your version '{0}' does not match the minimum required version and needs to be updated! Please contact Your systemadministrator!" & vbNewLine & "Application will close now.", My.Application.Info.Version.ToString), MsgBoxStyle.Exclamation)
Me.Close()
End If
Try
If USER_IS_ADMIN = False Or AUTO_LOGOUT_USER > 0 Then
TIMER_INACTIVITY.Interval = AUTO_LOGOUT_USER
'TIMER_INACTIVITY.Enabled = True
'AddHandler TIMER_INACTIVITY.Tick, AddressOf Scan_TickHandler
End If
Catch ex As Exception
ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUOTP_LOGOUT_USER: " & ex.Message)
End Try
Catch ex As Exception
MsgBox("Unexpected Error in FormShown: " & ex.Message, MsgBoxStyle.Critical)
End Try

View File

@ -62,6 +62,8 @@ Partial Class frmRecOrgConfig_Basic
Me.btnSaveUpdatePath = New System.Windows.Forms.Button()
Me.Label11 = New System.Windows.Forms.Label()
Me.txtBoxUpdatePath = New System.Windows.Forms.TextBox()
Me.txtAutoLogoutUser = New System.Windows.Forms.TextBox()
Me.Label12 = New System.Windows.Forms.Label()
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.GroupBox3.SuspendLayout()
@ -282,6 +284,8 @@ Partial Class frmRecOrgConfig_Basic
'
'TabPage1
'
Me.TabPage1.Controls.Add(Me.txtAutoLogoutUser)
Me.TabPage1.Controls.Add(Me.Label12)
Me.TabPage1.Controls.Add(Me.GroupBox2)
Me.TabPage1.Controls.Add(Me.txtWiki)
Me.TabPage1.Controls.Add(Me.GroupBox1)
@ -329,6 +333,16 @@ Partial Class frmRecOrgConfig_Basic
resources.ApplyResources(Me.txtBoxUpdatePath, "txtBoxUpdatePath")
Me.txtBoxUpdatePath.Name = "txtBoxUpdatePath"
'
'txtAutoLogoutUser
'
resources.ApplyResources(Me.txtAutoLogoutUser, "txtAutoLogoutUser")
Me.txtAutoLogoutUser.Name = "txtAutoLogoutUser"
'
'Label12
'
resources.ApplyResources(Me.Label12, "Label12")
Me.Label12.Name = "Label12"
'
'frmRecOrgConfig_Basic
'
resources.ApplyResources(Me, "$this")
@ -394,4 +408,6 @@ Partial Class frmRecOrgConfig_Basic
Friend WithEvents btnSaveUpdatePath As Button
Friend WithEvents Label11 As Label
Friend WithEvents lblSave As Label
Friend WithEvents txtAutoLogoutUser As TextBox
Friend WithEvents Label12 As Label
End Class

View File

@ -285,7 +285,7 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="GroupBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 9</value>
@ -309,7 +309,7 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<data name="txtWiki.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 93</value>
@ -330,7 +330,7 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;txtWiki.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="Label9.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -361,7 +361,7 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;Label9.ZOrder" xml:space="preserve">
<value>3</value>
<value>5</value>
</data>
<data name="lblSaveresult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
@ -397,7 +397,67 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;lblSaveresult.ZOrder" xml:space="preserve">
<value>6</value>
<value>8</value>
</data>
<data name="&gt;&gt;btnResetBackground.Name" xml:space="preserve">
<value>btnResetBackground</value>
</data>
<data name="&gt;&gt;btnResetBackground.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnResetBackground.Parent" xml:space="preserve">
<value>GroupBox3</value>
</data>
<data name="&gt;&gt;btnResetBackground.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;btnSelectBackground.Name" xml:space="preserve">
<value>btnSelectBackground</value>
</data>
<data name="&gt;&gt;btnSelectBackground.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnSelectBackground.Parent" xml:space="preserve">
<value>GroupBox3</value>
</data>
<data name="&gt;&gt;btnSelectBackground.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;pbBackground.Name" xml:space="preserve">
<value>pbBackground</value>
</data>
<data name="&gt;&gt;pbBackground.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pbBackground.Parent" xml:space="preserve">
<value>GroupBox3</value>
</data>
<data name="&gt;&gt;pbBackground.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="GroupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>558, 9</value>
</data>
<data name="GroupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>368, 315</value>
</data>
<data name="GroupBox3.TabIndex" type="System.Int32, mscorlib">
<value>81</value>
</data>
<data name="GroupBox3.Text" xml:space="preserve">
<value>Anwendungshintergrund</value>
</data>
<data name="&gt;&gt;GroupBox3.Name" xml:space="preserve">
<value>GroupBox3</value>
</data>
<data name="&gt;&gt;GroupBox3.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GroupBox3.Parent" xml:space="preserve">
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox3.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="btnResetBackground.Location" type="System.Drawing.Point, System.Drawing">
<value>211, 274</value>
@ -471,42 +531,9 @@
<data name="&gt;&gt;pbBackground.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="GroupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>558, 9</value>
</data>
<data name="GroupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>368, 315</value>
</data>
<data name="GroupBox3.TabIndex" type="System.Int32, mscorlib">
<value>81</value>
</data>
<data name="GroupBox3.Text" xml:space="preserve">
<value>Anwendungshintergrund</value>
</data>
<data name="&gt;&gt;GroupBox3.Name" xml:space="preserve">
<value>GroupBox3</value>
</data>
<data name="&gt;&gt;GroupBox3.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GroupBox3.Parent" xml:space="preserve">
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox3.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="txtProductName.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 21</value>
</data>
<data name="txtProductName.Size" type="System.Drawing.Size, System.Drawing">
<value>238, 22</value>
</data>
<data name="txtProductName.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;txtProductName.Name" xml:space="preserve">
<value>txtProductName</value>
</data>
@ -541,7 +568,28 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox4.ZOrder" xml:space="preserve">
<value>7</value>
<value>9</value>
</data>
<data name="txtProductName.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 21</value>
</data>
<data name="txtProductName.Size" type="System.Drawing.Size, System.Drawing">
<value>238, 22</value>
</data>
<data name="txtProductName.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;txtProductName.Name" xml:space="preserve">
<value>txtProductName</value>
</data>
<data name="&gt;&gt;txtProductName.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtProductName.Parent" xml:space="preserve">
<value>GroupBox4</value>
</data>
<data name="&gt;&gt;txtProductName.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnsave.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
@ -574,7 +622,7 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;btnsave.ZOrder" xml:space="preserve">
<value>4</value>
<value>6</value>
</data>
<data name="chkChildWindow.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -583,7 +631,7 @@
<value>NoControl</value>
</data>
<data name="chkChildWindow.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 146</value>
<value>0, 175</value>
</data>
<data name="chkChildWindow.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 30</value>
@ -605,8 +653,164 @@
<value>TabPage1</value>
</data>
<data name="&gt;&gt;chkChildWindow.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="&gt;&gt;Label10.Name" xml:space="preserve">
<value>Label10</value>
</data>
<data name="&gt;&gt;Label10.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label10.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label10.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;btnTest_Anmeldung.Name" xml:space="preserve">
<value>btnTest_Anmeldung</value>
</data>
<data name="&gt;&gt;btnTest_Anmeldung.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnTest_Anmeldung.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;btnTest_Anmeldung.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;txtServername.Name" xml:space="preserve">
<value>txtServername</value>
</data>
<data name="&gt;&gt;txtServername.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtServername.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;txtServername.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;Label5.Name" xml:space="preserve">
<value>Label5</value>
</data>
<data name="&gt;&gt;Label5.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label5.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="&gt;&gt;txtPW.Name" xml:space="preserve">
<value>txtPW</value>
</data>
<data name="&gt;&gt;txtPW.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtPW.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;txtPW.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;Label4.Name" xml:space="preserve">
<value>Label4</value>
</data>
<data name="&gt;&gt;Label4.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label4.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="&gt;&gt;txtUser.Name" xml:space="preserve">
<value>txtUser</value>
</data>
<data name="&gt;&gt;txtUser.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtUser.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;txtUser.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="&gt;&gt;Label6.Name" xml:space="preserve">
<value>Label6</value>
</data>
<data name="&gt;&gt;Label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label6.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;txtDomäne.Name" xml:space="preserve">
<value>txtDomäne</value>
</data>
<data name="&gt;&gt;txtDomäne.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtDomäne.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;txtDomäne.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="&gt;&gt;Label7.Name" xml:space="preserve">
<value>Label7</value>
</data>
<data name="&gt;&gt;Label7.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label7.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
<value>9</value>
</data>
<data name="&gt;&gt;Label8.Name" xml:space="preserve">
<value>Label8</value>
</data>
<data name="&gt;&gt;Label8.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label8.Parent" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="GroupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 211</value>
</data>
<data name="GroupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>541, 170</value>
</data>
<data name="GroupBox5.TabIndex" type="System.Int32, mscorlib">
<value>83</value>
</data>
<data name="GroupBox5.Text" xml:space="preserve">
<value>Userauthentifizierung windream Rechte:</value>
</data>
<data name="&gt;&gt;GroupBox5.Name" xml:space="preserve">
<value>GroupBox5</value>
</data>
<data name="&gt;&gt;GroupBox5.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GroupBox5.Parent" xml:space="preserve">
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox5.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="Label10.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -893,29 +1097,56 @@ Anmeldeservers in den Grundeinstellungen des Users.</value>
<data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="GroupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 182</value>
<data name="txtAutoLogoutUser.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 134</value>
</data>
<data name="GroupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>541, 170</value>
<data name="txtAutoLogoutUser.Size" type="System.Drawing.Size, System.Drawing">
<value>58, 22</value>
</data>
<data name="GroupBox5.TabIndex" type="System.Int32, mscorlib">
<value>83</value>
<data name="txtAutoLogoutUser.TabIndex" type="System.Int32, mscorlib">
<value>85</value>
</data>
<data name="GroupBox5.Text" xml:space="preserve">
<value>Userauthentifizierung windream Rechte:</value>
<data name="&gt;&gt;txtAutoLogoutUser.Name" xml:space="preserve">
<value>txtAutoLogoutUser</value>
</data>
<data name="&gt;&gt;GroupBox5.Name" xml:space="preserve">
<value>GroupBox5</value>
<data name="&gt;&gt;txtAutoLogoutUser.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GroupBox5.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;GroupBox5.Parent" xml:space="preserve">
<data name="&gt;&gt;txtAutoLogoutUser.Parent" xml:space="preserve">
<value>TabPage1</value>
</data>
<data name="&gt;&gt;GroupBox5.ZOrder" xml:space="preserve">
<value>5</value>
<data name="&gt;&gt;txtAutoLogoutUser.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="Label12.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="Label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="Label12.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 118</value>
</data>
<data name="Label12.Size" type="System.Drawing.Size, System.Drawing">
<value>197, 13</value>
</data>
<data name="Label12.TabIndex" type="System.Int32, mscorlib">
<value>84</value>
</data>
<data name="Label12.Text" xml:space="preserve">
<value>Auto Abmelden Inaktivität: (Minuten)</value>
</data>
<data name="&gt;&gt;Label12.Name" xml:space="preserve">
<value>Label12</value>
</data>
<data name="&gt;&gt;Label12.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label12.Parent" xml:space="preserve">
<value>TabPage1</value>
</data>
<data name="&gt;&gt;Label12.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="TabPage1.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
@ -924,7 +1155,7 @@ Anmeldeservers in den Grundeinstellungen des Users.</value>
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>938, 358</value>
<value>938, 399</value>
</data>
<data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -944,6 +1175,105 @@ Anmeldeservers in den Grundeinstellungen des Users.</value>
<data name="&gt;&gt;TabPage1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;lblSave.Name" xml:space="preserve">
<value>lblSave</value>
</data>
<data name="&gt;&gt;lblSave.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblSave.Parent" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;lblSave.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;btnSaveUpdatePath.Name" xml:space="preserve">
<value>btnSaveUpdatePath</value>
</data>
<data name="&gt;&gt;btnSaveUpdatePath.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnSaveUpdatePath.Parent" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;btnSaveUpdatePath.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;Label11.Name" xml:space="preserve">
<value>Label11</value>
</data>
<data name="&gt;&gt;Label11.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;Label11.Parent" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;Label11.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;txtBoxUpdatePath.Name" xml:space="preserve">
<value>txtBoxUpdatePath</value>
</data>
<data name="&gt;&gt;txtBoxUpdatePath.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtBoxUpdatePath.Parent" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;txtBoxUpdatePath.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="TabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>938, 358</value>
</data>
<data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="TabPage2.Text" xml:space="preserve">
<value>Update-Einstellungen</value>
</data>
<data name="&gt;&gt;TabPage2.Name" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;TabPage2.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;TabPage2.Parent" xml:space="preserve">
<value>TabControl1</value>
</data>
<data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>946, 425</value>
</data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>84</value>
</data>
<data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
<value>TabControl1</value>
</data>
<data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblSave.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1058,57 +1388,6 @@ Anmeldeservers in den Grundeinstellungen des Users.</value>
<data name="&gt;&gt;txtBoxUpdatePath.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="TabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>938, 358</value>
</data>
<data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="TabPage2.Text" xml:space="preserve">
<value>Update-Einstellungen</value>
</data>
<data name="&gt;&gt;TabPage2.Name" xml:space="preserve">
<value>TabPage2</value>
</data>
<data name="&gt;&gt;TabPage2.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;TabPage2.Parent" xml:space="preserve">
<value>TabControl1</value>
</data>
<data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>946, 384</value>
</data>
<data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
<value>84</value>
</data>
<data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
<value>TabControl1</value>
</data>
<data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
<value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -1116,7 +1395,7 @@ Anmeldeservers in den Grundeinstellungen des Users.</value>
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>946, 384</value>
<value>946, 425</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 8.25pt</value>

View File

@ -15,6 +15,7 @@ Public Class frmRecOrgConfig_Basic
Me.txtDelimiterFile.Text = dt.Rows(0).Item("FILE_DELIMITER")
Me.txtwddriveletter.Text = dt.Rows(0).Item("STRING1")
Me.txtProductName.Text = dt.Rows(0).Item("PRODUCT_NAME1")
Me.txtAutoLogoutUser.Text = dt.Rows(0).Item("AUTO_LOGOUT_USER")
' Hintergrundbild unwandeln und anzeigen
If Not IsDBNull(dt.Rows(0).Item("BACKGROUND_IMAGE")) Then
@ -78,7 +79,7 @@ Public Class frmRecOrgConfig_Basic
Dim image As Bitmap = Nothing
Dim bimage() As Byte = Nothing
Dim sql As String = "UPDATE TBDD_MODULES SET VERSION_DELIMITER = @VERSION_DELIMITER, FILE_DELIMITER = @FILE_DELIMITER, STRING1 = @STRING1, BACKGROUND_IMAGE = @BACKGROUND_IMAGE, PRODUCT_NAME1 = @PRODUCT_NAME1, CHANGED_WHO = @CHANGED_WHO WHERE NAME = 'Record-Organizer'"
Dim sql As String = "UPDATE TBDD_MODULES SET AUTO_LOGOUT_USER = @AUTO_LOGOUT_USER, VERSION_DELIMITER = @VERSION_DELIMITER, FILE_DELIMITER = @FILE_DELIMITER, STRING1 = @STRING1, BACKGROUND_IMAGE = @BACKGROUND_IMAGE, PRODUCT_NAME1 = @PRODUCT_NAME1, CHANGED_WHO = @CHANGED_WHO WHERE NAME = 'Record-Organizer'"
Dim conn As New SqlClient.SqlConnection(MyConnectionString)
Dim cmd As New SqlClient.SqlCommand(sql, conn)
@ -91,6 +92,7 @@ Public Class frmRecOrgConfig_Basic
End If
cmd.Parameters.Add("@VERSION_DELIMITER", SqlDbType.Text).Value = txtDelimiterVersion.Text
cmd.Parameters.Add("@AUTO_LOGOUT_USER", SqlDbType.Int).Value = txtAutoLogoutUser.Text
cmd.Parameters.Add("@FILE_DELIMITER", SqlDbType.Text).Value = txtDelimiterFile.Text
cmd.Parameters.Add("@STRING1", SqlDbType.Text).Value = txtwddriveletter.Text
cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.Text).Value = USER_USERNAME
@ -240,4 +242,11 @@ Public Class frmRecOrgConfig_Basic
Private Sub txtWiki_VisibleChanged(sender As Object, e As EventArgs) Handles txtWiki.VisibleChanged
End Sub
Private Sub txtAutoLogoutUser_TextChanged(sender As Object, e As EventArgs) Handles txtAutoLogoutUser.TextChanged
If loaded = True Then
changes_ModuleKonfig = True
btnsave.Enabled = True
End If
End Sub
End Class

View File

@ -74,6 +74,8 @@ Partial Class frmUserKonfig
Me.TBDD_USERBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
Me.tbRefreshUsers = New System.Windows.Forms.ToolStripButton()
Me.tsAddUser = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
Me.tsbtnExoirtExcel = New System.Windows.Forms.ToolStripButton()
Me.USER_GUIDTextBox = New System.Windows.Forms.TextBox()
Me.PRENAMETextBox = New System.Windows.Forms.TextBox()
Me.NAMETextBox = New System.Windows.Forms.TextBox()
@ -227,8 +229,6 @@ Partial Class frmUserKonfig
Me.WAN_ENVIRONMENTCheckBox = New System.Windows.Forms.CheckBox()
Me.DATE_FORMATComboBox = New System.Windows.Forms.ComboBox()
Me.LOG_OUT_WHENTextBox = New System.Windows.Forms.TextBox()
Me.tsbtnExoirtExcel = New System.Windows.Forms.ToolStripButton()
Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
GUIDLabel = New System.Windows.Forms.Label()
PRENAMELabel = New System.Windows.Forms.Label()
NAMELabel = New System.Windows.Forms.Label()
@ -612,6 +612,20 @@ Partial Class frmUserKonfig
resources.ApplyResources(Me.tsAddUser, "tsAddUser")
Me.tsAddUser.Name = "tsAddUser"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4")
'
'tsbtnExoirtExcel
'
Me.tsbtnExoirtExcel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.tsbtnExoirtExcel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
Me.tsbtnExoirtExcel.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
resources.ApplyResources(Me.tsbtnExoirtExcel, "tsbtnExoirtExcel")
Me.tsbtnExoirtExcel.Name = "tsbtnExoirtExcel"
'
'USER_GUIDTextBox
'
Me.USER_GUIDTextBox.BackColor = System.Drawing.Color.WhiteSmoke
@ -1673,9 +1687,9 @@ Partial Class frmUserKonfig
'
'GridViewUser
'
Me.GridViewUser.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView1.Appearance.EvenRow.BackColor"), System.Drawing.Color)
Me.GridViewUser.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.EvenRow.BackColor"), System.Drawing.Color)
Me.GridViewUser.Appearance.EvenRow.Options.UseBackColor = True
Me.GridViewUser.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
Me.GridViewUser.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUser.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
Me.GridViewUser.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridViewUser.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colUSERNAME, Me.colNAME, Me.colEMAIL})
Me.GridViewUser.GridControl = Me.GridControlUser
@ -1743,20 +1757,6 @@ Partial Class frmUserKonfig
Me.LOG_OUT_WHENTextBox.Name = "LOG_OUT_WHENTextBox"
Me.LOG_OUT_WHENTextBox.ReadOnly = True
'
'tsbtnExoirtExcel
'
Me.tsbtnExoirtExcel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.tsbtnExoirtExcel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
Me.tsbtnExoirtExcel.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
resources.ApplyResources(Me.tsbtnExoirtExcel, "tsbtnExoirtExcel")
Me.tsbtnExoirtExcel.Name = "tsbtnExoirtExcel"
'
'ToolStripSeparator4
'
Me.ToolStripSeparator4.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
resources.ApplyResources(Me.ToolStripSeparator4, "ToolStripSeparator4")
'
'frmUserKonfig
'
resources.ApplyResources(Me, "$this")

File diff suppressed because it is too large Load Diff

View File

@ -594,7 +594,7 @@ Public Class frmUserKonfig
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Dim del = "EXEC [dbo].[PRPMO_DELETE_USER] " & USER_GUIDTextBox.Text
If ClassDatabase.Execute_non_Query(del, True) = True Then
If ClassDatabase.Execute_non_Query(del) = True Then
Load_User()
Else
MsgBox("Unexpected Error while deleting User.", MsgBoxStyle.Exclamation)