AppStd/UserManager
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: bugfixes

Browse Source
This commit is contained in:
Jonathan Jenne 2018-06-14 14:53:42 +02:00
parent 767ce88170
commit 517043cdd0
8 changed files with 142 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
DDUserManager/DDUserManager/DS_ChangeS.Designer.vb generated
View File

@ -1123,23 +1123,18 @@ Namespace DS_ChangeSTableAdapters
Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.Connection = Me.Connection
Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_GROUPS] ([NAME], [ECM_FK_ID], [AD_SYNC], [INTERNAL], [ACTIVE], "& _ Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, ECM_FK_ID, AD_SYNC, INTE"& _
"[COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@NA"& _ "RNAL, ACTIVE, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@ECM_FK_ID,@AD_SYNC,@INTERNAL,@AC"& _
"ME, @ECM_FK_ID, @AD_SYNC, @INTERNAL, @ACTIVE, @COMMENT, @ADDED_WHO, @ADDED_WHEN,"& _ "TIVE,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, CO"& _
" @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL,"& _ "MMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE ("& _
" ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GRO"& _ "GUID = SCOPE_IDENTITY())"
"UPS WHERE (GUID = SCOPE_IDENTITY())"
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ECM_FK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AD_SYNC", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INTERNAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.Connection = Me.Connection
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, ECM_FK_ID = @ECM_FK_ID"& _ Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, ECM_FK_ID = @ECM_FK_ID"& _
@ -1169,7 +1164,7 @@ Namespace DS_ChangeSTableAdapters
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _
Private Sub InitCommandCollection() Private Sub InitCommandCollection()
Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(6) {} Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(7) {}
Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).Connection = Me.Connection
Me._commandCollection(0).CommandText = "SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WH"& _ Me._commandCollection(0).CommandText = "SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WH"& _
@ -1222,6 +1217,18 @@ Namespace DS_ChangeSTableAdapters
Me._commandCollection(6).CommandText = "SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (NAME = @NAME)" Me._commandCollection(6).CommandText = "SELECT GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (NAME = @NAME)"
Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(6).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(6).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7) = New Global.System.Data.SqlClient.SqlCommand()
Me._commandCollection(7).Connection = Me.Connection
Me._commandCollection(7).CommandText = "INSERT INTO TBDD_GROUPS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, ADDED_WHO, ECM_FK_ID, AD"& _
"_SYNC, INTERNAL, ACTIVE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@ADDED_WHO,@ECM_FK_ID,@AD_SYNC,@I"& _
"NTERNAL,@ACTIVE)"
Me._commandCollection(7).CommandType = Global.System.Data.CommandType.Text
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ECM_FK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AD_SYNC", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INTERNAL", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._commandCollection(7).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
End Sub End Sub
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@ -1485,7 +1492,7 @@ Namespace DS_ChangeSTableAdapters
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _
Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String) As Integer
If (NAME Is Nothing) Then If (NAME Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value
Else Else
@ -1495,30 +1502,10 @@ Namespace DS_ChangeSTableAdapters
Me.Adapter.InsertCommand.Parameters(2).Value = CType(AD_SYNC,Boolean) Me.Adapter.InsertCommand.Parameters(2).Value = CType(AD_SYNC,Boolean)
Me.Adapter.InsertCommand.Parameters(3).Value = CType(INTERNAL,Boolean) Me.Adapter.InsertCommand.Parameters(3).Value = CType(INTERNAL,Boolean)
Me.Adapter.InsertCommand.Parameters(4).Value = CType(ACTIVE,Boolean) Me.Adapter.InsertCommand.Parameters(4).Value = CType(ACTIVE,Boolean)
If (COMMENT Is Nothing) Then If (ADDED_WHO Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
Else Else
Me.Adapter.InsertCommand.Parameters(5).Value = CType(COMMENT,String) Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHO,String)
End If
If (ADDED_WHO Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
Else
Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String)
End If
If (ADDED_WHEN.HasValue = true) Then
Me.Adapter.InsertCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date)
Else
Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value
End If
If (CHANGED_WHO Is Nothing) Then
Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value
Else
Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHO,String)
End If
If (CHANGED_WHEN.HasValue = true) Then
Me.Adapter.InsertCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date)
Else
Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value
End If End If
Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _
@ -1606,6 +1593,42 @@ Namespace DS_ChangeSTableAdapters
Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer))
End If End If
End Function End Function
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, false)> _
Public Overloads Overridable Function InsertGroup(ByVal NAME As String, ByVal ADDED_WHO As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean) As Integer
Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(7)
If (NAME Is Nothing) Then
command.Parameters(0).Value = Global.System.DBNull.Value
Else
command.Parameters(0).Value = CType(NAME,String)
End If
If (ADDED_WHO Is Nothing) Then
command.Parameters(1).Value = Global.System.DBNull.Value
Else
command.Parameters(1).Value = CType(ADDED_WHO,String)
End If
command.Parameters(2).Value = CType(ECM_FK_ID,Integer)
command.Parameters(3).Value = CType(AD_SYNC,Boolean)
command.Parameters(4).Value = CType(INTERNAL,Boolean)
command.Parameters(5).Value = CType(ACTIVE,Boolean)
Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _
<> Global.System.Data.ConnectionState.Open) Then
command.Connection.Open
End If
Dim returnValue As Integer
Try
returnValue = command.ExecuteNonQuery
Finally
If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
command.Connection.Close
End If
End Try
Return returnValue
End Function
End Class End Class
'''<summary> '''<summary>

41
DDUserManager/DDUserManager/DS_ChangeS.xsd
View File

@ -35,20 +35,18 @@
</DbCommand> </DbCommand>
</DeleteCommand> </DeleteCommand>
<InsertCommand> <InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="false"> <DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO [TBDD_GROUPS] ([NAME], [ECM_FK_ID], [AD_SYNC], [INTERNAL], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@NAME, @ECM_FK_ID, @AD_SYNC, @INTERNAL, @ACTIVE, @COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); <CommandText>INSERT INTO TBDD_GROUPS
(NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, ADDED_WHO)
VALUES (@NAME,@ECM_FK_ID,@AD_SYNC,@INTERNAL,@ACTIVE,@ADDED_WHO);
SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE (GUID = SCOPE_IDENTITY())</CommandText> SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE (GUID = SCOPE_IDENTITY())</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="ECM_FK_ID" ColumnName="ECM_FK_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@AD_SYNC" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="AD_SYNC" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="AD_SYNC" ColumnName="AD_SYNC" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@AD_SYNC" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="AD_SYNC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@INTERNAL" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="INTERNAL" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="INTERNAL" ColumnName="INTERNAL" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INTERNAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INTERNAL" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters> </Parameters>
</DbCommand> </DbCommand>
</InsertCommand> </InsertCommand>
@ -175,6 +173,23 @@ WHERE (NAME = @NAME)</CommandText>
</DbCommand> </DbCommand>
</SelectCommand> </SelectCommand>
</DbSource> </DbSource>
<DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="InsertGroup" Modifier="Public" Name="InsertGroup" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy1" UserSourceName="InsertGroup">
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO TBDD_GROUPS
(NAME, ADDED_WHO, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE)
VALUES (@NAME,@ADDED_WHO,@ECM_FK_ID,@AD_SYNC,@INTERNAL,@ACTIVE)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ECM_FK_ID" ColumnName="ECM_FK_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ECM_FK_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ECM_FK_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="AD_SYNC" ColumnName="AD_SYNC" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@AD_SYNC" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="AD_SYNC" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="INTERNAL" ColumnName="INTERNAL" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@INTERNAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="INTERNAL" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBDD_GROUPS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
</DbSource>
</Sources> </Sources>
</TableAdapter> </TableAdapter>
</Tables> </Tables>
@ -185,7 +200,7 @@ WHERE (NAME = @NAME)</CommandText>
<xs:element name="DS_ChangeS" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_ChangeS" msprop:Generator_UserDSName="DS_ChangeS"> <xs:element name="DS_ChangeS" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_ChangeS" msprop:Generator_UserDSName="DS_ChangeS">
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPSRow" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent"> <xs:element name="TBDD_GROUPS" msprop:Generator_TableClassName="TBDD_GROUPSDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS" msprop:Generator_TablePropName="TBDD_GROUPS" msprop:Generator_RowDeletingName="TBDD_GROUPSRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPSRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPSRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS" msprop:Generator_RowChangedName="TBDD_GROUPSRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPSRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPSRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" /> <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />

2
DDUserManager/DDUserManager/DS_ChangeS.xss
View File

@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated. the code is regenerated.
</autogenerated>--> </autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="8" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="75" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes> <Shapes>
<Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="220" Y="16" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" /> <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="220" Y="16" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
</Shapes> </Shapes>

35
DDUserManager/DDUserManager/frmADImport_Groups.Designer.vb generated
View File

@ -30,13 +30,15 @@ Partial Class frmADImport_Groups
Me.viewAD_Groups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.viewAD_Groups = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colGROUPNAME = New DevExpress.XtraGrid.Columns.GridColumn() Me.colGROUPNAME = New DevExpress.XtraGrid.Columns.GridColumn()
Me.btnImport = New System.Windows.Forms.Button() Me.btnImport = New System.Windows.Forms.Button()
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.TBDD_GROUPSTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_GROUPSTableAdapter() Me.TBDD_GROUPSTableAdapter = New DDUserManager.DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter()
Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager() Me.TableAdapterManager = New DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager()
CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
@ -47,7 +49,7 @@ Partial Class frmADImport_Groups
Me.gridAD_Groups.Location = New System.Drawing.Point(0, 0) Me.gridAD_Groups.Location = New System.Drawing.Point(0, 0)
Me.gridAD_Groups.MainView = Me.viewAD_Groups Me.gridAD_Groups.MainView = Me.viewAD_Groups
Me.gridAD_Groups.Name = "gridAD_Groups" Me.gridAD_Groups.Name = "gridAD_Groups"
Me.gridAD_Groups.Size = New System.Drawing.Size(1146, 613) Me.gridAD_Groups.Size = New System.Drawing.Size(1154, 613)
Me.gridAD_Groups.TabIndex = 0 Me.gridAD_Groups.TabIndex = 0
Me.gridAD_Groups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAD_Groups}) Me.gridAD_Groups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAD_Groups})
' '
@ -84,17 +86,22 @@ Partial Class frmADImport_Groups
Me.btnImport.Enabled = False Me.btnImport.Enabled = False
Me.btnImport.Image = Global.DDUserManager.My.Resources.Resources.group_go Me.btnImport.Image = Global.DDUserManager.My.Resources.Resources.group_go
Me.btnImport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnImport.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.btnImport.Location = New System.Drawing.Point(955, 641) Me.btnImport.Location = New System.Drawing.Point(963, 649)
Me.btnImport.Name = "btnImport" Me.btnImport.Name = "btnImport"
Me.btnImport.Size = New System.Drawing.Size(179, 27) Me.btnImport.Size = New System.Drawing.Size(179, 27)
Me.btnImport.TabIndex = 1 Me.btnImport.TabIndex = 1
Me.btnImport.Text = "Import starten" Me.btnImport.Text = "Import starten"
Me.btnImport.UseVisualStyleBackColor = True Me.btnImport.UseVisualStyleBackColor = True
' '
'DS_ChangeS
'
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'TBDD_GROUPSBindingSource 'TBDD_GROUPSBindingSource
' '
Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS" Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS"
Me.TBDD_GROUPSBindingSource.DataSource = Me.UserDataSet Me.TBDD_GROUPSBindingSource.DataSource = Me.DS_ChangeS
' '
'TBDD_GROUPSTableAdapter 'TBDD_GROUPSTableAdapter
' '
@ -103,22 +110,14 @@ Partial Class frmADImport_Groups
'TableAdapterManager 'TableAdapterManager
' '
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
Me.TableAdapterManager.TBDD_CLIENT_USERTableAdapter = Nothing
Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing
Me.TableAdapterManager.TBDD_GROUPS_CLIENTTableAdapter = Nothing
Me.TableAdapterManager.TBDD_GROUPS_MODULESTableAdapter = Nothing
Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing
Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Me.TBDD_GROUPSTableAdapter Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Me.TBDD_GROUPSTableAdapter
Me.TableAdapterManager.TBDD_MODULESTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DDUserManager.DS_ChangeSTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
Me.TableAdapterManager.TBDD_USER_MODULESTableAdapter = Nothing
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
Me.TableAdapterManager.UpdateOrder = DDUserManager.UserDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
' '
'frmADImport_Groups 'frmADImport_Groups
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1146, 680) Me.ClientSize = New System.Drawing.Size(1154, 688)
Me.Controls.Add(Me.btnImport) Me.Controls.Add(Me.btnImport)
Me.Controls.Add(Me.gridAD_Groups) Me.Controls.Add(Me.gridAD_Groups)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@ -128,6 +127,7 @@ Partial Class frmADImport_Groups
CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBLOCAL_ADGROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.UserDataSet, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewAD_Groups, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False) Me.ResumeLayout(False)
@ -139,7 +139,8 @@ Partial Class frmADImport_Groups
Friend WithEvents TBLOCAL_ADGROUPSBindingSource As BindingSource Friend WithEvents TBLOCAL_ADGROUPSBindingSource As BindingSource
Friend WithEvents colGROUPNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colGROUPNAME As DevExpress.XtraGrid.Columns.GridColumn
Friend WithEvents btnImport As Button Friend WithEvents btnImport As Button
Friend WithEvents DS_ChangeS As DS_ChangeS
Friend WithEvents TBDD_GROUPSBindingSource As BindingSource Friend WithEvents TBDD_GROUPSBindingSource As BindingSource
Friend WithEvents TBDD_GROUPSTableAdapter As UserDataSetTableAdapters.TBDD_GROUPSTableAdapter Friend WithEvents TBDD_GROUPSTableAdapter As DS_ChangeSTableAdapters.TBDD_GROUPSTableAdapter
Friend WithEvents TableAdapterManager As UserDataSetTableAdapters.TableAdapterManager Friend WithEvents TableAdapterManager As DS_ChangeSTableAdapters.TableAdapterManager
End Class End Class

9
DDUserManager/DDUserManager/frmADImport_Groups.resx
View File

@ -123,14 +123,17 @@
<metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="UserDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>258, 17</value> <value>258, 17</value>
</metadata> </metadata>
<metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="DS_ChangeS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>626, 17</value> <value>626, 17</value>
</metadata> </metadata>
<metadata name="TBDD_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>746, 17</value>
</metadata>
<metadata name="TBDD_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TBDD_GROUPSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>840, 17</value> <value>960, 17</value>
</metadata> </metadata>
<metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1048, 17</value> <value>1168, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

17
DDUserManager/DDUserManager/frmADImport_Groups.vb
View File

@ -1,13 +1,12 @@
Imports DDUserManager.UserDataSet Imports DevExpress.XtraGrid.Views.Grid
Imports DevExpress.XtraGrid.Views.Grid
Public Class frmADImport_Groups Public Class frmADImport_Groups
Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmADImport_Groups_Load(sender As Object, e As EventArgs) Handles MyBase.Load
Try Try
TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString
TBDD_GROUPSTableAdapter.Fill(Me.UserDataSet.TBDD_GROUPS) TBDD_GROUPSTableAdapter.Fill(DS_ChangeS.TBDD_GROUPS)
' Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(Environment.UserName)
Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups() Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups()
UserDataSet.TBLOCAL_ADGROUPS.Clear() UserDataSet.TBLOCAL_ADGROUPS.Clear()
@ -28,7 +27,7 @@ Public Class frmADImport_Groups
For Each rowHandle As Integer In selectedGroupHandles For Each rowHandle As Integer In selectedGroupHandles
Dim rowView As DataRowView = viewAD_Groups.GetRow(rowHandle) Dim rowView As DataRowView = viewAD_Groups.GetRow(rowHandle)
Dim groupRow As TBLOCAL_ADGROUPSRow = rowView.Row Dim groupRow As UserDataSet.TBLOCAL_ADGROUPSRow = rowView.Row
Dim name As String = groupRow.GROUPNAME Dim name As String = groupRow.GROUPNAME
Dim internal As Boolean = False Dim internal As Boolean = False
@ -37,15 +36,9 @@ Public Class frmADImport_Groups
If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
TBDD_GROUPSTableAdapter.InsertGroup(name, Environment.UserName) TBDD_GROUPSTableAdapter.InsertGroup(name, Environment.UserName, 0, True, False, True)
importedGroups = importedGroups + 1 importedGroups = importedGroups + 1
End If End If
'If IsNothing(TBDD_GROUPSTableAdapter.GroupExists(groupRow.GROUPNAME)) Then
' TBDD_GROUPSTableAdapter.Insert(name, Environment.UserName)
' importedGroups = importedGroups + 1
'End If
Next Next
If importedGroups = 0 Then If importedGroups = 0 Then

40
DDUserManager/DDUserManager/frmMain.Designer.vb generated
View File

@ -115,6 +115,8 @@ Partial Class frmMain
Me.labelGroups_AssignedUsers = New System.Windows.Forms.Label() Me.labelGroups_AssignedUsers = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.gridGroups_AllGroups = New DevExpress.XtraGrid.GridControl() Me.gridGroups_AllGroups = New DevExpress.XtraGrid.GridControl()
Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
Me.viewGroups_AllGroups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.viewGroups_AllGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME2 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colCOMMENT2 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCOMMENT2 = New DevExpress.XtraGrid.Columns.GridColumn()
@ -192,8 +194,6 @@ Partial Class frmMain
Me.tabPageGroups = New DevExpress.XtraTab.XtraTabPage() Me.tabPageGroups = New DevExpress.XtraTab.XtraTabPage()
Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer()
Me.gridGroups = New DevExpress.XtraGrid.GridControl() Me.gridGroups = New DevExpress.XtraGrid.GridControl()
Me.TBDD_GROUPSBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
Me.DS_ChangeS = New DDUserManager.DS_ChangeS()
Me.viewGroups = New DevExpress.XtraGrid.Views.Grid.GridView() Me.viewGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.colNAME5 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colNAME5 = New DevExpress.XtraGrid.Columns.GridColumn()
Me.colCOMMENT1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colCOMMENT1 = New DevExpress.XtraGrid.Columns.GridColumn()
@ -404,6 +404,8 @@ Partial Class frmMain
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
CType(Me.gridGroups_AllGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridGroups_AllGroups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewGroups_AllGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewGroups_AllGroups, System.ComponentModel.ISupportInitialize).BeginInit()
Me.tabClientAssign.SuspendLayout() Me.tabClientAssign.SuspendLayout()
CType(Me.SplitContainer4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainer4, System.ComponentModel.ISupportInitialize).BeginInit()
@ -443,8 +445,6 @@ Partial Class frmMain
Me.SplitContainer3.Panel2.SuspendLayout() Me.SplitContainer3.Panel2.SuspendLayout()
Me.SplitContainer3.SuspendLayout() Me.SplitContainer3.SuspendLayout()
CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox4.SuspendLayout() Me.GroupBox4.SuspendLayout()
Me.GroupBox2.SuspendLayout() Me.GroupBox2.SuspendLayout()
@ -1386,6 +1386,16 @@ Partial Class frmMain
Me.gridGroups_AllGroups.TabIndex = 6 Me.gridGroups_AllGroups.TabIndex = 6
Me.gridGroups_AllGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AllGroups}) Me.gridGroups_AllGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups_AllGroups})
' '
'TBDD_GROUPSBindingSource1
'
Me.TBDD_GROUPSBindingSource1.DataMember = "TBDD_GROUPS"
Me.TBDD_GROUPSBindingSource1.DataSource = Me.DS_ChangeS
'
'DS_ChangeS
'
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'viewGroups_AllGroups 'viewGroups_AllGroups
' '
Me.viewGroups_AllGroups.Appearance.SelectedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer)) Me.viewGroups_AllGroups.Appearance.SelectedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
@ -2160,16 +2170,6 @@ Partial Class frmMain
Me.gridGroups.TabIndex = 17 Me.gridGroups.TabIndex = 17
Me.gridGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups}) Me.gridGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewGroups})
' '
'TBDD_GROUPSBindingSource1
'
Me.TBDD_GROUPSBindingSource1.DataMember = "TBDD_GROUPS"
Me.TBDD_GROUPSBindingSource1.DataSource = Me.DS_ChangeS
'
'DS_ChangeS
'
Me.DS_ChangeS.DataSetName = "DS_ChangeS"
Me.DS_ChangeS.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
'
'viewGroups 'viewGroups
' '
Me.viewGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1}) Me.viewGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1})
@ -2266,7 +2266,7 @@ Partial Class frmMain
' '
'INTERNALCheckBox 'INTERNALCheckBox
' '
Me.INTERNALCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource, "INTERNAL", True)) Me.INTERNALCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource1, "INTERNAL", True))
Me.INTERNALCheckBox.Enabled = False Me.INTERNALCheckBox.Enabled = False
Me.INTERNALCheckBox.Location = New System.Drawing.Point(126, 155) Me.INTERNALCheckBox.Location = New System.Drawing.Point(126, 155)
Me.INTERNALCheckBox.Name = "INTERNALCheckBox" Me.INTERNALCheckBox.Name = "INTERNALCheckBox"
@ -2277,7 +2277,7 @@ Partial Class frmMain
' '
'ACTIVECheckBox 'ACTIVECheckBox
' '
Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource, "ACTIVE", True)) Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource1, "ACTIVE", True))
Me.ACTIVECheckBox.Location = New System.Drawing.Point(126, 125) Me.ACTIVECheckBox.Location = New System.Drawing.Point(126, 125)
Me.ACTIVECheckBox.Name = "ACTIVECheckBox" Me.ACTIVECheckBox.Name = "ACTIVECheckBox"
Me.ACTIVECheckBox.Size = New System.Drawing.Size(104, 24) Me.ACTIVECheckBox.Size = New System.Drawing.Size(104, 24)
@ -2287,7 +2287,7 @@ Partial Class frmMain
' '
'AD_SYNCCheckBox 'AD_SYNCCheckBox
' '
Me.AD_SYNCCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource, "AD_SYNC", True)) Me.AD_SYNCCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_GROUPSBindingSource1, "AD_SYNC", True))
Me.AD_SYNCCheckBox.Enabled = False Me.AD_SYNCCheckBox.Enabled = False
Me.AD_SYNCCheckBox.Location = New System.Drawing.Point(236, 155) Me.AD_SYNCCheckBox.Location = New System.Drawing.Point(236, 155)
Me.AD_SYNCCheckBox.Name = "AD_SYNCCheckBox" Me.AD_SYNCCheckBox.Name = "AD_SYNCCheckBox"
@ -2315,7 +2315,7 @@ Partial Class frmMain
' '
'COMMENTTextBox1 'COMMENTTextBox1
' '
Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource, "COMMENT", True)) Me.COMMENTTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_GROUPSBindingSource1, "COMMENT", True))
Me.COMMENTTextBox1.Location = New System.Drawing.Point(126, 68) Me.COMMENTTextBox1.Location = New System.Drawing.Point(126, 68)
Me.COMMENTTextBox1.Name = "COMMENTTextBox1" Me.COMMENTTextBox1.Name = "COMMENTTextBox1"
Me.COMMENTTextBox1.Size = New System.Drawing.Size(200, 21) Me.COMMENTTextBox1.Size = New System.Drawing.Size(200, 21)
@ -3554,6 +3554,8 @@ Partial Class frmMain
CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
Me.Panel1.ResumeLayout(False) Me.Panel1.ResumeLayout(False)
CType(Me.gridGroups_AllGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gridGroups_AllGroups, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.viewGroups_AllGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewGroups_AllGroups, System.ComponentModel.ISupportInitialize).EndInit()
Me.tabClientAssign.ResumeLayout(False) Me.tabClientAssign.ResumeLayout(False)
Me.SplitContainer4.Panel1.ResumeLayout(False) Me.SplitContainer4.Panel1.ResumeLayout(False)
@ -3595,8 +3597,6 @@ Partial Class frmMain
CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainer3.ResumeLayout(False) Me.SplitContainer3.ResumeLayout(False)
CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gridGroups, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TBDD_GROUPSBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DS_ChangeS, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewGroups, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox4.ResumeLayout(False) Me.GroupBox4.ResumeLayout(False)
Me.GroupBox4.PerformLayout() Me.GroupBox4.PerformLayout()

3
DDUserManager/DDUserManager/frmMain.vb
View File

@ -14,8 +14,6 @@ Public Class frmMain
Private DragDropManager As ClassDragDrop = Nothing Private DragDropManager As ClassDragDrop = Nothing
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load
'TODO: Diese Codezeile lädt Daten in die Tabelle "DS_ChangeS.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen.
Me.TBDD_GROUPSTableAdapter.Fill(Me.DS_ChangeS.TBDD_GROUPS)
If InitDatabase() = False Then If InitDatabase() = False Then
MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager")
Application.Exit() Application.Exit()
@ -36,6 +34,7 @@ Public Class frmMain
TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString
TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_USER_MODULESTableAdapter.Connection.ConnectionString = MyConnectionString
If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) = 1 Then If TBDD_USERTableAdapter.IsUserManagerAdmin(Environment.UserName) = 1 Then
Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName) Dim userRow As TBDD_USERRow = GetCurrentUserRow(Environment.UserName)
tsLabelUser.Text = $"Angemeldeter Benutzer: {userRow.USERNAME}" tsLabelUser.Text = $"Angemeldeter Benutzer: {userRow.USERNAME}"