diff --git a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb index da30bfe8..b925710b 100644 --- a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb +++ b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb index e3544e5a..ae1b6a73 100644 --- a/GUIs.ClipboardWatcher/frmMatch.vb +++ b/GUIs.ClipboardWatcher/frmMatch.vb @@ -140,7 +140,9 @@ Public Class frmMatch _Logger.Debug($"ONLY Docs") 'ONLY DOCS AND NÒ DATA Dim oSearches = Await oProfileSearch.LoadDocumentSearchesAsync(oProfile.Guid) + _Logger.Debug($"Searches executed") OpenDocumentResults(oProfile, oSearches) + _Logger.Debug($"OpenDocumentResults finished") Hide() ElseIf oProfile.CountDocs > 0 And oProfile.CountData > 0 Then _Logger.Debug($"Docs AND Data") diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 95e7dd9a..2e513db0 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -77,11 +77,12 @@ Public Class frmDocumentResultList _Helpers = New DocumentResultList(LogConfig) _Filesystem = New Modules.Filesystem.File(_LogConfig) _GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3}) - _Environment = Environment + _Logger.Debug("DocumentResultlist: Environment loaded") _Params = Params + _Logger.Debug("DocumentResultlist: Params loaded") _ResultLists = Params.Results - + _Logger.Debug("DocumentResultlist: Params.Results loaded") _Language = Utils.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US) End Sub @@ -254,7 +255,7 @@ Public Class frmDocumentResultList _OpenDocuments.Add(oResultDocumentInfo) _CurrentDocument = oResultDocumentInfo End If - + _Logger.Debug($"Got Info for oObjectId: {oObjectId}!") Return oResultDocumentInfo Catch ex As Exception _Logger.Error(ex) diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index d07341f9..f07881ad 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index 0c9c984c..e0231a28 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -141,7 +141,6 @@ Partial Class frmObjectPropertyDialog Me.cmbBusinessEntity.EditWidth = 100 Me.cmbBusinessEntity.Id = 6 Me.cmbBusinessEntity.Name = "cmbBusinessEntity" - Me.cmbBusinessEntity.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'BarStaticItem1 ' @@ -241,7 +240,7 @@ Partial Class frmObjectPropertyDialog Me.lbLifecycleEnd.LineVisible = True Me.lbLifecycleEnd.Location = New System.Drawing.Point(489, 30) Me.lbLifecycleEnd.Name = "lbLifecycleEnd" - Me.lbLifecycleEnd.Size = New System.Drawing.Size(54, 13) + Me.lbLifecycleEnd.Size = New System.Drawing.Size(56, 13) Me.lbLifecycleEnd.TabIndex = 1 Me.lbLifecycleEnd.Text = "00.00.0000" ' @@ -250,84 +249,84 @@ Partial Class frmObjectPropertyDialog Me.lbLifecycleStart.LineVisible = True Me.lbLifecycleStart.Location = New System.Drawing.Point(5, 30) Me.lbLifecycleStart.Name = "lbLifecycleStart" - Me.lbLifecycleStart.Size = New System.Drawing.Size(54, 13) + Me.lbLifecycleStart.Size = New System.Drawing.Size(56, 13) Me.lbLifecycleStart.TabIndex = 1 Me.lbLifecycleStart.Text = "00.00.0000" ' 'txtCreatedWhen ' - Me.txtCreatedWhen.Location = New System.Drawing.Point(87, 37) + Me.txtCreatedWhen.Location = New System.Drawing.Point(85, 37) Me.txtCreatedWhen.Name = "txtCreatedWhen" Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWhen.Properties.ReadOnly = True - Me.txtCreatedWhen.Size = New System.Drawing.Size(197, 20) + Me.txtCreatedWhen.Size = New System.Drawing.Size(199, 20) Me.txtCreatedWhen.StyleController = Me.LayoutControlObject Me.txtCreatedWhen.TabIndex = 4 ' 'txtChangedWhen ' - Me.txtChangedWhen.Location = New System.Drawing.Point(87, 61) + Me.txtChangedWhen.Location = New System.Drawing.Point(85, 61) Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(197, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(199, 20) Me.txtChangedWhen.StyleController = Me.LayoutControlObject Me.txtChangedWhen.TabIndex = 5 ' 'txtAccessedWhen ' - Me.txtAccessedWhen.Location = New System.Drawing.Point(87, 85) + Me.txtAccessedWhen.Location = New System.Drawing.Point(85, 85) Me.txtAccessedWhen.Name = "txtAccessedWhen" Me.txtAccessedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtAccessedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtAccessedWhen.Properties.ReadOnly = True - Me.txtAccessedWhen.Size = New System.Drawing.Size(197, 20) + Me.txtAccessedWhen.Size = New System.Drawing.Size(199, 20) Me.txtAccessedWhen.StyleController = Me.LayoutControlObject Me.txtAccessedWhen.TabIndex = 6 ' 'txtObjectId ' - Me.txtObjectId.Location = New System.Drawing.Point(87, 12) + Me.txtObjectId.Location = New System.Drawing.Point(85, 12) Me.txtObjectId.Name = "txtObjectId" Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtObjectId.Properties.ReadOnly = True - Me.txtObjectId.Size = New System.Drawing.Size(473, 20) + Me.txtObjectId.Size = New System.Drawing.Size(475, 20) Me.txtObjectId.StyleController = Me.LayoutControlObject Me.txtObjectId.TabIndex = 7 ' 'txtCreatedWho ' - Me.txtCreatedWho.Location = New System.Drawing.Point(363, 37) + Me.txtCreatedWho.Location = New System.Drawing.Point(361, 37) Me.txtCreatedWho.Name = "txtCreatedWho" Me.txtCreatedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWho.Properties.ReadOnly = True - Me.txtCreatedWho.Size = New System.Drawing.Size(197, 20) + Me.txtCreatedWho.Size = New System.Drawing.Size(199, 20) Me.txtCreatedWho.StyleController = Me.LayoutControlObject Me.txtCreatedWho.TabIndex = 8 ' 'txtChangedWho ' - Me.txtChangedWho.Location = New System.Drawing.Point(363, 61) + Me.txtChangedWho.Location = New System.Drawing.Point(361, 61) Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(197, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(199, 20) Me.txtChangedWho.StyleController = Me.LayoutControlObject Me.txtChangedWho.TabIndex = 9 ' 'TextEdit1 ' - Me.TextEdit1.Location = New System.Drawing.Point(363, 85) + Me.TextEdit1.Location = New System.Drawing.Point(361, 85) Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.TextEdit1.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(197, 20) + Me.TextEdit1.Size = New System.Drawing.Size(199, 20) Me.TextEdit1.StyleController = Me.LayoutControlObject Me.TextEdit1.TabIndex = 10 ' @@ -347,7 +346,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Size = New System.Drawing.Size(276, 24) Me.LayoutControlItem1.Text = "Erstellt" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem2 ' @@ -356,7 +355,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Size = New System.Drawing.Size(276, 24) Me.LayoutControlItem2.Text = "Geändert" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem3 ' @@ -365,7 +364,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Size = New System.Drawing.Size(276, 24) Me.LayoutControlItem3.Text = "Letzter Zugriff" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem4 ' @@ -374,7 +373,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Size = New System.Drawing.Size(552, 24) Me.LayoutControlItem4.Text = "Objekt Id" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(70, 13) ' 'SimpleSeparator1 ' @@ -390,7 +389,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Size = New System.Drawing.Size(276, 24) Me.LayoutControlItem5.Text = "von" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem6 ' @@ -399,7 +398,7 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Size = New System.Drawing.Size(276, 24) Me.LayoutControlItem6.Text = "von" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(72, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(70, 13) ' 'txtAccessedWho ' @@ -409,7 +408,7 @@ Partial Class frmObjectPropertyDialog Me.txtAccessedWho.Name = "txtAccessedWho" Me.txtAccessedWho.Size = New System.Drawing.Size(276, 24) Me.txtAccessedWho.Text = "von" - Me.txtAccessedWho.TextSize = New System.Drawing.Size(72, 13) + Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) ' 'EmptySpaceItem1 ' diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index 53f93237..133116ac 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -157,37 +157,45 @@ Public Class frmObjectPropertyDialog End Function Private Async Sub cmbBusinessEntity_EditValueChanged(sender As Object, e As EventArgs) Handles cmbBusinessEntity.EditValueChanged - Dim oEntityId As Long - - If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then - Exit Sub - End If - - Dim oAttributes = Await GetAttributesForBusinessEntity(oEntityId) - - For Each oAttribute As Attribute In oAttributes - Dim oControl = _Controls.GetControlForAttribute(oAttribute, True) - Dim oItem As LayoutControlItem = AttributeLayout.AddItem() - - oItem.Text = oAttribute.Title - oItem.Name = oAttribute.Title - oItem.Control = oControl - Next - - For Each oItem As LayoutControlItem In AttributeLayout.Items - If TypeOf oItem.Control Is BaseEdit Then - Dim oValue = Await GetAttributeValue(oItem.Name, _ObjectId) - Dim oEdit = DirectCast(oItem.Control, BaseEdit) - oEdit.EditValue = oValue - ElseIf TypeOf oItem.Control Is GridControl Then - Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, _ObjectId) - Dim oGrid = DirectCast(oItem.Control, GridControl) - oGrid.DataSource = oValueTable - - End If - Next + Load_Attributes() End Sub + Private Async Sub Load_Attributes() + Try + Dim oEntityId As Long + If Long.TryParse(cmbBusinessEntity.EditValue, oEntityId) = False Then + _Logger.Warn("Could not Parse Entity from cmbBusinessEntity") + Exit Sub + End If + + Dim oAttributes = Await GetAttributesForBusinessEntity(oEntityId) + + For Each oAttribute As Attribute In oAttributes + Dim oControl = _Controls.GetControlForAttribute(oAttribute, True) + Dim oItem As LayoutControlItem = AttributeLayout.AddItem() + + oItem.Text = oAttribute.Title + oItem.Name = oAttribute.Title + oItem.Control = oControl + Next + + For Each oItem As LayoutControlItem In AttributeLayout.Items + If TypeOf oItem.Control Is BaseEdit Then + Dim oValue = Await GetAttributeValue(oItem.Name, _ObjectId) + Dim oEdit = DirectCast(oItem.Control, BaseEdit) + oEdit.EditValue = oValue + ElseIf TypeOf oItem.Control Is GridControl Then + Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, _ObjectId) + Dim oGrid = DirectCast(oItem.Control, GridControl) + oGrid.DataSource = oValueTable + + End If + Next + Catch ex As Exception + _Logger.Error(ex) + End Try + + End Sub Private Function ShowAttributeHistory(pDatatable As DataTable) As Boolean Try If pDatatable.Rows.Count > 0 diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index 93687c93..eee054ad 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -93,7 +93,7 @@ Public Class ImportZUGFeRDFiles _logger.Debug("Versioned filename for eml file is {0}", oFinalFileName) If oEmailData Is Nothing Then - _logger.Warn("Could not get Email Data from database. File {0} will not be moved!", oSource) + _logger.Warn("Could not get Email Data from firebird-database. File {0} will not be moved!", oSource) Return Nothing End If diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb index 3ba90779..2a1629f3 100644 --- a/Service.EDMIService/EDMIService.vb +++ b/Service.EDMIService/EDMIService.vb @@ -385,6 +385,7 @@ Public Class EDMIService Public Function GetFileInfoByObjectId(Data As DocumentInfoRequest) As DocumentInfoResponse Implements IEDMIService.GetFileInfoByObjectId Try + _Logger.Debug("GetFileInfoByObjectId...") Dim oAccessRight = GetAccessRightForObjectId(Data.UserId, Data.ObjectId) Dim oFullPath = GetFullPathForObjectId(Data.ObjectId) @@ -397,7 +398,7 @@ Public Class EDMIService .FileRight = oAccessRight, .FullPath = oFullPath } - + _Logger.Debug("End GetFileInfoByObjectId!") Catch ex As FaultException _Logger.Warn("GetFileInfoByObjectId: " & ex.Message) _Logger.Error(ex) diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 26d4bb54..4adf3ad7 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index 75ce14d8..672dc210 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -92,7 +92,7 @@ Public Class ThreadRunner _logger.Debug("Checking Non ZUGFeRD Directory {0}", oArgs.NonZugferdDirectory) If Not Directory.Exists(oArgs.NonZugferdDirectory) Then - _logger.Warn("RejectedEmailDirectory {0} does not exist!", oArgs.RejectedEmailDirectory) + _logger.Warn("NonZugferdDirectory {0} does not exist!", oArgs.NonZugferdDirectory) End If _logger.Debug("Checking Exception Email Adress {0}", oArgs.ExceptionEmailAddress) @@ -199,6 +199,7 @@ Public Class ThreadRunner pArgs.AttachmentsSubDirectory = oRow.Item("FOLDER_PATH") Case ZUGFERD_NO_ZUGFERD + _logger.Info($"## {ZUGFERD_NO_ZUGFERD}-Constant has been defined! [{oRow.Item("FOLDER_PATH")}]##") pArgs.NonZugferdDirectory = oRow.Item("FOLDER_PATH") End Select @@ -209,7 +210,7 @@ Public Class ThreadRunner Private Function LoadPropertyMapFor(pArgs As WorkerArgs, pSpecification As String) As WorkerArgs Dim oSQL As String = $"SELECT * FROM TBEDM_XML_ITEMS WHERE SPECIFICATION = '{pSpecification}' AND ACTIVE = True ORDER BY XML_PATH" - Dim oResult As DataTable = _firebird.GetDatatable(oSQL) + Dim oResult As DataTable = _firebird.GetDatatable(oSQL) For Each row As DataRow In oResult.Rows Dim oXmlPath = row.Item("XML_PATH")