edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://verag.visualstudio.com/SDL/_git/SDL

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-09-09 08:18:28 +02:00
parent cca0257f79 aad1cea1e9
commit 3ad1e4dbfc
31 changed files with 6223 additions and 1098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERAG_PROG_ALLGEMEIN/Classes/cFirmen.vb
View File

@@ -29,6 +29,7 @@ Public Class cFirmen
Property Firma_Webadresse As Object = Nothing ' NVARCHAR (40) NULL,
Property Firma_LandKz As Object = Nothing ' NVARCHAR (40) NULL,
Property Firmengruppe As Object = Nothing
Dim SQL As New SQL
@@ -70,6 +71,7 @@ Public Class cFirmen
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_E_Mail_Mahnungen", Firma_E_Mail_Mahnungen, "Firma_E_Mail_Mahnungen"))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_Webadresse", Firma_Webadresse))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firma_LandKz", Firma_LandKz))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("Firmengruppe", Firmengruppe))
Return list

16
VERAG_PROG_ALLGEMEIN/Classes/cKundenErweitert.vb
View File

@@ -81,6 +81,15 @@ Public Class cKundenErweitert
Property kde_Kapital As Object = Nothing
Property kde_KapitalWaehrung As Object = Nothing
Property kde_GruendungsDatum As Object = Nothing
Property kde_WechselBetrag As Object = Nothing
Property kde_WechselGueltigBis As Object = Nothing
Property kde_WechselErhaltenAm As Object = Nothing
Property kde_BankgarantielErhaltenAm As Object = Nothing
Property kde_WechselBlanko As Boolean = False
Dim SQL As New SQL
@@ -163,6 +172,13 @@ Public Class cKundenErweitert
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_Kapital", kde_Kapital))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_KapitalWaehrung", kde_KapitalWaehrung))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_GruendungsDatum", kde_GruendungsDatum))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBetrag", kde_WechselBetrag))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselGueltigBis", kde_WechselGueltigBis))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselErhaltenAm", kde_WechselErhaltenAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_BankgarantielErhaltenAm", kde_BankgarantielErhaltenAm))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("kde_WechselBlanko", kde_WechselBlanko))
Return list
End Function

7
VERAG_PROG_ALLGEMEIN/Classes/cMitarbeiter.vb
View File

@@ -94,9 +94,7 @@ Public Class cMitarbeiter
Property mit_Sprachkentnisse As Object = Nothing
Property mit_homeoffice As Boolean = False
Property mit_timasNichtStempeln As Boolean = False
Property mit_ausstempelnBeiBeenden As Boolean = False
Dim SQL As New SQL
@@ -207,6 +205,8 @@ Public Class cMitarbeiter
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_homeoffice", mit_homeoffice))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_timasNichtStempeln", mit_timasNichtStempeln))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_emailprivat", mit_emailprivat))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("mit_ausstempelnBeiBeenden", mit_ausstempelnBeiBeenden))
Return list
@@ -408,6 +408,7 @@ Public Class cMitarbeiter
Me.mit_homeoffice = dr.Item("mit_homeoffice")
Me.mit_timasNichtStempeln = dr.Item("mit_timasNichtStempeln")
If Not dr.Item("mit_emailprivat") Is DBNull.Value Then Me.mit_emailprivat = dr.Item("mit_emailprivat")
Me.mit_timasNichtStempeln = dr.Item("mit_ausstempelnBeiBeenden")
Catch ex As Exception

36
VERAG_PROG_ALLGEMEIN/Classes/cTextkonserve.vb
View File

@@ -15,6 +15,20 @@ Public Class cTextkonserve_LIST
End Sub
Sub New(txt_Type As Integer, txt_sprache As String, txt_FIRMA As String)
LOAD_LIST_TYPE(txt_Type, txt_sprache, txt_FIRMA)
End Sub
Sub New(txt_Type As Integer, txt_sprache As String, FIRMAID As Integer)
Dim FIRMA As New VERAG_PROG_ALLGEMEIN.cFirmen(FIRMAID)
LOAD_LIST_TYPE(txt_Type, txt_sprache, FIRMA.Firmengruppe)
End Sub
Sub New(txt_FIRMA As String)
LOAD_SPRACHENLIST(txt_FIRMA)
@@ -39,6 +53,26 @@ Public Class cTextkonserve_LIST
End Try
End Sub
Public Sub LOAD_LIST_TYPE(txt_type As Integer, 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_typ='" & txt_type & "' 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
Public Sub LOAD_SPRACHENLIST(txt_FIRMA As String)
Try
@@ -74,6 +108,7 @@ Public Class cTextkonserve
Property txt_sendungsvermerkId As Integer
Property txt_sendungsvermerkText As String
Property txt_fixerEmpfaengerEmail As String
Property txt_typ As Object
@@ -119,6 +154,7 @@ Public Class cTextkonserve
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkId", txt_sendungsvermerkId))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_sendungsvermerkText", txt_sendungsvermerkText))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_fixerEmpfaengerEmail", txt_fixerEmpfaengerEmail))
list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("txt_typ", txt_typ))
Return list
End Function

20
VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb
View File

@@ -990,16 +990,20 @@ Public Class cFormularManager
Try
Dim f = stamper.AcroFields
f.GenerateAppearances = True
For Each r In f.Fields
Dim key = r.Key.ToString
Dim value = IIf(f.GetField(r.Key.ToString) = "", " ", r.Key.ToString)
Dim listItem As VERAG_PROG_ALLGEMEIN.MyListItem
listItem = New VERAG_PROG_ALLGEMEIN.MyListItem(r.Key.ToString, f.GetField(r.Key.ToString))
If f IsNot Nothing Then
f.GenerateAppearances = True
For Each r In f.Fields
Dim key = r.Key.ToString
Dim value = IIf(f.GetField(r.Key.ToString) = "", " ", r.Key.ToString)
Dim listItem As VERAG_PROG_ALLGEMEIN.MyListItem
listItem = New VERAG_PROG_ALLGEMEIN.MyListItem(r.Key.ToString, f.GetField(r.Key.ToString))
list.Add(listItem)
list.Add(listItem)
Next
Else
MsgBox("In der Vorlage wurden sind keine ausfühlbaren Felder vorhanden!")
End If
Next
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)

13
VERAG_PROG_ALLGEMEIN/Messenger/frmMessenger.Designer.vb generated
View File

@@ -24,7 +24,6 @@ Partial Class frmMessenger
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
@@ -39,12 +38,12 @@ Partial Class frmMessenger
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMessenger))
Me.SplitContainer = New System.Windows.Forms.SplitContainer()
Me.SplitContainer2 = New System.Windows.Forms.SplitContainer()
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.dgvChats = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.Panel6 = New System.Windows.Forms.Panel()
Me.Label3 = New System.Windows.Forms.Label()
Me.lblLKWChat_MsgCntInaktiv = New System.Windows.Forms.Label()
Me.cbxInaktiveChats = New System.Windows.Forms.CheckBox()
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
Me.DGVSonstige = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
Me.Panel5 = New System.Windows.Forms.Panel()
Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox()
Me.PictureBox2 = New System.Windows.Forms.PictureBox()
@@ -65,7 +64,7 @@ Partial Class frmMessenger
Me.btnNeu = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button()
Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel(Me.components)
Me.MyFlowLayoutPanel1 = New VERAG_PROG_ALLGEMEIN.MyFlowLayoutPanel()
Me.UsrCntlMessenger_ChatElement1 = New VERAG_PROG_ALLGEMEIN.usrCntlMessenger_ChatElement()
Me.Panel3 = New System.Windows.Forms.Panel()
Me.btnTeilnehmer = New System.Windows.Forms.Button()
@@ -93,9 +92,9 @@ Partial Class frmMessenger
Me.btnSendAtt = New System.Windows.Forms.Button()
Me.btnSenden = New System.Windows.Forms.Button()
Me.rtbChatMessage = New System.Windows.Forms.RichTextBox()
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer(Me.components)
Me.Timer_REFRESH = New System.Windows.Forms.Timer(Me.components)
Me.cntxt = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.TimerNEW_MESSAGE = New System.Windows.Forms.Timer()
Me.Timer_REFRESH = New System.Windows.Forms.Timer()
Me.cntxt = New System.Windows.Forms.ContextMenuStrip()
Me.ChatDeaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.toolChatReminder = New System.Windows.Forms.ToolStripMenuItem()
Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn()