From fddd79ae1799fca4b3451470a30ec1c4a803134c Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 17 Feb 2022 12:03:46 +0100 Subject: [PATCH] MS Development Zooflow 1.0 --- .../frmAdmin_Globix.Designer.vb | 19 +- .../Administration/frmAdmin_Globix.vb | 7 +- .../Administration/frmAdmin_IDBAttribute.vb | 38 +- GUIs.ZooFlow/ClassInit.vb | 9 +- GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb | 1596 +++++++++++++---- GUIs.ZooFlow/DSIDB_Stammdaten.xsd | 99 +- GUIs.ZooFlow/DSIDB_Stammdaten.xss | 31 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 40 + GUIs.ZooFlow/My Project/Resources.resx | 144 +- GUIs.ZooFlow/Resources/Close_16xLG.png | Bin 0 -> 206 bytes .../Compare_RefreshScriptPreview.png | Bin 0 -> 361 bytes GUIs.ZooFlow/Resources/Hamburger_icon.svg.png | Bin 0 -> 11415 bytes GUIs.ZooFlow/Resources/refresh_16xMD.png | Bin 0 -> 376 bytes GUIs.ZooFlow/Search/frmFlowSearch1.vb | 60 +- GUIs.ZooFlow/ZooFlow.vbproj | 4 + GUIs.ZooFlow/frmConfigBasic.Designer.vb | 126 +- GUIs.ZooFlow/frmConfigBasic.resx | 67 + GUIs.ZooFlow/frmConfigBasic.vb | 61 +- GUIs.ZooFlow/frmFlowForm.Designer.vb | 210 ++- GUIs.ZooFlow/frmFlowForm.resx | 9 +- GUIs.ZooFlow/frmFlowForm.vb | 56 +- 21 files changed, 1957 insertions(+), 619 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/Close_16xLG.png create mode 100644 GUIs.ZooFlow/Resources/Compare_RefreshScriptPreview.png create mode 100644 GUIs.ZooFlow/Resources/Hamburger_icon.svg.png create mode 100644 GUIs.ZooFlow/Resources/refresh_16xMD.png diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index 30ecd9de..79281570 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -517,6 +517,7 @@ Partial Class frmAdmin_Globix Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing @@ -1382,7 +1383,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageRework.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPageRework.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPageRework.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPageRework.Name = "XtraTabPageRework" - Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 272) + Me.XtraTabPageRework.Size = New System.Drawing.Size(1111, 271) Me.XtraTabPageRework.Text = "Nachbearbeitungsfunktionen manueller Index" ' 'LayoutControlRework @@ -2228,7 +2229,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage1.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage1.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 597) + Me.XtraTabPage1.Size = New System.Drawing.Size(1138, 596) Me.XtraTabPage1.Text = "Profil-Zuordnung" ' 'XtraTabControl3 @@ -2238,7 +2239,7 @@ Partial Class frmAdmin_Globix Me.XtraTabControl3.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl3.Name = "XtraTabControl3" Me.XtraTabControl3.SelectedTabPage = Me.XtraTabPage2 - Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 597) + Me.XtraTabControl3.Size = New System.Drawing.Size(1138, 596) Me.XtraTabControl3.TabIndex = 0 Me.XtraTabControl3.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage3}) ' @@ -2248,7 +2249,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage2.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage2.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 571) + Me.XtraTabPage2.Size = New System.Drawing.Size(1136, 570) Me.XtraTabPage2.Text = "User" ' 'SplitContainerControl1 @@ -2269,7 +2270,7 @@ Partial Class frmAdmin_Globix Me.SplitContainerControl1.Panel2.Controls.Add(Me.gridAvailableUsers) Me.SplitContainerControl1.Panel2.Controls.Add(Me.Label35) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 571) + Me.SplitContainerControl1.Size = New System.Drawing.Size(1136, 570) Me.SplitContainerControl1.SplitterPosition = 308 Me.SplitContainerControl1.TabIndex = 0 ' @@ -2357,7 +2358,7 @@ Partial Class frmAdmin_Globix Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.MenuManager = Me.RibbonControl1 Me.gridAvailableUsers.Name = "gridAvailableUsers" - Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 223) + Me.gridAvailableUsers.Size = New System.Drawing.Size(1136, 222) Me.gridAvailableUsers.TabIndex = 2 Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) ' @@ -2433,7 +2434,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPage3.ImageOptions.SvgImage = CType(resources.GetObject("XtraTabPage3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 571) + Me.XtraTabPage3.Size = New System.Drawing.Size(1136, 570) Me.XtraTabPage3.Text = "Gruppen" ' 'SplitContainerControlGroup @@ -2454,7 +2455,7 @@ Partial Class frmAdmin_Globix Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.gridAvailableGroups) Me.SplitContainerControlGroup.Panel2.Controls.Add(Me.Label14) Me.SplitContainerControlGroup.Panel2.Text = "Panel2" - Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 571) + Me.SplitContainerControlGroup.Size = New System.Drawing.Size(1136, 570) Me.SplitContainerControlGroup.SplitterPosition = 315 Me.SplitContainerControlGroup.TabIndex = 0 ' @@ -2537,7 +2538,7 @@ Partial Class frmAdmin_Globix Me.gridAvailableGroups.MainView = Me.viewAvailableGroups Me.gridAvailableGroups.Name = "gridAvailableGroups" Me.gridAvailableGroups.ShowOnlyPredefinedDetails = True - Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 216) + Me.gridAvailableGroups.Size = New System.Drawing.Size(1136, 215) Me.gridAvailableGroups.TabIndex = 89 Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups}) ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 413235f7..326888a4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -29,7 +29,12 @@ Public Class frmAdmin_Globix Me.VWIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString Me.VWIDB_OBJECT_STORETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_OBJECT_STORE) Me.VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString - Me.VWIDB_BE_ATTRIBUTETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, My.Application.User.Language) + Try + Me.VWIDB_BE_ATTRIBUTETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, My.Application.User.Language) + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error loading VWIDB_BE_ATTRIBUTE") + End Try + Load_TabData() ' Add Focus Handler to all controls in all LayoutControls diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index fdac67f4..99f455c0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -62,8 +62,8 @@ Try VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() - 'If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Or IsInsert Then - HasChanges = True + If DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.GetChanges() IsNot Nothing Or IsInsert Then + HasChanges = True If IsInsert Then txtAddedWho.EditValue = My.Application.User.UserName @@ -73,29 +73,29 @@ VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() - ' TODO: Update Database - If Not IsInsert Then - Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " & - $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" & + ' TODO: Update Database + If Not IsInsert Then + Dim oUpdate As String = $"UPDATE TBIDB_ATTRIBUTE " & + $"SET TITLE = '{TextEdit2.Text}', TYP_ID = {ComboBoxEdit1.EditValue}, VIEW_SEQUENCE = {SpinEdit1.Value}, VIEW_VISIBLE = '{CheckEdit2.Checked}'" & $",MULTI_CONTEXT = '{CheckEditMulticontext.Checked}', COMMENT = '{TextEdit3.Text}', CHANGED_WHO = '{My.Application.User.UserName}' " & $"WHERE (GUID = {TextEdit1.Text})" - If My.DatabaseIDB.ExecuteNonQuery(oUpdate) = False Then - Return False - End If - Else - Dim oInsert As String = $"INSERT INTO TBIDB_ATTRIBUTE " & - "(TITLE, TYP_ID, VIEW_SEQUENCE, VIEW_VISIBLE, ADDED_WHO,COMMENT) " & - $"VALUES ('{TextEdit2.Text}',{ComboBoxEdit1.EditValue},{SpinEdit1.Value},'{CheckEdit2.Checked}','{My.Application.User.UserName}', '{TextEdit3.Text}')" - - If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then - IsInsert = False + If My.DatabaseIDB.ExecuteNonQuery(oUpdate) = False Then + Return False + End If Else - Return False + Dim oInsert As String = $"INSERT INTO TBIDB_ATTRIBUTE " & + "(TITLE, TYP_ID, VIEW_SEQUENCE, VIEW_VISIBLE, ADDED_WHO,COMMENT,MULTI_CONTEXT) " & + $"VALUES ('{TextEdit2.Text}',{ComboBoxEdit1.EditValue},{SpinEdit1.Value},'{CheckEdit2.Checked}','{My.Application.User.UserName}', '{TextEdit3.Text}','{CheckEditMulticontext.Checked}')" + + If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then + IsInsert = False + Else + Return False + End If End If + ' VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE) End If - ' VWIDB_BE_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE) - 'End If Return True Catch ex As Exception diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 90bfd2ba..6b61d6c4 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -193,10 +193,10 @@ Public Class ClassInit Private Sub Initialize3rdParty(MyApplication As My.MyApplication) Try Dim oSql = "Select LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" - Dim oDatatable As DataTable = My.Database.GetDatatableECM(oSql) + Dim oDatatable As DataTable = My.Database.GetDatatable("TBDD_3RD_PARTY_MODULES", oSql, EDMI.API.Constants.DatabaseType.ECM, "NAME = 'GDPICTURE'") If oDatatable.Rows.Count = 0 Then - Throw New InitException("Konfiguration konnte nicht geladen werden!") + Throw New InitException("Konfiguration 3RD_PARTY_MODULES konnte nicht geladen werden!") End If Dim oRow As DataRow = oDatatable.Rows.Item(0) @@ -224,7 +224,10 @@ Public Class ClassInit DocResultBaseSearch = DocResultBaseSearch.Replace("@LANG_CODE", My.Application.User.Language) End If Next - ' My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatableIDB("SELECT * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '" + MyApplication.User.Language + "'") + If DocResultBaseSearch = "" Then + Logger.Warn($"ATTENTION: NO DocResultBaseSearch - Check if entry {SQLCMD_FLOW_SEARCH_BASE} exists in TBIDB_COMMON_SQL") + End If + Catch ex As Exception Logger.Error(ex) Throw New InitException("Error in InitBasicData", ex) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index d5f2be0e..0504a777 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -47,6 +47,8 @@ Partial Public Class DSIDB_Stammdaten Private tableTBIDB_DOCTYPE_HANDLING As TBIDB_DOCTYPE_HANDLINGDataTable + Private tableTBIDB_CATALOG_USER As TBIDB_CATALOG_USERDataTable + Private relationFK_TYP_ID As Global.System.Data.DataRelation Private relationFK_OS_CAT_ID As Global.System.Data.DataRelation @@ -115,6 +117,9 @@ Partial Public Class DSIDB_Stammdaten If (Not (ds.Tables("TBIDB_DOCTYPE_HANDLING")) Is Nothing) Then MyBase.Tables.Add(New TBIDB_DOCTYPE_HANDLINGDataTable(ds.Tables("TBIDB_DOCTYPE_HANDLING"))) End If + If (Not (ds.Tables("TBIDB_CATALOG_USER")) Is Nothing) Then + MyBase.Tables.Add(New TBIDB_CATALOG_USERDataTable(ds.Tables("TBIDB_CATALOG_USER"))) + End If Me.DataSetName = ds.DataSetName Me.Prefix = ds.Prefix Me.Namespace = ds.Namespace @@ -242,6 +247,16 @@ Partial Public Class DSIDB_Stammdaten End Get End Property + _ + Public ReadOnly Property TBIDB_CATALOG_USER() As TBIDB_CATALOG_USERDataTable + Get + Return Me.tableTBIDB_CATALOG_USER + End Get + End Property + _ + Private Function ShouldSerializeTBIDB_CATALOG_USER() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -640,6 +672,9 @@ Partial Public Class DSIDB_Stammdaten _ Public Delegate Sub TBIDB_DOCTYPE_HANDLINGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBIDB_DOCTYPE_HANDLINGRowChangeEvent) + _ + Public Delegate Sub TBIDB_CATALOG_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBIDB_CATALOG_USERRowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -1342,6 +1377,7 @@ Partial Public Class DSIDB_Stammdaten Me.columnTITLE.MaxLength = 100 Me.columnTYP_ID.AllowDBNull = false Me.columnMULTI_CONTEXT.AllowDBNull = false + Me.columnMULTI_CONTEXT.DefaultValue = CType(false,Boolean) Me.columnVIEW_SEQUENCE.AllowDBNull = false Me.columnVIEW_VISIBLE.AllowDBNull = false Me.columnCOMMENT.MaxLength = 1000 @@ -2159,12 +2195,6 @@ Partial Public Class DSIDB_Stammdaten Return rowVWIDB_BE_ATTRIBUTERow End Function - _ - Public Function FindByLANG_ID(ByVal LANG_ID As Byte) As VWIDB_BE_ATTRIBUTERow - Return CType(Me.Rows.Find(New Object() {LANG_ID}),VWIDB_BE_ATTRIBUTERow) - End Function - _ Public Overrides Function Clone() As Global.System.Data.DataTable @@ -2238,32 +2268,24 @@ Partial Public Class DSIDB_Stammdaten MyBase.Columns.Add(Me.columnSYS_ATTRIBUTE) Me.columnMULTI_CONTEXT = New Global.System.Data.DataColumn("MULTI_CONTEXT", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnMULTI_CONTEXT) - Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnLANG_ID}, true)) Me.columnBE.MaxLength = 500 - Me.columnATTR_TITLE.AllowDBNull = false Me.columnATTR_TITLE.MaxLength = 900 - Me.columnTYP_ID.AllowDBNull = false - Me.columnTYPE_ID.AllowDBNull = false - Me.columnTYPE_NAME.AllowDBNull = false Me.columnTYPE_NAME.MaxLength = 100 - Me.columnVIEW_VISIBLE.AllowDBNull = false Me.columnVIEW_VISIBLE.DefaultValue = CType(true,Boolean) Me.columnVIEW_SEQUENCE.AllowDBNull = false Me.columnVIEW_SEQUENCE.DefaultValue = CType(1,Integer) Me.columnLANG_ID.AllowDBNull = false - Me.columnLANG_ID.Unique = true Me.columnLANG_ID.DefaultValue = CType(1,Byte) Me.columnLANG_CODE.AllowDBNull = false Me.columnLANG_CODE.DefaultValue = CType("de-DE",String) Me.columnLANG_CODE.MaxLength = 10 - Me.columnADDED_WHEN.AllowDBNull = false - Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.DefaultValue = CType("",String) Me.columnADDED_WHO.MaxLength = 30 Me.columnCHANGED_WHO.MaxLength = 30 Me.columnSYS_ATTRIBUTE.AllowDBNull = false Me.columnSYS_ATTRIBUTE.DefaultValue = CType(false,Boolean) Me.columnMULTI_CONTEXT.AllowDBNull = false + Me.columnMULTI_CONTEXT.DefaultValue = CType(false,Boolean) End Sub - '''Represents strongly named DataRow class. + '''Represents the strongly named DataTable class. ''' - Partial Public Class TBIDB_BUSINESS_ENTITYRow - Inherits Global.System.Data.DataRow + _ + Partial Public Class TBIDB_CATALOG_USERDataTable + Inherits Global.System.Data.TypedTableBase(Of TBIDB_CATALOG_USERRow) - Private tableTBIDB_BUSINESS_ENTITY As TBIDB_BUSINESS_ENTITYDataTable + Private columnGUID As Global.System.Data.DataColumn + + Private columnCAT_TITLE As Global.System.Data.DataColumn + + Private columnCAT_STRING As Global.System.Data.DataColumn _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBIDB_BUSINESS_ENTITY = CType(Me.Table,TBIDB_BUSINESS_ENTITYDataTable) + Public Sub New() + MyBase.New + Me.TableName = "TBIDB_CATALOG_USER" + Me.BeginInit + Me.InitClass + Me.EndInit End Sub _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn),Integer) - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn) = value - End Set - End Property + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub _ - Public Property PARENT_ENT_ID() As Integer - Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn),Integer) - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn) = value - End Set - End Property + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub _ - Public Property TITLE() As String + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn),String) + Return Me.columnGUID End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn) = value - End Set End Property _ - Public Property INHERITS_ATTRIBUTES() As Boolean + Public ReadOnly Property CAT_TITLEColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn),Boolean) + Return Me.columnCAT_TITLE End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn) = value - End Set End Property _ - Public Property COMMENT() As String + Public ReadOnly Property CAT_STRINGColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try + Return Me.columnCAT_STRING End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = value - End Set End Property _ - Public Property ADDED_WHO() As String + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ + Global.System.ComponentModel.Browsable(false)> _ + Public ReadOnly Property Count() As Integer Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn),String) + Return Me.Rows.Count End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn) = value - End Set End Property _ - Public Property ADDED_WHEN() As Date + Public Default ReadOnly Property Item(ByVal index As Integer) As TBIDB_CATALOG_USERRow Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try + Return CType(Me.Rows(index),TBIDB_CATALOG_USERRow) End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = value - End Set End Property + _ + Public Event TBIDB_CATALOG_USERRowChanging As TBIDB_CATALOG_USERRowChangeEventHandler + + _ + Public Event TBIDB_CATALOG_USERRowChanged As TBIDB_CATALOG_USERRowChangeEventHandler + + _ + Public Event TBIDB_CATALOG_USERRowDeleting As TBIDB_CATALOG_USERRowChangeEventHandler + + _ + Public Event TBIDB_CATALOG_USERRowDeleted As TBIDB_CATALOG_USERRowChangeEventHandler + _ - Public Property CHANGED_WHO() As String - Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = value - End Set - End Property + Public Overloads Sub AddTBIDB_CATALOG_USERRow(ByVal row As TBIDB_CATALOG_USERRow) + Me.Rows.Add(row) + End Sub _ - Public Property CHANGED_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = value - End Set - End Property + Public Overloads Function AddTBIDB_CATALOG_USERRow(ByVal CAT_TITLE As String, ByVal CAT_STRING As String) As TBIDB_CATALOG_USERRow + Dim rowTBIDB_CATALOG_USERRow As TBIDB_CATALOG_USERRow = CType(Me.NewRow,TBIDB_CATALOG_USERRow) + Dim columnValuesArray() As Object = New Object() {Nothing, CAT_TITLE, CAT_STRING} + rowTBIDB_CATALOG_USERRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBIDB_CATALOG_USERRow) + Return rowTBIDB_CATALOG_USERRow + End Function _ - Public Function IsCOMMENTNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) + Public Function FindByGUID(ByVal GUID As Integer) As TBIDB_CATALOG_USERRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBIDB_CATALOG_USERRow) End Function _ - Public Sub SetCOMMENTNull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = Global.System.Convert.DBNull - End Sub + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBIDB_CATALOG_USERDataTable = CType(MyBase.Clone,TBIDB_CATALOG_USERDataTable) + cln.InitVars + Return cln + End Function _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBIDB_CATALOG_USERDataTable() End Function _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = Global.System.Convert.DBNull + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnCAT_TITLE = MyBase.Columns("CAT_TITLE") + Me.columnCAT_STRING = MyBase.Columns("CAT_STRING") End Sub _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) - End Function + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnCAT_TITLE = New Global.System.Data.DataColumn("CAT_TITLE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCAT_TITLE) + Me.columnCAT_STRING = New Global.System.Data.DataColumn("CAT_STRING", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCAT_STRING) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnCAT_TITLE.AllowDBNull = false + Me.columnCAT_TITLE.MaxLength = 100 + Me.columnCAT_STRING.AllowDBNull = false + Me.columnCAT_STRING.MaxLength = 900 + End Sub _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = Global.System.Convert.DBNull - End Sub + Public Function NewTBIDB_CATALOG_USERRow() As TBIDB_CATALOG_USERRow + Return CType(Me.NewRow,TBIDB_CATALOG_USERRow) + End Function _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBIDB_CATALOG_USERRow(builder) End Function _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull - End Sub - End Class - - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBIDB_ATTRIBUTERow - Inherits Global.System.Data.DataRow - - Private tableTBIDB_ATTRIBUTE As TBIDB_ATTRIBUTEDataTable + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBIDB_CATALOG_USERRow) + End Function _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBIDB_ATTRIBUTE = CType(Me.Table,TBIDB_ATTRIBUTEDataTable) + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBIDB_CATALOG_USERRowChangedEvent) Is Nothing) Then + RaiseEvent TBIDB_CATALOG_USERRowChanged(Me, New TBIDB_CATALOG_USERRowChangeEvent(CType(e.Row,TBIDB_CATALOG_USERRow), e.Action)) + End If End Sub _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn),Integer) - End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn) = value - End Set - End Property + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBIDB_CATALOG_USERRowChangingEvent) Is Nothing) Then + RaiseEvent TBIDB_CATALOG_USERRowChanging(Me, New TBIDB_CATALOG_USERRowChangeEvent(CType(e.Row,TBIDB_CATALOG_USERRow), e.Action)) + End If + End Sub _ - Public Property TITLE() As String - Get - Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn),String) - End Get - Set - Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn) = value - End Set - End Property + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBIDB_CATALOG_USERRowDeletedEvent) Is Nothing) Then + RaiseEvent TBIDB_CATALOG_USERRowDeleted(Me, New TBIDB_CATALOG_USERRowChangeEvent(CType(e.Row,TBIDB_CATALOG_USERRow), e.Action)) + End If + End Sub _ - Public Property TYP_ID() As Byte - Get + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBIDB_CATALOG_USERRowDeletingEvent) Is Nothing) Then + RaiseEvent TBIDB_CATALOG_USERRowDeleting(Me, New TBIDB_CATALOG_USERRowChangeEvent(CType(e.Row,TBIDB_CATALOG_USERRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBIDB_CATALOG_USERRow(ByVal row As TBIDB_CATALOG_USERRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DSIDB_Stammdaten = New DSIDB_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBIDB_CATALOG_USERDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBIDB_BUSINESS_ENTITYRow + Inherits Global.System.Data.DataRow + + Private tableTBIDB_BUSINESS_ENTITY As TBIDB_BUSINESS_ENTITYDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBIDB_BUSINESS_ENTITY = CType(Me.Table,TBIDB_BUSINESS_ENTITYDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.GUIDColumn) = value + End Set + End Property + + _ + Public Property PARENT_ENT_ID() As Integer + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.PARENT_ENT_IDColumn) = value + End Set + End Property + + _ + Public Property TITLE() As String + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn),String) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.TITLEColumn) = value + End Set + End Property + + _ + Public Property INHERITS_ATTRIBUTES() As Boolean + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn),Boolean) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.INHERITS_ATTRIBUTESColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBIDB_ATTRIBUTERow + Inherits Global.System.Data.DataRow + + Private tableTBIDB_ATTRIBUTE As TBIDB_ATTRIBUTEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBIDB_ATTRIBUTE = CType(Me.Table,TBIDB_ATTRIBUTEDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.GUIDColumn) = value + End Set + End Property + + _ + Public Property TITLE() As String + Get + Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn),String) + End Get + Set + Me(Me.tableTBIDB_ATTRIBUTE.TITLEColumn) = value + End Set + End Property + + _ + Public Property TYP_ID() As Byte + Get Return CType(Me(Me.tableTBIDB_ATTRIBUTE.TYP_IDColumn),Byte) End Get Set @@ -5571,7 +5888,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ATTR_TITLE() As String Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn),String) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ATTR_TITLE in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) = value @@ -5582,7 +5903,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYP_ID() As Byte Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn),Byte) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn),Byte) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYP_ID in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) = value @@ -5593,7 +5918,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYPE_ID() As Byte Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn),Byte) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn),Byte) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYPE_ID in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) = value @@ -5604,7 +5933,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property TYPE_NAME() As String Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn),String) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte TYPE_NAME in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) = value @@ -5615,7 +5948,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property VIEW_VISIBLE() As Boolean Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn),Boolean) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn),Boolean) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte VIEW_VISIBLE in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn) = value @@ -5659,7 +5996,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn),Date) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) = value @@ -5670,7 +6011,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHO() As String Get - Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn),String) + Try + Return CType(Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle VWIDB_BE_ATTRIBUTE ist DBNull.", e) + End Try End Get Set Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn) = value @@ -5765,6 +6110,90 @@ Partial Public Class DSIDB_Stammdaten Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_IDColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsATTR_TITLENull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) + End Function + + _ + Public Sub SetATTR_TITLENull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.ATTR_TITLEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsTYP_IDNull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) + End Function + + _ + Public Sub SetTYP_IDNull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYP_IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsTYPE_IDNull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) + End Function + + _ + Public Sub SetTYPE_IDNull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsTYPE_NAMENull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) + End Function + + _ + Public Sub SetTYPE_NAMENull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.TYPE_NAMEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsVIEW_VISIBLENull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn) + End Function + + _ + Public Sub SetVIEW_VISIBLENull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.VIEW_VISIBLEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableVWIDB_BE_ATTRIBUTE.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsCHANGED_WHENNull() As Boolean @@ -6807,27 +7236,76 @@ Partial Public Class DSIDB_Stammdaten _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHOColumn) - End Function + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBIDB_CATALOG_USERRow + Inherits Global.System.Data.DataRow + + Private tableTBIDB_CATALOG_USER As TBIDB_CATALOG_USERDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBIDB_CATALOG_USER = CType(Me.Table,TBIDB_CATALOG_USERDataTable) + End Sub _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHOColumn) = Global.System.Convert.DBNull - End Sub + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBIDB_CATALOG_USER.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBIDB_CATALOG_USER.GUIDColumn) = value + End Set + End Property _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHENColumn) - End Function + Public Property CAT_TITLE() As String + Get + Return CType(Me(Me.tableTBIDB_CATALOG_USER.CAT_TITLEColumn),String) + End Get + Set + Me(Me.tableTBIDB_CATALOG_USER.CAT_TITLEColumn) = value + End Set + End Property _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBIDB_DOCTYPE_HANDLING.CHANGED_WHENColumn) = Global.System.Convert.DBNull - End Sub + Public Property CAT_STRING() As String + Get + Return CType(Me(Me.tableTBIDB_CATALOG_USER.CAT_STRINGColumn),String) + End Get + Set + Me(Me.tableTBIDB_CATALOG_USER.CAT_STRINGColumn) = value + End Set + End Property End Class ''' @@ -7225,6 +7703,42 @@ Partial Public Class DSIDB_Stammdaten End Get End Property End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBIDB_CATALOG_USERRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBIDB_CATALOG_USERRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBIDB_CATALOG_USERRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBIDB_CATALOG_USERRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class End Class Namespace DSIDB_StammdatenTableAdapters @@ -9962,73 +10476,247 @@ Namespace DSIDB_StammdatenTableAdapters _ - Public Overloads Overridable Function Insert(ByVal CAT_TITLE As String, ByVal CAT_STRING As String, ByVal ADDED_WHO As String) As Integer - If (CAT_TITLE Is Nothing) Then - Throw New Global.System.ArgumentNullException("CAT_TITLE") - Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(CAT_TITLE,String) - End If - If (CAT_STRING Is Nothing) Then - Throw New Global.System.ArgumentNullException("CAT_STRING") - Else - Me.Adapter.InsertCommand.Parameters(1).Value = CType(CAT_STRING,String) - End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - Me.Adapter.InsertCommand.Parameters(2).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) _ - <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.InsertCommand.Connection.Open + Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ + Public Overloads Overridable Function Insert(ByVal CAT_TITLE As String, ByVal CAT_STRING As String, ByVal ADDED_WHO As String) As Integer + If (CAT_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_TITLE") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(CAT_TITLE,String) + End If + If (CAT_STRING Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_STRING") + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(CAT_STRING,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(2).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) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal CAT_TITLE As String, ByVal CAT_STRING As String, ByVal ADDED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (CAT_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_TITLE") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CAT_TITLE,String) + End If + If (CAT_STRING Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_STRING") + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CAT_STRING,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ADDED_WHO,String) + End If + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(4).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 + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + End Class + + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBWH_ATTRIBUTE_TYPETableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBWH_ATTRIBUTE_TYPE" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("NAME_TYPE", "NAME_TYPE") + Me._adapter.TableMappings.Add(tableMapping) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.IDBConnectionStringDEFAULT + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT GUID, NAME_TYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_ATTRIBUTE_TYPE" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear End If - Try - Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery - Return returnValue - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - Me.Adapter.InsertCommand.Connection.Close - End If - End Try + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue End Function _ - Public Overloads Overridable Function Update(ByVal CAT_TITLE As String, ByVal CAT_STRING As String, ByVal ADDED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - If (CAT_TITLE Is Nothing) Then - Throw New Global.System.ArgumentNullException("CAT_TITLE") - Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CAT_TITLE,String) - End If - If (CAT_STRING Is Nothing) Then - Throw New Global.System.ArgumentNullException("CAT_STRING") - Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CAT_STRING,String) - End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ADDED_WHO,String) - End If - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(4).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 - Me.Adapter.UpdateCommand.Connection.Open - End If - Try - Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery - Return returnValue - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - Me.Adapter.UpdateCommand.Connection.Close - End If - End Try + Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ + Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable = New DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable End Function End Class @@ -10041,7 +10729,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBWH_ATTRIBUTE_TYPETableAdapter + Partial Public Class VWIDB_OBJECT_STORETableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -10158,9 +10846,15 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBWH_ATTRIBUTE_TYPE" + tableMapping.DataSetTable = "VWIDB_OBJECT_STORE" tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("NAME_TYPE", "NAME_TYPE") + tableMapping.ColumnMappings.Add("Objectstore", "Objectstore") + tableMapping.ColumnMappings.Add("Archive", "Archive") + tableMapping.ColumnMappings.Add("REL_PATH", "REL_PATH") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -10177,7 +10871,7 @@ Namespace DSIDB_StammdatenTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, NAME_TYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_ATTRIBUTE_TYPE" + Me._commandCollection(0).CommandText = "SELECT * FROM VWIDB_OBJECT_STORE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -10185,7 +10879,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)> _ - Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -10198,9 +10892,9 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable + Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable = New DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPEDataTable() + Dim dataTable As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable = New DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -10215,7 +10909,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class VWIDB_OBJECT_STORETableAdapter + Partial Public Class VWIDB_DOCTYPES_DETableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -10332,15 +11026,8 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "VWIDB_OBJECT_STORE" - tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("Objectstore", "Objectstore") - tableMapping.ColumnMappings.Add("Archive", "Archive") - tableMapping.ColumnMappings.Add("REL_PATH", "REL_PATH") - tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") - tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") - tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") - tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.DataSetTable = "VWIDB_DOCTYPES_DE" + tableMapping.ColumnMappings.Add("Doctype", "Doctype") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -10357,7 +11044,7 @@ Namespace DSIDB_StammdatenTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT * FROM VWIDB_OBJECT_STORE" + Me._commandCollection(0).CommandText = "SELECT * FROM VWIDB_DOCTYPES_DE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -10365,7 +11052,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)> _ - Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -10378,9 +11065,9 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable + Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable = New DSIDB_Stammdaten.VWIDB_OBJECT_STOREDataTable() + Dim dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable = New DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -10395,7 +11082,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class VWIDB_DOCTYPES_DETableAdapter + Partial Public Class TBIDB_DOCTYPE_HANDLINGTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -10512,9 +11199,50 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "VWIDB_DOCTYPES_DE" - tableMapping.ColumnMappings.Add("Doctype", "Doctype") + tableMapping.DataSetTable = "TBIDB_DOCTYPE_HANDLING" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("DOCTYPE", "DOCTYPE") + tableMapping.ColumnMappings.Add("CHANGED_ACTION", "CHANGED_ACTION") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOCTYPE, CHANGED_AC"& _ + "TION, ACTIVE, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOCTYPE,@CHANGED_ACTION,@ACTI"& _ + "VE,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT"& _ + ", ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING W"& _ + "HERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", 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, 1000, 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, 30, 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 TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOCTYPE = @DOCTYPE, CHANG"& _ + "ED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED_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, DOCTYPE, CHA"& _ + "NGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN F"& _ + "ROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, 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("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, 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 Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable) As Integer - Me.Adapter.SelectCommand = Me.CommandCollection(0) - If (Me.ClearBeforeFill = true) Then - dataTable.Clear + Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, true)> _ + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable, ByVal GUID As Integer) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData(ByVal GUID As Integer) As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + Dim dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable = New DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DSIDB_Stammdaten) As Integer + Return Me.Adapter.Update(dataSet, "TBIDB_DOCTYPE_HANDLING") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer + If (DOCTYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DOCTYPE") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE,String) End If - Dim returnValue As Integer = Me.Adapter.Fill(dataTable) - Return returnValue + Me.Adapter.InsertCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(ACTIVE,Boolean) + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(3).Value = CType(COMMENT,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(4).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) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try End Function _ - Public Overloads Overridable Function GetData() As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable - Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable = New DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable() - Me.Adapter.Fill(dataTable) - Return dataTable + Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ + Public Overloads Overridable Function Update(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (DOCTYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DOCTYPE") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE,String) + End If + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ACTIVE,Boolean) + If (COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(COMMENT,String) + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + End If + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(6).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 + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try End Function End Class @@ -10568,7 +11426,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBIDB_DOCTYPE_HANDLINGTableAdapter + Partial Public Class TBIDB_CATALOG_USERTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -10685,48 +11543,27 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBIDB_DOCTYPE_HANDLING" + tableMapping.DataSetTable = "TBIDB_CATALOG_USER" tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("DOCTYPE", "DOCTYPE") - tableMapping.ColumnMappings.Add("CHANGED_ACTION", "CHANGED_ACTION") - tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") - tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") - tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") - tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") - tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") - tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("CAT_TITLE", "CAT_TITLE") + tableMapping.ColumnMappings.Add("CAT_STRING", "CAT_STRING") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBIDB_CATALOG_USER] WHERE (([GUID] = @Original_GUID) AND ([CAT_TITLE"& _ + "] = @Original_CAT_TITLE) AND ([CAT_STRING] = @Original_CAT_STRING))" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() - Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOCTYPE, CHANGED_AC"& _ - "TION, ACTIVE, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOCTYPE,@CHANGED_ACTION,@ACTI"& _ - "VE,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT"& _ - ", ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING W"& _ - "HERE (GUID = SCOPE_IDENTITY())" - Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", 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, 1000, 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, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.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.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CAT_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CAT_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CAT_STRING", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CAT_STRING", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOCTYPE = @DOCTYPE, CHANG"& _ - "ED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED_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, DOCTYPE, CHA"& _ - "NGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN F"& _ - "ROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_CATALOG_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET CAT_TITLE = @CAT_TITLE, CAT_S"& _ + "TRING = @CAT_STRING"&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, CAT_TI"& _ + "TLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, 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("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, 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("@CAT_TITLE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CAT_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CAT_STRING", Global.System.Data.SqlDbType.VarChar, 900, Global.System.Data.ParameterDirection.Input, 0, 0, "CAT_STRING", 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 @@ -10744,20 +11581,19 @@ Namespace DSIDB_StammdatenTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WH"& _ - "EN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - " (GUID = @GUID)" + Me._commandCollection(0).CommandText = "SELECT GUID, CAT_TITLE, CAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_CATALOG_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WH"& _ + "ERE (USR_ID = @USR_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).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._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USR_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "USR_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBIDB_CATALOG_USERDataTable, ByVal USR_ID As Integer) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(USR_ID,Integer) If (Me.ClearBeforeFill = true) Then dataTable.Clear End If @@ -10769,10 +11605,10 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData(ByVal GUID As Integer) As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable + Public Overloads Overridable Function GetData(ByVal USR_ID As Integer) As DSIDB_Stammdaten.TBIDB_CATALOG_USERDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) - Dim dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable = New DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable() + Me.Adapter.SelectCommand.Parameters(0).Value = CType(USR_ID,Integer) + Dim dataTable As DSIDB_Stammdaten.TBIDB_CATALOG_USERDataTable = New DSIDB_Stammdaten.TBIDB_CATALOG_USERDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -10780,7 +11616,7 @@ Namespace DSIDB_StammdatenTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DSIDB_Stammdaten.TBIDB_CATALOG_USERDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -10788,7 +11624,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As DSIDB_Stammdaten) As Integer - Return Me.Adapter.Update(dataSet, "TBIDB_DOCTYPE_HANDLING") + Return Me.Adapter.Update(dataSet, "TBIDB_CATALOG_USER") End Function _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_CAT_TITLE As String, ByVal Original_CAT_STRING As String) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_CAT_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_CAT_TITLE") + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_CAT_TITLE,String) + End If + If (Original_CAT_STRING Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_CAT_STRING") + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_CAT_STRING,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -10826,67 +11672,23 @@ Namespace DSIDB_StammdatenTableAdapters End Try End Function - _ - Public Overloads Overridable Function Insert(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer - If (DOCTYPE Is Nothing) Then - Throw New Global.System.ArgumentNullException("DOCTYPE") - Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE,String) - End If - Me.Adapter.InsertCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) - Me.Adapter.InsertCommand.Parameters(2).Value = CType(ACTIVE,Boolean) - If (COMMENT Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(3).Value = CType(COMMENT,String) - End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - Me.Adapter.InsertCommand.Parameters(4).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) _ - <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.InsertCommand.Connection.Open - End If - Try - Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery - Return returnValue - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - Me.Adapter.InsertCommand.Connection.Close - End If - End Try - End Function - _ - Public Overloads Overridable Function Update(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - If (DOCTYPE Is Nothing) Then - Throw New Global.System.ArgumentNullException("DOCTYPE") - Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE,String) - End If - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ACTIVE,Boolean) - If (COMMENT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + Public Overloads Overridable Function Update(ByVal CAT_TITLE As String, ByVal CAT_STRING As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (CAT_TITLE Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_TITLE") Else - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(COMMENT,String) + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CAT_TITLE,String) End If - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + If (CAT_STRING Is Nothing) Then + Throw New Global.System.ArgumentNullException("CAT_STRING") Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CAT_STRING,String) End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(3).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 @@ -10932,6 +11734,8 @@ Namespace DSIDB_StammdatenTableAdapters Private _tBIDB_DOCTYPE_HANDLINGTableAdapter As TBIDB_DOCTYPE_HANDLINGTableAdapter + Private _tBIDB_CATALOG_USERTableAdapter As TBIDB_CATALOG_USERTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -11059,6 +11863,20 @@ Namespace DSIDB_StammdatenTableAdapters End Set End Property + _ + Public Property TBIDB_CATALOG_USERTableAdapter() As TBIDB_CATALOG_USERTableAdapter + Get + Return Me._tBIDB_CATALOG_USERTableAdapter + End Get + Set + Me._tBIDB_CATALOG_USERTableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -11110,6 +11928,10 @@ Namespace DSIDB_StammdatenTableAdapters AndAlso (Not (Me._tBIDB_DOCTYPE_HANDLINGTableAdapter.Connection) Is Nothing)) Then Return Me._tBIDB_DOCTYPE_HANDLINGTableAdapter.Connection End If + If ((Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBIDB_CATALOG_USERTableAdapter.Connection) Is Nothing)) Then + Return Me._tBIDB_CATALOG_USERTableAdapter.Connection + End If Return Nothing End Get Set @@ -11147,6 +11969,9 @@ Namespace DSIDB_StammdatenTableAdapters If (Not (Me._tBIDB_DOCTYPE_HANDLINGTableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -11230,6 +12055,15 @@ Namespace DSIDB_StammdatenTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBIDB_CATALOG_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBIDB_CATALOG_USERTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -11304,6 +12138,14 @@ Namespace DSIDB_StammdatenTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBIDB_CATALOG_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBIDB_CATALOG_USERTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -11314,6 +12156,14 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DSIDB_Stammdaten, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_CATALOG_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBIDB_CATALOG_USERTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBIDB_DOCTYPE_HANDLINGTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBIDB_DOCTYPE_HANDLING.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -11459,6 +12309,11 @@ Namespace DSIDB_StammdatenTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBIDB_CATALOG_USERTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -11565,6 +12420,15 @@ Namespace DSIDB_StammdatenTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBIDB_DOCTYPE_HANDLINGTableAdapter.Adapter) End If End If + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBIDB_CATALOG_USERTableAdapter, Me._tBIDB_CATALOG_USERTableAdapter.Connection) + Me._tBIDB_CATALOG_USERTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBIDB_CATALOG_USERTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBIDB_CATALOG_USERTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBIDB_CATALOG_USERTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBIDB_CATALOG_USERTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -11657,6 +12521,10 @@ Namespace DSIDB_StammdatenTableAdapters Me._tBIDB_DOCTYPE_HANDLINGTableAdapter.Connection = CType(revertConnections(Me._tBIDB_DOCTYPE_HANDLINGTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBIDB_DOCTYPE_HANDLINGTableAdapter.Transaction = Nothing End If + If (Not (Me._tBIDB_CATALOG_USERTableAdapter) Is Nothing) Then + Me._tBIDB_CATALOG_USERTableAdapter.Connection = CType(revertConnections(Me._tBIDB_CATALOG_USERTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBIDB_CATALOG_USERTableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 64743cdd..3437993e 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -251,8 +251,8 @@ VALUES (@TITLE,@TYP_ID,@VIEW_SEQUENCE,@VIEW_VISIBLE,@ADDED_WHO) - - + + @@ -276,7 +276,7 @@ WHERE (GUID = @GUID) - + @@ -706,6 +706,52 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH + + + + + + DELETE FROM [TBIDB_CATALOG_USER] WHERE (([GUID] = @Original_GUID) AND ([CAT_TITLE] = @Original_CAT_TITLE) AND ([CAT_STRING] = @Original_CAT_STRING)) + + + + + + + + + + SELECT GUID, CAT_TITLE, CAT_STRING +FROM TBIDB_CATALOG_USER +WHERE (USR_ID = @USR_ID) + + + + + + + + UPDATE TBIDB_CATALOG_USER +SET CAT_TITLE = @CAT_TITLE, CAT_STRING = @CAT_STRING +WHERE (GUID = @Original_GUID); +SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + @@ -765,23 +811,23 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + - - - + + + - + @@ -791,8 +837,8 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - - + + @@ -808,7 +854,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -824,7 +870,7 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH - + @@ -1170,16 +1216,33 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH + + + + + + + + + + + + + + + + + + + + + - - - - @@ -1212,6 +1275,10 @@ SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CH + + + + diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index 9a9e366c..5f4d2221 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -4,22 +4,23 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - + + + + + + + + + + + + - + 677 @@ -31,7 +32,7 @@ - + 896 @@ -43,7 +44,7 @@ - + 913 diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 13c4376f..2d33b4f1 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -610,6 +610,26 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Close_16xLG() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Close_16xLG", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Compare_RefreshScriptPreview() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Compare_RefreshScriptPreview", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -890,6 +910,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Hamburger_icon_svg() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Hamburger_icon.svg", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -970,6 +1000,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property refresh_16xMD() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("refresh_16xMD", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 88675ffa..7012f885 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -118,9 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -139,6 +136,9 @@ ..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -148,6 +148,9 @@ ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -157,6 +160,9 @@ ..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -175,8 +181,14 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -184,12 +196,12 @@ ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,9 +217,6 @@ ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -247,36 +256,42 @@ ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -298,8 +313,11 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -307,11 +325,8 @@ ..\Resources\insertsheet.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -331,35 +346,38 @@ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -373,9 +391,6 @@ ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -385,23 +400,23 @@ ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -409,17 +424,14 @@ ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_appearance1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -430,11 +442,11 @@ ..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -445,16 +457,16 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_send.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/Close_16xLG.png b/GUIs.ZooFlow/Resources/Close_16xLG.png new file mode 100644 index 0000000000000000000000000000000000000000..a9ae49f26478fc992a2e745c262779ba995a78a4 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP_V(% z#WAEJ?r5+hSA&AUl@E_LzuDt|^7;+)Ro%~Prnx6K_XZ?-PGn0dNo^|)nHeNxJHtg? zB&cWOO5U|wL$)w9_$R%u{Vw>5t!!h`eZD7IYtJY&N8der?2N~Go0iGnyqJ%*9ARF+ zaT4>^zwcTsoix=P^A5FjD6i)|*AN%R{qKLT_yGYMcl`%PErD)f@O1TaS?83{1OQ?9 BPBQ=i literal 0 HcmV?d00001 diff --git a/GUIs.ZooFlow/Resources/Compare_RefreshScriptPreview.png b/GUIs.ZooFlow/Resources/Compare_RefreshScriptPreview.png new file mode 100644 index 0000000000000000000000000000000000000000..4a84cd8c432b8b6f762d5591fe0b92d374372745 GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!GE4Ejv*HQODFH;Z8i{SwRLhk!7;OOp6-ji zthTm6Z41;*ZEI(#@U{wn47ak;=8v6_E5iDcrET~5^7oRazLO&l+q4>!eKiVHGl zl`e^8m=x*3vEa%P^-s^|2IkE7ERyL77dfhB(E7~ww9#sXDJ>`ZW3R7Wm(#s7Y(v-X z3r;mGB9EU`=FNZhRa9tMK}11DP4TtTx3|7C&X5<0C=+IKx%-oQgY5I?d{5p5ZTS5* zQP4*IprC@*8{SCv^k4h-voZc)c0RYjT7>^_0n-EC6L;jYznxdM0)_;Gr>mdKI;Vst E0IMX73jhEB literal 0 HcmV?d00001 diff --git a/GUIs.ZooFlow/Resources/Hamburger_icon.svg.png b/GUIs.ZooFlow/Resources/Hamburger_icon.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..449ec29028873d7acc5ca85c026387fd780b6fac GIT binary patch literal 11415 zcmeHNYgki9x1I!%Y6R+`f(k*cwbXJEw16Z8+7A_55wwsCB9J120ulrw2qLjwuqsgN zryv)pa^#W?B#Lr15UUjxG3CR}O(GN}!Ulp!!zCf)Om=*p^F8PMJ0UGV!ucG2h z0IUYzZu!P9F>geg`b^FZoF2D|+5FkL&*q3*K5_iK=&D!LZx=t&zu5AFt?hUd1MzoK z7th61q7j8r&&yHSo(iX)tS>g@eb-jHdi|$I4wQ?3p3!qX!*kEPzRcbAt*VJ@ZRrvt zSLLbddJBf@EHg*DT~gf=#^&BC>Uzhf=n&BSGw*@Fp$CuwVJji3?g8JIA6}+by}{mK zx6r~4H}~C#1eR`}F9l%vU@}TWHT2%Ss$=EK@3@hQn^+NcC1Nali|js;Jx;q$K`50; zL5gQs_Vuj*h&R?Cb=SN7QzAwu(Cb?*{)5E(Jv^0Z0M?JU4uMT zzjvsjbNF_WU^M~o(3l9tnTTZWA%*&u3(~ZRSDtW0@f<7mOoPTPiSp3M@uS)VE{X@@NL@2 z3Ns}PNvWJn-pH*0Ws)(5fJ}x~iS=A7x&u>^;vc_oA;hq)=+5-a#0RaO@n7ks7CrrRp@^0J<``=$eN!vWVPV0-+&sUM5 zsJLj;aQQ7z)7!ia*ED1U+7tEIvPEcWdIqd#+j*BouOd6-n1D@GyotSYc!p6nk;Gfk zxCAz69xiJo__7K16FsdkEZ|woibB02u{o$LxG%>p;sZJR{Fq-Re=@^p#gj$6r0;Z4 zjzn?a51wtc0oWa#p!BKaxGAVKfl7c)weL2A3t@y^J}YsQJ^tW=Q8w>#qXCStkjR+J zY%~Rmnh%2eJn^=fmb$j(vm@bzT}|mmP!U^h1EBxKt%Yzrg6#Us1!@}*p~6EWlb5s- z3jF~~+hZBD2v;Yb^#?C#ADY+Wn%P>zgo|~WrgUCNuy$9$hSeY5dM(KIIr?9x?2Feb zi>rQLS)k7g){b_1-vaR$&mb1E%2kBKXF*UtXxUtrC>LAp&3RKj=)& z&>?rDQrLGMXwmtJYGMa;fbiI}q{w@On8wkTjMJ_W+GGcE`(L8tD6P<=NW6%rlKQ5waX7iM_e(VH zp#-6z@xvf!Q6Q1P#K7J?T6&Ek-AD=jPFuWzq0wcLlau$CXpGqeVd~g&+~#kRRfD|svCq`^ zN6W5J@l0b_Tah$3cy>J{Bwl<b8}sV z=%#WI&pYgtDtZS~Vu=^KMVEOC@SOGvunJUsXL>T8?B01K^LwAYYqW!@uD1f~#Afgb zRD$(mzqBqr59fHg3%{;H*@dqI)^Zc{d~SYc7#Xf8@;lfj)B$hKc+tUs>laLh=@=&7 z!_IU80w*7gA?urDenLl-ZTYVWKXv0Y=hR)DzjHTgOWCQ5Q79GtFiriPtio zja@?9bQM=O_=P(r&lGs{1puceXMUDbvW0f_Z5gi(OPz6^<-obuQi*gq@_aIJm_#a4 zi3l#}R>a`|v=&Xnf!YYI5i@4+D!7IoGwhSqS1Z%7gJ|W#YKYe+X9vP$XsDFXE;#O+ zrjRN6ON4wh3J&eQuP6P?n4D-Q-&;?X6irO^V;XuB-cxo7$4?;PVzswH=SrUvJ0!>+ z{|E_j+a2hqT|>HRi9$y?|5f1Vp~-VMeWnlS7S3`4H zftuZ-Tgn%MKhyi+SH?@a22GGq$6Ex zZ+4}1jvCci!;c|U`x(+R+Ts+vfnQ;n3;k_x*5QcVv2W8L2TAYU~@@t^l?p`VOplVQOr zb4)aAVfDM!Ho){j6}ApVa`G1^zUZ`oQE3Pi36gviw=mVdxXmBK&&Wy}T^_>5wKy@dUee%O&cRzPO*-K&kBBoxhugP>vjc4i_$I@RjZwjdB_Z4v@Os zIqMNZ5awO;%V*GTCdG1N6*X9EWIF7Hz_~%2e+rCIQzaL%q(ar75({^75`tko|{AH)9-pY^N|Mj@$ zU*n|mpZ4wh#R=Pfr$01rsNbEkBK(&bO1NC3x;Fe{g68!=lw9R1iL-lbXbTyvre(a! zoU%ASDIelF#uEFyHk377(HKI~D2RJ6>98Vw=x4{n zuz2k8J9uC$%%a^@o*X)R*J1FQ{2Uh3T&N`#MgooL&Wy~RX=SHPKyk7M&i$zSlvfO1 zxjZ5E#Wzy%llDj1JNnc_L_%XslhNQMXL)V23)BnuZp4RZ#b{Kz5?sG{@S7_)9WpH zDZP!*W&>=rQb$hci*W&AiYeg6e^5LgFaC-I;E6Th1wwufDss>JH>@RN-a56tSBSw92abx5KLn591$yW(BSoi?8dVBilvAc`F~X4qBue6}sOPoR{d(IEFRc zBfRsKlv-wIKqYMJ=n~7EjBMEgF=U>Y#cN?%XN|{-IcpNHNi~S$G*9S=7w=(#ynYYp zZlNYy;r)K0cs;Yqf>axgQ={qALEIGRrclE?IB*UqF5+06WWk$eH5c^7Lvx35qtYE- z(=x0}LGse*+zggAhqvLpFkINDjo-5`g=dHop zu^4zg<0)Ruud7t5hR%v0XGMymb2*AgTsu{M2_3bys&X+l1!i&?R*AM1YiHS!7aG6D zpp;}v=!Wry;?t^FMHL(^a0-i!C_y6H1C9Q~Lhys-kX)IduI)D$G0oaTxlX`=kEo0SWayY$2w z_POKuCr_M25rnfdZNv=T;!sF2F6ybP5Y{6v5ly~Pm(T2yJ{gUnj#J#g_CL^aG080k zkot4aG3w&jfU4J4Xc}UT=;=7Cy&22|##q$V(oXx6LzB`VwFg&?`{O&>_aa(HY4uZL z-}}U9#dVC1TVg%&1hYl;+SaJxjg_pXLU`xH#8$xCa}V}YFW;i*Km(Aq4{WLTS0~Mo zOXfZ|UI0gQ{qO`@;8$?fs0&_2*n2z;nYue0+EUWy$CJ85edey)Jaa|8X zRGjo0hrX_^S~-DL41Ej}`0!uvuWS{Mz4<5Pc!dcT92ZRU3Tt~{J8MDWaaEVGDa5@Z zdSx{1EAdm~s@cD0dKtaTqyJn4uRRzt{Tls6wF7=)E{-!rpo~%YpiM}@Gg*wCDM*%F zhOwaTd9^rkC<@LBp@-4ko}orW>Bo(CN+bP15KaXKOZSjVqDzAqfz&;aj~+4T6*TN3 zN3EC~E48$=?f(UKU>iJ1AK?ll33VhWu0S`HsHO@_ zHG(R1@g(gdG{KWvP&HubnN5d~c5l+;ihjvtM(m#X*;%!&E1kmyoynyHN-0{FrAC;N znK#&@Wm)V=DwhiQaykq{8pkn(VYnI4zAVebJkPIu?oQ>$cF|-}hiY2OiusO|)+he3%4Yf*@e854Ua06KB)$zCG}15_rP2 zC4)>`*s_n~NZ{s|0B;z2Kl0$D5_tsymt~muBA`E$tTOYxBo8onBhN^7lzadG8@~Wd WPJ}SuuQy`=0000Yhaa literal 0 HcmV?d00001 diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 0ea1f458..e8f27b49 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -181,37 +181,43 @@ Public Class frmFlowSearch1 Private Sub frmFlowSearch1_Load(sender As Object, e As EventArgs) Handles Me.Load Logger = My.LogConfig.GetLogger() - If My.Application.User.Language = "de-DE" Then - cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_German) - Else - cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_Englisch) - End If - 'Dim oDT As DataTable = My.DatabaseIDB.GetDatatable($"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID IN (5,6) AND LANG_ID = {My.Application.User.LanguageId}") - - For Each oRow As DataRow In My.Tables.DTIDB_ATTRIBUTE.Rows - If CBool(oRow.Item("SYS_ATTRIBUTE")) = False And (oRow.Item("TYP_ID") = 5 Or oRow.Item("TYP_ID") = 6) Then - cmbLimitationDateAttr.Items.Add(oRow.Item("TITLE")) + Try + If My.Application.User.Language = "de-DE" Then + cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_German) + Else + cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_Englisch) End If + 'Dim oDT As DataTable = My.DatabaseIDB.GetDatatable($"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID IN (5,6) AND LANG_ID = {My.Application.User.LanguageId}") - Next - _Environment = My.Application.GetEnvironment - 'Dim editor As BarEditItem = BarEditItemDate - ' editor = TryCast(BarEditItemDate, ComboBoxEdit) - If My.Application.User.Language = "de-DE" Then - cmbLimitationDateAttr.SelectedIndex = 0 - ' BarEditItemDate.EditValue = "Erstellt Wann" - Else - cmbLimitationDateAttr.SelectedIndex = 1 - ' BarEditItemDate.EditValue = "Added When" - End If + For Each oRow As DataRow In My.Tables.DTIDB_ATTRIBUTE.Rows + If CBool(oRow.Item("SYS_ATTRIBUTE")) = False And (oRow.Item("TYP_ID") = 5 Or oRow.Item("TYP_ID") = 6) Then + cmbLimitationDateAttr.Items.Add(oRow.Item("ATTR_TITLE")) + End If - For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows - If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then - oBASESEARCH = oRow.Item("SQL_COMMAND") - oBASESEARCH = oBASESEARCH.Replace("@USER_ID", My.Application.User.UserId) - oBASESEARCH = oBASESEARCH.Replace("@LANG_CODE", My.Application.User.Language) + Next + _Environment = My.Application.GetEnvironment + 'Dim editor As BarEditItem = BarEditItemDate + ' editor = TryCast(BarEditItemDate, ComboBoxEdit) + If My.Application.User.Language = "de-DE" Then + cmbLimitationDateAttr.SelectedIndex = 0 + ' BarEditItemDate.EditValue = "Erstellt Wann" + Else + cmbLimitationDateAttr.SelectedIndex = 1 + ' BarEditItemDate.EditValue = "Added When" End If - Next + + For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then + oBASESEARCH = oRow.Item("SQL_COMMAND") + oBASESEARCH = oBASESEARCH.Replace("@USER_ID", My.Application.User.UserId) + oBASESEARCH = oBASESEARCH.Replace("@LANG_CODE", My.Application.User.Language) + End If + Next + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + Logger.Error(ex) + End Try + End Sub diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 35e68ff5..c986aca1 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1003,6 +1003,10 @@ + + + + diff --git a/GUIs.ZooFlow/frmConfigBasic.Designer.vb b/GUIs.ZooFlow/frmConfigBasic.Designer.vb index d0e6dab7..8c2ab845 100644 --- a/GUIs.ZooFlow/frmConfigBasic.Designer.vb +++ b/GUIs.ZooFlow/frmConfigBasic.Designer.vb @@ -24,35 +24,73 @@ Partial Class frmConfigBasic Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfigBasic)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.Quicksearch1CB_Pos = New DevExpress.XtraEditors.ComboBoxEdit() + Me.Quicksearch1TitleTextBox = New DevExpress.XtraEditors.TextEdit() Me.CheckButtonDEBUG = New DevExpress.XtraEditors.CheckButton() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() + CType(Me.Quicksearch1CB_Pos.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Quicksearch1TitleTextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.bsiInfo}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 3 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.Size = New System.Drawing.Size(800, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Appdata Folder" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Log Folder" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Speichern" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'bsiInfo + ' + Me.bsiInfo.Id = 4 + Me.bsiInfo.ImageOptions.SvgImage = CType(resources.GetObject("bsiInfo.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bsiInfo.Name = "bsiInfo" + Me.bsiInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -68,6 +106,7 @@ Partial Class frmConfigBasic ' 'RibbonStatusBar1 ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -80,6 +119,8 @@ Partial Class frmConfigBasic ' 'LayoutControl1 ' + Me.LayoutControl1.Controls.Add(Me.Quicksearch1CB_Pos) + Me.LayoutControl1.Controls.Add(Me.Quicksearch1TitleTextBox) Me.LayoutControl1.Controls.Add(Me.CheckButtonDEBUG) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Location = New System.Drawing.Point(0, 160) @@ -90,28 +131,25 @@ Partial Class frmConfigBasic Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' - 'Root - ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(800, 268) - Me.Root.TextVisible = False - ' - 'BarButtonItem1 + 'Quicksearch1CB_Pos ' - Me.BarButtonItem1.Caption = "Appdata Folder" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.Quicksearch1CB_Pos.Location = New System.Drawing.Point(166, 82) + Me.Quicksearch1CB_Pos.MenuManager = Me.RibbonControl1 + Me.Quicksearch1CB_Pos.Name = "Quicksearch1CB_Pos" + Me.Quicksearch1CB_Pos.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.Quicksearch1CB_Pos.Properties.Items.AddRange(New Object() {"Top", "Bottom"}) + Me.Quicksearch1CB_Pos.Size = New System.Drawing.Size(622, 20) + Me.Quicksearch1CB_Pos.StyleController = Me.LayoutControl1 + Me.Quicksearch1CB_Pos.TabIndex = 7 ' - 'BarButtonItem2 + 'Quicksearch1TitleTextBox ' - Me.BarButtonItem2.Caption = "Log Folder" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.Quicksearch1TitleTextBox.Location = New System.Drawing.Point(166, 58) + Me.Quicksearch1TitleTextBox.MenuManager = Me.RibbonControl1 + Me.Quicksearch1TitleTextBox.Name = "Quicksearch1TitleTextBox" + Me.Quicksearch1TitleTextBox.Size = New System.Drawing.Size(622, 20) + Me.Quicksearch1TitleTextBox.StyleController = Me.LayoutControl1 + Me.Quicksearch1TitleTextBox.TabIndex = 6 ' 'CheckButtonDEBUG ' @@ -123,15 +161,42 @@ Partial Class frmConfigBasic Me.CheckButtonDEBUG.TabIndex = 5 Me.CheckButtonDEBUG.Text = "DEBUG not active" ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(800, 268) + Me.Root.TextVisible = False + ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.CheckButtonDEBUG Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 248) + Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 46) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.Quicksearch1TitleTextBox + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 46) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 24) + Me.LayoutControlItem1.Text = "Titel der Schnellsuche 1" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(142, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.Quicksearch1CB_Pos + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 70) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(780, 178) + Me.LayoutControlItem3.Text = "Docking der Schnellsuche 1" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(142, 13) + ' 'frmConfigBasic ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -140,6 +205,7 @@ Partial Class frmConfigBasic Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmConfigBasic.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmConfigBasic" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -147,8 +213,12 @@ Partial Class frmConfigBasic CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) + CType(Me.Quicksearch1CB_Pos.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Quicksearch1TitleTextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -165,4 +235,10 @@ Partial Class frmConfigBasic Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents CheckButtonDEBUG As DevExpress.XtraEditors.CheckButton Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents Quicksearch1CB_Pos As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents Quicksearch1TitleTextBox As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.ZooFlow/frmConfigBasic.resx b/GUIs.ZooFlow/frmConfigBasic.resx index d1cd86ef..a2c52f8d 100644 --- a/GUIs.ZooFlow/frmConfigBasic.resx +++ b/GUIs.ZooFlow/frmConfigBasic.resx @@ -156,6 +156,73 @@ LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMICAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzczNzM3NDt9Cgku + WWVsbG93e2ZpbGw6I0ZDQjAxQjt9CgkuR3JlZW57ZmlsbDojMTI5QzQ5O30KCS5CbHVle2ZpbGw6IzM4 + N0NCNzt9CgkuUmVke2ZpbGw6I0QwMjEyNzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tk + aXNwbGF5Om5vbmU7ZmlsbDojNzM3Mzc0O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRoLTN2MTBI + OFY0SDVDNC40LDQsNCw0LjQsNCw1djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYsMCwxLTAuNCwxLTFW + NUMyOCw0LjQsMjcuNiw0LDI3LDR6IE0yNCwyNEg4di02ICBoMTZWMjR6IE0xMCw0djhoMTBWNEgxMHog + TTE0LDEwaC0yVjZoMlYxMHoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9 + Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs + MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs + NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg + PC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJgEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 + RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm + aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iWS1BeGlzX1NldHRpbmdzIj4N + CiAgICA8cG9seWdvbiBwb2ludHM9IjYsMjYgNiwwIDQsMCA0LDQgMiw0IDIsNiA0LDYgNCwxMCAyLDEw + IDIsMTIgNCwxMiA0LDE2IDIsMTYgMiwxOCA0LDE4IDQsMjIgMiwyMiAyLDI0IDQsMjQgNCwyOCAgICAz + MCwyOCAzMCwyNiAgIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBhdGggZD0iTTMwLDE0LjR2LTIuOGwt + My0wLjZjLTAuMy0wLjgtMC41LTEuOC0xLjEtMi41bDEuOC0yLjVsLTEuOS0xLjlMMjMuMyw2Yy0wLjct + MC40LTEuNi0wLjgtMi41LTFsLTAuNC0zaC0yLjggICBsLTAuNSwzYy0wLjgsMC4zLTEuOCwwLjUtMi41 + LDFsLTIuNS0xLjhsLTEuOSwxLjlMMTIsOC42Yy0wLjQsMC43LTAuOCwxLjctMS4xLDIuNUw4LDExLjZ2 + Mi44bDMsMC41YzAuMywwLjgsMC41LDEuOCwxLjEsMi41ICAgbC0xLjgsMi41bDEuOSwxLjlsMi41LTEu + OGMwLjcsMC40LDEuNiwwLjgsMi41LDFsMC40LDNoMi44bDAuNi0zYzAuOC0wLjMsMS44LTAuNiwyLjUt + MWwyLjUsMS44bDEuOS0xLjlMMjYsMTcuNCAgIGMwLjQtMC43LDAuOC0xLjYsMS4xLTIuNUwzMCwxNC40 + eiBNMTksMTZjLTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzIwLjcsMTYsMTksMTZ6 + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== \ No newline at end of file diff --git a/GUIs.ZooFlow/frmConfigBasic.vb b/GUIs.ZooFlow/frmConfigBasic.vb index 513b0e74..84328694 100644 --- a/GUIs.ZooFlow/frmConfigBasic.vb +++ b/GUIs.ZooFlow/frmConfigBasic.vb @@ -1,7 +1,20 @@ -Public Class frmConfigBasic +Imports DigitalData.Modules + +Public Class frmConfigBasic + Private FormLoaded As Boolean = False Private Sub frmConfigBasic_Load(sender As Object, e As EventArgs) Handles MyBase.Load LoadScreens() CheckButtonDEBUG.Checked = My.LogConfig.Debug + For Each orow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows + If orow.Item("CAT_TITLE") = "QUICKSEARCH1_TITLE" Then + Quicksearch1TitleTextBox.Text = orow.Item("CAT_STRING") + Quicksearch1TitleTextBox.Tag = orow.Item("GUID") + ElseIf orow.Item("CAT_TITLE") = "QUICKSEARCH1_POS" Then + Quicksearch1CB_Pos.EditValue = orow.Item("CAT_STRING") + Quicksearch1CB_Pos.Tag = orow.Item("GUID") + End If + Next + End Sub Private Sub LoadScreens() @@ -21,7 +34,7 @@ End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick - Process.Start(Windows.Forms.Application.LocalUserAppDataPath) + Process.Start(System.Windows.Forms.Application.LocalUserAppDataPath) End Sub Private Sub CheckButtonDEBUG_Click(sender As Object, e As EventArgs) Handles CheckButtonDEBUG.Click @@ -38,4 +51,48 @@ End If My.UIConfigManager.Save() End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + Try + Dim oUpd = "UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '', CAT_STRING = " + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + + + Private Sub frmConfigBasic_Shown(sender As Object, e As EventArgs) Handles Me.Shown + FormLoaded = True + End Sub + + Private Sub Quicksearch1CB_Pos_SelectedIndexChanged(sender As Object, e As EventArgs) Handles Quicksearch1CB_Pos.SelectedIndexChanged + If FormLoaded = False Then + Exit Sub + End If + Try + Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = '{Quicksearch1CB_Pos.EditValue}' + WHERE GUID = {Quicksearch1CB_Pos.Tag}" + If My.Database.ExecuteNonQuery(oUpd, EDMI.API.Constants.DatabaseType.IDB) = True Then + bsiInfo.Caption = "Position Quicksearch1 saved!" + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + End Sub + + Private Sub Quicksearch1TitleTextBox_Leave(sender As Object, e As EventArgs) Handles Quicksearch1TitleTextBox.Leave + If FormLoaded = False Then + Exit Sub + End If + Try + Dim oUpd = $"UPDATE TBIDB_CATALOG_USER SET CHANGED_WHO = '{My.Application.User.UserName}', CAT_STRING = '{Quicksearch1TitleTextBox.Text}' + WHERE GUID = {Quicksearch1TitleTextBox.Tag}" + If My.Database.ExecuteNonQuery(oUpd, EDMI.API.Constants.DatabaseType.IDB) = True Then + bsiInfo.Caption = "Title Quicksearch1 saved!" + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 6f73e74f..b8a0d458 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -44,31 +44,41 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxAbo = New System.Windows.Forms.PictureBox() + Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox() Me.TimerCheckActiveForms = New System.Windows.Forms.Timer(Me.components) Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components) Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components) Me.ToastNotificationsManager1 = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager(Me.components) Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) - Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox() - Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() Me.pnlQuicksearch1 = New System.Windows.Forms.Panel() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() + Me.MenuStrip1 = New System.Windows.Forms.MenuStrip() + Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem() + Me.ZooflowBeendenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.NeustartZooflowToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DatenbankverbindungToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() + Me.GrundeinstellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox() + Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() + Me.AppServiceToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Panel1 = New System.Windows.Forms.Panel() Me.ContextMenuSystray.SuspendLayout() - CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() Me.pnlQuicksearch1.SuspendLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + Me.MenuStrip1.SuspendLayout() + CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'SplashScreenManager @@ -156,13 +166,26 @@ Partial Class frmFlowForm Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' + 'PictureBoxAbo + ' + Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo + Me.PictureBoxAbo.Location = New System.Drawing.Point(100, 84) + Me.PictureBoxAbo.Name = "PictureBoxAbo" + Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) + Me.PictureBoxAbo.TabIndex = 11 + Me.PictureBoxAbo.TabStop = False + Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen") + Me.PictureBoxAbo.Visible = False + ' 'PictureBoxPM1 ' + Me.PictureBoxPM1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBoxPM1.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxPM1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxPM1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxPM1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxPM1.Location = New System.Drawing.Point(53, 376) + Me.PictureBoxPM1.Location = New System.Drawing.Point(50, 237) Me.PictureBoxPM1.Name = "PictureBoxPM1" Me.PictureBoxPM1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxPM1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -171,18 +194,6 @@ Partial Class frmFlowForm Me.PictureBoxPM1.Text = "SvgImageBox1" Me.ToolTip1.SetToolTip(Me.PictureBoxPM1, "ProcessManager - Workflow") ' - 'PictureBoxAbo - ' - Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo - Me.PictureBoxAbo.Location = New System.Drawing.Point(103, 223) - Me.PictureBoxAbo.Name = "PictureBoxAbo" - Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) - Me.PictureBoxAbo.TabIndex = 11 - Me.PictureBoxAbo.TabStop = False - Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen") - Me.PictureBoxAbo.Visible = False - ' 'PictureBoxDragDrop ' Me.PictureBoxDragDrop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle @@ -214,44 +225,15 @@ Partial Class frmFlowForm "empor incididunt ut labore et dolore magna aliqua.", "Body2 - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod " & "tempor incididunt ut labore et dolore magna aliqua.", DevExpress.XtraBars.ToastNotifications.ToastNotificationSound.Looping_Alarm4, DevExpress.XtraBars.ToastNotifications.ToastNotificationDuration.[Default], DevExpress.XtraBars.ToastNotifications.ToastNotificationTemplate.Text01)}) ' - 'PictureBoxGlobix1 - ' - Me.PictureBoxGlobix1.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxGlobix1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.PictureBoxGlobix1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark - Me.PictureBoxGlobix1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxGlobix1.Location = New System.Drawing.Point(53, 484) - Me.PictureBoxGlobix1.Name = "PictureBoxGlobix1" - Me.PictureBoxGlobix1.Size = New System.Drawing.Size(90, 90) - Me.PictureBoxGlobix1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom - Me.PictureBoxGlobix1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress - Me.PictureBoxGlobix1.TabIndex = 15 - Me.PictureBoxGlobix1.Text = "SvgImageBox1" - ' - 'PictureBoxSearch1 - ' - Me.PictureBoxSearch1.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark - Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch1.Location = New System.Drawing.Point(53, 265) - Me.PictureBoxSearch1.Name = "PictureBoxSearch1" - Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) - Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch - Me.PictureBoxSearch1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress - Me.PictureBoxSearch1.TabIndex = 13 - Me.PictureBoxSearch1.Text = "SvgImageBox1" - ' 'pnlQuicksearch1 ' - Me.pnlQuicksearch1.BackColor = System.Drawing.Color.CornflowerBlue + Me.pnlQuicksearch1.BackColor = System.Drawing.Color.Azure Me.pnlQuicksearch1.Controls.Add(Me.PictureEdit1) Me.pnlQuicksearch1.Controls.Add(Me.TextEdit1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) - Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Top - Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 150) + Me.pnlQuicksearch1.Location = New System.Drawing.Point(3, 6) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" - Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 60) + Me.pnlQuicksearch1.Size = New System.Drawing.Size(196, 67) Me.pnlQuicksearch1.TabIndex = 16 Me.pnlQuicksearch1.Visible = False ' @@ -259,7 +241,7 @@ Partial Class frmFlowForm ' Me.PictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) - Me.PictureEdit1.Location = New System.Drawing.Point(170, 29) + Me.PictureEdit1.Location = New System.Drawing.Point(164, 29) Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom @@ -272,11 +254,11 @@ Partial Class frmFlowForm Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.TextEdit1.Location = New System.Drawing.Point(3, 29) Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.TextEdit1.Properties.Appearance.BackColor = System.Drawing.Color.PowderBlue Me.TextEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit1.Properties.Appearance.Options.UseBackColor = True Me.TextEdit1.Properties.Appearance.Options.UseFont = True - Me.TextEdit1.Size = New System.Drawing.Size(196, 28) + Me.TextEdit1.Size = New System.Drawing.Size(190, 28) Me.TextEdit1.TabIndex = 1 ' 'lblQuicksearch1 @@ -289,6 +271,100 @@ Partial Class frmFlowForm Me.lblQuicksearch1.TabIndex = 0 Me.lblQuicksearch1.Text = "Schnellsuche" ' + 'MenuStrip1 + ' + Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem2}) + Me.MenuStrip1.Location = New System.Drawing.Point(0, 614) + Me.MenuStrip1.Name = "MenuStrip1" + Me.MenuStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional + Me.MenuStrip1.Size = New System.Drawing.Size(202, 24) + Me.MenuStrip1.TabIndex = 17 + Me.MenuStrip1.Text = "MenuStrip1" + ' + 'ToolStripMenuItem2 + ' + Me.ToolStripMenuItem2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right + Me.ToolStripMenuItem2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZooflowBeendenToolStripMenuItem1, Me.NeustartZooflowToolStripMenuItem, Me.AppServiceToolStripMenuItem, Me.DatenbankverbindungToolStripMenuItem1, Me.GrundeinstellungenToolStripMenuItem}) + Me.ToolStripMenuItem2.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Hamburger_icon_svg + Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2" + Me.ToolStripMenuItem2.Size = New System.Drawing.Size(28, 20) + ' + 'ZooflowBeendenToolStripMenuItem1 + ' + Me.ZooflowBeendenToolStripMenuItem1.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.Close_16xLG + Me.ZooflowBeendenToolStripMenuItem1.Name = "ZooflowBeendenToolStripMenuItem1" + Me.ZooflowBeendenToolStripMenuItem1.Size = New System.Drawing.Size(192, 22) + Me.ZooflowBeendenToolStripMenuItem1.Text = "Zooflow beenden" + ' + 'NeustartZooflowToolStripMenuItem + ' + Me.NeustartZooflowToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.refresh_16xMD + Me.NeustartZooflowToolStripMenuItem.Name = "NeustartZooflowToolStripMenuItem" + Me.NeustartZooflowToolStripMenuItem.Size = New System.Drawing.Size(192, 22) + Me.NeustartZooflowToolStripMenuItem.Text = "Neustart Zooflow" + ' + 'DatenbankverbindungToolStripMenuItem1 + ' + Me.DatenbankverbindungToolStripMenuItem1.Name = "DatenbankverbindungToolStripMenuItem1" + Me.DatenbankverbindungToolStripMenuItem1.Size = New System.Drawing.Size(192, 22) + Me.DatenbankverbindungToolStripMenuItem1.Text = "Datenbankverbindung" + ' + 'GrundeinstellungenToolStripMenuItem + ' + Me.GrundeinstellungenToolStripMenuItem.Name = "GrundeinstellungenToolStripMenuItem" + Me.GrundeinstellungenToolStripMenuItem.Size = New System.Drawing.Size(192, 22) + Me.GrundeinstellungenToolStripMenuItem.Text = "Grundeinstellungen" + ' + 'PictureBoxGlobix1 + ' + Me.PictureBoxGlobix1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PictureBoxGlobix1.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxGlobix1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.PictureBoxGlobix1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark + Me.PictureBoxGlobix1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox + Me.PictureBoxGlobix1.Location = New System.Drawing.Point(50, 345) + Me.PictureBoxGlobix1.Name = "PictureBoxGlobix1" + Me.PictureBoxGlobix1.Size = New System.Drawing.Size(90, 90) + Me.PictureBoxGlobix1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom + Me.PictureBoxGlobix1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress + Me.PictureBoxGlobix1.TabIndex = 15 + Me.PictureBoxGlobix1.Text = "SvgImageBox1" + ' + 'PictureBoxSearch1 + ' + Me.PictureBoxSearch1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PictureBoxSearch1.Cursor = System.Windows.Forms.Cursors.Hand + Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark + Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox + Me.PictureBoxSearch1.Location = New System.Drawing.Point(50, 126) + Me.PictureBoxSearch1.Name = "PictureBoxSearch1" + Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) + Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch + Me.PictureBoxSearch1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress + Me.PictureBoxSearch1.TabIndex = 13 + Me.PictureBoxSearch1.Text = "SvgImageBox1" + ' + 'AppServiceToolStripMenuItem + ' + Me.AppServiceToolStripMenuItem.Name = "AppServiceToolStripMenuItem" + Me.AppServiceToolStripMenuItem.Size = New System.Drawing.Size(192, 22) + Me.AppServiceToolStripMenuItem.Text = "AppService" + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.pnlQuicksearch1) + Me.Panel1.Controls.Add(Me.PictureBoxSearch1) + Me.Panel1.Controls.Add(Me.PictureBoxPM1) + Me.Panel1.Controls.Add(Me.PictureBoxAbo) + Me.Panel1.Controls.Add(Me.PictureBoxGlobix1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 150) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(202, 464) + Me.Panel1.TabIndex = 18 + ' 'frmFlowForm ' Me.AllowDrop = True @@ -301,31 +377,33 @@ Partial Class frmFlowForm Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BehaviorManager1.SetBehaviors(Me, New DevExpress.Utils.Behaviors.Behavior() {CType(DevExpress.Utils.Behaviors.Common.SnapWindowBehavior.Create(GetType(DevExpress.Utils.BehaviorSource.SnapWindowBehaviorSourceForForm), SnapOptions1), DevExpress.Utils.Behaviors.Behavior)}) Me.ClientSize = New System.Drawing.Size(202, 638) - Me.Controls.Add(Me.pnlQuicksearch1) - Me.Controls.Add(Me.PictureBoxAbo) - Me.Controls.Add(Me.PictureBoxGlobix1) - Me.Controls.Add(Me.PictureBoxPM1) - Me.Controls.Add(Me.PictureBoxSearch1) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.MenuStrip1) Me.Controls.Add(Me.PictureBoxDragDrop) Me.DoubleBuffered = True Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.IconOptions.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZOO_FLOW__sysicon_256 + Me.MainMenuStrip = Me.MenuStrip1 Me.Name = "frmFlowForm" Me.Text = "ZooFlow" Me.TopMost = True Me.ContextMenuSystray.ResumeLayout(False) - CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() Me.pnlQuicksearch1.ResumeLayout(False) Me.pnlQuicksearch1.PerformLayout() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.MenuStrip1.ResumeLayout(False) + Me.MenuStrip1.PerformLayout() + CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents NotifyIcon As NotifyIcon @@ -357,4 +435,12 @@ Partial Class frmFlowForm Friend WithEvents PictureEdit1 As PictureEdit Friend WithEvents TextEdit1 As TextEdit Friend WithEvents lblQuicksearch1 As LabelControl + Friend WithEvents MenuStrip1 As MenuStrip + Friend WithEvents ToolStripMenuItem2 As ToolStripMenuItem + Friend WithEvents DatenbankverbindungToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents GrundeinstellungenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ZooflowBeendenToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents NeustartZooflowToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AppServiceToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Panel1 As Panel End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 5fcd91c8..d44486fa 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1969,13 +1969,13 @@ 891, 17 - 1079, 17 + 17, 56 - 17, 56 + 166, 56 - 222, 56 + 371, 56 @@ -2004,4 +2004,7 @@ QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 525, 56 + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index cc1aca11..63dcd69f 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -314,6 +314,16 @@ Public Class frmFlowForm If IsNothing(My.Tables.DTIDB_CATALOG_USER) Then Exit Sub End If + Quicksearch1(False) + + Me.Cursor = Cursors.Default + End Sub + Sub Quicksearch1(Reload As Boolean) + If Reload Then + Dim oSQL = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}" + My.Tables.DTIDB_CATALOG_USER = My.Database.GetDatatableIDB(oSQL) + + End If For Each oRow As DataRow In My.Tables.DTIDB_CATALOG_USER.Rows If oRow.Item("CAT_TITLE") = "QUICKSEARCH1_TITLE" Then pnlQuicksearch1.Visible = True @@ -324,14 +334,9 @@ Public Class frmFlowForm ElseIf oRow.Item("CAT_STRING") = "Bottom" Then pnlQuicksearch1.Dock = DockStyle.Bottom End If - - End If Next - - Me.Cursor = Cursors.Default End Sub - Public Sub RegisterBar(ByVal dockEdge As ABEdge) AppDeskData = New AppDeskBar() AppDeskData.cbSize = Marshal.SizeOf(AppDeskData) @@ -988,7 +993,6 @@ Public Class frmFlowForm oState.CurrentProfilesWithResults = oProfiles.ToList() Catch ex As Exception Logger.Error(ex) - MsgBox("Fehler beim Auswerten der Profile. Mehr Informationen im Log.", MsgBoxStyle.Critical, Text) End Try End Sub @@ -1060,6 +1064,7 @@ Public Class frmFlowForm Private Sub BasisKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BasisKonfigurationToolStripMenuItem.Click frmConfigBasic.ShowDialog() + Quicksearch1(True) End Sub @@ -1096,6 +1101,7 @@ Public Class frmFlowForm If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then Dim oDTDocResult = My.DatabaseIDB.GetDatatable(DocResultBaseSearch) If oDTDocResult.Rows.Count > 0 Then + Logger.Debug($"Quicksearch1 got {oDTDocResult.Rows.Count} results") oParams.Results.Add(New DocumentResultList.DocumentResult() With { .Title = GetResultWindowString(TextEdit1.Text), .Datatable = oDTDocResult}) @@ -1106,7 +1112,13 @@ Public Class frmFlowForm 'OpenForms.Add(oForm) oForm.Show() Else - MsgBox("No Results") + Dim oMessage As String + If My.Application.User.Language = "de-DE" Then + oMessage = "Kein Ergebnis" + Else + oMessage = "No results" + End If + NotifyIcon.ShowBalloonTip(20000, $"Info", oMessage, ToolTipIcon.Info) End If End If @@ -1126,15 +1138,45 @@ Public Class frmFlowForm Sub CheckRunSearch1() If TextEdit1.Text <> String.Empty Then + If TextEdit1.Text = "porn" Then + NotifyIcon.ShowBalloonTip(20000, $"Info", "Think about Your search term an search again..", ToolTipIcon.Info) + Exit Sub + End If RunQuickSearch1() End If End Sub Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click + If TextEdit1.Text = String.Empty Then + Open_FlowSearch() + Exit Sub + End If + CheckRunSearch1() End Sub Private Sub frmFlowForm_Shown(sender As Object, e As EventArgs) Handles Me.Shown End Sub + + Private Sub GrundeinstellungenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GrundeinstellungenToolStripMenuItem.Click + frmConfigBasic.ShowDialog() + Quicksearch1(True) + End Sub + + Private Sub DatenbankverbindungToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem1.Click + frmConfigDatabase.ShowDialog() + End Sub + + Private Sub NeustartZooflowToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles NeustartZooflowToolStripMenuItem.Click + Application.Restart() + End Sub + + Private Sub ZooflowBeendenToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles ZooflowBeendenToolStripMenuItem1.Click + ExitZooflow() + End Sub + + Private Sub AppServiceToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AppServiceToolStripMenuItem.Click + frmServiceConfig.ShowDialog() + End Sub End Class