diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index fd5023bf..d27927c4 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -406,12 +406,13 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"IDB"}, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") + Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 3, 4, 4, -1, "GLOBIX_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 4, 4, 4, -1, "GLOBIX_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 5, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 6, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 7, 3, 3, -1, "META_SOURCE_SQL") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 8, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False @@ -440,6 +441,7 @@ Partial Class frmAdmin_Start Me.MainTreeImages.Add("allowuserstoeditranges", "image://svgimages/spreadsheet/allowuserstoeditranges.svg") Me.MainTreeImages.Add("ZooFlow_G_DevExpress", "ZooFlow_G_DevExpress", GetType(DigitalData.GUIs.ZooFlow.My.Resources.Resources)) Me.MainTreeImages.Add("ZooFlow_CW_DevExpress", "ZooFlow_CW_DevExpress", GetType(DigitalData.GUIs.ZooFlow.My.Resources.Resources)) + Me.MainTreeImages.Add("open", "image://svgimages/actions/open.svg") ' 'DockManager1 ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index 836a7329..93afe9cd 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -254,9 +254,6 @@ 122, 17 - - 122, 17 - 396, 17 @@ -266,17 +263,14 @@ 531, 17 - - 531, 17 - - 1141, 17 + 1043, 17 17, 56 - 273, 45 + 1216, 17 264, 17 @@ -301,9 +295,9 @@ - 937, 22 + 919, 17 - 978, 50 + 277, 56 \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 7ea8efaa..9cf0a424 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -45,8 +45,8 @@ Public Class frmAdmin_Start labelTitle.Text = oNode.GridTitle btnAddRecord.Caption = oNode.NewRecordTitle Else - MsgBox($"Page [{Page}] not found! Exiting." & vbNewLine & - "Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text) + MsgBox($"Tag [{Page}] not found! Exiting." & vbNewLine & + $"Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag [{Page}] of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text) Return False End If @@ -70,7 +70,7 @@ Public Class frmAdmin_Start Private Function Load_SQLData() As Boolean Try - Dim oTable As DataTable = My.DatabaseECM.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL") + Dim oTable As DataTable = My.DatabaseECM.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL WHERE SCOPE = 'OVERVIEW'") DetailForm.DetailDataList.Clear() For Each oRow As DataRow In oTable.Rows diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 0e82f5ea..6a7e5bb6 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -202,6 +202,12 @@ DSIDB_Stammdaten.xsd + + frmAdmin_IDBStore.vb + + + Form + frmServiceConfig.vb @@ -370,6 +376,9 @@ frmAdmin_SourceSQL.vb + + frmAdmin_IDBStore.vb + frmServiceConfig.vb diff --git a/GUIs.ZooFlow/frmAdmin_IDBStore.Designer.vb b/GUIs.ZooFlow/frmAdmin_IDBStore.Designer.vb new file mode 100644 index 00000000..54e0bbeb --- /dev/null +++ b/GUIs.ZooFlow/frmAdmin_IDBStore.Designer.vb @@ -0,0 +1,97 @@ + _ +Partial Class frmAdmin_IDBStore + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(800, 94) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'frmAdmin_IDBStore + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmAdmin_IDBStore" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "frmAdmin_IDBStore" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage +End Class diff --git a/GUIs.ZooFlow/frmAdmin_IDBStore.resx b/GUIs.ZooFlow/frmAdmin_IDBStore.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.ZooFlow/frmAdmin_IDBStore.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmAdmin_IDBStore.vb b/GUIs.ZooFlow/frmAdmin_IDBStore.vb new file mode 100644 index 00000000..ee31bafc --- /dev/null +++ b/GUIs.ZooFlow/frmAdmin_IDBStore.vb @@ -0,0 +1,21 @@ +Imports DigitalData.Modules.Logging +Public Class frmAdmin_IDBStore + Implements IAdminForm + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert + + Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + 'InitializeBaseForm(My.LogConfig) + Me.PrimaryKey = PrimaryKey + Me.IsInsert = IsInsert + End Sub + + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData + Throw New NotImplementedException() + End Function +End Class \ No newline at end of file diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index f7a4ad16..d755d139 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -696,6 +696,10 @@ Public Class ImportZUGFeRDFiles ' Close the connection oConnection.Close() + If Message.Contains("REJECTED") Then + oSQL = $"UPDATE TBEMLP_HISTORY SET COMMENT = '{Message}' CUST_REJECTED = 1,CUST_REJECTED_WHEN = GETDATE() WHERE EMAIL_MSGID = '{MessageId}'" + _mssql.ExecuteNonQuery(oSQL) + End If Return True Catch ex As Exception diff --git a/Modules.Jobs/My Project/AssemblyInfo.vb b/Modules.Jobs/My Project/AssemblyInfo.vb index f2565f8b..4815083d 100644 --- a/Modules.Jobs/My Project/AssemblyInfo.vb +++ b/Modules.Jobs/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - - + +