diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index 1904ab4..a704252 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -79,10 +79,13 @@ Partial Class frmIndex Me.PdfBarController2 = New DevExpress.XtraPdfViewer.Bars.PdfBarController(Me.components) Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.DxErrorProvider1 = New DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(Me.components) + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.tlpIndex = New System.Windows.Forms.TableLayoutPanel() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + Me.pnlIndex.SuspendLayout() CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -118,6 +121,7 @@ Partial Class frmIndex ' resources.ApplyResources(Me.pnlIndex, "pnlIndex") Me.pnlIndex.BackColor = System.Drawing.Color.White + Me.pnlIndex.Controls.Add(Me.tlpIndex) Me.pnlIndex.Name = "pnlIndex" ' 'ComboboxDoctype @@ -146,14 +150,15 @@ Partial Class frmIndex ' Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(47, 49, 47, 49) Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.checkItemPreview, Me.checkItemTopMost, Me.checkItemPreselection, Me.BarSubItem_Profilauswahl, Me.BarEditItem_Profilauswahl, Me.checkItemDeleteSource, Me.BarListItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarCheckItem_MultiIndexing, Me.BarToggleSwitchItem_Preselection, Me.BarButtonItem_OK}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.checkItemPreview, Me.checkItemTopMost, Me.checkItemPreselection, Me.BarSubItem_Profilauswahl, Me.BarEditItem_Profilauswahl, Me.checkItemDeleteSource, Me.BarListItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarCheckItem_MultiIndexing, Me.BarToggleSwitchItem_Preselection, Me.BarButtonItem_OK, Me.BarButtonItem3}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 31 + Me.RibbonControl1.MaxItemId = 32 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.OptionsMenuMinWidth = 519 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemCheckedComboBoxEdit1, Me.RepositoryItemLookUpEdit1, Me.RepositoryItemComboBox1, Me.RepositoryItemSearchLookUpEdit1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -468,6 +473,17 @@ Partial Class frmIndex ' Me.DxErrorProvider1.ContainerControl = Me ' + 'BarButtonItem3 + ' + resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3") + Me.BarButtonItem3.Id = 31 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'tlpIndex + ' + resources.ApplyResources(Me.tlpIndex, "tlpIndex") + Me.tlpIndex.Name = "tlpIndex" + ' 'frmIndex ' Me.Appearance.Options.UseFont = True @@ -484,6 +500,8 @@ Partial Class frmIndex Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + Me.pnlIndex.ResumeLayout(False) + Me.pnlIndex.PerformLayout() CType(Me.ComboboxDoctype.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemLookUpEdit1, System.ComponentModel.ISupportInitialize).EndInit() @@ -520,7 +538,6 @@ Partial Class frmIndex Friend WithEvents PdfBarController2 As DevExpress.XtraPdfViewer.Bars.PdfBarController Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem @@ -558,4 +575,7 @@ Partial Class frmIndex Friend WithEvents BarCheckItem_MultiIndexing As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarToggleSwitchItem_Preselection As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents BarButtonItem_OK As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents tlpIndex As TableLayoutPanel End Class diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index a8a47f5..6fe9c09 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -123,26 +123,59 @@ - 0, 233 - - - 5, 5, 5, 5 + 0, 132 True + + True + + + GrowAndShrink + + + 2 + + + Fill + + + 0, 0 + + + 1 + + + 615, 479 + + + 0 + + + tlpIndex + + + System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pnlIndex + + + 0 + + + <?xml version="1.0" encoding="utf-16"?><TableLayoutSettings><Controls /><Columns Styles="Percent,50,Percent,50" /><Rows Styles="Percent,50,Percent,50" /></TableLayoutSettings> + Fill - 0, 44 - - - 5, 5, 5, 5 + 0, 34 - 968, 842 + 615, 479 2 @@ -168,9 +201,6 @@ 0, 0 - - 5, 5, 5, 5 - Datei überspringen @@ -212,7 +242,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAANzxiPsOcYmVyc3ByaW5ndCBkaWUgSW5kZXhpZXJ1bmcgZGVyIGFrdHVlbGxl + AAAAAAA8AQAAAAYKAAAANzxiPsOcYmVyc3ByaW5ndCBkaWUgSW5kZXhpZXJ1bmcgZGVyIGFrdHVlbGxl biBEYXRlaTwvYj4FCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRpb25zBQAA AAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5kZXgTSW1hZ2VUb1RleHREaXN0 YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUHAAAAJkRldkV4cHJlc3MuVXRpbHMuVG9vbFRpcElt @@ -263,7 +293,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAALjxiPlfDpGhsZW4sIHVtIERhdGVpdm9yc2NoYXUgenUgYWt0aXZpZXJlbjwv + AAAAAAA8AQAAAAYKAAAALjxiPlfDpGhsZW4sIHVtIERhdGVpdm9yc2NoYXUgenUgYWt0aXZpZXJlbjwv Yj4FCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVy aQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5kZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAA E1N5c3RlbS5EcmF3aW5nLlNpemUHAAAAJkRldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25t @@ -318,7 +348,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAAKjxiPlplaWd0IGRhcyBGZW5zdGVyIGltIFZvcmRlcmdydW5kIGFuPC9iPgUJ + AAAAAAA8AQAAAAYKAAAAKjxiPlplaWd0IGRhcyBGZW5zdGVyIGltIFZvcmRlcmdydW5kIGFuPC9iPgUJ AAAAKERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMFAAAACEltYWdlVXJpDFN2 Z0ltYWdlU2l6ZQlBbGlnbm1lbnQKSW1hZ2VJbmRleBNJbWFnZVRvVGV4dERpc3RhbmNlAQQEAAATU3lz dGVtLkRyYXdpbmcuU2l6ZQcAAAAmRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSW1hZ2VBbGlnbm1lbnQC @@ -380,7 +410,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAARjxiPlNwZWljaGVydCBkaWUgYWt0dWVsbGUgUHJvZmlsYXVzd2FobCBmw7xy + AAAAAAA8AQAAAAYKAAAARjxiPlNwZWljaGVydCBkaWUgYWt0dWVsbGUgUHJvZmlsYXVzd2FobCBmw7xy IHp1a8O8bmZ0aWdlIFNpdHp1bmdlbjwvYj4FCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVt SW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5kZXgT SW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUHAAAAJkRldkV4cHJlc3Mu @@ -490,7 +520,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAARzxiPkzDtnNjaHQgZGllIHVycHLDvG5nbGljaGUgRGF0ZWkgbmFjaCBhYmdl + AAAAAAA8AQAAAAYKAAAARzxiPkzDtnNjaHQgZGllIHVycHLDvG5nbGljaGUgRGF0ZWkgbmFjaCBhYmdl c2NobG9zc2VuZXIgSW5kZXhpZXJ1bmc8L2I+BQkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRl bUltYWdlT3B0aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4 E0ltYWdlVG9UZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplBwAAACZEZXZFeHByZXNz @@ -562,7 +592,7 @@ TGVmdEluZGVudAhNYXhXaWR0aBJPd25lckFsbG93SHRtbFRleHQEVGV4dAQEBAAAAAEfRGV2RXhwcmVz cy5VdGlscy5EZWZhdWx0Qm9vbGVhbgMAAAATU3lzdGVtLkRyYXdpbmcuSWNvbgcAAAAoRGV2RXhwcmVz cy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0aW9ucwIAAAAICAECAAAAAfj////8////AAAAAAoJCQAA - AAAAAADaAQAAAAYKAAAAPjxiPkluZGV4aWVydCBhbGxlIGdld8OkaGx0ZW4gRGF0ZWllbiBtaXQgZGVt + AAAAAAA8AQAAAAYKAAAAPjxiPkluZGV4aWVydCBhbGxlIGdld8OkaGx0ZW4gRGF0ZWllbiBtaXQgZGVt IHNlbGJlbiBQcm9maWw8L2I+BQkAAAAoRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbUltYWdlT3B0 aW9ucwUAAAAISW1hZ2VVcmkMU3ZnSW1hZ2VTaXplCUFsaWdubWVudApJbWFnZUluZGV4E0ltYWdlVG9U ZXh0RGlzdGFuY2UBBAQAABNTeXN0ZW0uRHJhd2luZy5TaXplBwAAACZEZXZFeHByZXNzLlV0aWxzLlRv @@ -604,12 +634,12 @@ Segoe UI, 8.25pt, style=Bold + + BarButtonItem3 + 0, 0 - - 5, 5, 5, 5 - Indexierung @@ -626,7 +656,7 @@ Combo - 1691, 233 + 1076, 132 labelFilePath @@ -700,13 +730,10 @@ - 0, 1119 - - - 5, 5, 5, 5 + 0, 645 - 1691, 32 + 1076, 22 RibbonStatusBar1 @@ -777,11 +804,8 @@ 0 - - 118 - - 968, 44 + 615, 34 1 @@ -817,10 +841,10 @@ 0, 0 - 5, 7, 5, 7 + 3, 4, 3, 4 - 717, 886 + 457, 513 0 @@ -850,13 +874,10 @@ 1 - 1691, 886 + 1076, 513 - 968 - - - 6 + 615 0 @@ -931,16 +952,16 @@ 100 - 11, 28 + 7, 17 - 1691, 1151 + 1076, 667 Segoe UI, 9.75pt - 5, 7, 5, 7 + 3, 4, 3, 4 Datei Indexierung @@ -1209,6 +1230,12 @@ DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem3 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmIndex diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index a7bf2bb..010017a 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1,17 +1,18 @@ Imports System.IO -Imports System.Text.RegularExpressions -Imports System.Text Imports System.Security.AccessControl +Imports System.Text +Imports System.Text.RegularExpressions +Imports DevExpress.XtraEditors +Imports DevExpress.XtraEditors.Controls +Imports DevExpress.XtraSpreadsheet.TileLayout +Imports DigitalData.Controls.LookupGrid +Imports DigitalData.GUIs.Common +Imports DigitalData.GUIs.GlobalIndexer +Imports DigitalData.Modules.Base 'Imports System.Security.Principal Imports DigitalData.Modules.Logging -Imports DigitalData.Controls.LookupGrid -Imports DigitalData.GUIs.GlobalIndexer -Imports DevExpress.XtraEditors.Controls -Imports Limilabs.Mail -Imports DevExpress.XtraEditors -Imports DigitalData.GUIs.Common -Imports DigitalData.Modules.Base Imports DigitalData.Modules.Windream +Imports Limilabs.Mail 'Imports DevExpress.DataAccess.Native.Json 'Imports GdPicture.Internal.MSOfficeBinary.translator.Spreadsheet.XlsFileFormat.Records @@ -167,6 +168,32 @@ Public Class frmIndex pnlIndex.Controls.Add(lbl) End Sub + Private Sub AddLabelAndControl(labelText As String, + ctrl As Control, + indexName As String) + + '--- Label vorbereiten ------------------------------------ + Dim lbl As New Label With { + .Name = $"lbl_{indexName}", + .Text = labelText, + .AutoSize = True, + .Anchor = AnchorStyles.Left, + .Margin = New Padding(4, 4, 4, 4) 'äußerer Abstand + } + + '--- Control vorbereiten ---------------------------------- + ctrl.Anchor = AnchorStyles.Left Or AnchorStyles.Right + ctrl.Margin = New Padding(4, 4, 8, 4) 'äußerer Abstand rechts etwas größer + ctrl.Width = 260 'falls AutoSize=False + + '--- Zeile dynamisch anlegen ------------------------------ + tlpIndex.RowCount += 1 + tlpIndex.RowStyles.Add(New RowStyle(SizeType.AutoSize)) + + tlpIndex.Controls.Add(lbl, 0, tlpIndex.RowCount - 1) 'Spalte 0 = Label + tlpIndex.Controls.Add(ctrl, 1, tlpIndex.RowCount - 1) 'Spalte 1 = Control + End Sub + Function Indexwert_checkValueDB(indexname As String, wert As String) Try Dim DR As DataRow @@ -1968,29 +1995,147 @@ Public Class frmIndex End Try End Function + 'Private Sub LoadIndexe_Man() + ' Try + + ' Dim oScreen As New DigitalData.Modules.Windows.Screen() + ' Dim oDpiscale = oScreen.GetScreenScaling(Me) + + ' Dim oControlCount As Integer = 1 + ' Dim oLabelPosition As Integer = 11 * oDpiscale + ' Dim oControlPosition As Integer = 33 * oDpiscale + + ' _Logger.Info("Loading Indicies for Screen Scaling Factor [{0}]", oDpiscale) + + ' Dim oControls As New ControlCreator(LOGCONFIG, pnlIndex, Me) With { + ' .OnControlChanged = AddressOf PrepareDependingControl, + ' .OnLookupData = AddressOf GetLookupData + ' } + + ' 'Dim oControls As New ClassControls(pnlIndex, Me) + + ' If DT_INDEXEMAN.Rows.Count = 0 Then + ' ' ShowError("Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & cmbDokumentart.Text & " definiert") + ' '_Logger.Info(" - Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & cmbDokumentart.Text & " definiert") + + ' ShowError("Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & ComboboxDoctype.Text & " definiert") + ' _Logger.Info(" - Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & ComboboxDoctype.Text & " definiert") + ' End If + + ' For Each oRow As DataRow In DT_INDEXEMAN.Rows + ' Dim oDataType = oRow.Item("DATATYPE") + ' Dim MultiSelect As Boolean = oRow.Item("MULTISELECT") + ' Dim AddNewItems As Boolean = oRow.Item("VKT_ADD_ITEM") + ' Dim PreventDuplicates As Boolean = oRow.Item("VKT_PREVENT_MULTIPLE_VALUES") + ' Dim oControlName As String = oRow.Item("NAME") + ' Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", 0) + ' Dim oSQLSuggestion = oRow.Item("SUGGESTION") + ' Dim oSQLResult = oRow.Item("SQL_RESULT") + + ' LOGGER.Debug("IndexName: {0}", oControlName) + ' LOGGER.Debug("SQL: {0}", oSQLResult) + + ' If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then + ' addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount) + ' End If + + ' Dim DefaultValue = Check_HistoryValues(oControlName, oRow.Item("DOKUMENTART")) + ' If DefaultValue Is Nothing Then + ' DefaultValue = GetPlaceholderValue(oRow.Item("DEFAULT_VALUE"), CURRENT_WORKFILE, USER_SHORTNAME) + ' End If + + ' Select Case oDataType + ' Case ClassConstants.INDEX_TYPE_BOOLEAN + ' Dim chk As CheckEdit = oControls.AddCheckBox(oControlName, oControlPosition, DefaultValue, oRow.Item("COMMENT").ToString) + ' If Not IsNothing(chk) Then + ' pnlIndex.Controls.Add(chk) + ' End If + ' Case ClassConstants.INDEX_TYPE_INTEGER + ' If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then + ' Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) + ' If Not IsNothing(oControl) Then + ' pnlIndex.Controls.Add(oControl) + ' End If + ' Else + ' 'nur eine Textbox + ' Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, DefaultValue, oDataType) + ' If Not IsNothing(oControl) Then + ' pnlIndex.Controls.Add(oControl) + ' End If + ' End If + ' Case ClassConstants.INDEX_TYPE_VARCHAR + ' If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then + ' Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) + ' If Not IsNothing(oControl) Then + ' pnlIndex.Controls.Add(oControl) + ' End If + ' Else + ' If oControlName.ToString.ToLower = "dateiname" Then + ' Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE), oDataType) + ' If Not IsNothing(oControl) Then + ' pnlIndex.Controls.Add(oControl) + ' End If + ' Else + ' Dim VORBELGUNG As String = DefaultValue + ' Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, VORBELGUNG, oDataType) + ' If Not IsNothing(oControl) Then + ' pnlIndex.Controls.Add(oControl) + ' End If + ' End If + ' End If + ' Case "DATE" + ' Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, DefaultValue) + ' pnlIndex.Controls.Add(oPicker) + + ' Case Else + ' If USER_LANGUAGE = LANG_DE Then + ' MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") + ' Else + ' MsgBox("Please check Datatype of Indexvalue!", MsgBoxStyle.Critical, "Warning:") + ' End If + + ' _Logger.Warn(" - Datentyp nicht hinterlegt - LoadIndexe_Man") + ' End Select + + ' oControlCount += 1 + ' oLabelPosition += 50 * oDpiscale + ' oControlPosition += 50 * oDpiscale + ' 'make y as height in fom + ' Next + ' Dim oPanelHeight = oControlPosition - 30 + + ' If pnlIndex.Height < oPanelHeight Then + ' If (Me.Height - 315) < oPanelHeight Then + ' Me.Height = (Me.Height - 315) + oPanelHeight + ' End If + ' pnlIndex.Height = oPanelHeight + ' End If + + ' SendKeys.Send("{TAB}") + ' Catch ex As Exception + ' ShowErrorMessage(ex, "LoadIndexe_Man") + ' End Try + 'End Sub + Private Sub LoadIndexe_Man() Try - Dim oScreen As New DigitalData.Modules.Windows.Screen() Dim oDpiscale = oScreen.GetScreenScaling(Me) - Dim oControlCount As Integer = 1 - Dim oLabelPosition As Integer = 11 * oDpiscale - Dim oControlPosition As Integer = 33 * oDpiscale + Dim oRowTop As Integer = 20 * oDpiscale + Dim oLabelLeft As Integer = 10 + Dim oControlLeft As Integer = 160 + Dim oControlWidth As Integer = 300 + Dim oZeilenhoehe As Integer = 30 * oDpiscale _Logger.Info("Loading Indicies for Screen Scaling Factor [{0}]", oDpiscale) Dim oControls As New ControlCreator(LOGCONFIG, pnlIndex, Me) With { - .OnControlChanged = AddressOf PrepareDependingControl, - .OnLookupData = AddressOf GetLookupData - } - - 'Dim oControls As New ClassControls(pnlIndex, Me) + .OnControlChanged = AddressOf PrepareDependingControl, + .OnLookupData = AddressOf GetLookupData + } If DT_INDEXEMAN.Rows.Count = 0 Then - ' ShowError("Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & cmbDokumentart.Text & " definiert") - '_Logger.Info(" - Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & cmbDokumentart.Text & " definiert") - ShowError("Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & ComboboxDoctype.Text & " definiert") _Logger.Info(" - Keine Manuellen Indizes für die " & vbNewLine & "Dokumentart " & ComboboxDoctype.Text & " definiert") End If @@ -2008,75 +2153,65 @@ Public Class frmIndex LOGGER.Debug("IndexName: {0}", oControlName) LOGGER.Debug("SQL: {0}", oSQLResult) - If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then - addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount) - End If - Dim DefaultValue = Check_HistoryValues(oControlName, oRow.Item("DOKUMENTART")) If DefaultValue Is Nothing Then DefaultValue = GetPlaceholderValue(oRow.Item("DEFAULT_VALUE"), CURRENT_WORKFILE, USER_SHORTNAME) End If + Dim ctrl As Control = Nothing + + ' Label nur anzeigen, wenn nicht BOOLEAN + If oDataType <> ClassConstants.INDEX_TYPE_BOOLEAN Then + Dim lbl As New Label() + lbl.Text = oRow.Item("COMMENT").ToString() + lbl.Left = oLabelLeft + lbl.Top = oRowTop + lbl.Width = oControlLeft - oLabelLeft - 10 + lbl.Height = 20 + lbl.TextAlign = ContentAlignment.MiddleRight + pnlIndex.Controls.Add(lbl) + End If + + ' Control erzeugen und platzieren Select Case oDataType Case ClassConstants.INDEX_TYPE_BOOLEAN - Dim chk As CheckEdit = oControls.AddCheckBox(oControlName, oControlPosition, DefaultValue, oRow.Item("COMMENT").ToString) - If Not IsNothing(chk) Then + Dim chk As CheckEdit = oControls.AddCheckBox(oControlName, oRowTop, DefaultValue, oRow.Item("COMMENT").ToString) + If chk IsNot Nothing Then + chk.Left = oControlLeft + chk.Top = oRowTop + chk.Width = oControlWidth + chk.Margin = New Padding(0, 4, 0, 4) pnlIndex.Controls.Add(chk) End If - Case ClassConstants.INDEX_TYPE_INTEGER - If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then - Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) - If Not IsNothing(oControl) Then - pnlIndex.Controls.Add(oControl) - End If + Case ClassConstants.INDEX_TYPE_INTEGER, ClassConstants.INDEX_TYPE_VARCHAR + If (oSQLSuggestion = True AndAlso oSQLResult.ToString.Length > 0) OrElse MultiSelect = True Then + ctrl = oControls.AddLookupControl(oControlName, oRowTop, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) Else - 'nur eine Textbox - Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, DefaultValue, oDataType) - If Not IsNothing(oControl) Then - pnlIndex.Controls.Add(oControl) - End If - End If - Case ClassConstants.INDEX_TYPE_VARCHAR - If (oSQLSuggestion = True And oSQLResult.ToString.Length > 0) Or MultiSelect = True Then - Dim oControl = oControls.AddLookupControl(oControlName, oControlPosition, MultiSelect, oDataType, oSQLResult, oConnectionId, DefaultValue, AddNewItems, PreventDuplicates) - If Not IsNothing(oControl) Then - pnlIndex.Controls.Add(oControl) - End If - Else - If oControlName.ToString.ToLower = "dateiname" Then - Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE), oDataType) - If Not IsNothing(oControl) Then - pnlIndex.Controls.Add(oControl) - End If + If oControlName.ToLower() = "dateiname" Then + ctrl = oControls.AddTextBox(oControlName, oRowTop, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE), oDataType) Else - Dim VORBELGUNG As String = DefaultValue - Dim oControl = oControls.AddTextBox(oControlName, oControlPosition, VORBELGUNG, oDataType) - If Not IsNothing(oControl) Then - pnlIndex.Controls.Add(oControl) - End If + ctrl = oControls.AddTextBox(oControlName, oRowTop, DefaultValue, oDataType) End If End If Case "DATE" - Dim oPicker = oControls.AddDateTimePicker(oControlName, oControlPosition, DefaultValue) - pnlIndex.Controls.Add(oPicker) - + ctrl = oControls.AddDateTimePicker(oControlName, oRowTop, DefaultValue) Case Else - If USER_LANGUAGE = LANG_DE Then - MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") - Else - MsgBox("Please check Datatype of Indexvalue!", MsgBoxStyle.Critical, "Warning:") - End If - + MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") _Logger.Warn(" - Datentyp nicht hinterlegt - LoadIndexe_Man") End Select - oControlCount += 1 - oLabelPosition += 50 * oDpiscale - oControlPosition += 50 * oDpiscale - 'make y as height in fom - Next - Dim oPanelHeight = oControlPosition - 30 + If ctrl IsNot Nothing Then + ctrl.Left = oControlLeft + ctrl.Top = oRowTop + ctrl.Width = oControlWidth + pnlIndex.Controls.Add(ctrl) + End If + oRowTop += oZeilenhoehe + Next + + ' Panel- und Formhöhe anpassen, wenn nötig + Dim oPanelHeight = oRowTop + 10 If pnlIndex.Height < oPanelHeight Then If (Me.Height - 315) < oPanelHeight Then Me.Height = (Me.Height - 315) + oPanelHeight @@ -2085,6 +2220,7 @@ Public Class frmIndex End If SendKeys.Send("{TAB}") + Catch ex As Exception ShowErrorMessage(ex, "LoadIndexe_Man") End Try