False
F:\PROGRAMMIERUNG\dll\closedxml\95\ClosedXML.dll
@@ -637,6 +641,12 @@
UserControl
+
+ frmdynMailvorlage.vb
+
+
+ Form
+
frmEssensbestellungen.vb
@@ -3137,6 +3147,9 @@
usrCntlZollbeschau.vb
+
+ frmdynMailvorlage.vb
+
frmEssensbestellungen.vb
diff --git a/SDL/USTV/frmMDM_USTVAntrag.vb b/SDL/USTV/frmMDM_USTVAntrag.vb
index 24e9c01d..c80f678f 100644
--- a/SDL/USTV/frmMDM_USTVAntrag.vb
+++ b/SDL/USTV/frmMDM_USTVAntrag.vb
@@ -33,7 +33,7 @@ Public Class frmMDM_USTVAntrag
.SET_SQL("SELECT [UStVAn_ID] ,[UStVPo_ID] ,[UStVPo_ReDat],[UStVPo_ReNr],[UStVPo_Leistungsbezeichnung],[UStVPo_Leistender],leist.[UstV_Leistender_Strasse] + ' ' + leist.[UstV_Leistender_StrasseNr] as [UstV_Leistender_Strasse],leist.[UstV_Leistender_PLZ],leist.[UstV_Leistender_Stadt],leist.[UstV_Leistender_Land],leist.[UstV_Leistender_UstNr],[UStVPo_USteuerbetrag],[UStVPo_Schnittstelle],[UStVPo_SchnittstellenNr],[UStVPo_Umrechnungskurs],[UStVPo_USteuerbetragEUR],[UStVPo_Sachbearbeiter]
FROM [tblUStVPositionen]
- inner join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
+ left join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
where UStVAn_ID='" & UStVAn_ID & "' ORDER BY UStVPo_ID", "FMZOLL")
.LOAD()
.RowTemplate.Height = 20
@@ -468,16 +468,16 @@ Public Class frmMDM_USTVAntrag
Private Sub btnMail_Click(sender As Object, e As EventArgs) Handles btnMail.Click
If Not ContextMenuStrip1.Items.ContainsKey("excel") Then
- Dim uploadPictures = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
- ContextMenuStrip1.Items.Add(uploadPictures)
- AddHandler uploadPictures.Click, AddressOf mnuItem_Clicked
+ Dim excel = New ToolStripMenuItem() With {.Text = "Excelauswertung starten", .Name = "excel", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ ContextMenuStrip1.Items.Add(excel)
+ AddHandler excel.Click, AddressOf mnuItem_Clicked
End If
If Not ContextMenuStrip1.Items.ContainsKey("mail") Then
- Dim copyToClipboard = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
- AddHandler copyToClipboard.Click, AddressOf mnuItem_Clicked
- ContextMenuStrip1.Items.Add(copyToClipboard)
+ Dim mail = New ToolStripMenuItem() With {.Text = "Email generieren", .Name = "mail", .Font = New Font(Me.Font.FontFamily, Me.Font.Size)}
+ AddHandler mail.Click, AddressOf mnuItem_Clicked
+ ContextMenuStrip1.Items.Add(mail)
End If
@@ -508,10 +508,11 @@ Public Class frmMDM_USTVAntrag
Private Function excelAuswertung(ByRef Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
- Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, 'Verag 360 GmbH' as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
+ Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
FROM [tblUStVPositionen]
inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
- where UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID"
+ inner join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID
+ where [tblUStVPositionen].UStVAn_ID ='" & UStVAn_ID & "' ORDER BY UStVPo_ID"
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
@@ -540,8 +541,12 @@ Public Class frmMDM_USTVAntrag
End If
+ Dim subject As String = ""
+ subject &= IIf(USTV_ANTRAG.UStVAn_Name <> "", USTV_ANTRAG.UStVAn_Name & "_", "")
+ subject &= IIf(USTV_ANTRAG.UStVAn_LandKz <> "", USTV_ANTRAG.UStVAn_LandKz & "_", "")
+ subject &= IIf(USTV_ANTRAG.UStVAn_ReDatVon IsNot Nothing AndAlso USTV_ANTRAG.UStVAn_ReDatBis IsNot Nothing, CDate(USTV_ANTRAG.UStVAn_ReDatVon).ToShortDateString & "-" & CDate(USTV_ANTRAG.UStVAn_ReDatBis).ToShortDateString, "")
- Mail.Subject = USTV_ANTRAG.UStVAn_Name & "_" & USTV_ANTRAG.UStVAn_LandKz & "_" & USTV_ANTRAG.UStVAn_ReDatVon & "-" & USTV_ANTRAG.UStVAn_ReDatBis
+ Mail.Subject = subject
Dim TextHTML = ""
TextHTML &= "Ladies and Gentlemen,
"
diff --git a/SDL/USTV/usrCntlUSTV.vb b/SDL/USTV/usrCntlUSTV.vb
index 11c96640..f72370c2 100644
--- a/SDL/USTV/usrCntlUSTV.vb
+++ b/SDL/USTV/usrCntlUSTV.vb
@@ -293,19 +293,23 @@ Public Class usrCntlUSTV
End Sub
- Private Function excelAuswertung(Optional filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
+ Private Function excelAuswertung(Optional ByRef filepath As String = "", Optional feedback As Boolean = False, Optional openExcel As Boolean = True) As Boolean
- Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, 'Verag 360 GmbH' as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
+ Dim sqlStr = "SELECT [UStVPo_ReDat] as InvoiceDate , [UStVPo_ReNr] As InvoiceNumber, antr.UStVAn_Name as Company, 'FR' as CountryOfRefund ,'EUR' as Currency ,[UStVPo_Leistender] as SupplierName, leist.[UstV_Leistender_Strasse] AS SupplierStreet, leist.[UstV_Leistender_StrasseNr] as SupplierStreetNumber, leist.[UstV_Leistender_PLZ] as SupplierPostalCode, leist.[UstV_Leistender_Stadt] as SupplierCity, leist.[UstV_Leistender_Land] as SupplierCountry, leist.[UstV_Leistender_UstNr] as SupplierVAT_TaxNumber, [UStVPo_Leistungsbezeichnung] as ExpenseCategory ,Round((1119/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseGrossAmount, [UStVPo_USteuerbetragEUR] as ExpenseVATAmount,Round((100/19*[UStVPo_USteuerbetragEUR]),2) as ExpenseNetAmount
FROM [tblUStVPositionen]
inner Join [tblUStVLeistender] as leist on leist.UStV_Leistender = [tblUStVPositionen].[UStVPo_Leistender]
- where UStVAn_ID ='" & dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value & "' ORDER BY UStVPo_ID"
+ inner join [tblUStVAntrag] as antr on antr.UStVAn_ID = [tblUStVPositionen].UStVAn_ID
+ where [tblUStVPositionen].UStVAn_ID ='" & dgvUSTV.SelectedRows(0).Cells("UStVAn_ID").Value & "' ORDER BY UStVPo_ID"
Dim dt = SQL.loadDgvBySql(sqlStr, "FMZOLL")
- filepath = ""
+
+ 'filepath = ""
If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then
filepath = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(dt, {"N1:N" & (dt.Rows.Count + 1), "O1:O" & (dt.Rows.Count + 1), "P1:P" & (dt.Rows.Count + 1)},,,, openExcel)
+ Return True
Else
MsgBox("Keine Daten!")
+ Return False
End If
End Function
@@ -313,33 +317,48 @@ Public Class usrCntlUSTV
Private Sub mailmitExcelauswertung()
Try
- Dim outl As New Outlook.Application
- Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
- Mail = outl.CreateItem(0)
- Dim filepath = ""
- If excelAuswertung(filepath, False, False) Then
+ If dgvUSTV.Columns.Count > 0 Then
- Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
+ Dim subject As String = ""
+ subject &= IIf(dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value <> "", dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value & "_", "")
+ 'subject &= If(dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value <> "", dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value & "_")
+ If (dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value IsNot Nothing AndAlso dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value IsNot Nothing) Then
+ subject &= CDate(dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value).ToShortDateString & "-" & CDate(dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value).ToShortDateString
+ End If
- End If
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
- If dgvUSTV.Columns.Count > 0 Then Mail.Subject = dgvUSTV.CurrentRow.Cells("UStVAn_Name").Value & "_" & dgvUSTV.CurrentRow.Cells("UStVAn_LandKz").Value & "_" & dgvUSTV.CurrentRow.Cells("UStVAn_ReDatVon").Value & "-" & dgvUSTV.CurrentRow.Cells("UStVAn_ReDatBis").Value
- Dim TextHTML = ""
- TextHTML &= "Ladies and Gentlemen,
"
- TextHTML &= "
"
- TextHTML &= "In the attachment we will send you the Excel list and the corresponding invoices for the VAT refund.
"
- TextHTML &= "Please submit these invoices to the tax office.
"
- TextHTML &= "We are always available to answer more questions.
"
+ Dim filepath = ""
+ If excelAuswertung(filepath, False, False) Then
- TextHTML &= "Mit freundlichen Grüßen
"
- TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
- TextHTML &= "
"
- Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
+ Mail.Attachments.Add(filepath, Microsoft.Office.Interop.Outlook.OlAttachmentType.olByValue)
- Mail.Display()
+ End If
+
+
+ Mail.Subject = subject
+
+
+ Dim TextHTML = ""
+ TextHTML &= "Ladies and Gentlemen,
"
+ TextHTML &= "
"
+ TextHTML &= "In the attachment we will send you the Excel list and the corresponding invoices for the VAT refund.
"
+ TextHTML &= "Please submit these invoices to the tax office.
"
+ TextHTML &= "We are always available to answer more questions.
"
+
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
+ Mail.HTMLBody = "" & TextHTML & SDL.cFakturierung.getSignature("DE") & "
"
+
+
+ Mail.Display()
+ End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
index 5e9fcf0c..9bbf1818 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.Designer.vb
@@ -59,37 +59,37 @@ Partial Class ustCntlUSTV_AntragPosition
Me.lblSachbearbeiter = New System.Windows.Forms.Label()
Me.cboSchnittstellennr = New VERAG_PROG_ALLGEMEIN.MyComboBox()
Me.pnl = New System.Windows.Forms.Panel()
- Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.Label17 = New System.Windows.Forms.Label()
- Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.Label16 = New System.Windows.Forms.Label()
- Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
- Me.Label15 = New System.Windows.Forms.Label()
+ Me.picSave = New System.Windows.Forms.PictureBox()
+ Me.pnlAdresse = New System.Windows.Forms.Panel()
Me.txtStrasse = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtUIDNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Label14 = New System.Windows.Forms.Label()
+ Me.Label17 = New System.Windows.Forms.Label()
+ Me.Label15 = New System.Windows.Forms.Label()
+ Me.txtLand = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtPLZ = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.txtStrassenNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label16 = New System.Windows.Forms.Label()
+ Me.txtOrt = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.Panel4 = New System.Windows.Forms.Panel()
Me.TabControl1 = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.UsrcntlPDFScanList1 = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
- Me.pnlAdresse = New System.Windows.Forms.Panel()
- Me.picSave = New System.Windows.Forms.PictureBox()
Me.tabDok.SuspendLayout()
Me.tbcntr.SuspendLayout()
Me.tabVollmachten.SuspendLayout()
Me.tabFABest.SuspendLayout()
Me.Panel2.SuspendLayout()
Me.pnl.SuspendLayout()
+ CType(Me.picSave, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.pnlAdresse.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.Panel3.SuspendLayout()
Me.Panel4.SuspendLayout()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
- Me.pnlAdresse.SuspendLayout()
- CType(Me.picSave, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'scanLieferschein
@@ -523,7 +523,7 @@ Partial Class ustCntlUSTV_AntragPosition
'cboLeistungsgeber
'
Me.cboLeistungsgeber._allowedValuesFreiText = Nothing
- Me.cboLeistungsgeber._allowFreiText = False
+ Me.cboLeistungsgeber._allowFreiText = True
Me.cboLeistungsgeber._value = ""
Me.cboLeistungsgeber.FormattingEnabled = True
Me.cboLeistungsgeber.Location = New System.Drawing.Point(633, 49)
@@ -617,155 +617,34 @@ Partial Class ustCntlUSTV_AntragPosition
Me.pnl.Size = New System.Drawing.Size(1300, 239)
Me.pnl.TabIndex = 1
'
- 'txtUIDNr
+ 'picSave
'
- Me.txtUIDNr._DateTimeOnly = False
- Me.txtUIDNr._numbersOnly = False
- Me.txtUIDNr._numbersOnlyKommastellen = ""
- Me.txtUIDNr._numbersOnlyTrennzeichen = True
- Me.txtUIDNr._Prozent = False
- Me.txtUIDNr._ShortDateNew = False
- Me.txtUIDNr._ShortDateOnly = False
- Me.txtUIDNr._TimeOnly = False
- Me.txtUIDNr._TimeOnly_Seconds = False
- Me.txtUIDNr._value = ""
- Me.txtUIDNr._Waehrung = False
- Me.txtUIDNr._WaehrungZeichen = True
- Me.txtUIDNr.ForeColor = System.Drawing.Color.Red
- Me.txtUIDNr.Location = New System.Drawing.Point(180, 60)
- Me.txtUIDNr.MaxLength = 50
- Me.txtUIDNr.MaxLineLength = -1
- Me.txtUIDNr.MaxLines_Warning = ""
- Me.txtUIDNr.MaxLines_Warning_Label = Nothing
- Me.txtUIDNr.Name = "txtUIDNr"
- Me.txtUIDNr.Size = New System.Drawing.Size(106, 20)
- Me.txtUIDNr.TabIndex = 32
+ Me.picSave.BackgroundImage = Global.SDL.My.Resources.Resources.save
+ Me.picSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.picSave.Location = New System.Drawing.Point(886, 164)
+ Me.picSave.Name = "picSave"
+ Me.picSave.Size = New System.Drawing.Size(26, 22)
+ Me.picSave.TabIndex = 34
+ Me.picSave.TabStop = False
+ Me.picSave.Visible = False
'
- 'Label17
+ 'pnlAdresse
'
- Me.Label17.AutoSize = True
- Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label17.Location = New System.Drawing.Point(129, 63)
- Me.Label17.Name = "Label17"
- Me.Label17.Size = New System.Drawing.Size(45, 15)
- Me.Label17.TabIndex = 31
- Me.Label17.Text = "UID-Nr"
- '
- 'txtLand
- '
- Me.txtLand._DateTimeOnly = False
- Me.txtLand._numbersOnly = False
- Me.txtLand._numbersOnlyKommastellen = ""
- Me.txtLand._numbersOnlyTrennzeichen = True
- Me.txtLand._Prozent = False
- Me.txtLand._ShortDateNew = False
- Me.txtLand._ShortDateOnly = False
- Me.txtLand._TimeOnly = False
- Me.txtLand._TimeOnly_Seconds = False
- Me.txtLand._value = ""
- Me.txtLand._Waehrung = False
- Me.txtLand._WaehrungZeichen = True
- Me.txtLand.ForeColor = System.Drawing.Color.Red
- Me.txtLand.Location = New System.Drawing.Point(66, 58)
- Me.txtLand.MaxLength = 2
- Me.txtLand.MaxLineLength = -1
- Me.txtLand.MaxLines_Warning = ""
- Me.txtLand.MaxLines_Warning_Label = Nothing
- Me.txtLand.Name = "txtLand"
- Me.txtLand.Size = New System.Drawing.Size(38, 20)
- Me.txtLand.TabIndex = 30
- '
- 'txtStrassenNr
- '
- Me.txtStrassenNr._DateTimeOnly = False
- Me.txtStrassenNr._numbersOnly = False
- Me.txtStrassenNr._numbersOnlyKommastellen = ""
- Me.txtStrassenNr._numbersOnlyTrennzeichen = True
- Me.txtStrassenNr._Prozent = False
- Me.txtStrassenNr._ShortDateNew = False
- Me.txtStrassenNr._ShortDateOnly = False
- Me.txtStrassenNr._TimeOnly = False
- Me.txtStrassenNr._TimeOnly_Seconds = False
- Me.txtStrassenNr._value = ""
- Me.txtStrassenNr._Waehrung = False
- Me.txtStrassenNr._WaehrungZeichen = True
- Me.txtStrassenNr.ForeColor = System.Drawing.Color.Red
- Me.txtStrassenNr.Location = New System.Drawing.Point(241, 2)
- Me.txtStrassenNr.MaxLength = 10
- Me.txtStrassenNr.MaxLineLength = -1
- Me.txtStrassenNr.MaxLines_Warning = ""
- Me.txtStrassenNr.MaxLines_Warning_Label = Nothing
- Me.txtStrassenNr.Name = "txtStrassenNr"
- Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20)
- Me.txtStrassenNr.TabIndex = 29
- '
- 'txtOrt
- '
- Me.txtOrt._DateTimeOnly = False
- Me.txtOrt._numbersOnly = False
- Me.txtOrt._numbersOnlyKommastellen = ""
- Me.txtOrt._numbersOnlyTrennzeichen = True
- Me.txtOrt._Prozent = False
- Me.txtOrt._ShortDateNew = False
- Me.txtOrt._ShortDateOnly = False
- Me.txtOrt._TimeOnly = False
- Me.txtOrt._TimeOnly_Seconds = False
- Me.txtOrt._value = ""
- Me.txtOrt._Waehrung = False
- Me.txtOrt._WaehrungZeichen = True
- Me.txtOrt.ForeColor = System.Drawing.Color.Red
- Me.txtOrt.Location = New System.Drawing.Point(132, 29)
- Me.txtOrt.MaxLength = 50
- Me.txtOrt.MaxLineLength = -1
- Me.txtOrt.MaxLines_Warning = ""
- Me.txtOrt.MaxLines_Warning_Label = Nothing
- Me.txtOrt.Name = "txtOrt"
- Me.txtOrt.Size = New System.Drawing.Size(154, 20)
- Me.txtOrt.TabIndex = 28
- '
- 'Label16
- '
- Me.Label16.AutoSize = True
- Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label16.Location = New System.Drawing.Point(8, 58)
- Me.Label16.Name = "Label16"
- Me.Label16.Size = New System.Drawing.Size(35, 15)
- Me.Label16.TabIndex = 27
- Me.Label16.Text = "Land"
- '
- 'txtPLZ
- '
- Me.txtPLZ._DateTimeOnly = False
- Me.txtPLZ._numbersOnly = False
- Me.txtPLZ._numbersOnlyKommastellen = ""
- Me.txtPLZ._numbersOnlyTrennzeichen = True
- Me.txtPLZ._Prozent = False
- Me.txtPLZ._ShortDateNew = False
- Me.txtPLZ._ShortDateOnly = False
- Me.txtPLZ._TimeOnly = False
- Me.txtPLZ._TimeOnly_Seconds = False
- Me.txtPLZ._value = ""
- Me.txtPLZ._Waehrung = False
- Me.txtPLZ._WaehrungZeichen = True
- Me.txtPLZ.ForeColor = System.Drawing.Color.Red
- Me.txtPLZ.Location = New System.Drawing.Point(66, 29)
- Me.txtPLZ.MaxLength = 10
- Me.txtPLZ.MaxLineLength = -1
- Me.txtPLZ.MaxLines_Warning = ""
- Me.txtPLZ.MaxLines_Warning_Label = Nothing
- Me.txtPLZ.Name = "txtPLZ"
- Me.txtPLZ.Size = New System.Drawing.Size(59, 20)
- Me.txtPLZ.TabIndex = 26
- '
- 'Label15
- '
- Me.Label15.AutoSize = True
- Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
- Me.Label15.Location = New System.Drawing.Point(8, 32)
- Me.Label15.Name = "Label15"
- Me.Label15.Size = New System.Drawing.Size(48, 15)
- Me.Label15.TabIndex = 25
- Me.Label15.Text = "PLZ/Ort"
+ Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
+ Me.pnlAdresse.Controls.Add(Me.txtStrasse)
+ Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
+ Me.pnlAdresse.Controls.Add(Me.Label14)
+ Me.pnlAdresse.Controls.Add(Me.Label17)
+ Me.pnlAdresse.Controls.Add(Me.Label15)
+ Me.pnlAdresse.Controls.Add(Me.txtLand)
+ Me.pnlAdresse.Controls.Add(Me.txtPLZ)
+ Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
+ Me.pnlAdresse.Controls.Add(Me.Label16)
+ Me.pnlAdresse.Controls.Add(Me.txtOrt)
+ Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
+ Me.pnlAdresse.Name = "pnlAdresse"
+ Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
+ Me.pnlAdresse.TabIndex = 33
'
'txtStrasse
'
@@ -791,6 +670,30 @@ Partial Class ustCntlUSTV_AntragPosition
Me.txtStrasse.Size = New System.Drawing.Size(169, 20)
Me.txtStrasse.TabIndex = 24
'
+ 'txtUIDNr
+ '
+ Me.txtUIDNr._DateTimeOnly = False
+ Me.txtUIDNr._numbersOnly = False
+ Me.txtUIDNr._numbersOnlyKommastellen = ""
+ Me.txtUIDNr._numbersOnlyTrennzeichen = True
+ Me.txtUIDNr._Prozent = False
+ Me.txtUIDNr._ShortDateNew = False
+ Me.txtUIDNr._ShortDateOnly = False
+ Me.txtUIDNr._TimeOnly = False
+ Me.txtUIDNr._TimeOnly_Seconds = False
+ Me.txtUIDNr._value = ""
+ Me.txtUIDNr._Waehrung = False
+ Me.txtUIDNr._WaehrungZeichen = True
+ Me.txtUIDNr.ForeColor = System.Drawing.Color.Red
+ Me.txtUIDNr.Location = New System.Drawing.Point(180, 60)
+ Me.txtUIDNr.MaxLength = 50
+ Me.txtUIDNr.MaxLineLength = -1
+ Me.txtUIDNr.MaxLines_Warning = ""
+ Me.txtUIDNr.MaxLines_Warning_Label = Nothing
+ Me.txtUIDNr.Name = "txtUIDNr"
+ Me.txtUIDNr.Size = New System.Drawing.Size(106, 20)
+ Me.txtUIDNr.TabIndex = 32
+ '
'Label14
'
Me.Label14.AutoSize = True
@@ -801,6 +704,132 @@ Partial Class ustCntlUSTV_AntragPosition
Me.Label14.TabIndex = 23
Me.Label14.Text = "Strasse/Nr"
'
+ 'Label17
+ '
+ Me.Label17.AutoSize = True
+ Me.Label17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label17.Location = New System.Drawing.Point(129, 63)
+ Me.Label17.Name = "Label17"
+ Me.Label17.Size = New System.Drawing.Size(45, 15)
+ Me.Label17.TabIndex = 31
+ Me.Label17.Text = "UID-Nr"
+ '
+ 'Label15
+ '
+ Me.Label15.AutoSize = True
+ Me.Label15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label15.Location = New System.Drawing.Point(8, 32)
+ Me.Label15.Name = "Label15"
+ Me.Label15.Size = New System.Drawing.Size(48, 15)
+ Me.Label15.TabIndex = 25
+ Me.Label15.Text = "PLZ/Ort"
+ '
+ 'txtLand
+ '
+ Me.txtLand._DateTimeOnly = False
+ Me.txtLand._numbersOnly = False
+ Me.txtLand._numbersOnlyKommastellen = ""
+ Me.txtLand._numbersOnlyTrennzeichen = True
+ Me.txtLand._Prozent = False
+ Me.txtLand._ShortDateNew = False
+ Me.txtLand._ShortDateOnly = False
+ Me.txtLand._TimeOnly = False
+ Me.txtLand._TimeOnly_Seconds = False
+ Me.txtLand._value = ""
+ Me.txtLand._Waehrung = False
+ Me.txtLand._WaehrungZeichen = True
+ Me.txtLand.ForeColor = System.Drawing.Color.Red
+ Me.txtLand.Location = New System.Drawing.Point(66, 58)
+ Me.txtLand.MaxLength = 2
+ Me.txtLand.MaxLineLength = -1
+ Me.txtLand.MaxLines_Warning = ""
+ Me.txtLand.MaxLines_Warning_Label = Nothing
+ Me.txtLand.Name = "txtLand"
+ Me.txtLand.Size = New System.Drawing.Size(38, 20)
+ Me.txtLand.TabIndex = 30
+ '
+ 'txtPLZ
+ '
+ Me.txtPLZ._DateTimeOnly = False
+ Me.txtPLZ._numbersOnly = False
+ Me.txtPLZ._numbersOnlyKommastellen = ""
+ Me.txtPLZ._numbersOnlyTrennzeichen = True
+ Me.txtPLZ._Prozent = False
+ Me.txtPLZ._ShortDateNew = False
+ Me.txtPLZ._ShortDateOnly = False
+ Me.txtPLZ._TimeOnly = False
+ Me.txtPLZ._TimeOnly_Seconds = False
+ Me.txtPLZ._value = ""
+ Me.txtPLZ._Waehrung = False
+ Me.txtPLZ._WaehrungZeichen = True
+ Me.txtPLZ.ForeColor = System.Drawing.Color.Red
+ Me.txtPLZ.Location = New System.Drawing.Point(66, 29)
+ Me.txtPLZ.MaxLength = 10
+ Me.txtPLZ.MaxLineLength = -1
+ Me.txtPLZ.MaxLines_Warning = ""
+ Me.txtPLZ.MaxLines_Warning_Label = Nothing
+ Me.txtPLZ.Name = "txtPLZ"
+ Me.txtPLZ.Size = New System.Drawing.Size(59, 20)
+ Me.txtPLZ.TabIndex = 26
+ '
+ 'txtStrassenNr
+ '
+ Me.txtStrassenNr._DateTimeOnly = False
+ Me.txtStrassenNr._numbersOnly = False
+ Me.txtStrassenNr._numbersOnlyKommastellen = ""
+ Me.txtStrassenNr._numbersOnlyTrennzeichen = True
+ Me.txtStrassenNr._Prozent = False
+ Me.txtStrassenNr._ShortDateNew = False
+ Me.txtStrassenNr._ShortDateOnly = False
+ Me.txtStrassenNr._TimeOnly = False
+ Me.txtStrassenNr._TimeOnly_Seconds = False
+ Me.txtStrassenNr._value = ""
+ Me.txtStrassenNr._Waehrung = False
+ Me.txtStrassenNr._WaehrungZeichen = True
+ Me.txtStrassenNr.ForeColor = System.Drawing.Color.Red
+ Me.txtStrassenNr.Location = New System.Drawing.Point(241, 2)
+ Me.txtStrassenNr.MaxLength = 10
+ Me.txtStrassenNr.MaxLineLength = -1
+ Me.txtStrassenNr.MaxLines_Warning = ""
+ Me.txtStrassenNr.MaxLines_Warning_Label = Nothing
+ Me.txtStrassenNr.Name = "txtStrassenNr"
+ Me.txtStrassenNr.Size = New System.Drawing.Size(45, 20)
+ Me.txtStrassenNr.TabIndex = 29
+ '
+ 'Label16
+ '
+ Me.Label16.AutoSize = True
+ Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.5!)
+ Me.Label16.Location = New System.Drawing.Point(8, 58)
+ Me.Label16.Name = "Label16"
+ Me.Label16.Size = New System.Drawing.Size(35, 15)
+ Me.Label16.TabIndex = 27
+ Me.Label16.Text = "Land"
+ '
+ 'txtOrt
+ '
+ Me.txtOrt._DateTimeOnly = False
+ Me.txtOrt._numbersOnly = False
+ Me.txtOrt._numbersOnlyKommastellen = ""
+ Me.txtOrt._numbersOnlyTrennzeichen = True
+ Me.txtOrt._Prozent = False
+ Me.txtOrt._ShortDateNew = False
+ Me.txtOrt._ShortDateOnly = False
+ Me.txtOrt._TimeOnly = False
+ Me.txtOrt._TimeOnly_Seconds = False
+ Me.txtOrt._value = ""
+ Me.txtOrt._Waehrung = False
+ Me.txtOrt._WaehrungZeichen = True
+ Me.txtOrt.ForeColor = System.Drawing.Color.Red
+ Me.txtOrt.Location = New System.Drawing.Point(132, 29)
+ Me.txtOrt.MaxLength = 50
+ Me.txtOrt.MaxLineLength = -1
+ Me.txtOrt.MaxLines_Warning = ""
+ Me.txtOrt.MaxLines_Warning_Label = Nothing
+ Me.txtOrt.Name = "txtOrt"
+ Me.txtOrt.Size = New System.Drawing.Size(154, 20)
+ Me.txtOrt.TabIndex = 28
+ '
'Panel1
'
Me.Panel1.Controls.Add(Me.btnBildAuf)
@@ -871,35 +900,6 @@ Partial Class ustCntlUSTV_AntragPosition
Me.UsrcntlPDFScanList1.Size = New System.Drawing.Size(264, 207)
Me.UsrcntlPDFScanList1.TabIndex = 0
'
- 'pnlAdresse
- '
- Me.pnlAdresse.AccessibleRole = System.Windows.Forms.AccessibleRole.WhiteSpace
- Me.pnlAdresse.Controls.Add(Me.txtStrasse)
- Me.pnlAdresse.Controls.Add(Me.txtUIDNr)
- Me.pnlAdresse.Controls.Add(Me.Label14)
- Me.pnlAdresse.Controls.Add(Me.Label17)
- Me.pnlAdresse.Controls.Add(Me.Label15)
- Me.pnlAdresse.Controls.Add(Me.txtLand)
- Me.pnlAdresse.Controls.Add(Me.txtPLZ)
- Me.pnlAdresse.Controls.Add(Me.txtStrassenNr)
- Me.pnlAdresse.Controls.Add(Me.Label16)
- Me.pnlAdresse.Controls.Add(Me.txtOrt)
- Me.pnlAdresse.Location = New System.Drawing.Point(626, 76)
- Me.pnlAdresse.Name = "pnlAdresse"
- Me.pnlAdresse.Size = New System.Drawing.Size(287, 82)
- Me.pnlAdresse.TabIndex = 33
- '
- 'picSave
- '
- Me.picSave.BackgroundImage = Global.SDL.My.Resources.Resources.save
- Me.picSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.picSave.Location = New System.Drawing.Point(886, 164)
- Me.picSave.Name = "picSave"
- Me.picSave.Size = New System.Drawing.Size(26, 22)
- Me.picSave.TabIndex = 34
- Me.picSave.TabStop = False
- Me.picSave.Visible = False
- '
'ustCntlUSTV_AntragPosition
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -918,14 +918,14 @@ Partial Class ustCntlUSTV_AntragPosition
Me.Panel2.PerformLayout()
Me.pnl.ResumeLayout(False)
Me.pnl.PerformLayout()
+ CType(Me.picSave, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.pnlAdresse.ResumeLayout(False)
+ Me.pnlAdresse.PerformLayout()
Me.Panel1.ResumeLayout(False)
Me.Panel3.ResumeLayout(False)
Me.Panel4.ResumeLayout(False)
Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
- Me.pnlAdresse.ResumeLayout(False)
- Me.pnlAdresse.PerformLayout()
- CType(Me.picSave, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
End Sub
diff --git a/SDL/USTV/ustCntlUSTV_AntragPosition.vb b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
index f0fd00a7..c8603bbe 100644
--- a/SDL/USTV/ustCntlUSTV_AntragPosition.vb
+++ b/SDL/USTV/ustCntlUSTV_AntragPosition.vb
@@ -160,6 +160,7 @@ Public Class ustCntlUSTV_AntragPosition
UStV_Leist.UstV_Leistender_Adresse = True
If UStV_Leist.SAVE() Then
picSave.Visible = False
+ RaiseEvent CHANGED(UStV_POS.UStVPo_ID)
End If
End Sub
diff --git a/SDL/frmMain.vb b/SDL/frmMain.vb
index 0e817eb8..8d641a05 100644
--- a/SDL/frmMain.vb
+++ b/SDL/frmMain.vb
@@ -145,7 +145,7 @@ Public Class frmMain
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
- Dim timas As New cTimasAPI
+ Dim timas As New cTimasAPI("timas")
Dim infoMessage As String = ""
Dim timeEntryExisting As Boolean = False
Dim isEndpointRunning As Boolean = True
@@ -560,6 +560,37 @@ Public Class frmMain
Private Sub btnClose_Click(sender As Object, e As EventArgs) Handles btnClose.Click
+
+ Try
+ If False Then
+ If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
+ If Not VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasNichtStempeln Then
+ Dim timas As New cTimasAPI("timas")
+ Dim infoMessage As New DataTable
+ Dim timeEntryExisting As Boolean = False
+ Dim isEndpointRunning As Boolean = True
+ Dim isPresent = timas.getTimeEntries(cAllgemein.MITARBEITER.mit_timasId, infoMessage, timeEntryExisting,, isEndpointRunning)
+ If timeEntryExisting AndAlso isEndpointRunning AndAlso isPresent Then
+ Dim a As MsgBoxResult = MsgBox("Soll " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & " ausgestempelt werden?" & vbNewLine & Now.ToString() & " als Endzeit erfassen?", vbYesNo)
+ If a = vbYes Then
+ Dim info
+ timas.setTimeEntry(cAllgemein.MITARBEITER, Now, info, "out")
+ MsgBox(info)
+ Else
+
+ End If
+
+ End If
+
+ End If
+ End If
+ End If
+
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
Me.Close()
End Sub
diff --git a/SDL/frmdynMailvorlage.Designer.vb b/SDL/frmdynMailvorlage.Designer.vb
new file mode 100644
index 00000000..98e2e851
--- /dev/null
+++ b/SDL/frmdynMailvorlage.Designer.vb
@@ -0,0 +1,471 @@
+ _
+Partial Class frmdynMailvorlage
+ Inherits System.Windows.Forms.Form
+
+ '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.components = New System.ComponentModel.Container()
+ Me.mainPanel = New System.Windows.Forms.Panel()
+ Me.TextBox2 = New System.Windows.Forms.TextBox()
+ Me.btn = New System.Windows.Forms.Button()
+ Me.lblWordcount = New System.Windows.Forms.Label()
+ Me.cboFirmensignatur = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label7 = New System.Windows.Forms.Label()
+ Me.txtBezeichnung = New System.Windows.Forms.TextBox()
+ Me.Label6 = New System.Windows.Forms.Label()
+ Me.TextBox1 = New System.Windows.Forms.TextBox()
+ Me.txtBetreff = New System.Windows.Forms.TextBox()
+ Me.Label5 = New System.Windows.Forms.Label()
+ Me.cboSprache = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.rtb_Emailtext = New System.Windows.Forms.RichTextBox()
+ Me.cbxFirmaChange = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label = New System.Windows.Forms.Label()
+ Me.btnSave = New System.Windows.Forms.Button()
+ Me.cbxAktiv = New System.Windows.Forms.CheckBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.btnAdd = New System.Windows.Forms.Button()
+ Me.btnDelete = New System.Windows.Forms.Button()
+ Me.pnlTop = New System.Windows.Forms.Panel()
+ Me.cbxSpracheSelected = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.txtSuche = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+ Me.Label18 = New System.Windows.Forms.Label()
+ Me.lblWarning = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+ Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.mainPanel.SuspendLayout()
+ Me.pnlTop.SuspendLayout()
+ CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.SuspendLayout()
+ '
+ 'mainPanel
+ '
+ Me.mainPanel.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.mainPanel.Controls.Add(Me.TextBox2)
+ Me.mainPanel.Controls.Add(Me.btn)
+ Me.mainPanel.Controls.Add(Me.lblWordcount)
+ Me.mainPanel.Controls.Add(Me.cboFirmensignatur)
+ Me.mainPanel.Controls.Add(Me.Label7)
+ Me.mainPanel.Controls.Add(Me.txtBezeichnung)
+ Me.mainPanel.Controls.Add(Me.Label6)
+ Me.mainPanel.Controls.Add(Me.TextBox1)
+ Me.mainPanel.Controls.Add(Me.txtBetreff)
+ Me.mainPanel.Controls.Add(Me.Label5)
+ Me.mainPanel.Controls.Add(Me.cboSprache)
+ Me.mainPanel.Controls.Add(Me.Label2)
+ Me.mainPanel.Controls.Add(Me.rtb_Emailtext)
+ Me.mainPanel.Controls.Add(Me.cbxFirmaChange)
+ Me.mainPanel.Controls.Add(Me.Label)
+ Me.mainPanel.Controls.Add(Me.btnSave)
+ Me.mainPanel.Controls.Add(Me.cbxAktiv)
+ Me.mainPanel.Controls.Add(Me.Label1)
+ Me.mainPanel.Location = New System.Drawing.Point(0, 425)
+ Me.mainPanel.Name = "mainPanel"
+ Me.mainPanel.Size = New System.Drawing.Size(1283, 449)
+ Me.mainPanel.TabIndex = 101
+ '
+ 'TextBox2
+ '
+ Me.TextBox2.BackColor = System.Drawing.SystemColors.Control
+ Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.TextBox2.Location = New System.Drawing.Point(22, 400)
+ Me.TextBox2.Multiline = True
+ Me.TextBox2.Name = "TextBox2"
+ Me.TextBox2.Size = New System.Drawing.Size(256, 45)
+ Me.TextBox2.TabIndex = 34
+ Me.TextBox2.Text = "* Email-Text-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%VAR-GRENZE%"
+ '
+ 'btn
+ '
+ Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.btn.BackgroundImage = Global.SDL.My.Resources.Resources.email_big
+ Me.btn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn.Location = New System.Drawing.Point(1100, 405)
+ Me.btn.Margin = New System.Windows.Forms.Padding(5)
+ Me.btn.Name = "btn"
+ Me.btn.Padding = New System.Windows.Forms.Padding(5)
+ Me.btn.Size = New System.Drawing.Size(50, 40)
+ Me.btn.TabIndex = 33
+ Me.btn.UseVisualStyleBackColor = True
+ '
+ 'lblWordcount
+ '
+ Me.lblWordcount.AutoSize = True
+ Me.lblWordcount.Location = New System.Drawing.Point(1199, 398)
+ Me.lblWordcount.Name = "lblWordcount"
+ Me.lblWordcount.Size = New System.Drawing.Size(0, 13)
+ Me.lblWordcount.TabIndex = 32
+ '
+ 'cboFirmensignatur
+ '
+ Me.cboFirmensignatur._allowedValuesFreiText = Nothing
+ Me.cboFirmensignatur._allowFreiText = False
+ Me.cboFirmensignatur._value = ""
+ Me.cboFirmensignatur.DropDownWidth = 120
+ Me.cboFirmensignatur.FormattingEnabled = True
+ Me.cboFirmensignatur.Location = New System.Drawing.Point(985, 21)
+ Me.cboFirmensignatur.Name = "cboFirmensignatur"
+ Me.cboFirmensignatur.Size = New System.Drawing.Size(100, 21)
+ Me.cboFirmensignatur.TabIndex = 31
+ '
+ 'Label7
+ '
+ Me.Label7.AutoSize = True
+ Me.Label7.Location = New System.Drawing.Point(982, 5)
+ Me.Label7.Name = "Label7"
+ Me.Label7.Size = New System.Drawing.Size(103, 13)
+ Me.Label7.TabIndex = 30
+ Me.Label7.Text = "Email-Firmensignatur"
+ '
+ 'txtBezeichnung
+ '
+ Me.txtBezeichnung.Location = New System.Drawing.Point(139, 20)
+ Me.txtBezeichnung.Name = "txtBezeichnung"
+ Me.txtBezeichnung.Size = New System.Drawing.Size(250, 20)
+ Me.txtBezeichnung.TabIndex = 29
+ '
+ 'Label6
+ '
+ Me.Label6.AutoSize = True
+ Me.Label6.Location = New System.Drawing.Point(133, 3)
+ Me.Label6.Name = "Label6"
+ Me.Label6.Size = New System.Drawing.Size(69, 13)
+ Me.Label6.TabIndex = 28
+ Me.Label6.Text = "Bezeichnung"
+ '
+ 'TextBox1
+ '
+ Me.TextBox1.BackColor = System.Drawing.SystemColors.Control
+ Me.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.TextBox1.Location = New System.Drawing.Point(823, 3)
+ Me.TextBox1.Multiline = True
+ Me.TextBox1.Name = "TextBox1"
+ Me.TextBox1.Size = New System.Drawing.Size(110, 61)
+ Me.TextBox1.TabIndex = 27
+ Me.TextBox1.Text = "* Betreff-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%LKW%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%LKWKennzeichen%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%Empfaenger%" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10)
+ '
+ 'txtBetreff
+ '
+ Me.txtBetreff.Location = New System.Drawing.Point(465, 20)
+ Me.txtBetreff.Name = "txtBetreff"
+ Me.txtBetreff.Size = New System.Drawing.Size(290, 20)
+ Me.txtBetreff.TabIndex = 26
+ '
+ 'Label5
+ '
+ Me.Label5.AutoSize = True
+ Me.Label5.Location = New System.Drawing.Point(462, 3)
+ Me.Label5.Name = "Label5"
+ Me.Label5.Size = New System.Drawing.Size(42, 13)
+ Me.Label5.TabIndex = 25
+ Me.Label5.Text = "Betreff*"
+ '
+ 'cboSprache
+ '
+ Me.cboSprache._allowedValuesFreiText = Nothing
+ Me.cboSprache._allowFreiText = False
+ Me.cboSprache._value = ""
+ Me.cboSprache.DropDownWidth = 120
+ Me.cboSprache.FormattingEnabled = True
+ Me.cboSprache.Location = New System.Drawing.Point(22, 21)
+ Me.cboSprache.Name = "cboSprache"
+ Me.cboSprache.Size = New System.Drawing.Size(64, 21)
+ Me.cboSprache.TabIndex = 24
+ '
+ 'Label2
+ '
+ Me.Label2.AutoSize = True
+ Me.Label2.Location = New System.Drawing.Point(19, 5)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(47, 13)
+ Me.Label2.TabIndex = 23
+ Me.Label2.Text = "Sprache"
+ '
+ 'rtb_Emailtext
+ '
+ Me.rtb_Emailtext.Location = New System.Drawing.Point(15, 72)
+ Me.rtb_Emailtext.Name = "rtb_Emailtext"
+ Me.rtb_Emailtext.Size = New System.Drawing.Size(1245, 322)
+ Me.rtb_Emailtext.TabIndex = 22
+ Me.rtb_Emailtext.Text = ""
+ '
+ 'cbxFirmaChange
+ '
+ Me.cbxFirmaChange._allowedValuesFreiText = Nothing
+ Me.cbxFirmaChange._allowFreiText = False
+ Me.cbxFirmaChange._value = ""
+ Me.cbxFirmaChange.DropDownWidth = 120
+ Me.cbxFirmaChange.FormattingEnabled = True
+ Me.cbxFirmaChange.Location = New System.Drawing.Point(1155, 19)
+ Me.cbxFirmaChange.Name = "cbxFirmaChange"
+ Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
+ Me.cbxFirmaChange.TabIndex = 21
+ '
+ 'Label
+ '
+ Me.Label.AutoSize = True
+ Me.Label.Location = New System.Drawing.Point(1152, 3)
+ Me.Label.Name = "Label"
+ Me.Label.Size = New System.Drawing.Size(78, 13)
+ Me.Label.TabIndex = 20
+ Me.Label.Text = "gültig für Firma:"
+ '
+ 'btnSave
+ '
+ Me.btnSave.Location = New System.Drawing.Point(1185, 414)
+ Me.btnSave.Name = "btnSave"
+ Me.btnSave.Size = New System.Drawing.Size(75, 23)
+ Me.btnSave.TabIndex = 10
+ Me.btnSave.Text = "Speichern"
+ Me.btnSave.UseVisualStyleBackColor = True
+ '
+ 'cbxAktiv
+ '
+ Me.cbxAktiv.AutoSize = True
+ Me.cbxAktiv.Location = New System.Drawing.Point(1083, 52)
+ Me.cbxAktiv.Name = "cbxAktiv"
+ Me.cbxAktiv.Size = New System.Drawing.Size(172, 17)
+ Me.cbxAktiv.TabIndex = 3
+ Me.cbxAktiv.Text = "als dyn Mailvorlage verwenden"
+ Me.cbxAktiv.UseVisualStyleBackColor = True
+ '
+ 'Label1
+ '
+ Me.Label1.AutoSize = True
+ Me.Label1.Location = New System.Drawing.Point(19, 56)
+ Me.Label1.Name = "Label1"
+ Me.Label1.Size = New System.Drawing.Size(60, 13)
+ Me.Label1.TabIndex = 1
+ Me.Label1.Text = "Email-Text*"
+ '
+ 'btnAdd
+ '
+ Me.btnAdd.BackgroundImage = Global.SDL.My.Resources.Resources.plus
+ Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnAdd.Location = New System.Drawing.Point(1236, 399)
+ Me.btnAdd.Name = "btnAdd"
+ Me.btnAdd.Size = New System.Drawing.Size(24, 20)
+ Me.btnAdd.TabIndex = 103
+ Me.btnAdd.UseVisualStyleBackColor = True
+ '
+ 'btnDelete
+ '
+ Me.btnDelete.BackgroundImage = Global.SDL.My.Resources.Resources.del
+ Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+ Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btnDelete.Location = New System.Drawing.Point(1259, 399)
+ Me.btnDelete.Name = "btnDelete"
+ Me.btnDelete.Size = New System.Drawing.Size(24, 20)
+ Me.btnDelete.TabIndex = 102
+ Me.btnDelete.UseVisualStyleBackColor = True
+ '
+ 'pnlTop
+ '
+ Me.pnlTop.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer))
+ Me.pnlTop.Controls.Add(Me.cbxSpracheSelected)
+ Me.pnlTop.Controls.Add(Me.Label8)
+ Me.pnlTop.Controls.Add(Me.txtSuche)
+ Me.pnlTop.Controls.Add(Me.Label18)
+ Me.pnlTop.Controls.Add(Me.lblWarning)
+ Me.pnlTop.Controls.Add(Me.Label4)
+ Me.pnlTop.Controls.Add(Me.Label3)
+ Me.pnlTop.Controls.Add(Me.cbxFirma)
+ Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
+ Me.pnlTop.Location = New System.Drawing.Point(0, 0)
+ Me.pnlTop.Name = "pnlTop"
+ Me.pnlTop.Size = New System.Drawing.Size(1295, 48)
+ Me.pnlTop.TabIndex = 100
+ '
+ 'cbxSpracheSelected
+ '
+ Me.cbxSpracheSelected._allowedValuesFreiText = Nothing
+ Me.cbxSpracheSelected._allowFreiText = False
+ Me.cbxSpracheSelected._value = ""
+ Me.cbxSpracheSelected.DropDownWidth = 120
+ Me.cbxSpracheSelected.FormattingEnabled = True
+ Me.cbxSpracheSelected.Location = New System.Drawing.Point(1055, 19)
+ Me.cbxSpracheSelected.Name = "cbxSpracheSelected"
+ Me.cbxSpracheSelected.Size = New System.Drawing.Size(64, 21)
+ Me.cbxSpracheSelected.TabIndex = 35
+ '
+ 'Label8
+ '
+ Me.Label8.AutoSize = True
+ Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label8.ForeColor = System.Drawing.Color.White
+ Me.Label8.Location = New System.Drawing.Point(1052, 3)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(54, 13)
+ Me.Label8.TabIndex = 34
+ Me.Label8.Text = "Sprache"
+ '
+ 'txtSuche
+ '
+ Me.txtSuche._DateTimeOnly = False
+ Me.txtSuche._numbersOnly = False
+ Me.txtSuche._numbersOnlyKommastellen = ""
+ Me.txtSuche._numbersOnlyTrennzeichen = True
+ Me.txtSuche._Prozent = False
+ Me.txtSuche._ShortDateNew = False
+ Me.txtSuche._ShortDateOnly = False
+ Me.txtSuche._TimeOnly = False
+ Me.txtSuche._TimeOnly_Seconds = False
+ Me.txtSuche._value = Nothing
+ 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(702, 19)
+ 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(314, 20)
+ Me.txtSuche.TabIndex = 34
+ '
+ 'Label18
+ '
+ Me.Label18.AutoSize = True
+ Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label18.ForeColor = System.Drawing.Color.White
+ Me.Label18.Location = New System.Drawing.Point(699, 4)
+ Me.Label18.Name = "Label18"
+ Me.Label18.Size = New System.Drawing.Size(43, 13)
+ Me.Label18.TabIndex = 33
+ Me.Label18.Text = "Suche"
+ '
+ 'lblWarning
+ '
+ Me.lblWarning.AutoSize = True
+ Me.lblWarning.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblWarning.ForeColor = System.Drawing.Color.Red
+ Me.lblWarning.Location = New System.Drawing.Point(166, 13)
+ Me.lblWarning.Name = "lblWarning"
+ Me.lblWarning.Size = New System.Drawing.Size(0, 13)
+ Me.lblWarning.TabIndex = 14
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label4.ForeColor = System.Drawing.Color.White
+ Me.Label4.Location = New System.Drawing.Point(10, 13)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(147, 26)
+ Me.Label4.TabIndex = 0
+ Me.Label4.Text = "Mailvorlagen"
+ '
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label3.ForeColor = System.Drawing.Color.White
+ Me.Label3.Location = New System.Drawing.Point(1152, 3)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(37, 13)
+ Me.Label3.TabIndex = 5
+ Me.Label3.Text = "Firma"
+ '
+ 'cbxFirma
+ '
+ Me.cbxFirma._allowedValuesFreiText = Nothing
+ Me.cbxFirma._allowFreiText = False
+ Me.cbxFirma._value = ""
+ Me.cbxFirma.DropDownWidth = 150
+ Me.cbxFirma.Enabled = False
+ Me.cbxFirma.FormattingEnabled = True
+ Me.cbxFirma.Location = New System.Drawing.Point(1155, 19)
+ Me.cbxFirma.Name = "cbxFirma"
+ Me.cbxFirma.Size = New System.Drawing.Size(128, 21)
+ Me.cbxFirma.TabIndex = 13
+ '
+ 'dgvMailvorlagen
+ '
+ Me.dgvMailvorlagen.AKTUALISIERUNGS_INTERVALL = -1
+ Me.dgvMailvorlagen.AllowUserToAddRows = False
+ Me.dgvMailvorlagen.AllowUserToDeleteRows = False
+ Me.dgvMailvorlagen.BackgroundColor = System.Drawing.Color.White
+ Me.dgvMailvorlagen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+ Me.dgvMailvorlagen.Location = New System.Drawing.Point(0, 54)
+ Me.dgvMailvorlagen.Name = "dgvMailvorlagen"
+ Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365)
+ Me.dgvMailvorlagen.TabIndex = 104
+ '
+ 'frmdynMailvorlage
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(1295, 886)
+ Me.Controls.Add(Me.mainPanel)
+ Me.Controls.Add(Me.btnAdd)
+ Me.Controls.Add(Me.btnDelete)
+ Me.Controls.Add(Me.pnlTop)
+ Me.Controls.Add(Me.dgvMailvorlagen)
+ Me.Name = "frmdynMailvorlage"
+ Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+ Me.Text = "frmdynMailvorlage"
+ Me.mainPanel.ResumeLayout(False)
+ Me.mainPanel.PerformLayout()
+ Me.pnlTop.ResumeLayout(False)
+ Me.pnlTop.PerformLayout()
+ CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.ResumeLayout(False)
+
+ End Sub
+ Friend WithEvents mainPanel As Panel
+ Friend WithEvents cbxFirmaChange As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label As Label
+ Friend WithEvents btnSave As Button
+ Friend WithEvents cbxAktiv As CheckBox
+ Friend WithEvents Label1 As Label
+ Friend WithEvents btnAdd As Button
+ Friend WithEvents btnDelete As Button
+ Friend WithEvents pnlTop As Panel
+ Friend WithEvents lblWarning As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents Label3 As Label
+ Friend WithEvents cbxFirma As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents dgvMailvorlagen As VERAG_PROG_ALLGEMEIN.MyDatagridview
+ Friend WithEvents cboSprache As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label2 As Label
+ Friend WithEvents rtb_Emailtext As RichTextBox
+ Friend WithEvents Label5 As Label
+ Friend WithEvents TextBox1 As TextBox
+ Friend WithEvents txtBetreff As TextBox
+ Friend WithEvents txtBezeichnung As TextBox
+ Friend WithEvents Label6 As Label
+ Friend WithEvents txtSuche As VERAG_PROG_ALLGEMEIN.MyTextBox
+ Friend WithEvents Label18 As Label
+ Friend WithEvents cboFirmensignatur As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label7 As Label
+ Friend WithEvents lblWordcount As Label
+ Friend WithEvents btn As Button
+ Friend WithEvents cbxSpracheSelected As VERAG_PROG_ALLGEMEIN.MyComboBox
+ Friend WithEvents Label8 As Label
+ Friend WithEvents TextBox2 As TextBox
+End Class
diff --git a/SDL/frmdynMailvorlage.resx b/SDL/frmdynMailvorlage.resx
new file mode 100644
index 00000000..1af7de15
--- /dev/null
+++ b/SDL/frmdynMailvorlage.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/SDL/frmdynMailvorlage.vb b/SDL/frmdynMailvorlage.vb
new file mode 100644
index 00000000..e11e54dd
--- /dev/null
+++ b/SDL/frmdynMailvorlage.vb
@@ -0,0 +1,352 @@
+Imports System.Windows.Controls
+Imports Microsoft.Office.Interop
+Imports VERAG_PROG_ALLGEMEIN
+
+Public Class frmdynMailvorlage
+
+ Dim txtkonserve As New cTextkonserve
+ Dim editall As Boolean = False
+ Dim h2t As New Chilkat.HtmlToText
+
+ Sub New(permission As Boolean)
+ InitializeComponent()
+ editall = permission
+ VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+ End Sub
+
+ Private Sub Mailvorlage_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+ cboSprache.Items.Clear()
+ cboSprache.fillWithSQL("SELECT distinct([txt_sprache]) FROM [tblTextkonserve] where txt_sprache is not null ", False, "FMZOLL", True)
+
+ cbxSpracheSelected.Items.AddRange(cboSprache.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+ cbxSpracheSelected.changeItem("DE")
+
+
+ Dim listofFirmen = cFirmen.LOAD_LIST
+
+ cboFirmensignatur.Items.Clear()
+ For Each firma In listofFirmen
+ cboFirmensignatur.Items.Add(New MyListItem(firma.Firma_Bez, firma.Firma_ID))
+ Next
+
+ cbxFirma.Items.Clear()
+ cbxFirmaChange.Items.Clear()
+ cbxFirma.fillWithSQL("SELECT distinct([Firmengruppe]) FROM [tblFirma] where Firmengruppe is not null ", False, "FMZOLL", True)
+ cbxFirmaChange.Items.AddRange(cbxFirma.Items.Cast(Of VERAG_PROG_ALLGEMEIN.MyListItem).ToArray())
+
+ cbxFirma.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
+
+ cbxFirma.Enabled = editall
+
+ initDGVMailvorlagen(cbxFirma._value,, cbxSpracheSelected._value)
+
+ End Sub
+
+
+ Private Sub initDGVMailvorlagen(Optional firma As String = "", Optional searchparam As String = "", Optional sprache As String = "")
+
+ lblWarning.Text = ""
+
+ Dim SQLString As String = "SELECT * FROM [tblTextkonserve] WHERE txt_kategorie = 'FRM_MNGR_MailText'"
+ Dim SQLWHere = ""
+ If firma <> "" Then
+ SQLWHere &= " AND txt_FIRMA = '" & firma & "'"
+ End If
+
+ If searchparam <> "" Then
+ SQLWHere &= " AND (txt_Bezeichnung like '%" & searchparam & "%' OR txt_Betreff like '%" & searchparam & "%')"
+ End If
+
+ If sprache <> "" Then
+ SQLWHere &= " AND (txt_Sprache = '" & sprache & "')"
+ End If
+
+
+ dgvMailvorlagen.SET_SQL(SQLString & SQLWHere, "FMZOLL", ,)
+ dgvMailvorlagen.LOAD()
+
+
+ If dgvMailvorlagen.Columns.Count < 1 Then Exit Sub
+
+ With dgvMailvorlagen
+ If .RowCount = 0 Then Me.Cursor = Cursors.Default : Exit Sub
+ .MultiSelect = False
+ .RowHeadersVisible = False
+ .ReadOnly = True
+ .SelectionMode = DataGridViewSelectionMode.FullRowSelect
+ .Columns("txt_Id").Visible = False
+ .Columns("txt_kategorie").Visible = False
+ .Columns("txt_bezeichnung").HeaderText = "Bezeichnung"
+ .Columns("txt_bezeichnung").Width = 200
+ .Columns("txt_text").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
+ .Columns("txt_text").HeaderText = "Text"
+ .Columns("txt_betreff").HeaderText = "Betreff"
+ .Columns("txt_betreff").Width = 150
+ .Columns("txt_sprache").HeaderText = "Sprache"
+ .Columns("txt_sprache").Width = 50
+ .Columns("txt_dynMailvorlage").HeaderText = "Mailvorlage"
+ .Columns("txt_firmaSig").Visible = False
+ .Columns("txt_FIRMA").HeaderText = "Firma"
+ .Columns("txt_FIRMA").Width = 150
+ .Columns("txt_letzteAenderung").HeaderText = "letzte Änderung"
+ .Columns("txt_letzteAenderung").Width = 100
+ .Columns("txt_letzteAenderungUser").HeaderText = "User"
+ .Columns("txt_letzteAenderungUser").Width = 75
+ End With
+
+
+ For Each row As DataGridViewRow In dgvMailvorlagen.Rows
+
+
+ If row.Cells("txt_firmaSig").Value IsNot DBNull.Value AndAlso IsNumeric(row.Cells("txt_firmaSig").Value) Then
+ If CInt(row.Cells("txt_firmaSig").Value) > 0 Then
+
+ Dim tmpFirma = New VERAG_PROG_ALLGEMEIN.cFirmen(row.Cells("txt_firmaSig").Value)
+ 'row.Cells("txt_firmaSig").Value = tmpFirma.Firma_Bez.ToString
+ End If
+ End If
+
+ Next
+
+
+
+ End Sub
+
+ Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click
+
+ If checkIfFirmaIsFilled(True) = False Then Exit Sub
+
+ Dim input = InputBox("Bitte geben Sie die Bezeichnung der neuen Mailvorlage ein:", "Mailvorlage anlegen")
+ If input <> "" Then
+ If checkNameIsValid(input) Then
+ Dim txtkonserve As New cTextkonserve()
+ txtkonserve.txt_bezeichnung = input
+ txtkonserve.txt_kategorie = "FRM_MNGR_MailText"
+ txtkonserve.txt_dynMailvorlage = True
+ txtkonserve.txt_sprache = cbxSpracheSelected._value
+ txtkonserve.txt_text = " "
+ txtkonserve.txt_betreff = " "
+ txtkonserve.txt_FIRMA = cbxFirma.Text
+ txtkonserve.txt_firmaSig = 1
+ txtkonserve.txt_letzteAenderung = DateTime.Now
+ txtkonserve.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
+ If txtkonserve.SAVE() Then
+ initDGVMailvorlagen(cbxFirma._value)
+ End If
+
+ Else
+ MsgBox("Es existiert bereits ein Mailvorlage " & input & " für die Firma " & cbxFirma._value & "in der Sprache " & cbxSpracheSelected._value)
+ End If
+
+ Else
+ MsgBox("Keine Bezeichnung angegeben!")
+ End If
+ End Sub
+
+ Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+ If dgvMailvorlagen.SelectedRows.Count > 0 Then
+
+ Dim txtKonserve As New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ If vbYes = MsgBox("Möchten Sie diesen Mailvorlage " & txtKonserve.txt_bezeichnung & " (" & txtKonserve.txt_sprache & ")" & " in " & txtKonserve.txt_FIRMA & " wirklich löschen?", vbYesNo) Then
+ 'txtKonserve.deleteWarenort(txtKonserve.txt_Id) ' delete funktion implementierten
+ initDGVMailvorlagen(cbxFirma._value)
+ End If
+
+ End If
+
+ End Sub
+
+ Private Function checkNameIsValid(name As String) As Boolean
+
+ If dgvMailvorlagen.Rows.Count = 0 Then Return True
+ If checkIfFirmaIsFilled(False) = False Then Return False
+
+
+ For Each row As DataGridViewRow In dgvMailvorlagen.Rows
+ If Not IsDBNull(row.Cells("txt_bezeichnung").Value) AndAlso Not IsDBNull(row.Cells("txt_FIRMA").Value) Then
+ If row.Cells("txt_bezeichnung").Value.ToLower = name.ToLower AndAlso row.Cells("txt_FIRMA").Value = cbxFirma._value Then
+ Return False
+ End If
+ End If
+
+ Next
+
+ Return True
+
+ End Function
+
+
+ Private Sub dgvMailvorlagen_SelectionChanged(sender As Object, e As EventArgs) Handles dgvMailvorlagen.SelectionChanged
+ Try
+
+
+ If dgvMailvorlagen.SelectedRows.Count < 1 Then
+ mainPanel.Enabled = False
+ Exit Sub
+
+ Else
+ mainPanel.Enabled = True
+
+ End If
+
+ txtkonserve = New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ rtb_Emailtext.Text = txtkonserve.txt_text
+ txtBezeichnung.Text = txtkonserve.txt_bezeichnung
+ txtBetreff.Text = txtkonserve.txt_betreff
+ cbxAktiv.Checked = txtkonserve.txt_dynMailvorlage
+ cboSprache._value = txtkonserve.txt_sprache
+ rtb_Emailtext.Text = h2t.ToText(txtkonserve.txt_text)
+ cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig)
+ cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA)
+
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
+ Try
+ checkIfFirmaIsFilled(False)
+
+ Dim txtKS As New cTextkonserve(dgvMailvorlagen.SelectedRows(0).Cells("txt_id").Value)
+
+ If checkFields() = False Then Exit Sub
+
+ txtKS.txt_bezeichnung = txtBezeichnung.Text
+ txtKS.txt_betreff = txtBetreff.Text
+ txtKS.txt_dynMailvorlage = cbxAktiv.Checked
+ txtKS.txt_sprache = cboSprache._value
+ txtKS.txt_text = insertlinebreaks(rtb_Emailtext.Text)
+ txtKS.txt_FIRMA = cbxFirmaChange._value
+ txtKS.txt_firmaSig = cboFirmensignatur._value
+ txtKS.txt_letzteAenderung = DateTime.Now
+ txtKS.txt_letzteAenderungUser = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME
+
+ txtKS.SAVE()
+
+ dgvMailvorlagen.GetOrder()
+ initDGVMailvorlagen(cbxFirma._value)
+ dgvMailvorlagen.SetOrder()
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+ End Sub
+
+ Private Sub cbxFirma_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbxFirma.SelectedValueChanged, cbxSpracheSelected.SelectedValueChanged
+ Try
+
+ dgvMailvorlagen.GetOrder()
+ initDGVMailvorlagen(cbxFirma._value, txtSuche.Text, cbxSpracheSelected._value)
+ dgvMailvorlagen.SetOrder()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Function checkIfFirmaIsFilled(initialSave As Boolean, Optional setWarning As Boolean = True)
+
+ If cbxFirma._value = "" Then
+ If ((dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is DBNull.Value Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value Is Nothing Or dgvMailvorlagen.SelectedRows(0).Cells("txt_FIRMA").Value = "") Or initialSave = True) Then 'And initialSave = False ???
+
+ If setWarning Then
+ lblWarning.Text = "Bitte Firma auswählen!"
+ Else
+ lblWarning.Text = ""
+ End If
+
+ Return False
+ End If
+ lblWarning.Text = ""
+ Return True
+
+ Else
+
+ lblWarning.Text = ""
+ Return True
+
+
+ End If
+
+ Return False
+
+ End Function
+
+ Private Function checkFields() As Boolean
+
+ lblWarning.Text = ""
+ Return True
+
+
+ End Function
+
+ Private Sub txtSuche_KeyDown(sender As Object, e As KeyEventArgs) Handles txtSuche.KeyDown
+ If e.KeyCode = Keys.Enter Then
+
+ initDGVMailvorlagen(cbxFirma._value, txtSuche.Text, cboSprache._value)
+ e.Handled = True
+
+ End If
+ End Sub
+
+ Private Sub rtb_Emailtext_TextChanged(sender As Object, e As EventArgs) Handles rtb_Emailtext.TextChanged
+ Dim wordcount = rtb_Emailtext.TextLength
+ lblWordcount.Text = "(" & wordcount & "/65500)"
+
+ End Sub
+
+ Private Sub btn_Click(sender As Object, e As EventArgs) Handles btn.Click
+
+ Try
+
+ Dim outl As New Outlook.Application
+ Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+ Mail = outl.CreateItem(0)
+
+
+ If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then
+
+ Dim TextHTML = ""
+ TextHTML &= insertlinebreaks(rtb_Emailtext.Text)
+ TextHTML &= "
"
+ TextHTML &= "
"
+ TextHTML &= "Mit freundlichen Grüßen
"
+ TextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "
"
+ TextHTML &= "
"
+ TextHTML &= cFakturierung.getSignature(cboSprache._value, cboFirmensignatur._value, True, True)
+
+
+ Mail.HTMLBody = "" & TextHTML & "
"
+
+ Mail.Subject = txtBetreff.Text
+
+ End If
+
+ Mail.Display()
+
+ Catch ex As Exception
+ VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
+ End Try
+
+
+ End Sub
+
+ Private Function insertlinebreaks(text As String) As String
+
+ Return text.ToString.Replace(vbLf, vbLf & "
")
+
+ End Function
+
+
+
+End Class
\ No newline at end of file
diff --git a/SDL/kunden/frmKundenblatt.Designer.vb b/SDL/kunden/frmKundenblatt.Designer.vb
index 1327c63b..d4c87c8c 100644
--- a/SDL/kunden/frmKundenblatt.Designer.vb
+++ b/SDL/kunden/frmKundenblatt.Designer.vb
@@ -155,6 +155,8 @@ Partial Class frmKundenblatt
Me.tbUSTV = New System.Windows.Forms.TabPage()
Me.tbcntrUSTV = New System.Windows.Forms.TabControl()
Me.tbUSTVDokumente = New System.Windows.Forms.TabPage()
+ Me.Label8 = New System.Windows.Forms.Label()
+ Me.scanUSTVsonstigeDokumente = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
Me.Label27 = New System.Windows.Forms.Label()
Me.Label37 = New System.Windows.Forms.Label()
Me.scanUSTVFABest = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList()
@@ -261,7 +263,7 @@ Partial Class frmKundenblatt
Me.tbFirmendaten.Location = New System.Drawing.Point(4, 25)
Me.tbFirmendaten.Name = "tbFirmendaten"
Me.tbFirmendaten.Padding = New System.Windows.Forms.Padding(3)
- Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 744)
+ Me.tbFirmendaten.Size = New System.Drawing.Size(1630, 761)
Me.tbFirmendaten.TabIndex = 3
Me.tbFirmendaten.Text = "Firmendaten"
'
@@ -271,7 +273,7 @@ Partial Class frmKundenblatt
Me.Panel4.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel4.Location = New System.Drawing.Point(3, 3)
Me.Panel4.Name = "Panel4"
- Me.Panel4.Size = New System.Drawing.Size(1624, 738)
+ Me.Panel4.Size = New System.Drawing.Size(1624, 755)
Me.Panel4.TabIndex = 0
'
'UsrcntlKundeBearbeitenFull1
@@ -281,7 +283,7 @@ Partial Class frmKundenblatt
Me.UsrcntlKundeBearbeitenFull1.Location = New System.Drawing.Point(0, 0)
Me.UsrcntlKundeBearbeitenFull1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
Me.UsrcntlKundeBearbeitenFull1.Name = "UsrcntlKundeBearbeitenFull1"
- Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 738)
+ Me.UsrcntlKundeBearbeitenFull1.Size = New System.Drawing.Size(1624, 755)
Me.UsrcntlKundeBearbeitenFull1.TabIndex = 0
'
'tbcntrMain
@@ -721,7 +723,7 @@ Partial Class frmKundenblatt
Me.tbZoll.Location = New System.Drawing.Point(4, 25)
Me.tbZoll.Name = "tbZoll"
Me.tbZoll.Padding = New System.Windows.Forms.Padding(3)
- Me.tbZoll.Size = New System.Drawing.Size(1630, 744)
+ Me.tbZoll.Size = New System.Drawing.Size(1630, 761)
Me.tbZoll.TabIndex = 9
Me.tbZoll.Text = "ZOLL"
Me.tbZoll.UseVisualStyleBackColor = True
@@ -733,7 +735,7 @@ Partial Class frmKundenblatt
Me.tbcntrZOLL.Location = New System.Drawing.Point(3, 3)
Me.tbcntrZOLL.Name = "tbcntrZOLL"
Me.tbcntrZOLL.SelectedIndex = 0
- Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 738)
+ Me.tbcntrZOLL.Size = New System.Drawing.Size(1624, 755)
Me.tbcntrZOLL.TabIndex = 0
'
'tabZoll_Artikel
@@ -741,7 +743,7 @@ Partial Class frmKundenblatt
Me.tabZoll_Artikel.Location = New System.Drawing.Point(4, 22)
Me.tabZoll_Artikel.Name = "tabZoll_Artikel"
Me.tabZoll_Artikel.Padding = New System.Windows.Forms.Padding(3)
- Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 712)
+ Me.tabZoll_Artikel.Size = New System.Drawing.Size(1616, 729)
Me.tabZoll_Artikel.TabIndex = 1
Me.tabZoll_Artikel.Text = "Artikel"
Me.tabZoll_Artikel.UseVisualStyleBackColor = True
@@ -752,7 +754,7 @@ Partial Class frmKundenblatt
Me.tbMdm.Location = New System.Drawing.Point(4, 25)
Me.tbMdm.Name = "tbMdm"
Me.tbMdm.Padding = New System.Windows.Forms.Padding(3)
- Me.tbMdm.Size = New System.Drawing.Size(1630, 744)
+ Me.tbMdm.Size = New System.Drawing.Size(1630, 761)
Me.tbMdm.TabIndex = 10
Me.tbMdm.Text = "MDM"
Me.tbMdm.UseVisualStyleBackColor = True
@@ -770,7 +772,7 @@ Partial Class frmKundenblatt
Me.tbcntrMDM.Margin = New System.Windows.Forms.Padding(0)
Me.tbcntrMDM.Name = "tbcntrMDM"
Me.tbcntrMDM.SelectedIndex = 0
- Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 738)
+ Me.tbcntrMDM.Size = New System.Drawing.Size(1624, 755)
Me.tbcntrMDM.TabIndex = 0
'
'tbSDL
@@ -782,7 +784,7 @@ Partial Class frmKundenblatt
Me.tbSDL.Margin = New System.Windows.Forms.Padding(0)
Me.tbSDL.Name = "tbSDL"
Me.tbSDL.Padding = New System.Windows.Forms.Padding(3)
- Me.tbSDL.Size = New System.Drawing.Size(1616, 712)
+ Me.tbSDL.Size = New System.Drawing.Size(1616, 729)
Me.tbSDL.TabIndex = 5
Me.tbSDL.Text = "SDL-Leistungen"
Me.tbSDL.UseVisualStyleBackColor = True
@@ -824,7 +826,7 @@ Partial Class frmKundenblatt
DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
Me.dgvSDLLeistungenFull.RowHeadersDefaultCellStyle = DataGridViewCellStyle10
Me.dgvSDLLeistungenFull.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
- Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 516)
+ Me.dgvSDLLeistungenFull.Size = New System.Drawing.Size(1610, 533)
Me.dgvSDLLeistungenFull.TabIndex = 5
'
'Panel6
@@ -928,7 +930,7 @@ Partial Class frmKundenblatt
Me.Panel5.Controls.Add(Me.lblLetzterSA_SDL)
Me.Panel5.Controls.Add(Me.rtbVermerke)
Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom
- Me.Panel5.Location = New System.Drawing.Point(3, 566)
+ Me.Panel5.Location = New System.Drawing.Point(3, 583)
Me.Panel5.Name = "Panel5"
Me.Panel5.Size = New System.Drawing.Size(1610, 143)
Me.Panel5.TabIndex = 177
@@ -1792,7 +1794,7 @@ Partial Class frmKundenblatt
Me.tbOfferte.Location = New System.Drawing.Point(4, 25)
Me.tbOfferte.Margin = New System.Windows.Forms.Padding(2)
Me.tbOfferte.Name = "tbOfferte"
- Me.tbOfferte.Size = New System.Drawing.Size(1630, 744)
+ Me.tbOfferte.Size = New System.Drawing.Size(1630, 761)
Me.tbOfferte.TabIndex = 11
Me.tbOfferte.Text = "Offerte"
Me.tbOfferte.UseVisualStyleBackColor = True
@@ -1804,7 +1806,7 @@ Partial Class frmKundenblatt
Me.UsrCntlOfferte1.Location = New System.Drawing.Point(0, 0)
Me.UsrCntlOfferte1.Margin = New System.Windows.Forms.Padding(1)
Me.UsrCntlOfferte1.Name = "UsrCntlOfferte1"
- Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 744)
+ Me.UsrCntlOfferte1.Size = New System.Drawing.Size(1630, 761)
Me.UsrCntlOfferte1.TabIndex = 0
'
'tbUSTV
@@ -1831,6 +1833,8 @@ Partial Class frmKundenblatt
'
'tbUSTVDokumente
'
+ Me.tbUSTVDokumente.Controls.Add(Me.Label8)
+ Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVsonstigeDokumente)
Me.tbUSTVDokumente.Controls.Add(Me.Label27)
Me.tbUSTVDokumente.Controls.Add(Me.Label37)
Me.tbUSTVDokumente.Controls.Add(Me.scanUSTVFABest)
@@ -1842,6 +1846,35 @@ Partial Class frmKundenblatt
Me.tbUSTVDokumente.Text = "Dokumente"
Me.tbUSTVDokumente.UseVisualStyleBackColor = True
'
+ 'Label8
+ '
+ Me.Label8.AutoSize = True
+ Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label8.Location = New System.Drawing.Point(604, 17)
+ Me.Label8.Name = "Label8"
+ Me.Label8.Size = New System.Drawing.Size(126, 13)
+ Me.Label8.TabIndex = 8
+ Me.Label8.Text = "sonstige Dokumente:"
+ '
+ 'scanUSTVsonstigeDokumente
+ '
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_KATEGORIE = "DOKUMENTE"
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_ORDNER = "MDM"
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner1 = ""
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner2 = ""
+ Me.scanUSTVsonstigeDokumente._DATENSERVER_UOrdner3 = ""
+ Me.scanUSTVsonstigeDokumente._OPEN_ORIGINAL = False
+ Me.scanUSTVsonstigeDokumente._TYPE = "PDF"
+ Me.scanUSTVsonstigeDokumente.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink
+ Me.scanUSTVsonstigeDokumente.BackColor = System.Drawing.Color.White
+ Me.scanUSTVsonstigeDokumente.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.scanUSTVsonstigeDokumente.Cursor = System.Windows.Forms.Cursors.Default
+ Me.scanUSTVsonstigeDokumente.Location = New System.Drawing.Point(607, 36)
+ Me.scanUSTVsonstigeDokumente.Margin = New System.Windows.Forms.Padding(0)
+ Me.scanUSTVsonstigeDokumente.Name = "scanUSTVsonstigeDokumente"
+ Me.scanUSTVsonstigeDokumente.Size = New System.Drawing.Size(285, 505)
+ Me.scanUSTVsonstigeDokumente.TabIndex = 7
+ '
'Label27
'
Me.Label27.AutoSize = True
@@ -1906,7 +1939,7 @@ Partial Class frmKundenblatt
Me.tbUSTVAntrage.Location = New System.Drawing.Point(4, 22)
Me.tbUSTVAntrage.Name = "tbUSTVAntrage"
Me.tbUSTVAntrage.Padding = New System.Windows.Forms.Padding(3)
- Me.tbUSTVAntrage.Size = New System.Drawing.Size(1622, 735)
+ Me.tbUSTVAntrage.Size = New System.Drawing.Size(184, 45)
Me.tbUSTVAntrage.TabIndex = 9
Me.tbUSTVAntrage.Text = "USTV-Anträge"
Me.tbUSTVAntrage.UseVisualStyleBackColor = True
@@ -1916,7 +1949,7 @@ Partial Class frmKundenblatt
Me.UsrCntlUSTV.Dock = System.Windows.Forms.DockStyle.Fill
Me.UsrCntlUSTV.Location = New System.Drawing.Point(3, 3)
Me.UsrCntlUSTV.Name = "UsrCntlUSTV"
- Me.UsrCntlUSTV.Size = New System.Drawing.Size(1616, 729)
+ Me.UsrCntlUSTV.Size = New System.Drawing.Size(178, 39)
Me.UsrCntlUSTV.TabIndex = 0
'
'cntxtExcel
@@ -2425,4 +2458,6 @@ Partial Class frmKundenblatt
Friend WithEvents scanUSTVVollmachten As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
Friend WithEvents tbUSTVAntrage As TabPage
Friend WithEvents UsrCntlUSTV As usrCntlUSTV
+ Friend WithEvents Label8 As Label
+ Friend WithEvents scanUSTVsonstigeDokumente As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList
End Class
diff --git a/SDL/kunden/usrCntlKundenBesonderheiten.vb b/SDL/kunden/usrCntlKundenBesonderheiten.vb
index f8823632..1856e908 100644
--- a/SDL/kunden/usrCntlKundenBesonderheiten.vb
+++ b/SDL/kunden/usrCntlKundenBesonderheiten.vb
@@ -85,7 +85,7 @@ Public Class usrCntlKundenBesonderheiten
End Sub
Private Sub initDGV(Optional kdnrTmp = -1, Optional simpleView = False, Optional preferedKategorie = "", Optional preferedKategorieOtherIN = "")
- If dgvBesonderheiten.Columns IsNot Nothing Then
+ If dgvBesonderheiten.Columns IsNot Nothing AndAlso dgvBesonderheiten.Columns.Count > 0 Then
dgvBesonderheiten.Columns.Clear()
End If
diff --git a/SDL/kunden/usrCntlKundenuebersicht.vb b/SDL/kunden/usrCntlKundenuebersicht.vb
index 8f6b6f41..f4bbfbfa 100644
--- a/SDL/kunden/usrCntlKundenuebersicht.vb
+++ b/SDL/kunden/usrCntlKundenuebersicht.vb
@@ -2739,10 +2739,10 @@ Public Class usrCntlKundenuebersicht
Else
- Dim cs = New cCreditSafeAPI()
+ Dim cs = New cCreditSafeAPI("creditsafe")
'If cs.authenticate(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSuser, VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSpwd) = "200" Then
- If cs.authenticate("creditsafe@verag.ag", "^AZcBVTBUIHTT5SQ1C9OOH") = "200" Then
+ If cs.authenticate() = "200" Then
'Prüfung wird benötigt, da deutsche Abfragen einen Reasoncode benötigen!
If checkNullStr(ADRESSE.LandKz) = "" Then
@@ -2788,7 +2788,7 @@ Public Class usrCntlKundenuebersicht
Else
- MsgBox("Authentifizierungsfehler für User " & VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_CSuser)
+ MsgBox("Authentifizierungsfehler bei Creditsafe-User")
End If
diff --git a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
index d1774041..fd3f4841 100644
--- a/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
+++ b/VERAG_PROG_ALLGEMEIN/AVISO/cDatenbankAVISO.vb
@@ -1859,7 +1859,6 @@ Public Class cAvisoDAL
Dim tmpid = AvisoDAL.SpeichernAviso(av)
AvisoDAL.addAenderung(tmpid, "automatisch auf 'LKW nicht eingetroffen' gestellt", "automatisch auf 'LKW nicht eingetroffen' gestellt am " & Format(Now, "dd.MM.yyyy HH:mm") & ", da bereits länger als 10 Tage offen")
- 'TODO - Benachrichtigung für zuständigen Mitarbeiter einbauen
VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(av.AvisoID, -1, 3, "B", av.LetzterMitarbeiterId, "automatisch auf 'LKW nicht eingetroffen gesetzt", 0,, "automatisch auf 'LKW nicht eingetroffen' gestellt am " & Format(Now, "dd.MM.yyyy HH:mm") & ", da bereits länger als 10 Tage offen")
Check_Nicht_eingetroffen += 1
diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
index 17511f25..578a8cd1 100644
--- a/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
+++ b/VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
@@ -1,7 +1,40 @@
Imports System.Data.SqlClient
- Imports System.Reflection
+Imports System.Reflection
+Public Class cTextkonserve_LIST
+
+ Public LIST As New List(Of cTextkonserve)
+ Dim SQL As New SQL
+
+
+ Sub New(txt_kategorie As String, txt_sprache As String, txt_FIRMA As String)
+
+ LOAD_LIST(txt_kategorie, txt_sprache, txt_FIRMA)
+
+ End Sub
+
+
+ Public Sub LOAD_LIST(txt_kategorie As String, txt_sprache As String, txt_FIRMA As String)
+ Try
+
+ LIST.Clear()
+ Dim sqlSprache As String = ""
+ If txt_sprache <> "" Then sqlSprache = " And txt_sprache = '" & txt_sprache & "'"
+
+
+ For Each r In SQL.loadDgvBySql("Select txt_Id FROM [tblTextkonserve] WHERE txt_kategorie='" & txt_kategorie & "' AND txt_FIRMA = '" & txt_FIRMA & "' and txt_dynMailvorlage = 1" & sqlSprache & " ORDER BY txt_kategorie asc", "FMZOLL").Rows
+ LIST.Add(New VERAG_PROG_ALLGEMEIN.cTextkonserve(r("txt_Id")))
+ Next
+
+ Catch ex As Exception
+ MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace)
+ End Try
+ End Sub
+
+
+
+End Class
Public Class cTextkonserve
Property txt_Id As Integer
Property txt_kategorie As String
@@ -10,7 +43,10 @@ Public Class cTextkonserve
Property txt_text As String
Property txt_betreff As String
Property txt_FIRMA As String
- Property txt_firmaSig As Integer = 1
+ Property txt_firmaSig As Integer
+ Property txt_dynMailvorlage As Boolean
+ Property txt_letzteAenderungUser As String
+ Property txt_letzteAenderung As DateTime
Public hasEntry As Boolean = False
@@ -38,7 +74,6 @@ Public Class cTextkonserve
End Sub
-
Public Function getParameterList() As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
Dim list As New List(Of VERAG_PROG_ALLGEMEIN.SQLVariable)
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_Id", txt_Id, , True, True))
@@ -49,6 +84,9 @@ Public Class cTextkonserve
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_betreff", txt_betreff))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_FIRMA", txt_FIRMA))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_firmaSig", txt_firmaSig))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_dynMailvorlage", txt_dynMailvorlage))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_letzteAenderungUser", txt_letzteAenderungUser))
+ list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_letzteAenderung", txt_letzteAenderung))
Return list
End Function
@@ -125,6 +163,7 @@ Public Class cTextkonserve
End Try
End Sub
+
Public Function getUpdateCmd() As String
Try
Dim list As List(Of VERAG_PROG_ALLGEMEIN.SQLVariable) = getParameterList()
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
index d3870a1d..85de37c3 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmMitarbeitersuche.vb
@@ -10,7 +10,7 @@ Imports VERAG_PROG_ALLGEMEIN.cCreditSafeAPI
Public Class frmMitarbeitersuche
Dim mit_id As Integer = -1
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
- Dim timas As New cTimasAPI
+ Dim timas As New cTimasAPI("timas")
Dim requestDone As Boolean = False
Dim MA As cMitarbeiter = Nothing
@@ -323,7 +323,7 @@ Public Class frmMitarbeitersuche
If VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_timasId IsNot Nothing Then
- Dim timas As New cTimasAPI
+ Dim timas As New cTimasAPI("timas")
If art = "post" Then
'postgang ausstempen, dann beginn post, + 1h ende post
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
index b572c2b5..baf7cbe3 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmUeberstundenauszahlen
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
Private Sub InitializeComponent()
- Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUeberstundenauszahlen))
Me.dtpMonat = New System.Windows.Forms.DateTimePicker()
Me.lblMonat = New System.Windows.Forms.Label()
@@ -79,7 +78,8 @@ Partial Class frmUeberstundenauszahlen
Me.lblWarning = New System.Windows.Forms.Label()
Me.Label5 = New System.Windows.Forms.Label()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
- Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+ Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
+ Me.dgvUeberstunden = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
CType(Me.picDel, System.ComponentModel.ISupportInitialize).BeginInit()
Me.Panel1.SuspendLayout()
CType(Me.picShow, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -188,7 +188,7 @@ Partial Class frmUeberstundenauszahlen
'Button1
'
Me.Button1.DialogResult = System.Windows.Forms.DialogResult.OK
- Me.Button1.Location = New System.Drawing.Point(464, 170)
+ Me.Button1.Location = New System.Drawing.Point(521, 212)
Me.Button1.Name = "Button1"
Me.Button1.Size = New System.Drawing.Size(87, 30)
Me.Button1.TabIndex = 12
@@ -631,6 +631,17 @@ Partial Class frmUeberstundenauszahlen
Me.PictureBox5.TabIndex = 130
Me.PictureBox5.TabStop = False
'
+ 'LinkLabel1
+ '
+ Me.LinkLabel1.AutoSize = True
+ Me.LinkLabel1.Location = New System.Drawing.Point(473, 47)
+ Me.LinkLabel1.Name = "LinkLabel1"
+ Me.LinkLabel1.Size = New System.Drawing.Size(161, 13)
+ Me.LinkLabel1.TabIndex = 131
+ Me.LinkLabel1.TabStop = True
+ Me.LinkLabel1.Text = "zu unterschreibende Dokumente"
+ Me.LinkLabel1.Visible = False
+ '
'dgvUeberstunden
'
Me.dgvUeberstunden.AKTUALISIERUNGS_INTERVALL = -1
@@ -650,6 +661,7 @@ Partial Class frmUeberstundenauszahlen
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(646, 337)
+ Me.Controls.Add(Me.LinkLabel1)
Me.Controls.Add(Me.PictureBox5)
Me.Controls.Add(Me.Label5)
Me.Controls.Add(Me.lblWarning)
@@ -735,4 +747,5 @@ Partial Class frmUeberstundenauszahlen
Friend WithEvents txtBruttoSum As Windows.Forms.TextBox
Friend WithEvents Label12 As Windows.Forms.Label
Friend WithEvents PictureBox5 As Windows.Forms.PictureBox
+ Friend WithEvents LinkLabel1 As Windows.Forms.LinkLabel
End Class
diff --git a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
index 68cb71a9..164c2156 100644
--- a/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
+++ b/VERAG_PROG_ALLGEMEIN/Mitarbeiterverzeichnis/frmUeberstundenauszahlen.vb
@@ -9,7 +9,7 @@ Public Class frmUeberstundenauszahlen
Dim refresh As Boolean = False
Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL
Dim MA As cMitarbeiter = Nothing
- Dim timas As cTimasAPI = New cTimasAPI
+ Dim timas As cTimasAPI = New cTimasAPI("timas")
Dim dt As New DataTable
Dim customFields As New DataTable
Dim timeaccountdt As New DataTable
@@ -39,6 +39,13 @@ Public Class frmUeberstundenauszahlen
customFields = timas.getEmployeecustomFields(MA.mit_timasId)
timas.getTimeaccountList(dt)
+ Select Case MA.mit_firma
+ Case "VERAG", "FRONTOFFICE", "IMEX", "ALL" : LinkLabel1.Visible = True
+ Case Else : LinkLabel1.Visible = False
+
+ End Select
+
+
Dim dv = New DataView(dt)
dv.RowFilter = "accountid = 65 Or accountid = 69 Or accountid = 70 Or accountid = 72 Or accountid = 73 Or accountid = 1209 Or accountid = 1235 Or accountid = 1550 Or accountid = 1551 Or accountid = 1553"
timeaccountdt = dv.ToTable
@@ -482,6 +489,11 @@ Public Class frmUeberstundenauszahlen
Process.Start(webAddress)
End Sub
+ Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
+ Dim webAddress As String = "https://wiki.verag.ag/de/software/zeiterfassung_admin/zeiterfassung_admin#dokumente"
+ Process.Start(webAddress)
+ End Sub
+
Private Sub txtAusz_hhmm_KeyPress(sender As Object, e As KeyPressEventArgs)
Select Case Asc(e.KeyChar)
Case 48 To 57, 8, 44, 46, 58
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
index 37da582d..8a515ef6 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/ATEZ/VERAG_OUT_ATEZ_IN/cATEZ_NCTS_IN.vb
@@ -1,6 +1,7 @@
Imports System.Data.SqlClient
Imports System.Net
Imports System.Reflection
+Imports System.ServiceModel.Configuration
Imports System.ServiceModel.Security
Imports System.Threading
Imports System.Web.Routing
@@ -610,18 +611,29 @@ Public Class cATEZ_NCTS_IN
'Shared API_STRING As String = "https://dev-tds.singlewindow.io"
'PROD
Shared API_STRING As String = "https://transcom.singlewindow.io"
+ Shared API As New DataTable
Shared token As String = ""
Shared refresh_token As String = ""
Public dataTable As New DataTable()
Shared jsonData As New Chilkat.JsonObject
Public Shared sessionID As Integer = -1
+ Dim SQl As SQL
+ Shared apiSettingsloaded As Boolean = False
+ Sub New(program As String)
+ API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+ If API.Rows.Count = 0 Then
+ MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!")
+ Else
+ apiSettingsloaded = True
+ API_STRING = API.Rows(0).Item("api_url")
+ End If
+ API_STRING = API.Rows(0).Item("api_url")
+ End Sub
Shared Function SendRequestAuthentificationToken(ByVal myuri As String, ByVal contentType As String, ByVal method As String, ByRef Itoken As String) As String
Try
-
-
Dim session = New cATEZ_NCTS_Sessions()
If Not IsDBNull(session.token) AndAlso session.token IsNot Nothing Then
@@ -631,6 +643,8 @@ Public Class cATEZ_NCTS_IN
Return "200"
End If
+ If apiSettingsloaded = False Then Return "400"
+
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
Dim rest As New Chilkat.Rest
@@ -650,8 +664,8 @@ Public Class cATEZ_NCTS_IN
Dim json As New Chilkat.JsonObject
- json.UpdateString("password", "V3r4gAtez2023!")
- json.UpdateString("username", "atez-integration@verag.ag")
+ json.UpdateString("password", API.Rows(0).Item("api_password"))
+ json.UpdateString("username", API.Rows(0).Item("api_user"))
rest.AddHeader("Content-Type", contentType)
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
index 8ea9bb24..e5f369b2 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Creditsafe/cCreditSafeAPI.vb
@@ -1,35 +1,38 @@
-Imports System.Diagnostics.Eventing.Reader
-Imports System.IO
+
Imports System.Net
-Imports System.Text
Imports System.Threading
-Imports System.Web.UI.WebControls
-Imports System.Windows.Forms
Imports Chilkat
-Imports iTextSharp.text.pdf
-Imports Microsoft.Office.Interop.Outlook
-Imports Newtonsoft.Json
-Imports Spire.Pdf.Lists
-Imports Spire.Pdf.OPC
-Imports VERAG_PROG_ALLGEMEIN.IDEV_Intrastat
-Imports VERAG_PROG_ALLGEMEIN.TESTJSON
+
Public Class cCreditSafeAPI
- 'Test
- 'Shared API_STRING As String = "https://connect.sandbox.creditsafe.com"
- 'PROD
- Shared API_STRING As String = "https://connect.creditsafe.com"
+ Shared API_STRING As String
+ Shared API As New DataTable
Shared token As String = ""
Public dataTable As New DataTable()
+ Public dataTablecs As New DataTable()
+ Shared SQL As New SQL
+ Shared apiSettingsloaded As Boolean = False
+ Sub New(program As String)
+ API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+ dataTablecs = API
+ If API.Rows.Count = 0 Then
+ MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!")
+ Else
+ apiSettingsloaded = True
+ API_STRING = API.Rows(0).Item("api_url")
+ End If
+ End Sub
- Shared Function SendRequestAuthentificationToken(myuri As String, user As CreditSafeUser, contentType As String, method As String) As String
+ Shared Function SendRequestAuthentificationToken(myuri As String, contentType As String, method As String, Optional csUser As CreditSafeUser = Nothing) As String
Try
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+ If apiSettingsloaded = False Then Return "400"
+
Dim rest As New Chilkat.Rest
Dim success As Boolean
@@ -45,10 +48,15 @@ Public Class cCreditSafeAPI
End If
-
Dim json As New Chilkat.JsonObject
- json.UpdateString("username", user.username)
- json.UpdateString("password", user.password)
+ If csUser IsNot Nothing Then
+ json.UpdateString("username", csUser.username)
+ json.UpdateString("password", csUser.password)
+ Else
+ json.UpdateString("username", API.Rows(0).Item("api_user"))
+ json.UpdateString("password", API.Rows(0).Item("api_password"))
+ End If
+
rest.AddHeader("Content-Type", contentType)
@@ -176,11 +184,15 @@ Public Class cCreditSafeAPI
End Function
- Shared Function authenticate(username As String, passwort As String) As String
+ Shared Function authenticate(Optional username As String = "", Optional password As String = "") As String
Dim myUri As String = API_STRING & "/v1/authenticate"
- Dim csUser = New CreditSafeUser(username, passwort)
- Dim response = SendRequestAuthentificationToken(myUri, csUser, "application/json", "POST")
+ Dim csUser
+ If username <> "" AndAlso password <> "" Then
+ csUser = New CreditSafeUser(username, password)
+ End If
+
+ Dim response = SendRequestAuthentificationToken(myUri, "application/json", "POST", csUser)
Return response
@@ -506,6 +518,44 @@ Public Class cCreditSafeAPI
End Function
+ Public Function getSubscriptionCountries() As String
+
+ VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+
+ If apiSettingsloaded = False Then Return "400"
+
+ Dim rest As New Chilkat.Rest
+ Dim success As Boolean
+
+ rest.AddHeader("Authorization", "Bearer ")
+
+ Dim sbResponseBody As New Chilkat.StringBuilder
+ success = rest.FullRequestNoBodySb("GET", "/v1/access", sbResponseBody)
+ If (success <> True) Then
+ Return rest.LastErrorText
+ End If
+
+ Dim respStatusCode As Integer = rest.ResponseStatusCode
+ Debug.WriteLine("response status code = " & respStatusCode)
+ If (respStatusCode >= 400) Then
+ Debug.WriteLine("Response Status Code = " & respStatusCode)
+ Debug.WriteLine("Response Header:")
+ Debug.WriteLine(rest.ResponseHeader)
+ Debug.WriteLine("Response Body:")
+ Debug.WriteLine(sbResponseBody.GetAsString())
+ Return respStatusCode & " " & sbResponseBody.GetAsString()
+ End If
+
+
+ Dim jsonResponse As New Chilkat.JsonObject
+ jsonResponse.LoadSb(sbResponseBody)
+
+ jsonResponse.EmitCompact = False
+ Debug.WriteLine(jsonResponse.Emit())
+
+
+ End Function
+
Shared Sub setSearchParam(ByRef rest As Chilkat.Rest, ByRef company As Company)
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb
index 1653ca04..fb06ef78 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/Digicast/cDigicustAPI.vb
@@ -352,15 +352,30 @@ End Class
Public Class cDigicustAPI
'PROD
- Shared API_STRING As String = "https://api.digicust.com"
+ Shared API_STRING As String
Shared token As String = ""
+ Shared api As New DataTable
Shared refresh_token As String = ""
Public dataTable As New DataTable()
+ Dim sql As New SQL
+ Shared apiSettingsloaded As Boolean = False
+ Sub New(program As String)
+ api = sql.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+ If api.Rows.Count = 0 Then
+ MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!")
+ Else
+ apiSettingsloaded = True
+ API_STRING = api.Rows(0).Item("api_url")
+ End If
+ API_STRING = api.Rows(0).Item("api_url")
+ End Sub
+
Shared Function SendRequestAuthentificationToken(ByVal myuri As String, ByVal contentType As String, ByVal method As String, ByRef _token As String) As String
Try
+
Dim session = New cDigicustSessions()
If Not IsDBNull(session.token) AndAlso session.token IsNot Nothing Then
@@ -371,6 +386,8 @@ Public Class cDigicustAPI
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+ If apiSettingsloaded = False Then Return "400"
+
Dim rest As New Chilkat.Rest
Dim success As Boolean
Dim bTls As Boolean = True
@@ -385,8 +402,9 @@ Public Class cDigicustAPI
End If
Dim json As New Chilkat.JsonObject
- success = json.UpdateString("username", "edv@verag.ag")
- success = json.UpdateString("password", "hbG&%RhpE6kjV@r")
+
+ success = json.UpdateString("username", api.Rows(0).Item("user"))
+ success = json.UpdateString("password", api.Rows(0).Item("password"))
rest.AddHeader("Content-Type", contentType)
diff --git a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
index 8c72e983..65ff1f44 100644
--- a/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
+++ b/VERAG_PROG_ALLGEMEIN/Schnittstellen/TIMAS/cTimasAPI.vb
@@ -4,22 +4,35 @@ Imports System.Runtime.Remoting
Imports System.Text
Imports System.Threading
Imports System.Windows.Forms
+Imports DocumentFormat.OpenXml.Wordprocessing
Imports Microsoft.Office.Interop.Outlook
Public Class cTimasAPI
- Dim API_STRING = "https://zeit.verag.ag"
+ Public API_STRING
+ Dim API As New DataTable
Dim rest As New Chilkat.Rest
+ Dim SQL As New SQL
+ Dim apiSettingsloaded As Boolean = False
- Sub New()
+ Sub New(program As String)
VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
+ API = SQL.loadDgvBySql("SELECT top(1) * FROM tblAPIEinstellungen WHERE api_program='" & program & "' and api_productive ='" & IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM, "0", "1") & "'", "ADMIN")
+ If API.Rows.Count = 0 Then
+ MsgBox("keine gültigen API-Einstellungen für " & program & " gefunden!")
+ Else
+ apiSettingsloaded = True
+ API_STRING = API.Rows(0).Item("api_url")
+ End If
+
End Sub
Public Function checkConnectionTImas(ByRef failureText As String) As Boolean
Try
Dim success As Boolean
+ If apiSettingsloaded = False Then Return False
rest.VerboseLogging = True
Dim bTls As Boolean = True
@@ -33,7 +46,7 @@ Public Class cTimasAPI
Return False
End If
- success = rest.SetAuthBasic("admin", "BmWr501956")
+ success = rest.SetAuthBasic(API.Rows(0).Item("api_user"), API.Rows(0).Item("api_password"))
If (success <> True) Then
Debug.WriteLine("BAFailReason: " & rest.ConnectFailReason)