Merge branch 'master' of http://git.dd:3000/AppStd/Monorepo
This commit is contained in:
commit
e9bd997459
@ -89,8 +89,9 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
|
<HintPath>..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="GdPicture.NET.14">
|
<Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
|
||||||
<HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>D:\ProgramFiles\GdPicture.net 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||||
|
|||||||
@ -73,6 +73,9 @@
|
|||||||
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
<Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="DigitalData.Controls.DocumentViewer">
|
||||||
|
<HintPath>..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="DigitalData.Modules.Config">
|
<Reference Include="DigitalData.Modules.Config">
|
||||||
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
<HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
@ -102,9 +105,8 @@
|
|||||||
<Reference Include="DigitalData.Modules.Windream">
|
<Reference Include="DigitalData.Modules.Windream">
|
||||||
<HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
|
<HintPath>..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="GdPicture.NET.14, Version=14.1.0.97, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
|
<Reference Include="GdPicture.NET.14">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<HintPath>P:\Visual Studio Projekte\Bibliotheken\GdPicture.NET 14.1\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
|
||||||
<HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
|
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Mail">
|
<Reference Include="Mail">
|
||||||
<HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
|
<HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
|
||||||
@ -347,10 +349,6 @@
|
|||||||
<WCFMetadata Include="Connected Services\" />
|
<WCFMetadata Include="Connected Services\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
|
|
||||||
<Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
|
|
||||||
<Name>DocumentViewer</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
<ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
|
<ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
|
||||||
<Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project>
|
<Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project>
|
||||||
<Name>LookupControl</Name>
|
<Name>LookupControl</Name>
|
||||||
|
|||||||
27
GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
generated
27
GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
generated
@ -28,7 +28,6 @@ Partial Class Form1
|
|||||||
Me.Button2 = New System.Windows.Forms.Button()
|
Me.Button2 = New System.Windows.Forms.Button()
|
||||||
Me.Button3 = New System.Windows.Forms.Button()
|
Me.Button3 = New System.Windows.Forms.Button()
|
||||||
Me.Button4 = New System.Windows.Forms.Button()
|
Me.Button4 = New System.Windows.Forms.Button()
|
||||||
Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
|
|
||||||
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
|
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
|
||||||
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
|
Me.GroupBox2 = New System.Windows.Forms.GroupBox()
|
||||||
Me.Button7 = New System.Windows.Forms.Button()
|
Me.Button7 = New System.Windows.Forms.Button()
|
||||||
@ -37,6 +36,7 @@ Partial Class Form1
|
|||||||
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
|
Me.GroupBox4 = New System.Windows.Forms.GroupBox()
|
||||||
Me.Button6 = New System.Windows.Forms.Button()
|
Me.Button6 = New System.Windows.Forms.Button()
|
||||||
Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
|
Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
|
||||||
|
Me.txtMD5Checksum = New System.Windows.Forms.TextBox()
|
||||||
Me.GroupBox1.SuspendLayout()
|
Me.GroupBox1.SuspendLayout()
|
||||||
Me.GroupBox2.SuspendLayout()
|
Me.GroupBox2.SuspendLayout()
|
||||||
Me.GroupBox3.SuspendLayout()
|
Me.GroupBox3.SuspendLayout()
|
||||||
@ -58,10 +58,13 @@ Partial Class Form1
|
|||||||
'
|
'
|
||||||
'ListBox1
|
'ListBox1
|
||||||
'
|
'
|
||||||
|
Me.ListBox1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
|
||||||
|
Or System.Windows.Forms.AnchorStyles.Left) _
|
||||||
|
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||||
Me.ListBox1.FormattingEnabled = True
|
Me.ListBox1.FormattingEnabled = True
|
||||||
Me.ListBox1.Location = New System.Drawing.Point(378, 12)
|
Me.ListBox1.Location = New System.Drawing.Point(378, 8)
|
||||||
Me.ListBox1.Name = "ListBox1"
|
Me.ListBox1.Name = "ListBox1"
|
||||||
Me.ListBox1.Size = New System.Drawing.Size(526, 472)
|
Me.ListBox1.Size = New System.Drawing.Size(532, 472)
|
||||||
Me.ListBox1.TabIndex = 1
|
Me.ListBox1.TabIndex = 1
|
||||||
'
|
'
|
||||||
'Button2
|
'Button2
|
||||||
@ -91,15 +94,6 @@ Partial Class Form1
|
|||||||
Me.Button4.Text = "Create MD5 Checksum for PDF"
|
Me.Button4.Text = "Create MD5 Checksum for PDF"
|
||||||
Me.Button4.UseVisualStyleBackColor = True
|
Me.Button4.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
'txtMD5Checksum
|
|
||||||
'
|
|
||||||
Me.txtMD5Checksum.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ZUGFeRDTest.My.MySettings.Default, "MD5Cheksum", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
|
|
||||||
Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
|
|
||||||
Me.txtMD5Checksum.Name = "txtMD5Checksum"
|
|
||||||
Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
|
|
||||||
Me.txtMD5Checksum.TabIndex = 5
|
|
||||||
Me.txtMD5Checksum.Text = Global.ZUGFeRDTest.My.MySettings.Default.MD5Cheksum
|
|
||||||
'
|
|
||||||
'GroupBox1
|
'GroupBox1
|
||||||
'
|
'
|
||||||
Me.GroupBox1.Controls.Add(Me.Button1)
|
Me.GroupBox1.Controls.Add(Me.Button1)
|
||||||
@ -169,6 +163,15 @@ Partial Class Form1
|
|||||||
Me.Button6.Text = "Find and Extract XML Path Value"
|
Me.Button6.Text = "Find and Extract XML Path Value"
|
||||||
Me.Button6.UseVisualStyleBackColor = True
|
Me.Button6.UseVisualStyleBackColor = True
|
||||||
'
|
'
|
||||||
|
'txtMD5Checksum
|
||||||
|
'
|
||||||
|
Me.txtMD5Checksum.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ZUGFeRDTest.My.MySettings.Default, "MD5Cheksum", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
|
||||||
|
Me.txtMD5Checksum.Location = New System.Drawing.Point(6, 49)
|
||||||
|
Me.txtMD5Checksum.Name = "txtMD5Checksum"
|
||||||
|
Me.txtMD5Checksum.Size = New System.Drawing.Size(348, 20)
|
||||||
|
Me.txtMD5Checksum.TabIndex = 5
|
||||||
|
Me.txtMD5Checksum.Text = Global.ZUGFeRDTest.My.MySettings.Default.MD5Cheksum
|
||||||
|
'
|
||||||
'Form1
|
'Form1
|
||||||
'
|
'
|
||||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||||
|
|||||||
@ -116,6 +116,8 @@ Public Class Form1
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
|
||||||
|
ListBox1.Text = ""
|
||||||
|
ListBox1.Items.Clear()
|
||||||
Dim oDialogResult = OpenFileDialog1.ShowDialog()
|
Dim oDialogResult = OpenFileDialog1.ShowDialog()
|
||||||
Dim oArgs As New WorkerArgs() With {
|
Dim oArgs As New WorkerArgs() With {
|
||||||
.AllowFacturX = False,
|
.AllowFacturX = False,
|
||||||
|
|||||||
@ -15,7 +15,7 @@ Option Explicit On
|
|||||||
Namespace My
|
Namespace My
|
||||||
|
|
||||||
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
|
||||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"), _
|
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _
|
||||||
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
|
||||||
Partial Friend NotInheritable Class MySettings
|
Partial Friend NotInheritable Class MySettings
|
||||||
Inherits Global.System.Configuration.ApplicationSettingsBase
|
Inherits Global.System.Configuration.ApplicationSettingsBase
|
||||||
@ -110,7 +110,7 @@ Namespace My
|
|||||||
|
|
||||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
||||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
Global.System.Configuration.DefaultSettingValueAttribute("Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd")> _
|
Global.System.Configuration.DefaultSettingValueAttribute("Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd")> _
|
||||||
Public Property MSSQL_CONNECTIONSTRING() As String
|
Public Property MSSQL_CONNECTIONSTRING() As String
|
||||||
Get
|
Get
|
||||||
Return CType(Me("MSSQL_CONNECTIONSTRING"),String)
|
Return CType(Me("MSSQL_CONNECTIONSTRING"),String)
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
<Value Profile="(Default)" />
|
<Value Profile="(Default)" />
|
||||||
</Setting>
|
</Setting>
|
||||||
<Setting Name="MSSQL_CONNECTIONSTRING" Type="System.String" Scope="User">
|
<Setting Name="MSSQL_CONNECTIONSTRING" Type="System.String" Scope="User">
|
||||||
<Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM_TEST;User Id=sa;Password=dd</Value>
|
<Value Profile="(Default)">Server=SDD-VMP04-SQL17\DD_DEVELOP01;Database=DD_ECM;User Id=sa;Password=dd</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
</Settings>
|
</Settings>
|
||||||
</SettingsFile>
|
</SettingsFile>
|
||||||
@ -293,7 +293,7 @@ Public Class EmailService
|
|||||||
oEmailQueue = _Firebird.GetDatatable(oSQL)
|
oEmailQueue = _Firebird.GetDatatable(oSQL)
|
||||||
Case DatabaseType.MSSQL
|
Case DatabaseType.MSSQL
|
||||||
If My.Settings.MSSQL_SELECT <> String.Empty Then
|
If My.Settings.MSSQL_SELECT <> String.Empty Then
|
||||||
_Logger.Info("My.Settings.MSSQL_SELECT will be used..")
|
_Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
|
||||||
oSQL = My.Settings.MSSQL_SELECT
|
oSQL = My.Settings.MSSQL_SELECT
|
||||||
Else
|
Else
|
||||||
oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
|
oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user