This commit is contained in:
2024-09-19 13:20:23 +02:00
27 changed files with 1017 additions and 795 deletions

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.DAKOSY_Worker.My.MySettings
Get
Return Global.DAKOSY_Worker.My.MySettings.Default

View File

@@ -52,9 +52,6 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="VERAG_PROG_ALLGEMEIN">
<HintPath>..\..\..\Aviso\AVISO\Aviso\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
@@ -108,5 +105,11 @@
<LastGenOutput>Settings.Designer.vb</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.MDM_Worker.My.MySettings
Get
Return Global.MDM_Worker.My.MySettings.Default

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.MailSender.My.MySettings
Get
Return Global.MailSender.My.MySettings.Default

View File

@@ -48,8 +48,8 @@
<OptionInfer>On</OptionInfer>
</PropertyGroup>
<ItemGroup>
<Reference Include="KsVCom">
<HintPath>..\..\..\..\RKSV DE\KsVCom.dll</HintPath>
<Reference Include="ITGRKSVCom">
<HintPath>F:\PROGRAMMIERUNG\dll\ITGRKSVCom.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />

View File

@@ -1,4 +1,6 @@
Imports ItgKsV
Imports ITGRKSVCom
Imports RKSVComComplete
Public Class cRKSV_DE
Private Function SurroundingSub()
@@ -7,7 +9,9 @@ Public Class cRKSV_DE
' COM-Objekt anlegen
Dim licenseKey As String = "MEUCIQDg2GSwFrgOMHLzKBO7Sac+D3xBh9Ct+QRBXarDFPtdNgIgQyvotBil11sRfqQgdY+spD3aUve/HZS9cF7MS0D720w="
Dim m_ksv As ItgKsV.KsVCom = New ItgKsV.KsVCom()
Dim result As Integer = m_ksv.InitialiseLibrary("F:", "SwissbitDemo", "12345", licenseKey)
If result <> &H0 Then

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.TELOTEC_Worker.My.MySettings
Get
Return Global.TELOTEC_Worker.My.MySettings.Default

View File

@@ -53,6 +53,9 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="VERAG_PROG_ALLGEMEIN">
<HintPath>..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Import Include="Microsoft.VisualBasic" />
@@ -110,11 +113,5 @@
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@@ -286,6 +286,9 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="VERAG_PROG_ALLGEMEIN">
<HintPath>..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
@@ -1126,10 +1129,6 @@
</COMReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference>
<ProjectReference Include="..\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj">
<Project>{50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f}</Project>
<Name>DAKOSY_Worker_lib</Name>

View File

@@ -125,10 +125,8 @@ Partial Class frmMitarbDetails
Me.cboNiederlassung = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label9 = New System.Windows.Forms.Label()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
Me.txtprivateEMail = New System.Windows.Forms.TextBox()
Me.Label64 = New System.Windows.Forms.Label()
Me.cbxHO = New System.Windows.Forms.CheckBox()
Me.cbxChatBenutzer = New System.Windows.Forms.CheckBox()
Me.cbxTestaccount = New System.Windows.Forms.CheckBox()
Me.cbxGebDat = New System.Windows.Forms.CheckBox()
@@ -232,6 +230,9 @@ Partial Class frmMitarbDetails
Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.Label66 = New System.Windows.Forms.Label()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.cbxHO = New System.Windows.Forms.CheckBox()
Me.cbxBeiBeendenAusstempeln = New System.Windows.Forms.CheckBox()
Me.cbxTimasNichtStempeln1 = New System.Windows.Forms.CheckBox()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
Me.TabControl2.SuspendLayout()
@@ -1394,10 +1395,8 @@ Partial Class frmMitarbDetails
'
'GroupBox1
'
Me.GroupBox1.Controls.Add(Me.cbxTimasNichtStempeln1)
Me.GroupBox1.Controls.Add(Me.txtprivateEMail)
Me.GroupBox1.Controls.Add(Me.Label64)
Me.GroupBox1.Controls.Add(Me.cbxHO)
Me.GroupBox1.Controls.Add(Me.cbxChatBenutzer)
Me.GroupBox1.Controls.Add(Me.cbxTestaccount)
Me.GroupBox1.Controls.Add(Me.cbxGebDat)
@@ -1433,17 +1432,6 @@ Partial Class frmMitarbDetails
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Person"
'
'cbxTimasNichtStempeln1
'
Me.cbxTimasNichtStempeln1.AutoSize = True
Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(523, 182)
Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
Me.cbxTimasNichtStempeln1.TabIndex = 97
Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
'
'txtprivateEMail
'
Me.txtprivateEMail.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -1462,17 +1450,6 @@ Partial Class frmMitarbDetails
Me.Label64.TabIndex = 96
Me.Label64.Text = "private EMail (für ZE-Daten):"
'
'cbxHO
'
Me.cbxHO.AutoSize = True
Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxHO.Location = New System.Drawing.Point(295, 202)
Me.cbxHO.Name = "cbxHO"
Me.cbxHO.Size = New System.Drawing.Size(80, 17)
Me.cbxHO.TabIndex = 94
Me.cbxHO.Text = "Homeoffice"
Me.cbxHO.UseVisualStyleBackColor = True
'
'cbxChatBenutzer
'
Me.cbxChatBenutzer.AutoSize = True
@@ -2253,6 +2230,9 @@ Partial Class frmMitarbDetails
'
'TabPage8
'
Me.TabPage8.Controls.Add(Me.cbxTimasNichtStempeln1)
Me.TabPage8.Controls.Add(Me.cbxBeiBeendenAusstempeln)
Me.TabPage8.Controls.Add(Me.cbxHO)
Me.TabPage8.Controls.Add(Me.Button7)
Me.TabPage8.Controls.Add(Me.TabControl3)
Me.TabPage8.Controls.Add(Me.rtfInfoTimas)
@@ -2589,6 +2569,39 @@ Partial Class frmMitarbDetails
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
'
'cbxHO
'
Me.cbxHO.AutoSize = True
Me.cbxHO.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxHO.Location = New System.Drawing.Point(569, 9)
Me.cbxHO.Name = "cbxHO"
Me.cbxHO.Size = New System.Drawing.Size(80, 17)
Me.cbxHO.TabIndex = 151
Me.cbxHO.Text = "Homeoffice"
Me.cbxHO.UseVisualStyleBackColor = True
'
'cbxBeiBeendenAusstempeln
'
Me.cbxBeiBeendenAusstempeln.AutoSize = True
Me.cbxBeiBeendenAusstempeln.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxBeiBeendenAusstempeln.Location = New System.Drawing.Point(569, 32)
Me.cbxBeiBeendenAusstempeln.Name = "cbxBeiBeendenAusstempeln"
Me.cbxBeiBeendenAusstempeln.Size = New System.Drawing.Size(144, 17)
Me.cbxBeiBeendenAusstempeln.TabIndex = 152
Me.cbxBeiBeendenAusstempeln.Text = "Bei Beenden austempeln"
Me.cbxBeiBeendenAusstempeln.UseVisualStyleBackColor = True
'
'cbxTimasNichtStempeln1
'
Me.cbxTimasNichtStempeln1.AutoSize = True
Me.cbxTimasNichtStempeln1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cbxTimasNichtStempeln1.Location = New System.Drawing.Point(569, 55)
Me.cbxTimasNichtStempeln1.Name = "cbxTimasNichtStempeln1"
Me.cbxTimasNichtStempeln1.Size = New System.Drawing.Size(164, 17)
Me.cbxTimasNichtStempeln1.TabIndex = 153
Me.cbxTimasNichtStempeln1.Text = "Zeiterfassung: Kein Stempeln"
Me.cbxTimasNichtStempeln1.UseVisualStyleBackColor = True
'
'frmMitarbDetails
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -2812,10 +2825,8 @@ Partial Class frmMitarbDetails
Friend WithEvents lbSprachen As VERAG_PROG_ALLGEMEIN.MyListBox
Friend WithEvents Label62 As Label
Friend WithEvents cboEZOLL_SB_UNISPED As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents cbxHO As CheckBox
Friend WithEvents txtprivateEMail As TextBox
Friend WithEvents Label64 As Label
Friend WithEvents cbxTimasNichtStempeln1 As CheckBox
Friend WithEvents TabPage8 As TabPage
Friend WithEvents Label68 As Label
Friend WithEvents cbabwJahresurlaub As CheckBox
@@ -2846,4 +2857,7 @@ Partial Class frmMitarbDetails
Friend WithEvents rtfInfoTimas As RichTextBox
Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview
Friend WithEvents Button7 As Button
Friend WithEvents cbxTimasNichtStempeln1 As CheckBox
Friend WithEvents cbxBeiBeendenAusstempeln As CheckBox
Friend WithEvents cbxHO As CheckBox
End Class

View File

@@ -306,6 +306,7 @@ Public Class frmMitarbDetails
cbxHO.Checked = mitarbeiter.mit_homeoffice
cbxTimasNichtStempeln1.Checked = mitarbeiter.mit_timasNichtStempeln
cbxBeiBeendenAusstempeln.Checked = mitarbeiter.mit_ausstempelnBeiBeenden
@@ -581,6 +582,7 @@ Public Class frmMitarbDetails
mitarbeiter.mit_PersonalNr = txtLohnNr.Text
mitarbeiter.mit_telefonnr = txtTelNr.Text
mitarbeiter.mit_homeoffice = cbxHO.Checked
mitarbeiter.mit_ausstempelnBeiBeenden = cbxBeiBeendenAusstempeln.Checked
mitarbeiter.mit_timasNichtStempeln = cbxTimasNichtStempeln1.Checked
mitarbeiter.mit_emailprivat = txtprivateEMail.Text
@@ -1426,7 +1428,7 @@ Public Class frmMitarbDetails
Dim dtbereitsausgezahlteUE As DataTable
Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) as ignoreAuszahlungsdatum
Dim bereitsgezahlteueberstunden = "select uest_date as Datum ,isnull(uest_100,0) as ÜS100 , isnull(uest_50,0) as ÜS50, isnull(uest_25,0) as ÜS25, isnull(uest_0,0) as ÜS50_Saldo, isnull(uest_paidout_sum,0) as ausbezahlt, uest_systemuser as eingetragen_von ,uest_created as eingetragen_am, cast (case when isnull([uest_ignorePayoutDate],0) = 0 then 0 else 1 end as bit) ignoreAuszahlungsdatum
FROM [ADMIN].[dbo].[tblUeberstunden]
where uest_deleted = 0 and uest_maId = " & mitarbeiter.mit_id & "
Order by uest_date"
@@ -1453,5 +1455,12 @@ Public Class frmMitarbDetails
End Sub
Private Sub cbxBeiBeendenAusstempeln_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBeiBeendenAusstempeln.CheckedChanged
End Sub
Private Sub cbxHO_CheckedChanged(sender As Object, e As EventArgs) Handles cbxHO.CheckedChanged
End Sub
End Class

View File

@@ -290,7 +290,7 @@ Public Class usrCntlMitarbeiter
.Columns("mit_gekuendigt").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
.Columns("mit_DAKOSY").Width = 100
.Columns("mit_DAKOSY").HeaderText = "Dakosy-Zugang"
.Columns("mit_DAKOSY").HeaderText = "DY-Zugang"
.Columns("mit_DAKOSY").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -54,37 +54,37 @@ Namespace My
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("True")> _
<Global.System.Configuration.UserScopedSettingAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Configuration.DefaultSettingValueAttribute("True")>
Public Property firmashort() As Boolean
Get
Return CType(Me("firmashort"),Boolean)
Return CType(Me("firmashort"), Boolean)
End Get
Set
Me("firmashort") = value
Me("firmashort") = Value
End Set
End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User "& _
"ID=sa;Password=BmWr501956")> _
<Global.System.Configuration.ApplicationScopedSettingAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DEVELOPER\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User " &
"ID=sa;Password=BmWr501956")>
Public ReadOnly Property connToUID() As String
Get
Return CType(Me("connToUID"),String)
Return CType(Me("connToUID"), String)
End Get
End Property
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;Use"& _
"r ID=sa;Password=BmWr501956")> _
<Global.System.Configuration.ApplicationScopedSettingAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DEVELOPER\DEVSQL;Initial Catalog=ADMIN;Persist Security Info=True;Use" &
"r ID=sa;Password=BmWr501956")>
Public ReadOnly Property connToAdminDEV() As String
Get
Return CType(Me("connToAdminDEV"),String)
Return CType(Me("connToAdminDEV"), String)
End Get
End Property
End Class
@@ -92,12 +92,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.ADMIN.My.MySettings
Get
Return Global.ADMIN.My.MySettings.Default

122
UID/frmAPI.Designer.vb generated
View File

@@ -22,7 +22,7 @@ Partial Class frmAPI
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmERS))
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAPI))
Me.Label4 = New System.Windows.Forms.Label()
Me.rtferrStack = New System.Windows.Forms.RichTextBox()
Me.txtDatetime = New System.Windows.Forms.TextBox()
@@ -40,12 +40,20 @@ Partial Class frmAPI
Me.lblFirma = New System.Windows.Forms.Label()
Me.txtMail = New System.Windows.Forms.TextBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.txtMailCC = New System.Windows.Forms.TextBox()
Me.Label3 = New System.Windows.Forms.Label()
Me.txtMailBCC = New System.Windows.Forms.TextBox()
Me.Label5 = New System.Windows.Forms.Label()
Me.txtSubject = New System.Windows.Forms.TextBox()
Me.Label6 = New System.Windows.Forms.Label()
Me.txtAnhCount = New System.Windows.Forms.TextBox()
Me.Label7 = New System.Windows.Forms.Label()
Me.SuspendLayout()
'
'Label4
'
Me.Label4.AutoSize = True
Me.Label4.Location = New System.Drawing.Point(9, 462)
Me.Label4.Location = New System.Drawing.Point(9, 508)
Me.Label4.Name = "Label4"
Me.Label4.Size = New System.Drawing.Size(63, 13)
Me.Label4.TabIndex = 114
@@ -53,9 +61,11 @@ Partial Class frmAPI
'
'rtferrStack
'
Me.rtferrStack.Location = New System.Drawing.Point(12, 478)
Me.rtferrStack.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.rtferrStack.Location = New System.Drawing.Point(12, 524)
Me.rtferrStack.Name = "rtferrStack"
Me.rtferrStack.Size = New System.Drawing.Size(358, 305)
Me.rtferrStack.Size = New System.Drawing.Size(796, 305)
Me.rtferrStack.TabIndex = 113
Me.rtferrStack.Text = ""
'
@@ -101,15 +111,17 @@ Partial Class frmAPI
Me.lblErrMsg.AutoSize = True
Me.lblErrMsg.Location = New System.Drawing.Point(12, 210)
Me.lblErrMsg.Name = "lblErrMsg"
Me.lblErrMsg.Size = New System.Drawing.Size(78, 13)
Me.lblErrMsg.Size = New System.Drawing.Size(102, 13)
Me.lblErrMsg.TabIndex = 120
Me.lblErrMsg.Text = "Error Message:"
Me.lblErrMsg.Text = "Error Message/Mail:"
'
'rtferrMsg
'
Me.rtferrMsg.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.rtferrMsg.Location = New System.Drawing.Point(12, 226)
Me.rtferrMsg.Name = "rtferrMsg"
Me.rtferrMsg.Size = New System.Drawing.Size(361, 209)
Me.rtferrMsg.Size = New System.Drawing.Size(796, 279)
Me.rtferrMsg.TabIndex = 119
Me.rtferrMsg.Text = ""
'
@@ -146,7 +158,7 @@ Partial Class frmAPI
Me.txtType.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtType.Location = New System.Drawing.Point(188, 82)
Me.txtType.Name = "txtType"
Me.txtType.Size = New System.Drawing.Size(108, 20)
Me.txtType.Size = New System.Drawing.Size(185, 20)
Me.txtType.TabIndex = 126
'
'Label2
@@ -197,11 +209,91 @@ Partial Class frmAPI
Me.Label1.TabIndex = 131
Me.Label1.Text = "EMail:"
'
'frmERS
'txtMailCC
'
Me.txtMailCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtMailCC.Location = New System.Drawing.Point(396, 121)
Me.txtMailCC.Name = "txtMailCC"
Me.txtMailCC.Size = New System.Drawing.Size(185, 20)
Me.txtMailCC.TabIndex = 132
'
'Label3
'
Me.Label3.AutoSize = True
Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label3.Location = New System.Drawing.Point(393, 105)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(53, 13)
Me.Label3.TabIndex = 133
Me.Label3.Text = "EMail CC:"
'
'txtMailBCC
'
Me.txtMailBCC.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtMailBCC.Location = New System.Drawing.Point(623, 121)
Me.txtMailBCC.Name = "txtMailBCC"
Me.txtMailBCC.Size = New System.Drawing.Size(185, 20)
Me.txtMailBCC.TabIndex = 134
'
'Label5
'
Me.Label5.AutoSize = True
Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label5.Location = New System.Drawing.Point(620, 105)
Me.Label5.Name = "Label5"
Me.Label5.Size = New System.Drawing.Size(60, 13)
Me.Label5.TabIndex = 135
Me.Label5.Text = "EMail BCC:"
'
'txtSubject
'
Me.txtSubject.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSubject.Location = New System.Drawing.Point(396, 82)
Me.txtSubject.Name = "txtSubject"
Me.txtSubject.Size = New System.Drawing.Size(412, 20)
Me.txtSubject.TabIndex = 136
'
'Label6
'
Me.Label6.AutoSize = True
Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label6.Location = New System.Drawing.Point(393, 66)
Me.Label6.Name = "Label6"
Me.Label6.Size = New System.Drawing.Size(41, 13)
Me.Label6.TabIndex = 137
Me.Label6.Text = "Betreff:"
'
'txtAnhCount
'
Me.txtAnhCount.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtAnhCount.Location = New System.Drawing.Point(396, 169)
Me.txtAnhCount.Name = "txtAnhCount"
Me.txtAnhCount.Size = New System.Drawing.Size(38, 20)
Me.txtAnhCount.TabIndex = 138
'
'Label7
'
Me.Label7.AutoSize = True
Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label7.Location = New System.Drawing.Point(393, 153)
Me.Label7.Name = "Label7"
Me.Label7.Size = New System.Drawing.Size(29, 13)
Me.Label7.TabIndex = 139
Me.Label7.Text = "Anh:"
'
'frmAPI
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(391, 841)
Me.ClientSize = New System.Drawing.Size(820, 841)
Me.Controls.Add(Me.txtAnhCount)
Me.Controls.Add(Me.Label7)
Me.Controls.Add(Me.txtSubject)
Me.Controls.Add(Me.Label6)
Me.Controls.Add(Me.txtMailBCC)
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.txtMailCC)
Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.txtMail)
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.lblFirma)
@@ -220,7 +312,7 @@ Partial Class frmAPI
Me.Controls.Add(Me.txtMethode)
Me.Controls.Add(Me.lblProgramm)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmERS"
Me.Name = "frmAPI"
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
Me.Text = "Error"
Me.ResumeLayout(False)
@@ -245,4 +337,12 @@ Partial Class frmAPI
Friend WithEvents lblFirma As Label
Friend WithEvents txtMail As TextBox
Friend WithEvents Label1 As Label
Friend WithEvents txtMailCC As TextBox
Friend WithEvents Label3 As Label
Friend WithEvents txtMailBCC As TextBox
Friend WithEvents Label5 As Label
Friend WithEvents txtSubject As TextBox
Friend WithEvents Label6 As Label
Friend WithEvents txtAnhCount As TextBox
Friend WithEvents Label7 As Label
End Class

View File

@@ -1,6 +1,6 @@
Public Class frmAPI
Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion
Public id, progId, progName, maid, datetime, testsystem, type, mail, userName, firma, errorCode, errStack, errMessage, errMethodName, progVersion, mailcc, mailbcc, subject, mailtext, mailAnh
@@ -23,12 +23,35 @@
txtDatetime.Text = IIf(datetime IsNot DBNull.Value, datetime, "")
txtMail.Text = IIf(mail IsNot DBNull.Value, mail, "")
rtferrMsg.Text = IIf(errMessage IsNot DBNull.Value, errMessage, "")
rtferrStack.Text = IIf(errStack IsNot DBNull.Value, errStack, "")
txtAnhCount.Text = IIf(mailAnh IsNot DBNull.Value, mailAnh, "0")
txtMailCC.Text = IIf(mailcc IsNot DBNull.Value, mailcc, "")
txtMailBCC.Text = IIf(mailbcc IsNot DBNull.Value, mailbcc, "")
txtSubject.Text = IIf(subject IsNot DBNull.Value, subject, "")
If errMessage IsNot DBNull.Value Then rtferrMsg.Text = errMessage
If errStack IsNot DBNull.Value Then rtferrStack.Text = errStack
' Public Enum cAPI_Status
' [NEW] = 0 ' Neu, noch nicht verarbeitet
' OK = 1 ' Erfolg! :)
' ERR = 90 ' Fehlversuch :(
' ERR_FINAL = 99 'Hier sollte kein Verarbeitungs-Versuch mehr gestartet werden
'End Enum
Select Case errorCode
Case 0
lblErrMsg.Text &= " (Error Code: " & errorCode & " - Neu, noch nicht verarbeitet)"
Case 1
lblErrMsg.Text &= " (Error Code: " & errorCode & " - OK)"
Case 90
lblErrMsg.Text &= " (Error Code: " & errorCode & " - Fehlversuch)"
Case 99
lblErrMsg.Text &= " (Error Code: " & errorCode & " - zu viele Fehler, kein Versuch mehr)"
End Select
If errorCode > 0 Then
lblErrMsg.Text &= " (Error Code: " & errorCode & ")"
End If
If testsystem IsNot Nothing Then
cbxTestsysten.Checked = testsystem

View File

@@ -235,18 +235,54 @@ Public Class frmAPIEinstellungen
Dim path As New System.IO.DirectoryInfo(DataGridView.CurrentRow.Cells("api_debugpath").Value)
If DataGridView.CurrentRow.Cells("api_debugpath").Value IsNot DBNull.Value AndAlso path.Exists Then
Process.Start(DataGridView.CurrentRow.Cells("api_debugpath").Value)
End If
Process.Start(DataGridView.CurrentRow.Cells("api_debugpath").Value)
End If
Else
End If
Me.Cursor = Cursors.Default
ElseIf DataGridView.Columns(e.ColumnIndex).Name = "api_program" Then
If DataGridView.CurrentRow.Cells("api_program").Value <> "" AndAlso DataGridView.CurrentRow.Cells("api_program").Value.ToString.ToLower = "creditsafe" Then
openCreditsafeRequests()
End If
End If
Me.Cursor = Cursors.Default
End Sub
Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
Dim webAddress As String = "https://wiki.verag.ag/de/software/Offene_Punkte#aviso-schnittstellen-zu-fremdsystemen"
Process.Start(webAddress)
End Sub
Private Sub openCreditsafeRequests()
Try
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim frm As New Form
Dim dgv As New DataGridView()
Dim dt As New DataTable
Dim cs = New cCreditSafeAPI("creditsafe")
cs.authenticate()
cs.getSubscriptionCountries(dt)
dgv.DataSource = dt
If dgv IsNot Nothing Then
frm.Size = New Size(1400, 1000)
dgv.Size = New Size(frm.Size.Width - 50, frm.Size.Height - 50)
dgv.Dock = DockStyle.Fill
dgv.Anchor = AnchorStyles.Left
dgv.Anchor = AnchorStyles.Top
dgv.ReadOnly = True
frm.Controls.Add(dgv)
frm.StartPosition = FormStartPosition.CenterScreen
frm.ShowDialog()
End If
Catch ex As System.Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
End Class

View File

@@ -33,6 +33,7 @@ Partial Class frmMain
Me.TableAdapterManager1 = New ADMIN.DataSetBerechtigungenTableAdapters.TableAdapterManager()
Me.pnlMain = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Button3 = New System.Windows.Forms.Button()
Me.Button2 = New System.Windows.Forms.Button()
Me.btnFehler = New System.Windows.Forms.Button()
Me.btnAPI = New System.Windows.Forms.Button()
@@ -47,7 +48,6 @@ Partial Class frmMain
Me.btnMitarbeiter = New System.Windows.Forms.Button()
Me.Panel2 = New System.Windows.Forms.Panel()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
Me.Button3 = New System.Windows.Forms.Button()
Me.Panel3.SuspendLayout()
Me.Panel2.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -104,7 +104,7 @@ Partial Class frmMain
Me.pnlMain.BackColor = System.Drawing.Color.White
Me.pnlMain.Location = New System.Drawing.Point(137, 70)
Me.pnlMain.Name = "pnlMain"
Me.pnlMain.Size = New System.Drawing.Size(1026, 801)
Me.pnlMain.Size = New System.Drawing.Size(1740, 801)
Me.pnlMain.TabIndex = 26
'
'Panel3
@@ -129,6 +129,18 @@ Partial Class frmMain
Me.Panel3.Size = New System.Drawing.Size(137, 801)
Me.Panel3.TabIndex = 32
'
'Button3
'
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button3.Location = New System.Drawing.Point(12, 437)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(94, 33)
Me.Button3.TabIndex = 42
Me.Button3.Text = "Zugänge API"
Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button3.UseVisualStyleBackColor = True
'
'Button2
'
Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
@@ -276,7 +288,7 @@ Partial Class frmMain
Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel2.Location = New System.Drawing.Point(0, 0)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(1163, 70)
Me.Panel2.Size = New System.Drawing.Size(1877, 70)
Me.Panel2.TabIndex = 33
'
'PictureBox1
@@ -290,23 +302,11 @@ Partial Class frmMain
Me.PictureBox1.TabIndex = 31
Me.PictureBox1.TabStop = False
'
'Button3
'
Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
Me.Button3.Location = New System.Drawing.Point(12, 437)
Me.Button3.Name = "Button3"
Me.Button3.Size = New System.Drawing.Size(94, 33)
Me.Button3.TabIndex = 42
Me.Button3.Text = "Zugänge API"
Me.Button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
Me.Button3.UseVisualStyleBackColor = True
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1163, 871)
Me.ClientSize = New System.Drawing.Size(1877, 871)
Me.Controls.Add(Me.pnlMain)
Me.Controls.Add(Me.Panel3)
Me.Controls.Add(Me.Panel2)

View File

@@ -26,6 +26,10 @@ Partial Class usrCntlAPI
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.pnlSearch = New System.Windows.Forms.Panel()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label15 = New System.Windows.Forms.Label()
Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label14 = New System.Windows.Forms.Label()
Me.cboPartnersystem = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Button1 = New System.Windows.Forms.Button()
Me.Label11 = New System.Windows.Forms.Label()
@@ -82,8 +86,6 @@ Partial Class usrCntlAPI
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Button10 = New System.Windows.Forms.Button()
Me.Button11 = New System.Windows.Forms.Button()
Me.cboProgram = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.Label14 = New System.Windows.Forms.Label()
CType(Me.SplitContainer, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainer.Panel1.SuspendLayout()
Me.SplitContainer.Panel2.SuspendLayout()
@@ -139,6 +141,8 @@ Partial Class usrCntlAPI
'
'SplitContainer1.Panel1
'
Me.SplitContainer1.Panel1.Controls.Add(Me.txtSuche)
Me.SplitContainer1.Panel1.Controls.Add(Me.Label15)
Me.SplitContainer1.Panel1.Controls.Add(Me.cboProgram)
Me.SplitContainer1.Panel1.Controls.Add(Me.Label14)
Me.SplitContainer1.Panel1.Controls.Add(Me.cboPartnersystem)
@@ -192,6 +196,62 @@ Partial Class usrCntlAPI
Me.SplitContainer1.SplitterDistance = 125
Me.SplitContainer1.TabIndex = 0
'
'txtSuche
'
Me.txtSuche._DateTimeOnly = False
Me.txtSuche._numbersOnly = False
Me.txtSuche._numbersOnlyKommastellen = ""
Me.txtSuche._numbersOnlyTrennzeichen = False
Me.txtSuche._Prozent = False
Me.txtSuche._ShortDateNew = False
Me.txtSuche._ShortDateOnly = False
Me.txtSuche._TimeOnly = False
Me.txtSuche._TimeOnly_Seconds = False
Me.txtSuche._value = ""
Me.txtSuche._Waehrung = False
Me.txtSuche._WaehrungZeichen = False
Me.txtSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.txtSuche.ForeColor = System.Drawing.Color.Black
Me.txtSuche.Location = New System.Drawing.Point(633, 72)
Me.txtSuche.MaxLineLength = -1
Me.txtSuche.MaxLines_Warning = ""
Me.txtSuche.MaxLines_Warning_Label = Nothing
Me.txtSuche.Name = "txtSuche"
Me.txtSuche.Size = New System.Drawing.Size(159, 20)
Me.txtSuche.TabIndex = 58
'
'Label15
'
Me.Label15.AutoSize = True
Me.Label15.Location = New System.Drawing.Point(559, 77)
Me.Label15.Name = "Label15"
Me.Label15.Size = New System.Drawing.Size(65, 13)
Me.Label15.TabIndex = 57
Me.Label15.Text = "Email-Empf.:"
'
'cboProgram
'
Me.cboProgram._allowedValuesFreiText = Nothing
Me.cboProgram._allowFreiText = False
Me.cboProgram._value = ""
Me.cboProgram.DropDownWidth = 250
Me.cboProgram.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboProgram.FormattingEnabled = True
Me.cboProgram.Location = New System.Drawing.Point(324, 72)
Me.cboProgram.Name = "cboProgram"
Me.cboProgram.Size = New System.Drawing.Size(73, 22)
Me.cboProgram.TabIndex = 56
'
'Label14
'
Me.Label14.AutoSize = True
Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label14.Location = New System.Drawing.Point(321, 54)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(62, 13)
Me.Label14.TabIndex = 55
Me.Label14.Text = "Programm"
'
'cboPartnersystem
'
Me.cboPartnersystem._allowedValuesFreiText = Nothing
@@ -207,6 +267,7 @@ Partial Class usrCntlAPI
'
'Button1
'
Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -521,6 +582,7 @@ Partial Class usrCntlAPI
'
'btnSuche
'
Me.btnSuche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.btnSuche.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btnSuche.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btnSuche.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
@@ -978,29 +1040,6 @@ Partial Class usrCntlAPI
Me.Button11.TabIndex = 4
Me.Button11.UseVisualStyleBackColor = True
'
'cboProgram
'
Me.cboProgram._allowedValuesFreiText = Nothing
Me.cboProgram._allowFreiText = False
Me.cboProgram._value = ""
Me.cboProgram.DropDownWidth = 250
Me.cboProgram.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.cboProgram.FormattingEnabled = True
Me.cboProgram.Location = New System.Drawing.Point(324, 72)
Me.cboProgram.Name = "cboProgram"
Me.cboProgram.Size = New System.Drawing.Size(73, 22)
Me.cboProgram.TabIndex = 56
'
'Label14
'
Me.Label14.AutoSize = True
Me.Label14.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Label14.Location = New System.Drawing.Point(321, 54)
Me.Label14.Name = "Label14"
Me.Label14.Size = New System.Drawing.Size(62, 13)
Me.Label14.TabIndex = 55
Me.Label14.Text = "Programm"
'
'usrCntlAPI
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -1087,4 +1126,6 @@ Partial Class usrCntlAPI
Friend WithEvents Label12 As Label
Friend WithEvents cboProgram As VERAG_PROG_ALLGEMEIN.MyComboBox
Friend WithEvents Label14 As Label
Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox
Friend WithEvents Label15 As Label
End Class

View File

@@ -233,6 +233,7 @@ Public Class usrCntlAPI
If txtSendungsId.Text <> "" Then sqlstr &= " AND [api_SendungsId] LIKE @SendungsId "
If txtZollBelegNr.Text <> "" Then sqlstr &= " AND [api_Zollbelegnummer] LIKE @ZollBelegNr "
If txtBezugsNr.Text <> "" Then sqlstr &= " AND [api_BezugsNr] LIKE @BezugsNr "
If txtSuche.Text <> "" Then sqlstr &= " AND ([api_EMail] LIKE @api_EMail OR [api_EMailCC] LIKE @api_EMail OR [api_EMailBCC] LIKE @api_EMail)"
Return sqlstr
@@ -264,6 +265,7 @@ Public Class usrCntlAPI
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("SendungsId", txtSendungsId.Text))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("ZollBelegNr", txtZollBelegNr.Text.Replace("*", "%").ToUpper))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("BezugsNr", txtBezugsNr.Text.Replace("*", "%").ToUpper))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("api_EMail", txtSuche.Text.Replace("*", "%")))
Return list
End Function
@@ -304,10 +306,14 @@ Public Class usrCntlAPI
.mail = sender.CurrentRow.Cells("api_EMail").Value,
.maid = sender.CurrentRow.Cells("api_MaId").Value,
.userName = sender.CurrentRow.Cells("api_Username").Value,
.mailAnh = sender.CurrentRow.Cells("api_EMailAttCnt").Value,
.firma = sender.CurrentRow.Cells("api_Firma").Value,
.subject = sender.CurrentRow.Cells("api_EMailSubject").Value,
.mailcc = sender.CurrentRow.Cells("api_EMailCC").Value,
.mailbcc = sender.CurrentRow.Cells("api_EMailBCC").Value,
.errorCode = sender.CurrentRow.Cells("api_status").Value,
.errStack = IIf(sender.CurrentRow.Cells("api_errTstmp").Value IsNot DBNull.Value, "Datum: " & sender.CurrentRow.Cells("api_errTstmp").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMethodName").Value IsNot DBNull.Value, "Methode: " & sender.CurrentRow.Cells("api_errMethodName").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errMessage").Value IsNot DBNull.Value, "Message: " & sender.CurrentRow.Cells("api_errMessage").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_errStack").Value IsNot DBNull.Value, "Stack: " & sender.CurrentRow.Cells("api_errStack").Value & vbNewLine, ""),
.errMessage = IIf(sender.CurrentRow.Cells("api_EMailFrom").Value IsNot DBNull.Value, "Mail von : " & sender.CurrentRow.Cells("api_EMailFrom").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMail").Value IsNot DBNull.Value, "E-Mail: " & sender.CurrentRow.Cells("api_EMail").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, ""),
.errMessage = IIf(sender.CurrentRow.Cells("api_EMailFrom").Value IsNot DBNull.Value, "Mail von : " & sender.CurrentRow.Cells("api_EMailFrom").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMail").Value IsNot DBNull.Value, "E-Mail: " & sender.CurrentRow.Cells("api_EMail").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_EMailText").Value IsNot DBNull.Value, "E-MailText: " & sender.CurrentRow.Cells("api_EMailText").Value & vbNewLine, ""),
.errMethodName = IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "BezugsNr: " & sender.CurrentRow.Cells("api_BezugsNr").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_BezugsNr").Value IsNot DBNull.Value, "AVISO-ID: " & sender.CurrentRow.Cells("api_AvisoId").Value & vbNewLine, "") & IIf(sender.CurrentRow.Cells("api_KundenNr").Value IsNot DBNull.Value, "Kunde: " & sender.CurrentRow.Cells("api_KundenNr").Value & vbNewLine, "")
}
err.Show(Me)

View File

@@ -263,7 +263,7 @@ Public Class usrCntlERS
.firma = sender.CurrentRow.Cells("ers_firma").Value,
.errorCode = sender.CurrentRow.Cells("ers_progId").Value,
.errStack = sender.CurrentRow.Cells("ers_errStack").Value,
.errMessage = sender.CurrentRow.Cells("ers_errMessage").Value,
.errMessage = sender.CurrentRow.Cells("ers_errMessage").Value & IIf(sender.CurrentRow.Cells("ers_infotext").Value <> "", vbNewLine & vbNewLine & "SQL-QUERY:" & vbNewLine & sender.CurrentRow.Cells("ers_infotext").Value, ""),
.errMethodName = sender.CurrentRow.Cells("ers_errMethodName").Value
}

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.cNCTSPartnerWorker.My.MySettings
Get
Return Global.cNCTSPartnerWorker.My.MySettings.Default

View File

@@ -14,16 +14,16 @@ Option Explicit On
Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0"),
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
#Region "Automatische My.Settings-Speicherfunktion"
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object
@@ -40,7 +40,7 @@ Namespace My
Public Shared ReadOnly Property [Default]() As MySettings
Get
#If _MyType = "WindowsForms" Then
#If _MYTYPE = "WindowsForms" Then
If Not addedHandler Then
SyncLock addedHandlerLockObject
If Not addedHandler Then
@@ -58,12 +58,12 @@ End Namespace
Namespace My
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
<Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
Friend Module MySettingsProperty
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
<Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
Friend ReadOnly Property Settings() As Global.RoutineManager.My.MySettings
Get
Return Global.RoutineManager.My.MySettings.Default

View File

@@ -246,6 +246,7 @@ Public Class cUTA
Property Leistungsort_verlagerbar As Char
Property abgerechnetDatum As Object
Property abgerechnet As Boolean = False
Property daId As Object
Public hasEntry = False
@@ -348,6 +349,7 @@ Public Class cUTA
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Leistungsort_verlagerbar", Leistungsort_verlagerbar))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnetDatum", abgerechnetDatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("abgerechnet", abgerechnet))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("daId", daId))
Return list
End Function
@@ -1240,7 +1242,7 @@ Public Class cUTA
ERROR_PFAD = cUTA.Paramter.GET_PARAM_ByName("ERROR_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ARCHIV_PFAD = cUTA.Paramter.GET_PARAM_ByName("ARCHIV_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNG_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
VERARBEITUNG_PFAD = cUTA.Paramter.GET_PARAM_ByName("VERARBEITUNGS_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
ZIEL_PFAD = cUTA.Paramter.GET_PARAM_ByName("ZIEL_PFAD", VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM)
If Not IO.Directory.Exists(VERARBEITUNG_PFAD) Then IO.Directory.CreateDirectory(VERARBEITUNG_PFAD)

View File

@@ -6076,6 +6076,9 @@ Public Class frmDYNachrichtenVerarbeitung
Next
'TODO: SET_FIRMA
tryGetFirmaNiederlassung(EZA.eza_firma, EZA.eza_niederlassung, (EZA.eza_AnmeldenderBearbeiterEMail, "").ToString, EZA.eza_ObjectName)
End If
@@ -6084,6 +6087,7 @@ Public Class frmDYNachrichtenVerarbeitung
If EZA.SAVE_ALL() Then
If If(EZA.eza_Status, 0) <= 5 Then DAKOSY_Worker.cDakosy_Statusmeldungen.InsertStatusMeldung(DY_TMP, DAKOSY_Worker.cDY_Statusliste.S_05)
Else

View File

@@ -226,7 +226,10 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
Dim targetFile As SftpFile
For Each file As SftpFile In files
If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then
'If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), True) Then
If file.IsRegularFile AndAlso file.Name.ToLower.EndsWith(".uta") AndAlso file.Length > 0 AndAlso IIf(renameAfterDownload, Not file.Name.ToLower.StartsWith("_"), Not file.Name.ToLower.StartsWith("_")) Then
Dim remoteFileName = "/" & file.Name
Dim filePath = uta.VERARBEITUNG_PFAD & If(IO.File.Exists(uta.VERARBEITUNG_PFAD & file.Name), Name.Replace(".UTA", "_") & Now.ToString("yyMMdd_HHmmss.fff") & ".UTA", file.Name)
@@ -400,8 +403,28 @@ Public Class frmNachrichtenVerarbeitung_MDM_divers
'------------------------------------------
'------------------ .PDF ------------------
'------------------------------------------
'PDFs über EEA
If fi.Extension.ToLower = ".pdf" Then
If Not IO.Directory.Exists(zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\") Then IO.Directory.CreateDirectory(zielpfad & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToString.StartsWith("invoice_") Then
Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("MDM", "MDM_DATEN", "UTA", Now.Year, Now.ToString("yyyyMMdd"), frmStartOptions.getFileName(d))
DS.uploadDataToDATENSERVER(d,,,,,, True)
'TO DO -> ÄNDERN----------------------
' SQL.doSQL("Update [tblUTAImport] SET [daId]='" & DS.da_id & "' where [rmc_pdfFileName] = '" & DS.da_name & "' and [rmc_importDatum] > DATEADD(DAY,-4,getdate()) ", "FMZOLL")
'TO DO -> ÄNDERN----------------------
End If
End If
frmStartOptions.moveFile_DateBack(d, zielpfad & "Invoice_PDF\" & Now.Year & "\" & Now.ToString("yyyyMMdd") & "\")
If fi.Name.ToLower.Contains("pdf") Then addDGVEinarbeitung("PDF", fi.Name)
dgvEinarbeitung.Refresh()
'AKTUELL NOCH KEINE PDFs -> HIER LOGIK FÜR UTA_PDFs
dgvEinarbeitung.Refresh()

File diff suppressed because it is too large Load Diff

View File

@@ -521,10 +521,11 @@ Public Class frmStartOptions
Case "ABGLEICH_KUNDENUEMSAETZE"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
Dim lastyears = 2
Dim lastyears As Integer = 2
If DELETE_Kundenumsaetze(lastyears) Then
INSERT_Kundenumsaetze(lastyears)
End If
closeMe()
Case "AMBAR_VERAG_BUCHUNGEN"
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
@@ -4358,7 +4359,7 @@ Public Class frmStartOptions
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
txtBatchNr.Text = CInt(SQL.getValueTxtBySql("SELECT max([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions] ", "FMZOLL",,, 0))
cbxMSEBatchNr.DataSource = SQL.loadCboBySql("SELECT distinct([batch_seq_nr]) FROM [VERAG].[dbo].[tblMSETransactions]", "FMZOLL")
End Sub
@@ -4427,7 +4428,6 @@ Public Class frmStartOptions
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL)
Return False
End Try
End Function
@@ -4525,7 +4525,7 @@ Public Class frmStartOptions
If fehler <> "" Then
MsgBox(fehler)
Else
fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value)
fehler = mse.getInvoices(token, invoice, datVon.Value, datVon.Value, cbxUploadDA.Checked)
If fehler <> "" Then
MsgBox(fehler)
Me.Visible = True
@@ -4618,9 +4618,13 @@ Public Class frmStartOptions
Private Sub LinkLabel57_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel57.LinkClicked
If txtBatchNr.Text <> "" Then
If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 1000 Then Exit Sub
End If
If Not IsNumeric(txtBatchNr.Text) Then Exit Sub
If CInt(txtBatchNr.Text) < 1 AndAlso CInt(txtBatchNr.Text) > 100 Then Exit Sub
If Not IsNumeric(cbxMSEBatchNr._value) Then Exit Sub
If CInt(cbxMSEBatchNr._value) < 1 AndAlso CInt(cbxMSEBatchNr._value) > 1000 Then Exit Sub
Me.Visible = False
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = cbxTestsystem.Checked
@@ -4636,7 +4640,7 @@ Public Class frmStartOptions
Else
Dim totalPages = 1
Dim batchrequestNr = CInt(txtBatchNr.Text)
Dim batchrequestNr = IIf(txtBatchNr.Text <> "", CInt(txtBatchNr.Text), CInt(cbxMSEBatchNr._value))
fehler = mse.getTransactionsFromBatchNrAndPage(token, transactions, batchrequestNr, totalPages, 0)
If fehler <> "" Then
@@ -4743,7 +4747,7 @@ Public Class frmStartOptions
ElseIf sender Is LinkLabel61 Then
dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & datVon.Value & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
dtTransactionID = SQL.loadDgvBySql("select [transaction_id], CAST(1 AS BIT) as found FROM [VERAG].[dbo].[tblMSESettlements] where [invoice_date] = '" & Date.Parse(datVon.Value).ToShortDateString & "' AND [transaction_id] not in (select [transaction_id] from [VERAG].[dbo].[tblMSETransactions])", "FMZOLL")
If dtTransactionID.Rows.Count = 0 Then
MsgBox("Zu diesem Rechnungsdatum gibt es keine Rechnung!")
Me.Visible = True