From c5e310eed3e16cff36f90b1206534b487208872d Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 13 Jun 2018 11:09:46 +0200 Subject: [PATCH] MS Bugfixing --- DDUserManager/DDUserManager/ModuleRuntime.vb | 109 +-- .../DDUserManager/My Project/AssemblyInfo.vb | 4 +- .../DDUserManager/UserDataSet.Designer.vb | 834 ++---------------- DDUserManager/DDUserManager/UserDataSet.xsd | 213 ++--- DDUserManager/DDUserManager/UserDataSet.xss | 2 +- .../DDUserManager/frmMain.Designer.vb | 78 +- DDUserManager/DDUserManager/frmMain.resx | 40 +- DDUserManager/DDUserManager/frmMain.vb | 14 +- 8 files changed, 209 insertions(+), 1085 deletions(-) diff --git a/DDUserManager/DDUserManager/ModuleRuntime.vb b/DDUserManager/DDUserManager/ModuleRuntime.vb index 70f1886..9a52d31 100644 --- a/DDUserManager/DDUserManager/ModuleRuntime.vb +++ b/DDUserManager/DDUserManager/ModuleRuntime.vb @@ -3,6 +3,7 @@ Imports DD_LIB_Standards Module ModuleRuntime Public MyConnectionString As String + Public LogErrorsOnly As Boolean = True Public ConfigPath As String = Path.Combine(Application.UserAppDataPath, "UserConfig.xml") Public rowresult @@ -93,67 +94,10 @@ Module ModuleRuntime Else MyConnectionString = "" End If - + Case "LogErrorsOnly" + LogErrorsOnly = CBool(Row.Item("Value")) End Select Next - 'update 1.1 - If rowresult.Contains("WD_ShowDocs") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "WD_ShowDocs" - newRow("Value") = "False" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("Sett_ConstructorStart") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "Sett_ConstructorStart" - newRow("Value") = "0" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("FWSCAN_started") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "FWSCAN_started" - newRow("Value") = "False" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("Task_Popup_minutes") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "Task_Popup_minutes" - newRow("Value") = "2" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("PATH_ADDON") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "PATH_ADDON" - newRow("Value") = "" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("MyProxyConnectionString") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "MyProxyConnectionString" - newRow("Value") = "" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("MyLinkedServer") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "MyLinkedServer" - newRow("Value") = "" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - If rowresult.Contains("MyFormsDesign") = False Then - Dim newRow As DataRow = DT.NewRow() - newRow("ConfigName") = "MyFormsDesign" - newRow("Value") = "" - DT.Rows.Add(newRow) - DT.WriteXml(ConfigPath) - End If - Catch ex As Exception MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -190,53 +134,6 @@ Module ModuleRuntime newRow1("ConfigName") = "LogErrorsOnly" newRow1("Value") = "True" table.Rows.Add(newRow1) - Dim newRow2 As DataRow = table.NewRow() - newRow2("ConfigName") = "Sett_TaskOverviewKeepInFront" - newRow2("Value") = "True" - table.Rows.Add(newRow2) - Dim newRow3 As DataRow = table.NewRow() - newRow3("ConfigName") = "Sett_LoadWD_Docs" - newRow3("Value") = "True" - table.Rows.Add(newRow3) - Dim newRow7 As DataRow = table.NewRow() - newRow7("ConfigName") = "WD_IndexDeleteDocs" - newRow7("Value") = "False" - table.Rows.Add(newRow7) - Dim newRow8 As DataRow = table.NewRow() - newRow8("ConfigName") = "WD_ShowDocs" - newRow8("Value") = "False" - table.Rows.Add(newRow8) - Dim newRow9 As DataRow = table.NewRow() - newRow9("ConfigName") = "Sett_ConstructorStart" - newRow9("Value") = "0" - table.Rows.Add(newRow9) - Dim newRow10 As DataRow = table.NewRow() - newRow10("ConfigName") = "FWSCAN_started" - newRow10("Value") = "False" - table.Rows.Add(newRow10) - Dim newRow11 As DataRow = table.NewRow() - newRow11("ConfigName") = "Task_Popup_minutes" - newRow11("Value") = "2" - table.Rows.Add(newRow11) - Dim newRow12 As DataRow = table.NewRow() - newRow12("ConfigName") = "WAN_ENVIRONMENT" - newRow12("Value") = "False" - table.Rows.Add(newRow12) - Dim newRow13 As DataRow = table.NewRow() - newRow13("ConfigName") = "PATH_ADDON" - newRow13("Value") = "" - Dim newRow14 As DataRow = table.NewRow() - newRow14("ConfigName") = "MyProxyConnectionString" - newRow14("Value") = "" - table.Rows.Add(newRow14) - Dim newRow15 As DataRow = table.NewRow() - newRow15("ConfigName") = "MyLinkedServer" - newRow15("Value") = "" - table.Rows.Add(newRow15) - Dim newRow16 As DataRow = table.NewRow() - newRow16("ConfigName") = "MyFormsDesign" - newRow16("Value") = "" - table.AcceptChanges() clsLogger.Add(">> CreateConfigTable su...", False) Return table diff --git a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb index 378d9b4..2c30d6c 100644 --- a/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb +++ b/DDUserManager/DDUserManager/My Project/AssemblyInfo.vb @@ -10,8 +10,8 @@ Imports System.Runtime.InteropServices - - + + diff --git a/DDUserManager/DDUserManager/UserDataSet.Designer.vb b/DDUserManager/DDUserManager/UserDataSet.Designer.vb index 602015e..1396ea4 100644 --- a/DDUserManager/DDUserManager/UserDataSet.Designer.vb +++ b/DDUserManager/DDUserManager/UserDataSet.Designer.vb @@ -3128,24 +3128,8 @@ Partial Public Class UserDataSet Private columnLANGUAGE As Global.System.Data.DataColumn - Private columnGENERAL_VIEWER As Global.System.Data.DataColumn - Private columnCOMMENT As Global.System.Data.DataColumn - Private columnWAN_ENVIRONMENT As Global.System.Data.DataColumn - - Private columnLOGGED_IN As Global.System.Data.DataColumn - - Private columnLOGGED_WHERE As Global.System.Data.DataColumn - - Private columnLOG_IN_WHEN As Global.System.Data.DataColumn - - Private columnLOG_OUT_WHEN As Global.System.Data.DataColumn - - Private columnPM_RIGHT_FILE_DELETE As Global.System.Data.DataColumn - - Private columnUSERID_FK_INT_ECM As Global.System.Data.DataColumn - Private columnDATE_FORMAT As Global.System.Data.DataColumn Private columnADDED_WHO As Global.System.Data.DataColumn @@ -3247,14 +3231,6 @@ Partial Public Class UserDataSet End Get End Property - _ - Public ReadOnly Property GENERAL_VIEWERColumn() As Global.System.Data.DataColumn - Get - Return Me.columnGENERAL_VIEWER - End Get - End Property - _ Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn @@ -3263,62 +3239,6 @@ Partial Public Class UserDataSet End Get End Property - _ - Public ReadOnly Property WAN_ENVIRONMENTColumn() As Global.System.Data.DataColumn - Get - Return Me.columnWAN_ENVIRONMENT - End Get - End Property - - _ - Public ReadOnly Property LOGGED_INColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOGGED_IN - End Get - End Property - - _ - Public ReadOnly Property LOGGED_WHEREColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOGGED_WHERE - End Get - End Property - - _ - Public ReadOnly Property LOG_IN_WHENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOG_IN_WHEN - End Get - End Property - - _ - Public ReadOnly Property LOG_OUT_WHENColumn() As Global.System.Data.DataColumn - Get - Return Me.columnLOG_OUT_WHEN - End Get - End Property - - _ - Public ReadOnly Property PM_RIGHT_FILE_DELETEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnPM_RIGHT_FILE_DELETE - End Get - End Property - - _ - Public ReadOnly Property USERID_FK_INT_ECMColumn() As Global.System.Data.DataColumn - Get - Return Me.columnUSERID_FK_INT_ECM - End Get - End Property - _ Public ReadOnly Property DATE_FORMATColumn() As Global.System.Data.DataColumn @@ -3396,29 +3316,9 @@ Partial Public Class UserDataSet _ - Public Overloads Function AddTBDD_USERRow( _ - ByVal PRENAME As String, _ - ByVal NAME As String, _ - ByVal USERNAME As String, _ - ByVal SHORTNAME As String, _ - ByVal EMAIL As String, _ - ByVal LANGUAGE As String, _ - ByVal GENERAL_VIEWER As String, _ - ByVal COMMENT As String, _ - ByVal WAN_ENVIRONMENT As Boolean, _ - ByVal LOGGED_IN As Boolean, _ - ByVal LOGGED_WHERE As String, _ - ByVal LOG_IN_WHEN As Date, _ - ByVal LOG_OUT_WHEN As Date, _ - ByVal PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal USERID_FK_INT_ECM As Integer, _ - ByVal DATE_FORMAT As String, _ - ByVal ADDED_WHO As String, _ - ByVal ADDED_WHEN As Date, _ - ByVal CHANGED_WHO As String, _ - ByVal CHANGED_WHEN As Date) As TBDD_USERRow + Public Overloads Function AddTBDD_USERRow(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBDD_USERRow Dim rowTBDD_USERRow As TBDD_USERRow = CType(Me.NewRow,TBDD_USERRow) - Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} rowTBDD_USERRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBDD_USERRow) Return rowTBDD_USERRow @@ -3454,15 +3354,7 @@ Partial Public Class UserDataSet Me.columnSHORTNAME = MyBase.Columns("SHORTNAME") Me.columnEMAIL = MyBase.Columns("EMAIL") Me.columnLANGUAGE = MyBase.Columns("LANGUAGE") - Me.columnGENERAL_VIEWER = MyBase.Columns("GENERAL_VIEWER") Me.columnCOMMENT = MyBase.Columns("COMMENT") - Me.columnWAN_ENVIRONMENT = MyBase.Columns("WAN_ENVIRONMENT") - Me.columnLOGGED_IN = MyBase.Columns("LOGGED_IN") - Me.columnLOGGED_WHERE = MyBase.Columns("LOGGED_WHERE") - Me.columnLOG_IN_WHEN = MyBase.Columns("LOG_IN_WHEN") - Me.columnLOG_OUT_WHEN = MyBase.Columns("LOG_OUT_WHEN") - Me.columnPM_RIGHT_FILE_DELETE = MyBase.Columns("PM_RIGHT_FILE_DELETE") - Me.columnUSERID_FK_INT_ECM = MyBase.Columns("USERID_FK_INT_ECM") Me.columnDATE_FORMAT = MyBase.Columns("DATE_FORMAT") Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") @@ -3487,24 +3379,8 @@ Partial Public Class UserDataSet MyBase.Columns.Add(Me.columnEMAIL) Me.columnLANGUAGE = New Global.System.Data.DataColumn("LANGUAGE", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnLANGUAGE) - Me.columnGENERAL_VIEWER = New Global.System.Data.DataColumn("GENERAL_VIEWER", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnGENERAL_VIEWER) Me.columnCOMMENT = New Global.System.Data.DataColumn("COMMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnCOMMENT) - Me.columnWAN_ENVIRONMENT = New Global.System.Data.DataColumn("WAN_ENVIRONMENT", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnWAN_ENVIRONMENT) - Me.columnLOGGED_IN = New Global.System.Data.DataColumn("LOGGED_IN", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOGGED_IN) - Me.columnLOGGED_WHERE = New Global.System.Data.DataColumn("LOGGED_WHERE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOGGED_WHERE) - Me.columnLOG_IN_WHEN = New Global.System.Data.DataColumn("LOG_IN_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOG_IN_WHEN) - Me.columnLOG_OUT_WHEN = New Global.System.Data.DataColumn("LOG_OUT_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnLOG_OUT_WHEN) - Me.columnPM_RIGHT_FILE_DELETE = New Global.System.Data.DataColumn("PM_RIGHT_FILE_DELETE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnPM_RIGHT_FILE_DELETE) - Me.columnUSERID_FK_INT_ECM = New Global.System.Data.DataColumn("USERID_FK_INT_ECM", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnUSERID_FK_INT_ECM) Me.columnDATE_FORMAT = New Global.System.Data.DataColumn("DATE_FORMAT", GetType(String), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnDATE_FORMAT) Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) @@ -3530,14 +3406,7 @@ Partial Public Class UserDataSet Me.columnEMAIL.MaxLength = 100 Me.columnLANGUAGE.AllowDBNull = false Me.columnLANGUAGE.MaxLength = 5 - Me.columnGENERAL_VIEWER.AllowDBNull = false - Me.columnGENERAL_VIEWER.MaxLength = 30 Me.columnCOMMENT.MaxLength = 500 - Me.columnWAN_ENVIRONMENT.AllowDBNull = false - Me.columnLOGGED_IN.AllowDBNull = false - Me.columnLOGGED_WHERE.MaxLength = 50 - Me.columnPM_RIGHT_FILE_DELETE.AllowDBNull = false - Me.columnUSERID_FK_INT_ECM.AllowDBNull = false Me.columnDATE_FORMAT.AllowDBNull = false Me.columnDATE_FORMAT.MaxLength = 10 Me.columnADDED_WHO.AllowDBNull = false @@ -6480,17 +6349,6 @@ Partial Public Class UserDataSet End Set End Property - _ - Public Property GENERAL_VIEWER() As String - Get - Return CType(Me(Me.tableTBDD_USER.GENERAL_VIEWERColumn),String) - End Get - Set - Me(Me.tableTBDD_USER.GENERAL_VIEWERColumn) = value - End Set - End Property - _ Public Property COMMENT() As String @@ -6506,95 +6364,6 @@ Partial Public Class UserDataSet End Set End Property - _ - Public Property WAN_ENVIRONMENT() As Boolean - Get - Return CType(Me(Me.tableTBDD_USER.WAN_ENVIRONMENTColumn),Boolean) - End Get - Set - Me(Me.tableTBDD_USER.WAN_ENVIRONMENTColumn) = value - End Set - End Property - - _ - Public Property LOGGED_IN() As Boolean - Get - Return CType(Me(Me.tableTBDD_USER.LOGGED_INColumn),Boolean) - End Get - Set - Me(Me.tableTBDD_USER.LOGGED_INColumn) = value - End Set - End Property - - _ - Public Property LOGGED_WHERE() As String - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOGGED_WHEREColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOGGED_WHERE in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOGGED_WHEREColumn) = value - End Set - End Property - - _ - Public Property LOG_IN_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOG_IN_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOG_IN_WHEN in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOG_IN_WHENColumn) = value - End Set - End Property - - _ - Public Property LOG_OUT_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte LOG_OUT_WHEN in Tabelle TBDD_USER ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn) = value - End Set - End Property - - _ - Public Property PM_RIGHT_FILE_DELETE() As Boolean - Get - Return CType(Me(Me.tableTBDD_USER.PM_RIGHT_FILE_DELETEColumn),Boolean) - End Get - Set - Me(Me.tableTBDD_USER.PM_RIGHT_FILE_DELETEColumn) = value - End Set - End Property - - _ - Public Property USERID_FK_INT_ECM() As Integer - Get - Return CType(Me(Me.tableTBDD_USER.USERID_FK_INT_ECMColumn),Integer) - End Get - Set - Me(Me.tableTBDD_USER.USERID_FK_INT_ECMColumn) = value - End Set - End Property - _ Public Property DATE_FORMAT() As String @@ -6722,42 +6491,6 @@ Partial Public Class UserDataSet Me(Me.tableTBDD_USER.COMMENTColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsLOGGED_WHERENull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOGGED_WHEREColumn) - End Function - - _ - Public Sub SetLOGGED_WHERENull() - Me(Me.tableTBDD_USER.LOGGED_WHEREColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsLOG_IN_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOG_IN_WHENColumn) - End Function - - _ - Public Sub SetLOG_IN_WHENNull() - Me(Me.tableTBDD_USER.LOG_IN_WHENColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsLOG_OUT_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBDD_USER.LOG_OUT_WHENColumn) - End Function - - _ - Public Sub SetLOG_OUT_WHENNull() - Me(Me.tableTBDD_USER.LOG_OUT_WHENColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsADDED_WHENNull() As Boolean @@ -11053,15 +10786,7 @@ Namespace UserDataSetTableAdapters tableMapping.ColumnMappings.Add("SHORTNAME", "SHORTNAME") tableMapping.ColumnMappings.Add("EMAIL", "EMAIL") tableMapping.ColumnMappings.Add("LANGUAGE", "LANGUAGE") - tableMapping.ColumnMappings.Add("GENERAL_VIEWER", "GENERAL_VIEWER") tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") - tableMapping.ColumnMappings.Add("WAN_ENVIRONMENT", "WAN_ENVIRONMENT") - tableMapping.ColumnMappings.Add("LOGGED_IN", "LOGGED_IN") - tableMapping.ColumnMappings.Add("LOGGED_WHERE", "LOGGED_WHERE") - tableMapping.ColumnMappings.Add("LOG_IN_WHEN", "LOG_IN_WHEN") - tableMapping.ColumnMappings.Add("LOG_OUT_WHEN", "LOG_OUT_WHEN") - tableMapping.ColumnMappings.Add("PM_RIGHT_FILE_DELETE", "PM_RIGHT_FILE_DELETE") - tableMapping.ColumnMappings.Add("USERID_FK_INT_ECM", "USERID_FK_INT_ECM") tableMapping.ColumnMappings.Add("DATE_FORMAT", "DATE_FORMAT") tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") @@ -11124,125 +10849,45 @@ Namespace UserDataSetTableAdapters 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.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [SHORTNAME], [EMAIL], [LA"& _ - "NGUAGE], [GENERAL_VIEWER], [COMMENT], [WAN_ENVIRONMENT], [LOGGED_IN], [LOGGED_WH"& _ - "ERE], [LOG_IN_WHEN], [LOG_OUT_WHEN], [PM_RIGHT_FILE_DELETE], [USERID_FK_INT_ECM]"& _ - ", [DATE_FORMAT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUE"& _ - "S (@PRENAME, @NAME, @USERNAME, @SHORTNAME, @EMAIL, @LANGUAGE, @GENERAL_VIEWER, @"& _ - "COMMENT, @WAN_ENVIRONMENT, @LOGGED_IN, @LOGGED_WHERE, @LOG_IN_WHEN, @LOG_OUT_WHE"& _ - "N, @PM_RIGHT_FILE_DELETE, @USERID_FK_INT_ECM, @DATE_FORMAT, @ADDED_WHO, @ADDED_W"& _ - "HEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, SHORTN"& _ - "AME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGE"& _ - "D_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DAT"& _ - "E_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE "& _ - "(GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, SHORTNA"& _ + "ME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PRENAME,@"& _ + "NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ + "SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER"& _ + ", COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, "& _ + "PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHA"& _ + "NGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GENERAL_VIEWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GENERAL_VIEWER", 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("@WAN_ENVIRONMENT", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WAN_ENVIRONMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOGGED_IN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_IN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOGGED_WHERE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG_IN_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG_OUT_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERID_FK_INT_ECM", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERID_FK_INT_ECM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", 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.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", 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("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 5, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, 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("@DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", 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.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNA"& _ - "ME, [SHORTNAME] = @SHORTNAME, [EMAIL] = @EMAIL, [LANGUAGE] = @LANGUAGE, [GENERAL"& _ - "_VIEWER] = @GENERAL_VIEWER, [COMMENT] = @COMMENT, [WAN_ENVIRONMENT] = @WAN_ENVIR"& _ - "ONMENT, [LOGGED_IN] = @LOGGED_IN, [LOGGED_WHERE] = @LOGGED_WHERE, [LOG_IN_WHEN] "& _ - "= @LOG_IN_WHEN, [LOG_OUT_WHEN] = @LOG_OUT_WHEN, [PM_RIGHT_FILE_DELETE] = @PM_RIG"& _ - "HT_FILE_DELETE, [USERID_FK_INT_ECM] = @USERID_FK_INT_ECM, [DATE_FORMAT] = @DATE_"& _ - "FORMAT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @C"& _ - "HANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND "& _ - "((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME))"& _ - " AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND (["& _ - "USERNAME] = @Original_USERNAME) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS N"& _ - "ULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ((@IsNull_EMAIL = 1 AND [EMAIL]"& _ - " IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([LANGUAGE] = @Original_LANGUAGE) "& _ - "AND ([GENERAL_VIEWER] = @Original_GENERAL_VIEWER) AND ((@IsNull_COMMENT = 1 AND "& _ - "[COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([WAN_ENVIRONMENT] = "& _ - "@Original_WAN_ENVIRONMENT) AND ([LOGGED_IN] = @Original_LOGGED_IN) AND ((@IsNull"& _ - "_LOGGED_WHERE = 1 AND [LOGGED_WHERE] IS NULL) OR ([LOGGED_WHERE] = @Original_LOG"& _ - "GED_WHERE)) AND ((@IsNull_LOG_IN_WHEN = 1 AND [LOG_IN_WHEN] IS NULL) OR ([LOG_IN"& _ - "_WHEN] = @Original_LOG_IN_WHEN)) AND ((@IsNull_LOG_OUT_WHEN = 1 AND [LOG_OUT_WHE"& _ - "N] IS NULL) OR ([LOG_OUT_WHEN] = @Original_LOG_OUT_WHEN)) AND ([PM_RIGHT_FILE_DE"& _ - "LETE] = @Original_PM_RIGHT_FILE_DELETE) AND ([USERID_FK_INT_ECM] = @Original_USE"& _ - "RID_FK_INT_ECM) AND ([DATE_FORMAT] = @Original_DATE_FORMAT) AND ([ADDED_WHO] = @"& _ - "Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR (["& _ - "ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_"& _ - "WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_"& _ - "WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN"& _ - ")));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_"& _ - "VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_"& _ - "WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHE"& _ - "N, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PRENAME = @PRENAME, NAME = @NAME, USER"& _ + "NAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, "& _ + "COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANG"& _ + "ED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PREN"& _ + "AME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_EN"& _ + "VIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DEL"& _ + "ETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _ + "_WHEN FROM TBDD_USER WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GENERAL_VIEWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GENERAL_VIEWER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WAN_ENVIRONMENT", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WAN_ENVIRONMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOGGED_IN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_IN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOGGED_WHERE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG_IN_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOG_OUT_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERID_FK_INT_ECM", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERID_FK_INT_ECM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.UpdateCommand.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.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PRENAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PRENAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SHORTNAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SHORTNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EMAIL", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EMAIL", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GENERAL_VIEWER", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GENERAL_VIEWER", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_WAN_ENVIRONMENT", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "WAN_ENVIRONMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOGGED_IN", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_IN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOGGED_WHERE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOGGED_WHERE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOGGED_WHERE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOG_IN_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOG_IN_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_IN_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_LOG_OUT_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_LOG_OUT_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "LOG_OUT_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PM_RIGHT_FILE_DELETE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PM_RIGHT_FILE_DELETE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_USERID_FK_INT_ECM", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USERID_FK_INT_ECM", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USERNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SHORTNAME", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "SHORTNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EMAIL", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "EMAIL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 5, Global.System.Data.ParameterDirection.Input, 0, 0, "LANGUAGE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DATE_FORMAT", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "DATE_FORMAT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function Insert( _ - ByVal PRENAME As String, _ - ByVal NAME As String, _ - ByVal USERNAME As String, _ - ByVal SHORTNAME As String, _ - ByVal EMAIL As String, _ - ByVal LANGUAGE As String, _ - ByVal GENERAL_VIEWER As String, _ - ByVal COMMENT As String, _ - ByVal WAN_ENVIRONMENT As Boolean, _ - ByVal LOGGED_IN As Boolean, _ - ByVal LOGGED_WHERE As String, _ - ByVal LOG_IN_WHEN As Global.System.Nullable(Of Date), _ - ByVal LOG_OUT_WHEN As Global.System.Nullable(Of Date), _ - ByVal PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal USERID_FK_INT_ECM As Integer, _ - ByVal DATE_FORMAT 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 PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal ADDED_WHO As String) As Integer If (PRENAME Is Nothing) Then Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value Else @@ -11811,59 +11430,20 @@ Namespace UserDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(5).Value = CType(LANGUAGE,String) End If - If (GENERAL_VIEWER Is Nothing) Then - Throw New Global.System.ArgumentNullException("GENERAL_VIEWER") - Else - Me.Adapter.InsertCommand.Parameters(6).Value = CType(GENERAL_VIEWER,String) - End If If (COMMENT Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(7).Value = CType(COMMENT,String) + Me.Adapter.InsertCommand.Parameters(6).Value = CType(COMMENT,String) End If - Me.Adapter.InsertCommand.Parameters(8).Value = CType(WAN_ENVIRONMENT,Boolean) - Me.Adapter.InsertCommand.Parameters(9).Value = CType(LOGGED_IN,Boolean) - If (LOGGED_WHERE Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(10).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(10).Value = CType(LOGGED_WHERE,String) - End If - If (LOG_IN_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(11).Value = CType(LOG_IN_WHEN.Value,Date) - Else - Me.Adapter.InsertCommand.Parameters(11).Value = Global.System.DBNull.Value - End If - If (LOG_OUT_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(12).Value = CType(LOG_OUT_WHEN.Value,Date) - Else - Me.Adapter.InsertCommand.Parameters(12).Value = Global.System.DBNull.Value - End If - Me.Adapter.InsertCommand.Parameters(13).Value = CType(PM_RIGHT_FILE_DELETE,Boolean) - Me.Adapter.InsertCommand.Parameters(14).Value = CType(USERID_FK_INT_ECM,Integer) If (DATE_FORMAT Is Nothing) Then Throw New Global.System.ArgumentNullException("DATE_FORMAT") Else - Me.Adapter.InsertCommand.Parameters(15).Value = CType(DATE_FORMAT,String) + Me.Adapter.InsertCommand.Parameters(7).Value = CType(DATE_FORMAT,String) End If If (ADDED_WHO Is Nothing) Then Throw New Global.System.ArgumentNullException("ADDED_WHO") Else - Me.Adapter.InsertCommand.Parameters(16).Value = CType(ADDED_WHO,String) - End If - If (ADDED_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(17).Value = CType(ADDED_WHEN.Value,Date) - Else - Me.Adapter.InsertCommand.Parameters(17).Value = Global.System.DBNull.Value - End If - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(18).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(18).Value = CType(CHANGED_WHO,String) - End If - If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(19).Value = CType(CHANGED_WHEN.Value,Date) - Else - Me.Adapter.InsertCommand.Parameters(19).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(8).Value = CType(ADDED_WHO,String) End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ @@ -11884,49 +11464,7 @@ Namespace UserDataSetTableAdapters 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.Update, true)> _ - Public Overloads Overridable Function Update( _ - ByVal PRENAME As String, _ - ByVal NAME As String, _ - ByVal USERNAME As String, _ - ByVal SHORTNAME As String, _ - ByVal EMAIL As String, _ - ByVal LANGUAGE As String, _ - ByVal GENERAL_VIEWER As String, _ - ByVal COMMENT As String, _ - ByVal WAN_ENVIRONMENT As Boolean, _ - ByVal LOGGED_IN As Boolean, _ - ByVal LOGGED_WHERE As String, _ - ByVal LOG_IN_WHEN As Global.System.Nullable(Of Date), _ - ByVal LOG_OUT_WHEN As Global.System.Nullable(Of Date), _ - ByVal PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal USERID_FK_INT_ECM As Integer, _ - ByVal DATE_FORMAT 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), _ - ByVal Original_GUID As Integer, _ - ByVal Original_PRENAME As String, _ - ByVal Original_NAME As String, _ - ByVal Original_USERNAME As String, _ - ByVal Original_SHORTNAME As String, _ - ByVal Original_EMAIL As String, _ - ByVal Original_LANGUAGE As String, _ - ByVal Original_GENERAL_VIEWER As String, _ - ByVal Original_COMMENT As String, _ - ByVal Original_WAN_ENVIRONMENT As Boolean, _ - ByVal Original_LOGGED_IN As Boolean, _ - ByVal Original_LOGGED_WHERE As String, _ - ByVal Original_LOG_IN_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_LOG_OUT_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal Original_USERID_FK_INT_ECM As Integer, _ - ByVal Original_DATE_FORMAT As String, _ - ByVal Original_ADDED_WHO As String, _ - ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_CHANGED_WHO As String, _ - ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ - ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal PRENAME As String, ByVal NAME As String, ByVal USERNAME As String, ByVal SHORTNAME As String, ByVal EMAIL As String, ByVal LANGUAGE As String, ByVal COMMENT As String, ByVal DATE_FORMAT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (PRENAME Is Nothing) Then Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value Else @@ -11957,168 +11495,23 @@ Namespace UserDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(5).Value = CType(LANGUAGE,String) End If - If (GENERAL_VIEWER Is Nothing) Then - Throw New Global.System.ArgumentNullException("GENERAL_VIEWER") - Else - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GENERAL_VIEWER,String) - End If If (COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(COMMENT,String) - End If - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(WAN_ENVIRONMENT,Boolean) - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(LOGGED_IN,Boolean) - If (LOGGED_WHERE Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(10).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(LOGGED_WHERE,String) - End If - If (LOG_IN_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(LOG_IN_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value - End If - If (LOG_OUT_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(LOG_OUT_WHEN.Value,Date) + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(COMMENT,String) End If - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(PM_RIGHT_FILE_DELETE,Boolean) - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(USERID_FK_INT_ECM,Integer) If (DATE_FORMAT Is Nothing) Then Throw New Global.System.ArgumentNullException("DATE_FORMAT") Else - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(DATE_FORMAT,String) - End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(ADDED_WHO,String) - End If - If (ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(ADDED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(DATE_FORMAT,String) End If If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(18).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String) End If - If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(19).Value = CType(CHANGED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_GUID,Integer) - If (Original_PRENAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(22).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(21).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_PRENAME,String) - End If - If (Original_NAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_NAME,String) - End If - If (Original_USERNAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_USERNAME") - Else - Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_USERNAME,String) - End If - If (Original_SHORTNAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(26).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(27).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(26).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_SHORTNAME,String) - End If - If (Original_EMAIL Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(28).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(29).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(28).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_EMAIL,String) - End If - If (Original_LANGUAGE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_LANGUAGE") - Else - Me.Adapter.UpdateCommand.Parameters(30).Value = CType(Original_LANGUAGE,String) - End If - If (Original_GENERAL_VIEWER Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_GENERAL_VIEWER") - Else - Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_GENERAL_VIEWER,String) - End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(32).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(33).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(32).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_COMMENT,String) - End If - Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_WAN_ENVIRONMENT,Boolean) - Me.Adapter.UpdateCommand.Parameters(35).Value = CType(Original_LOGGED_IN,Boolean) - If (Original_LOGGED_WHERE Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(36).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(37).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(36).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(37).Value = CType(Original_LOGGED_WHERE,String) - End If - If (Original_LOG_IN_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(38).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(39).Value = CType(Original_LOG_IN_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(38).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(39).Value = Global.System.DBNull.Value - End If - If (Original_LOG_OUT_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(40).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(41).Value = CType(Original_LOG_OUT_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(40).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(41).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(42).Value = CType(Original_PM_RIGHT_FILE_DELETE,Boolean) - Me.Adapter.UpdateCommand.Parameters(43).Value = CType(Original_USERID_FK_INT_ECM,Integer) - If (Original_DATE_FORMAT Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_DATE_FORMAT") - Else - Me.Adapter.UpdateCommand.Parameters(44).Value = CType(Original_DATE_FORMAT,String) - End If - If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") - Else - Me.Adapter.UpdateCommand.Parameters(45).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(46).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(47).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(46).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(47).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(48).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(49).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(48).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(49).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(50).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(51).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(50).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(51).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(52).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -12134,55 +11527,6 @@ Namespace UserDataSetTableAdapters End Try End Function - _ - Public Overloads Overridable Function Update( _ - ByVal PRENAME As String, _ - ByVal NAME As String, _ - ByVal USERNAME As String, _ - ByVal SHORTNAME As String, _ - ByVal EMAIL As String, _ - ByVal LANGUAGE As String, _ - ByVal GENERAL_VIEWER As String, _ - ByVal COMMENT As String, _ - ByVal WAN_ENVIRONMENT As Boolean, _ - ByVal LOGGED_IN As Boolean, _ - ByVal LOGGED_WHERE As String, _ - ByVal LOG_IN_WHEN As Global.System.Nullable(Of Date), _ - ByVal LOG_OUT_WHEN As Global.System.Nullable(Of Date), _ - ByVal PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal USERID_FK_INT_ECM As Integer, _ - ByVal DATE_FORMAT 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), _ - ByVal Original_GUID As Integer, _ - ByVal Original_PRENAME As String, _ - ByVal Original_NAME As String, _ - ByVal Original_USERNAME As String, _ - ByVal Original_SHORTNAME As String, _ - ByVal Original_EMAIL As String, _ - ByVal Original_LANGUAGE As String, _ - ByVal Original_GENERAL_VIEWER As String, _ - ByVal Original_COMMENT As String, _ - ByVal Original_WAN_ENVIRONMENT As Boolean, _ - ByVal Original_LOGGED_IN As Boolean, _ - ByVal Original_LOGGED_WHERE As String, _ - ByVal Original_LOG_IN_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_LOG_OUT_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_PM_RIGHT_FILE_DELETE As Boolean, _ - ByVal Original_USERID_FK_INT_ECM As Integer, _ - ByVal Original_DATE_FORMAT As String, _ - ByVal Original_ADDED_WHO As String, _ - ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ - ByVal Original_CHANGED_WHO As String, _ - ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer - Return Me.Update(PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Original_GUID, Original_PRENAME, Original_NAME, Original_USERNAME, Original_SHORTNAME, Original_EMAIL, Original_LANGUAGE, Original_GENERAL_VIEWER, Original_COMMENT, Original_WAN_ENVIRONMENT, Original_LOGGED_IN, Original_LOGGED_WHERE, Original_LOG_IN_WHEN, Original_LOG_OUT_WHEN, Original_PM_RIGHT_FILE_DELETE, Original_USERID_FK_INT_ECM, Original_DATE_FORMAT, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_GUID) - End Function - - - INSERT INTO [TBDD_USER] ([PRENAME], [NAME], [USERNAME], [SHORTNAME], [EMAIL], [LANGUAGE], [GENERAL_VIEWER], [COMMENT], [WAN_ENVIRONMENT], [LOGGED_IN], [LOGGED_WHERE], [LOG_IN_WHEN], [LOG_OUT_WHEN], [PM_RIGHT_FILE_DELETE], [USERID_FK_INT_ECM], [DATE_FORMAT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@PRENAME, @NAME, @USERNAME, @SHORTNAME, @EMAIL, @LANGUAGE, @GENERAL_VIEWER, @COMMENT, @WAN_ENVIRONMENT, @LOGGED_IN, @LOGGED_WHERE, @LOG_IN_WHEN, @LOG_OUT_WHEN, @PM_RIGHT_FILE_DELETE, @USERID_FK_INT_ECM, @DATE_FORMAT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); + + INSERT INTO TBDD_USER + (PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO) +VALUES (@PRENAME,@NAME,@USERNAME,@SHORTNAME,@EMAIL,@LANGUAGE,@COMMENT,@DATE_FORMAT,@ADDED_WHO); SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - SELECT TBDD_USER.* + + SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER - - UPDATE [TBDD_USER] SET [PRENAME] = @PRENAME, [NAME] = @NAME, [USERNAME] = @USERNAME, [SHORTNAME] = @SHORTNAME, [EMAIL] = @EMAIL, [LANGUAGE] = @LANGUAGE, [GENERAL_VIEWER] = @GENERAL_VIEWER, [COMMENT] = @COMMENT, [WAN_ENVIRONMENT] = @WAN_ENVIRONMENT, [LOGGED_IN] = @LOGGED_IN, [LOGGED_WHERE] = @LOGGED_WHERE, [LOG_IN_WHEN] = @LOG_IN_WHEN, [LOG_OUT_WHEN] = @LOG_OUT_WHEN, [PM_RIGHT_FILE_DELETE] = @PM_RIGHT_FILE_DELETE, [USERID_FK_INT_ECM] = @USERID_FK_INT_ECM, [DATE_FORMAT] = @DATE_FORMAT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ((@IsNull_PRENAME = 1 AND [PRENAME] IS NULL) OR ([PRENAME] = @Original_PRENAME)) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([USERNAME] = @Original_USERNAME) AND ((@IsNull_SHORTNAME = 1 AND [SHORTNAME] IS NULL) OR ([SHORTNAME] = @Original_SHORTNAME)) AND ((@IsNull_EMAIL = 1 AND [EMAIL] IS NULL) OR ([EMAIL] = @Original_EMAIL)) AND ([LANGUAGE] = @Original_LANGUAGE) AND ([GENERAL_VIEWER] = @Original_GENERAL_VIEWER) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([WAN_ENVIRONMENT] = @Original_WAN_ENVIRONMENT) AND ([LOGGED_IN] = @Original_LOGGED_IN) AND ((@IsNull_LOGGED_WHERE = 1 AND [LOGGED_WHERE] IS NULL) OR ([LOGGED_WHERE] = @Original_LOGGED_WHERE)) AND ((@IsNull_LOG_IN_WHEN = 1 AND [LOG_IN_WHEN] IS NULL) OR ([LOG_IN_WHEN] = @Original_LOG_IN_WHEN)) AND ((@IsNull_LOG_OUT_WHEN = 1 AND [LOG_OUT_WHEN] IS NULL) OR ([LOG_OUT_WHEN] = @Original_LOG_OUT_WHEN)) AND ([PM_RIGHT_FILE_DELETE] = @Original_PM_RIGHT_FILE_DELETE) AND ([USERID_FK_INT_ECM] = @Original_USERID_FK_INT_ECM) AND ([DATE_FORMAT] = @Original_DATE_FORMAT) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))); + + UPDATE TBDD_USER +SET PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, SHORTNAME = @SHORTNAME, EMAIL = @EMAIL, LANGUAGE = @LANGUAGE, COMMENT = @COMMENT, DATE_FORMAT = @DATE_FORMAT, + CHANGED_WHO = @CHANGED_WHO +WHERE (GUID = @Original_GUID); SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -839,15 +791,7 @@ SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER - - - - - - - - @@ -858,8 +802,7 @@ SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER - SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.GENERAL_VIEWER, T1.COMMENT, T1.WAN_ENVIRONMENT, T1.LOGGED_IN, T1.LOGGED_WHERE, T1.LOG_IN_WHEN, - T1.LOG_OUT_WHEN, T1.PM_RIGHT_FILE_DELETE, T1.USERID_FK_INT_ECM, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN + SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN FROM TBDD_USER AS T1 INNER JOIN TBDD_CLIENT_USER AS T2 ON T1.GUID = T2.USER_ID WHERE (T2.CLIENT_ID = @CLIENT_ID) @@ -872,8 +815,7 @@ WHERE (T2.CLIENT_ID = @CLIENT_ID) - SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, - USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID NOT IN (SELECT DISTINCT T.GUID @@ -889,8 +831,7 @@ WHERE (GUID NOT IN - SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.GENERAL_VIEWER, T1.COMMENT, T1.WAN_ENVIRONMENT, T1.LOGGED_IN, T1.LOGGED_WHERE, T1.LOG_IN_WHEN, - T1.LOG_OUT_WHEN, T1.PM_RIGHT_FILE_DELETE, T1.USERID_FK_INT_ECM, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN + SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN FROM TBDD_USER AS T1 INNER JOIN TBDD_GROUPS_USER AS T2 ON T1.GUID = T2.USER_ID WHERE (T2.GROUP_ID = @GROUP_ID) @@ -903,14 +844,13 @@ WHERE (T2.GROUP_ID = @GROUP_ID) - SELECT * FROM TBDD_USER where GUID NOT IN -(SELECT DISTINCT - T.GUID -FROM - TBDD_USER T - INNER JOIN TBDD_GROUPS_USER T1 ON T.GUID = T1.USER_ID -WHERE - GROUP_ID = @GROUP_ID) + SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBDD_USER +WHERE (GUID NOT IN + (SELECT DISTINCT T.GUID + FROM TBDD_USER AS T INNER JOIN + TBDD_GROUPS_USER AS T1 ON T.GUID = T1.USER_ID + WHERE (T1.GROUP_ID = @GROUP_ID))) @@ -920,8 +860,7 @@ WHERE - SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.GENERAL_VIEWER, T1.COMMENT, T1.WAN_ENVIRONMENT, T1.LOGGED_IN, T1.LOGGED_WHERE, T1.LOG_IN_WHEN, - T1.LOG_OUT_WHEN, T1.PM_RIGHT_FILE_DELETE, T1.USERID_FK_INT_ECM, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN + SELECT T1.GUID, T1.PRENAME, T1.NAME, T1.USERNAME, T1.SHORTNAME, T1.EMAIL, T1.LANGUAGE, T1.COMMENT, T1.DATE_FORMAT, T1.ADDED_WHO, T1.ADDED_WHEN, T1.CHANGED_WHO, T1.CHANGED_WHEN FROM TBDD_USER AS T1 INNER JOIN TBDD_USER_MODULES AS T2 ON T1.GUID = T2.USER_ID WHERE (T2.MODULE_ID = @MODULE_ID) @@ -934,8 +873,7 @@ WHERE (T2.MODULE_ID = @MODULE_ID) - SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, - USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID NOT IN (SELECT DISTINCT T.GUID @@ -951,8 +889,7 @@ WHERE (GUID NOT IN - SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, GENERAL_VIEWER, COMMENT, WAN_ENVIRONMENT, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, PM_RIGHT_FILE_DELETE, - USERID_FK_INT_ECM, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + SELECT GUID, PRENAME, NAME, USERNAME, SHORTNAME, EMAIL, LANGUAGE, COMMENT, DATE_FORMAT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (USERNAME = @USERNAME) @@ -1173,7 +1110,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1214,7 +1151,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1246,7 +1183,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1350,7 +1287,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1375,7 +1312,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1440,7 +1377,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1464,7 +1401,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1510,13 +1447,6 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - - - - - - - @@ -1524,19 +1454,6 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - - - - - - - - - - - - - @@ -1563,7 +1480,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1573,14 +1490,14 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + - + @@ -1612,7 +1529,7 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - + @@ -1685,16 +1602,16 @@ SELECT GUID, CLIENT_ID, GROUP_ID, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, C - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/DDUserManager/DDUserManager/UserDataSet.xss b/DDUserManager/DDUserManager/UserDataSet.xss index 8d453f8..0357d4f 100644 --- a/DDUserManager/DDUserManager/UserDataSet.xss +++ b/DDUserManager/DDUserManager/UserDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb index 2f1c789..55a71f9 100644 --- a/DDUserManager/DDUserManager/frmMain.Designer.vb +++ b/DDUserManager/DDUserManager/frmMain.Designer.vb @@ -31,8 +31,6 @@ Partial Class frmMain Dim EMAILLabel As System.Windows.Forms.Label Dim LANGUAGELabel As System.Windows.Forms.Label Dim COMMENTLabel As System.Windows.Forms.Label - Dim WAN_ENVIRONMENTLabel As System.Windows.Forms.Label - Dim USERID_FK_INT_ECMLabel As System.Windows.Forms.Label Dim DATE_FORMATLabel As System.Windows.Forms.Label Dim ADDED_WHOLabel As System.Windows.Forms.Label Dim ADDED_WHENLabel As System.Windows.Forms.Label @@ -57,7 +55,6 @@ Partial Class frmMain Dim NAMELabel2 As System.Windows.Forms.Label Dim SHORT_NAMELabel As System.Windows.Forms.Label Dim PRODUCT_VERSIONLabel As System.Windows.Forms.Label - Dim Label4 As System.Windows.Forms.Label Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.tabPageUsers = New DevExpress.XtraTab.XtraTabPage() @@ -68,14 +65,12 @@ Partial Class frmMain Me.UserDataSet = New DDUserManager.UserDataSet() Me.TextBox2 = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.USERID_FK_INT_ECMTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.PRENAMETextBox = New System.Windows.Forms.TextBox() Me.EMAILTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() Me.LANGUAGETextBox = New System.Windows.Forms.TextBox() Me.GUIDTextBox = New System.Windows.Forms.TextBox() - Me.WAN_ENVIRONMENTCheckBox = New System.Windows.Forms.CheckBox() Me.COMMENTTextBox = New System.Windows.Forms.TextBox() Me.NAMETextBox = New System.Windows.Forms.TextBox() Me.USERNAMETextBox = New System.Windows.Forms.TextBox() @@ -347,8 +342,6 @@ Partial Class frmMain EMAILLabel = New System.Windows.Forms.Label() LANGUAGELabel = New System.Windows.Forms.Label() COMMENTLabel = New System.Windows.Forms.Label() - WAN_ENVIRONMENTLabel = New System.Windows.Forms.Label() - USERID_FK_INT_ECMLabel = New System.Windows.Forms.Label() DATE_FORMATLabel = New System.Windows.Forms.Label() ADDED_WHOLabel = New System.Windows.Forms.Label() ADDED_WHENLabel = New System.Windows.Forms.Label() @@ -373,7 +366,6 @@ Partial Class frmMain NAMELabel2 = New System.Windows.Forms.Label() SHORT_NAMELabel = New System.Windows.Forms.Label() PRODUCT_VERSIONLabel = New System.Windows.Forms.Label() - Label4 = New System.Windows.Forms.Label() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.tabPageUsers.SuspendLayout() @@ -577,25 +569,6 @@ Partial Class frmMain COMMENTLabel.TabIndex = 16 COMMENTLabel.Text = "Kommentar:" ' - 'WAN_ENVIRONMENTLabel - ' - WAN_ENVIRONMENTLabel.AutoSize = True - WAN_ENVIRONMENTLabel.Dock = System.Windows.Forms.DockStyle.Top - WAN_ENVIRONMENTLabel.Location = New System.Drawing.Point(0, 0) - WAN_ENVIRONMENTLabel.Name = "WAN_ENVIRONMENTLabel" - WAN_ENVIRONMENTLabel.Size = New System.Drawing.Size(89, 13) - WAN_ENVIRONMENTLabel.TabIndex = 18 - WAN_ENVIRONMENTLabel.Text = "WAN Umgebung:" - ' - 'USERID_FK_INT_ECMLabel - ' - USERID_FK_INT_ECMLabel.AutoSize = True - USERID_FK_INT_ECMLabel.Location = New System.Drawing.Point(462, 132) - USERID_FK_INT_ECMLabel.Name = "USERID_FK_INT_ECMLabel" - USERID_FK_INT_ECMLabel.Size = New System.Drawing.Size(107, 13) - USERID_FK_INT_ECMLabel.TabIndex = 40 - USERID_FK_INT_ECMLabel.Text = "USERID FK INT ECM:" - ' 'DATE_FORMATLabel ' DATE_FORMATLabel.AutoSize = True @@ -609,7 +582,7 @@ Partial Class frmMain 'ADDED_WHOLabel ' ADDED_WHOLabel.AutoSize = True - ADDED_WHOLabel.Location = New System.Drawing.Point(462, 25) + ADDED_WHOLabel.Location = New System.Drawing.Point(463, 52) ADDED_WHOLabel.Name = "ADDED_WHOLabel" ADDED_WHOLabel.Size = New System.Drawing.Size(90, 13) ADDED_WHOLabel.TabIndex = 44 @@ -618,7 +591,7 @@ Partial Class frmMain 'ADDED_WHENLabel ' ADDED_WHENLabel.AutoSize = True - ADDED_WHENLabel.Location = New System.Drawing.Point(462, 53) + ADDED_WHENLabel.Location = New System.Drawing.Point(463, 80) ADDED_WHENLabel.Name = "ADDED_WHENLabel" ADDED_WHENLabel.Size = New System.Drawing.Size(98, 13) ADDED_WHENLabel.TabIndex = 46 @@ -627,7 +600,7 @@ Partial Class frmMain 'CHANGED_WHOLabel ' CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(462, 79) + CHANGED_WHOLabel.Location = New System.Drawing.Point(463, 106) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13) CHANGED_WHOLabel.TabIndex = 48 @@ -636,7 +609,7 @@ Partial Class frmMain 'CHANGED_WHENLabel ' CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(462, 105) + CHANGED_WHENLabel.Location = New System.Drawing.Point(463, 132) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel.TabIndex = 50 @@ -813,15 +786,6 @@ Partial Class frmMain PRODUCT_VERSIONLabel.TabIndex = 8 PRODUCT_VERSIONLabel.Text = "Version:" ' - 'Label4 - ' - Label4.AutoSize = True - Label4.Location = New System.Drawing.Point(238, 25) - Label4.Name = "Label4" - Label4.Size = New System.Drawing.Size(89, 13) - Label4.TabIndex = 6 - Label4.Text = "WAN Umgebung:" - ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill @@ -877,8 +841,6 @@ Partial Class frmMain Me.SplitContainer2.Panel1.Controls.Add(ADDED_WHOLabel) Me.SplitContainer2.Panel1.Controls.Add(GUIDLabel) Me.SplitContainer2.Panel1.Controls.Add(CHANGED_WHENLabel) - Me.SplitContainer2.Panel1.Controls.Add(USERID_FK_INT_ECMLabel) - Me.SplitContainer2.Panel1.Controls.Add(Me.USERID_FK_INT_ECMTextBox) Me.SplitContainer2.Panel1.Controls.Add(DATE_FORMATLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.CHANGED_WHOTextBox) Me.SplitContainer2.Panel1.Controls.Add(Me.PRENAMETextBox) @@ -888,13 +850,10 @@ Partial Class frmMain Me.SplitContainer2.Panel1.Controls.Add(ADDED_WHENLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.EMAILTextBox) Me.SplitContainer2.Panel1.Controls.Add(Me.ADDED_WHOTextBox) - Me.SplitContainer2.Panel1.Controls.Add(WAN_ENVIRONMENTLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.LANGUAGETextBox) Me.SplitContainer2.Panel1.Controls.Add(COMMENTLabel) Me.SplitContainer2.Panel1.Controls.Add(Me.GUIDTextBox) - Me.SplitContainer2.Panel1.Controls.Add(Me.WAN_ENVIRONMENTCheckBox) Me.SplitContainer2.Panel1.Controls.Add(EMAILLabel) - Me.SplitContainer2.Panel1.Controls.Add(Label4) Me.SplitContainer2.Panel1.Controls.Add(USERNAMELabel) Me.SplitContainer2.Panel1.Controls.Add(SHORTNAMELabel) Me.SplitContainer2.Panel1.Controls.Add(Me.COMMENTTextBox) @@ -938,7 +897,7 @@ Partial Class frmMain 'TextBox2 ' Me.TextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "CHANGED_WHEN", True)) - Me.TextBox2.Location = New System.Drawing.Point(576, 102) + Me.TextBox2.Location = New System.Drawing.Point(577, 129) Me.TextBox2.Name = "TextBox2" Me.TextBox2.ReadOnly = True Me.TextBox2.Size = New System.Drawing.Size(163, 21) @@ -947,26 +906,17 @@ Partial Class frmMain 'TextBox1 ' Me.TextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "ADDED_WHEN", True)) - Me.TextBox1.Location = New System.Drawing.Point(576, 50) + Me.TextBox1.Location = New System.Drawing.Point(577, 77) Me.TextBox1.Name = "TextBox1" Me.TextBox1.ReadOnly = True Me.TextBox1.Size = New System.Drawing.Size(163, 21) Me.TextBox1.TabIndex = 52 ' - 'USERID_FK_INT_ECMTextBox - ' - Me.USERID_FK_INT_ECMTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "USERID_FK_INT_ECM", True)) - Me.USERID_FK_INT_ECMTextBox.Location = New System.Drawing.Point(576, 129) - Me.USERID_FK_INT_ECMTextBox.Name = "USERID_FK_INT_ECMTextBox" - Me.USERID_FK_INT_ECMTextBox.ReadOnly = True - Me.USERID_FK_INT_ECMTextBox.Size = New System.Drawing.Size(163, 21) - Me.USERID_FK_INT_ECMTextBox.TabIndex = 41 - ' 'CHANGED_WHOTextBox ' Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "CHANGED_WHO", True)) Me.CHANGED_WHOTextBox.Enabled = False - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(576, 75) + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(577, 102) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(163, 21) @@ -992,7 +942,7 @@ Partial Class frmMain ' Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "ADDED_WHO", True)) Me.ADDED_WHOTextBox.Enabled = False - Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(576, 23) + Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(577, 50) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(163, 21) @@ -1015,16 +965,6 @@ Partial Class frmMain Me.GUIDTextBox.Size = New System.Drawing.Size(109, 21) Me.GUIDTextBox.TabIndex = 1 ' - 'WAN_ENVIRONMENTCheckBox - ' - Me.WAN_ENVIRONMENTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_USERBindingSource, "WAN_ENVIRONMENT", True)) - Me.WAN_ENVIRONMENTCheckBox.Location = New System.Drawing.Point(347, 20) - Me.WAN_ENVIRONMENTCheckBox.Name = "WAN_ENVIRONMENTCheckBox" - Me.WAN_ENVIRONMENTCheckBox.Size = New System.Drawing.Size(109, 24) - Me.WAN_ENVIRONMENTCheckBox.TabIndex = 19 - Me.WAN_ENVIRONMENTCheckBox.Text = "Ja" - Me.WAN_ENVIRONMENTCheckBox.UseVisualStyleBackColor = True - ' 'COMMENTTextBox ' Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_USERBindingSource, "COMMENT", True)) @@ -3739,8 +3679,6 @@ Partial Class frmMain Friend WithEvents SHORTNAMETextBox As TextBox Friend WithEvents GUIDTextBox As TextBox Friend WithEvents COMMENTTextBox As TextBox - Friend WithEvents WAN_ENVIRONMENTCheckBox As CheckBox - Friend WithEvents USERID_FK_INT_ECMTextBox As TextBox Friend WithEvents ADDED_WHOTextBox As TextBox Friend WithEvents CHANGED_WHOTextBox As TextBox Friend WithEvents tabPageClients As DevExpress.XtraTab.XtraTabPage diff --git a/DDUserManager/DDUserManager/frmMain.resx b/DDUserManager/DDUserManager/frmMain.resx index 26598c8..a4aca58 100644 --- a/DDUserManager/DDUserManager/frmMain.resx +++ b/DDUserManager/DDUserManager/frmMain.resx @@ -141,12 +141,6 @@ False - - False - - - False - False @@ -219,14 +213,11 @@ False - - False - 136, 17 - - 17, 17 + + 136, 17 1295, 56 @@ -237,6 +228,12 @@ 439, 56 + + 136, 17 + + + 17, 17 + 693, 17 @@ -315,6 +312,27 @@ 843, 56 + + 1073, 56 + + + 17, 95 + + + 17, 17 + + + 1295, 56 + + + 17, 56 + + + 439, 56 + + + 843, 56 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb index 90de5b3..f4c0429 100644 --- a/DDUserManager/DDUserManager/frmMain.vb +++ b/DDUserManager/DDUserManager/frmMain.vb @@ -13,8 +13,16 @@ Public Class frmMain Private DragDropManager As ClassDragDrop = Nothing Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles MyBase.Load - InitDatabase() - + If InitDatabase() = False Then + MsgBox($"Unexpected error in Database Init(1). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") + Application.Exit() + Exit Sub + End If + If MyConnectionString = "" Then + MsgBox($"Unexpected error in Database Init(2). {vbCrLf & vbCrLf}Please contact Your admin.", MsgBoxStyle.Critical, "UserManager") + Application.Exit() + Exit Sub + End If TBDD_CLIENTTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_CLIENT_USERTableAdapter.Connection.ConnectionString = MyConnectionString TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString @@ -968,4 +976,6 @@ Public Class frmMain Private Sub ShowErrorMessage(errorText As String, ex As Exception) MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "Process Manager") End Sub + + End Class \ No newline at end of file