MS

app/DD-Record-Organiser/frmUserKonfig.vb

@@ -44,7 +44,7 @@
         Try
             Me.TBDD_CLIENTBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_CLIENT.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox2.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox2.Text = USER_USERNAME
                 Me.TBDD_CLIENTBindingSource.EndEdit()
                 Me.TBDD_CLIENTTableAdapter.Update(Me.DD_DMSDataSet.TBDD_CLIENT)
                 Label7.Visible = True
@@ -60,7 +60,7 @@
         Try
             Me.TBDD_USERBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_USER.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = USER_USERNAME
                 Me.TBDD_USERBindingSource.EndEdit()
                 Me.TBDD_USERTableAdapter.Update(Me.DD_DMSDataSet.TBDD_USER)
                 lblsave.Visible = True
@@ -72,7 +72,7 @@
         End Try
     End Sub
     Private Sub TBDD_USERBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USERBindingSource.AddingNew
-        DD_DMSDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBDD_USER.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub tsAddUser_Click(sender As Object, e As EventArgs) Handles tsAddUser.Click
@@ -106,7 +106,7 @@
                 MsgBox(String.Format("Der Benutzer {0} ist bereits Mitglied der Gruppe {1}", USERNAMETextBox.Text, groupName), MsgBoxStyle.Exclamation)
                 Exit Sub
             Else
-                SQL = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", userID, groupID, Environment.UserName)
+                SQL = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", userID, groupID, USER_USERNAME)
                 If ClassDatabase.Execute_non_Query(SQL) = True Then
                     LoadGroupsForSelectedUser()
                 Else
@@ -136,16 +136,16 @@
         End Try
         Dim SQL As String = String.Format("SELECT GROUP_NAME FROM VWPMO_USERS_GROUPS WHERE USER_ID = {0}", userID)
 
-            Try
-                Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
+        Try
+            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
 
-                lbGroups.Items.Clear()
-                For Each row As DataRow In dt.Rows
-                    lbGroups.Items.Add(row.Item(0).ToString)
-                Next
-            Catch ex As Exception
-                MsgBox("Error in LoadGroupsForSelectedUser:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End Try
+            lbGroups.Items.Clear()
+            For Each row As DataRow In dt.Rows
+                lbGroups.Items.Add(row.Item(0).ToString)
+            Next
+        Catch ex As Exception
+            MsgBox("Error in LoadGroupsForSelectedUser:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
 
     End Sub
     Private Sub GetMandantForSelectedUser()
@@ -204,7 +204,7 @@
     End Sub
 
     Private Sub TBDD_USER_GROUPSBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_USER_GROUPSBindingSource.AddingNew
-        Me.DD_DMSDataSet.TBDD_USER_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        Me.DD_DMSDataSet.TBDD_USER_GROUPS.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub ToolStripButton7_Click(sender As Object, e As EventArgs) Handles ToolStripButton7.Click
@@ -215,7 +215,7 @@
         Try
             Me.TBDD_USER_GROUPSBindingSource.EndEdit()
             If DD_DMSDataSet.TBDD_USER_GROUPS.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox1.Text = Environment.UserName
+                Me.CHANGED_WHOTextBox1.Text = USER_USERNAME
                 Me.TBDD_USER_GROUPSBindingSource.EndEdit()
                 Me.TBDD_USER_GROUPSTableAdapter.Update(Me.DD_DMSDataSet.TBDD_USER_GROUPS)
             End If
@@ -311,7 +311,7 @@
             Case 1
                 Load_Groups()
                 Load_Selectable_Users_for_Groups()
-              
+
                 Try
                     cmbGroups_Group2User.SelectedIndex = 1
                 Catch ex As Exception
@@ -326,7 +326,7 @@
             If row.Item(0) = CBool(True) Then
                 Dim sql = "select count(*) from TBDD_GROUPS_USER Where user_id = " & row.Item(5) & " AND GROUP_ID = " & cmbGroups_Group2User.SelectedValue
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                    sql = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbGroups_Group2User.SelectedValue, Environment.UserName)
+                    sql = String.Format("INSERT INTO TBDD_GROUPS_USER (USER_ID, GROUP_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbGroups_Group2User.SelectedValue, USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(sql) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to Group {1}", row.Item(1), cmbGroups_Group2User.Text), MsgBoxStyle.Critical)
                     End If
@@ -413,7 +413,7 @@
         Save_Clients()
     End Sub
     Private Sub TBDD_CLIENTBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_CLIENTBindingSource.AddingNew
-        DD_DMSDataSet.TBDD_CLIENT.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSDataSet.TBDD_CLIENT.ADDED_WHOColumn.DefaultValue = USER_USERNAME
     End Sub
 
     Private Sub TabControl3_SelectedIndexChanged(sender As Object, e As EventArgs) Handles TabControl3.SelectedIndexChanged
@@ -458,7 +458,7 @@
             If row.Item(0) = CBool(True) Then
                 Dim sql = "select count(*) from TBDD_CLIENT_USER Where user_id = " & row.Item(5) & " AND CLIENT_ID = " & cmbClientsforUser.SelectedValue
                 If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                    sql = String.Format("INSERT INTO TBDD_CLIENT_USER (USER_ID, CLIENT_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbClientsforUser.SelectedValue, Environment.UserName)
+                    sql = String.Format("INSERT INTO TBDD_CLIENT_USER (USER_ID, CLIENT_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", row.Item(5), cmbClientsforUser.SelectedValue, USER_USERNAME)
                     If ClassDatabase.Execute_non_Query(sql) = False Then
                         MsgBox(String.Format("Error in Adding User {0} to Client {1}", row.Item(1), cmbGroups_Group2User.Text), MsgBoxStyle.Critical)
                     End If
@@ -552,6 +552,11 @@
     'End Sub
 
     Private Sub BindingNavigatorDeleteItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem.Click
+        delete_user()
+
+
+    End Sub
+    Sub Delete_user()
         Dim msg = "Sind Sie sicher, dass Sie diesen User löschen wollen?"
         If USER_LANGUAGE <> "de-DE" Then
             msg = "Are You sure You want to delete the selected user?"
@@ -566,7 +571,10 @@
                 MsgBox("Unexpected Error while deleting User.", MsgBoxStyle.Exclamation)
             End If
         End If
-
-
+    End Sub
+    Private Sub frmUserKonfig_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp
+        If e.KeyCode = Keys.Delete Then
+            Delete_user()
+        End If
     End Sub
 End Class